@darajs/core 1.8.6 → 1.9.1

package/dist/umd/dara.core.umd.js

@@ -33,7 +33,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
 (function(global2, factory) {
   typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("react"), require("@tanstack/react-query"), require("react-dom"), require("styled-components")) : typeof define === "function" && define.amd ? define(["exports", "react", "@tanstack/react-query", "react-dom", "styled-components"], factory) : (global2 = typeof globalThis !== "undefined" ? globalThis : global2 || self, factory((global2.dara = global2.dara || {}, global2.dara.core = {}), global2.React, global2.ReactQuery, global2.ReactDOM, global2.styled));
 })(this, function(exports, React, reactQuery, ReactDOM, styled) {
-  var _pingInterval, _socketUrl, _reconnectCount, _instance, _observers, _events$, _parentBus;
+  var _pingInterval, _socketUrl, _reconnectCount, _events$, _parentBus, _instance, _observers;
   "use strict";
   const _interopDefaultLegacy = (e3) => e3 && typeof e3 === "object" && "default" in e3 ? e3 : { default: e3 };
   function _interopNamespace(e3) {
@@ -55995,10 +55995,13 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     }
   }
   async function handleAuthErrors(res, toLogin = false, ignoreErrors = null) {
+    var _a;
     const content = await res.clone().json();
     if (isAuthenticationError(content == null ? void 0 : content.detail) && !shouldIgnoreError(content == null ? void 0 : content.detail, ignoreErrors)) {
       localStorage.removeItem(getTokenKey());
-      const path = toLogin || shouldRedirectToLogin(content.detail) ? "/login" : `/error?code=${res.status}`;
+      const queryParams = new URLSearchParams(window.location.search);
+      const referrer = (_a = queryParams.get("referrer")) != null ? _a : encodeURIComponent(window.location.pathname + window.location.search);
+      const path = toLogin || shouldRedirectToLogin(content.detail) ? `/login?referrer=${referrer}` : `/error?code=${res.status}`;
       window.location.href = `${window.dara.base_url}${path}`;
       return true;
     }
@@ -56303,7 +56306,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
         const handler = () => {
           if (document.visibilityState === "visible") {
             __privateSet(this, _reconnectCount, 0);
-            this.initialize();
+            this.socket = this.initialize();
             document.removeEventListener("visibilitychange", handler);
           }
         };
@@ -56312,7 +56315,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       }
       setTimeout(() => {
         __privateWrapper(this, _reconnectCount)._++;
-        this.initialize(true);
+        this.socket = this.initialize(true);
       }, interAttemptTimeout);
     }
     close() {
@@ -56437,6 +56440,38 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     url.searchParams.set("token", sessionToken);
     return new WebSocketClient(socketUrl, sessionToken, liveReload);
   }
