@gooddata/sdk-ui-dashboard 10.7.0-alpha.24 → 10.7.0-alpha.25

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,2 +1,2 @@
1
- export declare const LIB_VERSION = "10.7.0-alpha.24";
1
+ export declare const LIB_VERSION = "10.7.0-alpha.25";
2
2
  //# sourceMappingURL=__version.d.ts.map
package/esm/__version.js CHANGED
@@ -1,4 +1,4 @@
1
1
  // (C) 2021 GoodData Corporation
2
2
  // DO NOT CHANGE THIS FILE, IT IS RE-GENERATED ON EVERY BUILD
3
- export const LIB_VERSION = "10.7.0-alpha.24";
3
+ export const LIB_VERSION = "10.7.0-alpha.25";
4
4
  //# sourceMappingURL=__version.js.map
@@ -4,5 +4,5 @@ import { CrossFiltering } from "../../commands/drill.js";
4
4
  export declare function crossFilteringHandler(ctx: DashboardContext, cmd: CrossFiltering): Generator<import("redux-saga/effects").SelectEffect | import("redux-saga/effects").CallEffect<void> | import("redux-saga/effects").AllEffect<import("redux-saga/effects").CallEffect<void>> | import("redux-saga/effects").PutEffect<import("../../events/drill.js").DashboardCrossFilteringRequested> | import("redux-saga/effects").PutEffect<{
5
5
  payload: import("../../index.js").ICrossFilteringItem;
6
6
  type: "drill/crossFilterByWidget";
7
- }>, import("../../events/drill.js").DashboardCrossFilteringResolved, boolean & (IDashboardAttributeFilter | import("@gooddata/sdk-model").IDashboardDateFilter)[] & import("@gooddata/sdk-model").ICatalogDateAttribute[] & string[] & (import("../../index.js").ICrossFilteringItem | undefined)>;
7
+ }>, import("../../events/drill.js").DashboardCrossFilteringResolved, boolean & (IDashboardAttributeFilter | import("@gooddata/sdk-model").IDashboardDateFilter)[] & import("@gooddata/sdk-model").ICatalogDateAttribute[] & string[] & (import("../../index.js").ICrossFilteringItem | undefined) & Map<string, import("@gooddata/sdk-model").ObjRef>>;
8
8
  //# sourceMappingURL=crossFilteringHandler.d.ts.map
@@ -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;AAezD,wBAAiB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,cAAc;;;mSAoIhF"}
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;;;uVAgJhF"}
@@ -14,6 +14,7 @@ import { changeAttributeFilterSelectionHandler } from "../filterContext/attribut
14
14
  import { removeAttributeFiltersHandler } from "../filterContext/attributeFilter/removeAttributeFiltersHandler.js";
15
15
  import isEmpty from "lodash/isEmpty.js";
16
16
  import { selectEnableDuplicatedLabelValuesInAttributeFilter } from "../../store/config/configSelectors.js";
17
+ import { selectAttributeFilterConfigsDisplayAsLabelMap } from "../../store/attributeFilterConfigs/attributeFilterConfigsSelectors.js";
17
18
  export function* crossFilteringHandler(ctx, cmd) {
18
19
  yield put(crossFilteringRequested(ctx, cmd.payload.drillDefinition, cmd.payload.drillEvent, cmd.correlationId));
19
20
  const enableDuplicatedLabelValuesInAttributeFilter = yield select(selectEnableDuplicatedLabelValuesInAttributeFilter);
@@ -30,6 +31,7 @@ export function* crossFilteringHandler(ctx, cmd) {
30
31
  });
31
32
  const crossFilteringItemByWidget = yield select(selectCrossFilteringItemByWidgetRef(widgetRef));
32
33
  const drillIntersectionFilters = convertIntersectionToAttributeFilters(cmd.payload.drillEvent.drillContext.intersection ?? [], dateDataSetsAttributesRefs, backendSupportsElementUris, enableDuplicatedLabelValuesInAttributeFilter);
34
+ const attributeFilterDisplayAsLabelMap = yield select(selectAttributeFilterConfigsDisplayAsLabelMap);
33
35
  const shouldUpdateExistingCrossFiltering = !isEmpty(crossFilteringItemByWidget) &&
34
36
  /**
35
37
  * Intersection may have multiple lengths in pivot table so we need to make sure that when we are updating existing
@@ -37,10 +39,17 @@ export function* crossFilteringHandler(ctx, cmd) {
37
39
  * Otherwise we would want the cross-filtering to be reset together with all virtual filters.
38
40
  */
