analytica.click 0.0.259 → 0.0.262

package/dist/index.d.ts

@@ -216,14 +216,6 @@ declare module 'analytica.click/ui-npm/src/components/UserProvider/refreshToken'
       logout: () => void;
   }): Promise<User | undefined>;
 
-}
-declare module 'analytica.click/ui-npm/src/components/UserProvider/useGranularHook' {
-  import { DependencyList, EffectCallback } from 'react';
-  type HookWithDependencies<C, R> = (callback: C, deps: DependencyList) => R;
-  export const useGranularHook: <T extends HookWithDependencies<C, ReturnType<T>>, C>(hook: T, callback: C, primaryDeps: DependencyList, secondaryDeps: DependencyList) => ReturnType<T>;
-  export const useGranularEffect: (effect: EffectCallback, primaryDeps: DependencyList, secondaryDeps: DependencyList) => void;
-  export {};
-
 }
 declare module 'analytica.click/ui-npm/src/components/index' {
   export * from 'analytica.click/ui-npm/src/components/AnalyticaConfig/index';

package/dist/index.js

@@ -36,7 +36,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
@@ -730,8 +733,17 @@ var require_ErrorBoundary = __commonJS({
           if (notify) {
             notify(hasError);
           }
-          return react_1.default.createElement(Modal_1.Modal, { open: true, setOpen: () => {
-          } }, react_1.default.createElement(Base, null, "A fatal error has occurred - the admin has been notified.", react_1.default.createElement("button", { type: "button", onClick: () => window.location.reload() }, "Press here to restart app")));
+          return react_1.default.createElement(
+            Modal_1.Modal,
+            { open: true, setOpen: () => {
+            } },
+            react_1.default.createElement(
+              Base,
+              null,
+              "A fatal error has occurred - the admin has been notified.",
+              react_1.default.createElement("button", { type: "button", onClick: () => window.location.reload() }, "Press here to restart app")
+            )
+          );
         }
         return children;
       }
@@ -903,7 +915,11 @@ var errorTrack = (_0) => __async(void 0, [_0], function* ({
 }) {
   var _a2;
   if (isLocal) {
-    (0, import_log.debug)(`local error tracking ignored:${data.data.message} ${JSON.stringify(data)}, to ${overrideBaseUrl}`);
+    (0, import_log.debug)(
+      `local error tracking ignored:${data.data.message} ${JSON.stringify(
+        data
+      )}, to ${overrideBaseUrl}`
+    );
     return {};
   }
   if (!(0, import_logsend.isValidLogMessage)((_a2 = data == null ? void 0 : data.data) == null ? void 0 : _a2.message)) {
@@ -920,6 +936,7 @@ var errorTrack = (_0) => __async(void 0, [_0], function* ({
 
 // src/components/AnalyticaConfig/index.tsx
 var import_react = __toESM(require("react"));
+var import_jsx_runtime = require("react/jsx-runtime");
 var stubState = {
   analyticaToken: void 0,
   overrideBaseUrl: void 0
@@ -959,9 +976,10 @@ var AnalyticaConfigProvider = ({
   (0, import_react.useEffect)(() => {
     overloadConsole(values);
   }, []);
-  return /* @__PURE__ */ import_react.default.createElement(AnalyticaConfigContext.Provider, {
-    value: state
-  }, children);
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AnalyticaConfigContext.Provider, {
+    value: state,
+    children
+  });
 };
 
 // src/helpers/log.ts
@@ -989,7 +1007,9 @@ var feedback = (_0) => __async(void 0, [_0], function* ({
 }) {
   var _a2;
   if (typeof window !== "undefined" && ((_a2 = window == null ? void 0 : window.location) == null ? void 0 : _a2.hostname) === "localhost") {
-    (0, import_log3.debug)(`local feedback ignored:${JSON.stringify(data)}, to ${overrideBaseUrl}`);
+    (0, import_log3.debug)(
+      `local feedback ignored:${JSON.stringify(data)}, to ${overrideBaseUrl}`
+    );
     return {};
   }
   (0, import_log3.debug)("feedback", JSON.stringify(data));
@@ -1003,7 +1023,9 @@ var feedback = (_0) => __async(void 0, [_0], function* ({
   return {};
 });
 var useFeedback = () => {
-  const { analyticaToken, overrideBaseUrl } = (0, import_react2.useContext)(AnalyticaConfigContext);
+  const { analyticaToken, overrideBaseUrl } = (0, import_react2.useContext)(
+    AnalyticaConfigContext
+  );
   if (!analyticaToken) {
     (0, import_log3.warn)(tokenMissing("useFeedback"));
     return { trackWithToken: () => ({ error: "no token" }) };
@@ -1109,7 +1131,9 @@ var page = (_0) => __async(void 0, [_0], function* ({
   return track({ analyticaToken, userData, overrideBaseUrl, eventName: "PAGE" });
 });
 var useTrack = () => {
-  const { analyticaToken, overrideBaseUrl } = (0, import_react3.useContext)(AnalyticaConfigContext);
+  const { analyticaToken, overrideBaseUrl } = (0, import_react3.useContext)(
+    AnalyticaConfigContext
+  );
   if (!analyticaToken) {
     (0, import_log5.warn)(tokenMissing("useTrack"));
     const def = () => __async(void 0, null, function* () {
@@ -1125,8 +1149,9 @@ var useTrack = () => {
 
 // src/components/ErrorBoundary/index.tsx
 var import_ErrorBoundary = __toESM(require_ErrorBoundary());
-var import_react4 = __toESM(require("react"));
+var import_react4 = require("react");
 var import_log6 = require("ag-common/dist/common/helpers/log");
+var import_jsx_runtime = require("react/jsx-runtime");
 function onBrowserError(_0) {
   return __async(this, arguments, function* ({
     ev,
@@ -1171,9 +1196,11 @@ var ErrorBoundary = ({
   }, [analyticaToken, filterBrowserError]);
   if (!analyticaToken) {
     (0, import_log6.warn)(tokenMissing("ErrorBoundary"));
-    return /* @__PURE__ */ import_react4.default.createElement(import_react4.default.Fragment, null, children);
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
+      children
+    });
   }
-  return /* @__PURE__ */ import_react4.default.createElement(import_ErrorBoundary.ErrorBoundary, {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ErrorBoundary.ErrorBoundary, {
     notify: (data) => __async(void 0, null, function* () {
       const { href } = window.location;
       yield errorTrack({
@@ -1184,8 +1211,9 @@ var ErrorBoundary = ({
           })
         }
       });
-    })
-  }, children);
+    }),
+    children
+  });
 };
 
 // src/components/ExternalComponent/index.tsx
@@ -1193,6 +1221,7 @@ var import_react5 = __toESM(require("react"));
 var import_createRequires = require("@paciolan/remote-component/dist/createRequires");
 var import_useRemoteComponent = require("@paciolan/remote-component/dist/hooks/useRemoteComponent");
 var import_react_dom = __toESM(require("react-dom"));
+var import_jsx_runtime = require("react/jsx-runtime");
 var styled = require("styled-components");
 var cache = {};
 var ExternalComponent = ({
@@ -1215,17 +1244,25 @@ var ExternalComponent = ({
   if (!cache[url] && !loading && !error2 && Component) {
     cache[url] = Component;
   }
-  return /* @__PURE__ */ import_react5.default.createElement(import_react5.default.Fragment, null, !loading && !error2 && /* @__PURE__ */ import_react5.default.createElement(Component, __spreadValues({}, props)), error2 && error2);
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
+    children: [
+      !loading && !error2 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, __spreadValues({}, props)),
+      error2 && error2
+    ]
+  });
 };
 
 // src/components/Feedback/index.tsx
-var import_react6 = __toESM(require("react"));
+var import_react6 = require("react");
 var import_log7 = require("ag-common/dist/common/helpers/log");
+var import_jsx_runtime = require("react/jsx-runtime");
 var Feedback = (props) => {
-  const { analyticaToken, overrideBaseUrl, devMode } = (0, import_react6.useContext)(AnalyticaConfigContext);
+  const { analyticaToken, overrideBaseUrl, devMode } = (0, import_react6.useContext)(
+    AnalyticaConfigContext
+  );
   if (!analyticaToken) {
     (0, import_log7.warn)(tokenMissing("Feedback"));
-    return /* @__PURE__ */ import_react6.default.createElement(import_react6.default.Fragment, null);
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {});
   }
   const int = __spreadProps(__spreadValues({}, props), {
     submitFeedback: feedback,
@@ -1236,7 +1273,7 @@ var Feedback = (props) => {
   if (devMode) {
     url = `/feedback.js`;
   }
-  return /* @__PURE__ */ import_react6.default.createElement(ExternalComponent, {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ExternalComponent, {
     url,
     props: int
   });
@@ -1386,26 +1423,17 @@ function getTokensFromCode(_0) {
   });
 }
 
-// src/components/UserProvider/useGranularHook.ts
-var import_react7 = require("react");
-var useGranularHook = (hook, callback, primaryDeps, secondaryDeps) => {
-  const ref = (0, import_react7.useRef)();
-  if (!ref.current || !primaryDeps.every((w, i) => {
-    var _a2;
-    return Object.is(w, (_a2 = ref.current) == null ? void 0 : _a2[i]);
-  }))
-    ref.current = [...primaryDeps, ...secondaryDeps];
-  return hook(callback, ref.current);
-};
-var useGranularEffect = (effect, primaryDeps, secondaryDeps) => useGranularHook(import_react7.useEffect, effect, primaryDeps, secondaryDeps);
-
 // src/components/UserProvider/index.tsx
 var import_log9 = require("ag-common/dist/common/helpers/log");
-var import_react8 = __toESM(require("react"));
+var import_react7 = __toESM(require("react"));
 var import_useLocalStorage = require("ag-common/dist/ui/helpers/useLocalStorage");
 var import_cookie = require("ag-common/dist/ui/helpers/cookie");
 var import_dom3 = __toESM(require_dom());
-var CognitoAuthContext = import_react8.default.createContext(void 0);
+var import_useGranularHook = require("ag-common/dist/ui/helpers/useGranularHook");
+var import_jsx_runtime = require("react/jsx-runtime");
+var CognitoAuthContext = import_react7.default.createContext(
+  void 0
+);
 var getStatefulUrl = ({
   redirectUrl,
   qs
@@ -1435,7 +1463,7 @@ var CognitoAuthProvider = ({
   cookieDocument
 }) => {
   var _a2, _b;
-  const [error2, setError] = (0, import_react8.useState)();
+  const [error2, setError] = (0, import_react7.useState)();
   const [idTokenRaw, setIdToken] = (0, import_cookie.useCookieString)({
     name: "id_token",
     cookieDocument: typeof window === "undefined" ? cookieDocument : void 0,
@@ -1456,7 +1484,7 @@ var CognitoAuthProvider = ({
     setUserRaw(value2);
     return;
   };
-  const [loading, setLoading] = (0, import_react8.useState)(false);
+  const [loading, setLoading] = (0, import_react7.useState)(false);
   const qs = (0, import_dom3.extractQs)({
     search: typeof window === "undefined" ? "" : window.location.search,
     sanatise: false
@@ -1471,7 +1499,7 @@ var CognitoAuthProvider = ({
     yield goToPageUrl({ url: location.origin, login: false });
     setLoading(false);
   });
-  (0, import_react8.useEffect)(() => {
+  (0, import_react7.useEffect)(() => {
     var _a3;
     const newT = (_a3 = user == null ? void 0 : user.jwt) == null ? void 0 : _a3.id_token;
     if (!!newT && newT !== idToken) {
@@ -1497,87 +1525,93 @@ var CognitoAuthProvider = ({
       login: true
     });
   });
-  useGranularEffect(() => {
-    function run() {
-      return __async(this, null, function* () {
-        var _a3, _b2, _c, _d;
-        const hasQs = !!(qs == null ? void 0 : qs.code) || !!(qs == null ? void 0 : qs.error);
-        const expired = jwtExpired(user == null ? void 0 : user.jwt);
-        const onlyJwt = !(user == null ? void 0 : user.userId) && !!(user == null ? void 0 : user.jwt);
-        if (loading || error2 || ((_a3 = user == null ? void 0 : user.idJwt) == null ? void 0 : _a3.email) && !hasQs && !expired) {
-          return;
-        }
-        try {
-          setLoading(true);
-          if (qs == null ? void 0 : qs.error) {
-            const newerror = {
-              message: (qs == null ? void 0 : qs.error_description) || "auth error"
-            };
-            if (JSON.stringify(newerror || {}) !== JSON.stringify(error2 || {})) {
-              setError(newerror);
-            }
+  (0, import_useGranularHook.useGranularEffect)(
+    () => {
+      function run() {
+        return __async(this, null, function* () {
+          var _a3, _b2, _c, _d;
+          const hasQs = !!(qs == null ? void 0 : qs.code) || !!(qs == null ? void 0 : qs.error);
+          const expired = jwtExpired(user == null ? void 0 : user.jwt);
+          const onlyJwt = !(user == null ? void 0 : user.userId) && !!(user == null ? void 0 : user.jwt);
+          if (loading || error2 || ((_a3 = user == null ? void 0 : user.idJwt) == null ? void 0 : _a3.email) && !hasQs && !expired) {
             return;
           }
-          if ((qs == null ? void 0 : qs.code) && !expired) {
-            yield goToPageUrl({ url: redirectUrl, login: false });
-            return;
-          }
-          if (qs == null ? void 0 : qs.code) {
-            if (expired) {
-              yield getTokensFromCode({
-                code: qs.code,
-                redirectUrl,
+          try {
+            setLoading(true);
+            if (qs == null ? void 0 : qs.error) {
+              const newerror = {
+                message: (qs == null ? void 0 : qs.error_description) || "auth error"
+              };
+              if (JSON.stringify(newerror || {}) !== JSON.stringify(error2 || {})) {
+                setError(newerror);
+              }
+              return;
+            }
+            if ((qs == null ? void 0 : qs.code) && !expired) {
+              yield goToPageUrl({ url: redirectUrl, login: false });
+              return;
+            }
+            if (qs == null ? void 0 : qs.code) {
+              if (expired) {
+                yield getTokensFromCode({
+                  code: qs.code,
+                  redirectUrl,
+                  config,
+                  setUser
+                });
+              }
+              yield goToPageUrl({
+                url: getStatefulUrl({ redirectUrl, qs }),
+                login: false
+              });
+              return;
+            }
+            if (expired && ((_b2 = user == null ? void 0 : user.jwt) == null ? void 0 : _b2.refresh_token)) {
+              yield refreshToken({
+                setUser,
+                setError,
+                user,
                 config,
-                setUser
+                logout
               });
+              return;
             }
-            yield goToPageUrl({
-              url: getStatefulUrl({ redirectUrl, qs }),
-              login: false
-            });
-            return;
-          }
-          if (expired && ((_b2 = user == null ? void 0 : user.jwt) == null ? void 0 : _b2.refresh_token)) {
-            yield refreshToken({
-              setUser,
-              setError,
-              user,
-              config,
-              logout
-            });
-            return;
-          }
-          if (onlyJwt) {
-            const token = (_d = (_c = user == null ? void 0 : user.jwt) == null ? void 0 : _c.id_token) == null ? void 0 : _d.substr(user.jwt.id_token.indexOf(" ") + 1);
-            if (!user || !token) {
-              (0, import_log9.info)("logging out no token");
-              setUser(void 0);
-              setError(void 0);
-            } else {
-              setUser(__spreadProps(__spreadValues({}, getUserFromIdToken(token)), {
-                jwt: user.jwt,
-                credentials: user.credentials
-              }));
+            if (onlyJwt) {
+              const token = (_d = (_c = user == null ? void 0 : user.jwt) == null ? void 0 : _c.id_token) == null ? void 0 : _d.substr(
+                user.jwt.id_token.indexOf(" ") + 1
+              );
+              if (!user || !token) {
+                (0, import_log9.info)("logging out no token");
+                setUser(void 0);
+                setError(void 0);
+              } else {
+                setUser(__spreadProps(__spreadValues({}, getUserFromIdToken(token)), {
+                  jwt: user.jwt,
+                  credentials: user.credentials
+                }));
+              }
             }
+          } finally {
+            setLoading(false);
           }
-        } finally {
-          setLoading(false);
-        }
-      });
-    }
-    void run();
-  }, [user == null ? void 0 : user.jwt, qs], [
-    config,
-    error2,
-    goToPageUrl,
-    logout,
-    loading,
-    qs,
-    redirectUrl,
-    setUser,
-    user
-  ]);
-  (0, import_react8.useEffect)(() => {
+        });
+      }
+      void run();
+    },
+    [user == null ? void 0 : user.jwt, qs],
+    [
+      config,
+      error2,
+      goToPageUrl,
+      logout,
+      loading,
+      qs,
+      redirectUrl,
+      setUser,
+      user
+    ]
+  );
+  (0, import_react7.useEffect)(() => {
     var _a3;
     if (error2) {
       (0, import_log9.error)(JSON.stringify(error2));
@@ -1602,17 +1636,19 @@ var CognitoAuthProvider = ({
     error: error2,
     user
   };
-  return /* @__PURE__ */ import_react8.default.createElement(CognitoAuthContext.Provider, {
-    value
-  }, children);
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CognitoAuthContext.Provider, {
+    value,
+    children
+  });
 };
 
 // src/components/UserProvider/DashboardAuthValidation.tsx
 var import_log10 = require("ag-common/dist/common/helpers/log");
 var import_string = require("ag-common/dist/common/helpers/string");
 var import_Loader = require("ag-common/dist/ui/components/Loader");
+var import_useGranularHook2 = require("ag-common/dist/ui/helpers/useGranularHook");
 var import_useQueryString = require("ag-common/dist/ui/helpers/useQueryString");
-var import_react9 = __toESM(require("react"));
+var import_jsx_runtime = require("react/jsx-runtime");
 var DashboardAuthValidation = ({
   rc: { request, pushPath },
   cac: {
@@ -1626,39 +1662,46 @@ var DashboardAuthValidation = ({
   getUnauthedPage,
   addToast
 }) => {
-  useGranularEffect(() => {
-    if (authError) {
-      const emailOption = authError.message.includes("email") ? ` We require the use of your email for the functionality of this app.
+  (0, import_useGranularHook2.useGranularEffect)(
+    () => {
+      if (authError) {
+        const emailOption = authError.message.includes("email") ? ` We require the use of your email for the functionality of this app.
         You can update your settings at https://www.facebook.com/settings?tab=applications` : "";
-      addToast(`An Error has occured with your login attempt.${emailOption}`, {
-        appearance: "error"
-      });
-      (0, import_log10.error)(`auth error:`, JSON.stringify(authError, null, 2));
-      void logout();
-    }
-  }, [authError], [authError, addToast, logout]);
+        addToast(
+          `An Error has occured with your login attempt.${emailOption}`,
+          {
+            appearance: "error"
+          }
+        );
+        (0, import_log10.error)(`auth error:`, JSON.stringify(authError, null, 2));
+        void logout();
+      }
+    },
+    [authError],
+    [authError, addToast, logout]
+  );
   const forceLogin = Object.keys(request.url.query || {}).includes("login");
   if (forceLogin) {
     if (!isAuthenticated) {
       void loginWithRedirect(request.url.query.state);
-      return { render: /* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null), openApiDisabled: true };
+      return { render: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {}), openApiDisabled: true };
     }
     if (isAuthenticated) {
       void pushPath(getDashboardPath());
-      return { render: /* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null), openApiDisabled: true };
+      return { render: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {}), openApiDisabled: true };
     }
   }
   if (request.url.query.state && isAuthenticated) {
     const decoded = JSON.parse((0, import_string.fromBase64)(request.url.query.state));
     if (decoded.redirect) {
       void pushPath(decoded.redirect);
-      return { render: /* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null), openApiDisabled: true };
+      return { render: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {}), openApiDisabled: true };
     }
   }
   const serverAuthLoading = import_useQueryString.isServer && !authError && !authLoading && !isAuthenticated && Object.keys(request.url.query || {}).includes("code");
   if (authLoading || serverAuthLoading) {
     return {
-      render: /* @__PURE__ */ import_react9.default.createElement(import_Loader.Loader, {
+      render: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Loader.Loader, {
         name: "authload"
       }),
       openApiDisabled: true
@@ -1666,7 +1709,7 @@ var DashboardAuthValidation = ({
   }
   if (!isAuthenticated && !authLoading && !authError && getUnauthedPage) {
     void pushPath(getUnauthedPage());
-    return { render: /* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null), openApiDisabled: true };
+    return { render: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {}), openApiDisabled: true };
   }
   const openApiDisabled = !isAuthenticated || authLoading || !!authError;
   return { openApiDisabled };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "analytica.click",
-  "version": "0.0.259",
+  "version": "0.0.262",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",