@asaleh37/ui-base 25.12.181 → 26.1.2-4.1

package/package.json

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

package/src/components/App.tsx

@@ -103,14 +103,27 @@ const App: React.FC<AppInfo> = (props: AppInfo) => {
   };
 
   const AppLayoutState = useSelector((state: any) => state.AppLayout);
-  let themeOptions = { ...LightThemeOptions };
-  if (AppLayoutState.themeMode === "dark") {
-    themeOptions = { ...DarkThemeOptions };
+  let themeOptions;
+  if (props?.allowThemeChange) {
+    themeOptions = { ...LightThemeOptions };
+    if (AppLayoutState.themeMode === "dark") {
+      themeOptions = { ...DarkThemeOptions };
+    }
+  } else {
+    if (props?.appThemeMode) {
+      themeOptions =
+        props?.appThemeMode === "light"
+          ? { ...LightThemeOptions }
+          : { ...DarkThemeOptions };
+    } else {
+      themeOptions = { ...LightThemeOptions };
+    }
   }
   const theme = createTheme({
     direction: AppLayoutState.appDirection,
     ...themeOptions,
   });
+
   useEffect(() => {
     document.title = props.documentTitle;
     dispatch(AppInfoActions.setAppInfo(props));

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

@@ -12,6 +12,7 @@ import { toast } from "react-toastify";
 import ReportParameterGrid from "./ReportParameterGrid";
 import ReportViewer from "../../templates/report/ReportViewer";
 import { storageTypes } from "./AttachmentConfigGrid";
+import { ContinuousColorLegend } from "@mui/x-charts";
 
 export type ReportType = "Jasper" | "Excel" | "Blueprint";
 
@@ -66,8 +67,11 @@ const adjustFormAfterValueChange: FormValueChangeCallBk = (
       }
     }
   } else {
+    console.log("FORM VALUES", formValues);
     if (formValues?.useSysCon) {
       formActions.hideField("datasourceConId");
+    } else {
+      formActions.showField("datasourceConId");
     }
     if (formValues?.reportType) {
       if (formValues?.reportType === "Blueprint") {
@@ -376,16 +380,16 @@ const ReportGrid: React.FC = () => {
         fieldType: "text",
       },
     },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        fieldLabel: "Include App Code in attachment path",
-        fieldName: "includeAppCodeInPath",
-        required: false,
-        fieldType: "checkbox",
-      },
-    },
+    // {
+    //   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/templates/DataEntryTemplates/TemplateDataForm/TemplateForm.tsx

@@ -105,7 +105,11 @@ const TemplateForm: React.FC<TemplateFormProps> = (
           }
         }
         if (props?.formValuesChangeCallBk) {
-          props?.formValuesChangeCallBk(formValues, formActions, formManager);
+          props?.formValuesChangeCallBk(
+            retrievedRecord,
+            formActions,
+            formManager
+          );
         }
       }
     } else {

package/src/components/templates/DataEntryTemplates/TemplateDataGrid/DataGridColumnsUtil.tsx

@@ -84,7 +84,6 @@ type ComboBoxColumnProps = TemplateGridColDef & {
 export const generateComboColumn: (
   props: ComboBoxColumnProps
 ) => TemplateGridColDef = (colDef: ComboBoxColumnProps) => {
-  debugger;
   const column: TemplateGridColDef = {
     ...colDef,
     type: "custom",

package/src/components/templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid.tsx

@@ -233,7 +233,6 @@ const TemplateGrid: React.FC<TemplateGridProps> = (props) => {
         gridColumn.valueField = "lookupValue";
       }
       if (gridColumn.type === "custom") {
-        debugger;
         if (gridColumn?.options) {
           continue;
         } else if (gridColumn?.commonStoreKey) {

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

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

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/hooks/UseConfirmationWindow.tsx

@@ -28,8 +28,8 @@ export const useConfirmationWindow = (props: ConfirmationWindowProps) => {
         <DialogActions>
           <Button
             variant="contained"
-            sx={{marginRight:2,marginLeft:2}}
-            color="primary"
+            sx={{ marginRight: 2, marginLeft: 2 }}
+            color="secondary"
             onClick={() => {
               setOpen(false);
             }}
@@ -38,7 +38,7 @@ export const useConfirmationWindow = (props: ConfirmationWindowProps) => {
           </Button>
           <Button
             variant="contained"
-            sx={{marginRight:2,marginLeft:2}}
+            sx={{ marginRight: 2, marginLeft: 2 }}
             color="error"
             onClick={() => {
               props.onConfirmationCallBk();

package/src/hooks/UseWindow.tsx

@@ -84,7 +84,7 @@ export const useWindow = (props: TemplateWindowProp) => {
                 }}
                 color="secondary"
               >
-                <FontAwesomeIcon icon="xmark-square" />
+                <FontAwesomeIcon icon="xmark-square" color="white" />
               </IconButton>
             </Toolbar>
           </AppBar>

package/src/hooks/useParameterPanel.tsx

@@ -35,10 +35,11 @@ export type EntityParameter = {
 
 export const getFormElementsFromParameters = (
   parameters: Array<EntityParameter>,
-  parameterValues: any
+  parameterValues: any,
 ) => {
   const formElements: Array<FormElementProps> = [];
   for (const parameter of parameters) {
+    debugger;
     const formElement: FormElementProps = {
       type: "field",
       mode: "props",
@@ -47,6 +48,17 @@ export const getFormElementsFromParameters = (
         fieldName: parameter?.parameterCode,
         fieldType: parameter?.parameterType,
         hidden: parameter?.hidden,
+        options: parameter?.parameterDataset
+          ? JSON.parse(parameter.parameterDataset)
+          : undefined,
+        optionDisplayField: parameter?.parameterDisplayField,
+        optionValueField: parameter?.parameterValueField,
+        commonStoreKey: parameter?.commonStoreKey,
+        comboboxGroupField: parameter?.groupField,
+        comboboxValueDataType: parameter?.comboboxValueDataType,
+        lookupType: parameter?.lookupType,
+        storeUrl: parameter?.comboboxStoreURl,
+        dataQueryId: parameter?.parameterDataQueryId,
         formProps: { fieldSize: { lg: 4, md: 6, sm: 12 } },
         required: parameter?.mandatory,
         defaultValue:
@@ -69,7 +81,7 @@ export const useParameterPanel = (props: UseParameterPanelProps) => {
   });
   const panelElements = getFormElementsFromParameters(
     props.parameters,
-    parametersValues
+    parametersValues,
   );
 
   const ParameterPanel: React.FC<{

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,51 @@ export default function NavigationTree() {
     mergedNavigationItems.push(...structuredClone(NavigationItems));
   }
   mergedNavigationItems.push(
-    ...structuredClone(AppInfo.businessNavigationItems)
+    ...structuredClone(AppInfo.businessNavigationItems),
   );
+  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 +329,7 @@ export default function NavigationTree() {
       onItemClick={(event, itemId) => {
         const navigationItem = findNavigationItemById(
           itemId,
-          mergedNavigationItems
+          mergedNavigationItems,
         );
         if (
           navigationItem?.action === "NAVIGATION" &&

package/src/main.tsx

@@ -7,11 +7,13 @@ createRoot(document.getElementById("root")!).render(
     enableUINotifications={false}
     appLogo={"/logo.png"}
     appName="UI Base Library"
-    isUserProfileManaged={false}
+    isUserProfileManaged={true}
     loginScreenStyle={{
       themeMode: "dark",
       backgroundImageNameInPublicFolder: "bg.jpg",
     }}
+    appThemeMode="dark"
+    allowThemeChange={true}
     appVersion="25.12.12"
     authenticationMethod="APP"
     azureConfiguration={{
@@ -26,9 +28,13 @@ createRoot(document.getElementById("root")!).render(
     businessRoutes={[]}
     documentTitle="UI Base"
     enableAdministrationModule={true}
+    // appTheme={{
+    //   dark: { primaryColor: "#b3a10c", secondaryColor: "#2b3c46" },
+    //   light: { primaryColor: "#2b3c46", secondaryColor: "#b3a10c" },
+    // }}
     appTheme={{
-      dark: { primaryColor: "#b3a10c", secondaryColor: "#2b3c46" },
-      light: { primaryColor: "#2b3c46", secondaryColor: "#b3a10c" },
+      dark: { primaryColor: "#b50031", secondaryColor: "#b3a10c" },
+      light: { primaryColor: "#080745", secondaryColor: "#b50031" },
     }}
     muiPremiumKey="c2bd611fa642666253500ab9c8e4f78fTz0xMTE4MjEsRT0xNzc2OTg4Nzk5MDAwLFM9cHJlbWl1bSxMTT1zdWJzY3JpcHRpb24sUFY9aW5pdGlhbCxLVj0y"
   />

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" },
 ];