+  class EventBus {
+    constructor(parentBus) {
+      __privateAdd(this, _events$, new Subject());
+      __privateAdd(this, _parentBus, null);
+      __privateSet(this, _parentBus, parentBus != null ? parentBus : null);
+    }
+    publish(type, data) {
+      __privateGet(this, _events$).next({ type, data });
+      if (__privateGet(this, _parentBus)) {
+        __privateGet(this, _parentBus).publish(type, data);
+      }
+    }
+    subscribe(callback) {
+      const sub = __privateGet(this, _events$).pipe().subscribe(callback);
+      return () => sub.unsubscribe();
+    }
+  }
+  _events$ = new WeakMap();
+  _parentBus = new WeakMap();
+  const DEFAULT_BUS = new EventBus();
+  const EventBusContext = React__namespace.createContext(DEFAULT_BUS);
+  function useEventBus() {
+    return React__namespace.useContext(EventBusContext);
+  }
+  function EventCapturer({ children, onEvent }) {
+    const parentBus = useEventBus();
+    const bus = React__namespace.useMemo(() => new EventBus(parentBus), [parentBus]);
+    React__namespace.useEffect(() => {
+      return bus.subscribe(onEvent);
+    }, [bus, onEvent]);
+    return /* @__PURE__ */ React__namespace.createElement(EventBusContext.Provider, { value: bus }, children);
+  }
   function err(message) {
     const error = new Error(message);
     if (error.stack === void 0) {
@@ -57411,38 +57446,6 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
   function useUrlVariable(variable) {
     return Recoil_index_22(getOrRegisterUrlVariable(variable));
   }
-  class EventBus {
-    constructor(parentBus) {
-      __privateAdd(this, _events$, new Subject());
-      __privateAdd(this, _parentBus, null);
-      __privateSet(this, _parentBus, parentBus != null ? parentBus : null);
-    }
-    publish(type, data) {
-      __privateGet(this, _events$).next({ type, data });
-      if (__privateGet(this, _parentBus)) {
-        __privateGet(this, _parentBus).publish(type, data);
-      }
-    }
-    subscribe(callback) {
-      const sub = __privateGet(this, _events$).pipe().subscribe(callback);
-      return () => sub.unsubscribe();
-    }
-  }
-  _events$ = new WeakMap();
-  _parentBus = new WeakMap();
-  const DEFAULT_BUS = new EventBus();
-  const EventBusContext = React__namespace.createContext(DEFAULT_BUS);
-  function useEventBus() {
-    return React__namespace.useContext(EventBusContext);
-  }
-  function EventCapturer({ children, onEvent }) {
-    const parentBus = useEventBus();
-    const bus = React__namespace.useMemo(() => new EventBus(parentBus), [parentBus]);
-    React__namespace.useEffect(() => {
-      return bus.subscribe(onEvent);
-    }, [bus, onEvent]);
-    return /* @__PURE__ */ React__namespace.createElement(EventBusContext.Provider, { value: bus }, children);
-  }
   function combineFilters(combinator, queries) {
     const validQueries = queries.filter(Boolean);
     if (validQueries.length === 0) {
@@ -58021,6 +58024,216 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     }
     return resolver(getOrRegisterPlainVariable(variable, client, taskContext, extras));
   }
+  function warnUpdateOnDerivedState() {
+    console.warn("You tried to call update on variable with derived state, this is a noop and will be ignored.");
+  }
+  function useVariable(variable) {
+    const extras = useRequestExtras();
+    const { client: WsClient } = React.useContext(websocketCtx);
+    const taskContext = useTaskContext();
+    const variablesContext = React.useContext(variablesCtx);
+    const bus = useEventBus();
+    if (!isVariable(variable)) {
+      return React.useState(variable);
+    }
+    variablesContext.variables.current.add(variable.uid);
+    React.useEffect(() => {
+      return () => {
+        variablesContext.variables.current.delete(variable.uid);
+      };
+    }, []);
+    if (isDataVariable(variable) || isDerivedDataVariable(variable)) {
+      throw new Error(`Non-data variable expected, got ${variable.__typename}`);
+    }
+    if (isDerivedVariable(variable)) {
+      const selector2 = useDerivedVariable(variable, WsClient, taskContext, extras);
+      const selectorLoadable = Recoil_index_28(selector2);
+      React.useEffect(() => {
+        if (selectorLoadable.state !== "loading") {
+          bus.publish("DERIVED_VARIABLE_LOADED", { variable, value: selectorLoadable.contents });
+        }
+      }, [selectorLoadable]);
+      const deferred2 = useDeferLoadable(selectorLoadable);
+      return [deferred2.value, warnUpdateOnDerivedState];
+    }
+    if (isUrlVariable(variable)) {
+      return useUrlVariable(variable);
+    }
+    const recoilState = getOrRegisterPlainVariable(variable, WsClient, taskContext, extras);
+    const [loadable, setLoadable] = Recoil_index_23(recoilState);
+    const deferred = useDeferLoadable(loadable);
+    React.useEffect(() => {
+      if (loadable.state !== "loading") {
+        bus.publish("PLAIN_VARIABLE_LOADED", { variable, value: loadable.contents });
+      }
+    }, [loadable]);
+    return [deferred, setLoadable];
+  }
+  function useDataVariable(variable) {
+    const extras = useRequestExtras();
+    const { client: wsClient } = React.useContext(websocketCtx);
+    if (isDataVariable(variable)) {
+      registerDataVariable(variable);
+      const serverTriggers$ = React.useMemo(() => wsClient.serverTriggers$(variable.uid), []);
+      const [serverTriggerCounter, setServerTriggerCounter] = React.useState(0);
+      React.useEffect(() => {
+        const sub = serverTriggers$.subscribe(() => setServerTriggerCounter((c2) => c2 + 1));
+        return () => sub.unsubscribe();
+      }, [serverTriggers$]);
+      const fetchDataVariable2 = useFetchDataVariable(variable, serverTriggerCounter);
+      return fetchDataVariable2;
+    }
+    const variablesContext = React.useContext(variablesCtx);
+    variablesContext.variables.current.add(variable.uid);
+    React.useEffect(() => {
+      return () => {
+        variablesContext.variables.current.delete(variable.uid);
+      };
+    }, []);
+    const taskContext = useTaskContext();
+    const dvSelector = useDerivedVariable(variable, wsClient, taskContext, extras);
+    const dvLoadable = Recoil_index_21(dvSelector);
+    const [dvValue, setDvValue] = React.useState(dvLoadable.toPromise());
+    React.useEffect(() => {
+      if (dvLoadable.state === "loading") {
+        setDvValue(dvLoadable.toPromise());
+      }
+    }, [dvLoadable]);
+    const fetchDerivedDataVariable2 = useFetchDerivedDataVariable(variable, taskContext, wsClient, dvValue);
+    return fetchDerivedDataVariable2;
+  }
+  function useAnyVariable(variable) {
+    if (isDataVariable(variable) || isDerivedDataVariable(variable)) {
+      const getData2 = useDataVariable(variable);
+      const { data, refetch } = reactQuery.useQuery({
+        cacheTime: 1,
+        queryFn: async () => {
+          const dataResponse = await getData2();
+          return dataResponse.data;
+        },
+        queryKey: ["any-variable-data", variable.uid],
+        refetchOnWindowFocus: false,
+        suspense: true
+      });
+      React.useEffect(() => {
+        refetch();
+      }, [getData2]);
+      return data;
+    }
+    return useVariable(variable)[0];
+  }
+  function getVariableValue(variable, shouldFetchVariable = false, ctx) {
+    const resolved = resolveVariable(
+      variable,
+      ctx.client,
+      ctx.taskContext,
+      ctx.extras,
+      (v2) => ctx.snapshot.getLoadable(v2).getValue()
+    );
+    if (!shouldFetchVariable || !isDerivedVariable(variable) && !isDataVariable(variable) && !isDerivedDataVariable(variable)) {
+      return resolved;
+    }
+    if (!isResolvedDerivedVariable(resolved) && !isResolvedDataVariable(resolved) && !isResolvedDerivedDataVariable(resolved)) {
+      return resolved;
+    }
+    if (isResolvedDataVariable(resolved)) {
+      return fetchDataVariable(resolved.uid, ctx.extras, resolved.filters);
+    }
+    return fetchDerivedVariable({
+      cache: variable.cache,
+      extras: ctx.extras,
+      force: false,
+      selectorKey: resolved.uid,
+      values: normalizeRequest(
+        formatDerivedVariableRequest(resolved.values),
+        variable.variables
+      ),
+      variableUid: resolved.uid,
+      wsClient: ctx.client
+    }).then((resp) => {
+      if (isTaskResponse$1(resp)) {
+        throw new Error("Task DerivedVariables are not supported in this context");
+      }
+      if (isDerivedDataVariable(variable)) {
+        return ctx.client.getChannel().then(
+          (chan) => fetchDerivedDataVariable(variable.uid, ctx.extras, resp.cache_key, chan, variable.filters)
+        );
+      }
+      return resp.value;
+    });
+  }
+  function useVariableValue(variable, shouldFetchVariable = false) {
+    const taskContext = useTaskContext();
+    const { client } = React.useContext(websocketCtx);
+    const { search } = useLocation();
+    const extras = useRequestExtras();
+    if (!isVariable(variable)) {
+      return () => variable;
+    }
+    return Recoil_index_31(
+      ({ snapshot }) => {
+        return () => {
+          return getVariableValue(variable, shouldFetchVariable, {
+            client,
+            extras,
+            search,
+            snapshot,
+            taskContext
+          });
+        };
+      },
+      [variable.uid, useDeepCompare(taskContext), client, search, extras]
+    );
+  }
+  function resolveValue(value, force) {
+    if (isResolvedDerivedVariable(value) || isResolvedDerivedDataVariable(value)) {
+      const { deps, ...rest } = value;
+      const resolvedValues = value.values.map((v2) => resolveValue(v2, force));
+      return {
+        ...rest,
+        force,
+        values: resolvedValues
+      };
+    }
+    if (typeof value === "function") {
+      return resolveValue(value(), force);
+    }
+    return value;
+  }
+  function useRefreshSelector() {
+    return Recoil_index_31(({ refresh }) => {
+      return (key, extras) => {
+        var _a;
+        const family = selectorFamilyRegistry.get(key);
+        if (family) {
+          const selector2 = (_a = selectorFamilyMembersRegistry.get(family)) == null ? void 0 : _a.get(extras);
+          if (selector2) {
+            refresh(selector2);
+          }
+        }
+      };
+    });
+  }
+  function useVariableState() {
+    const extras = useRequestExtras();
+    const { client } = React.useContext(websocketCtx);
+    const taskCtx = useTaskContext();
+    return Recoil_index_31(({ snapshot }) => {
+      return (variable) => {
+        if (!isRegistered(variable)) {
+          return "__NOT_REGISTERED__";
+        }
+        const resolvedVariable = resolveVariable(
+          variable,
+          client,
+          taskCtx,
+          extras,
+          (v2) => snapshot.getLoadable(v2).getValue()
+        );
+        return resolvedVariable;
+      };
+    }, []);
+  }
   function useActionRegistry() {
     const { actionRegistry: actions } = React.useContext(registriesCtx);
     const get2 = React.useCallback(
@@ -58169,6 +58382,12 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     });
   }
   const noop = () => Promise.resolve();
+  function useActionIsLoading(action) {
+    if (!action || isActionImpl(action) || Array.isArray(action)) {
+      return false;
+    }
+    return useVariable(action.loading)[0];
+  }
   function useAction(action, options) {
     const { client: wsClient } = React.useContext(websocketCtx);
     const importers = React.useContext(importersCtx);
@@ -58178,7 +58397,6 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     const history2 = useHistory();
     const taskCtx = useTaskContext();
     const location2 = useLocation();
-    const [isLoading, setIsLoading] = React.useState(false);
     const actionCtx = React.useRef();
     actionCtx.current = {
       extras,
@@ -58193,9 +58411,12 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     const callback = Recoil_index_31(
       (cbInterface) => async (input) => {
         var _a;
-        setIsLoading(true);
         const actionsToExecute = Array.isArray(action) ? action : [action];
         for (const actionToExecute of actionsToExecute) {
+          const loadingVariable = !isActionImpl(actionToExecute) ? getOrRegisterPlainVariable(actionToExecute.loading, wsClient, taskCtx, extras) : null;
+          if (loadingVariable) {
+            cbInterface.set(loadingVariable, true);
+          }
           const fullActionContext = {
             ...actionCtx.current,
             input,
@@ -58222,15 +58443,17 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
               title: "Error executing action"
             });
           }
+          if (loadingVariable) {
+            cbInterface.set(loadingVariable, false);
+          }
         }
-        setIsLoading(false);
       },
       [action, getAction, importers]
     );
     if (!action) {
-      return [noop, false];
+      return noop;
     }
-    return [callback, isLoading];
+    return callback;
   }
   function useDeferLoadable(loadable) {
     const { suspend } = React.useContext(fallbackCtx);
@@ -58615,13 +58838,23 @@ Inferred class string: "${iconClasses}."`
   }
   function PrivateRoute({ children, on_load, name }) {
     const token = useSessionToken();
-    const [onLoad, isLoading] = useAction(on_load);
+    const onLoad = useAction(on_load);
+    const isLoading = useActionIsLoading(on_load);
     useWindowTitle(name);
     React.useEffect(() => {
       onLoad();
     }, []);
     if (!token) {
-      return /* @__PURE__ */ React__default.default.createElement(Redirect, { to: "/login" });
+      const referrer = encodeURIComponent(window.location.pathname + window.location.search);
+      return /* @__PURE__ */ React__default.default.createElement(
+        Redirect,
+        {
+          to: {
+            pathname: "/login",
+            search: `?referrer=${referrer}`
+          }
+        }
+      );
     }
     return isLoading ? /* @__PURE__ */ React__default.default.createElement(DefaultFallback, null) : children;
   }
@@ -58995,216 +59228,6 @@ Inferred class string: "${iconClasses}."`
     const [styles2, css2] = parseRawCss((_a = props.config) == null ? void 0 : _a.raw_css);
     return /* @__PURE__ */ React__default.default.createElement(ErrorDisplayWrapper, { $rawCss: css2, style: styles2 }, /* @__PURE__ */ React__default.default.createElement(ContentWrapper, null, /* @__PURE__ */ React__default.default.createElement(ErrorContent, null, /* @__PURE__ */ React__default.default.createElement(ErrorTitle$1, null, /* @__PURE__ */ React__default.default.createElement(IconWrapper, null, /* @__PURE__ */ React__default.default.createElement(ErrorIcon, { "aria-hidden": true, className: "fa-solid fa-circle-xmark fa-lg" })), (_c = (_b = props == null ? void 0 : props.config) == null ? void 0 : _b.title) != null ? _c : "Error"), /* @__PURE__ */ React__default.default.createElement(ErrorText$1, null, (_e2 = (_d = props == null ? void 0 : props.config) == null ? void 0 : _d.description) != null ? _e2 : "Try again or contact the application owner."))), props.resetErrorBoundary && /* @__PURE__ */ React__default.default.createElement(RetryButton, { onClick: () => props.resetErrorBoundary(props.error), type: "button" }, /* @__PURE__ */ React__default.default.createElement("i", { "aria-hidden": true, className: "fa-solid fa-rotate fa-xl" })));
   }
