ag-common 0.0.9 → 0.0.13

package/dist/api/helpers/dynamo.js

@@ -28,7 +28,7 @@ const putDynamo = (item, tableName) => __awaiter(void 0, void 0, void 0, functio
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         Item: item,
     };
-    (0, log_1.info)(`running dynamo put=${JSON.stringify(params)}`);
+    (0, log_1.info)(`running dynamo put=${JSON.stringify(params, null, 2)}`);
     // write the todo to the database
     const put = yield exports.dynamoDb.put(params).promise();
     if (put.$response.error &&
@@ -138,7 +138,7 @@ const getItemDynamo = ({ tableName, pkName, pkValue, }) => __awaiter(void 0, voi
     try {
         const res = yield exports.dynamoDb.get(params).promise();
         const ret = res.Item;
-        (0, log_1.debug)(`got dynamo getitem=${JSON.stringify(params)}`);
+        (0, log_1.debug)(`got dynamo getitem=${JSON.stringify(params, null, 2)}`);
         return ret;
     }
     catch (e) {
@@ -158,14 +158,20 @@ const getItemsDynamo = ({ tableName, items, }) => __awaiter(void 0, void 0, void
             },
         },
     };
+    const dbRaw = new aws_sdk_1.default.DynamoDB({ apiVersion: '2012-10-08' });
     try {
-        const res = yield exports.dynamoDb.batchGet(params).promise();
-        (0, log_1.debug)(`got dynamo getitems=${JSON.stringify(res)}`);
-        let ret = ((_f = (_e = res.Responses) === null || _e === void 0 ? void 0 : _e[tableName]) === null || _f === void 0 ? void 0 : _f.map((s) => s)) || [];
+        const res = yield dbRaw.batchGetItem(params).promise();
+        (0, log_1.debug)(`got dynamo getitems=${JSON.stringify(res, null, 2)}`);
+        let ret = ((_f = (_e = res.Responses) === null || _e === void 0 ? void 0 : _e[tableName]) === null || _f === void 0 ? void 0 : _f.map((s) => aws_sdk_1.default.DynamoDB.Converter.unmarshall(s))) || [];
         return ret;
     }
     catch (e) {
-        (0, log_1.error)(e);
+        let msg = `error with getitems query:` +
+            JSON.stringify(params, null, 2) +
+            '\n' +
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            e.toString();
+        (0, log_1.error)(msg);
         throw e;
     }
 });

package/dist/api/helpers/index.d.ts

@@ -1,4 +1,5 @@
 export * from './api';
+export * from './dynamo';
 export * from './dynamoInfra';
 export * from './openApiHelpers';
 export * from './validateOpenApi';

package/dist/api/helpers/index.js

@@ -11,6 +11,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./api"), exports);
+__exportStar(require("./dynamo"), exports);
 __exportStar(require("./dynamoInfra"), exports);
 __exportStar(require("./openApiHelpers"), exports);
 __exportStar(require("./validateOpenApi"), exports);

package/dist/api/helpers/validateOpenApi.d.ts

@@ -1,5 +1,5 @@
 import { APIGatewayEvent, APIGatewayProxyResult } from 'aws-lambda';
