@asaleh37/ui-base 25.10.22 → 25.11.6

package/package.json

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

package/src/components/common/ChangeOrgForm.tsx

@@ -64,6 +64,10 @@ const ChangeOrgForm: React.FC<ChangeOrgFormProps> = (props) => {
                 ...response.data,
                 isAuthenticated: true,
               };
+              if (response?.data?.token) {
+                localStorage.setItem("TOKEN", response.data.token);
+              }              
+              UserSession.token = null;
               dispatch(UserSessionActions.setAuthenticated(UserSession));
               if (props.successChangeCallBackFn) {
                 props.successChangeCallBackFn();

package/src/components/templates/DataEntryTemplates/DataEntryTypes.ts

@@ -101,6 +101,7 @@ export type TemplateGridColDef = GridColDef & {
   dataQueryId?: number;
   storeUrl?: string;
   storeLoadParam?: any;
+  comboboxGroupField?: string;
 };
 
 export type TemplateGridAttachmentProps = {
@@ -207,6 +208,7 @@ export type RecordFieldProps = {
     | "custom";
   lookupType?: string;
   comboboxValueDataType?: "number" | "string";
+  comboboxGroupField?: string;
   commonStoreKey?: string;
   dataQueryId?: number;
   storeUrl?: string;

package/src/components/templates/DataEntryTemplates/DataEntryUtil.ts

@@ -132,6 +132,7 @@ export const constructGridColumnsFromFields: (
     } else if (tableField?.fieldType === "combobox") {
       const column: TemplateGridColDef = generateComboColumn({
         ...tableField?.gridProps?.muiProps,
+        comboboxGroupField: tableField?.comboboxGroupField,
         editable:
           tableField?.gridProps?.muiProps?.editable != undefined
             ? tableField?.gridProps?.muiProps?.editable

package/src/components/templates/DataEntryTemplates/TemplateDataForm/FormFields/ComboBox.tsx

@@ -10,6 +10,7 @@ interface ComboBoxProps {
   label: string;
   disabled?: boolean;
   required?: boolean;
+  groupField?: string;
 
   commonStoreKey?: string;
   dataQueryId?: number;
@@ -126,6 +127,13 @@ const ComboBox: React.FC<ComboBoxProps> = (props) => {
           />
         ),
       }}
+      groupBy={
+        props?.groupField
+          ? (option: any) => {
+              return option[props.groupField] ? option[props.groupField] : "";
+            }
+          : undefined
+      }
       renderInput={(params) => {
         return (
           <TextField

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

@@ -114,7 +114,6 @@ export const generateComboColumn: (
     storeUrl: colDef?.storeUrl,
     storeLoadParam: colDef?.storeLoadParam,
     renderEditCell: (params: any) => {
-      debugger;
       return (
         <ComboBox
           {...params}
@@ -126,6 +125,7 @@ export const generateComboColumn: (
           // storeLoadParam={params?.colDef?.storeLoadParam}
           valueField={params?.colDef?.valueField}
           displayField={params?.colDef?.displayField}
+          groupField={params?.colDef?.comboboxGroupField}
           onChangeCallBack={(v: any, selectedRecord: any) => {
             if (v === null) {
               params.api.setEditCellValue({

package/src/layout/NavigationTree.tsx

@@ -279,10 +279,7 @@ export default function NavigationTree() {
         );
         if (
           navigationItem?.action === "NAVIGATION" &&
-          navigationItem?.actionPayload != null &&
-          (navigationItem.children === undefined ||
-            navigationItem.children === null ||
-            navigationItem.children.length == 0)
+          navigationItem?.actionPayload != null
         ) {
           navigate(navigationItem?.actionPayload?.path || "");
           if (isMobile) {

package/src/main.tsx

@@ -11,7 +11,7 @@ createRoot(document.getElementById("root")!).render(
       themeMode: "dark",
       backgroundImageNameInPublicFolder: "bg.jpg",
     }}
-    appVersion="25.10.22"
+    appVersion="25.11.6"
     authenticationMethod="APP"
     azureConfiguration={{
       frontEndClientId: "c3bbbdbd-f392-4459-b3dd-2351cb07f924",