-  function warnUpdateOnDerivedState() {
-    console.warn("You tried to call update on variable with derived state, this is a noop and will be ignored.");
-  }
-  function useVariable(variable) {
-    const extras = useRequestExtras();
-    const { client: WsClient } = React.useContext(websocketCtx);
-    const taskContext = useTaskContext();
-    const variablesContext = React.useContext(variablesCtx);
-    const bus = useEventBus();
-    if (!isVariable(variable)) {
-      return React.useState(variable);
-    }
-    variablesContext.variables.current.add(variable.uid);
-    React.useEffect(() => {
-      return () => {
-        variablesContext.variables.current.delete(variable.uid);
-      };
-    }, []);
-    if (isDataVariable(variable) || isDerivedDataVariable(variable)) {
-      throw new Error(`Non-data variable expected, got ${variable.__typename}`);
-    }
-    if (isDerivedVariable(variable)) {
-      const selector2 = useDerivedVariable(variable, WsClient, taskContext, extras);
-      const selectorLoadable = Recoil_index_28(selector2);
-      React.useEffect(() => {
-        if (selectorLoadable.state !== "loading") {
-          bus.publish("DERIVED_VARIABLE_LOADED", { variable, value: selectorLoadable.contents });
-        }
-      }, [selectorLoadable]);
-      const deferred2 = useDeferLoadable(selectorLoadable);
-      return [deferred2.value, warnUpdateOnDerivedState];
-    }
-    if (isUrlVariable(variable)) {
-      return useUrlVariable(variable);
-    }
-    const recoilState = getOrRegisterPlainVariable(variable, WsClient, taskContext, extras);
-    const [loadable, setLoadable] = Recoil_index_23(recoilState);
-    const deferred = useDeferLoadable(loadable);
-    React.useEffect(() => {
-      if (loadable.state !== "loading") {
-        bus.publish("PLAIN_VARIABLE_LOADED", { variable, value: loadable.contents });
-      }
-    }, [loadable]);
-    return [deferred, setLoadable];
-  }
-  function useDataVariable(variable) {
-    const extras = useRequestExtras();
-    const { client: wsClient } = React.useContext(websocketCtx);
-    if (isDataVariable(variable)) {
-      registerDataVariable(variable);
-      const serverTriggers$ = React.useMemo(() => wsClient.serverTriggers$(variable.uid), []);
-      const [serverTriggerCounter, setServerTriggerCounter] = React.useState(0);
-      React.useEffect(() => {
-        const sub = serverTriggers$.subscribe(() => setServerTriggerCounter((c2) => c2 + 1));
-        return () => sub.unsubscribe();
-      }, [serverTriggers$]);
-      const fetchDataVariable2 = useFetchDataVariable(variable, serverTriggerCounter);
-      return fetchDataVariable2;
-    }
-    const variablesContext = React.useContext(variablesCtx);
-    variablesContext.variables.current.add(variable.uid);
-    React.useEffect(() => {
-      return () => {
-        variablesContext.variables.current.delete(variable.uid);
-      };
-    }, []);
-    const taskContext = useTaskContext();
-    const dvSelector = useDerivedVariable(variable, wsClient, taskContext, extras);
-    const dvLoadable = Recoil_index_21(dvSelector);
-    const [dvValue, setDvValue] = React.useState(dvLoadable.toPromise());
-    React.useEffect(() => {
-      if (dvLoadable.state === "loading") {
-        setDvValue(dvLoadable.toPromise());
-      }
-    }, [dvLoadable]);
-    const fetchDerivedDataVariable2 = useFetchDerivedDataVariable(variable, taskContext, wsClient, dvValue);
-    return fetchDerivedDataVariable2;
-  }
-  function useAnyVariable(variable) {
-    if (isDataVariable(variable) || isDerivedDataVariable(variable)) {
-      const getData2 = useDataVariable(variable);
-      const { data, refetch } = reactQuery.useQuery({
-        cacheTime: 1,
-        queryFn: async () => {
-          const dataResponse = await getData2();
-          return dataResponse.data;
-        },
-        queryKey: ["any-variable-data", variable.uid],
-        refetchOnWindowFocus: false,
-        suspense: true
-      });
-      React.useEffect(() => {
-        refetch();
-      }, [getData2]);
-      return data;
-    }
-    return useVariable(variable)[0];
-  }
-  function getVariableValue(variable, shouldFetchVariable = false, ctx) {
-    const resolved = resolveVariable(
-      variable,
-      ctx.client,
-      ctx.taskContext,
-      ctx.extras,
-      (v2) => ctx.snapshot.getLoadable(v2).getValue()
-    );
-    if (!shouldFetchVariable || !isDerivedVariable(variable) && !isDataVariable(variable) && !isDerivedDataVariable(variable)) {
-      return resolved;
-    }
-    if (!isResolvedDerivedVariable(resolved) && !isResolvedDataVariable(resolved) && !isResolvedDerivedDataVariable(resolved)) {
-      return resolved;
-    }
-    if (isResolvedDataVariable(resolved)) {
-      return fetchDataVariable(resolved.uid, ctx.extras, resolved.filters);
-    }
-    return fetchDerivedVariable({
-      cache: variable.cache,
-      extras: ctx.extras,
-      force: false,
-      selectorKey: resolved.uid,
-      values: normalizeRequest(
-        formatDerivedVariableRequest(resolved.values),
-        variable.variables
-      ),
-      variableUid: resolved.uid,
-      wsClient: ctx.client
-    }).then((resp) => {
-      if (isTaskResponse$1(resp)) {
-        throw new Error("Task DerivedVariables are not supported in this context");
-      }
-      if (isDerivedDataVariable(variable)) {
-        return ctx.client.getChannel().then(
-          (chan) => fetchDerivedDataVariable(variable.uid, ctx.extras, resp.cache_key, chan, variable.filters)
-        );
-      }
-      return resp.value;
-    });
-  }
-  function useVariableValue(variable, shouldFetchVariable = false) {
-    const taskContext = useTaskContext();
-    const { client } = React.useContext(websocketCtx);
-    const { search } = useLocation();
-    const extras = useRequestExtras();
-    if (!isVariable(variable)) {
-      return () => variable;
-    }
-    return Recoil_index_31(
-      ({ snapshot }) => {
-        return () => {
-          return getVariableValue(variable, shouldFetchVariable, {
-            client,
-            extras,
-            search,
-            snapshot,
-            taskContext
-          });
-        };
-      },
-      [variable.uid, useDeepCompare(taskContext), client, search, extras]
-    );
-  }
-  function resolveValue(value, force) {
-    if (isResolvedDerivedVariable(value) || isResolvedDerivedDataVariable(value)) {
-      const { deps, ...rest } = value;
-      const resolvedValues = value.values.map((v2) => resolveValue(v2, force));
-      return {
-        ...rest,
-        force,
-        values: resolvedValues
-      };
-    }
-    if (typeof value === "function") {
-      return resolveValue(value(), force);
-    }
-    return value;
-  }
-  function useRefreshSelector() {
-    return Recoil_index_31(({ refresh }) => {
-      return (key, extras) => {
-        var _a;
-        const family = selectorFamilyRegistry.get(key);
-        if (family) {
-          const selector2 = (_a = selectorFamilyMembersRegistry.get(family)) == null ? void 0 : _a.get(extras);
-          if (selector2) {
-            refresh(selector2);
-          }
-        }
-      };
-    });
-  }
-  function useVariableState() {
-    const extras = useRequestExtras();
-    const { client } = React.useContext(websocketCtx);
-    const taskCtx = useTaskContext();
-    return Recoil_index_31(({ snapshot }) => {
-      return (variable) => {
-        if (!isRegistered(variable)) {
-          return "__NOT_REGISTERED__";
-        }
-        const resolvedVariable = resolveVariable(
-          variable,
-          client,
-          taskCtx,
-          extras,
-          (v2) => snapshot.getLoadable(v2).getValue()
-        );
-        return resolvedVariable;
-      };
-    }, []);
-  }
   function isTaskResponse(response) {
     return response && typeof response === "object" && "task_id" in response;
   }
