@legalplace/wizardx-core 2.15.1 → 3.0.1

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.1](https://git.legalplace.eu/legalplace/monorepo/compare/@legalplace/wizardx-core@3.0.0...@legalplace/wizardx-core@3.0.1) (2023-02-08)
+
+
+### Bug Fixes
+
+* fix smartscript api[#7714](https://git.legalplace.eu/legalplace/monorepo/issues/7714) ([0c8fc01](https://git.legalplace.eu/legalplace/monorepo/commits/0c8fc01e209eb4e631f72c2dfa4cdab202453dba))
+* fix smartscript initiating api[#7714](https://git.legalplace.eu/legalplace/monorepo/issues/7714) ([365a087](https://git.legalplace.eu/legalplace/monorepo/commits/365a087a4e16bada6f133859a11d935fec8a1a5d))
+
+
+
+
+
+# [3.0.0](https://git.legalplace.eu/legalplace/monorepo/compare/@legalplace/wizardx-core@2.15.1...@legalplace/wizardx-core@3.0.0) (2023-02-08)
+
+
+### Bug Fixes
+
+* bunch of fixes and package alignments api[#7559](https://git.legalplace.eu/legalplace/monorepo/issues/7559) ([7e2828f](https://git.legalplace.eu/legalplace/monorepo/commits/7e2828feda10ffdf07cacd1cc661122830faaeeb))
+* fix test api[#7559](https://git.legalplace.eu/legalplace/monorepo/issues/7559) ([9a0b90a](https://git.legalplace.eu/legalplace/monorepo/commits/9a0b90ab2662debc5bacd84702f4fc722b5ea6fc))
+
+
+### Features
+
+* adding models-v3-types package to monorepo api[#7559](https://git.legalplace.eu/legalplace/monorepo/issues/7559) ([f987580](https://git.legalplace.eu/legalplace/monorepo/commits/f987580e808e1fc04bfb8b58db8c336b1394f618))
+* adding support for browser history pagination and slugs api[#7559](https://git.legalplace.eu/legalplace/monorepo/issues/7559) ([9e471ca](https://git.legalplace.eu/legalplace/monorepo/commits/9e471cadbc08df9507e0b5d9c816dd6d0bd05ed7))
+
+
+### BREAKING CHANGES
+
+* Pagination handling changed to support slugs, store init and destrying changed too.
+
+
+
+
+
 ## [2.15.1](https://git.legalplace.eu/legalplace/monorepo/compare/@legalplace/wizardx-core@2.15.0...@legalplace/wizardx-core@2.15.1) (2023-02-07)
 
 

package/dist/App.d.ts

@@ -3,7 +3,7 @@ import type { ModelV3 } from "@legalplace/models-v3-types";
 import type { StateType } from "./types/State.type";
 import type { IWizardParams } from "./types/config.type";
 export interface AppProps {
-    historyType: "browser" | "memory";
+    historyType?: "browser" | "memory";
     model?: ModelV3;
     meta?: StateType.App.Meta;
     instance?: StateType.App.Instance;
@@ -18,6 +18,7 @@ declare class WizardXCore extends React.Component<AppProps, {
 }> {
     constructor(props: AppProps);
     componentDidMount(): void;
+    componentWillUnmount(): void;
     render(): JSX.Element;
 }
 export default WizardXCore;

package/dist/App.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from "react";
-import { Route, Switch, Redirect, generatePath } from "react-router-dom";
+import { Route, Switch, Redirect } from "react-router-dom";
 import { Provider } from "react-redux";
 import { ConnectedRouter } from "connected-react-router";
 import { getStore, createAppStore } from "./redux/store";
@@ -13,8 +13,7 @@ import ViewComponent from "./components/View";
 import PluginRoute from "./components/PluginRoute";
 import SmartScriptComponent from "./components/SmartScript";
 import { clearPlugins } from "./PluginLoader";
-import { PathReader } from "./libs/PathReader";
-import { DANGEROUS_DESTROY_STORE } from "./redux/constants/app";
+import { DANGEROUS_DESTROY_STORE } from ".";
 class WizardXCore extends React.Component {
     constructor(props) {
         var _a;
@@ -39,39 +38,18 @@ class WizardXCore extends React.Component {
             updateConfig(props.wizardParams);
         if (props.preloadTheme && ((_a = props.wizardParams) === null || _a === void 0 ? void 0 : _a.theme.name))
             preloadTheme(props.wizardParams.theme.name);
-        if (!getStore(false)) {
-            createAppStore(historyType);
-        }
-        else {
-            getStore().dispatch({ type: DANGEROUS_DESTROY_STORE });
-        }
+        createAppStore(historyType);
     }
     componentDidMount() {
-        if (getConfig().permalink) {
-            const { permalink, prefix, uniqid } = getConfig();
-            if (uniqid === null || uniqid === void 0 ? void 0 : uniqid.trim().length) {
-                getHistory().push(generatePath(getConfig().router.wizardInstancePath, {
-                    prefix: (prefix === null || prefix === void 0 ? void 0 : prefix.trim().length) ? prefix : undefined,
-                    permalink,
-                    uniqid,
-                }));
-            }
-            else {
-                getHistory().push(generatePath(getConfig().router.wizardPath, {
-                    prefix: (prefix === null || prefix === void 0 ? void 0 : prefix.trim().length) ? prefix : undefined,
-                    permalink,
-                }));
-            }
-        }
-        else if (PathReader.isSmartScriptPath()) {
-            getHistory().push(window.location.pathname);
-        }
         const { dispatch, getState } = getStore();
         const state = getState();
         dispatch(fetchModelPrerequisitesAction(getConfig().permalink || state.app.meta.permalink, getConfig().prefix || state.app.meta.prefix || ""));
     }
+    componentWillUnmount() {
+        getStore().dispatch({ type: DANGEROUS_DESTROY_STORE });
+    }
     render() {
-        return (_jsx(Provider, Object.assign({ store: getStore() }, { children: _jsx(ConnectedRouter, Object.assign({ history: getHistory() }, { children: _jsxs(Switch, { children: [_jsx(Route, { path: "/p/:path", component: PluginRoute }, void 0), _jsx(Route, { path: getConfig().router.wizardInstancePath, component: ViewComponent }, void 0), _jsx(Route, { path: getConfig().router.wizardPath, component: ViewComponent }, void 0), _jsx(Route, { path: getConfig().router.smartscriptPath, exact: true, strict: true, component: SmartScriptComponent }, void 0), !window.location.href.includes("smartscript") && (_jsx(Redirect, { to: {
+        return (_jsx(Provider, Object.assign({ store: getStore() }, { children: _jsx(ConnectedRouter, Object.assign({ history: getHistory() }, { children: _jsxs(Switch, { children: [_jsx(Route, { path: "/p/:path", component: PluginRoute }, void 0), _jsx(Route, { path: getConfig().router.smartscriptPath, exact: true, strict: true, component: SmartScriptComponent }, void 0), _jsx(Route, { path: getConfig().router.wizardInstancePath, component: ViewComponent }, void 0), _jsx(Route, { path: getConfig().router.wizardPath, component: ViewComponent }, void 0), !window.location.href.includes("smartscript") && (_jsx(Redirect, { to: {
                                 pathname: getConfig().router.notFoundPath,
                             } }, void 0))] }, void 0) }), void 0) }), void 0));
     }

package/dist/components/SmartScript.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import type { Action } from "redux";
 import moment from "moment-business-days";
 import { SmartScriptStore } from "../libs/SmartScriptStore";
@@ -26,5 +27,13 @@ declare global {
         initTriggers: (callback: TInitTriggersCallback, inputs: StateType.Inputs, newInstance: boolean) => void;
     }
 }
-declare const SmartScriptComponent: () => JSX.Element;
-export default SmartScriptComponent;
+declare const _default: import("react-redux").ConnectedComponent<React.FC<{
+    permalink: string;
+    uniqid: string;
+    metaFetchStatus: "failed" | "waiting" | "succeeded" | "unhealthy" | "userLocked" | "nonBlocking";
+}>, import("react-redux").Omit<{
+    permalink: string;
+    uniqid: string;
+    metaFetchStatus: "failed" | "waiting" | "succeeded" | "unhealthy" | "userLocked" | "nonBlocking";
+}, "permalink" | "uniqid" | "metaFetchStatus">>;
+export default _default;

package/dist/components/SmartScript.js

@@ -1,14 +1,14 @@
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useState } from "react";
-import { useParams } from "react-router-dom";
 import queryString from "query-string";
 import moment from "moment-business-days";
+import { connect } from "react-redux";
 import { getConfig } from "../config";
 import { SmartScriptStore } from "../libs/SmartScriptStore";
-const SmartScriptComponent = () => {
+let initTriggersCallback = null;
+const SmartScriptComponent = ({ permalink, uniqid, metaFetchStatus, }) => {
     const [smartScriptLoaded, setSmartScriptLoaded] = useState(false);
     const [isNewInstance, setIsNewInstance] = useState(true);
-    const [initTriggersCallback, setInitTriggersCallback] = useState(null);
     window.onInit = SmartScriptStore.onInit;
     window.onLoad = SmartScriptStore.onLoad;
     window.onOptionChange = SmartScriptStore.onOptionChange;
@@ -27,10 +27,9 @@ const SmartScriptComponent = () => {
     window.displayOption = SmartScriptStore.displayOption;
     window.moment = moment;
     const apiEndpoint = getConfig().apiEndpoint + (/\/$/.test(getConfig().apiEndpoint) ? "" : "/");
-    const { permalink, uniqid } = useParams();
     const modelVersion = queryString.parse(window.location.search).version;
     useEffect(() => {
-        if (!smartScriptLoaded) {
+        if (metaFetchStatus === "succeeded" && !smartScriptLoaded) {
             const src = `${apiEndpoint}wizard/contractv1/smartscript/${permalink}${uniqid ? `/${uniqid}` : ""}${modelVersion ? `?version=${modelVersion}` : ""}`;
             const scriptElement = document.createElement("script");
             scriptElement.setAttribute("src", src);
@@ -50,11 +49,11 @@ const SmartScriptComponent = () => {
     }, [
         smartScriptLoaded,
         apiEndpoint,
-        initTriggersCallback,
         modelVersion,
         permalink,
         uniqid,
         isNewInstance,
+        metaFetchStatus,
     ]);
     window.initTriggers = (callback, inputs, newInstance = true) => {
         SmartScriptStore.inputs = inputs;
@@ -65,7 +64,7 @@ const SmartScriptComponent = () => {
             callback(SmartScriptStore.triggers, SmartScriptStore.grabActions());
         }
         else {
-            setInitTriggersCallback(callback);
+            initTriggersCallback = callback;
             setIsNewInstance(newInstance);
         }
     };
@@ -83,6 +82,11 @@ const SmartScriptComponent = () => {
         }
         return SmartScriptStore.grabActions();
     };
-    return _jsx(_Fragment, { children: "SmartScript" }, void 0);
+    return (_jsx(_Fragment, { children: smartScriptLoaded ? "SmartScript Loaded." : "Loading SmartScript..." }, void 0));
 };
-export default SmartScriptComponent;
+const mapStateToProps = (state) => ({
+    permalink: state.app.meta.permalink,
+    uniqid: state.app.instance.uniqid,
+    metaFetchStatus: state.app.meta.fetchStatus,
+});
+export default connect(mapStateToProps)(SmartScriptComponent);

package/dist/components/View.test.js

@@ -55,7 +55,7 @@ describe('<View />', () => {
             currentPage: 1,
             greatestPage: 1,
             currentSectionId: 1,
-            availableSections: [1, 2],
+            availableSections: [1],
             currentAppState: 'wizard',
             availableAppStates: ['wizard', 'termsheet'],
         }));
@@ -76,7 +76,7 @@ describe('<View />', () => {
         yield waitFor(() => expect(container).toContainHTML('<div><h1>Wizard test theme, WizardComponent</h1></div>'));
     }));
     it('Loads TermsheetComponent properly', () => __awaiter(void 0, void 0, void 0, function* () {
-        store.dispatch(goPageAction(3));
+        store.dispatch(goPageAction(2));
         yield loadTheme();
         const { container } = render(_jsx(Provider, Object.assign({ store: store }, { children: _jsx(View, {}, void 0) }), void 0));
         yield waitFor(() => expect(container).toContainHTML('<div><h1>Wizard test theme, TermsheetComponent</h1></div>'));

package/dist/componentsConnectors/connectBox.test.js

@@ -128,6 +128,8 @@ const references = {
             raw: 'This content should be parsed with [var:1] value',
         },
     },
+    optionTags: {},
+    variableTags: {}
 };
 const conditions = {
     options: {

package/dist/componentsConnectors/connectOption.js

@@ -1,3 +1,4 @@
+import { ROLE } from "@legalplace/typeorm-constants";
 import { parseOptionLabel, parseRawWithVariables, } from "../helpers/outputsParsing";
 import { componentConnector } from "./connector/componentConnector";
 import { isStepAvailable } from "../redux/selectors/app";
@@ -9,7 +10,7 @@ export const canOptionDisplay = (id, index, selectors) => {
         display && !selectors.selectIsSmartscriptOptionIndexHidden(id, index);
     const grantLevel = typeof option.meta.grantLevel === "string"
         ? option.meta.grantLevel
-        : "GUEST";
+        : ROLE.GUEST;
     display = display && selectors.isLevelAccessibleForUser(grantLevel);
     return display;
 };

package/dist/libs/PathReader.d.ts

@@ -16,7 +16,7 @@ export declare class PathReader {
     getPageNumber(page: string): number;
     getSectionId(page?: number): number;
     getPagination(): {
-        pages: (string | number)[];
+        pages: (string | number)[][];
         appStates: string[];
     };
     getAppStatesPages(): {

package/dist/libs/PathReader.js

@@ -3,7 +3,8 @@ import queryString from "query-string";
 import { matchPath, generatePath } from "react-router";
 import { getConfig } from "../config";
 import { getPluginsPageAppStates } from "../PluginLoader";
-import { selectAvailableSections, selectAvailableAppStates, selectInstanceUniqid, } from "../redux/selectors/app";
+import { selectAvailableSections, selectAvailableAppStates, selectInstanceUniqid, selectMetaFetchStatus, } from "../redux/selectors/app";
+import { selectSectionReference } from "../redux/selectors/references";
 import Globals from "../Globals";
 export class PathReader {
     constructor(state) {
@@ -62,15 +63,15 @@ export class PathReader {
     getPageUrlName(page) {
         const pagesArray = this.getPagination().pages;
         if (page > pagesArray.length)
-            return `${pagesArray[pagesArray.length - 1]}`;
-        return `${pagesArray[page - 1]}`;
+            return `${pagesArray[pagesArray.length - 1][0]}`;
+        return `${pagesArray[page - 1][0]}`;
     }
     getPageNumber(page) {
         const { pages } = this.getPagination();
         const parsedPage = Number.isNaN(parseInt(page, 10))
             ? page
             : parseInt(page, 10);
-        return pages.indexOf(parsedPage) + 1 || 1;
+        return (pages.findIndex((currentPageNames) => currentPageNames.includes(parsedPage)) + 1 || 1);
     }
     getSectionId(page = this.currentPage) {
         const availableSections = selectAvailableSections();
@@ -87,16 +88,23 @@ export class PathReader {
         let appStates = [];
         availableAppStates.forEach((currentAppState) => {
             if (currentAppState === "wizard")
-                selectAvailableSections().forEach(() => {
-                    pages = [...pages, pages.length + 1];
+                selectAvailableSections().forEach((id) => {
+                    let currentSectionPageNames = [pages.length + 1];
+                    if (selectMetaFetchStatus() === "succeeded") {
+                        const { slug } = selectSectionReference(id);
+                        if (slug && slug.trim().length > 0) {
+                            currentSectionPageNames = [slug, ...currentSectionPageNames];
+                        }
+                    }
+                    pages = [...pages, currentSectionPageNames];
                     appStates = [...appStates, "wizard"];
                 });
             else if (Object.prototype.hasOwnProperty.call(this.getAppStatesPages(), currentAppState)) {
-                pages = [...pages, this.getAppStatesPages()[currentAppState]];
+                pages = [...pages, [this.getAppStatesPages()[currentAppState]]];
                 appStates = [...appStates, currentAppState];
             }
             else {
-                pages = [...pages, pages.length + 1];
+                pages = [...pages, [pages.length + 1]];
                 appStates = [...appStates, currentAppState];
             }
         });

package/dist/redux/actions/references.test.js

@@ -34,6 +34,8 @@ describe('References actions test suit', () => {
             outputs: {},
             evaluations: {},
             boxes: {},
+            optionTags: {},
+            variableTags: {}
         };
         const action = initReferencesAction(_obj);
         expect(action).toEqual(Object.assign({ type: 'INIT_REFERENCES' }, _obj));

package/dist/redux/reducers/references.js

@@ -23,10 +23,20 @@ const initialState = {
         sections: {},
         documents: {},
     },
-    documents: {},
-    sections: {},
+    documents: {
+        main: {
+            name: "",
+        },
+    },
+    sections: {
+        main: {
+            1: { id: 1, label: "", options: [] },
+        },
+    },
     defaults: {},
     evaluations: {},
+    optionTags: {},
+    variableTags: {},
 };
 const reducersEnum = {
     [INIT_REFERENCES]: initReferencesReducer,

package/dist/redux/selectors/library.d.ts

@@ -1,10 +1,10 @@
 import * as inputs from "./inputs";
 export declare const selectorsLibrary: {
-    selectCurrentUserLevel: () => Readonly<"ADMIN" | "MANAGER" | "USER" | "GUEST" | "SUPER" | "OPS" | undefined>;
+    selectCurrentUserLevel: () => Readonly<"SUPER" | "ADMIN" | "OPS" | "MANAGER" | "USER" | "GUEST" | undefined>;
     selectUserStatus: () => Readonly<"failed" | "authenticated" | "unauthenticated" | "inprogress">;
     selectUserValidToken: () => Readonly<boolean>;
     selectUserEmail: () => string;
-    isLevelAccessibleForUser: (level: "ADMIN" | "MANAGER" | "USER" | "GUEST" | "SUPER" | "OPS") => Readonly<boolean>;
+    isLevelAccessibleForUser: (level: "SUPER" | "ADMIN" | "OPS" | "MANAGER" | "USER" | "GUEST") => Readonly<boolean>;
     selectIsSmartscriptOptionIndexHidden: (id: number, index: number) => Readonly<boolean>;
     selectIsSmartscriptVariableIndexHidden: (id: number, index: number) => Readonly<boolean>;
     selectReferences: () => Readonly<import("@legalplace/referencesparser/dist/libs/References.type").ReferencesType>;

package/dist/redux/selectors/references.test.js

@@ -28,6 +28,8 @@ const initialState = {
     outputs: {},
     evaluations: {},
     boxes: {},
+    optionTags: {},
+    variableTags: {}
 };
 describe('Inputs selectors test suit', () => {
     it('isOptionMultiple returns undefined when references are not set', () => {

package/dist/redux/selectors/user.d.ts

@@ -1,5 +1,5 @@
-export declare const selectCurrentUserLevel: () => Readonly<"ADMIN" | "MANAGER" | "USER" | "GUEST" | "SUPER" | "OPS" | undefined>;
+export declare const selectCurrentUserLevel: () => Readonly<"SUPER" | "ADMIN" | "OPS" | "MANAGER" | "USER" | "GUEST" | undefined>;
 export declare const selectUserStatus: () => Readonly<"failed" | "authenticated" | "unauthenticated" | "inprogress">;
 export declare const selectUserValidToken: () => Readonly<boolean>;
 export declare const selectUserEmail: () => string;
-export declare const isLevelAccessibleForUser: (level: "ADMIN" | "MANAGER" | "USER" | "GUEST" | "SUPER" | "OPS") => Readonly<boolean>;
+export declare const isLevelAccessibleForUser: (level: "SUPER" | "ADMIN" | "OPS" | "MANAGER" | "USER" | "GUEST") => Readonly<boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/wizardx-core",
-  "version": "2.15.1",
+  "version": "3.0.1",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "files": [
@@ -24,8 +24,9 @@
     "@legalplace/lp-events": "1.13.0",
     "@legalplace/lplogic": "^2.1.6",
     "@legalplace/model-healthcheck": "^1.1.5",
-    "@legalplace/referencesparser": "1.7.0",
-    "@legalplace/storybook": "2.15.2",
+    "@legalplace/referencesparser": "^2.3.12",
+    "@legalplace/storybook": "^2.171.0",
+    "@legalplace/typeorm-constants": "^2.43.0",
     "@loadable/component": "^5.15.0",
     "@redux-saga/core": "^1.1.3",
     "connected-react-router": "^6.8.0",
@@ -53,9 +54,9 @@
   },
   "devDependencies": {
     "@legalplace/eslint-config": "^2.2.0",
-    "@legalplace/models-v3-types": "^3.6.0",
+    "@legalplace/models-v3-types": "^4.0.0",
     "@legalplace/prettier-config": "^2.1.3",
-    "@legalplace/typeorm-entities": "3.8.2",
+    "@legalplace/typeorm-entities": "^4.6.0",
     "@swc-node/jest": "^1.3.2",
     "@swc/core": "^1.2.93",
     "@swc/jest": "^0.2.4",
@@ -93,5 +94,5 @@
     "*.test.ts",
     "*.test.tsx"
   ],
-  "gitHead": "8e377a599464d5885544773e3f9550bc33c5ae6c"
+  "gitHead": "1fb61bd835073ac75c833b826fa35e0cd04cfb42"
 }