@asaleh37/ui-base 25.8.26-1 → 25.8.30

package/package.json

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

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

@@ -111,6 +111,7 @@ const AttachmentConfigGrid: React.FC = () => {
         fieldName: "storageType",
         required: true,
         fieldType: "combobox",
+        comboboxValueDataType: "string",
         options: storageTypes,
         optionDisplayField: "value",
         optionValueField: "value",

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

@@ -1,7 +1,10 @@
 import { useState } from "react";
 import TemplateGrid from "../../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
 import { useApiActions, useWindow } from "../../../hooks";
-import { FormElementProps } from "../../templates/DataEntryTemplates/DataEntryTypes";
+import {
+  FormElementProps,
+  FormValueChangeCallBk,
+} from "../../templates/DataEntryTemplates/DataEntryTypes";
 import { useTranslation } from "react-i18next";
 import { useSelector } from "react-redux";
 import DataQueryParametersForm from "./DataQueryParametersForm";
@@ -30,6 +33,27 @@ const DataQueryGrid: React.FC = () => {
     setData: setData,
   });
 
+  const adjustFormAfterValueChange: FormValueChangeCallBk = (
+    formValues,
+    formActions,
+    formManager,
+    fieldName,
+    newValue
+  ) => {
+    if (fieldName) {
+      if (fieldName === "useSysCon" && newValue == true) {
+        formActions.hideField("datasourceConId");
+        formManager.setValue("datasourceConId", null);
+      } else {
+        formActions.showField("datasourceConId");
+      }
+    } else {
+      if (formValues?.useSysCon) {
+        formActions.hideField("datasourceConId");
+      }
+    }
+  };
+
   const formElements: Array<FormElementProps> = [
     {
       type: "field",
@@ -114,21 +138,6 @@ const DataQueryGrid: React.FC = () => {
         fieldName: "useSysCon",
         required: false,
         fieldType: "checkbox",
-        formProps: {
-          onValueChangeCallBack(
-            value,
-            formManager,
-            formActions,
-            selectedRecord
-          ) {
-            if (value) {
-              formActions.hideField("datasourceConId");
-              formManager.setValue("datasourceConId", null);
-            } else {
-              formActions.showField("datasourceConId");
-            }
-          },
-        },
       },
     },
     {
@@ -198,6 +207,7 @@ const DataQueryGrid: React.FC = () => {
         girdIcon="table-cells"
         editAction={{ isEnabled: true, authority: "DATA_QUERY_EDIT" }}
         deleteAction={{ isEnabled: true, authority: "DATA_QUERY_DELETE" }}
+        formProps={{ formValuesChangeCallBk: adjustFormAfterValueChange }}
       />
     </>
   );

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

@@ -55,6 +55,7 @@ const DatasourceConnectionGrid: React.FC = () => {
         required: true,
         fieldType: "combobox",
         options: SystemDataSourceType,
+        comboboxValueDataType: "string",
         optionValueField: "value",
         optionDisplayField: "value",
       },

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

@@ -1,7 +1,10 @@
 import { useState } from "react";
 import TemplateGrid from "../../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
 import { useApiActions } from "../../../hooks";
-import { FormElementProps } from "../../templates/DataEntryTemplates/DataEntryTypes";
+import {
+  FormElementProps,
+  FormValueChangeCallBk,
+} from "../../templates/DataEntryTemplates/DataEntryTypes";
 import { useTranslation } from "react-i18next";
 import { useSelector } from "react-redux";
 import { DATE_FORMAT, DATE_TIME_FORMAT } from "../../../util";
@@ -20,6 +23,91 @@ const EntityParameterGrid: React.FC = () => {
     setData: setData,
   });
 
+  const SystemDataQueries = useSelector(
+    (state: any) => state.commonStores.stores.SystemDataQueries.data
+  );
+  const adjustFormAccordingFormValues: FormValueChangeCallBk = (
+    formValues: any,
+    formActions,
+    formManager,
+    fieldName,
+    newValue,
+    selectedRecord
+  ) => {
+    if (fieldName) {
+      if (fieldName === "parameterType") {
+        if (newValue === "combobox") {
+          formManager.setValue("parameterValueFormat", null);
+          formActions.showField("parameterDataQueryId");
+          formActions.showField("parameterDataset");
+          formActions.showField("parameterDisplayField");
+          formActions.showField("parameterValueField");
+          formActions.hideField("parameterValueFormat");
+        } else {
+          formActions.hideField("parameterDataQueryId");
+          formActions.hideField("parameterDataset");
+          formActions.hideField("parameterDisplayField");
+          formActions.hideField("parameterValueField");
+        }
+        if (newValue === "date" || newValue === "datetime") {
+          formActions.showField("parameterValueFormat");
+          if (newValue === "date") {
+            formManager.setValue("parameterValueFormat", DATE_FORMAT);
+          } else {
+            formManager.setValue("parameterValueFormat", DATE_TIME_FORMAT);
+          }
+        } else {
+          formActions.hideField("parameterValueFormat");
+          formManager.setValue("parameterValueFormat", null);
+        }
+      } else if (fieldName == "parameterDataQueryId") {
+        if (newValue != null && newValue != "") {
+          formManager.setValue("parameterDataset", null);
+          formActions.hideField("parameterDataset");
+        } else {
+          formActions.showField("parameterDataset");
+        }
+      } else if (fieldName == "parameterDataset") {
+        if (newValue != null && newValue != "") {
+          formManager.setValue("parameterDataQueryId", null);
+          formActions.hideField("parameterDataQueryId");
+        } else {
+          formActions.showField("parameterDataQueryId");
+        }
+      }
+    } else {      
+      if (formValues?.parameterType === "combobox") {
+        formManager.setValue("parameterValueFormat", null);
+        formActions.showField("parameterDataQueryId");
+        formActions.showField("parameterDataset");
+        formActions.showField("parameterDisplayField");
+        formActions.showField("parameterValueField");
+        formActions.hideField("parameterValueFormat");                                
+      } else if (formValues?.parameterType === "date") {
+        formActions.hideField("parameterDataQueryId");
+        formActions.hideField("parameterDataset");
+        formActions.hideField("parameterDisplayField");
+        formActions.hideField("parameterValueField");
+        formActions.showField("parameterValueFormat");
+        formManager.setValue("parameterValueFormat", DATE_FORMAT);
+      } else if (formValues?.parameterType === "datetime") {
+        formActions.hideField("parameterDataQueryId");
+        formActions.hideField("parameterDataset");
+        formActions.hideField("parameterDisplayField");
+        formActions.hideField("parameterValueField");
+        formActions.showField("parameterValueFormat");
+        formManager.setValue("parameterValueFormat", DATE_TIME_FORMAT);
+      } else {
+        formManager.setValue("parameterValueFormat", null);
+        formActions.hideField("parameterDataQueryId");
+        formActions.hideField("parameterDataset");
+        formActions.hideField("parameterDisplayField");
+        formActions.hideField("parameterValueField");
+        formActions.hideField("parameterValueFormat");
+      }
+    }
+  };
+
   const formElements: Array<FormElementProps> = [
     {
       type: "field",
@@ -119,41 +207,6 @@ const EntityParameterGrid: React.FC = () => {
         comboboxValueDataType: "string",
         optionDisplayField: "value",
         optionValueField: "value",
-        formProps: {
-          onValueChangeCallBack(
-            value,
-            formManager,
-            formActions,
-            selectedRecord
-          ) {
-            if (value === "combobox") {
-              formManager.setValue("parameterValueFormat", null);
-              formActions.showField("parameterDataQueryId");
-              formActions.showField("parameterDataset");
-              formActions.showField("parameterDisplayField");
-              formActions.showField("parameterValueField");
-              formActions.hideField("parameterValueFormat");
-            } else if (value === "date" || value === "datetime") {
-              if (value === "date") {
-                formManager.setValue("parameterValueFormat", DATE_FORMAT);
-              } else if (value === "datetime") {
-                formManager.setValue("parameterValueFormat", DATE_TIME_FORMAT);
-              }
-              formActions.hideField("parameterDataQueryId");
-              formActions.hideField("parameterDataset");
-              formActions.hideField("parameterDisplayField");
-              formActions.hideField("parameterValueField");
-              formActions.showField("parameterValueFormat");
-            } else {
-              formManager.setValue("parameterValueFormat", null);
-              formActions.hideField("parameterDataQueryId");
-              formActions.hideField("parameterDataset");
-              formActions.hideField("parameterDisplayField");
-              formActions.hideField("parameterValueField");
-              formActions.hideField("parameterValueFormat");
-            }
-          },
-        },
       },
     },
     {
@@ -164,22 +217,10 @@ const EntityParameterGrid: React.FC = () => {
         fieldName: "parameterDataQueryId",
         hidden: true,
         required: false,
-        fieldType: "text",
-        formProps: {
-          onValueChangeCallBack(
-            value,
-            formManager,
-            formActions,
-            selectedRecord
-          ) {
-            if (value != null && value != "") {
-              formManager.setValue("parameterDataset", null);
-              formActions.hideField("parameterDataset");
-            } else {
-              formActions.showField("parameterDataset");
-            }
-          },
-        },
+        fieldType: "combobox",
+        options: SystemDataQueries,
+        optionDisplayField: "queryName",
+        optionValueField: "id",
       },
     },
     {
@@ -191,21 +232,6 @@ const EntityParameterGrid: React.FC = () => {
         hidden: true,
         required: false,
         fieldType: "text",
-        formProps: {
-          onValueChangeCallBack(
-            value,
-            formManager,
-            formActions,
-            selectedRecord
-          ) {
-            if (value != null && value != "") {
-              formManager.setValue("parameterDataQueryId", null);
-              formActions.hideField("parameterDataQueryId");
-            } else {
-              formActions.showField("parameterDataQueryId");
-            }
-          },
-        },
       },
     },
     {
@@ -271,6 +297,7 @@ const EntityParameterGrid: React.FC = () => {
       keyColumnName={"id"}
       gridTitle={t("ENTITY_PARAMETER_PLURAL")}
       girdIcon="p"
+      formProps={{ formValuesChangeCallBk: adjustFormAccordingFormValues }}
       editAction={{ isEnabled: true, authority: "ENTITY_PARAMETER_EDIT" }}
       deleteAction={{ isEnabled: true, authority: "ENTITY_PARAMETER_DELETE" }}
     />

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

@@ -216,6 +216,7 @@ const MailSenderConfigGrid: React.FC = () => {
         optionValueField: "value",
         formProps: {
           onValueChangeCallBack(
+            formValues,
             value,
             formManager,
             formActions,

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

@@ -254,6 +254,7 @@ const MailTemplateGrid: React.FC = () => {
               optionValueField: "value",
               required: false,
               fieldType: "combobox",
+              comboboxValueDataType: "string",
             },
           },
           {

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

@@ -107,7 +107,8 @@ const NotificationGrid: React.FC = () => {
       type: "field",
       mode: "props",
       props: {
-        fieldLabel: "Notification Data Query ( will be passed a parameter call last_run_time represents last check time)",
+        fieldLabel:
+          "Notification Data Query ( will be passed a parameter call last_run_time represents last check time)",
         fieldName: "notificationQueryId",
         required: true,
         fieldType: "combobox",
@@ -156,6 +157,7 @@ const NotificationGrid: React.FC = () => {
         fieldLabel: "Interval Type",
         fieldName: "intervalType",
         fieldType: "combobox",
+        comboboxValueDataType: "string",
         options: SystemTimeIntervals,
         gridProps: {
           hidden: true,
@@ -321,7 +323,7 @@ const NotificationGrid: React.FC = () => {
         disabled: true,
         fieldType: "text",
       },
-    },    
+    },
     {
       type: "field",
       mode: "props",
@@ -357,6 +359,7 @@ const NotificationGrid: React.FC = () => {
         fieldName: "notificationAction",
         required: false,
         fieldType: "combobox",
+        comboboxValueDataType: "string",
         options: [{ value: "NAVIGATION" }],
         optionDisplayField: "value",
         optionValueField: "value",

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

@@ -2,89 +2,108 @@ import { useState } from "react";
 import TemplateGrid from "../../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
 import { useApiActions, useWindow } from "../../../hooks";
 import {
-  FormActionProps,
   FormElementProps,
+  FormValueChangeCallBk,
 } from "../../templates/DataEntryTemplates/DataEntryTypes";
 import { useTranslation } from "react-i18next";
 import { UseFormReturn } from "react-hook-form";
 import { useSelector } from "react-redux";
 import { toast } from "react-toastify";
-import ReportParametersForm from "./ReportParametersForm";
 import ReportParameterGrid from "./ReportParameterGrid";
 import ReportViewer from "../../templates/report/ReportViewer";
 import { storageTypes } from "./AttachmentConfigGrid";
 
-type ValidationCritria = {
-  isVisible: boolean;
-  isMandatory: boolean;
-};
-
 export type ReportType = "Jasper" | "Excel" | "Blueprint";
 
-type ReportValidationOptions = {
-  useSysDatasource: ValidationCritria;
-  datasourceConId: ValidationCritria;
-  reportBluePrintId: ValidationCritria;
-  reportExcelDataQueryId: ValidationCritria;
-  reportJasperName: ValidationCritria;
-};
-
-type validationObjectType = {
-  [key in ReportType]: ReportValidationOptions;
-};
-
-const validationObject: validationObjectType = {
-  Blueprint: {
-    useSysDatasource: { isMandatory: false, isVisible: false },
-    datasourceConId: { isMandatory: false, isVisible: false },
-    reportBluePrintId: { isMandatory: true, isVisible: true },
-    reportExcelDataQueryId: { isMandatory: false, isVisible: false },
-    reportJasperName: { isMandatory: false, isVisible: false },
-  },
-  Jasper: {
-    useSysDatasource: { isMandatory: false, isVisible: true },
-    datasourceConId: { isMandatory: false, isVisible: true },
-    reportBluePrintId: { isMandatory: false, isVisible: false },
-    reportExcelDataQueryId: { isMandatory: false, isVisible: false },
-    reportJasperName: { isMandatory: true, isVisible: true },
-  },
-  Excel: {
-    useSysDatasource: { isMandatory: false, isVisible: false },
-    datasourceConId: { isMandatory: false, isVisible: false },
-    reportBluePrintId: { isMandatory: false, isVisible: false },
-    reportExcelDataQueryId: { isMandatory: true, isVisible: true },
-    reportJasperName: { isMandatory: false, isVisible: false },
-  },
-};
+const adjustFormAfterValueChange: FormValueChangeCallBk = (
+  formValues,
+  formActions,
+  formManager,
+  fieldName,
+  newValue
+) => {
+  if (fieldName) {
+    if (fieldName === "useSysDatasource" && newValue == true) {
+      formActions.hideField("datasourceConId");
+      formManager.setValue("datasourceConId", null);
+    } else {
+      formActions.showField("datasourceConId");
+    }
 
-const adjustFormAccordingToReportType = (
-  value: any,
-  formActions: FormActionProps,
-  formManager: UseFormReturn
-) => {  
-  if (value && validationObject[value]) {
-    const validationObjects: ReportValidationOptions = validationObject[value];
-    const fields = Object.keys(validationObjects);
-    for (const field of fields) {
-      const validationCritria: ValidationCritria = validationObjects[field];
-      if (validationCritria.isVisible) {
-        formActions.showField(field);
+    if (fieldName === "reportType") {
+      if (newValue === "Blueprint") {
+        formActions.hideField("storageType");
+        formActions.hideField("includeAppCodeInPath");
+        formActions.hideField("useSysDatasource");
+        formActions.hideField("datasourceConId");
+        formActions.hideField("reportExcelDataQueryId");
+        formActions.hideField("reportJasperName");
+        formActions.showField("reportBluePrintId");
+      } else if (newValue === "Jasper") {
+        formActions.showField("storageType");
+        formActions.showField("includeAppCodeInPath");
+        formActions.showField("useSysDatasource");
+        formActions.showField("datasourceConId");
+        formActions.hideField("reportExcelDataQueryId");
+        formActions.showField("reportJasperName");
+        formActions.hideField("reportBluePrintId");
+      } else if (newValue === "Excel") {
+        formActions.hideField("storageType");
+        formActions.hideField("includeAppCodeInPath");
+        formActions.hideField("useSysDatasource");
+        formActions.hideField("datasourceConId");
+        formActions.showField("reportExcelDataQueryId");
+        formActions.hideField("reportJasperName");
+        formActions.hideField("reportBluePrintId");
       } else {
-        formActions.hideField(field);
-        formManager.setValue(field, null);
+        formActions.hideField("storageType");
+        formActions.hideField("includeAppCodeInPath");
+        formActions.hideField("useSysDatasource");
+        formActions.hideField("datasourceConId");
+        formActions.hideField("reportExcelDataQueryId");
+        formActions.hideField("reportJasperName");
+        formActions.hideField("reportBluePrintId");
       }
     }
   } else {
-    formActions.hideField("useSysDatasource");
-    formActions.hideField("datasourceConId");
-    formActions.hideField("reportBluePrintId");
-    formActions.hideField("reportExcelDataQueryId");
-    formActions.hideField("reportJasperName");
-    formManager.setValue("useSysDatasource", null);
-    formManager.setValue("datasourceConId", null);
-    formManager.setValue("reportBluePrintId", null);
-    formManager.setValue("reportExcelDataQueryId", null);
-    formManager.setValue("reportJasperName", null);
+    if (formValues?.useSysCon) {
+      formActions.hideField("datasourceConId");
+    }
+    if (formValues?.reportType) {
+      if (formValues?.reportType === "Blueprint") {
+        formActions.hideField("storageType");
+        formActions.hideField("includeAppCodeInPath");
+        formActions.hideField("useSysDatasource");
+        formActions.hideField("datasourceConId");
+        formActions.hideField("reportExcelDataQueryId");
+        formActions.hideField("reportJasperName");
+        formActions.showField("reportBluePrintId");
+      } else if (formValues?.reportType === "Jasper") {
+        formActions.showField("storageType");
+        formActions.showField("includeAppCodeInPath");
+        formActions.showField("useSysDatasource");
+        formActions.showField("datasourceConId");
+        formActions.hideField("reportExcelDataQueryId");
+        formActions.showField("reportJasperName");
+        formActions.hideField("reportBluePrintId");
+      } else if (formValues?.reportType === "Excel") {
+        formActions.hideField("storageType");
+        formActions.hideField("includeAppCodeInPath");
+        formActions.hideField("useSysDatasource");
+        formActions.hideField("datasourceConId");
+        formActions.showField("reportExcelDataQueryId");
+        formActions.hideField("reportJasperName");
+        formActions.hideField("reportBluePrintId");
+      }
+    } else {
+      formActions.hideField("storageType");
+      formActions.hideField("includeAppCodeInPath");
+      formActions.hideField("useSysDatasource");
+      formActions.hideField("datasourceConId");
+      formActions.hideField("reportExcelDataQueryId");
+      formActions.hideField("reportJasperName");
+      formActions.hideField("reportBluePrintId");
+    }
   }
 };
 
@@ -209,16 +228,6 @@ const ReportGrid: React.FC = () => {
         required: true,
         fieldType: "combobox",
         comboboxValueDataType: "string",
-        formProps: {
-          onValueChangeCallBack(
-            value,
-            formManager,
-            formActions,
-            selectedRecord
-          ) {
-            adjustFormAccordingToReportType(value, formActions, formManager);
-          },
-        },
       },
     },
     {
@@ -247,7 +256,11 @@ const ReportGrid: React.FC = () => {
       props: {
         fieldLabel: "ATTACHMENT_CONFIG_STORAGE_TYPE",
         fieldName: "storageType",
-        required: true,
+        required: false,
+        hidden: true,
+        gridProps: {
+          hidden: true,
+        },
         comboboxValueDataType: "string",
         fieldType: "combobox",
         options: storageTypes,
@@ -295,21 +308,6 @@ const ReportGrid: React.FC = () => {
         gridProps: {
           hidden: true,
         },
-        formProps: {
-          onValueChangeCallBack(
-            value,
-            formManager,
-            formActions,
-            selectedRecord
-          ) {
-            if (value) {
-              formActions.hideField("datasourceConId");
-              formManager.setValue("datasourceConId", null);
-            } else {
-              formActions.showField("datasourceConId");
-            }
-          },
-        },
         required: false,
         fieldType: "checkbox",
       },
@@ -356,10 +354,7 @@ const ReportGrid: React.FC = () => {
       props: {
         fieldLabel: "REPORT_REPORT_EXCEL_DATA_QUERY_ID",
         fieldName: "reportExcelDataQueryId",
-        // hidden: true,
-        // gridProps: {
-        //   hidden: true,
-        // },
+        hidden: true,
         required: false,
         fieldType: "combobox",
         options: SystemDataQueries,
@@ -414,7 +409,16 @@ const ReportGrid: React.FC = () => {
         <ReportParameterGrid selectedRecord={selectedRecord} />
       </ReportParameterWindow>
       <TemplateGrid
-        attachment={{ attachmentCode: "JASPER_REPORTS" }}
+        attachment={{
+          attachmentCode: "JASPER_REPORTS",
+          enableAttachFn(record) {
+            if (record?.reportType === "Jasper") {
+              return true;
+            } else {
+              return false;
+            }
+          },
+        }}
         apiActions={apiActions}
         data={data}
         setData={setData}
@@ -447,20 +451,7 @@ const ReportGrid: React.FC = () => {
             },
           },
         ]}
-        formLoadCallBk={(
-          formActions: FormActionProps,
-          formManager: UseFormReturn,
-          record: any
-        ) => {
-          adjustFormAccordingToReportType(
-            record.reportType,
-            formActions,
-            formManager
-          );
-          if (record?.useSysDatasource === true) {
-            formActions.hideField("datasourceConId");
-          }
-        }}
+        formProps={{ formValuesChangeCallBk: adjustFormAfterValueChange }}
         formElements={formElements}
         keyColumnName={"id"}
         gridTitle={t("REPORT_PLURAL")}