-import { User } from 'analytica.click';
+import { User } from '../../ui/helpers/jwt';
 export declare type NextType<T> = ({ event, body, params, userProfile, }: {
     params: Record<string, string>;
     event: APIGatewayEvent;

package/dist/api/helpers/validations.d.ts

@@ -1,6 +1,6 @@
 import { APIGatewayProxyResult } from 'aws-lambda';
-import { User } from 'analytica.click';
 import { error } from '../../common/helpers/log';
+import { User } from '../../ui/helpers/jwt';
 export declare const getAndValidateToken: ({ tokenRaw, COGNITO_USER_POOL_ID, }: {
     tokenRaw?: string | undefined;
     COGNITO_USER_POOL_ID: string;

package/dist/api/helpers/validations.js

@@ -73,7 +73,7 @@ const getAndValidateToken = ({ tokenRaw, COGNITO_USER_POOL_ID, }) => __awaiter(v
         try {
             yield jwtVerify({ token, COGNITO_USER_POOL_ID });
             const decoded = (0, jsonwebtoken_1.decode)(token);
-            (0, log_1.debug)(`decoded=${JSON.stringify(decoded)}`);
+            (0, log_1.debug)(`decoded=${JSON.stringify(decoded, null, 2)}`);
             subject = decoded === null || decoded === void 0 ? void 0 : decoded.sub;
             if (!subject) {
                 const mess = 'user should have responded with subject (sub) field';

package/dist/common/helpers/array.d.ts

@@ -1,4 +1,4 @@
-export declare const toObject: <T, Indexer extends string | number>(arr: T[], keyF: (a: T) => Indexer) => { [a in Indexer]: T; } | null;
+export declare const toObject: <T, Indexer extends string | number>(arr: T[], keyF: (a: T) => Indexer) => { [a in Indexer]: T; };
 export declare const flat: <T>(arr: T[][]) => T[];
 export declare const take: <T>(array: T[], num: number) => {
     part: T[];

package/dist/common/helpers/array.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.notEmpty = exports.partition = exports.chunk = exports.take = exports.flat = exports.toObject = void 0;
 const toObject = (arr, keyF) => {
+    const ret = {};
     if (!arr || !keyF) {
-        return null;
+        return ret;
     }
-    const ret = {};
     arr.forEach((v) => {
         const k = keyF(v);
         ret[k] = v;
@@ -27,10 +27,8 @@ const chunk = (array, max) => {
     let row = [];
     for (const k in array) {
         const item = array[k];
-        if (row.length < max) {
-            row = [...row, item];
-        }
-        else {
+        row.push(item);
+        if (row.length >= max) {
             rows.push(row);
             row = [];
         }

package/dist/common/helpers/date.d.ts

@@ -0,0 +1,8 @@
+export declare const getTimeSeconds: () => number;
+export declare const addHours: (d: number, h: number) => Date;
+export declare const addDays: (dIn: Date, count: number) => Date;
+export declare const addMinutes: (date: Date, minutes: number) => Date;
+export declare const lastDayInMonth: (date: Date) => Date;
+export declare const dateDiffDays: (date1: Date, date2: Date) => number;
+export declare const CSharpToJs: (charpTicks: number) => Date;
+export declare const dateTimeToNearestMinute: (minutes: number, date?: Date | undefined) => Date;

package/dist/common/helpers/date.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dateTimeToNearestMinute = exports.CSharpToJs = exports.dateDiffDays = exports.lastDayInMonth = exports.addMinutes = exports.addDays = exports.addHours = exports.getTimeSeconds = void 0;
+const getTimeSeconds = () => Math.ceil(new Date().getTime() / 1000);
+exports.getTimeSeconds = getTimeSeconds;
+const addHours = (d, h) => {
+    return new Date(d + h * 60 * 60 * 1000);
+};
+exports.addHours = addHours;
+const addDays = (dIn, count) => {
+    const d = new Date(dIn);
+    d.setDate(d.getDate() + count);
+    return d;
+};
+exports.addDays = addDays;
+const addMinutes = (date, minutes) => new Date(date.getTime() + minutes * 60000);
+exports.addMinutes = addMinutes;
+const lastDayInMonth = (date) => new Date(date.getFullYear(), date.getMonth() + 1, 0);
+exports.lastDayInMonth = lastDayInMonth;
+const dateDiffDays = (date1, date2) => {
+    const dt1 = new Date(date1);
+    const dt2 = new Date(date2);
+    return Math.floor((Date.UTC(dt2.getFullYear(), dt2.getMonth(), dt2.getDate()) -
+        Date.UTC(dt1.getFullYear(), dt1.getMonth(), dt1.getDate())) /
+        1000);
+};
+exports.dateDiffDays = dateDiffDays;
+const CSharpToJs = (charpTicks) => {
+    // ticks are in nanotime; convert to microtime
+    const ticks = charpTicks / 10000;
+    // ticks are recorded from 1/1/1; get microtime difference from 1/1/1/ to 1/1/1970
+    const epochMicrotimeDiff = Math.abs(new Date(0, 0, 1).setFullYear(1));
+    // new date is ticks, converted to microtime, minus difference from epoch microtime
+    const tickDate = new Date(ticks - epochMicrotimeDiff);
+    return tickDate;
+};
+exports.CSharpToJs = CSharpToJs;
+const dateTimeToNearestMinute = (minutes, date) => {
+    const coeff = 1000 * 60 * minutes;
+    if (!date) {
+        // eslint-disable-next-line no-param-reassign
+        date = new Date();
+    }
+    const rounded = new Date(Math.round(date.getTime() / coeff) * coeff);
+    return rounded;
+};
+exports.dateTimeToNearestMinute = dateTimeToNearestMinute;

package/dist/common/helpers/index.d.ts

@@ -1,4 +1,5 @@
 export * from './array';
+export * from './date';
 export * from './distinctBy';
 export * from './email';
 export * from './groupBy';

package/dist/common/helpers/index.js

@@ -11,6 +11,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./array"), exports);
+__exportStar(require("./date"), exports);
 __exportStar(require("./distinctBy"), exports);
 __exportStar(require("./email"), exports);
 __exportStar(require("./groupBy"), exports);

package/dist/common/helpers/log.d.ts

@@ -1,5 +1,8 @@
+export declare type TLogType = 'TRACE' | 'DEBUG' | 'INFO' | 'WARN' | 'ERROR' | 'FATAL';
+export declare const GetLogLevel: (l: TLogType) => number;
+export declare const trace: (...args: any[]) => void;
+export declare const debug: (...args: any[]) => void;
 export declare const info: (...args: any[]) => void;
 export declare const warn: (...args: any[]) => void;
 export declare const error: (...args: any[]) => void;
-export declare const debug: (...args: any[]) => void;
-export declare const trace: (...args: any[]) => void;
+export declare const fatal: (...args: any[]) => void;

package/dist/common/helpers/log.js

@@ -1,25 +1,153 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.trace = exports.debug = exports.error = exports.warn = exports.info = void 0;
+exports.fatal = exports.error = exports.warn = exports.info = exports.debug = exports.trace = exports.GetLogLevel = void 0;
 /* eslint-disable @typescript-eslint/no-explicit-any */
+const _1 = require(".");
+const GetLogLevel = (l) => ['TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'].findIndex((s) => s === l);
+exports.GetLogLevel = GetLogLevel;
 /* eslint-disable no-console */
-const info = (...args) => {
-    console.log(...args);
+function dateF() {
+    const d = new Date();
+    const str = `${d.getHours()}:${d.getMinutes()}:${d.getSeconds()}`;
+    return str;
+}
+function nicify(...args) {
+    const ret = [];
+    args.forEach((a) => {
+        a.forEach((v) => {
+            if (v !== null &&
+                typeof v !== 'undefined' &&
+                v.toString().indexOf('Error:') !== -1 &&
+                v.stack) {
+                ret.push(`${v.stack}`);
+            }
+            else if (typeof v === 'string') {
+                if (v.trim() !== 'undefined') {
+                    ret.push(`${v.trim()}`);
+                }
+            }
+            else if (typeof v === 'object') {
+                ret.push(JSON.parse(JSON.stringify(v)));
+            }
+            else {
+                ret.push(v);
+            }
+        });
+    });
+    return ret;
+}
+function logprocess(type, date, args) {
+    var _a;
+    const ds = date ? `[${date}]` : '';
+    const retm = [ds, type, ...args].filter(_1.notEmpty).join('\t');
+    const min = (0, exports.GetLogLevel)((_a = process.env.LOG_LEVEL) === null || _a === void 0 ? void 0 : _a.toUpperCase()) || 'WARN';
+    const typesLogLevel = (0, exports.GetLogLevel)(type);
+    // env ignores it
+    if (typesLogLevel < min) {
+        return;
+    }
+    switch (type) {
+        case 'TRACE': {
+            console.trace(retm);
+            break;
+        }
+        case 'DEBUG': {
+            console.debug(retm);
+            break;
+        }
+        case 'INFO': {
+            console.log(retm);
+            break;
+        }
+        case 'WARN': {
+            console.warn(retm);
+            break;
+        }
+        case 'ERROR': {
+            console.error(retm);
+            break;
+        }
+        case 'FATAL': {
+            console.error(retm);
+            break;
+        }
+        default: {
+            console.log(retm);
+            break;
+        }
+    }
+}
+function printStackTrace(...args) {
+    const callstack = [];
+    let isCallstackPopulated = false;
+    try {
+        throw new Error('Test');
+    }
+    catch (e) {
+        const er = e;
+        if (er.stack) {
+            // Firefox / chrome
+            const lines = er.stack.split('\n');
+            for (let i = 0, len = lines.length; i < len; i += 1) {
+                callstack.push(` ${lines[i]} `);
+            }
+            // Remove call to logStackTrace()
+            callstack.shift();
+            isCallstackPopulated = true;
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+        }
+        else if (window.opera && er.message) {
+            // Opera
+            const lines = er.message.split('\n');
+            for (let i = 0, len = lines.length; i < len; i += 1) {
+                if (lines[i].match(/^\s*[A-Za-z0-9\-_$]+\(/)) {
+                    let entry = lines[i];
+                    // Append next line also since it has the file info
+                    if (lines[i + 1]) {
+                        entry += ` at ${lines[i + 1]}`;
+                        i += 1;
+                    }
+                    callstack.push(entry);
+                }
+            }
+            // Remove call to logStackTrace()
+            callstack.shift();
+            isCallstackPopulated = true;
+        }
+    }
+    if (!isCallstackPopulated) {
+        // IE and Safari
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        let currentFunction = args.callee.caller;
+        while (currentFunction) {
+            const fn = currentFunction.toString();
+            const fname = fn.substring(fn.indexOf('function') + 8, fn.indexOf('(')) ||
+                'anonymous';
+            callstack.push(fname);
+            currentFunction = currentFunction.caller;
+        }
+    }
+    return callstack.join('\n');
+}
+const trace = (...args) => {
+    const argsNice = nicify(args);
+    args.push(printStackTrace());
+    logprocess('TRACE', dateF(), argsNice);
 };
+exports.trace = trace;
+const debug = (...args) => logprocess('DEBUG', dateF(), nicify(args));
+exports.debug = debug;
+const info = (...args) => logprocess('INFO', dateF(), nicify(args));
 exports.info = info;
-const warn = (...args) => {
-    console.warn(...args);
-};
+const warn = (...args) => logprocess('WARN', dateF(), nicify(args));
 exports.warn = warn;
-const error = (...args) => {
-    console.error(...args);
-};
+const error = (...args) => logprocess('ERROR', dateF(), nicify(args));
 exports.error = error;
-const debug = (...args) => {
-    console.debug(...args);
+const fatal = (...args) => {
+    const argsNice = nicify(args);
+    args.push(printStackTrace());
+    logprocess('FATAL', dateF(), argsNice);
 };
-exports.debug = debug;
-const trace = (...args) => {
-    console.trace(...args);
-};
-exports.trace = trace;
+exports.fatal = fatal;

package/dist/common/helpers/string.d.ts

@@ -9,7 +9,7 @@ export interface ISite {
 /**
  * removes protocol, and trailing slashes
  */
-export declare const niceUrl: (siteUrl: string) => string | ISite;
+export declare const niceUrl: (siteUrl: string) => ISite | undefined;
 /**
  * string -> String
  * @param str

package/dist/common/helpers/string.js

@@ -52,7 +52,7 @@ exports.truncate = truncate;
  */
 const niceUrl = (siteUrl) => {
     if (!siteUrl) {
-        return siteUrl;
+        return undefined;
     }
     let niceSiteUrl = siteUrl
         .substring(siteUrl.indexOf(':') + 1)

package/dist/index.js

@@ -10,7 +10,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable prettier/prettier */
 __exportStar(require("./ui"), exports);
 __exportStar(require("./common"), exports);
 __exportStar(require("./api"), exports);

package/dist/ui/components/BorderGradient/index.d.ts

@@ -0,0 +1,19 @@
+import React from 'react';
+declare type IOnClick = React.MouseEvent<HTMLDivElement, MouseEvent> | React.MouseEvent<HTMLAnchorElement, MouseEvent>;
+export declare const BorderGradient: ({ left, right, children, radius, fill, padding, className, onClick, href, target, rel, noGrow, disabled, canClick, }: {
+    canClick?: boolean | undefined;
+    noGrow?: boolean | undefined;
+    className?: string | undefined;
+    fill?: boolean | undefined;
+    radius?: string | undefined;
+    left?: string | undefined;
+    right?: string | undefined;
+    children: JSX.Element | (JSX.Element | string | number | undefined)[];
+    padding?: string | undefined;
+    onClick?: ((e: IOnClick) => void) | undefined;
+    href?: string | undefined;
+    target?: string | undefined;
+    rel?: string | undefined;
+    disabled?: boolean | undefined;
+}) => JSX.Element;
+export {};

package/dist/ui/components/BorderGradient/index.js

@@ -0,0 +1,111 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BorderGradient = void 0;
+const styled_components_1 = __importStar(require("styled-components"));
+const react_1 = __importDefault(require("react"));
+const colours_1 = require("../../styles/colours");
+const BGcss = (0, styled_components_1.css) `
+  display: flex;
+  border: 0;
+  padding: 3px;
+  border-radius: ${({ radius }) => radius};
+  background-image: linear-gradient(white, white),
+    linear-gradient(
+      to bottom right,
+      ${({ left }) => left},
+      ${({ right }) => right}
+    );
+  background-origin: border-box;
+  background-clip: content-box, border-box;
+  overflow: hidden;
+  ${({ noGrow }) => !noGrow &&
+    (0, styled_components_1.css) `
+      flex-grow: 1;
+    `}
+  ${({ disabled }) => disabled &&
+    (0, styled_components_1.css) `
+      filter: grayscale(1);
+    `}
+
+${({ canClick, disabled }) => (0, styled_components_1.css) `
+      cursor: ${canClick && !disabled ? 'pointer' : 'default'};
+    `}
+
+  ${({ canClick, disabled }) => canClick &&
+    !disabled &&
+    (0, styled_components_1.css) `
+      &:hover {
+        filter: saturate(3);
+      }
+    `}
+`;
+const BGLink = styled_components_1.default.div `
+  ${BGcss};
+`;
+const BGALink = styled_components_1.default.a `
+  ${BGcss};
+`;
+const Padding = styled_components_1.default.div `
+  justify-content: center;
+  align-items: center;
+  display: flex;
+  flex-flow: column;
+  padding: ${({ padding }) => padding};
+  border: 0;
+  flex-grow: 1;
+`;
+const FeatureBoxFill = (0, styled_components_1.default)(Padding) `
+  background-image: linear-gradient(
+    to bottom right,
+    ${({ left }) => left},
+    ${({ right }) => right}
+  );
+  color: ${colours_1.colours.mainLight};
+  border-radius: ${({ radius }) => radius};
+  flex-grow: 1;
+`;
+const BorderGradient = ({ left = colours_1.colours.orange, right = colours_1.colours.orangeRed, children, radius = '2rem', fill = false, padding = '2rem', className, onClick, href, target, rel, noGrow = false, disabled = false, canClick = false, }) => {
+    const props = {
+        onClick: (e) => !disabled && onClick && onClick(e),
+        className,
+        left: (!fill && left) || undefined,
+        right: (!fill && right) || undefined,
+        radius,
+        href,
+        target,
+        rel,
+        noGrow,
+        disabled,
+        canClick: !!onClick || canClick,
+    };
+    const child = (react_1.default.createElement(react_1.default.Fragment, null,
+        !fill && react_1.default.createElement(Padding, { padding: padding }, children),
+        fill && (react_1.default.createElement(FeatureBoxFill, { left: left, right: right, radius: radius, padding: padding }, children))));
+    if (href) {
+        return react_1.default.createElement(BGALink, Object.assign({}, props), child);
+    }
+    return react_1.default.createElement(BGLink, Object.assign({}, props), child);
+};
+exports.BorderGradient = BorderGradient;

package/dist/ui/components/Icon/index.d.ts

@@ -0,0 +1,21 @@
+import React from 'react';
+interface IIcon {
+    disabled?: boolean;
+    fill?: string;
+    outline?: string;
+    width?: string;
+    height?: string;
+    flip?: boolean;
+    canHover?: boolean;
+    margin?: string;
+    padding?: string;
+    onClick?: (e: React.MouseEvent<HTMLSpanElement, MouseEvent>) => void;
+    children?: JSX.Element | JSX.Element[];
+    role?: string;
+    title?: string;
+    tabIndex?: number;
+    className?: string;
+}
+export declare const IconF: import("styled-components").StyledComponent<"span", any, IIcon, never>;
+export declare const Icon: (pr: IIcon) => JSX.Element;
+export {};

package/dist/ui/components/Icon/index.js

@@ -0,0 +1,86 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Icon = exports.IconF = void 0;
+const react_1 = __importDefault(require("react"));
+const styled_components_1 = __importStar(require("styled-components"));
+const common_1 = require("../../styles/common");
+exports.IconF = styled_components_1.default.span `
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 2rem;
+  padding: ${({ padding }) => padding || '0'};
+  transition: background-color 200ms;
+  margin: ${({ margin }) => (!margin ? 'unset' : margin)};
+  cursor: ${({ disabled, canHover }) => disabled || !canHover ? 'inherit' : 'pointer'};
+  > svg {
+    flex-grow: 1;
+  }
+  ${({ disabled }) => disabled &&
+    (0, styled_components_1.css) `
+      filter: grayscale(1);
+    `}
+  ${({ canHover, disabled }) => canHover &&
+    !disabled &&
+    (0, styled_components_1.css) `
+      &:hover {
+        filter: saturate(3);
+      }
+    `}
+
+  
+
+  ${({ fill }) => fill &&
+    (0, styled_components_1.css) `
+      fill: ${fill};
+
+      svg {
+        fill: ${fill};
+      }
+
+      linearGradient > *,
+      radialGradient > * {
+        stop-color: ${fill} !important;
+      }
+    `};
+  ${({ outline }) => outline && (0, common_1.DropShadow)(outline)};
+
+  width: ${({ width }) => width || '100%'};
+  height: ${({ height }) => height || '100%'};
+  ${({ flip }) => flip &&
+    (0, styled_components_1.css) `
+      transform: rotate(180deg);
+    `};
+
+  svg {
+    width: 100%;
+    height: 100%;
+  }
+`;
+const Icon = (pr) => {
+    const { className, children, disabled, onClick } = pr;
+    return (react_1.default.createElement(exports.IconF, Object.assign({}, pr, { className: className, onClick: (e) => !disabled && (onClick === null || onClick === void 0 ? void 0 : onClick(e)) }), children));
+};
+exports.Icon = Icon;

package/dist/ui/components/Modal/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 export declare const ModalItem: import("styled-components").StyledComponent<"div", any, {}, never>;
-export declare const Modal: ({ open, setOpen, children, position, topPosition, showCloseButton, closeOnMoveMouseOutside, }: {
+export declare const Modal: ({ open, setOpen, children, position, topPosition, showCloseButton, closeOnMoveMouseOutside, className, }: {
     open: boolean;
     setOpen: (b: boolean) => void;
     children: JSX.Element | JSX.Element[];
@@ -8,6 +8,7 @@ export declare const Modal: ({ open, setOpen, children, position, topPosition, s
     topPosition?: "center" | "top" | "bottom" | undefined;
     showCloseButton?: boolean | undefined;
     closeOnMoveMouseOutside?: boolean | undefined;
+    className?: string | undefined;
 }) => JSX.Element;
 export declare const ModalDropList: (p: {
     options: (string | JSX.Element)[];
@@ -18,4 +19,5 @@ export declare const ModalDropList: (p: {
     setOpen: (b: boolean) => void;
     closeOnMoveMouseOutside?: boolean | undefined;
     showCloseButton?: boolean | undefined;
+    className?: string | undefined;
 }) => JSX.Element;

package/dist/ui/components/Modal/index.js

@@ -67,7 +67,7 @@ exports.ModalItem = styled_components_1.default.div `
     background-color: #eee;
   }
 `;
-const Modal = ({ open, setOpen, children, position = 'left', topPosition = 'bottom', showCloseButton = true, closeOnMoveMouseOutside = false, }) => {
+const Modal = ({ open, setOpen, children, position = 'left', topPosition = 'bottom', showCloseButton = true, closeOnMoveMouseOutside = false, className, }) => {
     const ref = (0, react_1.useRef)(null);
     (0, useOnClickOutside_1.useOnClickOutside)({ ref, moveMouseOutside: closeOnMoveMouseOutside }, () => {
         if (open) {
@@ -77,13 +77,13 @@ const Modal = ({ open, setOpen, children, position = 'left', topPosition = 'bott
     if (!open) {
         return react_1.default.createElement(react_1.default.Fragment, null);
     }
-    return (react_1.default.createElement(FixedBackground, null,
+    return (react_1.default.createElement(FixedBackground, { className: className },
         react_1.default.createElement(ModalBase, { "data-position": position, "data-topposition": topPosition, ref: ref },
             showCloseButton && react_1.default.createElement(Close_1.Close, { onClick: () => setOpen(false) }),
             children)));
 };
 exports.Modal = Modal;
-const ModalDropList = (p) => (react_1.default.createElement(exports.Modal, Object.assign({}, p), p.options.map((option, index) => (react_1.default.createElement(exports.ModalItem, { key: option, onClick: (e) => {
+const ModalDropList = (p) => (react_1.default.createElement(exports.Modal, Object.assign({}, p, { className: p.className }), p.options.map((option, index) => (react_1.default.createElement(exports.ModalItem, { key: option, onClick: (e) => {
         var _a;
         e.stopPropagation();
         e.preventDefault();

package/dist/ui/components/UserImage/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { AuthedUserContext } from 'analytica.click';
+import { AuthedUserContext } from '../../helpers/jwt';
 export declare const UserImage: ({ image, className, showProfilePicture, CognitoAuthContext, }: {
     image?: string | undefined;
     className?: string | undefined;

package/dist/ui/components/index.d.ts

@@ -1,9 +1,11 @@
+export * from './BorderGradient';
 export * from './Button';
 export * from './Dropdown';
 export * from './DropdownList';
 export * from './FlexColumn';
 export * from './FlexRow';
 export * from './HeadersRaw';
+export * from './Icon';
 export * from './Input';
 export * from './Loader';
 export * from './LoginButton';

package/dist/ui/components/index.js

@@ -10,12 +10,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./BorderGradient"), exports);
 __exportStar(require("./Button"), exports);
 __exportStar(require("./Dropdown"), exports);
 __exportStar(require("./DropdownList"), exports);
 __exportStar(require("./FlexColumn"), exports);
 __exportStar(require("./FlexRow"), exports);
 __exportStar(require("./HeadersRaw"), exports);
+__exportStar(require("./Icon"), exports);
 __exportStar(require("./Input"), exports);
 __exportStar(require("./Loader"), exports);
 __exportStar(require("./LoginButton"), exports);

package/dist/ui/helpers/axiosHelper.d.ts

@@ -1,11 +1,17 @@
 import { AxiosResponse } from 'axios';
-export declare const axiosHelper: <TOut>({ verb, url, data, headers, timeout, retryMax, }: {
+/**
+ *
+ * @param body accepts object or json, and passes as-is
+ * @returns
+ */
+export declare const axiosHelper: <TOut>({ verb, url, body, headers, timeout, retryMax, onStaleAuth, }: {
     headers?: {
         [a: string]: string;
     } | undefined;
     verb: 'put' | 'post' | 'get' | 'patch' | 'delete';
     url: string;
-    data?: unknown;
+    body?: unknown;
     timeout?: number | undefined;
     retryMax?: number | undefined;
+    onStaleAuth?: (() => void) | undefined;
 }) => Promise<AxiosResponse<TOut, any>>;

package/dist/ui/helpers/axiosHelper.js

@@ -15,7 +15,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.axiosHelper = void 0;
 const axios_1 = __importDefault(require("axios"));
 const object_1 = require("../../common/helpers/object");
-const axiosHelper = ({ verb, url, data, headers, timeout = 30000, retryMax = 0, }) => __awaiter(void 0, void 0, void 0, function* () {
+/**
+ *
+ * @param body accepts object or json, and passes as-is
+ * @returns
+ */
+const axiosHelper = ({ verb, url, body, headers, timeout = 30000, retryMax = 0, onStaleAuth, }) => __awaiter(void 0, void 0, void 0, function* () {
     let retry = 0;
     do {
         try {
@@ -29,23 +34,24 @@ const axiosHelper = ({ verb, url, data, headers, timeout = 30000, retryMax = 0,
                 return ret;
             }
             let noBody = false;
-            let func = axios_1.default.post;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            let axios = axios_1.default.post;
             if (verb === 'put') {
-                func = axios_1.default.put;
+                axios = axios_1.default.put;
             }
             else if (verb === 'post') {
-                func = axios_1.default.post;
+                axios = axios_1.default.post;
             }
             else if (verb === 'patch') {
-                func = axios_1.default.patch;
+                axios = axios_1.default.patch;
             }
             else if (verb === 'delete') {
-                func = axios_1.default.delete;
+                axios = axios_1.default.delete;
                 noBody = true;
             }
             let ret;
             if (noBody) {
-                ret = yield func(url, {
+                ret = yield axios(url, {
                     headers: setHeaders,
                     timeout,
                     timeoutErrorMessage: `${url} timeout`,
@@ -53,10 +59,10 @@ const axiosHelper = ({ verb, url, data, headers, timeout = 30000, retryMax = 0,
             }
             else {
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                if (data && (0, object_1.isJson)(data)) {
+                if (body && (0, object_1.isJson)(body)) {
                     setHeaders['Content-Type'] = 'application/json';
                 }
-                ret = yield func(url, data, { headers: setHeaders });
+                ret = yield axios(url, body, { headers: setHeaders });
             }
             return ret;
         }
@@ -66,9 +72,8 @@ const axiosHelper = ({ verb, url, data, headers, timeout = 30000, retryMax = 0,
             // 403 returned for old token - will be refreshed
             if (em.code === '401' || em.code === '403') {
                 // eslint-disable-next-line no-console
-                console.log('auth expired, reset');
-                // retry current page
-                window.location.reload();
+                console.log('auth expired');
+                onStaleAuth === null || onStaleAuth === void 0 ? void 0 : onStaleAuth();
                 retry = retryMax;
             }
             if (retry >= retryMax) {

package/dist/ui/helpers/callOpenApi.d.ts

@@ -1,5 +1,5 @@
-import { AxiosWrapper, User } from 'analytica.click';
 import { AxiosResponse } from 'axios';
+import { AxiosWrapper, User } from './jwt';
 export interface OverrideAuth {
     id_token?: string;
 }

package/dist/ui/helpers/cognito.d.ts

@@ -0,0 +1,31 @@
+/// <reference types="react" />
+export declare type TOnMessage = (m: string, options?: {
+    appearance: 'error' | 'success';
+}) => void;
+export interface ICognitoAuth {
+    AWSRegion: string;
+    poolUrl: string;
+    identityPool?: string;
+    UserPoolId: string;
+    ClientId: string;
+    cognitoEndpoint: string;
+    cognitoRefresh: string;
+    vendToken: string;
+}
+export interface ICognitoAuthProviderProps {
+    redirectUrl?: string;
+    location: {
+        pathname: string;
+        hash: string;
+        search: string;
+        origin: string;
+    };
+    goToPageUrl: ({ url, state, login, }: {
+        url: string;
+        state?: any;
+        login: boolean;
+    }) => Promise<void>;
+    children: JSX.Element | JSX.Element[];
+    config: ICognitoAuth;
+    onMessage?: TOnMessage;
+}

package/dist/ui/helpers/cognito.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/ui/helpers/date.d.ts

@@ -0,0 +1,2 @@
+export declare const daydiffstr: (dayticks: number) => string;
+export declare const getDMY: (date: Date, dayOffset?: number | undefined) => string;

package/dist/ui/helpers/date.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDMY = exports.daydiffstr = void 0;
+const date_1 = require("../../common/helpers/date");
+const math_1 = require("../../common/helpers/math");
+const plural_1 = require("./plural");
+const daydiffstr = (dayticks) => {
+    const ticksSince = new Date().getTime() - dayticks;
+    const totalMinutes = (0, math_1.toFixedDown)(ticksSince / 1000 / 60, 0);
+    const totalHours = (0, math_1.toFixedDown)(totalMinutes / 60, 0);
+    const totalDays = (0, math_1.toFixedDown)(totalHours / 24, 0);
+    const totalYears = (0, math_1.toFixedDown)(totalDays / 365, 0);
+    let ts = `${totalYears} ${(0, plural_1.plural)('yr', totalYears)} ago `;
+    if (totalMinutes < 60) {
+        ts = `${totalMinutes} ${(0, plural_1.plural)('min', totalMinutes)} ago `;
+    }
+    else if (totalHours < 24) {
+        ts = `${totalHours} ${(0, plural_1.plural)('hr', totalHours)} ago `;
+    }
+    else if (totalDays < 365) {
+        ts = `${totalDays} ${(0, plural_1.plural)('day', totalDays)} ago `;
+    }
+    return ts;
+};
+exports.daydiffstr = daydiffstr;
+const getDMY = (date, dayOffset) => {
+    const date1 = (0, date_1.addDays)(date, dayOffset || 0);
+    const d = String(date1.getDate()).padStart(2, '0');
+    const m = String(date1.getMonth() + 1).padStart(2, '0'); // January is 0!
+    const y = date1.getFullYear();
+    return `${y}-${m}-${d}`;
+};
+exports.getDMY = getDMY;

package/dist/ui/helpers/index.d.ts

@@ -1,14 +1,18 @@
 export * from './axiosHelper';
 export * from './browserHelpers';
 export * from './callOpenApi';
+export * from './cognito';
 export * from './cookie';
+export * from './date';
 export * from './debounce';
 export * from './dom';
 export * from './extractAttributes';
+export * from './jwt';
 export * from './lang';
 export * from './mutex';
 export * from './mutexData';
 export * from './plural';
+export * from './routes';
 export * from './useLocalStorage';
 export * from './useLockBodyScroll';
 export * from './useOnClickOutside';

package/dist/ui/helpers/index.js

@@ -13,14 +13,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./axiosHelper"), exports);
 __exportStar(require("./browserHelpers"), exports);
 __exportStar(require("./callOpenApi"), exports);
+__exportStar(require("./cognito"), exports);
 __exportStar(require("./cookie"), exports);
+__exportStar(require("./date"), exports);
 __exportStar(require("./debounce"), exports);
 __exportStar(require("./dom"), exports);
 __exportStar(require("./extractAttributes"), exports);
+__exportStar(require("./jwt"), exports);
 __exportStar(require("./lang"), exports);
 __exportStar(require("./mutex"), exports);
 __exportStar(require("./mutexData"), exports);
 __exportStar(require("./plural"), exports);
+__exportStar(require("./routes"), exports);
 __exportStar(require("./useLocalStorage"), exports);
 __exportStar(require("./useLockBodyScroll"), exports);
 __exportStar(require("./useOnClickOutside"), exports);

package/dist/ui/helpers/jwt.d.ts

@@ -0,0 +1,78 @@
+import { AxiosError } from 'axios';
+export interface Jwt {
+    access_token: string;
+    expires_at: number;
+    expires_in: number;
+    id_token: string;
+    refresh_token: string;
+    token_type: string;
+}
+export interface Identity {
+    dateCreated: string;
+    issuer?: string | Array<string>;
+    primary: string;
+    providerName: string;
+    providerType: string;
+    userId: string;
+}
+export interface IdJwt {
+    at_hash: string;
+    aud: string;
+    auth_time: number;
+    'cognito:groups': Array<string>;
+    'cognito:preferred_role': string;
+    'cognito:username': string;
+    email: string;
+    exp: number;
+    iat: number;
+    identities: Array<Identity>;
+    iss: string;
+    name: string;
+    nickname: string;
+    picture: string;
+    sub: string;
+    token_use: string;
+}
+export interface AwsCreds {
+    accessKeyId: string;
+    secretAccessKey: string;
+    sessionToken: string;
+}
+export interface User {
+    userId: string;
+    picture: string;
+    updatedAt: number;
+    nickname: string;
+    fullname: string;
+    credentials?: AwsCreds;
+    idJwt: IdJwt;
+    isAdmin: boolean;
+    jwt?: Jwt;
+}
+export interface AxiosWrapper<T> {
+    data: T;
+    error: AxiosError<unknown, any> | undefined;
+    loading: boolean;
+    reFetch: () => Promise<any>;
+    url: string;
+    datetime: number;
+}
+export interface AuthedUserContext {
+    loading: boolean;
+    isAuthenticated: boolean;
+    /**
+     * @param stateqs: must be base64'd
+     */
+    loginWithRedirect: (stateqs?: string) => Promise<void>;
+    logout: () => Promise<void>;
+    user: AxiosWrapper<User>;
+    error: Error | undefined;
+    refreshToken: () => Promise<User | undefined>;
+}
+export interface AuthedUser {
+    user: AuthedUserContext;
+    userLink?: User;
+}
+export declare const getBearerToken: (jwt?: {
+    id_token?: string | undefined;
+} | undefined) => string | undefined;

package/dist/ui/helpers/jwt.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBearerToken = void 0;
+const getBearerToken = (jwt) => !(jwt === null || jwt === void 0 ? void 0 : jwt.id_token) ? undefined : `Bearer ${jwt.id_token}`;
+exports.getBearerToken = getBearerToken;

package/dist/ui/helpers/mutexData.d.ts

@@ -8,5 +8,9 @@ export declare class MutexData<T> {
     unsubscribe(key: string, subId: string): void;
     getData(key: string): T;
     pingSubscribers(key: string): void;
-    setData(key: string, data: T, ttlSeconds?: number): void;
+    setData({ ttlSeconds, key, data, }: {
+        key: string;
+        data: T;
+        ttlSeconds?: number;
+    }): void;
 }

package/dist/ui/helpers/mutexData.js

@@ -36,7 +36,7 @@ class MutexData {
             }
         });
     }
-    setData(key, data, ttlSeconds = 3600) {
+    setData({ ttlSeconds = 3600, key, data, }) {
         (0, useLocalStorage_1.setLocalStorageItem)(`mutex-${key}`, data, ttlSeconds);
         if (Object.keys(this.subscriptions).length > 0) {
             this.pingSubscribers(key);

package/dist/ui/helpers/routes.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
-import { AuthedUserContext, ICognitoAuth, ICognitoAuthProviderProps } from 'analytica.click';
+import { ICognitoAuth, ICognitoAuthProviderProps } from './cognito';
+import { AuthedUserContext } from './jwt';
 export interface LocationSubset {
     pathname: string;
     hash: string;
@@ -7,26 +8,26 @@ export interface LocationSubset {
     query: Record<string, string>;
     host: string;
 }
-export interface IRequest {
-    darkMode: boolean;
-    url: LocationSubset;
-    headerTitle?: string;
-    seed?: number;
-    lang: 'en';
-}
 export declare type CacheItems = CacheItem[];
 export interface CacheItem {
     cacheKey: string;
     prefillData: any;
     ttlSeconds: number;
 }
-export interface IInitialState {
+export interface IInitialStateCommon {
     openApiCache?: CacheItem[];
     headerTitle?: string;
     seed?: number;
 }
-export interface IState extends IInitialState {
-    request: IRequest;
+export interface IRequestCommon {
+    darkMode: boolean;
+    url: LocationSubset;
+    headerTitle?: string;
+    seed?: number;
+    lang: 'en';
+}
+export interface IStateCommon<TRequest extends IRequestCommon> extends IInitialStateCommon {
+    request: TRequest;
     auth: ICognitoAuth;
     CognitoAuthContext: React.Context<AuthedUserContext>;
     CognitoAuthProvider: (p: ICognitoAuthProviderProps) => JSX.Element;

package/dist/ui/helpers/useOpenApiStore.d.ts

@@ -1,13 +1,19 @@
 import { AxiosResponse } from 'axios';
-import { AxiosWrapper, User } from 'analytica.click';
+import { OverrideAuth } from './callOpenApi';
 import { CacheItems } from './routes';
+import { AxiosWrapper, User } from './jwt';
 export declare const setMutexData: ({ key, data, ttlSeconds, }: {
     key: string;
     data: any;
     ttlSeconds: number;
 }) => void;
 export declare const getMutexData: <T>(key: string) => AxiosWrapper<T>;
-export declare const useOpenApiStore: <T, TDefaultApi>({ func, cacheKey, ttlSeconds, logout, refreshToken, disabled, apiUrl, newDefaultApi, }: {
+/**
+ *
+ * @param overrideAuth - auth automatically picked up from id_token cookie, can override value here, but not required
+ * @returns
+ */
+export declare const useOpenApiStore: <T, TDefaultApi>(p: {
     ttlSeconds?: number | undefined;
     func: (f: TDefaultApi) => Promise<AxiosResponse<T, any>>;
     cacheKey: string;
@@ -16,5 +22,6 @@ export declare const useOpenApiStore: <T, TDefaultApi>({ func, cacheKey, ttlSeco
     disabled?: boolean | undefined;
     apiUrl: string;
     newDefaultApi: (config: any) => TDefaultApi;
+    overrideAuth?: OverrideAuth | undefined;
 }) => AxiosWrapper<T>;
 export declare const setOpenApiCache: (items: CacheItems) => void;

package/dist/ui/helpers/useOpenApiStore.js

@@ -34,15 +34,13 @@ const setMutexData = ({ key, data, ttlSeconds = 3600, }) => {
         error: undefined,
         url: '',
     };
-    mutexData.setData(key, wrap, ttlSeconds);
+    mutexData.setData({ key, data: wrap, ttlSeconds });
 };
 exports.setMutexData = setMutexData;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const getMutexData = (key) => mutexData.getData(key);
 exports.getMutexData = getMutexData;
-function mLock(key, func, ttlSeconds, logout, refreshToken, apiUrl, 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-newDefaultApi) {
+function mLock({ key, func, ttlSeconds = 3600, logout, refreshToken, apiUrl, newDefaultApi, overrideAuth, }) {
     return __awaiter(this, void 0, void 0, function* () {
         let unlock;
         try {
@@ -56,6 +54,7 @@ newDefaultApi) {
                 logout,
                 refreshToken,
                 newDefaultApi,
+                overrideAuth,
             });
             if (!newData) {
                 return;
@@ -64,7 +63,7 @@ newDefaultApi) {
                 (0, log_1.error)('api error:', newData.error);
             }
             else {
-                mutexData.setData(key, newData, ttlSeconds);
+                mutexData.setData({ key, data: newData, ttlSeconds });
             }
             mutexData.pingSubscribers(key);
         }
@@ -81,7 +80,13 @@ newDefaultApi) {
     });
 }
 const getTs = () => new Date().getTime();
-const useOpenApiStore = ({ func, cacheKey, ttlSeconds = 3600, logout, refreshToken, disabled = false, apiUrl, newDefaultApi, }) => {
+/**
+ *
+ * @param overrideAuth - auth automatically picked up from id_token cookie, can override value here, but not required
+ * @returns
+ */
+const useOpenApiStore = (p) => {
+    const { cacheKey, disabled } = p;
     if (!cacheKey) {
         throw new Error('no cache key');
     }
@@ -98,18 +103,9 @@ const useOpenApiStore = ({ func, cacheKey, ttlSeconds = 3600, logout, refreshTok
     (0, react_1.useEffect)(() => {
         if (!disabled && !mutexData.getData(key)) {
             // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            mLock(key, func, ttlSeconds, logout, refreshToken, apiUrl, newDefaultApi);
+            mLock(Object.assign({ key }, p));
         }
-    }, [
-        disabled,
-        func,
-        key,
-        ttlSeconds,
-        logout,
-        refreshToken,
-        apiUrl,
-        newDefaultApi,
-    ]);
+    }, [disabled, key, p]);
     if (!mutexData.getData(key)) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         return { loading: true };
@@ -127,23 +123,21 @@ const useOpenApiStore = ({ func, cacheKey, ttlSeconds = 3600, logout, refreshTok
     }
     const current = mutexData.getData(key);
     return Object.assign(Object.assign({}, current), { reFetch: () => __awaiter(void 0, void 0, void 0, function* () {
-            mutexData.setData(key, Object.assign(Object.assign({}, current), { loading: true }), ttlSeconds);
-            mutexData.pingSubscribers(key);
-            const newData = yield (0, callOpenApi_1.callOpenApi)({
-                apiUrl,
-                func,
-                logout,
-                refreshToken,
-                newDefaultApi,
+            mutexData.setData({
+                key,
+                data: Object.assign(Object.assign({}, current), { loading: true }),
+                ttlSeconds: p.ttlSeconds,
             });
-            mutexData.setData(key, newData, ttlSeconds);
+            mutexData.pingSubscribers(key);
+            const newData = yield (0, callOpenApi_1.callOpenApi)(p);
+            mutexData.setData({ key, data: newData, ttlSeconds: p.ttlSeconds });
             mutexData.pingSubscribers(key);
         }) });
 };
 exports.useOpenApiStore = useOpenApiStore;
 const setOpenApiCache = (items) => {
     items.forEach(({ cacheKey, prefillData, ttlSeconds }) => {
-        mutexData.setData(cacheKey, prefillData, ttlSeconds);
+        mutexData.setData({ key: cacheKey, data: prefillData, ttlSeconds });
     });
 };
 exports.setOpenApiCache = setOpenApiCache;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.9",
+  "version": "0.0.13",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
@@ -12,7 +12,6 @@
     "axios": "0.24.0",
     "typescript": "4.5.4",
     "openapi-request-validator": "10.0.0",
-    "analytica.click": "0.0.123",
     "aws-sdk": "2.1048.0",
     "aws-cdk-lib": "2.3.0",
     "constructs": "10.0.17",