@asaleh37/ui-base 1.2.26 → 1.2.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asaleh37/ui-base",
-  "version": "1.2.26",
+  "version": "1.2.28",
   "description": "",
   "license": "ISC",
   "author": "Ahmed Saleh Mohamed",

package/rollup.config-1748377725725.cjs

@@ -1,16 +1,16 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var resolve = require('@rollup/plugin-node-resolve');
-var commonjs = require('@rollup/plugin-commonjs');
-var typescript = require('@rollup/plugin-typescript');
-var dts = require('rollup-plugin-dts');
-var terser = require('@rollup/plugin-terser');
-var json = require('@rollup/plugin-json');
-var peerDepsExternal = require('rollup-plugin-peer-deps-external');
-var postcss = require('rollup-plugin-postcss');
-
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var resolve = require('@rollup/plugin-node-resolve');
+var commonjs = require('@rollup/plugin-commonjs');
+var typescript = require('@rollup/plugin-typescript');
+var dts = require('rollup-plugin-dts');
+var terser = require('@rollup/plugin-terser');
+var json = require('@rollup/plugin-json');
+var peerDepsExternal = require('rollup-plugin-peer-deps-external');
+var postcss = require('rollup-plugin-postcss');
+
 const packageJson = require("./package.json");
 
 var rollup_config = [
@@ -45,6 +45,6 @@ var rollup_config = [
     plugins: [dts.default()],
     external: [/\.css$/],
   },
-];
-
-exports.default = rollup_config;
+];
+
+exports.default = rollup_config;

package/src/components/BaseApp.tsx

@@ -14,6 +14,10 @@ import CommonStoreReducer from "../redux/features/common/CommonStoreSlice";
 import AppInfoReducer from "../redux/features/common/AppInfoSlice";
 import SideBarReducer from "../redux/features/common/SideBarSlice";
 import { configureStore } from "@reduxjs/toolkit";
+import i18n from "../locales/i18n";
+import { initReactI18next } from "react-i18next";
+import { ENGLISH_TRANS } from "../locales/english";
+import { ARABIC_TRANS } from "../locales/arabic";
 
 library.add(fab);
 library.add(far);
@@ -27,12 +31,20 @@ export const BaseApp: React.FC<AppInfo> = (props) => {
     commonStores: CommonStoreReducer,
     SideBar: SideBarReducer,
     AppInfo: AppInfoReducer,
-    ...props.businessReduxReducers,
+    ...props?.businessReduxReducers,
   };
   const store = configureStore({
     reducer: systemReducers,
   });
