diff --git a/micro-ui/web/packages/core/src/components/Search/index.js b/micro-ui/web/packages/core/src/components/Search/index.js index 7eb59cd1ca5..328a24d2bc1 100644 --- a/micro-ui/web/packages/core/src/components/Search/index.js +++ b/micro-ui/web/packages/core/src/components/Search/index.js @@ -160,7 +160,7 @@ const SearchApplication = ({ tenantId, t, onSubmit, data, count }) => { {data?.display ? (
{t(data.display) - .split("\\n") + ?.split("\\n") .map((text, index) => (

{text} diff --git a/micro-ui/web/packages/tqm/public/index.html b/micro-ui/web/packages/tqm/public/index.html index d07c8a10f17..12af1aca46e 100644 --- a/micro-ui/web/packages/tqm/public/index.html +++ b/micro-ui/web/packages/tqm/public/index.html @@ -2,14 +2,14 @@ - Workbench Page + TQM Page diff --git a/micro-ui/web/packages/tqm/src/TQMWrapper.js b/micro-ui/web/packages/tqm/src/TQMWrapper.js index 836f3ba3ccf..2435f84331a 100644 --- a/micro-ui/web/packages/tqm/src/TQMWrapper.js +++ b/micro-ui/web/packages/tqm/src/TQMWrapper.js @@ -7,11 +7,10 @@ import EmployeeApp from "./pages/employee"; const App = ({ queryClient, title }) => { initTQMComponents(); //make way to do this job in container while registering remotes - return ( - + ); diff --git a/micro-ui/web/packages/tqm/src/bootstrap.js b/micro-ui/web/packages/tqm/src/bootstrap.js index 86f81eb63ea..64959b09228 100644 --- a/micro-ui/web/packages/tqm/src/bootstrap.js +++ b/micro-ui/web/packages/tqm/src/bootstrap.js @@ -1,62 +1,38 @@ -// import React from "react"; -// import ReactDOM from "react-dom"; -// import { createBrowserHistory } from "history"; -// import { QueryClient, QueryClientProvider } from "react-query"; -// import App from "./TQMWrapper"; - -// //registering remote apps -// const queryClient = new QueryClient({ -// defaultOptions: { -// queries: { -// staleTime: 15 * 60 * 1000, -// cacheTime: 50 * 60 * 1000, -// retry: false, -// retryDelay: (attemptIndex) => Infinity, -// /* -// enable this to have auto retry incase of failure -// retryDelay: attemptIndex => Math.min(1000 * 3 ** attemptIndex, 60000) -// */ -// }, -// }, -// }); - -// const mount = (el, { history, login }) => { -// ReactDOM.render( -// -// -// , -// el -// ); -// }; - -// if (process.env.NODE_ENV === "development") { -// debugger -// const rootNode = document.querySelector("#tqm-module-root"); - -// if (rootNode) { -// mount(rootNode, { -// history: createBrowserHistory(), -// login: () => {}, -// }); -// } -// } - -// export { mount }; -debugger; import React from "react"; import ReactDOM from "react-dom"; import { Router } from "react-router-dom"; import { createBrowserHistory } from "history"; import { initLibraries } from "@digit-ui/digit-ui-libraries-mfe"; import { initTQMComponents } from "./Module"; -import { QueryClient, QueryClientProvider } from "react-query"; +import { QueryClient } from "react-query"; import App from "./TQMWrapper"; +const initDigitUI = () => { + window.contextPath = "core-digit-ui" + window.Digit.Customizations = {}; + window?.Digit.ComponentRegistryService.setupRegistry({ + // PaymentModule, + // ...paymentConfigs, + // PaymentLinks, + }); + + // initHRMSComponents(); + const enabledModules = ["TQM"]; + + const moduleReducers = (initData) => initData; + + const stateCode = window?.globalConfigs?.getConfig("STATE_LEVEL_TENANT_ID") || "pg"; + // initTokens(stateCode); + + // return (); +}; + initLibraries().then(() => { - initDigitUI(); + // initDigitUI(); }); -initTQMComponents(); + +// initTQMComponents(); const queryClient = new QueryClient({ defaultOptions: { @@ -73,16 +49,15 @@ const queryClient = new QueryClient({ }, }); const mount = (el, { history, login }) => { + initDigitUI() ReactDOM.render( - - - , + , + //

TQM MODULE
, el ); }; if (process.env.NODE_ENV === "development") { - debugger const rootNode = document.querySelector("#tqm-module-root"); if (rootNode) { @@ -93,24 +68,6 @@ if (process.env.NODE_ENV === "development") { } } -const initDigitUI = () => { - window.contextPath = window?.globalConfigs?.getConfig("CONTEXT_PATH") || "digit-ui"; - window.Digit.Customizations = {}; - window?.Digit.ComponentRegistryService.setupRegistry({ - // PaymentModule, - // ...paymentConfigs, - // PaymentLinks, - }); - - // initHRMSComponents(); - const enabledModules = ["PT", "TQM"]; - - const moduleReducers = (initData) => initData; - const stateCode = window?.globalConfigs?.getConfig("STATE_LEVEL_TENANT_ID") || "pb"; - // initTokens(stateCode); - - // return (); -}; export { mount }; diff --git a/micro-ui/web/packages/tqm/webpack.common.js b/micro-ui/web/packages/tqm/webpack.common.js index 6fe7bf190f7..85e7cf18775 100644 --- a/micro-ui/web/packages/tqm/webpack.common.js +++ b/micro-ui/web/packages/tqm/webpack.common.js @@ -1,7 +1,7 @@ const path = require("path"); module.exports = { - entry: "./src/SingleSpaEntry.js", + entry: "./src/index.js", resolve: { extensions: [ ".js", ".jsx"], modules: [path.resolve(__dirname, "src"), "node_modules"],