@asaleh37/ui-base 26.2.2 → 26.2.13

package/package.json

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

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

@@ -12,7 +12,7 @@ import { DATE_FORMAT, DATE_TIME_FORMAT } from "../../../util";
 const EntityParameterGrid: React.FC = () => {
   const { t } = useTranslation();
   const SystemParameterTypes = useSelector(
-    (state: any) => state.commonStores.stores.SystemParameterTypes.data
+    (state: any) => state.commonStores.stores.SystemParameterTypes.data,
   );
   const [data, setData] = useState([]);
   const apiActions = useApiActions({
@@ -24,7 +24,7 @@ const EntityParameterGrid: React.FC = () => {
   });
 
   const SystemDataQueries = useSelector(
-    (state: any) => state.commonStores.stores.SystemDataQueries.data
+    (state: any) => state.commonStores.stores.SystemDataQueries.data,
   );
   const adjustFormAccordingFormValues: FormValueChangeCallBk = (
     formValues: any,
@@ -32,7 +32,7 @@ const EntityParameterGrid: React.FC = () => {
     formManager,
     fieldName,
     newValue,
-    selectedRecord
+    selectedRecord,
   ) => {
     if (fieldName) {
       if (fieldName === "parameterType") {
@@ -41,6 +41,7 @@ const EntityParameterGrid: React.FC = () => {
           formActions.showField("parameterDataQueryId");
           formActions.showField("parameterDataset");
           formActions.showField("parameterDisplayField");
+          formActions.showField("comboboxValueDataType");
           formActions.showField("parameterValueField");
           formActions.hideField("parameterValueFormat");
         } else {
@@ -48,6 +49,7 @@ const EntityParameterGrid: React.FC = () => {
           formActions.hideField("parameterDataset");
           formActions.hideField("parameterDisplayField");
           formActions.hideField("parameterValueField");
+          formActions.hideField("comboboxValueDataType");
         }
         if (newValue === "date" || newValue === "datetime") {
           formActions.showField("parameterValueFormat");
@@ -75,14 +77,14 @@ const EntityParameterGrid: React.FC = () => {
           formActions.showField("parameterDataQueryId");
         }
       }
-    } else {      
+    } else {
       if (formValues?.parameterType === "combobox") {
         formManager.setValue("parameterValueFormat", null);
         formActions.showField("parameterDataQueryId");
         formActions.showField("parameterDataset");
         formActions.showField("parameterDisplayField");
         formActions.showField("parameterValueField");
-        formActions.hideField("parameterValueFormat");                                
+        formActions.hideField("parameterValueFormat");
       } else if (formValues?.parameterType === "date") {
         formActions.hideField("parameterDataQueryId");
         formActions.hideField("parameterDataset");
@@ -257,6 +259,19 @@ const EntityParameterGrid: React.FC = () => {
         fieldType: "text",
       },
     },
+    {
+      type: "field",
+      mode: "props",
+      props: {
+        fieldLabel: "Value Type",
+        fieldName: "comboboxValueDataType",
+        fieldType: "combobox",
+        options: [{ value: "string" }, { value: "number" }],
+        comboboxValueDataType: "string",
+        optionDisplayField: "value",
+        optionValueField: "value",
+      },
+    },
     {
       type: "field",
       mode: "props",

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

@@ -27,7 +27,7 @@ const ReportViewer: React.FC<ReportViewerProps> = (props) => {
   const [errorMessage, setErrorMessage] = useState(null);
   const [excelReportData, setExcelReportData] = useState<Array<any>>([]);
   const [reportViewerState, setReportViewerState] = useState<ReportViewerState>(
-    "WAITING_REPORT_CODE"
+    "WAITING_REPORT_CODE",
   );
   const { handleGetRequest, handlePostRequest, HandleDownloadHTTPPostPDF } =
     useAxios();
@@ -52,7 +52,7 @@ const ReportViewer: React.FC<ReportViewerProps> = (props) => {
       },
       failureCallBkFn: (response) => {
         setErrorMessage(
-          "Failed loading report metadata ... contact your administrator"
+          "Failed loading report metadata ... contact your administrator",
         );
         setReportViewerState("ERROR");
       },
@@ -136,7 +136,7 @@ const ReportViewer: React.FC<ReportViewerProps> = (props) => {
         },
         failureCallBkFn: (response) => {
           setErrorMessage(
-            "Failed To run report ... contact your administrator"
+            "Failed To run report ... contact your administrator",
           );
           setReportViewerState("ERROR");
         },
@@ -160,9 +160,9 @@ const ReportViewer: React.FC<ReportViewerProps> = (props) => {
     <>
       <Box
         sx={{
-          display: "flex",
-          alignItems: "center",
-          justifyContent: "center",
+          // display: "flex",
+          // alignItems: "center",
+          // justifyContent: "center",
           width: "100%",
         }}
       >
@@ -208,63 +208,52 @@ const ReportViewer: React.FC<ReportViewerProps> = (props) => {
           <></>
         )}
       </Box>
-      <Box
-        sx={{
-          flexGrow: 1,
-          width: "100%",
-          display: "flex",
-          flexDirection: "column",
-          alignItems: "center",
-          justifyContent: "flex-start",
-        }}
-      >
-        {reportViewerState === "WAITING_PARAMETER_INPUT" &&
-        reportInfo?.reportType != "Excel" ? (
-          <ParameterPanel searchBtnClickCallBk={runReport} />
-        ) : reportViewerState === "SHOWING_RESULT" ||
-          ((reportViewerState === "WAITING_PARAMETER_INPUT" ||
-            reportViewerState === "WAITING_RESULT") &&
-            reportInfo?.reportType === "Excel") ? (
-          reportInfo?.reportType === "Excel" ? (
-            <ExcelReportViewer
-              reportData={excelReportData}
-              setReportData={setExcelReportData}
-              reloadReport={async () => {
-                runReport(parametersValues);
-              }}
-              gridLoadParameters={panelElements}
-              gridLoadParametersValues={parametersValues}
-              setGridLoadParametersValues={setParametersValues}
-            />
-          ) : (
-            <iframe
-              src={blobUrl}
-              width="100%"
-              height="100%"
-              title="PDF Preview"
-              style={{ border: "1px solid #ccc", marginTop: "20px" }}
-            ></iframe>
-          )
-        ) : reportViewerState === "ERROR" ? (
-          <Box
-            sx={{
-              display: "flex",
-              flex: 1,
-              alignItems: "center",
-              justifyContent: "center",
+      {reportViewerState === "WAITING_PARAMETER_INPUT" &&
+      reportInfo?.reportType != "Excel" ? (
+        <ParameterPanel searchBtnClickCallBk={runReport} />
+      ) : reportViewerState === "SHOWING_RESULT" ||
+        ((reportViewerState === "WAITING_PARAMETER_INPUT" ||
+          reportViewerState === "WAITING_RESULT") &&
+          reportInfo?.reportType === "Excel") ? (
+        reportInfo?.reportType === "Excel" ? (
+          <ExcelReportViewer
+            reportData={excelReportData}
+            setReportData={setExcelReportData}
+            reloadReport={async () => {
+              runReport(parametersValues);
             }}
-          >
-            <FontAwesomeIcon
-              icon="circle-exclamation"
-              color="darkred"
-              style={{ marginRight: 10, marginLeft: 10 }}
-            />
-            {errorMessage}
-          </Box>
+            gridLoadParameters={panelElements}
+            gridLoadParametersValues={parametersValues}
+            setGridLoadParametersValues={setParametersValues}
+          />
         ) : (
-          <></>
-        )}
-      </Box>
+          <iframe
+            src={blobUrl}
+            width="100%"
+            height="100%"
+            title="PDF Preview"
+            style={{ border: "1px solid #ccc", marginTop: "20px" }}
+          ></iframe>
+        )
+      ) : reportViewerState === "ERROR" ? (
+        <Box
+          sx={{
+            display: "flex",
+            flex: 1,
+            alignItems: "center",
+            justifyContent: "center",
+          }}
+        >
+          <FontAwesomeIcon
+            icon="circle-exclamation"
+            color="darkred"
+            style={{ marginRight: 10, marginLeft: 10 }}
+          />
+          {errorMessage}
+        </Box>
+      ) : (
+        <></>
+      )}
     </>
   );
 };

package/src/hooks/useParameterPanel.tsx

@@ -39,7 +39,7 @@ export const getFormElementsFromParameters = (
 ) => {
   const formElements: Array<FormElementProps> = [];
   for (const parameter of parameters) {
-    debugger;
+    
     const formElement: FormElementProps = {
       type: "field",
       mode: "props",