@asaleh37/ui-base 25.6.2 → 25.6.17-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asaleh37/ui-base",
-  "version": "25.6.2",
+  "version": "25.6.17-1",
   "description": "",
   "license": "ISC",
   "author": "Ahmed Saleh Mohamed",
@@ -10,7 +10,7 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "rollup -c --bundleConfigAsCjs",
-    "dev": "vite --host"
+    "dev": "vite"
   },
   "devDependencies": {
     "@emotion/cache": "^11.14.0",
@@ -41,7 +41,7 @@
     "@types/react-dom": "^19.0.3",
     "@types/react-i18next": "^7.8.3",
     "@vitejs/plugin-react": "^4.3.4",
-    "axios": "^1.8.1",
+    "axios": "^1.8.1",    
     "eslint": "^9.19.0",
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-react-refresh": "^0.4.18",
@@ -53,7 +53,7 @@
     "moment": "^2.30.1",
     "oidc-client-ts": "^3.1.0",
     "react": "^19.1.0",
-    "react-dom": "^19.0.0",
+    "react-dom": "^19.0.0",    
     "react-hook-form": "^7.54.2",
     "react-i18next": "^15.4.0",
     "react-redux": "^9.2.0",
@@ -92,7 +92,7 @@
     "@mui/x-tree-view": "^7.26.0",
     "@react-spring/web": "^9.7.5",
     "@reduxjs/toolkit": "^2.5.1",
-    "axios": "^1.8.1",
+    "axios": "^1.8.1",    
     "global": "^4.4.0",
     "i18next": "^24.2.2",
     "i18next-browser-languagedetector": "^8.0.3",
@@ -100,7 +100,7 @@
     "moment": "^2.30.1",
     "oidc-client-ts": "^3.1.0",
     "react": "^19.0.0",
-    "react-dom": "^19.0.0",
+    "react-dom": "^19.0.0",    
     "react-hook-form": "^7.54.2",
     "react-i18next": "^15.4.0",
     "react-redux": "^9.2.0",
@@ -113,8 +113,7 @@
     "stylis-plugin-rtl": "^2.1.1",
     "zod": "^3.24.2"
   },
-  "dependencies": {
-    "@rollup/plugin-json": "^6.1.0",
-    "rollup-plugin-terser": "^7.0.2"
+  "dependencies": {    
+    "@rollup/plugin-json": "^6.1.0"    
   }
 }

package/src/components/administration/dev/AttachmentConfigGrid.tsx

@@ -4,7 +4,7 @@ import { FormElementProps } from "../../templates/DataEntryTemplates/DataEntryTy
 import { useTranslation } from "react-i18next";
 import { useApiActions } from "../../../hooks";
 
-export const storageTypes = [{ value: "FILE_SYSTEM" }, { value: "SFTP" }];
+const storageTypes = [{ value: "FILE_SYSTEM" }, { value: "SFTP" }];
 
 const AttachmentConfigGrid: React.FC = () => {
   const { t } = useTranslation();
@@ -116,16 +116,6 @@ const AttachmentConfigGrid: React.FC = () => {
         optionValueField: "value",
       },
     },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        fieldLabel: "Include App Code in attachment path",