-
+  const resources = {
+    en: { translation: { ...ENGLISH_TRANS, ...props?.businessLocals?.en } },
+    ar: { translation: { ...ARABIC_TRANS, ...props?.businessLocals?.ar } },
+  };
+  i18n.use(initReactI18next).init({
+    resources: resources, // Where we're gonna put translations' files
+    lng: localStorage.getItem("language") || "en", // Set the initial language of the App
+    fallbackLng: "en",
+  });
   return (
     <Provider store={store}>
       <App {...props} />

package/src/components/templates/report/ExcelReportViewer.tsx

@@ -33,10 +33,16 @@ const getGridColumnsFromRecord = (data: Array<any>) => {
 };
 
 const ExcelReportViewer: React.FC<ExcelReportViewerProps> = (props) => {
-  console.log("reportdata", props.reportData);
+  const [data, setData] = useState([]);
+  useEffect(() => {
+    const newData = props.reportData.map((record, index) => {
+      return { ...record, report_record_data_key: index };
+    });
+    setData(newData);
+  }, [props.reportData]);
   return (
     <TemplateGrid
-      data={props.reportData}
+      data={data}
       disableDefaultAction={true}
       setData={props.setReportData}
       formElements={getGridColumnsFromRecord(props.reportData)}
@@ -47,6 +53,7 @@ const ExcelReportViewer: React.FC<ExcelReportViewerProps> = (props) => {
       girdIcon={"file-excel"}
       gridTitle="Report"
       autoLoad={true}
+      keyColumnName={"report_record_data_key"}
       hideInfoBar={true}
       apiActions={{
         deleteRecordById: async () => {

package/src/layout/NavigationTree.tsx

@@ -26,7 +26,6 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useNavigate } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { useDispatch, useSelector } from "react-redux";
-import { RootState } from "../redux/store";
 import { IconProp } from "@fortawesome/fontawesome-svg-core";
 import { useIsMobile } from "../hooks/UseMobile";
 import useSession from "../hooks/UseSession";
@@ -143,7 +142,7 @@ function CustomLabel({
   ...other
 }: CustomLabelProps) {
   const { t } = useTranslation();
-  const appLayoutState = useSelector((state: RootState) => state.AppLayout);
+  const appLayoutState = useSelector((state: any) => state.AppLayout);
   return (
     <TreeItem2Label
       {...other}
@@ -231,8 +230,8 @@ const CustomTreeItem = React.forwardRef(function CustomTreeItem(
 
 export default function NavigationTree() {
   const navigate = useNavigate();
-  const appLayoutState = useSelector((state: RootState) => state.AppLayout);
-  const AppInfo = useSelector((state: RootState) => state.AppInfo.value);
+  const appLayoutState = useSelector((state: any) => state.AppLayout);
+  const AppInfo = useSelector((state: any) => state.AppInfo.value);
   const dispatch = useDispatch();
   const isMobile = useIsMobile();
   const { isUserAuthorized } = useSession();

package/src/locales/i18n.ts

@@ -1,11 +1,4 @@
 import i18n from "i18next";
-import { initReactI18next } from "react-i18next";
-import resources from ".";
-i18n.use(initReactI18next).init({
-  resources: resources, // Where we're gonna put translations' files
-  lng: localStorage.getItem("language") || "en", // Set the initial language of the App
-  fallbackLng: "en",
-});
 
 export const changeLanguage = (lng: string) => {
   i18n.changeLanguage(lng);

package/src/main.tsx

@@ -1,7 +1,6 @@
-import { StrictMode } from "react";
 import { createRoot } from "react-dom/client";
 import { BaseApp } from "./components";
-// import logo from "./assets/logo.png";
+
 
 createRoot(document.getElementById("root")!).render(
   <BaseApp

package/src/redux/features/common/AppInfoSlice.ts

@@ -9,10 +9,14 @@ export type AppInfo = {
   appName: string | null;
   appVersion: string | null;
   appLogo: any | null;
-  businessRoutes: Array<SystemRoute>;
-  businessNavigationItems: Array<ExtendedTreeItemProps>;
-  businessReduxReducers: { [key: string]: Reducer<any> };
-  businessCommonStoresMetaData: { [key: string]: StoreMetaData };
+  businessLocals?: {
+    ar: { [key: string]: string };
+    en: { [key: string]: string };
+  };
+  businessRoutes?: Array<SystemRoute>;
+  businessNavigationItems?: Array<ExtendedTreeItemProps>;
+  businessReduxReducers?: { [key: string]: Reducer<any> };
+  businessCommonStoresMetaData?: { [key: string]: StoreMetaData };
   muiPremiumKey: string;
   enableAdministrationModule: boolean;
   appTheme?: {

package/src/locals/book/arabic/bookLocalsAr.json

@@ -1,8 +0,0 @@
-{
-	"book":"book",
-			"WF_DOC_SINGULAR":"wfdoc",
-		"WF_DOC_PLURAL":"wfdocs",
-														"WF_DOC_DOC_NUM":"Doc num",
-												"WF_DOC_DOC_STATUS":"Doc status",
-												"WF_DOC_DOC_TYPE":"Doc type",
-																																									}

package/src/locals/book/english/bookLocalsEn.json

@@ -1,8 +0,0 @@
-{
-	"book":"book",
-			"WF_DOC_SINGULAR":"wfdoc",
-		"WF_DOC_PLURAL":"wfdocs",
-														"WF_DOC_DOC_NUM":"Doc num",
-												"WF_DOC_DOC_STATUS":"Doc status",
-												"WF_DOC_DOC_TYPE":"Doc type",
-																																									}