@darajs/core 1.4.6 → 1.5.0
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/actions/download-variable.js +1 -1
- package/dist/actions/download-variable.js.map +1 -1
- package/dist/actions/navigate-to.js.map +1 -1
- package/dist/actions/reset-variables.d.ts.map +1 -1
- package/dist/actions/reset-variables.js +1 -1
- package/dist/actions/reset-variables.js.map +1 -1
- package/dist/actions/update-variable.d.ts.map +1 -1
- package/dist/actions/update-variable.js +1 -1
- package/dist/actions/update-variable.js.map +1 -1
- package/dist/api/core.d.ts +3 -2
- package/dist/api/core.d.ts.map +1 -1
- package/dist/api/core.js +13 -13
- package/dist/api/core.js.map +1 -1
- package/dist/api/http.d.ts +27 -2
- package/dist/api/http.d.ts.map +1 -1
- package/dist/api/http.js +49 -5
- package/dist/api/http.js.map +1 -1
- package/dist/api/index.d.ts +1 -1
- package/dist/api/index.d.ts.map +1 -1
- package/dist/api/index.js.map +1 -1
- package/dist/api/websocket.js.map +1 -1
- package/dist/auth/auth-wrapper.js.map +1 -1
- package/dist/auth/auth.d.ts.map +1 -1
- package/dist/auth/auth.js +3 -3
- package/dist/auth/auth.js.map +1 -1
- package/dist/auth/basic/basic-auth-login.js.map +1 -1
- package/dist/auth/default/default-auth-login.js.map +1 -1
- package/dist/components/for/for.js.map +1 -1
- package/dist/components/progress-tracker/progress-tracker.js.map +1 -1
- package/dist/{dara_core-1.4.6-py3-none-any.whl → dara_core-1.5.0-py3-none-any.whl} +0 -0
- package/dist/devtools/devtools-wrapper.js.map +1 -1
- package/dist/devtools/floating-button.js.map +1 -1
- package/dist/devtools/use-move.js.map +1 -1
- package/dist/index.d.ts +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/run.js.map +1 -1
- package/dist/shared/context/global-task-context.d.ts.map +1 -1
- package/dist/shared/context/global-task-context.js +6 -4
- package/dist/shared/context/global-task-context.js.map +1 -1
- package/dist/shared/context/index.d.ts +1 -0
- package/dist/shared/context/index.d.ts.map +1 -1
- package/dist/shared/context/index.js +1 -0
- package/dist/shared/context/index.js.map +1 -1
- package/dist/shared/context/request-extras-context.d.ts +35 -0
- package/dist/shared/context/request-extras-context.d.ts.map +1 -0
- package/dist/shared/context/request-extras-context.js +61 -0
- package/dist/shared/context/request-extras-context.js.map +1 -0
- package/dist/shared/dynamic-component/dynamic-component.js +1 -1
- package/dist/shared/dynamic-component/dynamic-component.js.map +1 -1
- package/dist/shared/error-handling/types.d.ts +2 -1
- package/dist/shared/error-handling/types.d.ts.map +1 -1
- package/dist/shared/error-handling/types.js +2 -2
- package/dist/shared/error-handling/types.js.map +1 -1
- package/dist/shared/index.d.ts +1 -1
- package/dist/shared/index.d.ts.map +1 -1
- package/dist/shared/index.js +1 -1
- package/dist/shared/index.js.map +1 -1
- package/dist/shared/interactivity/data-variable.d.ts +5 -6
- package/dist/shared/interactivity/data-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/data-variable.js +19 -21
- package/dist/shared/interactivity/data-variable.js.map +1 -1
- package/dist/shared/interactivity/derived-variable.d.ts +18 -11
- package/dist/shared/interactivity/derived-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/derived-variable.js +87 -46
- package/dist/shared/interactivity/derived-variable.js.map +1 -1
- package/dist/shared/interactivity/filtering.js.map +1 -1
- package/dist/shared/interactivity/index.d.ts +1 -1
- package/dist/shared/interactivity/index.d.ts.map +1 -1
- package/dist/shared/interactivity/index.js +0 -1
- package/dist/shared/interactivity/index.js.map +1 -1
- package/dist/shared/interactivity/nested.js.map +1 -1
- package/dist/shared/interactivity/plain-variable.d.ts +5 -4
- package/dist/shared/interactivity/plain-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/plain-variable.js +145 -46
- package/dist/shared/interactivity/plain-variable.js.map +1 -1
- package/dist/shared/interactivity/resolve-value.js.map +1 -1
- package/dist/shared/interactivity/resolve-variable.d.ts +3 -3
- package/dist/shared/interactivity/resolve-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/resolve-variable.js +5 -6
- package/dist/shared/interactivity/resolve-variable.js.map +1 -1
- package/dist/shared/interactivity/store.d.ts +41 -8
- package/dist/shared/interactivity/store.d.ts.map +1 -1
- package/dist/shared/interactivity/store.js +55 -23
- package/dist/shared/interactivity/store.js.map +1 -1
- package/dist/shared/interactivity/triggers.js.map +1 -1
- package/dist/shared/interactivity/url-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/url-variable.js +1 -2
- package/dist/shared/interactivity/url-variable.js.map +1 -1
- package/dist/shared/interactivity/use-any-variable.js.map +1 -1
- package/dist/shared/interactivity/use-data-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/use-data-variable.js +3 -6
- package/dist/shared/interactivity/use-data-variable.js.map +1 -1
- package/dist/shared/interactivity/use-refresh-selector.d.ts +1 -1
- package/dist/shared/interactivity/use-refresh-selector.d.ts.map +1 -1
- package/dist/shared/interactivity/use-refresh-selector.js +9 -5
- package/dist/shared/interactivity/use-refresh-selector.js.map +1 -1
- package/dist/shared/interactivity/use-server-component.d.ts.map +1 -1
- package/dist/shared/interactivity/use-server-component.js +45 -29
- package/dist/shared/interactivity/use-server-component.js.map +1 -1
- package/dist/shared/interactivity/use-variable-state.d.ts.map +1 -1
- package/dist/shared/interactivity/use-variable-state.js +5 -14
- package/dist/shared/interactivity/use-variable-state.js.map +1 -1
- package/dist/shared/interactivity/use-variable-value.d.ts +2 -1
- package/dist/shared/interactivity/use-variable-value.d.ts.map +1 -1
- package/dist/shared/interactivity/use-variable-value.js +13 -10
- package/dist/shared/interactivity/use-variable-value.js.map +1 -1
- package/dist/shared/interactivity/use-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/use-variable.js +5 -8
- package/dist/shared/interactivity/use-variable.js.map +1 -1
- package/dist/shared/private-route/private-route.js.map +1 -1
- package/dist/shared/template-root/dynamic-context.js.map +1 -1
- package/dist/shared/template-root/template-root.js.map +1 -1
- package/dist/shared/utils/clean-session-cache.js.map +1 -1
- package/dist/shared/utils/embed.js.map +1 -1
- package/dist/shared/utils/get-icon.js.map +1 -1
- package/dist/shared/utils/hashing.js.map +1 -1
- package/dist/shared/utils/inject-css.js.map +1 -1
- package/dist/shared/utils/normalization.js.map +1 -1
- package/dist/shared/utils/resolve-theme.js.map +1 -1
- package/dist/shared/utils/templating.js.map +1 -1
- package/dist/shared/utils/use-action-registry.js.map +1 -1
- package/dist/shared/utils/use-action.d.ts.map +1 -1
- package/dist/shared/utils/use-action.js +8 -9
- package/dist/shared/utils/use-action.js.map +1 -1
- package/dist/shared/utils/use-component-registry.d.ts.map +1 -1
- package/dist/shared/utils/use-component-registry.js +3 -4
- package/dist/shared/utils/use-component-registry.js.map +1 -1
- package/dist/shared/utils/use-component-styles.js.map +1 -1
- package/dist/shared/utils/use-defer-loadable.js.map +1 -1
- package/dist/shared/utils/use-interval.js.map +1 -1
- package/dist/shared/utils/use-url-sync.js.map +1 -1
- package/dist/shared/utils/use-window-title.js.map +1 -1
- package/dist/types/core.d.ts +4 -3
- package/dist/types/core.d.ts.map +1 -1
- package/dist/types/core.js.map +1 -1
- package/dist/umd/dara.core.umd.js +22782 -30226
- package/dist/utils.d.ts +9 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +10 -1
- package/dist/utils.js.map +1 -1
- package/package.json +11 -11
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
/* eslint-disable react-hooks/rules-of-hooks */
|
|
2
2
|
/* eslint-disable react-hooks/exhaustive-deps */
|
|
3
3
|
import { useContext, useEffect, useMemo, useState } from 'react';
|
|
4
|
-
import { useLocation } from 'react-router-dom';
|
|
5
4
|
import { useRecoilValueLoadable } from 'recoil';
|
|
6
5
|
// eslint-disable-next-line import/no-cycle
|
|
7
|
-
import {
|
|
8
|
-
import { VariableCtx, WebSocketCtx, useTaskContext } from '../../shared/context';
|
|
6
|
+
import { VariableCtx, WebSocketCtx, useRequestExtras, useTaskContext } from '../../shared/context';
|
|
9
7
|
import { isDataVariable } from '../../types';
|
|
10
8
|
import { registerDataVariable, useDerivedVariable, useFetchDataVariable, useFetchDerivedDataVariable, } from './internal';
|
|
11
9
|
/**
|
|
@@ -17,7 +15,7 @@ import { registerDataVariable, useDerivedVariable, useFetchDataVariable, useFetc
|
|
|
17
15
|
* @param variable data variable
|
|
18
16
|
*/
|
|
19
17
|
export function useDataVariable(variable) {
|
|
20
|
-
const
|
|
18
|
+
const extras = useRequestExtras();
|
|
21
19
|
const { client: WsClient } = useContext(WebSocketCtx);
|
|
22
20
|
if (isDataVariable(variable)) {
|
|
23
21
|
registerDataVariable(variable);
|
|
@@ -39,8 +37,7 @@ export function useDataVariable(variable) {
|
|
|
39
37
|
};
|
|
40
38
|
}, []);
|
|
41
39
|
const taskContext = useTaskContext();
|
|
42
|
-
const
|
|
43
|
-
const dvSelector = useDerivedVariable(variable, WsClient, taskContext, search, token);
|
|
40
|
+
const dvSelector = useDerivedVariable(variable, WsClient, taskContext, extras);
|
|
44
41
|
const dvLoadable = useRecoilValueLoadable(dvSelector);
|
|
45
42
|
// We can't directly use the loadable as the callback's dependency because the loadable identity
|
|
46
43
|
// changes whenever it also changes state; we only want to update it when there is a new value
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-data-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/use-data-variable.tsx"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,gDAAgD;AAEhD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"use-data-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/use-data-variable.tsx"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,gDAAgD;AAEhD,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;;;;;;;GAOG;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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-refresh-selector.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/use-refresh-selector.tsx"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,kBAAkB,IAAI,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"use-refresh-selector.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/use-refresh-selector.tsx"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,kBAAkB,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAclF"}
|
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
import { useRecoilCallback } from 'recoil';
|
|
2
|
-
import {
|
|
2
|
+
import { selectorFamilyMembersRegistry, selectorFamilyRegistry } from './store';
|
|
3
3
|
/**
|
|
4
4
|
* Helper hook to refresh a selector by its key
|
|
5
5
|
*/
|
|
6
6
|
export default function useRefreshSelector() {
|
|
7
7
|
return useRecoilCallback(({ refresh }) => {
|
|
8
|
-
return (key) => {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
8
|
+
return (key, extras) => {
|
|
9
|
+
var _a;
|
|
10
|
+
const family = selectorFamilyRegistry.get(key);
|
|
11
|
+
if (family) {
|
|
12
|
+
const selector = (_a = selectorFamilyMembersRegistry.get(family)) === null || _a === void 0 ? void 0 : _a.get(extras);
|
|
13
|
+
if (selector) {
|
|
14
|
+
refresh(selector);
|
|
15
|
+
}
|
|
12
16
|
}
|
|
13
17
|
};
|
|
14
18
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-refresh-selector.js","sourceRoot":"","sources":["../../../js/shared/interactivity/use-refresh-selector.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"use-refresh-selector.js","sourceRoot":"","sources":["../../../js/shared/interactivity/use-refresh-selector.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,EAAE,6BAA6B,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEhF;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,kBAAkB;IACtC,OAAO,iBAAiB,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;QACrC,OAAO,CAAC,GAAW,EAAE,MAAc,EAAE,EAAE;;YACnC,MAAM,MAAM,GAAG,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAE/C,IAAI,MAAM,EAAE,CAAC;gBACT,MAAM,QAAQ,GAAG,MAAA,6BAA6B,CAAC,GAAG,CAAC,MAAM,CAAC,0CAAE,GAAG,CAAC,MAAM,CAAC,CAAC;gBAExE,IAAI,QAAQ,EAAE,CAAC;oBACX,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACtB,CAAC;YACL,CAAC;QACL,CAAC,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-server-component.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/use-server-component.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"use-server-component.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/use-server-component.tsx"],"names":[],"mappings":"AAWA,OAAO,EACH,WAAW,EACX,iBAAiB,EAKpB,MAAM,SAAS,CAAC;AAkEjB;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,GAAG,CAa9D;AAmLD;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,GAChD,iBAAiB,CAmBnB;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,IAAI,CAajE"}
|
|
@@ -20,19 +20,18 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
20
20
|
return t;
|
|
21
21
|
};
|
|
22
22
|
import { useContext, useEffect } from 'react';
|
|
23
|
-
import {
|
|
24
|
-
import { atom, selector, useRecoilCallback, useRecoilValueLoadable } from 'recoil';
|
|
23
|
+
import { atom, selectorFamily, useRecoilCallback, useRecoilValueLoadable } from 'recoil';
|
|
25
24
|
import { HTTP_METHOD, validateResponse } from '@darajs/ui-utils';
|
|
26
25
|
import { fetchTaskResult, request } from '../../api';
|
|
27
|
-
import {
|
|
26
|
+
import { RequestExtrasSerializable } from '../../api/http';
|
|
28
27
|
import { useDeferLoadable } from '../../shared/utils';
|
|
29
28
|
import { denormalize, normalizeRequest } from '../../shared/utils/normalization';
|
|
30
29
|
import { isResolvedDerivedDataVariable, isResolvedDerivedVariable, } from '../../types';
|
|
31
|
-
import { VariableCtx, WebSocketCtx } from '../context';
|
|
30
|
+
import { VariableCtx, WebSocketCtx, useRequestExtras } from '../context';
|
|
32
31
|
import { useTaskContext } from '../context/global-task-context';
|
|
33
32
|
import { resolveDerivedValue } from './derived-variable';
|
|
34
33
|
import { resolveVariable } from './resolve-variable';
|
|
35
|
-
import { atomRegistry, depsRegistry,
|
|
34
|
+
import { atomRegistry, depsRegistry, selectorFamilyMembersRegistry, selectorFamilyRegistry, } from './store';
|
|
36
35
|
function isTaskResponse(response) {
|
|
37
36
|
return response && typeof response === 'object' && 'task_id' in response;
|
|
38
37
|
}
|
|
@@ -53,15 +52,18 @@ function getComponentRegistryKey(uid, trigger) {
|
|
|
53
52
|
* Fetch a component from the backend, expects a component instance to be returned.
|
|
54
53
|
*
|
|
55
54
|
* @param component the component to fetch
|
|
56
|
-
* @param
|
|
55
|
+
* @param values the values to pass into the component
|
|
56
|
+
* @param uid the component instance uid
|
|
57
|
+
* @param extras request extras to be merged into the options
|
|
58
|
+
* @param wsClient websocket client
|
|
57
59
|
*/
|
|
58
|
-
function fetchFunctionComponent(component, values, uid,
|
|
60
|
+
function fetchFunctionComponent(component, values, uid, extras, wsClient) {
|
|
59
61
|
return __awaiter(this, void 0, void 0, function* () {
|
|
60
62
|
const ws_channel = yield wsClient.getChannel();
|
|
61
63
|
const res = yield request(`/api/core/components/${component}`, {
|
|
62
64
|
body: JSON.stringify({ uid, values, ws_channel }),
|
|
63
65
|
method: HTTP_METHOD.POST,
|
|
64
|
-
},
|
|
66
|
+
}, extras);
|
|
65
67
|
yield validateResponse(res, `Failed to fetch the component: ${component}`);
|
|
66
68
|
const result = yield res.json();
|
|
67
69
|
return result;
|
|
@@ -110,27 +112,28 @@ function getOrRegisterComponentTrigger(uid) {
|
|
|
110
112
|
* @param wsClient websocket client
|
|
111
113
|
* @param taskContext task context
|
|
112
114
|
* @param search current search string
|
|
113
|
-
* @param
|
|
115
|
+
* @param currentExtras request extras to be merged into the options
|
|
114
116
|
*/
|
|
115
|
-
function getOrRegisterServerComponent(name, uid, dynamicKwargs, wsClient, taskContext,
|
|
117
|
+
function getOrRegisterServerComponent(name, uid, dynamicKwargs, wsClient, taskContext, currentExtras) {
|
|
116
118
|
const key = getComponentRegistryKey(uid);
|
|
117
|
-
if (!
|
|
118
|
-
|
|
119
|
-
const resolvedKwargs = Object.keys(dynamicKwargs).reduce((acc, k) => {
|
|
120
|
-
const value = dynamicKwargs[k];
|
|
121
|
-
acc[k] = resolveVariable(value, wsClient, taskContext, search, token);
|
|
122
|
-
return acc;
|
|
123
|
-
}, {});
|
|
124
|
-
// Turn kwargs into lists so we can re-use the DerivedVariable logic
|
|
125
|
-
const resolvedKwargsList = Object.values(resolvedKwargs);
|
|
126
|
-
const kwargsList = Object.values(dynamicKwargs);
|
|
127
|
-
const triggerAtom = getOrRegisterComponentTrigger(uid);
|
|
128
|
-
selectorRegistry.set(key, selector({
|
|
119
|
+
if (!selectorFamilyRegistry.has(key)) {
|
|
120
|
+
selectorFamilyRegistry.set(key, selectorFamily({
|
|
129
121
|
cachePolicy_UNSTABLE: {
|
|
130
122
|
eviction: 'most-recent',
|
|
131
123
|
},
|
|
132
|
-
get: ({ get }) => __awaiter(this, void 0, void 0, function* () {
|
|
124
|
+
get: (extrasSerializable) => ({ get }) => __awaiter(this, void 0, void 0, function* () {
|
|
125
|
+
// Kwargs resolved to their simple values
|
|
126
|
+
const resolvedKwargs = Object.keys(dynamicKwargs).reduce((acc, k) => {
|
|
127
|
+
const value = dynamicKwargs[k];
|
|
128
|
+
acc[k] = resolveVariable(value, wsClient, taskContext, currentExtras);
|
|
129
|
+
return acc;
|
|
130
|
+
}, {});
|
|
131
|
+
// Turn kwargs into lists so we can re-use the DerivedVariable logic
|
|
132
|
+
const resolvedKwargsList = Object.values(resolvedKwargs);
|
|
133
|
+
const kwargsList = Object.values(dynamicKwargs);
|
|
134
|
+
const triggerAtom = getOrRegisterComponentTrigger(uid);
|
|
133
135
|
const selfTrigger = get(triggerAtom);
|
|
136
|
+
const { extras } = extrasSerializable;
|
|
134
137
|
const derivedResult = yield resolveDerivedValue(key, kwargsList, kwargsList, // pass deps=kwargs
|
|
135
138
|
resolvedKwargsList, wsClient, get, selfTrigger);
|
|
136
139
|
// returning previous result as no change in dependant values
|
|
@@ -145,10 +148,11 @@ function getOrRegisterServerComponent(name, uid, dynamicKwargs, wsClient, taskCo
|
|
|
145
148
|
}, {}), derivedResult.force);
|
|
146
149
|
let result = null;
|
|
147
150
|
try {
|
|
148
|
-
result = yield fetchFunctionComponent(name, normalizeRequest(kwargValues, dynamicKwargs), uid,
|
|
151
|
+
result = yield fetchFunctionComponent(name, normalizeRequest(kwargValues, dynamicKwargs), uid, extras, wsClient);
|
|
149
152
|
}
|
|
150
153
|
catch (e) {
|
|
151
154
|
e.selectorId = key;
|
|
155
|
+
e.selectorExtras = extrasSerializable.toJSON();
|
|
152
156
|
throw e;
|
|
153
157
|
}
|
|
154
158
|
taskContext.cleanupRunningTasks(key);
|
|
@@ -167,10 +171,11 @@ function getOrRegisterServerComponent(name, uid, dynamicKwargs, wsClient, taskCo
|
|
|
167
171
|
taskContext.endTask(taskId);
|
|
168
172
|
}
|
|
169
173
|
try {
|
|
170
|
-
result = yield fetchTaskResult(taskId,
|
|
174
|
+
result = yield fetchTaskResult(taskId, extras);
|
|
171
175
|
}
|
|
172
176
|
catch (e) {
|
|
173
177
|
e.selectorId = key;
|
|
178
|
+
e.selectorExtras = extrasSerializable.toJSON();
|
|
174
179
|
throw e;
|
|
175
180
|
}
|
|
176
181
|
}
|
|
@@ -188,7 +193,19 @@ function getOrRegisterServerComponent(name, uid, dynamicKwargs, wsClient, taskCo
|
|
|
188
193
|
key,
|
|
189
194
|
}));
|
|
190
195
|
}
|
|
191
|
-
|
|
196
|
+
const family = selectorFamilyRegistry.get(key);
|
|
197
|
+
// Get a selector instance for this particular extras value
|
|
198
|
+
// This is required as otherwise the selector is not aware of different possible extras values
|
|
199
|
+
// at the call site of e.g. useVariable and would otherwise be a stale closure using the initial extras when
|
|
200
|
+
// first registered
|
|
201
|
+
const serializableExtras = new RequestExtrasSerializable(currentExtras);
|
|
202
|
+
const selectorInstance = family(serializableExtras);
|
|
203
|
+
// register selector instance in the selector family registry
|
|
204
|
+
if (!selectorFamilyMembersRegistry.has(family)) {
|
|
205
|
+
selectorFamilyMembersRegistry.set(family, new Map());
|
|
206
|
+
}
|
|
207
|
+
selectorFamilyMembersRegistry.get(family).set(serializableExtras.toJSON(), selectorInstance);
|
|
208
|
+
return selectorInstance;
|
|
192
209
|
}
|
|
193
210
|
/**
|
|
194
211
|
* A hook to fetch a server component
|
|
@@ -198,11 +215,10 @@ function getOrRegisterServerComponent(name, uid, dynamicKwargs, wsClient, taskCo
|
|
|
198
215
|
* @param dynamicKwargs kwargs passed into the component
|
|
199
216
|
*/
|
|
200
217
|
export default function useServerComponent(name, uid, dynamicKwargs) {
|
|
201
|
-
const
|
|
218
|
+
const extras = useRequestExtras();
|
|
202
219
|
const { client: wsClient } = useContext(WebSocketCtx);
|
|
203
220
|
const taskContext = useTaskContext();
|
|
204
221
|
const variablesContext = useContext(VariableCtx);
|
|
205
|
-
const { search } = useLocation();
|
|
206
222
|
// Synchronously register the py_component uid, and clean it up on unmount
|
|
207
223
|
variablesContext.variables.current.add(getComponentRegistryKey(uid));
|
|
208
224
|
useEffect(() => {
|
|
@@ -210,7 +226,7 @@ export default function useServerComponent(name, uid, dynamicKwargs) {
|
|
|
210
226
|
variablesContext.variables.current.delete(getComponentRegistryKey(uid));
|
|
211
227
|
};
|
|
212
228
|
}, []);
|
|
213
|
-
const componentSelector = getOrRegisterServerComponent(name, uid, dynamicKwargs, wsClient, taskContext,
|
|
229
|
+
const componentSelector = getOrRegisterServerComponent(name, uid, dynamicKwargs, wsClient, taskContext, extras);
|
|
214
230
|
const componentLoadable = useRecoilValueLoadable(componentSelector);
|
|
215
231
|
const deferred = useDeferLoadable(componentLoadable);
|
|
216
232
|
return deferred;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-server-component.js","sourceRoot":"","sources":["../../../js/shared/interactivity/use-server-component.tsx"],"names":[],"mappings":"AAAA,gDAAgD;;;;;;;;;;;;;;;;;;;;;AAEhD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"use-server-component.js","sourceRoot":"","sources":["../../../js/shared/interactivity/use-server-component.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-variable-state.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/use-variable-state.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"use-variable-state.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/use-variable-state.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAe,oBAAoB,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAKlH,KAAK,mBAAmB,GAAG,oBAAoB,GAAG,2BAA2B,GAAG,uBAAuB,CAAC;AAExG;;;GAGG;AAEH,MAAM,CAAC,OAAO,UAAU,gBAAgB,IAAI,GAAG,GAAG,mBAAmB,CAmBpE"}
|
|
@@ -1,33 +1,24 @@
|
|
|
1
1
|
import { useContext } from 'react';
|
|
2
|
-
import { useLocation } from 'react-router';
|
|
3
2
|
import { useRecoilCallback } from 'recoil';
|
|
4
|
-
import {
|
|
5
|
-
import { WebSocketCtx, useTaskContext } from '../../shared/context';
|
|
6
|
-
import { isVariable, } from '../../types';
|
|
3
|
+
import { WebSocketCtx, useRequestExtras, useTaskContext } from '../../shared/context';
|
|
7
4
|
import { resolveVariable } from './resolve-variable';
|
|
8
|
-
import {
|
|
5
|
+
import { isRegistered } from './store';
|
|
9
6
|
/**
|
|
10
7
|
* Helper hook to get the current state of the variable.
|
|
11
8
|
* For client-side variables, returns their value. For server-side variables, returns their resolved forms.
|
|
12
9
|
*/
|
|
13
10
|
// eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
|
|
14
11
|
export default function useVariableState() {
|
|
15
|
-
const
|
|
12
|
+
const extras = useRequestExtras();
|
|
16
13
|
const { client } = useContext(WebSocketCtx);
|
|
17
14
|
const taskCtx = useTaskContext();
|
|
18
|
-
const { search } = useLocation();
|
|
19
15
|
return useRecoilCallback(({ snapshot }) => {
|
|
20
16
|
return (variable) => {
|
|
21
17
|
if (!isRegistered(variable)) {
|
|
22
18
|
return '__NOT_REGISTERED__';
|
|
23
19
|
}
|
|
24
|
-
//
|
|
25
|
-
|
|
26
|
-
const atom = atomRegistry.get(variable.uid);
|
|
27
|
-
return snapshot.getLoadable(atom).getValue();
|
|
28
|
-
}
|
|
29
|
-
// otherwise we'll just get the resolved form of the variable
|
|
30
|
-
const resolvedVariable = resolveVariable(variable, client, taskCtx, search, token, (v) => snapshot.getLoadable(v).getValue());
|
|
20
|
+
// get the resolved form of the variable
|
|
21
|
+
const resolvedVariable = resolveVariable(variable, client, taskCtx, extras, (v) => snapshot.getLoadable(v).getValue());
|
|
31
22
|
return resolvedVariable;
|
|
32
23
|
};
|
|
33
24
|
}, []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-variable-state.js","sourceRoot":"","sources":["../../../js/shared/interactivity/use-variable-state.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"use-variable-state.js","sourceRoot":"","sources":["../../../js/shared/interactivity/use-variable-state.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAIvC;;;GAGG;AACH,6EAA6E;AAC7E,MAAM,CAAC,OAAO,UAAU,gBAAgB;IACpC,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;IAClC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,cAAc,EAAE,CAAC;IAEjC,OAAO,iBAAiB,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;QACtC,OAAO,CAAC,QAA0B,EAAE,EAAE;YAClC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC1B,OAAO,oBAAoB,CAAC;YAChC,CAAC;YAED,wCAAwC;YACxC,MAAM,gBAAgB,GAAG,eAAe,CAAsB,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CACnG,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CACrC,CAAC;YAEF,OAAO,gBAAgB,CAAC;QAC5B,CAAC,CAAC;IACN,CAAC,EAAE,EAAE,CAAC,CAAC;AACX,CAAC"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { Snapshot } from 'recoil';
|
|
2
2
|
import { WebSocketClientInterface } from '../../api';
|
|
3
|
+
import { RequestExtras } from '../../api/http';
|
|
3
4
|
import { AnyVariable, DataFrame, DataVariable, DerivedDataVariable, DerivedVariable, ResolvedDataVariable, ResolvedDerivedDataVariable, ResolvedDerivedVariable, Variable } from '../../types';
|
|
4
5
|
import { GlobalTaskContext } from '../context/global-task-context';
|
|
5
6
|
type GetVariableValueCtx = {
|
|
6
7
|
client: WebSocketClientInterface;
|
|
8
|
+
extras: RequestExtras;
|
|
7
9
|
search: string;
|
|
8
10
|
snapshot: Snapshot;
|
|
9
11
|
taskContext: GlobalTaskContext;
|
|
10
|
-
token: string;
|
|
11
12
|
};
|
|
12
13
|
/**
|
|
13
14
|
* Helper function that returns the current value of a variable.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-variable-value.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/use-variable-value.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAqB,MAAM,QAAQ,CAAC;AAKrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"use-variable-value.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/use-variable-value.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAqB,MAAM,QAAQ,CAAC;AAKrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAG3C,OAAO,EACH,WAAW,EACX,SAAS,EACT,YAAY,EACZ,mBAAmB,EACnB,eAAe,EACf,oBAAoB,EACpB,2BAA2B,EAC3B,uBAAuB,EACvB,QAAQ,EAQX,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAUnE,KAAK,mBAAmB,GAAG;IACvB,MAAM,EAAE,wBAAwB,CAAC;IACjC,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,iBAAiB,CAAC;CAClC,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,CAAC,SAAS,OAAO,GAAG,KAAK,EAC1D,QAAQ,EAAE,WAAW,CAAC,EAAE,CAAC,EACzB,mBAAmB,EAAE,CAAc,EACnC,GAAG,EAAE,mBAAmB,GAEtB,EAAE,GACF,SAAS,GACT,oBAAoB,GACpB,uBAAuB,GACvB,2BAA2B,GAC3B,OAAO,CAAC,EAAE,CAAC,GACX,OAAO,CAAC,SAAS,CAAC,CAgEvB;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EAAE,EAAE,CAAC,SAAS,OAAO,GAAG,KAAK,EAClE,QAAQ,EAAE,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,GAAG,YAAY,GAAG,eAAe,GAAG,mBAAmB,EAClF,mBAAmB,GAAE,CAAc,GACpC,MAAM,UAAU,CAAC,OAAO,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAwBlD"}
|
|
@@ -3,8 +3,7 @@ import { useContext } from 'react';
|
|
|
3
3
|
import { useLocation } from 'react-router-dom';
|
|
4
4
|
import { useRecoilCallback } from 'recoil';
|
|
5
5
|
import { useDeepCompare } from '@darajs/ui-utils';
|
|
6
|
-
import {
|
|
7
|
-
import { WebSocketCtx, useTaskContext } from '../../shared/context';
|
|
6
|
+
import { WebSocketCtx, useRequestExtras, useTaskContext } from '../../shared/context';
|
|
8
7
|
import { normalizeRequest } from '../../shared/utils/normalization';
|
|
9
8
|
import { isDataVariable, isDerivedDataVariable, isDerivedVariable, isResolvedDataVariable, isResolvedDerivedDataVariable, isResolvedDerivedVariable, isVariable, } from '../../types';
|
|
10
9
|
import { fetchDataVariable, fetchDerivedDataVariable, fetchDerivedVariable, formatDerivedVariableRequest, isTaskResponse, resolveVariable, } from './internal';
|
|
@@ -16,7 +15,7 @@ import { fetchDataVariable, fetchDerivedDataVariable, fetchDerivedVariable, form
|
|
|
16
15
|
*/
|
|
17
16
|
export function getVariableValue(variable, shouldFetchVariable = false, ctx) {
|
|
18
17
|
// Using loadable since the resolver is only used for simple atoms and shouldn't cause problems
|
|
19
|
-
const resolved = resolveVariable(variable, ctx.client, ctx.taskContext, ctx.
|
|
18
|
+
const resolved = resolveVariable(variable, ctx.client, ctx.taskContext, ctx.extras, (v) => ctx.snapshot.getLoadable(v).getValue());
|
|
20
19
|
// if we're NOT forced to fetch, or if it's not a DV/DDV/data variable, return the resolved value
|
|
21
20
|
// variable is plain/url
|
|
22
21
|
if (!shouldFetchVariable ||
|
|
@@ -32,15 +31,19 @@ export function getVariableValue(variable, shouldFetchVariable = false, ctx) {
|
|
|
32
31
|
}
|
|
33
32
|
// data variable
|
|
34
33
|
if (isResolvedDataVariable(resolved)) {
|
|
35
|
-
return fetchDataVariable(resolved.uid, ctx.
|
|
34
|
+
return fetchDataVariable(resolved.uid, ctx.extras, resolved.filters);
|
|
36
35
|
}
|
|
37
36
|
// derived variable
|
|
38
37
|
return fetchDerivedVariable({
|
|
39
38
|
cache: variable.cache,
|
|
39
|
+
extras: ctx.extras,
|
|
40
40
|
force: false,
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
/**
|
|
42
|
+
* In this case we're not concerned about different selectors fetching the value so just use the uid
|
|
43
|
+
*/
|
|
44
|
+
selectorKey: resolved.uid,
|
|
43
45
|
values: normalizeRequest(formatDerivedVariableRequest(resolved.values), variable.variables),
|
|
46
|
+
variableUid: resolved.uid,
|
|
44
47
|
wsClient: ctx.client,
|
|
45
48
|
}).then((resp) => {
|
|
46
49
|
// This is really only used in DownloadVariable currently; we can add support for tasks
|
|
@@ -52,7 +55,7 @@ export function getVariableValue(variable, shouldFetchVariable = false, ctx) {
|
|
|
52
55
|
if (isDerivedDataVariable(variable)) {
|
|
53
56
|
return ctx.client
|
|
54
57
|
.getChannel()
|
|
55
|
-
.then((chan) => fetchDerivedDataVariable(variable.uid, ctx.
|
|
58
|
+
.then((chan) => fetchDerivedDataVariable(variable.uid, ctx.extras, resp.cache_key, chan, variable.filters));
|
|
56
59
|
}
|
|
57
60
|
return resp.value;
|
|
58
61
|
});
|
|
@@ -72,7 +75,7 @@ export default function useVariableValue(variable, shouldFetchVariable = false)
|
|
|
72
75
|
const taskContext = useTaskContext();
|
|
73
76
|
const { client } = useContext(WebSocketCtx);
|
|
74
77
|
const { search } = useLocation();
|
|
75
|
-
const
|
|
78
|
+
const extras = useRequestExtras();
|
|
76
79
|
if (!isVariable(variable)) {
|
|
77
80
|
return () => variable;
|
|
78
81
|
}
|
|
@@ -80,12 +83,12 @@ export default function useVariableValue(variable, shouldFetchVariable = false)
|
|
|
80
83
|
return () => {
|
|
81
84
|
return getVariableValue(variable, shouldFetchVariable, {
|
|
82
85
|
client,
|
|
86
|
+
extras,
|
|
83
87
|
search,
|
|
84
88
|
snapshot,
|
|
85
89
|
taskContext,
|
|
86
|
-
token,
|
|
87
90
|
});
|
|
88
91
|
};
|
|
89
|
-
}, [variable.uid, useDeepCompare(taskContext), client, search,
|
|
92
|
+
}, [variable.uid, useDeepCompare(taskContext), client, search, extras]);
|
|
90
93
|
}
|
|
91
94
|
//# sourceMappingURL=use-variable-value.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-variable-value.js","sourceRoot":"","sources":["../../../js/shared/interactivity/use-variable-value.tsx"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAY,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"use-variable-value.js","sourceRoot":"","sources":["../../../js/shared/interactivity/use-variable-value.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/use-variable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"use-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/use-variable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAmC,MAAM,OAAO,CAAC;AAKlF,OAAO,EAAE,QAAQ,EAAuF,MAAM,SAAS,CAAC;AAkBxH;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CA0CzG"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import { useContext, useEffect,
|
|
2
|
-
import { useLocation } from 'react-router-dom';
|
|
1
|
+
import { useContext, useEffect, useState } from 'react';
|
|
3
2
|
import { useRecoilStateLoadable, useRecoilValueLoadable_TRANSITION_SUPPORT_UNSTABLE } from 'recoil';
|
|
4
|
-
import {
|
|
5
|
-
import { VariableCtx, WebSocketCtx, useTaskContext } from '../../shared/context';
|
|
3
|
+
import { VariableCtx, WebSocketCtx, useRequestExtras, useTaskContext } from '../../shared/context';
|
|
6
4
|
import { useDeferLoadable } from '../../shared/utils';
|
|
7
5
|
import { isDataVariable, isDerivedDataVariable, isDerivedVariable, isUrlVariable, isVariable } from '../../types';
|
|
8
6
|
import { getOrRegisterPlainVariable, useDerivedVariable, useUrlVariable } from './internal';
|
|
@@ -27,11 +25,10 @@ function warnUpdateOnDerivedState() {
|
|
|
27
25
|
* @param variable the possible variable to use
|
|
28
26
|
*/
|
|
29
27
|
export function useVariable(variable) {
|
|
30
|
-
const
|
|
28
|
+
const extras = useRequestExtras();
|
|
31
29
|
const { client: WsClient } = useContext(WebSocketCtx);
|
|
32
30
|
const taskContext = useTaskContext();
|
|
33
31
|
const variablesContext = useContext(VariableCtx);
|
|
34
|
-
const { search } = useLocation();
|
|
35
32
|
if (!isVariable(variable)) {
|
|
36
33
|
return useState(variable);
|
|
37
34
|
}
|
|
@@ -47,7 +44,7 @@ export function useVariable(variable) {
|
|
|
47
44
|
throw new Error(`Non-data variable expected, got ${variable.__typename}`);
|
|
48
45
|
}
|
|
49
46
|
if (isDerivedVariable(variable)) {
|
|
50
|
-
const selector = useDerivedVariable(variable, WsClient, taskContext,
|
|
47
|
+
const selector = useDerivedVariable(variable, WsClient, taskContext, extras);
|
|
51
48
|
const selectorLoadable = useRecoilValueLoadable_TRANSITION_SUPPORT_UNSTABLE(selector);
|
|
52
49
|
const deferred = useDeferLoadable(selectorLoadable);
|
|
53
50
|
return [deferred.value, warnUpdateOnDerivedState];
|
|
@@ -55,7 +52,7 @@ export function useVariable(variable) {
|
|
|
55
52
|
if (isUrlVariable(variable)) {
|
|
56
53
|
return useUrlVariable(variable);
|
|
57
54
|
}
|
|
58
|
-
const recoilState =
|
|
55
|
+
const recoilState = getOrRegisterPlainVariable(variable, WsClient, taskContext, extras);
|
|
59
56
|
const [loadable, setLoadable] = useRecoilStateLoadable(recoilState);
|
|
60
57
|
const deferred = useDeferLoadable(loadable);
|
|
61
58
|
return [deferred, setLoadable];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/use-variable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA4B,UAAU,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"use-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/use-variable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA4B,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,kDAAkD,EAAE,MAAM,QAAQ,CAAC;AAEpG,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC/F,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAY,cAAc,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAExH,OAAO,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5F,mIAAmI;AACnI,+CAA+C;AAC/C,kFAAkF;AAClF,4DAA4D;AAC5D,gDAAgD;AAEhD;;GAEG;AACH,SAAS,wBAAwB;IAC7B,sCAAsC;IACtC,OAAO,CAAC,IAAI,CAAC,8FAA8F,CAAC,CAAC;AACjH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,WAAW,CAAI,QAAyB;IACpD,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;IAElC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;IACtD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,gBAAgB,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IAEjD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxB,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAED,2EAA2E;IAC3E,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,wEAAwE;IACxE,IAAI,cAAc,CAAC,QAAQ,CAAC,IAAI,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9D,MAAM,IAAI,KAAK,CAAC,mCAAoC,QAAgB,CAAC,UAAoB,EAAE,CAAC,CAAC;IACjG,CAAC;IAED,IAAI,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAC7E,MAAM,gBAAgB,GAAG,kDAAkD,CAAC,QAAQ,CAAC,CAAC;QAEtF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;QAEpD,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,wBAAwB,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,WAAW,GAAG,0BAA0B,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IACxF,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,sBAAsB,CAAC,WAAW,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAE5C,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;AACnC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"private-route.js","sourceRoot":"","sources":["../../../js/shared/private-route/private-route.tsx"],"names":[],"mappings":";AAAA,gDAAgD;AAEhD,OAAO,EAAa,SAAS,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,SAAS,MAAM,2BAA2B,CAAC;AAClD,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAY7D;;;;;GAKG;AACH,SAAS,YAAY,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAqB;IAChE,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;IAChC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAE/C,cAAc,CAAC,IAAI,CAAC,CAAC;IAErB,SAAS,CAAC,GAAG,EAAE;QACX,oCAAoC;QACpC,MAAM,EAAE,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAI,CAAC,KAAK,EAAE;
|
|
1
|
+
{"version":3,"file":"private-route.js","sourceRoot":"","sources":["../../../js/shared/private-route/private-route.tsx"],"names":[],"mappings":";AAAA,gDAAgD;AAEhD,OAAO,EAAa,SAAS,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,SAAS,MAAM,2BAA2B,CAAC;AAClD,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAY7D;;;;;GAKG;AACH,SAAS,YAAY,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAqB;IAChE,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;IAChC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAE/C,cAAc,CAAC,IAAI,CAAC,CAAC;IAErB,SAAS,CAAC,GAAG,EAAE;QACX,oCAAoC;QACpC,MAAM,EAAE,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,OAAO,KAAC,QAAQ,IAAC,EAAE,EAAC,QAAQ,GAAG,CAAC;IACpC,CAAC;IAED,uDAAuD;IACvD,OAAO,SAAS,CAAC,CAAC,CAAC,KAAC,eAAe,KAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;AACtD,CAAC;AAED,eAAe,YAAY,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-context.js","sourceRoot":"","sources":["../../../js/shared/template-root/dynamic-context.tsx"],"names":[],"mappings":";AAAA,gDAAgD;AAEhD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,gBAAgB,MAAM,8CAA8C,CAAC;AAG5E;;;;;;GAMG;AACH,SAAS,YAAY,CAAC,iBAA2C,EAAE,QAAyB;IACxF,MAAM,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,GAAG,iBAAiB,CAAC;IAE/C,uCACO,SAAS,KACZ,KAAK,kCACE,SAAS,CAAC,KAAK,KAClB,QAAQ,EAAE,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAC,gBAAgB,IAAC,SAAS,EAAE,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAI,OAE5G;AACN,CAAC;AAOD,SAAS,cAAc,CAAC,KAA0B;IAC9C,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACrC,IAAI,KAAK,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"dynamic-context.js","sourceRoot":"","sources":["../../../js/shared/template-root/dynamic-context.tsx"],"names":[],"mappings":";AAAA,gDAAgD;AAEhD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,gBAAgB,MAAM,8CAA8C,CAAC;AAG5E;;;;;;GAMG;AACH,SAAS,YAAY,CAAC,iBAA2C,EAAE,QAAyB;IACxF,MAAM,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,GAAG,iBAAiB,CAAC;IAE/C,uCACO,SAAS,KACZ,KAAK,kCACE,SAAS,CAAC,KAAK,KAClB,QAAQ,EAAE,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAC,gBAAgB,IAAC,SAAS,EAAE,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAI,OAE5G;AACN,CAAC;AAOD,SAAS,cAAc,CAAC,KAA0B;IAC9C,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACrC,IAAI,KAAK,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,YAAY,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IACjE,CAAC,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAE9B,IAAI,CAAC,aAAa,EAAE,CAAC;QACjB,OAAO,4BAAG,KAAK,CAAC,QAAQ,GAAI,CAAC;IACjC,CAAC;IAED,OAAO,KAAC,gBAAgB,IAAC,SAAS,EAAE,aAAa,GAAI,CAAC;AAC1D,CAAC;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template-root.js","sourceRoot":"","sources":["../../../js/shared/template-root/template-root.tsx"],"names":[],"mappings":";AAAA,gDAAgD;AAEhD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE5C,OAAO,MAAM,EAAE,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAElE,OAAO,EAAmB,cAAc,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAC3G,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACnF,OAAO,gBAAgB,MAAM,8CAA8C,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,qBAAqB,MAAM,0DAA0D,CAAC;AAE7F,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAE/C,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAA;uBACP,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE;;;;;;;;;;aAU9E,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI;;;;;;;sBAOzB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;;;;sBAInC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;;;4BAG7B,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;;;CAG9D,CAAC;AAEF;;;;GAIG;AACH,SAAS,YAAY;;IACjB,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;IAChC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;IACrC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,WAAW,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC;IAErF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,UAAU,EAAE,CAAC;IAClE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,aAAa,EAAE,CAAC;IACvG,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAmB,CAAC;IAE5D,SAAS,CAAC,GAAG,EAAE;QACX,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,EAAE;
|
|
1
|
+
{"version":3,"file":"template-root.js","sourceRoot":"","sources":["../../../js/shared/template-root/template-root.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clean-session-cache.js","sourceRoot":"","sources":["../../../js/shared/utils/clean-session-cache.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,SAAS,iBAAiB,CAAC,YAAoB;IAC3C,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAEhD,WAAW,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACxB,kDAAkD;QAClD,IAAI,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,gBAAgB,YAAY,EAAE,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"clean-session-cache.js","sourceRoot":"","sources":["../../../js/shared/utils/clean-session-cache.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,SAAS,iBAAiB,CAAC,YAAoB;IAC3C,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAEhD,WAAW,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACxB,kDAAkD;QAClD,IAAI,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,gBAAgB,YAAY,EAAE,CAAC,EAAE,CAAC;YACpF,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACnC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,eAAe,iBAAiB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"embed.js","sourceRoot":"","sources":["../../../js/shared/utils/embed.tsx"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAE/C;;GAEG;AACH,MAAM,UAAU,UAAU;;IACtB,MAAM,KAAK,GAAG,MAAM,CAAC,YAAiC,CAAC;IACvD,OAAO,KAAK,IAAI,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,0CAAE,UAAU,MAAK,EAAE,CAAC;AACtD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB;;IAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,YAAiC,CAAC;IACvD,OAAO,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,0CAAE,UAAU,CAAC;AACtC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa;IACzB,OAAO,YAAY,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;AACpD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,QAAQ;IACpB,IAAI,UAAU,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"embed.js","sourceRoot":"","sources":["../../../js/shared/utils/embed.tsx"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAE/C;;GAEG;AACH,MAAM,UAAU,UAAU;;IACtB,MAAM,KAAK,GAAG,MAAM,CAAC,YAAiC,CAAC;IACvD,OAAO,KAAK,IAAI,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,0CAAE,UAAU,MAAK,EAAE,CAAC;AACtD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB;;IAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,YAAiC,CAAC;IACvD,OAAO,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,0CAAE,UAAU,CAAC;AACtC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa;IACzB,OAAO,YAAY,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;AACpD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,QAAQ;IACpB,IAAI,UAAU,EAAE,EAAE,CAAC;QACf,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;QACnC,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,OAAO,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AAChD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW;IACvB,IAAI,UAAU,EAAE,EAAE,CAAC;QACf,OAAO,gBAAgB,EAAE,CAAC;IAC9B,CAAC;IAED,OAAO,cAAc,CAAC;AAC1B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-icon.js","sourceRoot":"","sources":["../../../js/shared/utils/get-icon.tsx"],"names":[],"mappings":";AAAA,OAAO,+CAA+C,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;AAE5B;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,IAAY;IACxC,IAAI,WAAW,GAAG,IAAI,CAAC;IAEvB,8FAA8F;IAC9F,qHAAqH;IACrH,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"get-icon.js","sourceRoot":"","sources":["../../../js/shared/utils/get-icon.tsx"],"names":[],"mappings":";AAAA,OAAO,+CAA+C,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;AAE5B;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,IAAY;IACxC,IAAI,WAAW,GAAG,IAAI,CAAC;IAEvB,8FAA8F;IAC9F,qHAAqH;IACrH,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACpD,sFAAsF;QACtF,mCAAmC;QACnC,MAAM,gBAAgB,GAAG,IAAI;aACxB,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;aAC1B,IAAI,EAAE;aACN,WAAW,EAAE;aACb,KAAK,CAAC,GAAG,CAAC;aACV,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,WAAW,GAAG,eAAe,gBAAgB,EAAE,CAAC;QAChD,sCAAsC;QACtC,OAAO,CAAC,IAAI,CACR,qCAAqC,IAAI,wKAAwK,WAAW,IAAI,CACnO,CAAC;IACN,CAAC;IAED,OAAO,CAAC,KAAK,EAAE,EAAE,WAAC,OAAA,KAAC,IAAI,oBAAK,KAAK,IAAE,SAAS,EAAE,GAAG,MAAM,CAAC,MAAA,KAAK,CAAC,SAAS,mCAAI,EAAE,CAAC,IAAI,WAAW,EAAE,IAAI,CAAA,EAAA,CAAC;AACxG,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hashing.js","sourceRoot":"","sources":["../../../js/shared/utils/hashing.tsx"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAC;AAI/B;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,GAAQ;IAC/B,OAAO,IAAI,CAAC,GAAG,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;AAC7F,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAI,QAAwB;IAC3D,IAAI,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC;IAE9B,IAAI,QAAQ,IAAI,QAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"hashing.js","sourceRoot":"","sources":["../../../js/shared/utils/hashing.tsx"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAC;AAI/B;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,GAAQ;IAC/B,OAAO,IAAI,CAAC,GAAG,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;AAC7F,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAI,QAAwB;IAC3D,IAAI,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC;IAE9B,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAAC;QACvB,UAAU,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5C,CAAC;IAED,uGAAuG;IACvG,IAAI,SAAS,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QAC5C,UAAU,IAAI,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inject-css.js","sourceRoot":"","sources":["../../../js/shared/utils/inject-css.tsx"],"names":[],"mappings":"AAEA,OAAO,MAAwB,MAAM,2BAA2B,CAAC;AAMjE,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAY;MACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO;CAC7B,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,SAAS,CACrB,SAAY;IAEZ,sBAAsB;IACtB,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"inject-css.js","sourceRoot":"","sources":["../../../js/shared/utils/inject-css.tsx"],"names":[],"mappings":"AAEA,OAAO,MAAwB,MAAM,2BAA2B,CAAC;AAMjE,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAY;MACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO;CAC7B,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,SAAS,CACrB,SAAY;IAEZ,sBAAsB;IACtB,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QAChC,+BAA+B;QAC/B,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;YACtB,gGAAgG;YAChG,OAAO,gBAAuE,CAAC;QACnF,CAAC;QAED,gDAAgD;QAChD,OAAO,gBAAgB,CAAC,aAAa,CAAI,SAAS,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,MAAM,CAAC,SAAS,CAAC,CAAY;UAC9B,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO;KAC7B,CAAC;AACN,CAAC"}
|