@asaleh37/ui-base 25.12.17 → 25.12.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asaleh37/ui-base",
-  "version": "25.12.17",
+  "version": "25.12.21",
   "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/templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid.tsx

@@ -637,8 +637,7 @@ const TemplateGrid: React.FC<TemplateGridProps> = (props) => {
       }
     }
     if (
-      record[props?.keyColumnName || "id"] &&
-      record[props?.keyColumnName || "id"] > 0 &&
+      (record[props?.keyColumnName] || (record["id"] && record["id"] > 0)) &&
       props?.attachment
     ) {
       actions?.push(
@@ -666,8 +665,7 @@ const TemplateGrid: React.FC<TemplateGridProps> = (props) => {
       );
     }
     if (
-      record[props?.keyColumnName || "id"] &&
-      record[props?.keyColumnName || "id"] > 0 &&
+      (record[props?.keyColumnName] || (record["id"] && record["id"] > 0)) &&
       props?.workFlowDocumentCode
     ) {
       actions?.push(

package/src/components/templates/attachment/AttachmentImageViewer.tsx

@@ -30,10 +30,10 @@ const AttachmentImageViewer: React.FC<AttachmentImageViewerProps> = (props) => {
     setImgSrc(imagePath);
   };
   useEffect(() => {
-    if (props?.refKey) {
+    if (props?.refKey || props?.attachmentId) {
       handleImageSrc();
     }
-  }, [props.refKey]);
+  }, [props.refKey, props?.attachmentId]);
   {
     /* </Avatar>
       src={imgSrc}

package/src/components/templates/workflow/WorkflowDocumentPanel.tsx

@@ -240,8 +240,12 @@ const WorkflowDocumentPanel: React.FC<WorkflowDocumentPanelProps> = (props) => {
           if (workflowDocumentInfo?.nextActionTakers) {
             for (const actionTaker of workflowDocumentInfo.nextActionTakers) {
               if (
-                UserInfo?.username === actionTaker?.username ||
-                UserInfo?.username === actionTaker?.USERNAME
+                UserInfo?.username == actionTaker?.username ||
+                UserInfo?.username == actionTaker?.USERNAME ||
+                UserInfo?.email == actionTaker?.email ||
+                UserInfo?.email == actionTaker?.EMAIL ||
+                UserInfo?.employeeNumber == actionTaker?.employeeNumber ||
+                UserInfo?.employeeNumber == actionTaker?.EMPLOYEE_NUMBER
               ) {
                 return true;
               }

package/src/layout/TopBar.tsx

@@ -202,35 +202,40 @@ const TopBar: React.FC = () => {
                     : currentOrganization?.organizationArName
                 }`}
           </Typography>
-          <Tooltip
-            title={
-              AppLayout.themeMode === "light"
-                ? "Switch Theme to Dark"
-                : "Switch Theme to Light"
-            }
-          >
-            <IconButton
-              sx={{ mx: 1 }}
-              color="inherit"
-              onClick={() => {
-                dispatch(
-                  AppLayoutActions.setThemeMode(
-                    AppLayout.themeMode === "light" ? "dark" : "light"
-                  )
-                );
-                localStorage.setItem(
-                  "themeMode",
-                  AppLayout.themeMode === "light" ? "dark" : "light"
-                );
-              }}
+          {AppInfo.allowThemeChange ? (
+            <Tooltip
+              title={
+                AppLayout.themeMode === "light"
+                  ? "Switch Theme to Dark"
+                  : "Switch Theme to Light"
+              }
             >
-              {AppLayout.themeMode === "light" ? (
-                <FontAwesomeIcon icon="moon" />
-              ) : (
-                <FontAwesomeIcon icon={{ prefix: "far", iconName: "sun" }} />
-              )}
-            </IconButton>
-          </Tooltip>
+              <IconButton
+                sx={{ mx: 1 }}
+                color="inherit"
+                onClick={() => {
+                  dispatch(
+                    AppLayoutActions.setThemeMode(
+                      AppLayout.themeMode === "light" ? "dark" : "light"
+                    )
+                  );
+                  localStorage.setItem(
+                    "themeMode",
+                    AppLayout.themeMode === "light" ? "dark" : "light"
+                  );
+                }}
+              >
+                {AppLayout.themeMode === "light" ? (
+                  <FontAwesomeIcon icon="moon" />
+                ) : (
+                  <FontAwesomeIcon icon={{ prefix: "far", iconName: "sun" }} />
+                )}
+              </IconButton>
+            </Tooltip>
+          ) : (
+            <></>
+          )}
+
           {AppInfo.isLocalizationEnabled ? (
             <Tooltip
               title={

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

@@ -21,6 +21,8 @@ export type AppInfo = {
     ar: { [key: string]: string };
     en: { [key: string]: string };
   };
+  appThemeMode: "dark" | "light";
+  allowThemeChange?: boolean;
   loginScreenStyle?: {
     themeMode: "dark" | "light";
     backgroundImageNameInPublicFolder?: string;
@@ -68,6 +70,8 @@ const initialState: AppInfoProp = {
     businessNavigationItems: [],
     businessReduxReducers: {},
     businessCommonStoresMetaData: {},
+    appThemeMode: "light",
+    allowThemeChange: true,
     appTheme: {
       light: { primaryColor: "#37505C", secondaryColor: "#ff6d00" },
       dark: { primaryColor: "#ea690e", secondaryColor: "#74776B" },