@asaleh37/ui-base 26.1.24 → 26.2.2

package/package.json

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

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

@@ -19,7 +19,7 @@ type ReportValidationOptions = {
   mailHost: ValidationCritria;
   mailPort: ValidationCritria;
   mailUsername: ValidationCritria;
-  mailPassword: ValidationCritria;  
+  mailPassword: ValidationCritria;
   mailProtocol: ValidationCritria;
   isMailSmtpAuthEnabled: ValidationCritria;
   isMailStarttlsEnabled: ValidationCritria;
@@ -40,7 +40,7 @@ const validationObject: validationObjectType = {
     mailHost: { isMandatory: true, isVisible: true },
     mailPort: { isMandatory: true, isVisible: true },
     mailUsername: { isMandatory: true, isVisible: true },
-    mailPassword: { isMandatory: true, isVisible: true },    
+    mailPassword: { isMandatory: true, isVisible: true },
     mailProtocol: { isMandatory: true, isVisible: true },
     isMailSmtpAuthEnabled: { isMandatory: true, isVisible: true },
     isMailStarttlsEnabled: { isMandatory: true, isVisible: true },
@@ -55,7 +55,7 @@ const validationObject: validationObjectType = {
     mailHost: { isMandatory: false, isVisible: false },
     mailPort: { isMandatory: false, isVisible: false },
     mailUsername: { isMandatory: false, isVisible: false },
-    mailPassword: { isMandatory: false, isVisible: false },    
+    mailPassword: { isMandatory: false, isVisible: false },
     mailProtocol: { isMandatory: false, isVisible: false },
     isMailSmtpAuthEnabled: { isMandatory: false, isVisible: false },
     isMailStarttlsEnabled: { isMandatory: false, isVisible: false },
@@ -71,8 +71,9 @@ const validationObject: validationObjectType = {
 const adjustFormAccordingToEngineType = (
   value: any,
   formActions: FormActionProps,
-  formManager: UseFormReturn
+  formManager: UseFormReturn,
 ) => {
+  debugger;
   if (value && validationObject[value]) {
     const validationObjects: ReportValidationOptions = validationObject[value];
     const fields = Object.keys(validationObjects);
@@ -93,7 +94,7 @@ const adjustFormAccordingToEngineType = (
     formActions.hideField("mailUsername");
     formManager.setValue("mailUsername", null);
     formActions.hideField("mailPassword");
-    formManager.setValue("mailPassword", null);    
+    formManager.setValue("mailPassword", null);
     formActions.hideField("mailProtocol");
     formManager.setValue("mailProtocol", null);
     formActions.hideField("isMailSmtpAuthEnabled");
@@ -220,7 +221,7 @@ const MailSenderConfigGrid: React.FC = () => {
             value,
             formManager,
             formActions,
-            selectedRecord
+            selectedRecord,
           ) {
             adjustFormAccordingToEngineType(value, formActions, formManager);
           },
@@ -462,16 +463,21 @@ const MailSenderConfigGrid: React.FC = () => {
       girdIcon={{ iconName: "paper-plane", prefix: "fas" }}
       editAction={{ isEnabled: true, authority: "MAIL_SENDER_CONFIG_EDIT" }}
       deleteAction={{ isEnabled: true, authority: "MAIL_SENDER_CONFIG_DELETE" }}
-      formLoadCallBk={(
-        formActions: FormActionProps,
-        formManager: UseFormReturn,
-        record: any
-      ) => {
-        adjustFormAccordingToEngineType(
-          record.mailEngine,
+      formProps={{
+        formValuesChangeCallBk: (
+          formValues,
           formActions,
-          formManager
-        );
+          formManager,
+          fieldName,
+          newValue,
+          selectedRecord,
+        ) => {
+          adjustFormAccordingToEngineType(
+            formValues.mailEngine,
+            formActions,
+            formManager,
+          );
+        },
       }}
     />
   );

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

@@ -0,0 +1,9 @@
+import { useParams } from "react-router-dom";
+import ReportViewer from "./ReportViewer";
+
+const ReportViewerRoute = () => {
+  const { reportCode } = useParams();
+  return <ReportViewer reportCode={reportCode} resultMode="App" />;
+};
+
+export default ReportViewerRoute;

package/src/layout/NavigationTree.tsx

@@ -178,12 +178,13 @@ const isExpandable = (reactChildren: React.ReactNode) => {
 };
 
 interface CustomTreeItemProps
-  extends Omit<UseTreeItem2Parameters, "rootRef">,
+  extends
+    Omit<UseTreeItem2Parameters, "rootRef">,
     Omit<React.HTMLAttributes<HTMLLIElement>, "onFocus"> {}
 
 const CustomTreeItem = React.forwardRef(function CustomTreeItem(
   props: CustomTreeItemProps,
-  ref: React.Ref<HTMLLIElement>
+  ref: React.Ref<HTMLLIElement>,
 ) {
   const { id, itemId, label, disabled, children, ...other } = props;
   const {
@@ -239,8 +240,11 @@ export default function NavigationTree() {
   const toggleSideBar = () => {
     dispatch(toggleSideBarState());
   };
-  const { isUserAuthorized, isCurrentOrganizationAuthorizedToModule } =
-    useSession();
+  const {
+    isUserAuthorized,
+    isCurrentOrganizationAuthorizedToModule,
+    UserInfo,
+  } = useSession();
   const filterData = (data) => {
     const parentItems = [];
     for (let parentItem of data) {
@@ -273,8 +277,55 @@ export default function NavigationTree() {
     mergedNavigationItems.push(...structuredClone(NavigationItems));
   }
   mergedNavigationItems.push(
-    ...structuredClone(AppInfo.businessNavigationItems)
+    ...structuredClone(AppInfo.businessNavigationItems),
   );
+  if (AppInfo?.showSystemReportsTreeNode) {
+    let sysReports = [];
+    let reportCategories = {};
+    let currentCategory = null;
+    let reportNodeId = 1;
+
+    for (const report of UserInfo?.systemReports || []) {
+      if (report?.reportCategory) {
+        currentCategory = report.reportCategory;
+      } else {
+        currentCategory = "NA";
+      }
+      if (!reportCategories[currentCategory]) {
+        reportCategories[currentCategory] = [];
+      }
+      reportCategories[currentCategory].push({
+        id: `system_report_${reportNodeId}`,
+        label: report.reportName,
+        icon: report.reportType === "Excel" ? "file-excel" : "file-pdf",
+        action: "NAVIGATION",
+        authority: report.reportAuthorityCode,
+        actionPayload: { path: "report-viewer/" + report.reportCode },
+      });
+      reportNodeId++;
+    }
+    for (const category of Object.keys(reportCategories)) {
+      if (category === "NA") {
+        for (const sysReport of reportCategories[category]) {
+          sysReports.push(sysReport);
+        }
+      } else {
+        sysReports.push({
+          id: `system_report_category_${category}`,
+          label: category,
+          icon: "folder",
+          children: reportCategories[category],
+        });
+      }
+    }
+    mergedNavigationItems.push({
+      id: "system_configured_reports",
+      label: "Reports",
+      icon: "folder",
+      children: sysReports,
+    });
+  }
+
   const authoriedNavigationItems = filterData(mergedNavigationItems);
   return (
     <RichTreeView
@@ -282,7 +333,7 @@ export default function NavigationTree() {
       onItemClick={(event, itemId) => {
         const navigationItem = findNavigationItemById(
           itemId,
-          mergedNavigationItems
+          mergedNavigationItems,
         );
         if (
           navigationItem?.action === "NAVIGATION" &&

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

@@ -35,6 +35,7 @@ export type AppInfo = {
     redirectURL: string;
     scopes: Array<string>;
   };
+  showSystemReportsTreeNode?: boolean;
   businessRoutes?: Array<SystemRoute>;
   businessNavigationItems?: Array<ExtendedTreeItemProps>;
   businessReduxReducers?: { [key: string]: Reducer<any> };
@@ -63,6 +64,7 @@ const initialState: AppInfoProp = {
     appName: null,
     appVersion: null,
     appLogo: null,
+    showSystemReportsTreeNode: false,
     muiPremiumKey: null,
     enableAdministrationModule: false,
     enableUINotifications: false,

package/src/routes/administration/index.ts

@@ -1,3 +1,4 @@
+import ReportViewerRoute from "../../components/templates/report/ReportViewerRoute";
 import { SystemRoute } from "../types";
 import { adminRoutes } from "./adminRoutes";
 import { devRoutes } from "./devRoutes";
@@ -5,4 +6,5 @@ import { devRoutes } from "./devRoutes";
 export const ADMINISTRATION_ROUTES: Array<SystemRoute> = [
   ...adminRoutes,
   ...devRoutes,
+  { component: ReportViewerRoute, path: "report-viewer/:reportCode" },
 ];