-        fieldName: "includeAppCodeInPath",
-        required: false,
-        fieldType: "checkbox",
-      },
-    },
     {
       type: "field",
       mode: "props",

package/src/components/administration/dev/ReportGrid.tsx

@@ -12,7 +12,6 @@ import { toast } from "react-toastify";
 import ReportParametersForm from "./ReportParametersForm";
 import ReportParameterGrid from "./ReportParameterGrid";
 import ReportViewer from "../../templates/report/ReportViewer";
-import { storageTypes } from "./AttachmentConfigGrid";
 
 type ValidationCritria = {
   isVisible: boolean;
@@ -27,6 +26,7 @@ type ReportValidationOptions = {
   reportBluePrintId: ValidationCritria;
   reportExcelDataQueryId: ValidationCritria;
   reportJasperName: ValidationCritria;
+  reportJasperPath: ValidationCritria;
 };
 
 type validationObjectType = {
@@ -40,6 +40,7 @@ const validationObject: validationObjectType = {
     reportBluePrintId: { isMandatory: true, isVisible: true },
     reportExcelDataQueryId: { isMandatory: false, isVisible: false },
     reportJasperName: { isMandatory: false, isVisible: false },
+    reportJasperPath: { isMandatory: false, isVisible: false },
   },
   Jasper: {
     useSysDatasource: { isMandatory: false, isVisible: true },
@@ -47,6 +48,7 @@ const validationObject: validationObjectType = {
     reportBluePrintId: { isMandatory: false, isVisible: false },
     reportExcelDataQueryId: { isMandatory: false, isVisible: false },
     reportJasperName: { isMandatory: true, isVisible: true },
+    reportJasperPath: { isMandatory: true, isVisible: true },
   },
   Excel: {
     useSysDatasource: { isMandatory: false, isVisible: false },
@@ -54,6 +56,7 @@ const validationObject: validationObjectType = {
     reportBluePrintId: { isMandatory: false, isVisible: false },
     reportExcelDataQueryId: { isMandatory: true, isVisible: true },
     reportJasperName: { isMandatory: false, isVisible: false },
+    reportJasperPath: { isMandatory: false, isVisible: false },
   },
 };
 
@@ -80,11 +83,13 @@ const adjustFormAccordingToReportType = (
     formActions.hideField("reportBluePrintId");
     formActions.hideField("reportExcelDataQueryId");
     formActions.hideField("reportJasperName");
+    formActions.hideField("reportJasperPath");
     formManager.setValue("useSysDatasource", null);
     formManager.setValue("datasourceConId", null);
     formManager.setValue("reportBluePrintId", null);
     formManager.setValue("reportExcelDataQueryId", null);
     formManager.setValue("reportJasperName", null);
+    formManager.setValue("reportJasperPath", null);
   }
 };
 
@@ -240,19 +245,6 @@ const ReportGrid: React.FC = () => {
         fieldType: "text",
       },
     },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        fieldLabel: "ATTACHMENT_CONFIG_STORAGE_TYPE",
-        fieldName: "storageType",
-        required: true,
-        fieldType: "combobox",
-        options: storageTypes,
-        optionDisplayField: "value",
-        optionValueField: "value",
-      },
-    },
     {
       type: "field",
       mode: "props",
@@ -383,10 +375,14 @@ const ReportGrid: React.FC = () => {
       type: "field",
       mode: "props",
       props: {
-        fieldLabel: "Include App Code in attachment path",
-        fieldName: "includeAppCodeInPath",
+        fieldLabel: "REPORT_REPORT_JASPER_PATH",
+        fieldName: "reportJasperPath",
+        hidden: true,
+        gridProps: {
+          hidden: true,
+        },
         required: false,
-        fieldType: "checkbox",
+        fieldType: "text",
       },
     },
     {
@@ -412,7 +408,6 @@ const ReportGrid: React.FC = () => {
         <ReportParameterGrid selectedRecord={selectedRecord} />
       </ReportParameterWindow>
       <TemplateGrid
-        attachment={{ attachmentCode: "JASPER_REPORTS" }}
         apiActions={apiActions}
         data={data}
         setData={setData}
@@ -479,7 +474,10 @@ const ReportGrid: React.FC = () => {
               toast.error("You must enter the jasper report name");
               return false;
             }
-
+            if (record?.reportType === "Jasper" && !record?.reportJasperPath) {
+              toast.error("You must enter the jasper report path");
+              return false;
+            }
             if (
               record?.reportType === "Blueprint" &&
               !record?.reportBluePrintId

package/src/components/common/Home.tsx

@@ -8,7 +8,8 @@ import AttachmentPanel from "../templates/attachment/AttachmentPanel";
 import { useSelector } from "react-redux";
 
 const Home: React.FC = () => {
-  const AppInfo = useSelector((state: any) => state.AppInfo.value);  
+  const AppInfo = useSelector((state: any) => state.AppInfo.value);
+  console.log("AppInfo", AppInfo);
   return (
     <Box
       sx={{

package/src/components/common/MyNotificationsPanel.tsx

@@ -34,6 +34,7 @@ const MyNotificationsPanel: React.FC = () => {
         showMask: false,
         successCallBkFn: (response: any) => {
           setNotifications(response.data);
+          console.log(response.data);
         },
       });
     }

package/src/components/templates/DataEntryTemplates/TemplateDataForm/TemplateForm.tsx

@@ -341,6 +341,7 @@ const TemplateForm: React.FC<TemplateFormProps> = (
           }
           onClick={formManager.handleSubmit(
             (values) => {
+              console.log("form values", values);
               saveRecord(values);
             },
             (errors) => {

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

@@ -27,7 +27,8 @@ const getGridColumnsFromRecord = (data: Array<any>) => {
       },
     };
     formElements.push(formElement);
-  }  
+  }
+  console.log("formElements", formElements);
   return formElements;
 };
 

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

@@ -186,7 +186,8 @@ const ReportViewer: React.FC<ReportViewerProps> = (props) => {
             // Clean up
             document.body.removeChild(link);
             window.URL.revokeObjectURL(url);
-          }          
+          }
+          console.log(response);
         },
         failureCallBkFn: (response) => {
           setErrorMessage(

package/src/layout/NavigationTree.tsx

@@ -236,32 +236,28 @@ export default function NavigationTree() {
   const isMobile = useIsMobile();
   const { isUserAuthorized } = useSession();
   const filterData = (data) => {
-    const parentItems = [];
-    for (let parentItem of data) {
-      if (
-        parentItem.authority === undefined ||
-        parentItem.authority == null ||
-        isUserAuthorized(parentItem.authority)
-      ) {
-        let newParentItem = structuredClone(parentItem);
-        if (parentItem?.children) {
-          newParentItem.children = filterData(parentItem.children);
+    return data
+      .filter(
+        (item: any) =>
+          item.authority === undefined ||
+          item.authority == null ||
+          isUserAuthorized(item.authority)
+      )
+      .map((item: any) => {
+        if (item.children) {
+          item.children = filterData(item.children);
         }
-        parentItems.push(newParentItem);
-      }
-    }
-    return parentItems;
+        return item;
+      });
   };
 
   const mergedNavigationItems = [];
   if (AppInfo.enableAdministrationModule) {
-    mergedNavigationItems.push(...structuredClone(NavigationItems));
+    mergedNavigationItems.push(...NavigationItems);
   }
-  mergedNavigationItems.push(
-    ...structuredClone(AppInfo.businessNavigationItems)
-  );
+  mergedNavigationItems.push(...AppInfo.businessNavigationItems);
   const authoriedNavigationItems = filterData(mergedNavigationItems);
-  console.log("authoriedNavigationItems", authoriedNavigationItems);
+
   return (
     <RichTreeView
       items={authoriedNavigationItems}

package/src/layout/TopBar.tsx

@@ -80,7 +80,9 @@ const TopBar: React.FC = () => {
   const handleLogout = async () => {
     try {
       await handleGetRequest({ endPointURI: "api/auth/logout" });
-    } catch (error) {}
+    } catch (error) {
+      console.log("logout error", error);
+    }
     dispatch(UserSessionActions.setUnAuthenticated());
   };
   const toggleSideBar = () => {

package/src/main.tsx

@@ -4,8 +4,8 @@ import { BaseApp } from "./components";
 
 createRoot(document.getElementById("root")!).render(
   <BaseApp
-    apiBaseUrl="http://192.168.1.2:8081/api-base"
-    appLogo={"/logo.png"}
+    apiBaseUrl="http://localhost:8080/api-base"
+    appLogo={"/public/logo.png"}
     appName="UI Base Library"
     appVersion="0.0"
     businessCommonStoresMetaData={{}}

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

@@ -14,12 +14,12 @@ interface setStoreDataProps {
   data: Array<any>;
 }
 
-export type StoreMetaData = {
+export type StoreMetaData {
   url: string;
   data: Array<any>;
   autoLoad: boolean;
   authority?: string;
-};
+}
 
 export const commonStoresInitialState: CommonStoresInterface = {
   stores: {},
@@ -27,7 +27,7 @@ export const commonStoresInitialState: CommonStoresInterface = {
 };
 
 const commonStoreSlice = createSlice({
-  name: "commonStores",
+  name: "loadingMask",
   initialState: commonStoresInitialState,
   reducers: {
     setStoresMetaData: (state, action) => {

package/vite.config.ts

@@ -2,7 +2,6 @@ import { defineConfig } from "vite";
 import react from "@vitejs/plugin-react";
 import rollupNodePolyFill from "rollup-plugin-polyfill-node";
 import inject from "@rollup/plugin-inject";
-import { terser } from "rollup-plugin-terser";
 
 // https://vite.dev/config/
 export default defineConfig({
@@ -14,20 +13,8 @@ export default defineConfig({
     include: ["fbjs"],
   },
   build: {
-    minify: false,
     rollupOptions: {
-      plugins: [
-        rollupNodePolyFill(),
-        terser({
-          compress: {
-            drop_debugger: false,
-            drop_console: false,
-          },
-          format: {
-            comments: false,
-          },
-        }),
-      ],
+      plugins: [rollupNodePolyFill()],
     },
   },
   server: {