ag-common 0.0.69 → 0.0.73

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

@@ -11,4 +11,13 @@ export declare const openApiImpl: (p: {
     certificate: certmgr.ICertificate;
     hostedZone: route53.IHostedZone;
     shortStackName: string;
+    /**
+     * defaults:
+     * allowOrigins: apigw.Cors.ALL_ORIGINS,
+      allowHeaders: apigw.Cors.DEFAULT_HEADERS,
+     */
+    cors?: {
+        allowOrigins: string[];
+        allowHeaders: string[];
+    };
 }) => void;

package/dist/api/helpers/openApiHelpers.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.openApiImpl = void 0;
 /* eslint-disable no-new */
 const aws_cdk_lib_1 = require("aws-cdk-lib");
+const __1 = require("../..");
 const distinctBy_1 = require("../../common/helpers/distinctBy");
 const log_1 = require("../../common/helpers/log");
 // eslint-disable-next-line
@@ -11,11 +12,12 @@ const getPaths = (schema) => Object.entries(schema.paths).map(([fullPath, verbs]
     pathList: fullPath.split('/').filter((s) => s),
     verbs: Object.keys(verbs),
 }));
-const setUpApiGw = ({ stack, NODE_ENV, baseUrl, certificate, hostedZone, shortStackName, }) => {
+const setUpApiGw = ({ stack, NODE_ENV, baseUrl, certificate, hostedZone, shortStackName, cors = {
+    allowOrigins: aws_cdk_lib_1.aws_apigateway.Cors.ALL_ORIGINS,
+    allowHeaders: aws_cdk_lib_1.aws_apigateway.Cors.DEFAULT_HEADERS,
+}, }) => {
     const api = new aws_cdk_lib_1.aws_apigateway.RestApi(stack, `${shortStackName}-api-${NODE_ENV}`, {
-        defaultCorsPreflightOptions: {
-            allowOrigins: aws_cdk_lib_1.aws_apigateway.Cors.ALL_ORIGINS,
-        },
+        defaultCorsPreflightOptions: Object.assign({}, (cors || {})),
     });
     const dn = new aws_cdk_lib_1.aws_apigateway.DomainName(stack, 'domain', {
         domainName: `api.${baseUrl}`,
@@ -33,7 +35,7 @@ const setUpApiGw = ({ stack, NODE_ENV, baseUrl, certificate, hostedZone, shortSt
     return api;
 };
 const getDynamoPermissions = ({ lambdaPermissions, pathV, verb, seenPermissions, }) => {
-    const pathCompute = pathV + '-' + verb;
+    const pathCompute = pathV + '/' + verb;
     const lp = lambdaPermissions === null || lambdaPermissions === void 0 ? void 0 : lambdaPermissions[pathCompute];
     if (lp) {
         seenPermissions[pathCompute] = true;
@@ -48,30 +50,25 @@ const getDynamoPermissions = ({ lambdaPermissions, pathV, verb, seenPermissions,
     //
     const readTables = (0, distinctBy_1.distinctBy)([...((def === null || def === void 0 ? void 0 : def.reads) || []), ...((lp === null || lp === void 0 ? void 0 : lp.reads) || [])], (s) => s.shortName);
     const writeTables = (0, distinctBy_1.distinctBy)([...((def === null || def === void 0 ? void 0 : def.writes) || []), ...((lp === null || lp === void 0 ? void 0 : lp.writes) || [])], (s) => s.shortName);
+    const policies = [...(def.policies || []), ...((lp === null || lp === void 0 ? void 0 : lp.policies) || [])].filter(__1.notEmpty);
     const tables = [...readTables, ...writeTables];
     const environment = {};
     Object.values(tables).forEach((v) => {
         environment[v.shortName] = v.table.tableName;
     });
-    return { environment, readTables, writeTables };
+    return { environment, readTables, writeTables, policies };
 };
-const addApiPaths = (api, subs, apiRoots) => {
-    let apiPath;
-    subs.forEach((s, i) => {
-        if (i === 0) {
-            if (apiRoots[s]) {
-                apiPath = apiRoots[s];
-            }
-            else {
-                apiPath = api.root.addResource(s);
-                apiRoots[s] = apiPath;
-            }
+const addApiPaths = (api, pathList, apiRoots) => {
+    let pathBuild = '';
+    let apiPath = api.root;
+    pathList.forEach((path) => {
+        pathBuild += '/' + path;
+        if (apiRoots[pathBuild]) {
+            apiPath = apiRoots[pathBuild];
         }
         else {
-            if (!apiPath) {
-                throw new Error('no apipath');
-            }
-            apiPath = apiPath.addResource(s);
+            apiRoots[pathBuild] = apiPath.addResource(path);
+            apiPath = apiRoots[pathBuild];
         }
     });
     if (!apiPath) {
@@ -92,13 +89,14 @@ const openApiImpl = (p) => {
     paths.forEach(({ fullPath, verbs, pathList }) => {
         const apiPath = addApiPaths(api, pathList, apiRoots);
         verbs.forEach((verb) => {
-            const { environment, readTables, writeTables } = getDynamoPermissions({
+            const { environment, readTables, writeTables, policies } = getDynamoPermissions({
                 lambdaPermissions,
                 pathV: fullPath,
                 verb,
                 seenPermissions,
             });
             const lambdaName = lambdaNameSafe(`${p.shortStackName}-${fullPath}-${verb}-${NODE_ENV}`);
+            const entry = `${endpointsBase}${fullPath}/${verb.toUpperCase()}.ts`;
             const lambdaV = new aws_cdk_lib_1.aws_lambda_nodejs.NodejsFunction(stack, lambdaName, {
                 functionName: lambdaName,
                 runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_14_X,
@@ -107,7 +105,7 @@ const openApiImpl = (p) => {
                 memorySize: 128,
                 timeout: aws_cdk_lib_1.Duration.seconds(30),
                 description: '(cdk)',
-                entry: `${endpointsBase}${fullPath}/${verb.toUpperCase()}.ts`,
+                entry: entry,
                 bundling: {
                     externalModules: ['aws-sdk', 'aws-lambda'],
                 },
@@ -116,6 +114,7 @@ const openApiImpl = (p) => {
             });
             readTables.forEach((t) => t.table.grantReadData(lambdaV));
             writeTables.forEach((t) => t.table.grantReadWriteData(lambdaV));
+            policies.forEach((p1) => lambdaV.addToRolePolicy(p1));
             //
             apiPath.addMethod(verb.toUpperCase(), new aws_cdk_lib_1.aws_apigateway.LambdaIntegration(lambdaV, {}));
         });

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

@@ -1,4 +1,4 @@
-import { aws_dynamodb as dynamodb } from 'aws-cdk-lib';
+import { aws_dynamodb as dynamodb, aws_iam as iam } from 'aws-cdk-lib';
 import { Key } from './aws';
 export interface DYNAMOKEYS {
     type: string;
@@ -21,10 +21,12 @@ export interface ILambdaPermissions {
     [pathHyphenVerb: string]: {
         reads?: IGeneratedDynamoData[];
         writes?: IGeneratedDynamoData[];
+        policies?: iam.PolicyStatement[];
     } & {
         default?: {
             reads?: IGeneratedDynamoData[];
             writes?: IGeneratedDynamoData[];
+            policies?: iam.PolicyStatement[];
         };
     };
 }

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

@@ -1,11 +1,9 @@
 import React, { KeyboardEventHandler, MouseEventHandler } from 'react';
-import { TLang, TResource } from '../../../common/helpers/i18n';
 export declare const ButtonBase: import("styled-components").FlattenSimpleInterpolation;
 export declare const Button: React.FC<{
-    title?: TResource;
+    title?: string;
     invert?: boolean;
     disabled?: boolean;
-    lang: TLang;
     className?: string;
     onClick?: MouseEventHandler<HTMLButtonElement>;
     onKeyPress?: KeyboardEventHandler<HTMLButtonElement>;

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

@@ -26,7 +26,6 @@ exports.Button = exports.ButtonBase = void 0;
 /* eslint-disable react/destructuring-assignment */
 const react_1 = __importDefault(require("react"));
 const styled_components_1 = __importStar(require("styled-components"));
-const i18n_1 = require("../../../common/helpers/i18n");
 const colours_1 = require("../../styles/colours");
 exports.ButtonBase = (0, styled_components_1.css) `
   text-decoration: none;
@@ -67,6 +66,6 @@ const Base = styled_components_1.default.button `
 `;
 const Button = (props) => {
     var _a;
-    return (react_1.default.createElement(Base, Object.assign({ className: props.className, "data-invert": props.invert, "data-disabled": (_a = props.disabled) !== null && _a !== void 0 ? _a : false }, props, { role: "button", title: !props.title ? undefined : (0, i18n_1.t)(props.title, props.lang) }), props.children));
+    return (react_1.default.createElement(Base, Object.assign({ className: props.className, "data-invert": props.invert, "data-disabled": (_a = props.disabled) !== null && _a !== void 0 ? _a : false }, props, { role: "button", title: props.title || undefined }), props.children));
 };
 exports.Button = Button;

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

@@ -0,0 +1,4 @@
+export declare const confirm: ({ bottomText, topText, }: {
+    topText?: string | undefined;
+    bottomText: string;
+}) => Promise<unknown>;

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

@@ -0,0 +1,77 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.confirm = void 0;
+/* eslint-disable jsx-a11y/no-static-element-interactions */
+/* eslint-disable jsx-a11y/click-events-have-key-events */
+const react_1 = __importDefault(require("react"));
+const react_dom_1 = __importDefault(require("react-dom"));
+const styled_components_1 = __importDefault(require("styled-components"));
+const Button_1 = require("../Button");
+const FlexColumn_1 = require("../FlexColumn");
+const FlexRow_1 = require("../FlexRow");
+const Modal_1 = require("../Modal");
+const Base = styled_components_1.default.div `
+  width: 95vw;
+  max-width: 30rem;
+  height: 50vh;
+  max-height: 15rem;
+  padding: 1rem;
+`;
+const Content = (0, styled_components_1.default)(FlexColumn_1.FlexColumn) `
+  height: 100%;
+`;
+const TopText = styled_components_1.default.div `
+  font-weight: bold;
+  border-bottom: solid 1px #ccc;
+  padding-bottom: 0.25rem;
+  font-size: 1.5rem;
+  margin-bottom: 1rem;
+`;
+const BottomText = styled_components_1.default.div `
+  padding-bottom: 0.25rem;
+  font-size: 1.1rem;
+`;
+const Bottom = (0, styled_components_1.default)(FlexRow_1.FlexRow) `
+  margin-top: auto;
+  justify-content: flex-end;
+  > button:first-child {
+    margin-right: 1rem;
+  }
+`;
+const ConfirmModal = ({ wrapper, res, bottomText, topText, okText = 'OK', cancelText = 'Cancel', }) => {
+    const ret = (v) => {
+        try {
+            res(v);
+        }
+        finally {
+            wrapper.remove();
+        }
+    };
+    return (react_1.default.createElement(Modal_1.Modal, { position: "center", topPosition: "center", open: true, setOpen: () => ret(false), showCloseButton: false, closeOnClickOutside: false },
+        react_1.default.createElement(Base, null,
+            react_1.default.createElement(Content, null,
+                topText && react_1.default.createElement(TopText, null, topText),
+                react_1.default.createElement(BottomText, null, bottomText),
+                react_1.default.createElement(Bottom, { noGrow: true },
+                    react_1.default.createElement(Button_1.Button, { onClick: () => ret(true) }, okText),
+                    react_1.default.createElement(Button_1.Button, { invert: true, onClick: () => ret(false) }, cancelText))))));
+};
+const confirm = ({ bottomText, topText, }) => __awaiter(void 0, void 0, void 0, function* () {
+    return new Promise((res) => {
+        const wrapper = document.body.appendChild(document.createElement('div'));
+        react_dom_1.default.render(react_1.default.createElement(ConfirmModal, { bottomText: bottomText, topText: topText, res: res, wrapper: wrapper }), wrapper);
+    });
+});
+exports.confirm = confirm;

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

@@ -1,10 +1,8 @@
 /// <reference types="react" />
-import { TLang, TResource } from '../../../common/helpers/i18n';
-export declare const HeadersRaw: ({ title, image, lang, SiteShort, FullSiteUrl, siteDesc, }: {
-    title?: TResource | null | undefined;
+export declare const HeadersRaw: ({ title, image, SiteShort, FullSiteUrl, siteDesc, }: {
+    title?: string | undefined;
     image?: string | undefined;
-    lang: TLang;
     SiteShort: string;
     FullSiteUrl: string;
-    siteDesc: TResource;
+    siteDesc: string;
 }) => JSX.Element[];

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

@@ -5,18 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HeadersRaw = void 0;
 const react_1 = __importDefault(require("react"));
-const i18n_1 = require("../../../common/helpers/i18n");
-const HeadersRaw = ({ title, image, lang, SiteShort, FullSiteUrl, siteDesc, }) => {
-    const dt = (0, i18n_1.t)(siteDesc, lang);
-    const titleText = !title ? undefined : (0, i18n_1.t)(title, lang);
-    const fullTitle = `${title ? `${titleText} | ` : ''}${SiteShort} | ${dt}`;
+const HeadersRaw = ({ title, image, SiteShort, FullSiteUrl, siteDesc, }) => {
+    const fullTitle = `${title ? `${title} | ` : ''}${SiteShort} | ${siteDesc}`;
     const titleBlock = title === undefined
         ? []
         : [
             react_1.default.createElement("title", { key: "1" }, fullTitle),
-            react_1.default.createElement("meta", { key: "2", property: "og:title", content: titleText }),
-            react_1.default.createElement("meta", { key: "3", name: "twitter:title", content: titleText }),
-            react_1.default.createElement("meta", { key: "4", itemProp: "name", content: titleText }),
+            react_1.default.createElement("meta", { key: "2", property: "og:title", content: title }),
+            react_1.default.createElement("meta", { key: "3", name: "twitter:title", content: title }),
+            react_1.default.createElement("meta", { key: "4", itemProp: "name", content: title }),
             react_1.default.createElement("meta", { key: "5", name: "description", content: fullTitle }),
             react_1.default.createElement("meta", { key: "6", itemProp: "description", content: fullTitle }),
             react_1.default.createElement("meta", { key: "7", property: "og:description", content: fullTitle }),

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

@@ -1,11 +1,8 @@
 /// <reference types="react" />
-import { TLang, TResource } from '../../../common/helpers/i18n';
-export declare const LoginButton: ({ className, text, invert, title, savePath, lang, loginPath, }: {
-    title?: TResource | undefined;
+export declare const LoginButton: ({ className, text, invert, savePath, loginPath, }: {
     invert?: boolean | undefined;
-    text?: TResource | undefined;
+    text: string;
     className?: string | undefined;
     savePath?: boolean | undefined;
-    lang: TLang;
     loginPath: (state?: Record<string, unknown> | undefined) => string;
 }) => JSX.Element;

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

@@ -6,18 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoginButton = void 0;
 const react_1 = __importDefault(require("react"));
 const styled_components_1 = __importDefault(require("styled-components"));
-const i18n_1 = require("../../../common/helpers/i18n");
 const Button_1 = require("../Button");
-const text_1 = require("./text");
 const Base = styled_components_1.default.a `
   ${Button_1.ButtonBase}
 `;
-const LoginButton = ({ className, text = text_1.getstarted, invert, title, savePath = true, lang, loginPath, }) => {
+const LoginButton = ({ className, text, invert, savePath = true, loginPath, }) => {
     const lp = loginPath(!savePath || typeof window === 'undefined'
         ? undefined
         : {
             redirect: window.location.href.substring(window.location.origin.length),
         });
-    return (react_1.default.createElement(Base, { href: lp, lang: lang, title: !title ? undefined : (0, i18n_1.t)(title, lang), "data-invert": invert, "data-disabled": false, className: className }, text && (0, i18n_1.t)(text, lang)));
+    return (react_1.default.createElement(Base, { href: lp, title: text, "data-invert": invert, "data-disabled": false, className: className }, text));
 };
 exports.LoginButton = LoginButton;

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

@@ -1,7 +1,5 @@
 /// <reference types="react" />
-import { TLang } from '../../..';
-export declare const LogoutButton: ({ className, invert, lang, logout, }: {
-    lang: TLang;
+export declare const LogoutButton: ({ className, invert, logout, }: {
     invert?: boolean | undefined;
     className?: string | undefined;
     logout: () => void;

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

@@ -24,8 +24,6 @@ const ButtonStyled = (0, styled_components_1.default)(Button_1.Button) `
     fill: ${colours_1.colours.notificationBlue};
   }
 `;
-const LogoutButton = ({ className, invert, lang, logout, }) => {
-    return (react_1.default.createElement(ButtonStyled, { invert: invert, className: className, onKeyPress: () => logout(), onClick: () => logout(), lang: lang },
-        react_1.default.createElement(Icon, null, Door)));
-};
+const LogoutButton = ({ className, invert, logout, }) => (react_1.default.createElement(ButtonStyled, { invert: invert, className: className, onKeyPress: () => logout(), onClick: () => logout() },
+    react_1.default.createElement(Icon, null, Door)));
 exports.LogoutButton = LogoutButton;

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, className, }: {
+export declare const Modal: ({ open, setOpen, children, position, topPosition, showCloseButton, closeOnMoveMouseOutside, className, closeOnClickOutside, }: {
     open: boolean;
     setOpen: (b: boolean) => void;
     children: JSX.Element | JSX.Element[];
@@ -9,6 +9,7 @@ export declare const Modal: ({ open, setOpen, children, position, topPosition, s
     showCloseButton?: boolean | undefined;
     closeOnMoveMouseOutside?: boolean | undefined;
     className?: string | undefined;
+    closeOnClickOutside?: boolean | undefined;
 }) => JSX.Element;
 export declare const ModalDropList: (p: {
     options: (string | JSX.Element)[];

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

@@ -67,10 +67,10 @@ exports.ModalItem = styled_components_1.default.div `
     background-color: #eee;
   }
 `;
-const Modal = ({ open, setOpen, children, position = 'left', topPosition = 'bottom', showCloseButton = true, closeOnMoveMouseOutside = false, className, }) => {
+const Modal = ({ open, setOpen, children, position = 'left', topPosition = 'bottom', showCloseButton = true, closeOnMoveMouseOutside = false, className, closeOnClickOutside = true, }) => {
     const ref = (0, react_1.useRef)(null);
     (0, useOnClickOutside_1.useOnClickOutside)({ ref, moveMouseOutside: closeOnMoveMouseOutside }, () => {
-        if (open) {
+        if (closeOnClickOutside && open) {
             setOpen(false);
         }
     });

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

@@ -1,6 +1,7 @@
 export * from './BorderGradient';
 export * from './Button';
 export * from './Chevron';
+export * from './Confirm';
 export * from './Dropdown';
 export * from './DropdownList';
 export * from './FlexColumn';

package/dist/ui/components/index.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./BorderGradient"), exports);
 __exportStar(require("./Button"), exports);
 __exportStar(require("./Chevron"), exports);
+__exportStar(require("./Confirm"), exports);
 __exportStar(require("./Dropdown"), exports);
 __exportStar(require("./DropdownList"), exports);
 __exportStar(require("./FlexColumn"), exports);

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

@@ -2,15 +2,15 @@ export declare const isServer: boolean;
 export declare const useQueryStringRaw: <T>({ name, searchOverride, defaultValue, stringify, parse, }: {
     name: string;
     searchOverride?: string | undefined;
-    defaultValue: T | undefined;
+    defaultValue: T;
     stringify: (v: T) => string | undefined;
-    parse: (v: string | undefined) => T | undefined;
-}) => [T | undefined, (v: T | undefined) => void];
+    parse: (v: string | undefined) => T;
+}) => [T, (v: T) => void];
 export declare const useQueryStringArray: ({ name, searchOverride, defaultValue, }: {
     name: string;
     searchOverride?: string | undefined;
     defaultValue: string[];
-}) => [string[] | undefined, (v: string[] | undefined) => void];
+}) => [string[], (v: string[]) => void];
 export declare const useQueryStringSingle: ({ name, searchOverride, defaultValue, }: {
     name: string;
     searchOverride?: string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.69",
+  "version": "0.0.73",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
@@ -13,10 +13,10 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.7.0",
+    "aws-cdk-lib": "2.8.0",
     "aws-sdk": "2.1058.0",
     "axios": "0.24.0",
-    "constructs": "10.0.32",
+    "constructs": "10.0.36",
     "jsonwebtoken": "8.5.1",
     "jwks-rsa": "2.0.5",
     "openapi-request-validator": "10.0.0",

package/dist/ui/components/LoginButton/text.d.ts

@@ -1,3 +0,0 @@
-import { TResource } from '../../../common/helpers/i18n';
-export declare const getstarted: TResource;
-export declare const login: TResource;

package/dist/ui/components/LoginButton/text.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.login = exports.getstarted = void 0;
-exports.getstarted = {
-    en: 'Get Started',
-};
-exports.login = {
-    en: 'Log In',
-};