@gooddata/sdk-ui-filters 10.5.0-alpha.10 → 10.5.0-alpha.11

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.
@@ -1 +1 @@
1
- {"version":3,"file":"loadCustomElementsReducers.d.ts","sourceRoot":"","sources":["../../../../../src/AttributeFilterHandler/internal/redux/loadCustomElements/loadCustomElementsReducers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACjG,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAmD3D;;GAEG;AACH,eAAO,MAAM,0BAA0B;;;qBAlDV,oBAAoB;yBAAe,WAAW,GAAG,SAAS;;;;;;yBAItD,WAAW,GAAG,SAAS;;;;;;0BAM9B,WAAW;0DACqB,OAAO;;;;;;mBAyBtC,gBAAgB;yBAAe,WAAW,GAAG,SAAS;;;;;;yBAIhD,WAAW,GAAG,SAAS;;;;;;yBAIvB,WAAW,GAAG,SAAS;;;;CAavD,CAAC"}
1
+ {"version":3,"file":"loadCustomElementsReducers.d.ts","sourceRoot":"","sources":["../../../../../src/AttributeFilterHandler/internal/redux/loadCustomElements/loadCustomElementsReducers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACjG,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AA8F3D;;GAEG;AACH,eAAO,MAAM,0BAA0B;;;qBAxFV,oBAAoB;yBAAe,WAAW,GAAG,SAAS;;;;;;yBAItD,WAAW,GAAG,SAAS;;;;;;0BAmB9B,WAAW;0DACqB,OAAO;;;;;;mBAkDtC,gBAAgB;yBAAe,WAAW,GAAG,SAAS;;;;;;yBAIhD,WAAW,GAAG,SAAS;;;;;;yBAIvB,WAAW,GAAG,SAAS;;;;CAavD,CAAC"}
@@ -1,20 +1,53 @@
1
1
  import identity from "lodash/identity.js";
2
2
  import { getElementCacheKey } from "../common/selectors.js";
3
+ import { isElementsQueryOptionsElementsByPrimaryDisplayFormValue, isElementsQueryOptionsElementsByValue, } from "@gooddata/sdk-backend-spi";
3
4
  const loadCustomElementsRequest = identity;
4
5
  const loadCustomElementsStart = identity;
6
+ const getElementValues = (elements) => {
7
+ if (!elements) {
8
+ return [];
9
+ }
10
+ if (isElementsQueryOptionsElementsByValue(elements)) {
11
+ return elements.values;
12
+ }
13
+ if (isElementsQueryOptionsElementsByPrimaryDisplayFormValue(elements)) {
14
+ return elements.primaryValues;
15
+ }
16
+ return elements.uris;
17
+ };
5
18
  const loadCustomElementsSuccess = (state, action) => {
6
19
  const keys = [];
7
- const { enableDuplicatedLabelValuesInAttributeFilter } = action.payload;
8
- action.payload.elements.forEach((el) => {
9
- const cacheKey = getElementCacheKey(state, el, enableDuplicatedLabelValuesInAttributeFilter);
10
- if (!state.elements.cache[cacheKey]) {
11
- state.elements.cache[cacheKey] = el;
12
- }
13
- if (state.initialization.status === "loading") {
14
- keys.push(cacheKey);
15
- }
16
- });
17
- if (state.initialization.status === "loading") {
20
+ const { enableDuplicatedLabelValuesInAttributeFilter, options: { elements }, } = action.payload;
21
+ if (elements) {
22
+ const originalElements = getElementValues(elements);
23
+ // iterate over original elements to keep the order in selection,
24
+ // fetched elements are sorted by default
25
+ originalElements.forEach((originalEl) => {
26
+ action.payload.elements
27
+ .filter((el) => el.title === originalEl)
28
+ .forEach((el) => {
29
+ const cacheKey = getElementCacheKey(state, el, enableDuplicatedLabelValuesInAttributeFilter);
30
+ if (!state.elements.cache[cacheKey]) {
31
+ state.elements.cache[cacheKey] = el;
32
+ }
33
+ if (state.initialization.status === "loading") {
34
+ keys.push(cacheKey);
35
+ }
36
+ });
37
+ });
38
+ }
39
+ else {
40
+ action.payload.elements.forEach((el) => {
41
+ const cacheKey = getElementCacheKey(state, el, enableDuplicatedLabelValuesInAttributeFilter);
42
+ if (!state.elements.cache[cacheKey]) {
43
+ state.elements.cache[cacheKey] = el;
44
+ }
45
+ if (state.initialization.status === "loading") {
46
+ keys.push(cacheKey);
47
+ }
48
+ });
49
+ }
50
+ if (enableDuplicatedLabelValuesInAttributeFilter && state.initialization.status === "loading") {
18
51
  state.selection.working.keys = keys;
19
52
  state.selection.commited.keys = keys;
20
53
  }
@@ -1 +1 @@
1
- {"version":3,"file":"loadCustomElementsReducers.js","sourceRoot":"","sources":["../../../../../src/AttributeFilterHandler/internal/redux/loadCustomElements/loadCustomElementsReducers.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAK1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,MAAM,yBAAyB,GAE3B,QAAQ,CAAC;AAEb,MAAM,uBAAuB,GAEzB,QAAQ,CAAC;AAEb,MAAM,yBAAyB,GAO3B,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;IAClB,MAAM,IAAI,GAAG,EAAE,CAAC;IAEhB,MAAM,EAAE,4CAA4C,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;IAExE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;QACnC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,KAAK,EAAE,EAAE,EAAE,4CAA4C,CAAC,CAAC;QAC7F,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACxC,CAAC;QACD,IAAI,KAAK,CAAC,cAAc,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC5C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,KAAK,CAAC,cAAc,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC5C,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QACpC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;IACzC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAEzB,QAAQ,CAAC;AAEb,MAAM,+BAA+B,GAEjC,QAAQ,CAAC;AAEb,MAAM,wBAAwB,GAE1B,QAAQ,CAAC;AAEb;;GAEG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACtC,yBAAyB;IACzB,uBAAuB;IACvB,yBAAyB;IACzB,uBAAuB;IACvB,+BAA+B;IAC/B,wBAAwB;CAC3B,CAAC"}
1
+ {"version":3,"file":"loadCustomElementsReducers.js","sourceRoot":"","sources":["../../../../../src/AttributeFilterHandler/internal/redux/loadCustomElements/loadCustomElementsReducers.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gooddata/sdk-ui-filters",
3
- "version": "10.5.0-alpha.10",
3
+ "version": "10.5.0-alpha.11",
4
4
  "description": "GoodData.UI SDK - Filter Components",
5
5
  "repository": {
6
6
  "type": "git",
@@ -47,11 +47,11 @@
47
47
  "ts-invariant": "^0.7.5",
48
48
  "tslib": "^2.5.0",
49
49
  "uuid": "^8.3.2",
50
- "@gooddata/sdk-model": "10.5.0-alpha.10",
51
- "@gooddata/sdk-backend-spi": "10.5.0-alpha.10",
52
- "@gooddata/sdk-ui-kit": "10.5.0-alpha.10",
53
- "@gooddata/util": "10.5.0-alpha.10",
54
- "@gooddata/sdk-ui": "10.5.0-alpha.10"
50
+ "@gooddata/sdk-backend-spi": "10.5.0-alpha.11",
51
+ "@gooddata/sdk-ui": "10.5.0-alpha.11",
52
+ "@gooddata/sdk-ui-kit": "10.5.0-alpha.11",
53
+ "@gooddata/sdk-model": "10.5.0-alpha.11",
54
+ "@gooddata/util": "10.5.0-alpha.11"
55
55
  },
56
56
  "peerDependencies": {
57
57
  "react": "^16.10.0 || ^17.0.0 || ^18.0.0",
@@ -101,8 +101,8 @@
101
101
  "typescript": "5.3.3",
102
102
  "vitest": "1.0.4",
103
103
  "vitest-dom": "0.1.1",
104
- "@gooddata/reference-workspace": "10.5.0-alpha.10",
105
- "@gooddata/sdk-backend-mockingbird": "10.5.0-alpha.10"
104
+ "@gooddata/reference-workspace": "10.5.0-alpha.11",
105
+ "@gooddata/sdk-backend-mockingbird": "10.5.0-alpha.11"
106
106
  },
107
107
  "scripts": {
108
108
  "clean": "rm -rf ci dist esm coverage *.log styles/css tsconfig.tsbuildinfo",