@@ -85717,8 +85740,7 @@ Inferred class string: "${iconClasses}."`
     const history2 = useHistory();
     const location2 = useLocation();
     const queryParams = new URLSearchParams(location2.search);
-    const previousLocation = location2.state || { from: { pathname: (_a = queryParams.get("referrer")) != null ? _a : "/" } };
-    const { from: from2 } = previousLocation;
+    const previousLocation = (_a = queryParams.get("referrer")) != null ? _a : "/";
     const login = async () => {
       setIsLoggingIn(true);
       setIsError(false);
@@ -85726,7 +85748,7 @@ Inferred class string: "${iconClasses}."`
         const sessionToken = await getSessionToken({ password, username });
         if (sessionToken) {
           setToken(sessionToken);
-          history2.replace(from2);
+          history2.replace(decodeURIComponent(previousLocation));
         }
       } catch {
         setIsError(true);
@@ -85738,7 +85760,7 @@ Inferred class string: "${iconClasses}."`
       if (token) {
         verifySessionToken(localStorage.getItem(key)).then((verified) => {
           if (verified) {
-            history2.replace(from2);
+            history2.replace(decodeURIComponent(previousLocation));
           } else {
             setIsVerifyingToken(false);
           }
@@ -85809,13 +85831,12 @@ Inferred class string: "${iconClasses}."`
     const history2 = useHistory();
     const location2 = useLocation();
     const queryParams = new URLSearchParams(location2.search);
-    const previousLocation = location2.state || { from: { pathname: (_a = queryParams.get("referrer")) != null ? _a : "/" } };
-    const { from: from2 } = previousLocation;
+    const previousLocation = (_a = queryParams.get("referrer")) != null ? _a : "/";
     async function getNewToken() {
       const sessionToken = await getSessionToken({});
       if (sessionToken) {
         setToken(sessionToken);
-        history2.replace(from2);
+        history2.replace(decodeURIComponent(previousLocation));
       }
     }
     React.useEffect(() => {
@@ -85827,7 +85848,7 @@ Inferred class string: "${iconClasses}."`
         }
         verifySessionToken(localStorage.getItem(key)).then((verified) => {
           if (verified) {
-            history2.replace(from2);
+            history2.replace(decodeURIComponent(previousLocation));
           } else {
             getNewToken();
           }
@@ -86170,6 +86191,7 @@ Inferred class string: "${iconClasses}."`
   exports.resolveValue = resolveValue;
   exports.revokeSession = revokeSession;
   exports.useAction = useAction;
+  exports.useActionIsLoading = useActionIsLoading;
   exports.useAnyVariable = useAnyVariable;
   exports.useAuthCtx = useAuthCtx;
   exports.useComponentStyles = useComponentStyles;