@gooddata/sdk-ui 8.10.0-alpha.4 → 8.10.0-alpha.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/base/headerMatching/HeaderPredicateFactory.d.ts.map +1 -1
- package/dist/base/headerMatching/HeaderPredicateFactory.js +27 -8
- package/dist/base/headerMatching/HeaderPredicateFactory.js.map +1 -1
- package/dist/base/localization/bundles/de-DE.json +8 -1
- package/dist/base/localization/bundles/en-US.json +6 -1
- package/dist/base/localization/bundles/es-ES.json +8 -1
- package/dist/base/localization/bundles/fr-FR.json +8 -1
- package/dist/base/localization/bundles/ja-JP.json +8 -1
- package/dist/base/localization/bundles/nl-NL.json +8 -1
- package/dist/base/localization/bundles/pt-BR.json +8 -1
- package/dist/base/localization/bundles/pt-PT.json +8 -1
- package/dist/base/localization/bundles/ru-RU.json +8 -1
- package/dist/base/localization/bundles/zh-Hans.json +8 -1
- package/dist/execution/createExecution.d.ts.map +1 -1
- package/dist/execution/createExecution.js +3 -5
- package/dist/execution/createExecution.js.map +1 -1
- package/esm/base/headerMatching/HeaderPredicateFactory.d.ts.map +1 -1
- package/esm/base/headerMatching/HeaderPredicateFactory.js +27 -8
- package/esm/base/headerMatching/HeaderPredicateFactory.js.map +1 -1
- package/esm/base/localization/bundles/de-DE.json +8 -1
- package/esm/base/localization/bundles/en-US.json +6 -1
- package/esm/base/localization/bundles/es-ES.json +8 -1
- package/esm/base/localization/bundles/fr-FR.json +8 -1
- package/esm/base/localization/bundles/ja-JP.json +8 -1
- package/esm/base/localization/bundles/nl-NL.json +8 -1
- package/esm/base/localization/bundles/pt-BR.json +8 -1
- package/esm/base/localization/bundles/pt-PT.json +8 -1
- package/esm/base/localization/bundles/ru-RU.json +8 -1
- package/esm/base/localization/bundles/zh-Hans.json +8 -1
- package/esm/execution/createExecution.d.ts.map +1 -1
- package/esm/execution/createExecution.js +4 -6
- package/esm/execution/createExecution.js.map +1 -1
- package/package.json +7 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HeaderPredicateFactory.d.ts","sourceRoot":"","sources":["../../../src/base/headerMatching/HeaderPredicateFactory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAA2B,MAAM,mBAAmB,CAAC;AAS9E,OAAO,
|
|
1
|
+
{"version":3,"file":"HeaderPredicateFactory.d.ts","sourceRoot":"","sources":["../../../src/base/headerMatching/HeaderPredicateFactory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAA2B,MAAM,mBAAmB,CAAC;AAS9E,OAAO,EAIH,QAAQ,EAYR,MAAM,EACT,MAAM,qBAAqB,CAAC;AAsL7B;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CA2BtD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB,CA+BpE;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAUrE;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,GAAG,QAAQ,GAAG,gBAAgB,CAgB1F;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAI5D;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,gBAAgB,CAsBnD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAM7D;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB,CAM3E;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;CAS5B,CAAC"}
|
|
@@ -9,6 +9,10 @@ var sdk_model_1 = require("@gooddata/sdk-model");
|
|
|
9
9
|
* compatibility with the previous more lenient behavior.
|
|
10
10
|
*/
|
|
11
11
|
var alwaysFalsePredicate = function () { return false; };
|
|
12
|
+
function toCompositeId(originalId, currentWorkspace) {
|
|
13
|
+
var alreadyComposite = originalId.includes(":");
|
|
14
|
+
return alreadyComposite ? originalId : currentWorkspace + ":" + originalId;
|
|
15
|
+
}
|
|
12
16
|
function arithmeticMeasureLocalIdentifierDeepMatch(dv, operandLocalIdentifier, predicate, context) {
|
|
13
17
|
var operand = dv.def().measure(operandLocalIdentifier);
|
|
14
18
|
var operandDescriptor = dv.meta().measureDescriptor(operandLocalIdentifier);
|
|
@@ -60,17 +64,32 @@ function matchHeaderUri(uri, header) {
|
|
|
60
64
|
var headerUri = MappingHeader_1.getMappingHeaderUri(header);
|
|
61
65
|
return headerUri ? headerUri === uri : false;
|
|
62
66
|
}
|
|
63
|
-
function
|
|
67
|
+
function matchHeaderIdentifierWithCompositeSupport(identifier, header, currentWorkspace) {
|
|
64
68
|
var headerIdentifier = MappingHeader_1.getMappingHeaderIdentifier(header);
|
|
65
|
-
|
|
69
|
+
if (!headerIdentifier) {
|
|
70
|
+
return false;
|
|
71
|
+
}
|
|
72
|
+
if (headerIdentifier === identifier) {
|
|
73
|
+
return true;
|
|
74
|
+
}
|
|
75
|
+
// also try converting both to composite ids and compare those
|
|
76
|
+
return toCompositeId(headerIdentifier, currentWorkspace) === toCompositeId(identifier, currentWorkspace);
|
|
66
77
|
}
|
|
67
78
|
function matchUri(uri, measure) {
|
|
68
79
|
var simpleMeasureUri = sdk_model_1.measureUri(measure);
|
|
69
80
|
return simpleMeasureUri ? simpleMeasureUri === uri : false;
|
|
70
81
|
}
|
|
71
|
-
function
|
|
82
|
+
function matchMeasureIdentifierWithCompositeSupport(identifier, measure, currentWorkspace) {
|
|
72
83
|
var simpleMeasureIdentifier = sdk_model_1.measureIdentifier(measure);
|
|
73
|
-
|
|
84
|
+
if (!simpleMeasureIdentifier) {
|
|
85
|
+
return false;
|
|
86
|
+
}
|
|
87
|
+
if (simpleMeasureIdentifier === identifier) {
|
|
88
|
+
return true;
|
|
89
|
+
}
|
|
90
|
+
// also try converting both to composite ids and compare those
|
|
91
|
+
return (toCompositeId(simpleMeasureIdentifier, currentWorkspace) ===
|
|
92
|
+
toCompositeId(identifier, currentWorkspace));
|
|
74
93
|
}
|
|
75
94
|
function matchDerivedMeasureByMasterUri(uri, measure, context) {
|
|
76
95
|
var dv = context.dv;
|
|
@@ -92,11 +111,11 @@ function matchDerivedMeasureByMasterIdentifier(identifier, measure, context) {
|
|
|
92
111
|
return false;
|
|
93
112
|
}
|
|
94
113
|
var masterMeasureHeader = dv.meta().measureDescriptor(masterMeasureLocalIdentifier);
|
|
95
|
-
if (
|
|
114
|
+
if (matchHeaderIdentifierWithCompositeSupport(identifier, masterMeasureHeader, dv.definition.workspace)) {
|
|
96
115
|
return true;
|
|
97
116
|
}
|
|
98
117
|
var masterMeasure = dv.def().measure(masterMeasureLocalIdentifier);
|
|
99
|
-
return
|
|
118
|
+
return matchMeasureIdentifierWithCompositeSupport(identifier, masterMeasure, dv.definition.workspace);
|
|
100
119
|
}
|
|
101
120
|
/**
|
|
102
121
|
* Creates a new predicate that returns true for any header that belongs to either attribute or measure with the
|
|
@@ -142,7 +161,7 @@ function identifierMatch(identifier) {
|
|
|
142
161
|
if (sdk_backend_spi_1.isResultAttributeHeader(header)) {
|
|
143
162
|
return false;
|
|
144
163
|
}
|
|
145
|
-
if (
|
|
164
|
+
if (matchHeaderIdentifierWithCompositeSupport(identifier, header, dv.definition.workspace)) {
|
|
146
165
|
return true;
|
|
147
166
|
}
|
|
148
167
|
if (!sdk_backend_spi_1.isMeasureDescriptor(header)) {
|
|
@@ -152,7 +171,7 @@ function identifierMatch(identifier) {
|
|
|
152
171
|
if (!measure) {
|
|
153
172
|
return false;
|
|
154
173
|
}
|
|
155
|
-
if (
|
|
174
|
+
if (matchMeasureIdentifierWithCompositeSupport(identifier, measure, dv.definition.workspace)) {
|
|
156
175
|
return true;
|
|
157
176
|
}
|
|
158
177
|
return matchDerivedMeasureByMasterIdentifier(identifier, measure, context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HeaderPredicateFactory.js","sourceRoot":"","sources":["../../../src/base/headerMatching/HeaderPredicateFactory.ts"],"names":[],"mappings":";;;AAEA,iDAMyB;AACzB,6DAA6G;AAC7G,
|
|
1
|
+
{"version":3,"file":"HeaderPredicateFactory.js","sourceRoot":"","sources":["../../../src/base/headerMatching/HeaderPredicateFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "Alle Benutzer",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "Inaktiver Benutzer",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "Der Benutzer wurde von diesem Workspace gelöscht.",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "Von Auswahl entfernen."
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "Von Auswahl entfernen.",
|
|
241
|
+
"sorting.dropdown.header": "Betrachtung sortieren",
|
|
242
|
+
"sorting.type.alphabetical.asc": "A bis Z",
|
|
243
|
+
"sorting.type.alphabetical.desc": "Z bis A",
|
|
244
|
+
"sorting.type.numerical.asc": "Aufsteigende Größe",
|
|
245
|
+
"sorting.type.numerical.desc": "Absteigende Größe",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "Summe aller Messwerte",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "Summe aller Metriken"
|
|
241
248
|
}
|
|
@@ -1276,7 +1276,12 @@
|
|
|
1276
1276
|
},
|
|
1277
1277
|
"sorting.type.numerical.desc": {
|
|
1278
1278
|
"value": "Largest to smallest",
|
|
1279
|
-
"comment": "Title of sort option when is sorted
|
|
1279
|
+
"comment": "Title of sort option when is sorted numerically and in descending order.",
|
|
1280
|
+
"limit": 0
|
|
1281
|
+
},
|
|
1282
|
+
"sorting.by": {
|
|
1283
|
+
"value": "by",
|
|
1284
|
+
"comment": "Text that will appear before the measures from which attribute will be sorted.",
|
|
1280
1285
|
"limit": 0
|
|
1281
1286
|
},
|
|
1282
1287
|
"sorting.sum.of.all.measure._measure": {
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "Todos los usuarios",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "Usuario inactivo",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "Se eliminó al usuario de este espacio de trabajo",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "Eliminar de la selección."
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "Eliminar de la selección.",
|
|
241
|
+
"sorting.dropdown.header": "Ordenar perspectiva",
|
|
242
|
+
"sorting.type.alphabetical.asc": "De la A a la Z",
|
|
243
|
+
"sorting.type.alphabetical.desc": "De la Z a la A",
|
|
244
|
+
"sorting.type.numerical.asc": "De menor a mayor",
|
|
245
|
+
"sorting.type.numerical.desc": "De mayor a menor",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "Suma de todas las medidas (total)",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "Suma de todas las métricas (total)"
|
|
241
248
|
}
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "Tous les utilisateurs",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "Utilisateur inactif",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "L'utilisateur a été supprimé de cet espace de travail",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "Retirer de la sélection."
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "Retirer de la sélection.",
|
|
241
|
+
"sorting.dropdown.header": "Trier la perception",
|
|
242
|
+
"sorting.type.alphabetical.asc": "A à Z",
|
|
243
|
+
"sorting.type.alphabetical.desc": "Z à A",
|
|
244
|
+
"sorting.type.numerical.asc": "Du plus petit au plus grand",
|
|
245
|
+
"sorting.type.numerical.desc": "Du plus grand au plus petit",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "Somme de toutes les mesures (total)",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "Somme de toutes les métriques (total)"
|
|
241
248
|
}
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "すべてのユーザー",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "非アクティブなユーザー",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "ユーザーはこのワークスペースから削除されています",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "この選択範囲から削除。"
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "この選択範囲から削除。",
|
|
241
|
+
"sorting.dropdown.header": "インサイトの並べ替え",
|
|
242
|
+
"sorting.type.alphabetical.asc": "A から Z",
|
|
243
|
+
"sorting.type.alphabetical.desc": "Z から A",
|
|
244
|
+
"sorting.type.numerical.asc": "最小から最大の順",
|
|
245
|
+
"sorting.type.numerical.desc": "最大から最小の順",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "すべての測定値の合計（合計）",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "すべてのメトリックの合計（合計）"
|
|
241
248
|
}
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "Alle gebruikers",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "Inactieve gebruiker",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "Gebruiker is verwijderd uit deze werkruimte",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "Verwijderen uit sectie."
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "Verwijderen uit sectie.",
|
|
241
|
+
"sorting.dropdown.header": "Inzicht sorteren",
|
|
242
|
+
"sorting.type.alphabetical.asc": "A tot Z",
|
|
243
|
+
"sorting.type.alphabetical.desc": "Z tot A",
|
|
244
|
+
"sorting.type.numerical.asc": "Kleinst naar grootst",
|
|
245
|
+
"sorting.type.numerical.desc": "Grootst naar kleinst",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "Som van alle maten (totaal)",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "Som van alle meetgegevens (totaal)"
|
|
241
248
|
}
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "Todos os usuários",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "Usuário inativo",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "O usuário foi excluído deste espaço de trabalho",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "Remover da seleção."
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "Remover da seleção.",
|
|
241
|
+
"sorting.dropdown.header": "Classificar insight",
|
|
242
|
+
"sorting.type.alphabetical.asc": "A a Z",
|
|
243
|
+
"sorting.type.alphabetical.desc": "Z a A",
|
|
244
|
+
"sorting.type.numerical.asc": "Do menor para o maior",
|
|
245
|
+
"sorting.type.numerical.desc": "Do maior para o menor",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "Soma de todas as medidas (total)",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "Soma de todas as métricas (total)"
|
|
241
248
|
}
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "Todos os utilizadores",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "Utilizador inativo",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "O utilizador foi eliminado desta área de trabalho",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "Remover da seleção."
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "Remover da seleção.",
|
|
241
|
+
"sorting.dropdown.header": "Ordenar insight",
|
|
242
|
+
"sorting.type.alphabetical.asc": "A a Z",
|
|
243
|
+
"sorting.type.alphabetical.desc": "Z a A",
|
|
244
|
+
"sorting.type.numerical.asc": "Menor para maior",
|
|
245
|
+
"sorting.type.numerical.desc": "Maior para menor",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "Soma de todas as medidas (total)",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "Soma de todas as métricas (total)"
|
|
241
248
|
}
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "Все пользователи",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "Неактивный пользователь",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "Пользователь удален из этой рабочей области",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "Удалить из выбора."
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "Удалить из выбора.",
|
|
241
|
+
"sorting.dropdown.header": "Сортировка анализа",
|
|
242
|
+
"sorting.type.alphabetical.asc": "От А до Я",
|
|
243
|
+
"sorting.type.alphabetical.desc": "От Я до А",
|
|
244
|
+
"sorting.type.numerical.asc": "От меньшего к большему",
|
|
245
|
+
"sorting.type.numerical.desc": "От большего к меньшему",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "Сумма всех показателей (всего)",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "Сумма всех метрик (всего)"
|
|
241
248
|
}
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "全部用户",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "非活跃用户",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "用户已从此工作区中删除",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "从选择中删除。"
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "从选择中删除。",
|
|
241
|
+
"sorting.dropdown.header": "排序洞察",
|
|
242
|
+
"sorting.type.alphabetical.asc": "A 到 Z。",
|
|
243
|
+
"sorting.type.alphabetical.desc": "Z到A",
|
|
244
|
+
"sorting.type.numerical.asc": "从最小到最大",
|
|
245
|
+
"sorting.type.numerical.desc": "从最大到最小",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "所有度量的总和（总计）",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "所有指标的总和（总计）"
|
|
241
248
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createExecution.d.ts","sourceRoot":"","sources":["../../src/execution/createExecution.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"createExecution.d.ts","sourceRoot":"","sources":["../../src/execution/createExecution.ts"],"names":[],"mappings":"AACA,OAAO,EACH,UAAU,EACV,mBAAmB,EAEnB,eAAe,EAEf,SAAS,EACT,MAAM,EAIT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAInF;;GAEG;AACH,oBAAY,sBAAsB,GAAG;IACjC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAE7B;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,QAAQ,EAAE,mBAAmB,EAAE,CAAC;IAEhC;;OAEG;IACH,QAAQ,CAAC,EAAE,UAAU,EAAE,CAAC;IAExB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAE5B;;OAEG;IACH,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;IAErB;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AA2BF;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,kBAAkB,CA2BnF"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createExecution = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
|
-
// (C) 2019-
|
|
5
|
+
// (C) 2019-2022 GoodData Corporation
|
|
6
6
|
var sdk_model_1 = require("@gooddata/sdk-model");
|
|
7
7
|
var isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
|
|
8
8
|
var ts_invariant_1 = tslib_1.__importDefault(require("ts-invariant"));
|
|
@@ -10,7 +10,7 @@ var ts_invariant_1 = tslib_1.__importDefault(require("ts-invariant"));
|
|
|
10
10
|
* When caller desires just data series and no slicing, create a single-dim result.
|
|
11
11
|
*/
|
|
12
12
|
function seriesOnlyDim(seriesBy) {
|
|
13
|
-
return [sdk_model_1.newDimension(seriesBy.filter(sdk_model_1.isAttribute)
|
|
13
|
+
return [sdk_model_1.newDimension(tslib_1.__spread(seriesBy.filter(sdk_model_1.isAttribute), [sdk_model_1.MeasureGroupIdentifier]))];
|
|
14
14
|
}
|
|
15
15
|
/**
|
|
16
16
|
* When caller desires data series to be sliced further by some attributes (and perhaps with totals as well)
|
|
@@ -20,9 +20,7 @@ function seriesOnlyDim(seriesBy) {
|
|
|
20
20
|
* - measures & scoping attributes will be in columns (second dim)
|
|
21
21
|
*/
|
|
22
22
|
function seriesAndSlicesDim(seriesBy, slices, totals) {
|
|
23
|
-
|
|
24
|
-
firstDimItems.push.apply(firstDimItems, tslib_1.__spread(totals));
|
|
25
|
-
return sdk_model_1.newTwoDimensional(firstDimItems, seriesBy.filter(sdk_model_1.isAttribute).map(sdk_model_1.attributeLocalId).concat(sdk_model_1.MeasureGroupIdentifier));
|
|
23
|
+
return sdk_model_1.newTwoDimensional(tslib_1.__spread(slices, totals), tslib_1.__spread(seriesBy.filter(sdk_model_1.isAttribute), [sdk_model_1.MeasureGroupIdentifier]));
|
|
26
24
|
}
|
|
27
25
|
/**
|
|
28
26
|
* Given execute props, this will prepare execution to send to backend.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createExecution.js","sourceRoot":"","sources":["../../src/execution/createExecution.ts"],"names":[],"mappings":";;;;AAAA,qCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"createExecution.js","sourceRoot":"","sources":["../../src/execution/createExecution.ts"],"names":[],"mappings":";;;;AAAA,qCAAqC;AACrC,iDAW6B;AAE7B,mEAAqC;AACrC,sEAAqC;AA0DrC;;GAEG;AACH,SAAS,aAAa,CAAC,QAA+B;IAClD,OAAO,CAAC,wBAAY,kBAAK,QAAQ,CAAC,MAAM,CAAC,uBAAW,CAAC,GAAE,kCAAsB,GAAE,CAAC,CAAC;AACrF,CAAC;AAED;;;;;;GAMG;AACH,SAAS,kBAAkB,CACvB,QAA+B,EAC/B,MAAoB,EACpB,MAAgB;IAEhB,OAAO,6BAAiB,kBAChB,MAAM,EAAK,MAAM,oBACjB,QAAQ,CAAC,MAAM,CAAC,uBAAW,CAAC,GAAE,kCAAsB,GAC3D,CAAC;AACN,CAAC;AAED;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,OAA+B;;IAEvD,IAAA,OAAO,GAQP,OAAO,QARA,EACP,SAAS,GAOT,OAAO,UAPE,EACT,QAAQ,GAMR,OAAO,SANC,EACR,KAKA,OAAO,SALM,EAAb,QAAQ,mBAAG,EAAE,KAAA,EACb,KAIA,OAAO,QAJK,EAAZ,OAAO,mBAAG,EAAE,KAAA,EACZ,KAGA,OAAO,OAHI,EAAX,MAAM,mBAAG,EAAE,KAAA,EACX,KAEA,OAAO,OAFI,EAAX,MAAM,mBAAG,EAAE,KAAA,EACX,KACA,OAAO,cADoB,EAA3B,aAAa,mBAAG,WAAW,KAAA,CACnB;IACZ,sBAAS,CACL,OAAO,IAAI,SAAS,EACpB,qFAAqF,CACxF,CAAC;IAEF,IAAM,UAAU,GAAG,iBAAO,CAAC,QAAQ,CAAC;QAChC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC;QACzB,CAAC,CAAC,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAErD,OAAO,CAAA,KAAA,CAAA,KAAA,OAAO;SACT,aAAa,CAAC,aAAa,EAAE,OAAO,CAAC;SACrC,SAAS,CAAC,SAAS,CAAC;SACpB,SAAS,EAAE;SACX,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAA;SAC5C,WAAW,4BAAI,MAAM,EAAC,CAAA;SACtB,cAAc,4BAAI,UAAU,GAAE;AACvC,CAAC;AA3BD,0CA2BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HeaderPredicateFactory.d.ts","sourceRoot":"","sources":["../../../src/base/headerMatching/HeaderPredicateFactory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAA2B,MAAM,mBAAmB,CAAC;AAS9E,OAAO,
|
|
1
|
+
{"version":3,"file":"HeaderPredicateFactory.d.ts","sourceRoot":"","sources":["../../../src/base/headerMatching/HeaderPredicateFactory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAA2B,MAAM,mBAAmB,CAAC;AAS9E,OAAO,EAIH,QAAQ,EAYR,MAAM,EACT,MAAM,qBAAqB,CAAC;AAsL7B;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CA2BtD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB,CA+BpE;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAUrE;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,GAAG,QAAQ,GAAG,gBAAgB,CAgB1F;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAI5D;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,gBAAgB,CAsBnD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAM7D;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB,CAM3E;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;CAS5B,CAAC"}
|
|
@@ -6,6 +6,10 @@ import { attributeDisplayFormRef, attributeLocalId, isArithmeticMeasure, isAttri
|
|
|
6
6
|
* compatibility with the previous more lenient behavior.
|
|
7
7
|
*/
|
|
8
8
|
var alwaysFalsePredicate = function () { return false; };
|
|
9
|
+
function toCompositeId(originalId, currentWorkspace) {
|
|
10
|
+
var alreadyComposite = originalId.includes(":");
|
|
11
|
+
return alreadyComposite ? originalId : currentWorkspace + ":" + originalId;
|
|
12
|
+
}
|
|
9
13
|
function arithmeticMeasureLocalIdentifierDeepMatch(dv, operandLocalIdentifier, predicate, context) {
|
|
10
14
|
var operand = dv.def().measure(operandLocalIdentifier);
|
|
11
15
|
var operandDescriptor = dv.meta().measureDescriptor(operandLocalIdentifier);
|
|
@@ -57,17 +61,32 @@ function matchHeaderUri(uri, header) {
|
|
|
57
61
|
var headerUri = getMappingHeaderUri(header);
|
|
58
62
|
return headerUri ? headerUri === uri : false;
|
|
59
63
|
}
|
|
60
|
-
function
|
|
64
|
+
function matchHeaderIdentifierWithCompositeSupport(identifier, header, currentWorkspace) {
|
|
61
65
|
var headerIdentifier = getMappingHeaderIdentifier(header);
|
|
62
|
-
|
|
66
|
+
if (!headerIdentifier) {
|
|
67
|
+
return false;
|
|
68
|
+
}
|
|
69
|
+
if (headerIdentifier === identifier) {
|
|
70
|
+
return true;
|
|
71
|
+
}
|
|
72
|
+
// also try converting both to composite ids and compare those
|
|
73
|
+
return toCompositeId(headerIdentifier, currentWorkspace) === toCompositeId(identifier, currentWorkspace);
|
|
63
74
|
}
|
|
64
75
|
function matchUri(uri, measure) {
|
|
65
76
|
var simpleMeasureUri = measureUri(measure);
|
|
66
77
|
return simpleMeasureUri ? simpleMeasureUri === uri : false;
|
|
67
78
|
}
|
|
68
|
-
function
|
|
79
|
+
function matchMeasureIdentifierWithCompositeSupport(identifier, measure, currentWorkspace) {
|
|
69
80
|
var simpleMeasureIdentifier = measureIdentifier(measure);
|
|
70
|
-
|
|
81
|
+
if (!simpleMeasureIdentifier) {
|
|
82
|
+
return false;
|
|
83
|
+
}
|
|
84
|
+
if (simpleMeasureIdentifier === identifier) {
|
|
85
|
+
return true;
|
|
86
|
+
}
|
|
87
|
+
// also try converting both to composite ids and compare those
|
|
88
|
+
return (toCompositeId(simpleMeasureIdentifier, currentWorkspace) ===
|
|
89
|
+
toCompositeId(identifier, currentWorkspace));
|
|
71
90
|
}
|
|
72
91
|
function matchDerivedMeasureByMasterUri(uri, measure, context) {
|
|
73
92
|
var dv = context.dv;
|
|
@@ -89,11 +108,11 @@ function matchDerivedMeasureByMasterIdentifier(identifier, measure, context) {
|
|
|
89
108
|
return false;
|
|
90
109
|
}
|
|
91
110
|
var masterMeasureHeader = dv.meta().measureDescriptor(masterMeasureLocalIdentifier);
|
|
92
|
-
if (
|
|
111
|
+
if (matchHeaderIdentifierWithCompositeSupport(identifier, masterMeasureHeader, dv.definition.workspace)) {
|
|
93
112
|
return true;
|
|
94
113
|
}
|
|
95
114
|
var masterMeasure = dv.def().measure(masterMeasureLocalIdentifier);
|
|
96
|
-
return
|
|
115
|
+
return matchMeasureIdentifierWithCompositeSupport(identifier, masterMeasure, dv.definition.workspace);
|
|
97
116
|
}
|
|
98
117
|
/**
|
|
99
118
|
* Creates a new predicate that returns true for any header that belongs to either attribute or measure with the
|
|
@@ -138,7 +157,7 @@ export function identifierMatch(identifier) {
|
|
|
138
157
|
if (isResultAttributeHeader(header)) {
|
|
139
158
|
return false;
|
|
140
159
|
}
|
|
141
|
-
if (
|
|
160
|
+
if (matchHeaderIdentifierWithCompositeSupport(identifier, header, dv.definition.workspace)) {
|
|
142
161
|
return true;
|
|
143
162
|
}
|
|
144
163
|
if (!isMeasureDescriptor(header)) {
|
|
@@ -148,7 +167,7 @@ export function identifierMatch(identifier) {
|
|
|
148
167
|
if (!measure) {
|
|
149
168
|
return false;
|
|
150
169
|
}
|
|
151
|
-
if (
|
|
170
|
+
if (matchMeasureIdentifierWithCompositeSupport(identifier, measure, dv.definition.workspace)) {
|
|
152
171
|
return true;
|
|
153
172
|
}
|
|
154
173
|
return matchDerivedMeasureByMasterIdentifier(identifier, measure, context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HeaderPredicateFactory.js","sourceRoot":"","sources":["../../../src/base/headerMatching/HeaderPredicateFactory.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,0BAA0B,EAC1B,+BAA+B,EAC/B,mBAAmB,EACnB,+BAA+B,GAElC,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAsB,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAC7G,OAAO,EACH,uBAAuB,EACvB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"HeaderPredicateFactory.js","sourceRoot":"","sources":["../../../src/base/headerMatching/HeaderPredicateFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "Alle Benutzer",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "Inaktiver Benutzer",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "Der Benutzer wurde von diesem Workspace gelöscht.",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "Von Auswahl entfernen."
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "Von Auswahl entfernen.",
|
|
241
|
+
"sorting.dropdown.header": "Betrachtung sortieren",
|
|
242
|
+
"sorting.type.alphabetical.asc": "A bis Z",
|
|
243
|
+
"sorting.type.alphabetical.desc": "Z bis A",
|
|
244
|
+
"sorting.type.numerical.asc": "Aufsteigende Größe",
|
|
245
|
+
"sorting.type.numerical.desc": "Absteigende Größe",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "Summe aller Messwerte",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "Summe aller Metriken"
|
|
241
248
|
}
|
|
@@ -1276,7 +1276,12 @@
|
|
|
1276
1276
|
},
|
|
1277
1277
|
"sorting.type.numerical.desc": {
|
|
1278
1278
|
"value": "Largest to smallest",
|
|
1279
|
-
"comment": "Title of sort option when is sorted
|
|
1279
|
+
"comment": "Title of sort option when is sorted numerically and in descending order.",
|
|
1280
|
+
"limit": 0
|
|
1281
|
+
},
|
|
1282
|
+
"sorting.by": {
|
|
1283
|
+
"value": "by",
|
|
1284
|
+
"comment": "Text that will appear before the measures from which attribute will be sorted.",
|
|
1280
1285
|
"limit": 0
|
|
1281
1286
|
},
|
|
1282
1287
|
"sorting.sum.of.all.measure._measure": {
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "Todos los usuarios",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "Usuario inactivo",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "Se eliminó al usuario de este espacio de trabajo",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "Eliminar de la selección."
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "Eliminar de la selección.",
|
|
241
|
+
"sorting.dropdown.header": "Ordenar perspectiva",
|
|
242
|
+
"sorting.type.alphabetical.asc": "De la A a la Z",
|
|
243
|
+
"sorting.type.alphabetical.desc": "De la Z a la A",
|
|
244
|
+
"sorting.type.numerical.asc": "De menor a mayor",
|
|
245
|
+
"sorting.type.numerical.desc": "De mayor a menor",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "Suma de todas las medidas (total)",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "Suma de todas las métricas (total)"
|
|
241
248
|
}
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "Tous les utilisateurs",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "Utilisateur inactif",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "L'utilisateur a été supprimé de cet espace de travail",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "Retirer de la sélection."
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "Retirer de la sélection.",
|
|
241
|
+
"sorting.dropdown.header": "Trier la perception",
|
|
242
|
+
"sorting.type.alphabetical.asc": "A à Z",
|
|
243
|
+
"sorting.type.alphabetical.desc": "Z à A",
|
|
244
|
+
"sorting.type.numerical.asc": "Du plus petit au plus grand",
|
|
245
|
+
"sorting.type.numerical.desc": "Du plus grand au plus petit",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "Somme de toutes les mesures (total)",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "Somme de toutes les métriques (total)"
|
|
241
248
|
}
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "すべてのユーザー",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "非アクティブなユーザー",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "ユーザーはこのワークスペースから削除されています",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "この選択範囲から削除。"
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "この選択範囲から削除。",
|
|
241
|
+
"sorting.dropdown.header": "インサイトの並べ替え",
|
|
242
|
+
"sorting.type.alphabetical.asc": "A から Z",
|
|
243
|
+
"sorting.type.alphabetical.desc": "Z から A",
|
|
244
|
+
"sorting.type.numerical.asc": "最小から最大の順",
|
|
245
|
+
"sorting.type.numerical.desc": "最大から最小の順",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "すべての測定値の合計（合計）",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "すべてのメトリックの合計（合計）"
|
|
241
248
|
}
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "Alle gebruikers",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "Inactieve gebruiker",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "Gebruiker is verwijderd uit deze werkruimte",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "Verwijderen uit sectie."
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "Verwijderen uit sectie.",
|
|
241
|
+
"sorting.dropdown.header": "Inzicht sorteren",
|
|
242
|
+
"sorting.type.alphabetical.asc": "A tot Z",
|
|
243
|
+
"sorting.type.alphabetical.desc": "Z tot A",
|
|
244
|
+
"sorting.type.numerical.asc": "Kleinst naar grootst",
|
|
245
|
+
"sorting.type.numerical.desc": "Grootst naar kleinst",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "Som van alle maten (totaal)",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "Som van alle meetgegevens (totaal)"
|
|
241
248
|
}
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "Todos os usuários",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "Usuário inativo",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "O usuário foi excluído deste espaço de trabalho",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "Remover da seleção."
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "Remover da seleção.",
|
|
241
|
+
"sorting.dropdown.header": "Classificar insight",
|
|
242
|
+
"sorting.type.alphabetical.asc": "A a Z",
|
|
243
|
+
"sorting.type.alphabetical.desc": "Z a A",
|
|
244
|
+
"sorting.type.numerical.asc": "Do menor para o maior",
|
|
245
|
+
"sorting.type.numerical.desc": "Do maior para o menor",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "Soma de todas as medidas (total)",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "Soma de todas as métricas (total)"
|
|
241
248
|
}
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "Todos os utilizadores",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "Utilizador inativo",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "O utilizador foi eliminado desta área de trabalho",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "Remover da seleção."
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "Remover da seleção.",
|
|
241
|
+
"sorting.dropdown.header": "Ordenar insight",
|
|
242
|
+
"sorting.type.alphabetical.asc": "A a Z",
|
|
243
|
+
"sorting.type.alphabetical.desc": "Z a A",
|
|
244
|
+
"sorting.type.numerical.asc": "Menor para maior",
|
|
245
|
+
"sorting.type.numerical.desc": "Maior para menor",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "Soma de todas as medidas (total)",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "Soma de todas as métricas (total)"
|
|
241
248
|
}
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "Все пользователи",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "Неактивный пользователь",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "Пользователь удален из этой рабочей области",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "Удалить из выбора."
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "Удалить из выбора.",
|
|
241
|
+
"sorting.dropdown.header": "Сортировка анализа",
|
|
242
|
+
"sorting.type.alphabetical.asc": "От А до Я",
|
|
243
|
+
"sorting.type.alphabetical.desc": "От Я до А",
|
|
244
|
+
"sorting.type.numerical.asc": "От меньшего к большему",
|
|
245
|
+
"sorting.type.numerical.desc": "От большего к меньшему",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "Сумма всех показателей (всего)",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "Сумма всех метрик (всего)"
|
|
241
248
|
}
|
|
@@ -237,5 +237,12 @@
|
|
|
237
237
|
"shareDialog.share.grantee.item.user.all": "全部用户",
|
|
238
238
|
"shareDialog.share.grantee.item.user.inactive": "非活跃用户",
|
|
239
239
|
"shareDialog.share.grantee.item.user.inactive.description": "用户已从此工作区中删除",
|
|
240
|
-
"shareDialog.share.grantee.item.remove.selection": "从选择中删除。"
|
|
240
|
+
"shareDialog.share.grantee.item.remove.selection": "从选择中删除。",
|
|
241
|
+
"sorting.dropdown.header": "排序洞察",
|
|
242
|
+
"sorting.type.alphabetical.asc": "A 到 Z。",
|
|
243
|
+
"sorting.type.alphabetical.desc": "Z到A",
|
|
244
|
+
"sorting.type.numerical.asc": "从最小到最大",
|
|
245
|
+
"sorting.type.numerical.desc": "从最大到最小",
|
|
246
|
+
"sorting.sum.of.all.measure._measure": "所有度量的总和（总计）",
|
|
247
|
+
"sorting.sum.of.all.measure._metric": "所有指标的总和（总计）"
|
|
241
248
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createExecution.d.ts","sourceRoot":"","sources":["../../src/execution/createExecution.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"createExecution.d.ts","sourceRoot":"","sources":["../../src/execution/createExecution.ts"],"names":[],"mappings":"AACA,OAAO,EACH,UAAU,EACV,mBAAmB,EAEnB,eAAe,EAEf,SAAS,EACT,MAAM,EAIT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAInF;;GAEG;AACH,oBAAY,sBAAsB,GAAG;IACjC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAE7B;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,QAAQ,EAAE,mBAAmB,EAAE,CAAC;IAEhC;;OAEG;IACH,QAAQ,CAAC,EAAE,UAAU,EAAE,CAAC;IAExB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAE5B;;OAEG;IACH,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;IAErB;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AA2BF;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,kBAAkB,CA2BnF"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { __read, __spread } from "tslib";
|
|
2
|
-
// (C) 2019-
|
|
3
|
-
import {
|
|
2
|
+
// (C) 2019-2022 GoodData Corporation
|
|
3
|
+
import { isAttribute, MeasureGroupIdentifier, newDimension, newTwoDimensional, } from "@gooddata/sdk-model";
|
|
4
4
|
import isEmpty from "lodash/isEmpty";
|
|
5
5
|
import invariant from "ts-invariant";
|
|
6
6
|
/**
|
|
7
7
|
* When caller desires just data series and no slicing, create a single-dim result.
|
|
8
8
|
*/
|
|
9
9
|
function seriesOnlyDim(seriesBy) {
|
|
10
|
-
return [newDimension(seriesBy.filter(isAttribute)
|
|
10
|
+
return [newDimension(__spread(seriesBy.filter(isAttribute), [MeasureGroupIdentifier]))];
|
|
11
11
|
}
|
|
12
12
|
/**
|
|
13
13
|
* When caller desires data series to be sliced further by some attributes (and perhaps with totals as well)
|
|
@@ -17,9 +17,7 @@ function seriesOnlyDim(seriesBy) {
|
|
|
17
17
|
* - measures & scoping attributes will be in columns (second dim)
|
|
18
18
|
*/
|
|
19
19
|
function seriesAndSlicesDim(seriesBy, slices, totals) {
|
|
20
|
-
|
|
21
|
-
firstDimItems.push.apply(firstDimItems, __spread(totals));
|
|
22
|
-
return newTwoDimensional(firstDimItems, seriesBy.filter(isAttribute).map(attributeLocalId).concat(MeasureGroupIdentifier));
|
|
20
|
+
return newTwoDimensional(__spread(slices, totals), __spread(seriesBy.filter(isAttribute), [MeasureGroupIdentifier]));
|
|
23
21
|
}
|
|
24
22
|
/**
|
|
25
23
|
* Given execute props, this will prepare execution to send to backend.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createExecution.js","sourceRoot":"","sources":["../../src/execution/createExecution.ts"],"names":[],"mappings":";AAAA,qCAAqC;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"createExecution.js","sourceRoot":"","sources":["../../src/execution/createExecution.ts"],"names":[],"mappings":";AAAA,qCAAqC;AACrC,OAAO,EAKH,WAAW,EAGX,sBAAsB,EACtB,YAAY,EACZ,iBAAiB,GACpB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,SAAS,MAAM,cAAc,CAAC;AA0DrC;;GAEG;AACH,SAAS,aAAa,CAAC,QAA+B;IAClD,OAAO,CAAC,YAAY,UAAK,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,GAAE,sBAAsB,GAAE,CAAC,CAAC;AACrF,CAAC;AAED;;;;;;GAMG;AACH,SAAS,kBAAkB,CACvB,QAA+B,EAC/B,MAAoB,EACpB,MAAgB;IAEhB,OAAO,iBAAiB,UAChB,MAAM,EAAK,MAAM,YACjB,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,GAAE,sBAAsB,GAC3D,CAAC;AACN,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,OAA+B;;IAEvD,IAAA,OAAO,GAQP,OAAO,QARA,EACP,SAAS,GAOT,OAAO,UAPE,EACT,QAAQ,GAMR,OAAO,SANC,EACR,KAKA,OAAO,SALM,EAAb,QAAQ,mBAAG,EAAE,KAAA,EACb,KAIA,OAAO,QAJK,EAAZ,OAAO,mBAAG,EAAE,KAAA,EACZ,KAGA,OAAO,OAHI,EAAX,MAAM,mBAAG,EAAE,KAAA,EACX,KAEA,OAAO,OAFI,EAAX,MAAM,mBAAG,EAAE,KAAA,EACX,KACA,OAAO,cADoB,EAA3B,aAAa,mBAAG,WAAW,KAAA,CACnB;IACZ,SAAS,CACL,OAAO,IAAI,SAAS,EACpB,qFAAqF,CACxF,CAAC;IAEF,IAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC;QAChC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC;QACzB,CAAC,CAAC,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAErD,OAAO,CAAA,KAAA,CAAA,KAAA,OAAO;SACT,aAAa,CAAC,aAAa,EAAE,OAAO,CAAC;SACrC,SAAS,CAAC,SAAS,CAAC;SACpB,SAAS,EAAE;SACX,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAA;SAC5C,WAAW,oBAAI,MAAM,EAAC,CAAA;SACtB,cAAc,oBAAI,UAAU,GAAE;AACvC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gooddata/sdk-ui",
|
|
3
|
-
"version": "8.10.0-alpha.
|
|
3
|
+
"version": "8.10.0-alpha.7",
|
|
4
4
|
"description": "GoodData.UI SDK - Core",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -37,9 +37,9 @@
|
|
|
37
37
|
"dependencies": {
|
|
38
38
|
"@formatjs/intl-pluralrules": "~1.3.7",
|
|
39
39
|
"@gooddata/numberjs": "^4.0.1",
|
|
40
|
-
"@gooddata/sdk-backend-spi": "^8.10.0-alpha.
|
|
41
|
-
"@gooddata/sdk-model": "^8.10.0-alpha.
|
|
42
|
-
"@gooddata/util": "^8.10.0-alpha.
|
|
40
|
+
"@gooddata/sdk-backend-spi": "^8.10.0-alpha.7",
|
|
41
|
+
"@gooddata/sdk-model": "^8.10.0-alpha.7",
|
|
42
|
+
"@gooddata/util": "^8.10.0-alpha.7",
|
|
43
43
|
"custom-event": "^1.0.1",
|
|
44
44
|
"hoist-non-react-statics": "^3.3.0",
|
|
45
45
|
"http-status-codes": "^2.1.4",
|
|
@@ -57,9 +57,9 @@
|
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
59
|
"@gooddata/eslint-config": "^2.1.0",
|
|
60
|
-
"@gooddata/reference-workspace": "^8.10.0-alpha.
|
|
61
|
-
"@gooddata/sdk-backend-base": "^8.10.0-alpha.
|
|
62
|
-
"@gooddata/sdk-backend-mockingbird": "^8.10.0-alpha.
|
|
60
|
+
"@gooddata/reference-workspace": "^8.10.0-alpha.7",
|
|
61
|
+
"@gooddata/sdk-backend-base": "^8.10.0-alpha.7",
|
|
62
|
+
"@gooddata/sdk-backend-mockingbird": "^8.10.0-alpha.7",
|
|
63
63
|
"@gooddata/stylelint-config": "^5.0.0",
|
|
64
64
|
"@microsoft/api-documenter": "^7.12.13",
|
|
65
65
|
"@microsoft/api-extractor": "^7.18.4",
|