analytica.click 0.0.261 → 0.0.264

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';
@@ -273,6 +265,13 @@ declare module 'analytica.click/ui-npm/src/helpers/jwt' {
 declare module 'analytica.click/ui-npm/src/helpers/log' {
   export const tokenMissing: (comp: string) => string;
 
+}
+declare module 'analytica.click/ui-npm/src/helpers/object' {
+  export const takeObject: <T>(ob: Record<string, T>, num: number) => {
+      part: T[];
+      rest: Record<string, T>;
+  };
+
 }
 declare module 'analytica.click/ui-npm/src/helpers/track' {
   import { ITrack, TTrack, TTrackNoEvent } from 'analytica.click/common-ui/src/types/index';

package/dist/index.js

@@ -679,7 +679,8 @@ var require_api = __commonJS({
 var require_logsend = __commonJS({
   "../common/dist/helpers/logsend.js"(exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.isValidLogMessage = void 0;
+    exports.getErrorKey = exports.isValidLogMessage = void 0;
+    var hashCode_1 = require("ag-common/dist/common/helpers/hashCode");
     var log_1 = require("ag-common/dist/common/helpers/log");
     function isValidLogMessage2(m) {
       if (!m) {
@@ -697,6 +698,27 @@ var require_logsend = __commonJS({
       return true;
     }
     exports.isValidLogMessage = isValidLogMessage2;
+    var getErrorKey2 = (message = "") => {
+      var _a2, _b, _c;
+      let messageHash = "";
+      try {
+        const ob = JSON.parse(message);
+        const toClean = Array.isArray(ob) && ((_a2 = ob[0]) === null || _a2 === void 0 ? void 0 : _a2.match(/^\[?[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}\]?$/));
+        if (toClean) {
+          (0, log_1.info)("removing date from hash");
+          ob[0] = "(date)";
+          messageHash = (0, hashCode_1.hashCode)(JSON.stringify(ob));
+        } else {
+          messageHash = ob.message || ob.name || ob.description || void 0;
+        }
+      } catch (e) {
+      }
+      if (!messageHash) {
+        messageHash = (_c = (_b = (0, hashCode_1.hashCode)(message)) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : "";
+      }
+      return messageHash;
+    };
+    exports.getErrorKey = getErrorKey2;
   }
 });
 
@@ -845,8 +867,23 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
+// src/helpers/object.ts
+var takeObject = (ob, num) => {
+  const part = [];
+  const rest = {};
+  let c = 0;
+  Object.entries(ob).forEach(([index, item]) => {
+    if (c < num) {
+      part.push(item);
+    } else {
+      rest[index] = item;
+    }
+    c += 1;
+  });
+  return { part, rest };
+};
+
 // src/helpers/errorTrack.tsx
-var import_array = require("ag-common/dist/common/helpers/array");
 var import_log = require("ag-common/dist/common/helpers/log");
 var import_callOpenApi = require("ag-common/dist/ui/helpers/callOpenApi");
 var import_api = __toESM(require_api());
@@ -863,34 +900,36 @@ function callOpenApi(p) {
 }
 var _a;
 var isLocal = typeof window !== "undefined" && ((_a = window == null ? void 0 : window.location) == null ? void 0 : _a.hostname) === "localhost";
-var errorBuffer = [];
+var errorBuffer = {};
 var errorTimer;
 var overrideBaseUrlSet;
 var errorPush = () => __async(void 0, null, function* () {
   var _a2, _b;
   try {
-    if (errorBuffer.length > 100) {
+    if (Object.keys(errorBuffer).length > 100) {
+      const firstKey = Object.keys(errorBuffer)[0];
+      const first = errorBuffer[firstKey];
       const x1 = yield callOpenApi({
         apiUrl: overrideBaseUrlSet,
         func: (s) => {
           var _a3;
           return s.postErrors([
             {
-              key: errorBuffer[0].key,
-              data: __spreadProps(__spreadValues({}, errorBuffer[0].data), {
-                message: `error overload!: ${(_a3 = errorBuffer[0].data.message) != null ? _a3 : "?"}`
+              key: first.key,
+              data: __spreadProps(__spreadValues({}, first.data), {
+                message: `error overload!: ${(_a3 = first.data.message) != null ? _a3 : "?"}`
               })
             }
           ]);
         }
       });
-      errorBuffer = [];
+      errorBuffer = {};
       if (x1.error) {
         throw x1.error;
       }
       return {};
     }
-    const { part, rest } = (0, import_array.take)(errorBuffer, 10);
+    const { part, rest } = takeObject(errorBuffer, 10);
     errorBuffer = rest;
     const x = yield callOpenApi({
       apiUrl: overrideBaseUrlSet,
@@ -926,7 +965,8 @@ var errorTrack = (_0) => __async(void 0, [_0], function* ({
     return {};
   }
   (0, import_log.debug)("error track", data.data.message, JSON.stringify(data));
-  errorBuffer.push(data);
+  const key = (0, import_logsend.getErrorKey)(data.data.message);
+  errorBuffer[key] = data;
   overrideBaseUrlSet = overrideBaseUrl;
   if (!errorTimer) {
     errorTimer = setTimeout(errorPush, 500);
@@ -936,6 +976,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
@@ -975,9 +1016,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
@@ -1147,8 +1189,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,
@@ -1193,9 +1236,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({
@@ -1206,8 +1251,9 @@ var ErrorBoundary = ({
           })
         }
       });
-    })
-  }, children);
+    }),
+    children
+  });
 };
 
 // src/components/ExternalComponent/index.tsx
@@ -1215,6 +1261,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 = ({
@@ -1237,19 +1284,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
   );
   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,
@@ -1260,7 +1313,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
   });
@@ -1410,26 +1463,15 @@ 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(
+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 = ({
@@ -1461,7 +1503,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,
@@ -1482,7 +1524,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
@@ -1497,7 +1539,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) {
@@ -1523,7 +1565,7 @@ var CognitoAuthProvider = ({
       login: true
     });
   });
-  useGranularEffect(
+  (0, import_useGranularHook.useGranularEffect)(
     () => {
       function run() {
         return __async(this, null, function* () {
@@ -1609,7 +1651,7 @@ var CognitoAuthProvider = ({
       user
     ]
   );
-  (0, import_react8.useEffect)(() => {
+  (0, import_react7.useEffect)(() => {
     var _a3;
     if (error2) {
       (0, import_log9.error)(JSON.stringify(error2));
@@ -1634,17 +1676,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: {
@@ -1658,7 +1702,7 @@ var DashboardAuthValidation = ({
   getUnauthedPage,
   addToast
 }) => {
-  useGranularEffect(
+  (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.
@@ -1680,24 +1724,24 @@ var DashboardAuthValidation = ({
   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
@@ -1705,7 +1749,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.261",
+  "version": "0.0.264",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",