@asaleh37/ui-base 25.9.19 → 25.9.24-2

package/package.json

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

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

@@ -49,15 +49,6 @@ const ReportViewer: React.FC<ReportViewerProps> = (props) => {
       parameters: { reportCode: props.reportCode },
       successCallBkFn: (response: any) => {
         setReportInfo(response.data);
-        if (
-          props?.byPassParameterEntry === true ||
-          response.data.reportParameters.length == 0
-        ) {
-          runReport(parametersValues);
-          setReportViewerState("WAITING_RESULT");
-        } else {
-          setReportViewerState("WAITING_PARAMETER_INPUT");
-        }
       },
       failureCallBkFn: (response) => {
         setErrorMessage(
@@ -68,6 +59,20 @@ const ReportViewer: React.FC<ReportViewerProps> = (props) => {
     });
   };
 
+  useEffect(() => {
+    if (reportInfo) {
+      if (
+        props?.byPassParameterEntry === true ||
+        reportInfo.reportParameters.length == 0
+      ) {
+        runReport(parametersValues);
+        setReportViewerState("WAITING_RESULT");
+      } else {
+        setReportViewerState("WAITING_PARAMETER_INPUT");
+      }
+    }
+  }, [reportInfo]);
+
   const runReport = async (params) => {
     setReportViewerState("WAITING_RESULT");
     if (reportInfo?.reportType === "Excel") {
@@ -98,7 +103,6 @@ const ReportViewer: React.FC<ReportViewerProps> = (props) => {
         successCallBkFn: (response: any) => {
           setReportViewerState("SHOWING_RESULT");
           const contentDisposition = response.headers["content-disposition"];
-          debugger;
           let filename = "downloaded_file";
           if (
             contentDisposition &&

package/src/hooks/useParameterPanel.tsx

@@ -64,22 +64,13 @@ interface UseParameterPanelProps {
 }
 
 export const useParameterPanel = (props: UseParameterPanelProps) => {
-  console.log("useParameterPanel", "useParameterPanel called");
   const [parametersValues, setParametersValues] = useState<any>({
     ...props?.initialParameterValues,
   });
-  // const [panelElements, setPanelElements] = useState<Array<FormElementProps>>(
-  //   []
-  // );
   const panelElements = getFormElementsFromParameters(
     props.parameters,
     parametersValues
   );
-  // useEffect(() => {
-  //   setPanelElements(
-  //     getFormElementsFromParameters(props.parameters, parametersValues)
-  //   );
-  // }, [props.parameters]);
 
   const ParameterPanel: React.FC<{
     searchBtnClickCallBk: (params: any) => Promise<void>;
@@ -146,7 +137,7 @@ export const useParameterPanel = (props: UseParameterPanelProps) => {
                     setParametersValues({});
                   }
                   if (searchBtnClickCallBk) {
-                    await searchBtnClickCallBk(parametersValues);
+                    await searchBtnClickCallBk(params);
                   }
                 },
                 reloadData: async () => {},

package/src/layout/MainContent.tsx

@@ -6,7 +6,7 @@ import { cacheLtr, cacheRtl } from "../components/common/LayoutHandlers";
 import { SYSTEM_ROUTES } from "../routes";
 import { SystemRoute } from "../routes/types";
 import RouteWrapper from "./RouteWrapper";
-import { useAxios, useLoadingMask, useSession } from "../hooks";
+import { useAxios, useIsMobile, useLoadingMask, useSession } from "../hooks";
 import { useEffect, useState } from "react";
 import { setStoreData } from "../redux/features/common/CommonStoreSlice";
 
@@ -57,6 +57,7 @@ const MainContent: React.FC = () => {
       loadCommonStores();
     }
   }, [commonStores.storeKeys, UserInfo?.currentOrganization]);
+  const isMobile = useIsMobile();
   return (
     <CacheProvider
       value={AppLayoutState.appDirection === "ltr" ? cacheLtr : cacheRtl}
@@ -70,7 +71,7 @@ const MainContent: React.FC = () => {
           justifyContent: "flex-start",
           flex: 1,
           overflow: "hidden",
-          padding: 3,
+          padding: isMobile ? 1 : 3,
         }}
       >
         <Routes>

package/src/layout/NavigationTree.tsx

@@ -31,6 +31,7 @@ import { useIsMobile } from "../hooks/UseMobile";
 import useSession from "../hooks/UseSession";
 import { findNavigationItemById, NavigationItems } from "../navigationItems";
 import { DRAWER_WIDTH } from "../redux/features/common/AppLayoutSlice";
+import { toggleSideBarState } from "../redux/features/common/SideBarSlice";
 
 function DotIcon() {
   return (
@@ -234,6 +235,9 @@ export default function NavigationTree() {
   const AppInfo = useSelector((state: any) => state.AppInfo.value);
   const dispatch = useDispatch();
   const isMobile = useIsMobile();
+  const toggleSideBar = () => {
+    dispatch(toggleSideBarState());
+  };
   const { isUserAuthorized, isCurrentOrganizationAuthorizedToModule } =
     useSession();
   const filterData = (data) => {
@@ -281,6 +285,9 @@ export default function NavigationTree() {
             navigationItem.children.length == 0)
         ) {
           navigate(navigationItem?.actionPayload?.path || "");
+          if (isMobile) {
+            toggleSideBar();
+          }
         }
       }}
       sx={{

package/src/layout/TopBar.tsx

@@ -167,20 +167,21 @@ const TopBar: React.FC = () => {
           >
             <FontAwesomeIcon icon="bars" />
           </IconButton>
-          <AttachmentImageViewer
-            showAsAvatar={true}
-            attachmentCode="ORGANIZATION_LOGOS"
-            refKey={UserSession?.value?.currentOrganization?.id + ""}
-            onErrorImage="/logo.png"
-            style={{
-              marginRight: 1,
-              marginLeft: 1,
-            }}
-          />
-          {/* <Avatar
-            src={AppInfo.appLogo}
-            sx={{ marginRight: 1, marginLeft: 1 }}
-          /> */}
+          {!isMobile ? (
+            <AttachmentImageViewer
+              showAsAvatar={true}
+              attachmentCode="ORGANIZATION_LOGOS"
+              refKey={UserSession?.value?.currentOrganization?.id + ""}
+              onErrorImage="/logo.png"
+              style={{
+                marginRight: 1,
+                marginLeft: 1,
+              }}
+            />
+          ) : (
+            <></>
+          )}
+
           <Typography variant="h6" noWrap component="div" sx={{ flex: 1 }}>
             {isMobile
               ? ""
@@ -260,14 +261,18 @@ const TopBar: React.FC = () => {
           ) : (
             <></>
           )}
-          <div onClick={handleOpenUserMenu} style={{ cursor: "pointer" }}>
-            <AttachmentImageViewer
-              showAsAvatar={true}
-              onErrorImage="/no_user.png"
-              attachmentCode="EMPLOYEE_PHOTOS"
-              refKey={UserSession.value?.id + ""}
-            />
-          </div>
+          {!isMobile ? (
+            <div onClick={handleOpenUserMenu} style={{ cursor: "pointer" }}>
+              <AttachmentImageViewer
+                showAsAvatar={true}
+                onErrorImage="/no_user.png"
+                attachmentCode="EMPLOYEE_PHOTOS"
+                refKey={UserSession.value?.id + ""}
+              />
+            </div>
+          ) : (
+            <></>
+          )}
 
           <div
             style={{ marginLeft: 5, marginRight: 5, cursor: "pointer" }}

package/src/main.tsx

@@ -3,7 +3,7 @@ import { BaseApp } from "./components";
 
 createRoot(document.getElementById("root")!).render(
   <BaseApp
-    apiBaseUrl="http://10.14.22.13:8080/api-base"
+    apiBaseUrl="http://localhost:8080/api-base"
     enableUINotifications={false}
     appLogo={"/logo.png"}
     appName="UI Base Library"

package/src/redux/features/administration/AdministrationStoresMetaData.ts

@@ -28,6 +28,7 @@ export const ADMINISTRATION_STORES: CommonStores = {
   SystemWorkflows: {
     autoLoad: true,
     url: "api/v1/dev/workflowdocument/all",
+    authority: "DEVELOPMENT_ADMIN",
     data: [],
   },
   SystemWidgetTypes: {
@@ -67,26 +68,31 @@ export const ADMINISTRATION_STORES: CommonStores = {
   },
   SystemOrganizationRanks: {
     autoLoad: true,
+    authority: "SYSTEM_ADMIN",
     url: "api/v1/public/organization/ranks/all",
     data: [],
   },
   CurrentOrganizationRanks: {
     autoLoad: true,
+    authority: "SYSTEM_ADMIN",
     url: "api/v1/public/organizationrank/all",
     data: [],
   },
   SystemOrganizationUnits: {
     autoLoad: true,
+    authority: "SYSTEM_ADMIN",
     url: "api/v1/public/organization/units/all",
     data: [],
   },
   CurrentOrganizationUnits: {
     autoLoad: true,
+    authority: "SYSTEM_ADMIN",
     url: "api/v1/public/organizationunit/all",
     data: [],
   },
   SystemOrganizationUnitType: {
     autoLoad: true,
+    authority: "SYSTEM_ADMIN",
     url: "api/v1/public/organizationunittype/all",
     data: [],
   },
@@ -153,6 +159,7 @@ export const ADMINISTRATION_STORES: CommonStores = {
   persons: {
     autoLoad: true,
     data: [],
+    authority: "SYSTEM_ADMIN",
     url: "api/v1/public/person/all",
   },
 };

package/vite.config.ts

@@ -19,6 +19,6 @@ export default defineConfig({
     },
   },
   server: {
-    port: 8082,
+    port: 3000,
   },
 });