pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] web: search param: domains --> comparison

Browse Source 
The search param "domains" of type Array was not satisfactory for
several reasons:
 - useless for non reporting views
 - too close from the search param "domain"
 - a key "fieldName" was put on the value (resulting in a loss of
   information in case of stringification)

We change it for a search param "comparison" of type null or Object.

closes odoo/odoo#76340

X-original-commit: 4f867099846c4214a74a7b0222ac0941537bbe29
Related: odoo/enterprise#20772
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
This commit is contained in:
Mathieu Duckerts-Antoine
2021-09-10 15:00:55 +00:00
parent 38a4062678
commit b7502e6ce6
11 changed files with 311 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/board/static/src/add_to_board/add_to_board.js
+4 -4
View File
@@ -38,11 +38,10 @@ export class AddToBoard extends Component {
action,
displayName,
domain,
comparison,
context,
groupBy,
orderedBy,
view
view,
} = this.env.searchModel;
// Retrieves view context
@@ -57,8 +56,9 @@ export class AddToBoard extends Component {
...viewContext,
};
if (comparison) {
contextToSave.comparison = comparison;
const detailedComparison = this.env.searchModel.getFullComparison();
if (detailedComparison) {
contextToSave.comparison = detailedComparison;
}
const result = await this.rpc("/board/add_to_dashboard", {
addons/web/static/src/search/search_model.js
+98 -77
View File
@@ -20,6 +20,28 @@ import { deepCopy } from "@web/core/utils/objects";
const { DateTime } = luxon;
const EventBus = owl.core.EventBus;
/**
* @typedef {Object} ComparisonDomain
* @property {DomainListRepr} arrayRepr
* @property {string} description
*/
/**
* @typedef {Object} Comparison
* @property {ComparisonDomain[]} domains
* @property {string} [fieldName]
*/
/**
* @typedef {Object} SearchParams
* @property {Comparison | null} comparison
* @property {Context} context
* @property {DomainListRepr} domain
* @property {string[]} groupBy
* @property {string[]} orderBy
* @property {boolean} [useSampleModel] to remove?
*/
/** @todo rework doc */
// interface SectionCommon { // check optional keys
// color: string;
@@ -170,10 +192,10 @@ export class SearchModel extends EventBus {
*
* @param {Object} [config.action={id:false,views:[]}]
* @param {boolean} [config.activateFavorite=true]
* @param {Object | null} [config.comparison]
* @param {Object} [config.context={}]
* @param {String} [config.displayName=""]
* @param {Array} [config.domain=[]]
* @param {Array} [config.domains]
* @param {Array} [config.dynamicFilters=[]]
* @param {string[]} [config.groupBy=[]]
* @param {boolean} [config.loadIrFilters=false]
@@ -197,17 +219,17 @@ export class SearchModel extends EventBus {
this.view = view || { id: false };
// used to avoid useless recomputations
// this._comparison is left undefined (we have to distinguish it from null)
this._context = null;
this._domain = null;
this._domains = null;
this._groupBy = null;
this._orderBy = null;
const { context, domain, domains, groupBy, orderBy } = config;
const { comparison, context, domain, groupBy, orderBy } = config;
this.globalComparison = comparison;
this.globalContext = context || {};
this.globalDomain = domain || [];
this.globalDomains = domains; // rework that part
this.globalGroupBy = groupBy || [];
this.globalOrderBy = orderBy || [];
@@ -362,25 +384,25 @@ export class SearchModel extends EventBus {
/**
* @param {Object} [config={}]
* @param {Object | null} [config.comparison]
* @param {Object} [config.context={}]
* @param {Array} [config.domain=[]]
* @param {Object[]} [config.domains]
* @param {string[]} [config.groupBy=[]]
* @param {string[]} [config.orderBy=[]]
*/
async reload(config = {}) {
// used to avoid useless recomputations
delete this._comparison;
this._context = null;
this._domain = null;
this._domains = null;
this._groupBy = null;
this._orderBy = null;
const { context, domain, domains, groupBy, orderBy } = config;
const { comparison, context, domain, groupBy, orderBy } = config;
this.globalContext = context || {};
this.globalDomain = domain || [];
this.globalDomains = domains; // how to use this?
this.globalComparison = comparison;
this.globalGroupBy = groupBy || [];
this.globalOrderBy = orderBy || [];
@@ -398,13 +420,6 @@ export class SearchModel extends EventBus {
return [...this.sections.values()].filter((s) => s.type === "category");
}
/**
* @returns {Object}
*/
get comparison() {
return this._getComparison();
}
/**
* @returns {Context} should be imported from context.js?
*/
@@ -425,12 +440,18 @@ export class SearchModel extends EventBus {
return this._domain;
}
get domains() {
if (!this._domains) {
if (this.globalDomains) {
this._domains = this.globalDomains;
/**
* @returns {Comparison}
*/
get comparison() {
if (!this.searchMenuTypes.has("comparison")) {
return null;
}
if (this._comparison === undefined) {
if (this.globalComparison) {
this._comparison = this.globalComparison;
} else {
const comparison = this._getComparison();
const comparison = this.getFullComparison();
if (comparison) {
const {
fieldName,
@@ -439,7 +460,7 @@ export class SearchModel extends EventBus {
comparisonRange,
comparisonRangeDescription,
} = comparison;
this._domains = [
const domains = [
{
arrayRepr: Domain.and([this.domain, range]).toList(),
description: rangeDescription,
@@ -449,13 +470,13 @@ export class SearchModel extends EventBus {
description: comparisonRangeDescription,
},
];
this._domains.fieldName = fieldName; // bad but for now okay
this._comparison = { domains, fieldName };
} else {
this._domains = [{ arrayRepr: this.domain, description: null }];
this._comparison = null;
}
}
}
return this._domains;
return this._comparison;
}
get facets() {
@@ -688,6 +709,57 @@ export class SearchModel extends EventBus {
return sortBy(Object.values(copy), (part) => part.groupId);
}
getFullComparison() {
let searchItem = null;
for (const queryElem of this.query.slice().reverse()) {
const item = this.searchItems[queryElem.searchItemId];
if (item.type === "comparison") {
searchItem = item;
break;
} else if (item.type === "favorite" && item.comparison) {
searchItem = item;
break;
}
}
if (!searchItem) {
return null;
} else if (searchItem.type === "favorite") {
return searchItem.comparison;
}
const { dateFilterId, comparisonOptionId } = searchItem;
const { fieldName, fieldType, description: dateFilterDescription } = this.searchItems[
dateFilterId
];
const selectedGeneratorIds = this._getSelectedGeneratorIds(dateFilterId);
// compute range and range description
const { domain: range, description: rangeDescription } = constructDateDomain(
this.referenceMoment,
fieldName,
fieldType,
selectedGeneratorIds
);
// compute comparisonRange and comparisonRange description
const {
domain: comparisonRange,
description: comparisonRangeDescription,
} = constructDateDomain(
this.referenceMoment,
fieldName,
fieldType,
selectedGeneratorIds,
comparisonOptionId
);
return {
comparisonId: comparisonOptionId,
fieldName,
fieldDescription: dateFilterDescription,
range: range.toList(),
rangeDescription,
comparisonRange: comparisonRange.toList(),
comparisonRangeDescription,
};
}
getIrFilterValues(params) {
const { irFilter } = this._getIrFilterDescription(params);
return irFilter;
@@ -1264,57 +1336,6 @@ export class SearchModel extends EventBus {
return domain;
}
_getComparison() {
let searchItem = null;
for (const queryElem of this.query.slice().reverse()) {
const item = this.searchItems[queryElem.searchItemId];
if (item.type === "comparison") {
searchItem = item;
break;
} else if (item.type === "favorite" && item.comparison) {
searchItem = item;
break;
}
}
if (!searchItem) {
return null;
} else if (searchItem.type === "favorite") {
return searchItem.comparison;
}
const { dateFilterId, comparisonOptionId } = searchItem;
const { fieldName, fieldType, description: dateFilterDescription } = this.searchItems[
dateFilterId
];
const selectedGeneratorIds = this._getSelectedGeneratorIds(dateFilterId);
// compute range and range description
const { domain: range, description: rangeDescription } = constructDateDomain(
this.referenceMoment,
fieldName,
fieldType,
selectedGeneratorIds
);
// compute comparisonRange and comparisonRange description
const {
domain: comparisonRange,
description: comparisonRangeDescription,
} = constructDateDomain(
this.referenceMoment,
fieldName,
fieldType,
selectedGeneratorIds,
comparisonOptionId
);
return {
comparisonId: comparisonOptionId,
fieldName,
fieldDescription: dateFilterDescription,
range: range.toList(),
rangeDescription,
comparisonRange: comparisonRange.toList(),
comparisonRangeDescription,
};
}
/**
* Construct a single context from the contexts of
* filters of type 'filter', 'favorite', and 'field'.
@@ -1736,7 +1757,7 @@ export class SearchModel extends EventBus {
}
const rawDomain = this._getDomain({ raw: true, withGlobal: false });
const groupBys = this._getGroupBy();
const comparison = this._getComparison();
const comparison = this.getFullComparison();
const orderBy = saveParams.orderBy ? saveParams.orderBy : this._getOrderBy() || [];
const userId = isShared ? false : this.userService.userId;
@@ -1996,9 +2017,9 @@ export class SearchModel extends EventBus {
if (this.blockNotification) {
return;
}
delete this._comparison;
this._context = null;
this._domain = null;
this._domains = null;
this._groupBy = null;
this._orderBy = null;
addons/web/static/src/search/with_search/with_search.js
+4 -3
View File
@@ -7,7 +7,7 @@ import { CallbackRecorder, useSetupAction } from "@web/webclient/actions/action_
const { Component, hooks } = owl;
const { useSubEnv } = hooks;
export const SEARCH_KEYS = ["context", "domain", "domains", "groupBy", "orderBy"];
export const SEARCH_KEYS = ["comparison", "context", "domain", "groupBy", "orderBy"];
const OTHER_SEARCH_KEYS = ["irFilters", "searchViewArch", "searchViewFields", "searchViewId"];
export class WithSearch extends Component {
@@ -63,7 +63,7 @@ export class WithSearch extends Component {
async willUpdateProps(nextProps) {
const config = {};
for (const key of SEARCH_KEYS) {
if (nextProps[key]) {
if (nextProps[key] !== undefined) {
config[key] = nextProps[key];
}
}
@@ -122,9 +122,10 @@ WithSearch.props = {
display: { type: Object, optional: true },
// search query elements
comparison: { validate: () => true, optional: true }, // fix problem with validation with type: [Object, null]
// Issue OWL: https://github.com/odoo/owl/issues/910
context: { type: Object, optional: true },
domain: { type: Array, element: [String, Array], optional: true },
domains: { type: Array, element: Object, optional: true },
groupBy: { type: Array, element: String, optional: true },
orderBy: { type: Array, element: String, optional: true },
addons/web/static/src/views/graph/graph_model.js
+15 -9
View File
@@ -11,6 +11,10 @@ import { computeReportMeasures, processMeasure } from "@web/views/helpers/utils"
export const SEP = " / ";
/**
* @typedef {import("@web/search/search_model").SearchParams} SearchParams
*/
class DateClasses {
// We view the param "array" as a matrix of values and undefined.
// An equivalence class is formed of defined values of a column.
@@ -100,15 +104,17 @@ export class GraphModel extends Model {
//--------------------------------------------------------------------------
/**
* @param {Object} [searchParams]
* @param {Object} [searchParams.context]
* @param {Object[]} [searchParams.domains]
* @param {string[]} [searchParams.groupBy]
* @param {SearchParams} searchParams
*/
async load(searchParams) {
const { context, domains, groupBy } = searchParams;
const metaData = Object.assign({}, this.metaData, { context, domains });
const { comparison, domain, context, groupBy } = searchParams;
const metaData = Object.assign({}, this.metaData, { context });
if (comparison) {
metaData.domains = comparison.domains;
metaData.comparisonField = comparison.fieldName;
} else {
metaData.domains = [{ arrayRepr: domain, description: null }];
}
metaData.measure = context.graph_measure || metaData.measure;
metaData.mode = context.graph_mode || metaData.mode;
@@ -183,10 +189,10 @@ export class GraphModel extends Model {
* @returns {Object}
*/
_getData(dataPoints) {
const { domains, groupBy, mode } = this.metaData;
const { comparisonField, groupBy, mode } = this.metaData;
let identify = false;
if (domains.length && groupBy.length && groupBy[0].fieldName === domains.fieldName) {
if (comparisonField && groupBy.length && groupBy[0].fieldName === comparisonField) {
identify = true;
}
const dateClasses = identify ? this._getDateClasses(dataPoints) : null;
addons/web/static/src/views/graph/graph_view.xml
+1 -1
View File
@@ -31,7 +31,7 @@
t-att-class="{ active: model.metaData.stacked }"
/>
</div>
<div t-if="model.metaData.mode !== 'pie' and env.searchModel.domains.length === 1" class="btn-group ml-3" role="toolbar" aria-label="Sort graph">
<div t-if="model.metaData.mode !== 'pie' and model.metaData.domains.length === 1" class="btn-group ml-3" role="toolbar" aria-label="Sort graph">
<button class="btn btn-secondary fa fa-sort-amount-desc o_graph_button" data-tooltip="Descending" aria-label="Descending"
t-on-click="toggleOrder('DESC')"
t-att-class="{ active: model.metaData.order === 'DESC' }"
addons/web/static/src/views/helpers/model.js
+9 -1
View File
@@ -7,6 +7,10 @@ const { core, hooks } = owl;
const { EventBus } = core;
const { onWillStart, onWillUpdateProps, useComponent } = hooks;
/**
* @typedef {import("@web/search/search_model").SearchParams} SearchParams
*/
export class Model extends EventBus {
/**
* @param {Object} env
@@ -25,7 +29,7 @@ export class Model extends EventBus {
setup(params, services) {}
/**
* @param {Object} searchParams
* @param {SearchParams} searchParams
*/
load(searchParams) {}
@@ -35,6 +39,10 @@ export class Model extends EventBus {
}
Model.services = [];
/**
* @param {Object} props
* @returns {SearchParams}
*/
function getSearchParams(props) {
const params = {};
for (const key of SEARCH_KEYS) {
addons/web/static/src/views/helpers/standard_view_props.js
+2 -1
View File
@@ -19,9 +19,10 @@ export const standardViewProps = {
},
resModel: String,
arch: { type: String },
comparison: { validate: () => true }, // fix problem with validation with type: [Object, null]
// Issue OWL: https://github.com/odoo/owl/issues/910
context: { type: Object },
domain: { type: Array },
domains: { type: Array, elements: Object },
fields: { type: Object, elements: Object },
groupBy: { type: Array, elements: String },
limit: { type: Number, optional: 1 },
addons/web/static/src/views/pivot/pivot_model.js
+14 -19
View File
@@ -309,12 +309,7 @@ import { computeReportMeasures, processMeasure } from "@web/views/helpers/utils"
*/
/**
* @typedef SearchParams
* @property {Array[]} domain
* @property {Object} context
* @property {string[]} groupBy
* @property {Array[]} domains
* @property {string[]} origins
* @typedef {import("@web/search/search_model").SearchParams} SearchParams
*/
/**
@@ -669,13 +664,7 @@ export class PivotModel extends Model {
}
/**
* @override
*
* @param {Object} searchParams
* @param {Object} params.context
* @param {Array[]} params.domain
* @param {string[]} params.groupBy
* @param {string[]} params.measures
* @param {Object} [params.domains]
* @param {SearchParams} searchParams
*/
async load(searchParams) {
this.orm2Use = this.realORM;
@@ -1475,17 +1464,23 @@ export class PivotModel extends Model {
}
}
/**
* @todo review comment
* Determine this.searchParams.domains and this.searchParams.origins from
* this.searchParams.domains.
*
* @private
* @param {SearchParams} searchParams
*/
_computeDerivedParams(params) {
const domains = params.domains.reverse();
return {
domains: domains.map((d) => d.arrayRepr),
origins: domains.map((d) => d.description || ""),
};
_computeDerivedParams(searchParams) {
const { comparison, domain } = searchParams;
if (comparison) {
const domains = searchParams.comparison.domains.slice().reverse();
return {
domains: domains.map((d) => d.arrayRepr),
origins: domains.map((d) => d.description),
};
}
return { domains: [domain], origins: [""] };
}
/**
* Make any group in tree a leaf if it was a leaf in oldTree.
addons/web/static/src/views/view.js
+5 -5
View File
@@ -27,9 +27,9 @@ const { Component } = owl;
* @property {Object[]} [irFilters]
* @property {boolean} [loadIrFilters=false]
*
* @property {Object} [comparison]
* @property {Object} [context={}]
* @property {DomainRepr} [domain]
* @property {Object[]} [domains]
* @property {string[]} [groupBy]
* @property {string[]} [orderBy]
*
@@ -71,9 +71,9 @@ const STANDARD_PROPS = new Set([
"irFilters",
"loadIrFilters",
"comparison",
"context",
"domain",
"domains",
"groupBy",
"orderBy",
@@ -280,9 +280,9 @@ export class View extends Component {
async willUpdateProps(nextProps) {
// we assume that nextProps can only vary in the search keys:
// context, domain, domains, groupBy, orderBy
const { context, domain, domains, groupBy, orderBy } = nextProps;
Object.assign(this.withSearchProps, { context, domain, domains, groupBy, orderBy });
// comparison, context, domain, groupBy, orderBy
const { comparison, context, domain, groupBy, orderBy } = nextProps;
Object.assign(this.withSearchProps, { comparison, context, domain, groupBy, orderBy });
}
}
addons/web/static/tests/search/favorite_menu_tests.js
+3 -3
View File
@@ -233,7 +233,7 @@ QUnit.module("Search", (hooks) => {
let domain = controlPanel.env.searchModel.domain;
let groupBy = controlPanel.env.searchModel.groupBy;
let comparison = controlPanel.env.searchModel._getComparison();
let comparison = controlPanel.env.searchModel.getFullComparison();
assert.deepEqual(domain, [
"&",
@@ -257,7 +257,7 @@ QUnit.module("Search", (hooks) => {
domain = controlPanel.env.searchModel.domain;
groupBy = controlPanel.env.searchModel.groupBy;
comparison = controlPanel.env.searchModel._getComparison();
comparison = controlPanel.env.searchModel.getFullComparison();
assert.deepEqual(domain, [["foo", "ilike", "a"]]);
assert.deepEqual(groupBy, ["date_field:month"]);
@@ -285,7 +285,7 @@ QUnit.module("Search", (hooks) => {
domain = controlPanel.env.searchModel.domain;
groupBy = controlPanel.env.searchModel.groupBy;
comparison = controlPanel.env.searchModel._getComparison();
comparison = controlPanel.env.searchModel.getFullComparison();
assert.deepEqual(domain, ["!", ["foo", "=", "qsdf"]]);
assert.deepEqual(groupBy, ["foo"]);
addons/web/static/tests/views/graph_view_tests.js
+156 -136
View File
@@ -381,10 +381,12 @@ QUnit.module("Views", (hooks) => {
</graph>
`,
groupBy: [],
domains: [
{ arrayRepr: [["bar", "=", true]], description: "True group" },
{ arrayRepr: [["bar", "=", false]], description: "False group" },
],
comparison: {
domains: [
{ arrayRepr: [["bar", "=", true]], description: "True group" },
{ arrayRepr: [["bar", "=", false]], description: "False group" },
],
},
});
checkLabels(assert, graph, ["Total"]);
checkDatasets(
@@ -449,10 +451,12 @@ QUnit.module("Views", (hooks) => {
<field name="foo"/>
</graph>
`,
domains: [
{ arrayRepr: [["bar", "=", true]], description: "True group" },
{ arrayRepr: [["bar", "=", false]], description: "False group" },
],
comparison: {
domains: [
{ arrayRepr: [["bar", "=", true]], description: "True group" },
{ arrayRepr: [["bar", "=", false]], description: "False group" },
],
},
});
checkLabels(assert, graph, ["1", "2", "3", "4"]);
checkDatasets(
@@ -530,23 +534,6 @@ QUnit.module("Views", (hooks) => {
{ date: "2021-02-17", revenue: false },
{ date: false, revenue: 0 },
];
const domains = [
{
arrayRepr: [
["date", ">=", "2021-02-01"],
["date", "<=", "2021-02-28"],
],
description: "February 2021",
},
{
arrayRepr: [
["date", ">=", "2021-01-01"],
["date", "<=", "2021-01-31"],
],
description: "January 2021",
},
];
domains.fieldName = "date";
const graph = await makeView({
serverData,
type: "graph",
@@ -557,7 +544,25 @@ QUnit.module("Views", (hooks) => {
<field name="date" interval="week"/>
</graph>
`,
domains,
comparison: {
domains: [
{
arrayRepr: [
["date", ">=", "2021-02-01"],
["date", "<=", "2021-02-28"],
],
description: "February 2021",
},
{
arrayRepr: [
["date", ">=", "2021-01-01"],
["date", "<=", "2021-01-31"],
],
description: "January 2021",
},
],
fieldName: "date",
},
});
checkLabels(assert, graph, ["W05 2021", "W07 2021", "", ""]);
checkDatasets(
@@ -644,23 +649,6 @@ QUnit.module("Views", (hooks) => {
{ date: "2021-02-17", bar: false, revenue: false },
{ date: false, bar: true, revenue: 0 },
];
const domains = [
{
arrayRepr: [
["date", ">=", "2021-02-01"],
["date", "<=", "2021-02-28"],
],
description: "February 2021",
},
{
arrayRepr: [
["date", ">=", "2021-01-01"],
["date", "<=", "2021-01-31"],
],
description: "January 2021",
},
];
domains.fieldName = "date";
const graph = await makeView({
serverData,
type: "graph",
@@ -672,7 +660,25 @@ QUnit.module("Views", (hooks) => {
<field name="date" interval="week"/>
</graph>
`,
domains,
comparison: {
domains: [
{
arrayRepr: [
["date", ">=", "2021-02-01"],
["date", "<=", "2021-02-28"],
],
description: "February 2021",
},
{
arrayRepr: [
["date", ">=", "2021-01-01"],
["date", "<=", "2021-01-31"],
],
description: "January 2021",
},
],
fieldName: "date",
},
});
checkLabels(assert, graph, ["true", "false"]);
checkDatasets(
@@ -863,10 +869,12 @@ QUnit.module("Views", (hooks) => {
<field name="revenue" type="measure"/>
</graph>
`,
domains: [
{ arrayRepr: [["bar", "=", true]], description: "True group" },
{ arrayRepr: [["bar", "=", false]], description: "False group" },
],
comparison: {
domains: [
{ arrayRepr: [["bar", "=", true]], description: "True group" },
{ arrayRepr: [["bar", "=", false]], description: "False group" },
],
},
});
checkLabels(assert, graph, ["", "Total", ""]);
checkDatasets(
@@ -923,10 +931,12 @@ QUnit.module("Views", (hooks) => {
<field name="foo"/>
</graph>
`,
domains: [
{ arrayRepr: [["bar", "=", true]], description: "True group" },
{ arrayRepr: [["bar", "=", false]], description: "False group" },
],
comparison: {
domains: [
{ arrayRepr: [["bar", "=", true]], description: "True group" },
{ arrayRepr: [["bar", "=", false]], description: "False group" },
],
},
});
checkLabels(assert, graph, ["1", "2", "3", "4"]);
checkDatasets(
@@ -1012,23 +1022,6 @@ QUnit.module("Views", (hooks) => {
{ date: "2021-02-17", revenue: false },
{ date: false, revenue: 0 },
];
const domains = [
{
arrayRepr: [
["date", ">=", "2021-02-01"],
["date", "<=", "2021-02-28"],
],
description: "February 2021",
},
{
arrayRepr: [
["date", ">=", "2021-01-01"],
["date", "<=", "2021-01-31"],
],
description: "January 2021",
},
];
domains.fieldName = "date";
const graph = await makeView({
serverData,
type: "graph",
@@ -1039,7 +1032,25 @@ QUnit.module("Views", (hooks) => {
<field name="date" interval="week"/>
</graph>
`,
domains,
comparison: {
domains: [
{
arrayRepr: [
["date", ">=", "2021-02-01"],
["date", "<=", "2021-02-28"],
],
description: "February 2021",
},
{
arrayRepr: [
["date", ">=", "2021-01-01"],
["date", "<=", "2021-01-31"],
],
description: "January 2021",
},
],
fieldName: "date",
},
});
checkLabels(assert, graph, ["W05 2021", "W07 2021", "", ""]);
checkDatasets(
@@ -1118,23 +1129,6 @@ QUnit.module("Views", (hooks) => {
{ date: "2021-02-17", bar: false, revenue: false },
{ date: false, bar: true, revenue: 0 },
];
const domains = [
{
arrayRepr: [
["date", ">=", "2021-02-01"],
["date", "<=", "2021-02-28"],
],
description: "February 2021",
},
{
arrayRepr: [
["date", ">=", "2021-01-01"],
["date", "<=", "2021-01-31"],
],
description: "January 2021",
},
];
domains.fieldName = "date";
const graph = await makeView({
serverData,
type: "graph",
@@ -1146,7 +1140,25 @@ QUnit.module("Views", (hooks) => {
<field name="date" interval="week"/>
</graph>
`,
domains,
comparison: {
domains: [
{
arrayRepr: [
["date", ">=", "2021-02-01"],
["date", "<=", "2021-02-28"],
],
description: "February 2021",
},
{
arrayRepr: [
["date", ">=", "2021-01-01"],
["date", "<=", "2021-01-31"],
],
description: "January 2021",
},
],
fieldName: "date",
},
});
checkLabels(assert, graph, ["true", "false"]);
checkDatasets(
@@ -1316,10 +1328,12 @@ QUnit.module("Views", (hooks) => {
<field name="revenue" type="measure"/>
</graph>
`,
domains: [
{ arrayRepr: [["bar", "=", true]], description: "True group" },
{ arrayRepr: [["bar", "=", false]], description: "False group" },
],
comparison: {
domains: [
{ arrayRepr: [["bar", "=", true]], description: "True group" },
{ arrayRepr: [["bar", "=", false]], description: "False group" },
],
},
});
checkLabels(assert, graph, ["Total"]);
checkDatasets(
@@ -1384,10 +1398,12 @@ QUnit.module("Views", (hooks) => {
<field name="foo"/>
</graph>
`,
domains: [
{ arrayRepr: [["bar", "=", true]], description: "True group" },
{ arrayRepr: [["bar", "=", false]], description: "False group" },
],
comparison: {
domains: [
{ arrayRepr: [["bar", "=", true]], description: "True group" },
{ arrayRepr: [["bar", "=", false]], description: "False group" },
],
},
});
checkLabels(assert, graph, ["1", "2", "4"]);
checkDatasets(
@@ -1465,23 +1481,6 @@ QUnit.module("Views", (hooks) => {
{ date: "2021-02-17" },
{ date: false },
];
const domains = [
{
arrayRepr: [
["date", ">=", "2021-02-01"],
["date", "<=", "2021-02-28"],
],
description: "February 2021",
},
{
arrayRepr: [
["date", ">=", "2021-01-01"],
["date", "<=", "2021-01-31"],
],
description: "January 2021",
},
];
domains.fieldName = "date";
const graph = await makeView({
serverData,
type: "graph",
@@ -1491,7 +1490,25 @@ QUnit.module("Views", (hooks) => {
<field name="date" interval="week"/>
</graph>
`,
domains,
comparison: {
domains: [
{
arrayRepr: [
["date", ">=", "2021-02-01"],
["date", "<=", "2021-02-28"],
],
description: "February 2021",
},
{
arrayRepr: [
["date", ">=", "2021-01-01"],
["date", "<=", "2021-01-31"],
],
description: "January 2021",
},
],
fieldName: "date",
},
});
checkLabels(assert, graph, [
"W05 2021, W01 2021",
@@ -1592,23 +1609,6 @@ QUnit.module("Views", (hooks) => {
{ date: "2021-02-17", bar: false, revenue: false },
{ date: false, bar: true, revenue: 0 },
];
const domains = [
{
arrayRepr: [
["date", ">=", "2021-02-01"],
["date", "<=", "2021-02-28"],
],
description: "February 2021",
},
{
arrayRepr: [
["date", ">=", "2021-01-01"],
["date", "<=", "2021-01-31"],
],
description: "January 2021",
},
];
domains.fieldName = "date";
const graph = await makeView({
serverData,
type: "graph",
@@ -1620,7 +1620,25 @@ QUnit.module("Views", (hooks) => {
<field name="date" interval="week"/>
</graph>
`,
domains,
comparison: {
domains: [
{
arrayRepr: [
["date", ">=", "2021-02-01"],
["date", "<=", "2021-02-28"],
],
description: "February 2021",
},
{
arrayRepr: [
["date", ">=", "2021-01-01"],
["date", "<=", "2021-01-31"],
],
description: "January 2021",
},
],
fieldName: "date",
},
});
checkLabels(assert, graph, ["true / W05 2021", "true / W01 2021", "false / W02 2021"]);
checkDatasets(
@@ -1715,10 +1733,12 @@ QUnit.module("Views", (hooks) => {
<field name="product_id"/>
<graph/>
`,
domains: [
{ arrayRepr: [["bar", "=", true]], description: "True group" },
{ arrayRepr: [["bar", "=", false]], description: "False group" },
],
comparison: {
domains: [
{ arrayRepr: [["bar", "=", true]], description: "True group" },
{ arrayRepr: [["bar", "=", false]], description: "False group" },
],
},
});
checkLabels(assert, graph, ["xphone", "No data"]);
checkDatasets(