@gooddata/sdk-ui 10.22.0-alpha.20 → 10.22.0-alpha.21
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":"CorrelationContext.d.ts","sourceRoot":"","sources":["../../../src/base/react/CorrelationContext.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAS5F;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACtC;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAExC;;OAEG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC9B;AAED;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,
|
|
1
|
+
{"version":3,"file":"CorrelationContext.d.ts","sourceRoot":"","sources":["../../../src/base/react/CorrelationContext.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAS5F;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACtC;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAExC;;OAEG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC9B;AAED;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAenE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,QAAO,OAAO,MAAM,EAAE,MAAM,CAE1D,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,yBAAyB,aACxB,kBAAkB,wBACN,2BAA2B,KAClD,kBAAkB,GAAG,SAqBvB,CAAC;AAEF;;;;GAIG;AACH,MAAM,WAAW,oCAAoC;IACjD;;OAEG;IACH,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAE7B;;OAEG;IACH,eAAe,EAAE,2BAA2B,CAAC;IAE7C;;OAEG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC9B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,8BAA8B,EAAE,KAAK,CAAC,EAAE,CAAC,oCAAoC,CAwCzF,CAAC"}
|
|
@@ -15,10 +15,14 @@ CorrelationContext.displayName = "CorrelationContext";
|
|
|
15
15
|
export const CorrelationProvider = ({ children, correlationData }) => {
|
|
16
16
|
// Get parent correlation metadata to merge with
|
|
17
17
|
const parentCorrelationData = useCorrelationData();
|
|
18
|
+
const memoizedAdditionalCorrelationData = useMemo(() => {
|
|
19
|
+
return correlationData;
|
|
20
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
21
|
+
}, [JSON.stringify(correlationData)]);
|
|
18
22
|
// Merge parent data with our data (newer values override)
|
|
19
23
|
const mergedData = useMemo(() => {
|
|
20
|
-
return { ...parentCorrelationData, ...
|
|
21
|
-
}, [parentCorrelationData,
|
|
24
|
+
return { ...parentCorrelationData, ...memoizedAdditionalCorrelationData };
|
|
25
|
+
}, [parentCorrelationData, memoizedAdditionalCorrelationData]);
|
|
22
26
|
return React.createElement(CorrelationContext.Provider, { value: mergedData }, children);
|
|
23
27
|
};
|
|
24
28
|
/**
|
|
@@ -45,9 +49,14 @@ export const useBackendWithCorrelation = (backend, correlationMetadata) => {
|
|
|
45
49
|
const contextBackend = useBackend();
|
|
46
50
|
const effectiveBackend = backend ?? contextBackend;
|
|
47
51
|
const correlationData = useCorrelationData();
|
|
52
|
+
const memoizedAdditionalCorrelationData = useMemo(() => {
|
|
53
|
+
return correlationMetadata;
|
|
54
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
55
|
+
}, [JSON.stringify(correlationMetadata)]);
|
|
56
|
+
// Merge correlation data from context with metadata parameter, giving priority to context data
|
|
48
57
|
const mergedCorrelationData = useMemo(() => {
|
|
49
|
-
return { ...
|
|
50
|
-
}, [
|
|
58
|
+
return { ...correlationData, ...memoizedAdditionalCorrelationData };
|
|
59
|
+
}, [correlationData, memoizedAdditionalCorrelationData]);
|
|
51
60
|
return useMemo(() => {
|
|
52
61
|
if (!effectiveBackend || Object.keys(mergedCorrelationData).length === 0) {
|
|
53
62
|
return effectiveBackend;
|
|
@@ -68,9 +77,13 @@ export const BackendProviderWithCorrelation = ({ backend: externalBackend, corre
|
|
|
68
77
|
const baseBackend = externalBackend || contextBackend;
|
|
69
78
|
// Get parent correlation metadata and merge
|
|
70
79
|
const parentCorrelationData = useCorrelationData();
|
|
80
|
+
const memoizedAdditionalCorrelationData = useMemo(() => {
|
|
81
|
+
return correlationData;
|
|
82
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
83
|
+
}, [JSON.stringify(correlationData)]);
|
|
71
84
|
const mergedData = useMemo(() => {
|
|
72
|
-
return { ...parentCorrelationData, ...
|
|
73
|
-
}, [parentCorrelationData,
|
|
85
|
+
return { ...parentCorrelationData, ...memoizedAdditionalCorrelationData };
|
|
86
|
+
}, [parentCorrelationData, memoizedAdditionalCorrelationData]);
|
|
74
87
|
// Create enhanced backend with correlation metadata
|
|
75
88
|
const enhancedBackend = useMemo(() => {
|
|
76
89
|
if (!baseBackend) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CorrelationContext.js","sourceRoot":"","sources":["../../../src/base/react/CorrelationContext.tsx"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAElE;;GAEG;AACH,MAAM,kBAAkB,GAAG,KAAK,CAAC,aAAa,CAA8B,EAAE,CAAC,CAAC;AAChF,kBAAkB,CAAC,WAAW,GAAG,oBAAoB,CAAC;AAkBtD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAwC,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,EAAE;IACtG,gDAAgD;IAChD,MAAM,qBAAqB,GAAG,kBAAkB,EAAE,CAAC;IAEnD,0DAA0D;IAC1D,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE;QAC5B,OAAO,EAAE,GAAG,qBAAqB,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"CorrelationContext.js","sourceRoot":"","sources":["../../../src/base/react/CorrelationContext.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gooddata/sdk-ui",
|
|
3
|
-
"version": "10.22.0-alpha.
|
|
3
|
+
"version": "10.22.0-alpha.21",
|
|
4
4
|
"description": "GoodData.UI SDK - Core",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -41,9 +41,9 @@
|
|
|
41
41
|
"ts-invariant": "^0.7.5",
|
|
42
42
|
"tslib": "^2.5.0",
|
|
43
43
|
"uuid": "^8.3.2",
|
|
44
|
-
"@gooddata/sdk-backend-spi": "10.22.0-alpha.
|
|
45
|
-
"@gooddata/
|
|
46
|
-
"@gooddata/
|
|
44
|
+
"@gooddata/sdk-backend-spi": "10.22.0-alpha.21",
|
|
45
|
+
"@gooddata/util": "10.22.0-alpha.21",
|
|
46
|
+
"@gooddata/sdk-model": "10.22.0-alpha.21"
|
|
47
47
|
},
|
|
48
48
|
"peerDependencies": {
|
|
49
49
|
"react": "^16.10.0 || ^17.0.0 || ^18.0.0",
|
|
@@ -94,10 +94,10 @@
|
|
|
94
94
|
"typescript": "5.3.3",
|
|
95
95
|
"vitest": "1.0.4",
|
|
96
96
|
"vitest-dom": "0.1.1",
|
|
97
|
-
"@gooddata/i18n-toolkit": "10.22.0-alpha.
|
|
98
|
-
"@gooddata/reference-workspace": "10.22.0-alpha.
|
|
99
|
-
"@gooddata/sdk-backend-
|
|
100
|
-
"@gooddata/sdk-backend-
|
|
97
|
+
"@gooddata/i18n-toolkit": "10.22.0-alpha.21",
|
|
98
|
+
"@gooddata/reference-workspace": "10.22.0-alpha.21",
|
|
99
|
+
"@gooddata/sdk-backend-base": "10.22.0-alpha.21",
|
|
100
|
+
"@gooddata/sdk-backend-mockingbird": "10.22.0-alpha.21"
|
|
101
101
|
},
|
|
102
102
|
"scripts": {
|
|
103
103
|
"clean": "rm -rf ci dist esm coverage *.log tsconfig.tsbuildinfo",
|