39
41
  crossFilteringItemByWidget?.filterLocalIdentifiers.length <= drillIntersectionFilters.length;
40
- const virtualFilters = drillIntersectionFilters.map(({ attributeFilter }) => {
42
+ const virtualFilters = drillIntersectionFilters.map(({ attributeFilter, primaryLabel }) => {
41
43
  const { displayForm, attributeElements, negativeSelection } = attributeFilter.attributeFilter;
42
44
  const existingVirtualFilter = shouldUpdateExistingCrossFiltering
43
45
  ? currentVirtualFilters.find((vf) => {
46
+ if (enableDuplicatedLabelValuesInAttributeFilter) {
47
+ const vfDisplayAsLabel = attributeFilterDisplayAsLabelMap.get(vf.attributeFilter.localIdentifier);
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, displayForm) && vfDisplayAsLabel
50
+ ? areObjRefsEqual(vfDisplayAsLabel, primaryLabel)
51
+ : true;
52
+ }
44
53
  return areObjRefsEqual(vf.attributeFilter.displayForm, displayForm);
45
54
  })
46
55
  : undefined;
@@ -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 +1 @@
1
- {"version":3,"file":"drillDownHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillDownHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,0BAA0B,EAAyC,MAAM,uBAAuB,CAAC;AAG1G,wBAAiB,gBAAgB,CAC7B,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,SAAS,GACf,YAAY,CAAC,0BAA0B,CAAC,CAmB1C"}
1
+ {"version":3,"file":"drillDownHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillDownHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,0BAA0B,EAAyC,MAAM,uBAAuB,CAAC;AAI1G,wBAAiB,gBAAgB,CAC7B,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,SAAS,GACf,YAAY,CAAC,0BAA0B,CAAC,CAwB1C"}
@@ -1,10 +1,12 @@
1
- import { put } from "redux-saga/effects";
1
+ import { put, select } from "redux-saga/effects";
2
2
  import { drillDownRequested, drillDownResolved } from "../../events/drill.js";
3
3
  import { getInsightWithAppliedDrillDown } from "@gooddata/sdk-ui-ext";
4
+ import { selectEnableDuplicatedLabelValuesInAttributeFilter } from "../../store/config/configSelectors.js";
4
5
  export function* drillDownHandler(ctx, cmd) {
5
6
  const { drillDefinition, drillEvent, insight } = cmd.payload;
6
7
  yield put(drillDownRequested(ctx, insight, drillDefinition, drillEvent, cmd.correlationId));
7
- const insightWithDrillDownApplied = getInsightWithAppliedDrillDown(insight, drillEvent, drillDefinition, ctx.backend.capabilities.supportsElementUris ?? true);
8
+ const enableDuplicatedLabelValuesInAttributeFilter = yield select(selectEnableDuplicatedLabelValuesInAttributeFilter);
9
+ const insightWithDrillDownApplied = getInsightWithAppliedDrillDown(insight, drillEvent, drillDefinition, ctx.backend.capabilities.supportsElementUris ?? true, enableDuplicatedLabelValuesInAttributeFilter);
8
10
  return drillDownResolved(ctx, insightWithDrillDownApplied, cmd.payload.drillDefinition, cmd.payload.drillEvent, cmd.correlationId);
9
11
  }
10
12
  //# sourceMappingURL=drillDownHandler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"drillDownHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillDownHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAGzC,OAAO,EAA8B,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1G,OAAO,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AAEtE,MAAM,SAAS,CAAC,CAAC,gBAAgB,CAC7B,GAAqB,EACrB,GAAc;IAEd,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;IAE7D,MAAM,GAAG,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;IAE5F,MAAM,2BAA2B,GAAG,8BAA8B,CAC9D,OAAO,EACP,UAAU,EACV,eAAe,EACf,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,mBAAmB,IAAI,IAAI,CACvD,CAAC;IAEF,OAAO,iBAAiB,CACpB,GAAG,EACH,2BAA2B,EAC3B,GAAG,CAAC,OAAO,CAAC,eAAe,EAC3B,GAAG,CAAC,OAAO,CAAC,UAAU,EACtB,GAAG,CAAC,aAAa,CACpB,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"drillDownHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillDownHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAGjD,OAAO,EAA8B,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1G,OAAO,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,kDAAkD,EAAE,MAAM,uCAAuC,CAAC;AAE3G,MAAM,SAAS,CAAC,CAAC,gBAAgB,CAC7B,GAAqB,EACrB,GAAc;IAEd,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;IAE7D,MAAM,GAAG,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;IAE5F,MAAM,4CAA4C,GAE9C,MAAM,MAAM,CAAC,kDAAkD,CAAC,CAAC;IAErE,MAAM,2BAA2B,GAAG,8BAA8B,CAC9D,OAAO,EACP,UAAU,EACV,eAAe,EACf,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,mBAAmB,IAAI,IAAI,EACpD,4CAA4C,CAC/C,CAAC;IAEF,OAAO,iBAAiB,CACpB,GAAG,EACH,2BAA2B,EAC3B,GAAG,CAAC,OAAO,CAAC,eAAe,EAC3B,GAAG,CAAC,OAAO,CAAC,UAAU,EACtB,GAAG,CAAC,aAAa,CACpB,CAAC;AACN,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"drillToInsightHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToInsightHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EACH,+BAA+B,EAGlC,MAAM,uBAAuB,CAAC;AAI/B,wBAAiB,qBAAqB,CAClC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,cAAc,GACpB,YAAY,CAAC,+BAA+B,CAAC,CAkB/C"}
1
+ {"version":3,"file":"drillToInsightHandler.d.ts","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToInsightHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EACH,+BAA+B,EAGlC,MAAM,uBAAuB,CAAC;AAK/B,wBAAiB,qBAAqB,CAClC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,cAAc,GACpB,YAAY,CAAC,+BAA+B,CAAC,CAuB/C"}
@@ -2,11 +2,13 @@ import { put, select } from "redux-saga/effects";
2
2
  import { drillToInsightRequested, drillToInsightResolved, } from "../../events/drill.js";
3
3
  import { selectInsightByRef } from "../../store/insights/insightsSelectors.js";
4
4
  import { addIntersectionFiltersToInsight } from "@gooddata/sdk-ui-ext";
5
+ import { selectEnableDuplicatedLabelValuesInAttributeFilter } from "../../store/config/configSelectors.js";
5
6
  export function* drillToInsightHandler(ctx, cmd) {
6
7
  const { drillDefinition, drillEvent } = cmd.payload;
7
8
  const insight = yield select(selectInsightByRef(drillDefinition.target));
8
9
  yield put(drillToInsightRequested(ctx, insight, drillDefinition, drillEvent, cmd.correlationId));
9
- const insightWithDrillsApplied = addIntersectionFiltersToInsight(insight, drillEvent.drillContext.intersection, ctx.backend.capabilities.supportsElementUris ?? true);
10
+ const enableDuplicatedLabelValuesInAttributeFilter = yield select(selectEnableDuplicatedLabelValuesInAttributeFilter);
11
+ const insightWithDrillsApplied = addIntersectionFiltersToInsight(insight, drillEvent.drillContext.intersection, ctx.backend.capabilities.supportsElementUris ?? true, enableDuplicatedLabelValuesInAttributeFilter);
10
12
  return drillToInsightResolved(ctx, insightWithDrillsApplied, cmd.payload.drillDefinition, cmd.payload.drillEvent, cmd.correlationId);
11
13
  }
12
14
  //# sourceMappingURL=drillToInsightHandler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"drillToInsightHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToInsightHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAGjD,OAAO,EAEH,uBAAuB,EACvB,sBAAsB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAC;AAEvE,MAAM,SAAS,CAAC,CAAC,qBAAqB,CAClC,GAAqB,EACrB,GAAmB;IAEnB,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;IACpD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IACzE,MAAM,GAAG,CAAC,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;IAEjG,MAAM,wBAAwB,GAAG,+BAA+B,CAC5D,OAAO,EACP,UAAU,CAAC,YAAY,CAAC,YAAa,EACrC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,mBAAmB,IAAI,IAAI,CACvD,CAAC;IAEF,OAAO,sBAAsB,CACzB,GAAG,EACH,wBAAwB,EACxB,GAAG,CAAC,OAAO,CAAC,eAAe,EAC3B,GAAG,CAAC,OAAO,CAAC,UAAU,EACtB,GAAG,CAAC,aAAa,CACpB,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"drillToInsightHandler.js","sourceRoot":"","sources":["../../../../src/model/commandHandlers/drill/drillToInsightHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAGjD,OAAO,EAEH,uBAAuB,EACvB,sBAAsB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,kDAAkD,EAAE,MAAM,uCAAuC,CAAC;AAE3G,MAAM,SAAS,CAAC,CAAC,qBAAqB,CAClC,GAAqB,EACrB,GAAmB;IAEnB,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;IACpD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IACzE,MAAM,GAAG,CAAC,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;IAEjG,MAAM,4CAA4C,GAE9C,MAAM,MAAM,CAAC,kDAAkD,CAAC,CAAC;IAErE,MAAM,wBAAwB,GAAG,+BAA+B,CAC5D,OAAO,EACP,UAAU,CAAC,YAAY,CAAC,YAAa,EACrC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,mBAAmB,IAAI,IAAI,EACpD,4CAA4C,CAC/C,CAAC;IAEF,OAAO,sBAAsB,CACzB,GAAG,EACH,wBAAwB,EACxB,GAAG,CAAC,OAAO,CAAC,eAAe,EAC3B,GAAG,CAAC,OAAO,CAAC,UAAU,EACtB,GAAG,CAAC,aAAa,CACpB,CAAC;AACN,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gooddata/sdk-ui-dashboard",
3
- "version": "10.7.0-alpha.24",
3
+ "version": "10.7.0-alpha.25",
4
4
  "description": "GoodData SDK - Dashboard Component",
5
5
  "repository": {
6
6
  "type": "git",
@@ -55,17 +55,17 @@
55
55
  "ts-invariant": "^0.7.5",
56
56
  "tslib": "^2.5.0",
57
57
  "uuid": "^8.3.2",
58
- "@gooddata/sdk-backend-base": "10.7.0-alpha.24",
59
- "@gooddata/sdk-backend-spi": "10.7.0-alpha.24",
60
- "@gooddata/sdk-model": "10.7.0-alpha.24",
61
- "@gooddata/sdk-ui-ext": "10.7.0-alpha.24",
62
- "@gooddata/sdk-ui": "10.7.0-alpha.24",
63
- "@gooddata/sdk-ui-filters": "10.7.0-alpha.24",
64
- "@gooddata/sdk-ui-geo": "10.7.0-alpha.24",
65
- "@gooddata/sdk-ui-kit": "10.7.0-alpha.24",
66
- "@gooddata/sdk-ui-theme-provider": "10.7.0-alpha.24",
67
- "@gooddata/util": "10.7.0-alpha.24",
68
- "@gooddata/sdk-ui-vis-commons": "10.7.0-alpha.24"
58
+ "@gooddata/sdk-backend-base": "10.7.0-alpha.25",
59
+ "@gooddata/sdk-model": "10.7.0-alpha.25",
60
+ "@gooddata/sdk-backend-spi": "10.7.0-alpha.25",
61
+ "@gooddata/sdk-ui": "10.7.0-alpha.25",
62
+ "@gooddata/sdk-ui-ext": "10.7.0-alpha.25",
63
+ "@gooddata/sdk-ui-filters": "10.7.0-alpha.25",
64
+ "@gooddata/sdk-ui-geo": "10.7.0-alpha.25",
65
+ "@gooddata/sdk-ui-kit": "10.7.0-alpha.25",
66
+ "@gooddata/sdk-ui-theme-provider": "10.7.0-alpha.25",
67
+ "@gooddata/sdk-ui-vis-commons": "10.7.0-alpha.25",
68
+ "@gooddata/util": "10.7.0-alpha.25"
69
69
  },
70
70
  "peerDependencies": {
71
71
  "react": "^16.10.0 || ^17.0.0 || ^18.0.0",
@@ -118,9 +118,9 @@
118
118
  "typescript": "5.3.3",
119
119
  "vitest": "1.0.4",
120
120
  "vitest-dom": "0.1.1",
121
- "@gooddata/i18n-toolkit": "10.7.0-alpha.24",
122
- "@gooddata/sdk-backend-mockingbird": "10.7.0-alpha.24",
123
- "@gooddata/reference-workspace": "10.7.0-alpha.24"
121
+ "@gooddata/i18n-toolkit": "10.7.0-alpha.25",
122
+ "@gooddata/sdk-backend-mockingbird": "10.7.0-alpha.25",
123
+ "@gooddata/reference-workspace": "10.7.0-alpha.25"
124
124
  },
125
125
  "scripts": {
126
126
  "clean": "rm -rf ci dist esm coverage *.log styles/css tsconfig.tsbuildinfo",