@legalplace/wizardx-core 3.0.1 → 3.0.2

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.2](https://git.legalplace.eu/legalplace/monorepo/compare/@legalplace/wizardx-core@3.0.1...@legalplace/wizardx-core@3.0.2) (2023-02-08)
+
+
+### Bug Fixes
+
+* fix smartscrip loading api[#7714](https://git.legalplace.eu/legalplace/monorepo/issues/7714) ([7e42cba](https://git.legalplace.eu/legalplace/monorepo/commits/7e42cbac2f65d7815b069d54e8feab8f83bd5467))
+* fix test api[#7714](https://git.legalplace.eu/legalplace/monorepo/issues/7714) ([cdd9dee](https://git.legalplace.eu/legalplace/monorepo/commits/cdd9dee1816f5f61a057bfaabf8edca589dde060))
+
+
+
+
+
 ## [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)
 
 

package/dist/components/SmartScript.d.ts

@@ -1,4 +1,3 @@
-import React from "react";
 import type { Action } from "redux";
 import moment from "moment-business-days";
 import { SmartScriptStore } from "../libs/SmartScriptStore";
@@ -27,13 +26,5 @@ declare global {
         initTriggers: (callback: TInitTriggersCallback, inputs: StateType.Inputs, newInstance: boolean) => void;
     }
 }
-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;
+declare const SmartScriptComponent: () => JSX.Element;
+export default SmartScriptComponent;

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";
-let initTriggersCallback = null;
-const SmartScriptComponent = ({ permalink, uniqid, metaFetchStatus, }) => {
+const SmartScriptComponent = () => {
     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,9 +27,10 @@ const SmartScriptComponent = ({ permalink, uniqid, metaFetchStatus, }) => {
     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 (metaFetchStatus === "succeeded" && !smartScriptLoaded) {
+        if (!smartScriptLoaded) {
             const src = `${apiEndpoint}wizard/contractv1/smartscript/${permalink}${uniqid ? `/${uniqid}` : ""}${modelVersion ? `?version=${modelVersion}` : ""}`;
             const scriptElement = document.createElement("script");
             scriptElement.setAttribute("src", src);
@@ -49,11 +50,11 @@ const SmartScriptComponent = ({ permalink, uniqid, metaFetchStatus, }) => {
     }, [
         smartScriptLoaded,
         apiEndpoint,
+        initTriggersCallback,
         modelVersion,
         permalink,
         uniqid,
         isNewInstance,
-        metaFetchStatus,
     ]);
     window.initTriggers = (callback, inputs, newInstance = true) => {
         SmartScriptStore.inputs = inputs;
@@ -64,7 +65,7 @@ const SmartScriptComponent = ({ permalink, uniqid, metaFetchStatus, }) => {
             callback(SmartScriptStore.triggers, SmartScriptStore.grabActions());
         }
         else {
-            initTriggersCallback = callback;
+            setInitTriggersCallback(callback);
             setIsNewInstance(newInstance);
         }
     };
@@ -82,11 +83,6 @@ const SmartScriptComponent = ({ permalink, uniqid, metaFetchStatus, }) => {
         }
         return SmartScriptStore.grabActions();
     };
-    return (_jsx(_Fragment, { children: smartScriptLoaded ? "SmartScript Loaded." : "Loading SmartScript..." }, void 0));
+    return _jsx(_Fragment, { children: smartScriptLoaded ? "SmartScript" : "Loading..." }, void 0);
 };
-const mapStateToProps = (state) => ({
-    permalink: state.app.meta.permalink,
-    uniqid: state.app.instance.uniqid,
-    metaFetchStatus: state.app.meta.fetchStatus,
-});
-export default connect(mapStateToProps)(SmartScriptComponent);
+export default SmartScriptComponent;

package/dist/redux/middlewares/smartscriptMiddleware.js

@@ -19,8 +19,10 @@ const watchEnableSmartScript = (mpi, next, action) => {
     iframe = document.createElement("iframe");
     iframe.id = "lp-smartscript";
     iframe.setAttribute("style", "position: absolute; width:0; height:0; border:0;");
-    const { permalink, prefix } = mpi.getState().app.meta;
-    const { uniqid } = mpi.getState().app.instance;
+    const state = mpi.getState();
+    const permalink = getConfig().permalink || state.app.meta.permalink || "";
+    const prefix = getConfig().prefix || state.app.meta.prefix || "";
+    const uniqid = getConfig().uniqid || state.app.instance.uniqid || "";
     const { modelVersion } = new PathReader(mpi.getState());
     if (getConfig().router.smartscriptPath) {
         const path = generatePath(getConfig().router.smartscriptPath, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/wizardx-core",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "files": [
@@ -94,5 +94,5 @@
     "*.test.ts",
     "*.test.tsx"
   ],
-  "gitHead": "1fb61bd835073ac75c833b826fa35e0cd04cfb42"
+  "gitHead": "29260cdc0aac1698afff6be27bdc78c8ac7ef174"
 }