@asaleh37/ui-base 25.12.16 → 25.12.122

package/src/layout/TopBar.tsx

@@ -27,7 +27,6 @@ import AttachmentImageViewer from "../components/templates/attachment/Attachment
 import NotificationButton from "./NotificationButton";
 import { useState } from "react";
 import ChangePasswordPanel from "../components/administration/admin/ChangePasswordPanel";
-import { AppInfo } from "../redux/features/common/AppInfoSlice";
 
 interface AppBarProps extends MuiAppBarProps {
   open?: boolean;
@@ -36,7 +35,6 @@ interface AppBarProps extends MuiAppBarProps {
 const AppBar = styled(MuiAppBar, {
   shouldForwardProp: (prop) => prop !== "open",
 })<AppBarProps>(({ theme }) => {
-  const AppInfo: AppInfo = useSelector((state: any) => state.AppInfo.value);
   const AppLayout = useSelector((state: any) => state.AppLayout);
   const isMobile = useIsMobile();
   return {
@@ -111,49 +109,40 @@ const TopBar: React.FC = () => {
   };
   return (
     <>
-      {AppInfo.isUserProfileManaged ? (
-        <>
-          <ChangePasswordWindow>
-            <ChangePasswordPanel
-              selectedPerson={UserSession.value}
-              isSelfService={true}
-              onSuccessCallBk={() => {
-                setChangePasswordWindow(false);
-              }}
-            />
-          </ChangePasswordWindow>
-          <Menu
-            sx={{ mt: "45px" }}
-            id="menu-appbar"
-            anchorEl={anchorElUser}
-            anchorOrigin={{
-              vertical: "top",
-              horizontal: "right",
-            }}
-            keepMounted
-            transformOrigin={{
-              vertical: "top",
-              horizontal: "right",
-            }}
-            open={Boolean(anchorElUser)}
-            onClose={handleCloseUserMenu}
-          >
-            <MenuItem
-              onClick={() => {
-                setChangePasswordWindow(true);
-                handleCloseUserMenu();
-              }}
-            >
-              <Typography sx={{ textAlign: "center" }}>
-                Change Password
-              </Typography>
-            </MenuItem>
-          </Menu>
-        </>
-      ) : (
-        <></>
-      )}
-
+      <ChangePasswordWindow>
+        <ChangePasswordPanel
+          selectedPerson={UserSession.value}
+          isSelfService={true}
+          onSuccessCallBk={() => {
+            setChangePasswordWindow(false);
+          }}
+        />
+      </ChangePasswordWindow>
+      <Menu
+        sx={{ mt: "45px" }}
+        id="menu-appbar"
+        anchorEl={anchorElUser}
+        anchorOrigin={{
+          vertical: "top",
+          horizontal: "right",
+        }}
+        keepMounted
+        transformOrigin={{
+          vertical: "top",
+          horizontal: "right",
+        }}
+        open={Boolean(anchorElUser)}
+        onClose={handleCloseUserMenu}
+      >
+        <MenuItem
+          onClick={() => {
+            setChangePasswordWindow(true);
+            handleCloseUserMenu();
+          }}
+        >
+          <Typography sx={{ textAlign: "center" }}>Change Password</Typography>
+        </MenuItem>
+      </Menu>
       <ChangeOrgWindow>
         <ChangeOrgForm
           successChangeCallBackFn={() => {
@@ -210,7 +199,6 @@ const TopBar: React.FC = () => {
             }
           >
             <IconButton
-              sx={{ mx: 1 }}
               color="inherit"
               onClick={() => {
                 dispatch(
@@ -231,33 +219,28 @@ const TopBar: React.FC = () => {
               )}
             </IconButton>
           </Tooltip>
-          {AppInfo.isLocalizationEnabled ? (
-            <Tooltip
-              title={
-                i18n.language === "ar"
-                  ? "Change Language To English"
-                  : "Change Language To Arabic"
-              }
+          <Tooltip
+            title={
+              i18n.language === "ar"
+                ? "Change Language To English"
+                : "Change Language To Arabic"
+            }
+          >
+            <IconButton
+              color="inherit"
+              onClick={() => {
+                let nextLanguage = i18n.language === "ar" ? "en" : "ar";
+                changeLanguage(nextLanguage);
+                dispatch(
+                  AppLayoutActions.setAppDirection(
+                    nextLanguage === "ar" ? "rtl" : "ltr"
+                  )
+                );
+              }}
             >
-              <IconButton
-                color="inherit"
-                onClick={() => {
-                  let nextLanguage = i18n.language === "ar" ? "en" : "ar";
-                  changeLanguage(nextLanguage);
-                  dispatch(
-                    AppLayoutActions.setAppDirection(
-                      nextLanguage === "ar" ? "rtl" : "ltr"
-                    )
-                  );
-                }}
-              >
-                <FontAwesomeIcon icon="language" />
-              </IconButton>
-            </Tooltip>
-          ) : (
-            <></>
-          )}
-
+              <FontAwesomeIcon icon="language" />
+            </IconButton>
+          </Tooltip>
           {UserSession.value?.userOrganizations &&
           UserSession.value?.userOrganizations.length > 1 ? (
             <Tooltip title="Change Current Organization">

package/src/main.tsx

@@ -7,9 +7,8 @@ createRoot(document.getElementById("root")!).render(
     enableUINotifications={false}
     appLogo={"/logo.png"}
     appName="UI Base Library"
-    isUserProfileManaged={false}
     loginScreenStyle={{
-      themeMode: "dark",
+      themeMode: "dark",      
       backgroundImageNameInPublicFolder: "bg.jpg",
     }}
     appVersion="25.12.12"

package/src/navigationItems/Administration/adminNavigationItems.tsx

@@ -47,7 +47,7 @@ export const adminNavigationItems: TreeViewBaseItem<ExtendedTreeItemProps>[] = [
         children: [
           {
             id: "development_admin.organization.modules",
-            label: "Subscribed Modules",
+            label: "Subscriped Modules",
             icon: "layer-group",
             authority: "ORGANIZATION_ADMIN",
             action: "NAVIGATION",

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

@@ -15,8 +15,6 @@ export type AppInfo = {
   appName: string | null;
   appVersion: string | null;
   appLogo: any | null;
-  isUserProfileManaged?: boolean;
-  isLocalizationEnabled?: boolean;
   businessLocals?: {
     ar: { [key: string]: string };
     en: { [key: string]: string };
@@ -56,8 +54,6 @@ const initialState: AppInfoProp = {
     documentTitle: null,
     apiBaseUrl: null,
     authenticationMethod: "APP",
-    isUserProfileManaged: true,
-    isLocalizationEnabled: false,
     appName: null,
     appVersion: null,
     appLogo: null,

package/src/components/administration/admin/CustomPersonGrid.tsx

@@ -1,361 +0,0 @@
-import { useState } from "react";
-import TemplateGrid from "../../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import { useApiActions, useSession, useWindow } from "../../../hooks";
-import { FormElementProps } from "../../templates/DataEntryTemplates/DataEntryTypes";
-import { useTranslation } from "react-i18next";
-import { toast } from "react-toastify";
-import OrganizationMemberGrid from "./OrganizationMemberGrid";
-import { Box } from "@mui/material";
-import AttachmentImageViewer from "../../templates/attachment/AttachmentImageViewer";
-import { useSelector } from "react-redux";
-import OrgMemberRoleForm from "./OrgMemberRoleForm";
-import ChangePasswordPanel from "./ChangePasswordPanel";
-
-const CustomPersonGrid: React.FC = () => {
-  const { t } = useTranslation();
-  const [selectedPerson, setSelectedPerson] = useState<any>(null);
-  const { UserInfo } = useSession();
-  const CurrentOrganizationRanks = useSelector(
-    (state: any) => state.commonStores.stores.CurrentOrganizationRanks.data
-  );
-  const CurrentOrganizationUnits = useSelector(
-    (state: any) => state.commonStores.stores.CurrentOrganizationUnits.data
-  );
-  const [data, setData] = useState([]);
-  const apiActions = useApiActions({
-    commonStoreKey: "persons",
-    deleteById: "api/v1/admin/person",
-    save: "api/v1/admin/person",
-    findById: "api/v1/admin/person",
-    setData: setData,
-  });
-  const [selectedRecord, setSelectedRecord] = useState<any>(null);
-  const {
-    Window: OrganizationMembersWindow,
-    setWindowState: setOrganizationMemberWindowState,
-  } = useWindow({
-    windowTitle: "Organizations Membership",
-    windowIcon: "globe",
-  });
-  const {
-    Window: OrganizationMemberRolesWindow,
-    setWindowState: setOrganizationMemberRolesWindowState,
-  } = useWindow({
-    windowIcon: "tag",
-    windowTitle: "Organization Member Roles",
-    width: "50%",
-  });
-  const {
-    Window: ChangePasswordWindow,
-    setWindowState: setChangePasswordWindow,
-  } = useWindow({
-    windowIcon: "key",
-    windowTitle: "Change Password",
-    width: "fit-content",
-    height: "fit-content",
-  });
-
-  const formElements: Array<FormElementProps> = [
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        hidden: true,
-        fieldLabel: "id",
-        fieldName: "id",
-        gridProps: {
-          hidden: true,
-        },
-        required: false,
-        fieldType: "number",
-      },
-    },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        hidden: true,
-        fieldLabel: "organizationMemberId",
-        fieldName: "organizationMemberId",
-        gridProps: {
-          hidden: true,
-        },
-        required: false,
-        fieldType: "number",
-      },
-    },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        fieldLabel: "Image",
-        fieldName: "custom",
-        fieldType: "custom",
-        gridProps: {
-          muiProps: {
-            align: "center",
-            headerAlign: "center",
-            renderCell: (params) => {
-              return (
-                <Box
-                  sx={{
-                    display: "flex",
-                    alignItems: "center",
-                    justifyContent: "center",
-                    height: "100%",
-                  }}
-                >
-                  <AttachmentImageViewer
-                    showAsAvatar={true}
-                    attachmentCode="EMPLOYEE_PHOTOS"
-                    refKey={params.id + ""}
-                  />
-                </Box>
-              );
-            },
-          },
-        },
-      },
-    },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        fieldLabel: "PERSON_EMPLOYEE_AR_NAME",
-        fieldName: "employeeArName",
-        required: true,
-        fieldType: "text",
-      },
-    },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        fieldLabel: "PERSON_EMPLOYEE_EN_NAME",
-        fieldName: "employeeEnName",
-        required: true,
-        fieldType: "text",
-      },
-    },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        fieldLabel: "PERSON_EMAIL",
-        fieldName: "email",
-        required: false,
-        fieldType: "text",
-      },
-    },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        fieldLabel: "PERSON_MOBILE_NUMBER",
-        fieldName: "mobileNumber",
-        required: false,
-        fieldType: "text",
-      },
-    },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        fieldLabel: "ORGANIZATION_MEMBER_ORGANIZATION_RANK_ID",
-        fieldName: "organizationRankId",
-        required: false,
-        fieldType: "combobox",
-        options: CurrentOrganizationRanks,
-        optionValueField: "id",
-        optionDisplayField: "rankEnName",
-      },
-    },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        fieldLabel: "ORGANIZATION_MEMBER_ORGANIZATION_UNIT_ID",
-        fieldName: "organizationUnitId",
-        required: false,
-        fieldType: "combobox",
-        options: CurrentOrganizationUnits,
-        optionValueField: "id",
-        optionDisplayField: "organizationUnitEnName",
-      },
-    },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        fieldLabel: "Membership number",
-        fieldName: "organizationMembershipNumber",
-        fieldType: "text",
-      },
-    },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        hidden: true,
-        gridProps: { hidden: true },
-        fieldLabel: "PERSON_PASSWORD",
-        fieldName: "password",
-        required: false,
-        fieldType: "text",
-      },
-    },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        fieldLabel: "PERSON_USERNAME",
-        fieldName: "username",
-        required: false,
-        fieldType: "text",
-      },
-    },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        hidden: true,
-        fieldLabel: "Ref Source",
-        fieldName: "refSource",
-        required: false,
-        fieldType: "text",
-      },
-    },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        hidden: true,
-        fieldLabel: "PERSON_EMPLOYEE_NUMBER",
-        fieldName: "refSyncNumber",
-        required: false,
-        fieldType: "text",
-      },
-    },
-    {
-      type: "field",
-      mode: "props",
-      props: {
-        fieldLabel: "PERSON_IS_ACTIVE",
-        fieldName: "isActive",
-        required: false,
-        fieldType: "checkbox",
-      },
-    },
-  ];
-
-  return (
-    <>
-      <OrganizationMemberRolesWindow>
-        <OrgMemberRoleForm
-          selectedRecord={selectedRecord}
-          closeModalFn={() => {
-            setOrganizationMemberRolesWindowState(false);
-          }}
-        />
-      </OrganizationMemberRolesWindow>
-      <OrganizationMembersWindow>
-        <OrganizationMemberGrid selectedPerson={selectedPerson} />
-      </OrganizationMembersWindow>
-      <ChangePasswordWindow>
-        <ChangePasswordPanel
-          selectedPerson={selectedPerson}
-          isSelfService={false}
-          onSuccessCallBk={() => {
-            setChangePasswordWindow(false);
-          }}
-        />
-      </ChangePasswordWindow>
-      <TemplateGrid
-        attachment={{ attachmentCode: "EMPLOYEE_PHOTOS" }}
-        apiActions={apiActions}
-        data={data}
-        setData={setData}
-        editMode={{
-          editMode: "modal",          
-          specs: {
-            modalIcon: "user",
-            modalTitle: "Person Profile",             
-            modalWidth: 300,
-          },
-        }}
-        formElements={formElements}
-        keyColumnName={"id"}
-        gridTitle="PERSON_PLURAL"
-        rowActions={[
-          {
-            icon: "key",
-            label: "Change User Password",
-            actionFn: async (data) => {
-              setSelectedPerson(data);
-              setChangePasswordWindow(true);
-            },
-          },
-          {
-            icon: "tags",
-            label: "Current Organization User Roles",
-            isActionDisabledForRecord: (data) => {
-              return !data?.organizationMemberId;
-            },
-            actionFn: async (data) => {
-              setSelectedRecord({
-                organizationId: UserInfo?.currentOrganization?.id,
-                id: data?.organizationMemberId,
-              });
-              setOrganizationMemberRolesWindowState(true);
-            },
-          },
-          {
-            icon: "globe",
-            label: "User Organizations",
-            actionFn: async (data) => {
-              setSelectedPerson(data);
-              setOrganizationMemberWindowState(true);
-            },
-          },
-        ]}
-        girdIcon="users"
-        editAction={{
-          isEnabled: true,          
-          authority: "PERSON_EDIT",
-          preActionValidation: (data) => {
-            if (
-              data.refSource != undefined &&
-              data.refSource != null &&
-              data.refSource != ""
-            ) {
-              toast.error(
-                "This Person Was synced from other system therefore you can't modify this record"
-              );
-              return false;
-            }
-            return true;
-          },
-        }}
-        deleteAction={{
-          isEnabled: true,
-          authority: "PERSON_DELETE",
-          preActionValidation: (data) => {
-            if (
-              data.refSource != undefined &&
-              data.refSource != null &&
-              data.refSource != ""
-            ) {
-              toast.error(
-                "This Person Was synced from other system therefore you can't modify this record"
-              );
-              return false;
-            }
-            return true;
-          },
-        }}
-      />
-    </>
-  );
-};
-
-export default CustomPersonGrid;