@darajs/core 1.11.4 → 1.12.1
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/{dara_core-1.11.4-py3-none-any.whl → dara_core-1.12.1-py3-none-any.whl} +0 -0
- package/dist/shared/interactivity/data-variable.d.ts +9 -0
- package/dist/shared/interactivity/data-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/data-variable.js +32 -14
- package/dist/shared/interactivity/data-variable.js.map +1 -1
- package/dist/shared/interactivity/use-data-variable.d.ts +7 -1
- package/dist/shared/interactivity/use-data-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/use-data-variable.js +4 -0
- package/dist/shared/interactivity/use-data-variable.js.map +1 -1
- package/dist/umd/dara.core.umd.js +36 -8
- package/package.json +9 -9
|
Binary file
|
|
@@ -24,7 +24,16 @@ interface TaskResponse {
|
|
|
24
24
|
export interface DataResponse {
|
|
25
25
|
data: DataFrame | null;
|
|
26
26
|
totalCount: number;
|
|
27
|
+
schema: DataFrameSchema;
|
|
27
28
|
}
|
|
29
|
+
type FieldType = {
|
|
30
|
+
name: string | string[];
|
|
31
|
+
type: 'integer' | 'number' | 'boolean' | 'datetime' | 'duration' | 'any' | 'str';
|
|
32
|
+
};
|
|
33
|
+
type DataFrameSchema = {
|
|
34
|
+
fields: FieldType[];
|
|
35
|
+
primaryKey: string[];
|
|
36
|
+
};
|
|
28
37
|
export declare function isDataResponse(response: any): response is DataResponse;
|
|
29
38
|
/**
|
|
30
39
|
* Retrieve the value of a derived data variable from the backend
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/data-variable.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,wBAAwB,EAAqC,MAAM,OAAO,CAAC;AACpF,OAAO,EAAE,aAAa,EAAW,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,mBAAmB,EAAE,WAAW,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAMtH,OAAO,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAG1D;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,oBAAoB,CAMhF;AA8BD;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACnC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,aAAa,EACrB,OAAO,CAAC,EAAE,WAAW,EACrB,UAAU,CAAC,EAAE,UAAU,GACxB,OAAO,CAAC,SAAS,CAAC,CAOpB;AAED,UAAU,YAAY;IAClB,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"data-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/data-variable.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,wBAAwB,EAAqC,MAAM,OAAO,CAAC;AACpF,OAAO,EAAE,aAAa,EAAW,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,mBAAmB,EAAE,WAAW,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAMtH,OAAO,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAG1D;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,oBAAoB,CAMhF;AA8BD;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACnC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,aAAa,EACrB,OAAO,CAAC,EAAE,WAAW,EACrB,UAAU,CAAC,EAAE,UAAU,GACxB,OAAO,CAAC,SAAS,CAAC,CAOpB;AAED,UAAU,YAAY;IAClB,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,eAAe,CAAC;CAC3B;AAED,KAAK,SAAS,GAAG;IACb,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAExB,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,KAAK,GAAG,KAAK,CAAC;CACpF,CAAC;AAEF,KAAK,eAAe,GAAG;IACnB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAEF,wBAAgB,cAAc,CAAC,QAAQ,EAAE,GAAG,GAAG,QAAQ,IAAI,YAAY,CAEtE;AAED;;;;;;;;;GASG;AACH,wBAAsB,wBAAwB,CAC1C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,WAAW,EACrB,UAAU,CAAC,EAAE,UAAU,GACxB,OAAO,CAAC,SAAS,GAAG,YAAY,GAAG,IAAI,CAAC,CAU1C;AA+CD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAChC,QAAQ,EAAE,YAAY,EACtB,oBAAoB,EAAE,MAAM,GAC7B,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,UAAU,KAAK,OAAO,CAAC,YAAY,CAAC,CA4B3E;AAED;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CACvC,QAAQ,EAAE,mBAAmB,EAC7B,WAAW,EAAE,iBAAiB,EAC9B,QAAQ,EAAE,wBAAwB,EAClC,cAAc,EAAE,OAAO,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC,GAC3D,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,UAAU,KAAK,OAAO,CAAC,YAAY,CAAC,CA6E3E;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,CAIjE"}
|
|
@@ -105,6 +105,21 @@ function fetchDataVariableCount(uid, extras, filters, cacheKey) {
|
|
|
105
105
|
return response.json();
|
|
106
106
|
});
|
|
107
107
|
}
|
|
108
|
+
/**
|
|
109
|
+
* Get data variable schema
|
|
110
|
+
*
|
|
111
|
+
* @param uid uid of the variable
|
|
112
|
+
* @param extras request extras to be merged into the options
|
|
113
|
+
* @param cacheKey cache key of the underlying DV in the case of derived data variables
|
|
114
|
+
*/
|
|
115
|
+
function fetchDataVariableSchema(uid, extras, cacheKey) {
|
|
116
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
117
|
+
const response = yield request(`/api/core/data-variable/${uid}/schema`, { body: JSON.stringify({ cache_key: cacheKey }), method: HTTP_METHOD.GET }, extras);
|
|
118
|
+
yield handleAuthErrors(response, true);
|
|
119
|
+
yield validateResponse(response, 'Failed to fetch data variable schema');
|
|
120
|
+
return response.json();
|
|
121
|
+
});
|
|
122
|
+
}
|
|
108
123
|
/**
|
|
109
124
|
* Get a callback to fetch data variable from the backend
|
|
110
125
|
*
|
|
@@ -114,16 +129,17 @@ function fetchDataVariableCount(uid, extras, filters, cacheKey) {
|
|
|
114
129
|
export function useFetchDataVariable(variable, serverTriggerCounter) {
|
|
115
130
|
const eventBus = useEventBus();
|
|
116
131
|
const extras = useRequestExtras();
|
|
117
|
-
const dataCallback = useCallback((
|
|
132
|
+
const dataCallback = useCallback((filters_1, pagination_1, ...args_1) => __awaiter(this, [filters_1, pagination_1, ...args_1], void 0, function* (filters, pagination, withSchema = false) {
|
|
118
133
|
const mergedFilters = combineFilters('AND', [variable.filters, filters]);
|
|
119
134
|
const data = yield fetchDataVariable(variable.uid, extras, mergedFilters, pagination);
|
|
120
|
-
const totalCount = yield
|
|
135
|
+
const [totalCount, schema = null] = yield Promise.all([
|
|
136
|
+
fetchDataVariableCount(variable.uid, extras, mergedFilters),
|
|
137
|
+
...(withSchema ? [fetchDataVariableSchema(variable.uid, extras)] : []),
|
|
138
|
+
]);
|
|
121
139
|
// publish the event
|
|
122
140
|
eventBus.publish('DATA_VARIABLE_LOADED', { variable, value: { data, totalCount } });
|
|
123
|
-
return {
|
|
124
|
-
|
|
125
|
-
totalCount,
|
|
126
|
-
};
|
|
141
|
+
return Object.assign({ data,
|
|
142
|
+
totalCount }, (schema !== null && { schema }));
|
|
127
143
|
}), [variable, extras, serverTriggerCounter, eventBus]);
|
|
128
144
|
return dataCallback;
|
|
129
145
|
}
|
|
@@ -139,8 +155,8 @@ export function useFetchDataVariable(variable, serverTriggerCounter) {
|
|
|
139
155
|
export function useFetchDerivedDataVariable(variable, taskContext, wsClient, dvValuePromise) {
|
|
140
156
|
const eventBus = useEventBus();
|
|
141
157
|
const extras = useRequestExtras();
|
|
142
|
-
const previousResult = useRef({ data: null, totalCount: 0 });
|
|
143
|
-
const dataCallback = useCallback((
|
|
158
|
+
const previousResult = useRef({ data: null, totalCount: 0, schema: { fields: [], primaryKey: [] } });
|
|
159
|
+
const dataCallback = useCallback((filters_1, pagination_1, ...args_1) => __awaiter(this, [filters_1, pagination_1, ...args_1], void 0, function* (filters, pagination, withSchema = false) {
|
|
144
160
|
const mergedFilters = combineFilters('AND', [variable.filters, filters]);
|
|
145
161
|
const dvValue = yield dvValuePromise;
|
|
146
162
|
const response = yield fetchDerivedDataVariable(variable.uid, extras, dvValue.cache_key, yield wsClient.getChannel(), mergedFilters, pagination);
|
|
@@ -174,14 +190,16 @@ export function useFetchDerivedDataVariable(variable, taskContext, wsClient, dvV
|
|
|
174
190
|
}
|
|
175
191
|
// For derived data variables count can only be fetched when task is not running so we have to make the request here
|
|
176
192
|
// As the total count could have changed because of the underlying DV changing
|
|
177
|
-
const totalCount =
|
|
178
|
-
|
|
193
|
+
const [totalCount, schema = null] = yield Promise.all([
|
|
194
|
+
fetchDataVariableCount(variable.uid, extras, mergedFilters),
|
|
195
|
+
...(withSchema ? [fetchDataVariableSchema(variable.uid, extras)] : []),
|
|
196
|
+
]);
|
|
197
|
+
previousResult.current = Object.assign({ data,
|
|
198
|
+
totalCount }, (schema !== null && { schema }));
|
|
179
199
|
// publish the event
|
|
180
200
|
eventBus.publish('DERIVED_DATA_VARIABLE_LOADED', { variable, value: { data, totalCount } });
|
|
181
|
-
return {
|
|
182
|
-
|
|
183
|
-
totalCount,
|
|
184
|
-
};
|
|
201
|
+
return Object.assign({ data,
|
|
202
|
+
totalCount }, (schema !== null && { schema }));
|
|
185
203
|
}), [variable, extras, dvValuePromise, eventBus]);
|
|
186
204
|
return dataCallback;
|
|
187
205
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/data-variable.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,gDAAgD;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAA4B,eAAe,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AACpF,OAAO,EAAiB,OAAO,EAAE,MAAM,YAAY,CAAC;AAIpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAG7C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,QAAsB;IACtD,OAAO;QACH,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,QAAQ,CAAC,GAAG;KACpB,CAAC;AACN,CAAC;AAED;;;;;GAKG;AACH,SAAS,aAAa,CAAC,IAAY,EAAE,UAAuB;IACxD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAElD,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,EAAE,CAAC;QACpB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,EAAE,CAAC;QACrB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,EAAE,CAAC;QACnB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7F,CAAC;IAED,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,EAAE,CAAC;QACpB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAgB,iBAAiB,CACnC,GAAW,EACX,MAAqB,EACrB,OAAqB,EACrB,UAAuB;;QAEvB,MAAM,GAAG,GAAG,aAAa,CAAC,2BAA2B,GAAG,EAAE,EAAE,UAAU,CAAC,CAAC;QAExE,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;QAC7G,MAAM,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACvC,MAAM,gBAAgB,CAAC,QAAQ,EAAE,+BAA+B,CAAC,CAAC;QAClE,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CAAA;
|
|
1
|
+
{"version":3,"file":"data-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/data-variable.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,15 @@ import { DataResponse } from './internal';
|
|
|
4
4
|
* Helper hook which turns a (Derived)DataVariable into a callback to return DataFrame.
|
|
5
5
|
* Can be used in components that only work with data variables.
|
|
6
6
|
*
|
|
7
|
+
* Optionally pass in filters, pagination, and other options to fetch data.
|
|
8
|
+
* Other options include:
|
|
9
|
+
* - schema: boolean - whether to include schema in the response. Default = false.
|
|
10
|
+
*
|
|
7
11
|
* The callback identity changes whenever a refetch should be triggered.
|
|
8
12
|
*
|
|
9
13
|
* @param variable data variable
|
|
10
14
|
*/
|
|
11
|
-
export declare function useDataVariable(variable: AnyDataVariable): (filters?: FilterQuery, pagination?: Pagination
|
|
15
|
+
export declare function useDataVariable(variable: AnyDataVariable): (filters?: FilterQuery, pagination?: Pagination, options?: {
|
|
16
|
+
schema: boolean;
|
|
17
|
+
}) => Promise<DataResponse>;
|
|
12
18
|
//# sourceMappingURL=use-data-variable.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-data-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/use-data-variable.tsx"],"names":[],"mappings":"AAQA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAkB,MAAM,SAAS,CAAC;AAEnF,OAAO,EACH,YAAY,EAMf,MAAM,YAAY,CAAC;AAEpB
|
|
1
|
+
{"version":3,"file":"use-data-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/use-data-variable.tsx"],"names":[],"mappings":"AAQA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAkB,MAAM,SAAS,CAAC;AAEnF,OAAO,EACH,YAAY,EAMf,MAAM,YAAY,CAAC;AAEpB;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAC3B,QAAQ,EAAE,eAAe,GAC1B,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,KAAK,OAAO,CAAC,YAAY,CAAC,CA8C1G"}
|
|
@@ -10,6 +10,10 @@ import { registerDataVariable, useDerivedVariable, useFetchDataVariable, useFetc
|
|
|
10
10
|
* Helper hook which turns a (Derived)DataVariable into a callback to return DataFrame.
|
|
11
11
|
* Can be used in components that only work with data variables.
|
|
12
12
|
*
|
|
13
|
+
* Optionally pass in filters, pagination, and other options to fetch data.
|
|
14
|
+
* Other options include:
|
|
15
|
+
* - schema: boolean - whether to include schema in the response. Default = false.
|
|
16
|
+
*
|
|
13
17
|
* The callback identity changes whenever a refetch should be triggered.
|
|
14
18
|
*
|
|
15
19
|
* @param variable data variable
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-data-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/use-data-variable.tsx"],"names":[],"mappings":"AAAA,+CAA+C;AAE/C,gDAAgD;AAChD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AAEhD,2CAA2C;AAC3C,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC/F,OAAO,EAA4C,cAAc,EAAE,MAAM,SAAS,CAAC;AAEnF,OAAO,EAGH,oBAAoB,EACpB,kBAAkB,EAClB,oBAAoB,EACpB,2BAA2B,GAC9B,MAAM,YAAY,CAAC;AAEpB
|
|
1
|
+
{"version":3,"file":"use-data-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/use-data-variable.tsx"],"names":[],"mappings":"AAAA,+CAA+C;AAE/C,gDAAgD;AAChD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AAEhD,2CAA2C;AAC3C,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC/F,OAAO,EAA4C,cAAc,EAAE,MAAM,SAAS,CAAC;AAEnF,OAAO,EAGH,oBAAoB,EACpB,kBAAkB,EAClB,oBAAoB,EACpB,2BAA2B,GAC9B,MAAM,YAAY,CAAC;AAEpB;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,eAAe,CAC3B,QAAyB;IAEzB,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;IAClC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;IAEtD,IAAI,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3B,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QAClF,MAAM,CAAC,oBAAoB,EAAE,uBAAuB,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACpE,SAAS,CAAC,GAAG,EAAE;YACX,MAAM,GAAG,GAAG,eAAe,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAEnF,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QACnC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;QAEtB,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;QAE/E,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAED,gFAAgF;IAChF,MAAM,gBAAgB,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IACjD,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACrD,SAAS,CAAC,GAAG,EAAE;QACX,OAAO,GAAG,EAAE;YACR,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC5D,CAAC,CAAC;IACN,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,MAAM,UAAU,GAAG,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAC/E,MAAM,UAAU,GAAG,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAEtD,gGAAgG;IAChG,8FAA8F;IAC9F,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAA6C,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC;IAC3G,SAAS,CAAC,GAAG,EAAE;QACX,8DAA8D;QAC9D,IAAI,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACjC,UAAU,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC;QACvC,CAAC;IACL,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IAEjB,MAAM,wBAAwB,GAAG,2BAA2B,CAAC,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAEvG,OAAO,wBAAwB,CAAC;AACpC,CAAC"}
|
|
@@ -33844,6 +33844,8 @@ var __privateWrapper = (obj, member, setter, getter) => ({
|
|
|
33844
33844
|
styled__default.default.div`
|
|
33845
33845
|
position: relative;
|
|
33846
33846
|
|
|
33847
|
+
display: flex;
|
|
33848
|
+
flex-direction: column;
|
|
33847
33849
|
gap: 0.5rem;
|
|
33848
33850
|
|
|
33849
33851
|
width: 100%;
|
|
@@ -33871,7 +33873,9 @@ var __privateWrapper = (obj, member, setter, getter) => ({
|
|
|
33871
33873
|
display: flex;
|
|
33872
33874
|
flex-direction: column;
|
|
33873
33875
|
gap: 0.5rem;
|
|
33876
|
+
|
|
33874
33877
|
width: 100%;
|
|
33878
|
+
|
|
33875
33879
|
color: ${(props) => props.theme.colors.text};
|
|
33876
33880
|
overflow-wrap: break-word;
|
|
33877
33881
|
`;
|
|
@@ -33881,6 +33885,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
|
|
|
33881
33885
|
color: ${(props) => props.theme.colors.grey4};
|
|
33882
33886
|
`;
|
|
33883
33887
|
styled__default.default(Trash)`
|
|
33888
|
+
cursor: pointer;
|
|
33884
33889
|
height: 0.8rem;
|
|
33885
33890
|
color: ${(props) => props.theme.colors.secondary};
|
|
33886
33891
|
|
|
@@ -33893,6 +33898,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
|
|
|
33893
33898
|
}
|
|
33894
33899
|
`;
|
|
33895
33900
|
styled__default.default(PenToSquare)`
|
|
33901
|
+
cursor: pointer;
|
|
33896
33902
|
height: 0.8rem;
|
|
33897
33903
|
color: ${(props) => props.theme.colors.secondary};
|
|
33898
33904
|
|
|
@@ -57513,18 +57519,32 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
|
|
|
57513
57519
|
await validateResponse(response, "Failed to fetch data variable total count");
|
|
57514
57520
|
return response.json();
|
|
57515
57521
|
}
|
|
57522
|
+
async function fetchDataVariableSchema(uid2, extras, cacheKey) {
|
|
57523
|
+
const response = await request(
|
|
57524
|
+
`/api/core/data-variable/${uid2}/schema`,
|
|
57525
|
+
{ body: JSON.stringify({ cache_key: cacheKey }), method: HTTP_METHOD.GET },
|
|
57526
|
+
extras
|
|
57527
|
+
);
|
|
57528
|
+
await handleAuthErrors(response, true);
|
|
57529
|
+
await validateResponse(response, "Failed to fetch data variable schema");
|
|
57530
|
+
return response.json();
|
|
57531
|
+
}
|
|
57516
57532
|
function useFetchDataVariable(variable, serverTriggerCounter) {
|
|
57517
57533
|
const eventBus = useEventBus();
|
|
57518
57534
|
const extras = useRequestExtras();
|
|
57519
57535
|
const dataCallback = React.useCallback(
|
|
57520
|
-
async (filters, pagination) => {
|
|
57536
|
+
async (filters, pagination, withSchema = false) => {
|
|
57521
57537
|
const mergedFilters = combineFilters("AND", [variable.filters, filters]);
|
|
57522
57538
|
const data = await fetchDataVariable(variable.uid, extras, mergedFilters, pagination);
|
|
57523
|
-
const totalCount = await
|
|
57539
|
+
const [totalCount, schema = null] = await Promise.all([
|
|
57540
|
+
fetchDataVariableCount(variable.uid, extras, mergedFilters),
|
|
57541
|
+
...withSchema ? [fetchDataVariableSchema(variable.uid, extras)] : []
|
|
57542
|
+
]);
|
|
57524
57543
|
eventBus.publish("DATA_VARIABLE_LOADED", { variable, value: { data, totalCount } });
|
|
57525
57544
|
return {
|
|
57526
57545
|
data,
|
|
57527
|
-
totalCount
|
|
57546
|
+
totalCount,
|
|
57547
|
+
...schema !== null && { schema }
|
|
57528
57548
|
};
|
|
57529
57549
|
},
|
|
57530
57550
|
[variable, extras, serverTriggerCounter, eventBus]
|
|
@@ -57534,9 +57554,9 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
|
|
|
57534
57554
|
function useFetchDerivedDataVariable(variable, taskContext, wsClient, dvValuePromise) {
|
|
57535
57555
|
const eventBus = useEventBus();
|
|
57536
57556
|
const extras = useRequestExtras();
|
|
57537
|
-
const previousResult = React.useRef({ data: null, totalCount: 0 });
|
|
57557
|
+
const previousResult = React.useRef({ data: null, totalCount: 0, schema: { fields: [], primaryKey: [] } });
|
|
57538
57558
|
const dataCallback = React.useCallback(
|
|
57539
|
-
async (filters, pagination) => {
|
|
57559
|
+
async (filters, pagination, withSchema = false) => {
|
|
57540
57560
|
const mergedFilters = combineFilters("AND", [variable.filters, filters]);
|
|
57541
57561
|
const dvValue = await dvValuePromise;
|
|
57542
57562
|
const response = await fetchDerivedDataVariable(
|
|
@@ -57565,12 +57585,20 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
|
|
|
57565
57585
|
} else {
|
|
57566
57586
|
data = response;
|
|
57567
57587
|
}
|
|
57568
|
-
const totalCount =
|
|
57569
|
-
|
|
57588
|
+
const [totalCount, schema = null] = await Promise.all([
|
|
57589
|
+
fetchDataVariableCount(variable.uid, extras, mergedFilters),
|
|
57590
|
+
...withSchema ? [fetchDataVariableSchema(variable.uid, extras)] : []
|
|
57591
|
+
]);
|
|
57592
|
+
previousResult.current = {
|
|
57593
|
+
data,
|
|
57594
|
+
totalCount,
|
|
57595
|
+
...schema !== null && { schema }
|
|
57596
|
+
};
|
|
57570
57597
|
eventBus.publish("DERIVED_DATA_VARIABLE_LOADED", { variable, value: { data, totalCount } });
|
|
57571
57598
|
return {
|
|
57572
57599
|
data,
|
|
57573
|
-
totalCount
|
|
57600
|
+
totalCount,
|
|
57601
|
+
...schema !== null && { schema }
|
|
57574
57602
|
};
|
|
57575
57603
|
},
|
|
57576
57604
|
[variable, extras, dvValuePromise, eventBus]
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@darajs/core",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.12.1",
|
|
4
4
|
"description": "Dara Framework core",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"module": "dist/index.js",
|
|
@@ -37,9 +37,9 @@
|
|
|
37
37
|
"@babel/preset-env": "^7.23.0",
|
|
38
38
|
"@babel/preset-react": "^7.22.15",
|
|
39
39
|
"@babel/preset-typescript": "^7.23.0",
|
|
40
|
-
"@darajs/eslint-config": "1.
|
|
41
|
-
"@darajs/prettier-config": "1.
|
|
42
|
-
"@darajs/stylelint-config": "1.
|
|
40
|
+
"@darajs/eslint-config": "1.12.1",
|
|
41
|
+
"@darajs/prettier-config": "1.12.1",
|
|
42
|
+
"@darajs/stylelint-config": "1.12.1",
|
|
43
43
|
"@rollup/plugin-inject": "^4.0.4",
|
|
44
44
|
"@testing-library/dom": "^9.3.0",
|
|
45
45
|
"@testing-library/jest-dom": "^5.16.5",
|
|
@@ -79,10 +79,10 @@
|
|
|
79
79
|
"whatwg-fetch": "^3.6.2"
|
|
80
80
|
},
|
|
81
81
|
"dependencies": {
|
|
82
|
-
"@darajs/styled-components": "1.
|
|
83
|
-
"@darajs/ui-components": "1.
|
|
84
|
-
"@darajs/ui-notifications": "1.
|
|
85
|
-
"@darajs/ui-utils": "1.
|
|
82
|
+
"@darajs/styled-components": "1.12.1",
|
|
83
|
+
"@darajs/ui-components": "1.12.1",
|
|
84
|
+
"@darajs/ui-notifications": "1.12.1",
|
|
85
|
+
"@darajs/ui-utils": "1.12.1",
|
|
86
86
|
"@fortawesome/fontawesome-free": "~6.4.0",
|
|
87
87
|
"@recoiljs/refine": "^0.1.1",
|
|
88
88
|
"@tanstack/query-core": "^4.0.0",
|
|
@@ -118,5 +118,5 @@
|
|
|
118
118
|
"publishConfig": {
|
|
119
119
|
"access": "public"
|
|
120
120
|
},
|
|
121
|
-
"gitHead": "
|
|
121
|
+
"gitHead": "984b822936a73a32ec83621d24412e4bb9b54e32"
|
|
122
122
|
}
|