@gooddata/sdk-ui-dashboard 10.8.0-alpha.0 → 10.8.0-alpha.10
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/NOTICE +3 -3
- package/esm/__version.d.ts +1 -1
- package/esm/__version.d.ts.map +1 -1
- package/esm/__version.js +1 -1
- package/esm/__version.js.map +1 -1
- package/esm/_staging/drills/drillingUtils.d.ts +1 -1
- package/esm/_staging/drills/drillingUtils.d.ts.map +1 -1
- package/esm/_staging/drills/drillingUtils.js +1 -1
- package/esm/_staging/drills/drillingUtils.js.map +1 -1
- package/esm/converters/filterConverters.d.ts.map +1 -1
- package/esm/converters/filterConverters.js +2 -2
- package/esm/converters/filterConverters.js.map +1 -1
- package/esm/model/commandHandlers/common/validateDrillToCustomUrlParams.d.ts.map +1 -1
- package/esm/model/commandHandlers/common/validateDrillToCustomUrlParams.js +6 -1
- package/esm/model/commandHandlers/common/validateDrillToCustomUrlParams.js.map +1 -1
- package/esm/model/commandHandlers/drill/crossFilteringHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/drill/crossFilteringHandler.js +2 -3
- package/esm/model/commandHandlers/drill/crossFilteringHandler.js.map +1 -1
- package/esm/model/commandHandlers/drill/getElementTitle.d.ts +9 -0
- package/esm/model/commandHandlers/drill/getElementTitle.d.ts.map +1 -1
- package/esm/model/commandHandlers/drill/getElementTitle.js +24 -0
- package/esm/model/commandHandlers/drill/getElementTitle.js.map +1 -1
- package/esm/model/commandHandlers/drill/resolveDrillToCustomUrl.d.ts +3 -2
- package/esm/model/commandHandlers/drill/resolveDrillToCustomUrl.d.ts.map +1 -1
- package/esm/model/commandHandlers/drill/resolveDrillToCustomUrl.js +48 -23
- package/esm/model/commandHandlers/drill/resolveDrillToCustomUrl.js.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.d.ts.map +1 -1
- package/esm/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.js +6 -2
- package/esm/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.js.map +1 -1
- package/esm/model/eventHandlers/drillToSameDashboardHandlerFactory.d.ts.map +1 -1
- package/esm/model/eventHandlers/drillToSameDashboardHandlerFactory.js +6 -3
- package/esm/model/eventHandlers/drillToSameDashboardHandlerFactory.js.map +1 -1
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditor.d.ts.map +1 -1
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditor.js +21 -15
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditor.js.map +1 -1
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditorParameters.d.ts.map +1 -1
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditorParameters.js +3 -3
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditorParameters.js.map +1 -1
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditorParametersSections/DashboardParametersSection.d.ts +2 -1
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditorParametersSections/DashboardParametersSection.d.ts.map +1 -1
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditorParametersSections/DashboardParametersSection.js +16 -6
- package/esm/presentation/drill/DrillConfigPanel/DrillToUrl/CustomUrlEditorParametersSections/DashboardParametersSection.js.map +1 -1
- package/esm/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.js +1 -1
- package/esm/presentation/filterBar/filterBar/useFiltersWithAddedPlaceholder.js.map +1 -1
- package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/DefaultScheduledEmailDialog.d.ts.map +1 -1
- package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/DefaultScheduledEmailDialog.js +7 -13
- package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/DefaultScheduledEmailDialog.js.map +1 -1
- package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/components/Attachments/AttachmentItems.d.ts +3 -3
- package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/components/Attachments/AttachmentItems.d.ts.map +1 -1
- package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/components/Attachments/Attachments.d.ts +3 -3
- package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/components/Attachments/Attachments.d.ts.map +1 -1
- package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useEditScheduledEmail.d.ts +4 -4
- package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useEditScheduledEmail.d.ts.map +1 -1
- package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useEditScheduledEmail.js +9 -5
- package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/hooks/useEditScheduledEmail.js.map +1 -1
- package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/utils/automationHelpers.js +7 -7
- package/esm/presentation/scheduledEmail/DefaultScheduledEmailDialog/utils/automationHelpers.js.map +1 -1
- package/esm/presentation/widget/insight/configuration/DrillTargets/useInvalidFilteringParametersIdentifiers.d.ts +2 -2
- package/esm/presentation/widget/insight/configuration/DrillTargets/useInvalidFilteringParametersIdentifiers.d.ts.map +1 -1
- package/esm/presentation/widget/insight/configuration/DrillTargets/useInvalidFilteringParametersIdentifiers.js +9 -5
- package/esm/presentation/widget/insight/configuration/DrillTargets/useInvalidFilteringParametersIdentifiers.js.map +1 -1
- package/package.json +15 -15
- package/styles/css/dashboard.css +4 -0
- package/styles/css/dashboard.css.map +1 -1
- package/styles/css/main.css +4 -1
- package/styles/css/main.css.map +1 -1
- package/styles/css/scheduled_mail.css +4 -0
- package/styles/css/scheduled_mail.css.map +1 -1
- package/styles/scss/scheduled_mail.scss +5 -0
package/NOTICE
CHANGED
|
@@ -7,9 +7,9 @@
|
|
|
7
7
|
|
|
8
8
|
The following 3rd-party software packages may be used by or distributed with gooddata-ui-sdk. Any information relevant to third-party vendors listed below are collected using common, reasonable means.
|
|
9
9
|
|
|
10
|
-
Date generated: 2024-7-
|
|
10
|
+
Date generated: 2024-7-30
|
|
11
11
|
|
|
12
|
-
Revision ID:
|
|
12
|
+
Revision ID: feae71fee3c7fe046e807c41e845d282eb3a26a6
|
|
13
13
|
|
|
14
14
|
================================================================================
|
|
15
15
|
================================================================================
|
|
@@ -69112,4 +69112,4 @@ POSSIBILITY OF SUCH DAMAGE.
|
|
|
69112
69112
|
--------------------------------------------------------------------------------
|
|
69113
69113
|
--------------------------------------------------------------------------------
|
|
69114
69114
|
|
|
69115
|
-
Report Generated by FOSSA on 2024-7-
|
|
69115
|
+
Report Generated by FOSSA on 2024-7-30
|
package/esm/__version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const LIB_VERSION = "10.8.0-alpha.
|
|
1
|
+
export declare const LIB_VERSION = "10.8.0-alpha.10";
|
|
2
2
|
//# sourceMappingURL=__version.d.ts.map
|
package/esm/__version.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"__version.d.ts","sourceRoot":"","sources":["../src/__version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"__version.d.ts","sourceRoot":"","sources":["../src/__version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,oBAAoB,CAAC"}
|
package/esm/__version.js
CHANGED
package/esm/__version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"__version.js","sourceRoot":"","sources":["../src/__version.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,6DAA6D;AAC7D,MAAM,CAAC,MAAM,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"__version.js","sourceRoot":"","sources":["../src/__version.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,6DAA6D;AAC7D,MAAM,CAAC,MAAM,WAAW,GAAG,iBAAiB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ObjRefInScope, DrillDefinition, InsightDrillDefinition, ICatalogAttribute, ICatalogDateAttribute, IAttributeDescriptor } from "@gooddata/sdk-model";
|
|
2
2
|
import { IAvailableDrillTargetAttribute, IHeaderPredicate, IDrillEvent, IAvailableDrillTargets } from "@gooddata/sdk-ui";
|
|
3
3
|
import { DashboardDrillDefinition, IDrillDownDefinition, IGlobalDrillDownAttributeHierarchyDefinition } from "../../types.js";
|
|
4
|
-
export { getAttributeIdentifiersPlaceholdersFromUrl, getDashboardAttributeFilterPlaceholdersFromUrl, getInsightAttributeFilterPlaceholdersFromUrl, } from "@gooddata/sdk-model/internal";
|
|
4
|
+
export { getAttributeIdentifiersPlaceholdersFromUrl, getDashboardAttributeFilterPlaceholdersFromUrl, getInsightAttributeFilterPlaceholdersFromUrl, IDrillToUrlPlaceholder, } from "@gooddata/sdk-model/internal";
|
|
5
5
|
interface IImplicitDrillWithPredicates {
|
|
6
6
|
drillDefinition: DrillDefinition | IDrillDownDefinition;
|
|
7
7
|
predicates: IHeaderPredicate[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drillingUtils.d.ts","sourceRoot":"","sources":["../../../src/_staging/drills/drillingUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAKH,aAAa,EAEb,eAAe,EACf,sBAAsB,EAItB,iBAAiB,EACjB,qBAAqB,EAErB,oBAAoB,EAEvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEH,8BAA8B,EAC9B,gBAAgB,EAEhB,WAAW,EACX,sBAAsB,EACzB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACH,wBAAwB,EACxB,oBAAoB,EACpB,4CAA4C,EAC/C,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EACH,0CAA0C,EAC1C,8CAA8C,EAC9C,4CAA4C,
|
|
1
|
+
{"version":3,"file":"drillingUtils.d.ts","sourceRoot":"","sources":["../../../src/_staging/drills/drillingUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAKH,aAAa,EAEb,eAAe,EACf,sBAAsB,EAItB,iBAAiB,EACjB,qBAAqB,EAErB,oBAAoB,EAEvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEH,8BAA8B,EAC9B,gBAAgB,EAEhB,WAAW,EACX,sBAAsB,EACzB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACH,wBAAwB,EACxB,oBAAoB,EACpB,4CAA4C,EAC/C,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EACH,0CAA0C,EAC1C,8CAA8C,EAC9C,4CAA4C,EAC5C,sBAAsB,GACzB,MAAM,8BAA8B,CAAC;AAEtC,UAAU,4BAA4B;IAClC,eAAe,EAAE,eAAe,GAAG,oBAAoB,CAAC;IACxD,UAAU,EAAE,gBAAgB,EAAE,CAAC;CAClC;AAyDD;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC3C,mBAAmB,EAAE,eAAe,EAAE,EACtC,cAAc,EAAE,8BAA8B,EAAE,EAChD,uBAAuB,EAAE,KAAK,CAAC,iBAAiB,GAAG,qBAAqB,CAAC,EACzE,mBAAmB,CAAC,EAAE,OAAO,GAC9B,4BAA4B,EAAE,CAQhC;AAED,wBAAgB,iCAAiC,CAC7C,qBAAqB,EAAE,KAAK,CAAC,wBAAwB,CAAC,EACtD,2BAA2B,EAAE,MAAM,EAAE,GACtC,KAAK,CAAC,wBAAwB,CAAC,CAOjC;AAED,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,WAAW,GAAG,MAAM,EAAE,CAG9E;AAUD,wBAAgB,sCAAsC,CAAC,UAAU,EAAE,WAAW,GAAG,MAAM,EAAE,CAaxF;AAED,wBAAgB,wBAAwB,CACpC,gBAAgB,EAAE,wBAAwB,EAAE,EAC5C,UAAU,EAAE,WAAW,GACxB,wBAAwB,EAAE,CAM5B;AAED,wBAAgB,6BAA6B,CACzC,eAAe,EACT,sBAAsB,GACtB,oBAAoB,GACpB,4CAA4C,GACnD,MAAM,CAgBR;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAMlE;AAED,wBAAgB,iBAAiB,CAC7B,KAAK,EAAE,wBAAwB,EAC/B,gBAAgB,EAAE,wBAAwB,EAAE,GAC7C,OAAO,CAWT;AAED,wBAAgB,6BAA6B,CACzC,uBAAuB,EAAE,sBAAsB,EAC/C,eAAe,EAAE,MAAM,GACxB,oBAAoB,EAAE,CAgBxB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// (C) 2020-
|
|
1
|
+
// (C) 2020-2024 GoodData Corporation
|
|
2
2
|
import compact from "lodash/compact.js";
|
|
3
3
|
import { UnexpectedError } from "@gooddata/sdk-backend-spi";
|
|
4
4
|
import { isLocalIdRef, isIdentifierRef, isUriRef, areObjRefsEqual, localIdRef, isDrillFromAttribute, isDrillFromMeasure, isDrillToLegacyDashboard, isMeasureDescriptor, isCrossFiltering, } from "@gooddata/sdk-model";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drillingUtils.js","sourceRoot":"","sources":["../../../src/_staging/drills/drillingUtils.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EACH,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,eAAe,EAEf,UAAU,EAGV,oBAAoB,EACpB,kBAAkB,EAClB,wBAAwB,EAGxB,mBAAmB,EAEnB,gBAAgB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACH,gBAAgB,EAGhB,+BAA+B,GAGlC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,MAAM,iBAAiB,CAAC;AACpC,OAAO,IAAI,MAAM,gBAAgB,CAAC;AAMlC,OAAO,OAAO,MAAM,mBAAmB,CAAC;AAExC,OAAO,EACH,0CAA0C,EAC1C,8CAA8C,EAC9C,4CAA4C,
|
|
1
|
+
{"version":3,"file":"drillingUtils.js","sourceRoot":"","sources":["../../../src/_staging/drills/drillingUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterConverters.d.ts","sourceRoot":"","sources":["../../src/converters/filterConverters.ts"],"names":[],"mappings":"AACA,OAAO,EAKH,gBAAgB,EAChB,WAAW,EACX,MAAM,EACN,iBAAiB,EACjB,yBAAyB,EACzB,oBAAoB,EACpB,cAAc,EACd,wBAAwB,EACxB,kBAAkB,EAElB,iBAAiB,EACjB,iBAAiB,EACpB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C;;;;;;GAMG;AACH,wBAAgB,uCAAuC,CACnD,aAAa,EAAE,wBAAwB,GAAG,cAAc,GAAG,kBAAkB,GAAG,SAAS,EACzF,MAAM,EAAE,iBAAiB,GAC1B,gBAAgB,EAAE,CAMpB;AAED;;;;;;;GAOG;AACH,wBAAgB,4CAA4C,CACxD,aAAa,EAAE,wBAAwB,GAAG,cAAc,GAAG,kBAAkB,GAAG,SAAS,EACzF,WAAW,EAAE,MAAM,GACpB,gBAAgB,EAAE,CAMpB;AAED;;;;;GAKG;AACH,wBAAgB,yCAAyC,CACrD,MAAM,EAAE,yBAAyB,GAClC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"filterConverters.d.ts","sourceRoot":"","sources":["../../src/converters/filterConverters.ts"],"names":[],"mappings":"AACA,OAAO,EAKH,gBAAgB,EAChB,WAAW,EACX,MAAM,EACN,iBAAiB,EACjB,yBAAyB,EACzB,oBAAoB,EACpB,cAAc,EACd,wBAAwB,EACxB,kBAAkB,EAElB,iBAAiB,EACjB,iBAAiB,EACpB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C;;;;;;GAMG;AACH,wBAAgB,uCAAuC,CACnD,aAAa,EAAE,wBAAwB,GAAG,cAAc,GAAG,kBAAkB,GAAG,SAAS,EACzF,MAAM,EAAE,iBAAiB,GAC1B,gBAAgB,EAAE,CAMpB;AAED;;;;;;;GAOG;AACH,wBAAgB,4CAA4C,CACxD,aAAa,EAAE,wBAAwB,GAAG,cAAc,GAAG,kBAAkB,GAAG,SAAS,EACzF,WAAW,EAAE,MAAM,GACpB,gBAAgB,EAAE,CAMpB;AAED;;;;;GAKG;AACH,wBAAgB,yCAAyC,CACrD,MAAM,EAAE,yBAAyB,GAClC,gBAAgB,CAclB;AAED;;;;;;GAMG;AACH,wBAAgB,uCAAuC,CACnD,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,OAAO,CAAC,iBAAiB,CAAC,GACnC,WAAW,CAeb;AAED;;;;;;GAMG;AACH,wBAAgB,4CAA4C,CACxD,MAAM,EAAE,oBAAoB,EAC5B,WAAW,EAAE,MAAM,GACpB,WAAW,CAeb;AAED;;;;;;GAMG;AACH,wBAAgB,4CAA4C,CACxD,kBAAkB,EAAE,iBAAiB,EAAE,EACvC,MAAM,EAAE,OAAO,CAAC,iBAAiB,CAAC,GACnC,gBAAgB,EAAE,CAQpB;AAED;;;;;;GAMG;AACH,wBAAgB,iDAAiD,CAC7D,kBAAkB,EAAE,iBAAiB,EAAE,EACvC,WAAW,EAAE,MAAM,GACpB,gBAAgB,EAAE,CAQpB"}
|
|
@@ -36,9 +36,9 @@ export function filterContextToDashboardFiltersByDateDataSet(filterContext, date
|
|
|
36
36
|
*/
|
|
37
37
|
export function dashboardAttributeFilterToAttributeFilter(filter) {
|
|
38
38
|
if (filter.attributeFilter.negativeSelection) {
|
|
39
|
-
return newNegativeAttributeFilter(filter.attributeFilter.displayForm, filter.attributeFilter.attributeElements);
|
|
39
|
+
return newNegativeAttributeFilter(filter.attributeFilter.displayForm, filter.attributeFilter.attributeElements, filter.attributeFilter.localIdentifier);
|
|
40
40
|
}
|
|
41
|
-
return newPositiveAttributeFilter(filter.attributeFilter.displayForm, filter.attributeFilter.attributeElements);
|
|
41
|
+
return newPositiveAttributeFilter(filter.attributeFilter.displayForm, filter.attributeFilter.attributeElements, filter.attributeFilter.localIdentifier);
|
|
42
42
|
}
|
|
43
43
|
/**
|
|
44
44
|
* Converts {@link @gooddata/sdk-backend-spi#IDashboardDateFilter} to {@link @gooddata/sdk-model#IDateFilter} instance.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterConverters.js","sourceRoot":"","sources":["../../src/converters/filterConverters.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,EACH,0BAA0B,EAC1B,0BAA0B,EAC1B,qBAAqB,EACrB,qBAAqB,EAUrB,0BAA0B,GAG7B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAI1C;;;;;;GAMG;AACH,MAAM,UAAU,uCAAuC,CACnD,aAAyF,EACzF,MAAyB;IAEzB,IAAI,CAAC,aAAa,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,OAAO,4CAA4C,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AACvF,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,4CAA4C,CACxD,aAAyF,EACzF,WAAmB;IAEnB,IAAI,CAAC,aAAa,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,OAAO,iDAAiD,CAAC,aAAa,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AACjG,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,yCAAyC,CACrD,MAAiC;IAEjC,IAAI,MAAM,CAAC,eAAe,CAAC,iBAAiB,EAAE,CAAC;QAC3C,OAAO,0BAA0B,CAC7B,MAAM,CAAC,eAAe,CAAC,WAAW,EAClC,MAAM,CAAC,eAAe,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"filterConverters.js","sourceRoot":"","sources":["../../src/converters/filterConverters.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateDrillToCustomUrlParams.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/common/validateDrillToCustomUrlParams.ts"],"names":[],"mappings":"AACA,OAAO,EAGH,iBAAiB,EAEjB,cAAc,EAQjB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"validateDrillToCustomUrlParams.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/common/validateDrillToCustomUrlParams.ts"],"names":[],"mappings":"AACA,OAAO,EAGH,iBAAiB,EAEjB,cAAc,EAQjB,MAAM,qBAAqB,CAAC;AAmB7B,UAAU,kBAAkB;IACxB,MAAM,EAAE,cAAc,CAAC;IACvB,aAAa,EAAE,iBAAiB,EAAE,CAAC;CACtC;AAGD,wBAAiB,8BAA8B,CAAC,OAAO,EAAE,cAAc,EAAE;;;;;;;;;gCAYxE"}
|
|
@@ -10,6 +10,7 @@ import { queryWidgetFilters } from "../../queries/widgets.js";
|
|
|
10
10
|
import { query } from "../../store/_infra/queryCall.js";
|
|
11
11
|
import { dashboardAttributeFilterToAttributeFilter } from "../../../_staging/dashboard/dashboardFilterConverter.js";
|
|
12
12
|
import { selectFilterContextAttributeFilters } from "../../store/filterContext/filterContextSelectors.js";
|
|
13
|
+
import { selectAttributeFilterConfigsOverrides } from "../../store/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
|
|
13
14
|
//
|
|
14
15
|
export function* validateDrillToCustomUrlParams(widgets) {
|
|
15
16
|
const possibleInvalidDrills = yield all(widgets.map((widget) => call(validateWidgetDrillToCustomUrlParams, widget)));
|
|
@@ -38,6 +39,7 @@ function* validateWidgetDrillToCustomUrlParams(widget) {
|
|
|
38
39
|
const dashboardFilters = yield select(selectFilterContextAttributeFilters);
|
|
39
40
|
const dashboardAttributeFilters = dashboardFilters.map(dashboardAttributeFilterToAttributeFilter);
|
|
40
41
|
const sanitizedDashboardAttributeFilters = dashboardAttributeFilters.map((filter) => sanitizeAttributeFilter(filter, displayForms));
|
|
42
|
+
const attributeFilterConfigs = yield select(selectAttributeFilterConfigsOverrides);
|
|
41
43
|
return widget.drills.filter(isDrillToCustomUrl).reduce((acc, drillDefinition) => {
|
|
42
44
|
const ids = extractDisplayFormIdentifiers([drillDefinition]);
|
|
43
45
|
const hasInvalidParam = ids.some((identifier) => {
|
|
@@ -55,7 +57,10 @@ function* validateWidgetDrillToCustomUrlParams(widget) {
|
|
|
55
57
|
// target display form no longer exists, no reason to validate the parameters
|
|
56
58
|
return true;
|
|
57
59
|
}
|
|
58
|
-
return !sanitizedDashboardAttributeFilters.some((filter) => areObjRefsEqual(filterObjRef(filter), identifier))
|
|
60
|
+
return (!sanitizedDashboardAttributeFilters.some((filter) => areObjRefsEqual(filterObjRef(filter), identifier)) &&
|
|
61
|
+
!attributeFilterConfigs.some((config) => {
|
|
62
|
+
return config.displayAsLabel && areObjRefsEqual(config.displayAsLabel, identifier);
|
|
63
|
+
}));
|
|
59
64
|
});
|
|
60
65
|
const insightFilterIds = extractInsightFilterDisplayFormIdentifiers([drillDefinition]);
|
|
61
66
|
const hasInvalidInsightFilterParam = insightFilterIds.some((identifier) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateDrillToCustomUrlParams.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/common/validateDrillToCustomUrlParams.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,EAMH,YAAY,EACZ,KAAK,EACL,iBAAiB,EACjB,kBAAkB,EAClB,yBAAyB,EACzB,SAAS,EACT,eAAe,GAClB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAkB,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,EACH,6BAA6B,EAC7B,4CAA4C,EAC5C,0CAA0C,GAC7C,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAClG,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAC1F,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAC;AACxD,OAAO,EAAE,yCAAyC,EAAE,MAAM,yDAAyD,CAAC;AAEpH,OAAO,EAAE,mCAAmC,EAAE,MAAM,qDAAqD,CAAC;
|
|
1
|
+
{"version":3,"file":"validateDrillToCustomUrlParams.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/common/validateDrillToCustomUrlParams.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crossFilteringHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/crossFilteringHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAA+C,MAAM,qBAAqB,CAAC;AAC7G,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAQ9D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAgBzD,wBAAiB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,cAAc;;;
|
|
1
|
+
{"version":3,"file":"crossFilteringHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/crossFilteringHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAA+C,MAAM,qBAAqB,CAAC;AAC7G,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAQ9D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAgBzD,wBAAiB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,cAAc;;;uVAiJhF"}
|
|
@@ -46,9 +46,8 @@ export function* crossFilteringHandler(ctx, cmd) {
|
|
|
46
46
|
if (enableDuplicatedLabelValuesInAttributeFilter) {
|
|
47
47
|
const vfDisplayAsLabel = attributeFilterDisplayAsLabelMap.get(vf.attributeFilter.localIdentifier);
|
|
48
48
|
// strict checking of both primary and secondary label means that cross filtering is able to create two filters using same primary label but different display as label. It was possible even before.
|
|
49
|
-
return areObjRefsEqual(vf.attributeFilter.displayForm,
|
|
50
|
-
? areObjRefsEqual(vfDisplayAsLabel,
|
|
51
|
-
: true;
|
|
49
|
+
return (areObjRefsEqual(vf.attributeFilter.displayForm, primaryLabel) &&
|
|
50
|
+
(vfDisplayAsLabel ? areObjRefsEqual(vfDisplayAsLabel, displayForm) : true));
|
|
52
51
|
}
|
|
53
52
|
return areObjRefsEqual(vf.attributeFilter.displayForm, displayForm);
|
|
54
53
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crossFilteringHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/crossFilteringHandler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"crossFilteringHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/crossFilteringHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
import { ObjRef } from "@gooddata/sdk-model";
|
|
2
2
|
import { DashboardContext } from "../../types/commonTypes.js";
|
|
3
3
|
export declare function getElementTitle(projectId: string, dfRef: ObjRef, attrElementUriOrPrimaryLabel: string, ctx: DashboardContext): Promise<string | null>;
|
|
4
|
+
/**
|
|
5
|
+
* For set of primary label elements and secondary label ref resolves element titles in this label
|
|
6
|
+
* @param projectId - model's project id to resolve elements in
|
|
7
|
+
* @param secondaryLabelRef - reference to label to resolve elements for
|
|
8
|
+
* @param attrPrimaryLabelValues - element values in primary label of the attribute
|
|
9
|
+
* @param ctx - dashboard context
|
|
10
|
+
* @returns Element values in secondary label for provided primary label values
|
|
11
|
+
*/
|
|
12
|
+
export declare function getElementsSecondaryTitles(projectId: string, secondaryLabelRef: ObjRef, attrPrimaryLabelValues: (string | null)[], ctx: DashboardContext): Promise<Array<string | null>>;
|
|
4
13
|
//# sourceMappingURL=getElementTitle.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getElementTitle.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/getElementTitle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,wBAAsB,eAAe,CACjC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,4BAA4B,EAAE,MAAM,EACpC,GAAG,EAAE,gBAAgB,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAqBxB"}
|
|
1
|
+
{"version":3,"file":"getElementTitle.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/getElementTitle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,wBAAsB,eAAe,CACjC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,4BAA4B,EAAE,MAAM,EACpC,GAAG,EAAE,gBAAgB,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAqBxB;AAED;;;;;;;GAOG;AACH,wBAAsB,0BAA0B,CAC5C,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,EACzB,sBAAsB,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,EACzC,GAAG,EAAE,gBAAgB,GACtB,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAiB/B"}
|
|
@@ -18,4 +18,28 @@ export async function getElementTitle(projectId, dfRef, attrElementUriOrPrimaryL
|
|
|
18
18
|
.query();
|
|
19
19
|
return validElementsQuery.items[0].title;
|
|
20
20
|
}
|
|
21
|
+
/**
|
|
22
|
+
* For set of primary label elements and secondary label ref resolves element titles in this label
|
|
23
|
+
* @param projectId - model's project id to resolve elements in
|
|
24
|
+
* @param secondaryLabelRef - reference to label to resolve elements for
|
|
25
|
+
* @param attrPrimaryLabelValues - element values in primary label of the attribute
|
|
26
|
+
* @param ctx - dashboard context
|
|
27
|
+
* @returns Element values in secondary label for provided primary label values
|
|
28
|
+
*/
|
|
29
|
+
export async function getElementsSecondaryTitles(projectId, secondaryLabelRef, attrPrimaryLabelValues, ctx) {
|
|
30
|
+
const queryOptions = {
|
|
31
|
+
elements: {
|
|
32
|
+
primaryValues: attrPrimaryLabelValues,
|
|
33
|
+
},
|
|
34
|
+
};
|
|
35
|
+
const validElementsQuery = await ctx.backend
|
|
36
|
+
.workspace(projectId)
|
|
37
|
+
.attributes()
|
|
38
|
+
.elements()
|
|
39
|
+
.forDisplayForm(secondaryLabelRef)
|
|
40
|
+
.withLimit(attrPrimaryLabelValues.length)
|
|
41
|
+
.withOptions(queryOptions)
|
|
42
|
+
.query();
|
|
43
|
+
return validElementsQuery.items.map((i) => i.title);
|
|
44
|
+
}
|
|
21
45
|
//# sourceMappingURL=getElementTitle.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getElementTitle.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/getElementTitle.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,KAAK,UAAU,eAAe,CACjC,SAAiB,EACjB,KAAa,EACb,4BAAoC,EACpC,GAAqB;IAErB,MAAM,YAAY,GAA0B;QACxC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,mBAAmB;YAClD,CAAC,CAAC;gBACI,IAAI,EAAE,CAAC,4BAA4B,CAAC;aACvC;YACH,CAAC,CAAC;gBACI,aAAa,EAAE,CAAC,4BAA4B,CAAC;aAChD;KACV,CAAC;IAEF,MAAM,kBAAkB,GAAG,MAAM,GAAG,CAAC,OAAO;SACvC,SAAS,CAAC,SAAS,CAAC;SACpB,UAAU,EAAE;SACZ,QAAQ,EAAE;SACV,cAAc,CAAC,KAAK,CAAC;SACrB,SAAS,CAAC,CAAC,CAAC;SACZ,WAAW,CAAC,YAAY,CAAC;SACzB,KAAK,EAAE,CAAC;IAEb,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC7C,CAAC"}
|
|
1
|
+
{"version":3,"file":"getElementTitle.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/getElementTitle.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,KAAK,UAAU,eAAe,CACjC,SAAiB,EACjB,KAAa,EACb,4BAAoC,EACpC,GAAqB;IAErB,MAAM,YAAY,GAA0B;QACxC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,mBAAmB;YAClD,CAAC,CAAC;gBACI,IAAI,EAAE,CAAC,4BAA4B,CAAC;aACvC;YACH,CAAC,CAAC;gBACI,aAAa,EAAE,CAAC,4BAA4B,CAAC;aAChD;KACV,CAAC;IAEF,MAAM,kBAAkB,GAAG,MAAM,GAAG,CAAC,OAAO;SACvC,SAAS,CAAC,SAAS,CAAC;SACpB,UAAU,EAAE;SACZ,QAAQ,EAAE;SACV,cAAc,CAAC,KAAK,CAAC;SACrB,SAAS,CAAC,CAAC,CAAC;SACZ,WAAW,CAAC,YAAY,CAAC;SACzB,KAAK,EAAE,CAAC;IAEb,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC7C,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC5C,SAAiB,EACjB,iBAAyB,EACzB,sBAAyC,EACzC,GAAqB;IAErB,MAAM,YAAY,GAA0B;QACxC,QAAQ,EAAE;YACN,aAAa,EAAE,sBAAsB;SACxC;KACJ,CAAC;IAEF,MAAM,kBAAkB,GAAG,MAAM,GAAG,CAAC,OAAO;SACvC,SAAS,CAAC,SAAS,CAAC;SACpB,UAAU,EAAE;SACZ,QAAQ,EAAE;SACV,cAAc,CAAC,iBAAiB,CAAC;SACjC,SAAS,CAAC,sBAAsB,CAAC,MAAM,CAAC;SACxC,WAAW,CAAC,YAAY,CAAC;SACzB,KAAK,EAAE,CAAC;IAEb,OAAO,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AACxD,CAAC"}
|
|
@@ -5,7 +5,7 @@ import { SagaIterator } from "redux-saga";
|
|
|
5
5
|
import { DrillToCustomUrl } from "../../commands/drill.js";
|
|
6
6
|
interface IDrillToUrlPlaceholderReplacement {
|
|
7
7
|
toBeReplaced: string;
|
|
8
|
-
replacement: string;
|
|
8
|
+
replacement: string | undefined;
|
|
9
9
|
replaceGlobally?: boolean;
|
|
10
10
|
}
|
|
11
11
|
interface IDrillToUrlElement {
|
|
@@ -13,6 +13,7 @@ interface IDrillToUrlElement {
|
|
|
13
13
|
elementTitle: string | null;
|
|
14
14
|
}
|
|
15
15
|
export declare function loadElementTitle(dfRef: ObjRef, dfIdentifier: string, attrElementUri: string, ctx: DashboardContext): SagaIterator<IDrillToUrlElement>;
|
|
16
|
+
export declare function loadSecondaryElementTitles(dfRef: ObjRef, attrElementValues: (string | null)[], ctx: DashboardContext): SagaIterator<Array<string | null>>;
|
|
16
17
|
export declare function splitDFToLoadingAndMapping(attributesDisplayForms: IAttributeDisplayFormMetadataObject[], ctx: DashboardContext): SagaIterator<{
|
|
17
18
|
displayFormsWithKnownValues: IAttributeDisplayFormMetadataObject[];
|
|
18
19
|
displayFormForValueLoad: IAttributeDisplayFormMetadataObject[];
|
|
@@ -20,7 +21,7 @@ export declare function splitDFToLoadingAndMapping(attributesDisplayForms: IAttr
|
|
|
20
21
|
export declare function loadAttributeElementsForDrillIntersection(drillIntersectionElements: IDrillEventIntersectionElement[], attributesDisplayForms: IAttributeDisplayFormMetadataObject[], ctx: DashboardContext): SagaIterator<IDrillToUrlElement[]>;
|
|
21
22
|
export declare function getAttributeDisplayForms(projectId: string, objRefs: ObjRef[], ctx: DashboardContext): Promise<IAttributeDisplayFormMetadataObject[]>;
|
|
22
23
|
export declare function getAttributeIdentifiersReplacements(url: string, drillIntersectionElements: IDrillEventIntersectionElement[], ctx: DashboardContext): SagaIterator<IDrillToUrlPlaceholderReplacement[]>;
|
|
23
|
-
export declare function getDashboardAttributeFilterReplacements(url: string): SagaIterator<IDrillToUrlPlaceholderReplacement[]>;
|
|
24
|
+
export declare function getDashboardAttributeFilterReplacements(url: string, ctx: DashboardContext): SagaIterator<IDrillToUrlPlaceholderReplacement[]>;
|
|
24
25
|
export declare function getInsightAttributeFilterReplacements(url: string, widgetRef: ObjRef): SagaIterator<IDrillToUrlPlaceholderReplacement[]>;
|
|
25
26
|
export declare function getInsightIdentifiersReplacements(customUrl: string, widgetRef: ObjRef, ctx: DashboardContext): SagaIterator<IDrillToUrlPlaceholderReplacement[]>;
|
|
26
27
|
export declare function resolveDrillToCustomUrl(drillConfig: IDrillToCustomUrl, widgetRef: ObjRef, event: IDrillEvent, ctx: DashboardContext, cmd: DrillToCustomUrl): SagaIterator<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveDrillToCustomUrl.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/resolveDrillToCustomUrl.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,WAAW,EACX,8BAA8B,EAEjC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEH,MAAM,EAGN,iBAAiB,EAEjB,mCAAmC,EAOtC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"resolveDrillToCustomUrl.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/resolveDrillToCustomUrl.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,WAAW,EACX,8BAA8B,EAEjC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEH,MAAM,EAGN,iBAAiB,EAEjB,mCAAmC,EAOtC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAW1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAc3D,UAAU,iCAAiC;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,UAAU,kBAAkB;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,wBAAiB,gBAAgB,CAC7B,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EACtB,GAAG,EAAE,gBAAgB,GACtB,YAAY,CAAC,kBAAkB,CAAC,CAYlC;AAED,wBAAiB,0BAA0B,CACvC,KAAK,EAAE,MAAM,EACb,iBAAiB,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,EACpC,GAAG,EAAE,gBAAgB,GACtB,YAAY,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CASpC;AAsBD,wBAAiB,0BAA0B,CACvC,sBAAsB,EAAE,mCAAmC,EAAE,EAC7D,GAAG,EAAE,gBAAgB,GACtB,YAAY,CAAC;IACZ,2BAA2B,EAAE,mCAAmC,EAAE,CAAC;IACnE,uBAAuB,EAAE,mCAAmC,EAAE,CAAC;CAClE,CAAC,CAwBD;AAED,wBAAiB,yCAAyC,CACtD,yBAAyB,EAAE,8BAA8B,EAAE,EAC3D,sBAAsB,EAAE,mCAAmC,EAAE,EAC7D,GAAG,EAAE,gBAAgB,GACtB,YAAY,CAAC,kBAAkB,EAAE,CAAC,CA8CpC;AAKD,wBAAgB,wBAAwB,CACpC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EAAE,EACjB,GAAG,EAAE,gBAAgB,GACtB,OAAO,CAAC,mCAAmC,EAAE,CAAC,CAEhD;AAED,wBAAiB,mCAAmC,CAChD,GAAG,EAAE,MAAM,EACX,yBAAyB,EAAE,8BAA8B,EAAE,EAC3D,GAAG,EAAE,gBAAgB,GACtB,YAAY,CAAC,iCAAiC,EAAE,CAAC,CAkCnD;AAkDD,wBAAiB,uCAAuC,CACpD,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,gBAAgB,GACtB,YAAY,CAAC,iCAAiC,EAAE,CAAC,CA8BnD;AAED,wBAAiB,qCAAqC,CAClD,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,GAClB,YAAY,CAAC,iCAAiC,EAAE,CAAC,CAsCnD;AAOD,wBAAiB,iCAAiC,CAC9C,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,gBAAgB,GACtB,YAAY,CAAC,iCAAiC,EAAE,CAAC,CAwCnD;AAYD,wBAAiB,uBAAuB,CACpC,WAAW,EAAE,iBAAiB,EAC9B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,WAAW,EAClB,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,gBAAgB,GACtB,YAAY,CAAC,MAAM,CAAC,CAmDtB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// (C) 2020-
|
|
1
|
+
// (C) 2020-2024 GoodData Corporation
|
|
2
2
|
import { all, call, select } from "redux-saga/effects";
|
|
3
3
|
import isNil from "lodash/isNil.js";
|
|
4
4
|
import { isDrillIntersectionAttributeItem, } from "@gooddata/sdk-ui";
|
|
@@ -6,7 +6,7 @@ import { idRef, areObjRefsEqual, insightId, isAttributeDescriptor, isAttributeEl
|
|
|
6
6
|
import { selectDashboardId } from "../../store/meta/metaSelectors.js";
|
|
7
7
|
import { selectAnalyticalWidgetByRef } from "../../store/layout/layoutSelectors.js";
|
|
8
8
|
import { selectInsightByRef } from "../../store/insights/insightsSelectors.js";
|
|
9
|
-
import { getElementTitle } from "./getElementTitle.js";
|
|
9
|
+
import { getElementsSecondaryTitles, getElementTitle } from "./getElementTitle.js";
|
|
10
10
|
import { getAttributeIdentifiersPlaceholdersFromUrl, getDashboardAttributeFilterPlaceholdersFromUrl, getInsightAttributeFilterPlaceholdersFromUrl, } from "../../../_staging/drills/drillingUtils.js";
|
|
11
11
|
import { invalidArgumentsProvided } from "../../events/general.js";
|
|
12
12
|
import { selectAllCatalogDisplayFormsMap, selectCatalogDateAttributes, } from "../../store/catalog/catalogSelectors.js";
|
|
@@ -16,6 +16,7 @@ import { selectFilterContextAttributeFilters } from "../../store/filterContext/f
|
|
|
16
16
|
import { query } from "../../store/_infra/queryCall.js";
|
|
17
17
|
import { queryWidgetFilters } from "../../queries/widgets.js";
|
|
18
18
|
import stringify from "json-stable-stringify";
|
|
19
|
+
import { selectAttributeFilterConfigsOverrides } from "../../store/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
|
|
19
20
|
export function* loadElementTitle(dfRef, dfIdentifier, attrElementUri, ctx) {
|
|
20
21
|
const elementTitle = yield call(getElementTitle, ctx.workspace, dfRef, attrElementUri, ctx);
|
|
21
22
|
return {
|
|
@@ -23,6 +24,10 @@ export function* loadElementTitle(dfRef, dfIdentifier, attrElementUri, ctx) {
|
|
|
23
24
|
elementTitle,
|
|
24
25
|
};
|
|
25
26
|
}
|
|
27
|
+
export function* loadSecondaryElementTitles(dfRef, attrElementValues, ctx) {
|
|
28
|
+
const elementsTitles = yield call(getElementsSecondaryTitles, ctx.workspace, dfRef, attrElementValues, ctx);
|
|
29
|
+
return elementsTitles;
|
|
30
|
+
}
|
|
26
31
|
function isInRefList(list, ref) {
|
|
27
32
|
return list.some((itemRef) => areObjRefsEqual(itemRef, ref));
|
|
28
33
|
}
|
|
@@ -95,32 +100,52 @@ export function* getAttributeIdentifiersReplacements(url, drillIntersectionEleme
|
|
|
95
100
|
};
|
|
96
101
|
});
|
|
97
102
|
}
|
|
98
|
-
|
|
103
|
+
function* resolveDashboardAttributeFilterReplacement({ placeholder: toBeReplaced, ref }, attributeFilters, catalogDisplayForms, attributeFilterConfigs, ctx) {
|
|
104
|
+
let usedFilter = attributeFilters.find((filter) => {
|
|
105
|
+
const df = catalogDisplayForms.get(filter.attributeFilter.displayForm);
|
|
106
|
+
return df && areObjRefsEqual(idRef(df.id), ref);
|
|
107
|
+
});
|
|
108
|
+
let attributeElementsValues = [];
|
|
109
|
+
if (usedFilter) {
|
|
110
|
+
const elements = usedFilter?.attributeFilter.attributeElements;
|
|
111
|
+
attributeElementsValues = isAttributeElementsByValue(elements)
|
|
112
|
+
? elements.values
|
|
113
|
+
: elements?.uris ?? [];
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
const usedConfig = attributeFilterConfigs.find((config) => {
|
|
117
|
+
return config.displayAsLabel && areObjRefsEqual(config.displayAsLabel, ref);
|
|
118
|
+
});
|
|
119
|
+
usedFilter = attributeFilters.find((filter) => {
|
|
120
|
+
return filter.attributeFilter.localIdentifier === usedConfig?.localIdentifier;
|
|
121
|
+
});
|
|
122
|
+
const elements = usedFilter?.attributeFilter.attributeElements;
|
|
123
|
+
const primaryElementsValues = !elements
|
|
124
|
+
? []
|
|
125
|
+
: isAttributeElementsByValue(elements)
|
|
126
|
+
? elements.values
|
|
127
|
+
: elements.uris;
|
|
128
|
+
attributeElementsValues = yield call(loadSecondaryElementTitles, ref, primaryElementsValues, ctx);
|
|
129
|
+
}
|
|
130
|
+
const isNegative = usedFilter?.attributeFilter.negativeSelection;
|
|
131
|
+
const parsedFilter = usedFilter
|
|
132
|
+
? stringifyAttributeFilterSelection(attributeElementsValues, isNegative)
|
|
133
|
+
: undefined;
|
|
134
|
+
const replacement = encodeParameterIfSet(parsedFilter);
|
|
135
|
+
return {
|
|
136
|
+
toBeReplaced,
|
|
137
|
+
replacement: replacement,
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
export function* getDashboardAttributeFilterReplacements(url, ctx) {
|
|
99
141
|
const attributeFilterPlaceholders = getDashboardAttributeFilterPlaceholdersFromUrl(url);
|
|
100
142
|
if (attributeFilterPlaceholders.length === 0) {
|
|
101
143
|
return [];
|
|
102
144
|
}
|
|
103
145
|
const attributeFilters = yield select(selectFilterContextAttributeFilters);
|
|
104
146
|
const catalogDisplayForms = yield select(selectAllCatalogDisplayFormsMap);
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
const df = catalogDisplayForms.get(filter.attributeFilter.displayForm);
|
|
108
|
-
return df && areObjRefsEqual(idRef(df.id), ref);
|
|
109
|
-
});
|
|
110
|
-
const elements = usedFilter?.attributeFilter.attributeElements;
|
|
111
|
-
const attributeElementsValues = isAttributeElementsByValue(elements)
|
|
112
|
-
? elements.values
|
|
113
|
-
: elements?.uris ?? [];
|
|
114
|
-
const isNegative = usedFilter?.attributeFilter.negativeSelection;
|
|
115
|
-
const parsedFilter = usedFilter
|
|
116
|
-
? stringifyAttributeFilterSelection(attributeElementsValues, isNegative)
|
|
117
|
-
: undefined;
|
|
118
|
-
const replacement = encodeParameterIfSet(parsedFilter);
|
|
119
|
-
return {
|
|
120
|
-
toBeReplaced,
|
|
121
|
-
replacement: replacement,
|
|
122
|
-
};
|
|
123
|
-
});
|
|
147
|
+
const attributeFilterConfigs = yield select(selectAttributeFilterConfigsOverrides);
|
|
148
|
+
return yield all(attributeFilterPlaceholders.map((placeholder) => call(resolveDashboardAttributeFilterReplacement, placeholder, attributeFilters, catalogDisplayForms, attributeFilterConfigs, ctx)));
|
|
124
149
|
}
|
|
125
150
|
export function* getInsightAttributeFilterReplacements(url, widgetRef) {
|
|
126
151
|
const attributeFilterPlaceholders = getInsightAttributeFilterPlaceholdersFromUrl(url);
|
|
@@ -176,7 +201,7 @@ const applyReplacements = (url, replacements) => replacements.reduce((customUrlW
|
|
|
176
201
|
export function* resolveDrillToCustomUrl(drillConfig, widgetRef, event, ctx, cmd) {
|
|
177
202
|
const customUrl = drillConfig.target.url;
|
|
178
203
|
const attributeIdentifiersReplacements = yield call(getAttributeIdentifiersReplacements, customUrl, event.drillContext.intersection, ctx);
|
|
179
|
-
const dashboardAttributeFilterReplacements = yield call(getDashboardAttributeFilterReplacements, customUrl);
|
|
204
|
+
const dashboardAttributeFilterReplacements = yield call(getDashboardAttributeFilterReplacements, customUrl, ctx);
|
|
180
205
|
const insightAttributeFilterReplacements = yield call(getInsightAttributeFilterReplacements, customUrl, widgetRef);
|
|
181
206
|
const missingReplacement = [
|
|
182
207
|
...attributeIdentifiersReplacements,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveDrillToCustomUrl.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/resolveDrillToCustomUrl.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"resolveDrillToCustomUrl.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/resolveDrillToCustomUrl.ts"],"names":[],"mappings":"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"}
|
package/esm/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addAttributeFilterHandler.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,
|
|
1
|
+
{"version":3,"file":"addAttributeFilterHandler.d.ts","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EACH,yBAAyB,EACzB,MAAM,EAIT,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAalE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAejE,wBAAiB,yBAAyB,CACtC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,kBAAkB,GACxB,YAAY,CAAC,IAAI,CAAC,CA+IpB;AAED,wBAAiB,uBAAuB,CACpC,GAAG,EAAE,gBAAgB,EACrB,oBAAoB,EAAE,MAAM,EAC5B,cAAc,EAAE,yBAAyB;;;;;;sLAqC5C"}
|
package/esm/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// (C) 2021-2024 GoodData Corporation
|
|
2
2
|
import { all, call, put, select } from "redux-saga/effects";
|
|
3
3
|
import { invariant } from "ts-invariant";
|
|
4
|
-
import { objRefToString, isInsightWidget } from "@gooddata/sdk-model";
|
|
4
|
+
import { objRefToString, isInsightWidget, areObjRefsEqual, } from "@gooddata/sdk-model";
|
|
5
5
|
import { invalidArgumentsProvided } from "../../../events/general.js";
|
|
6
6
|
import { attributeFilterAdded } from "../../../events/filters.js";
|
|
7
7
|
import { filterContextActions } from "../../../store/filterContext/index.js";
|
|
@@ -23,7 +23,11 @@ export function* addAttributeFilterHandler(ctx, cmd) {
|
|
|
23
23
|
const isUnderFilterCountLimit = yield select(selectCanAddMoreFilters);
|
|
24
24
|
const enableDuplicatedLabelValuesInAttributeFilter = yield select(selectEnableDuplicatedLabelValuesInAttributeFilter);
|
|
25
25
|
const usedDisplayForm = enableDuplicatedLabelValuesInAttributeFilter && primaryDisplayForm ? primaryDisplayForm : displayForm;
|
|
26
|
-
const displayAsLabel = enableDuplicatedLabelValuesInAttributeFilter &&
|
|
26
|
+
const displayAsLabel = enableDuplicatedLabelValuesInAttributeFilter &&
|
|
27
|
+
primaryDisplayForm &&
|
|
28
|
+
!areObjRefsEqual(primaryDisplayForm, displayForm)
|
|
29
|
+
? displayForm
|
|
30
|
+
: undefined;
|
|
27
31
|
if (!isUnderFilterCountLimit) {
|
|
28
32
|
throw invalidArgumentsProvided(ctx, cmd, `Attempting to add filter, even though the limit on the count of filters has been reached.`);
|
|
29
33
|
}
|
package/esm/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addAttributeFilterHandler.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAkB,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5E,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,
|
|
1
|
+
{"version":3,"file":"addAttributeFilterHandler.js","sourceRoot":"","sources":["../../../../../src/model/commandHandlers/filterContext/attributeFilter/addAttributeFilterHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drillToSameDashboardHandlerFactory.d.ts","sourceRoot":"","sources":["../../../src/model/eventHandlers/drillToSameDashboardHandlerFactory.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAA8B,iCAAiC,EAAE,MAAM,oBAAoB,CAAC;AAEnG;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,8BAA8B,iBACzB,MAAM,KACrB,sBAAsB,iCAAiC,
|
|
1
|
+
{"version":3,"file":"drillToSameDashboardHandlerFactory.d.ts","sourceRoot":"","sources":["../../../src/model/eventHandlers/drillToSameDashboardHandlerFactory.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAA8B,iCAAiC,EAAE,MAAM,oBAAoB,CAAC;AAEnG;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,8BAA8B,iBACzB,MAAM,KACrB,sBAAsB,iCAAiC,CAexD,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
// (C) 2021 GoodData Corporation
|
|
1
|
+
// (C) 2021-2024 GoodData Corporation
|
|
2
2
|
import { areObjRefsEqual } from "@gooddata/sdk-model";
|
|
3
|
-
import {
|
|
3
|
+
import { changeFilterContextSelectionByParams } from "../commands/index.js";
|
|
4
4
|
import { newDashboardEventPredicate } from "../events/index.js";
|
|
5
5
|
/**
|
|
6
6
|
* Event handler with the default implementation for drill to the same dashboard.
|
|
@@ -19,7 +19,10 @@ export const newDrillToSameDashboardHandler = (dashboardRef) => ({
|
|
|
19
19
|
eval: newDashboardEventPredicate("GDC.DASH/EVT.DRILL.DRILL_TO_DASHBOARD.RESOLVED", (e) => !e.payload.drillDefinition.target ||
|
|
20
20
|
areObjRefsEqual(e.payload.drillDefinition.target, dashboardRef)),
|
|
21
21
|
handler: (event, dispatch) => {
|
|
22
|
-
dispatch(
|
|
22
|
+
dispatch(changeFilterContextSelectionByParams({
|
|
23
|
+
filters: event.payload.filters,
|
|
24
|
+
attributeFilterConfigs: event.payload.attributeFilterConfigs,
|
|
25
|
+
}));
|
|
23
26
|
},
|
|
24
27
|
});
|
|
25
28
|
//# sourceMappingURL=drillToSameDashboardHandlerFactory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drillToSameDashboardHandlerFactory.js","sourceRoot":"","sources":["../../../src/model/eventHandlers/drillToSameDashboardHandlerFactory.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"drillToSameDashboardHandlerFactory.js","sourceRoot":"","sources":["../../../src/model/eventHandlers/drillToSameDashboardHandlerFactory.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,EAAE,eAAe,EAAU,MAAM,qBAAqB,CAAC;AAE9D,OAAO,EAAE,oCAAoC,EAAE,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,0BAA0B,EAAqC,MAAM,oBAAoB,CAAC;AAEnG;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC1C,YAAoB,EACoC,EAAE,CAAC,CAAC;IAC5D,IAAI,EAAE,0BAA0B,CAC5B,gDAAgD,EAChD,CAAC,CAAC,EAAE,EAAE,CACF,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM;QACjC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,CACtE;IACD,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QACzB,QAAQ,CACJ,oCAAoC,CAAC;YACjC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO;YAC9B,sBAAsB,EAAE,KAAK,CAAC,OAAO,CAAC,sBAAsB;SAC/D,CAAC,CACL,CAAC;IACN,CAAC;CACJ,CAAC,CAAC"}
|