@asaleh37/ui-base 25.6.17-2 → 25.6.17-3

package/package.json

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

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

@@ -4,7 +4,7 @@ import { FormElementProps } from "../../templates/DataEntryTemplates/DataEntryTy
 import { useTranslation } from "react-i18next";
 import { useApiActions } from "../../../hooks";
 
-const storageTypes = [{ value: "FILE_SYSTEM" }, { value: "SFTP" }];
+export const storageTypes = [{ value: "FILE_SYSTEM" }, { value: "SFTP" }];
 
 const AttachmentConfigGrid: React.FC = () => {
   const { t } = useTranslation();
@@ -116,6 +116,16 @@ const AttachmentConfigGrid: React.FC = () => {
         optionValueField: "value",
       },
     },
+    {
+      type: "field",
+      mode: "props",
+      props: {
+        fieldLabel: "Include App Code in attachment path",
+        fieldName: "includeAppCodeInPath",
+        required: false,
+        fieldType: "checkbox",
+      },
+    },
     {
       type: "field",
       mode: "props",

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

@@ -12,6 +12,7 @@ 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;
@@ -26,7 +27,6 @@ type ReportValidationOptions = {
   reportBluePrintId: ValidationCritria;
   reportExcelDataQueryId: ValidationCritria;
   reportJasperName: ValidationCritria;
-  reportJasperPath: ValidationCritria;
 };
 
 type validationObjectType = {
@@ -40,7 +40,6 @@ const validationObject: validationObjectType = {
     reportBluePrintId: { isMandatory: true, isVisible: true },
     reportExcelDataQueryId: { isMandatory: false, isVisible: false },
     reportJasperName: { isMandatory: false, isVisible: false },
-    reportJasperPath: { isMandatory: false, isVisible: false },
   },
   Jasper: {
     useSysDatasource: { isMandatory: false, isVisible: true },
@@ -48,7 +47,6 @@ const validationObject: validationObjectType = {
     reportBluePrintId: { isMandatory: false, isVisible: false },
     reportExcelDataQueryId: { isMandatory: false, isVisible: false },
     reportJasperName: { isMandatory: true, isVisible: true },
-    reportJasperPath: { isMandatory: true, isVisible: true },
   },
   Excel: {
     useSysDatasource: { isMandatory: false, isVisible: false },
@@ -56,7 +54,6 @@ const validationObject: validationObjectType = {
     reportBluePrintId: { isMandatory: false, isVisible: false },
     reportExcelDataQueryId: { isMandatory: true, isVisible: true },
     reportJasperName: { isMandatory: false, isVisible: false },
-    reportJasperPath: { isMandatory: false, isVisible: false },
   },
 };
 
@@ -83,13 +80,11 @@ const adjustFormAccordingToReportType = (
     formActions.hideField("reportBluePrintId");
     formActions.hideField("reportExcelDataQueryId");
     formActions.hideField("reportJasperName");
-    formActions.hideField("reportJasperPath");
     formManager.setValue("useSysDatasource", null);
     formManager.setValue("datasourceConId", null);
     formManager.setValue("reportBluePrintId", null);
     formManager.setValue("reportExcelDataQueryId", null);
     formManager.setValue("reportJasperName", null);
-    formManager.setValue("reportJasperPath", null);
   }
 };
 
@@ -245,6 +240,19 @@ const ReportGrid: React.FC = () => {
         fieldType: "text",
       },
     },
+    {
+      type: "field",
+      mode: "props",
+      props: {
+        fieldLabel: "ATTACHMENT_CONFIG_STORAGE_TYPE",
+        fieldName: "storageType",
+        required: true,
+        fieldType: "combobox",
+        options: storageTypes,
+        optionDisplayField: "value",
+        optionValueField: "value",
+      },
+    },
     {
       type: "field",
       mode: "props",
@@ -375,14 +383,10 @@ const ReportGrid: React.FC = () => {
       type: "field",
       mode: "props",
       props: {
-        fieldLabel: "REPORT_REPORT_JASPER_PATH",
-        fieldName: "reportJasperPath",
-        hidden: true,
-        gridProps: {
-          hidden: true,
-        },
+        fieldLabel: "Include App Code in attachment path",
+        fieldName: "includeAppCodeInPath",
         required: false,
-        fieldType: "text",
+        fieldType: "checkbox",
       },
     },
     {
@@ -408,6 +412,7 @@ const ReportGrid: React.FC = () => {
         <ReportParameterGrid selectedRecord={selectedRecord} />
       </ReportParameterWindow>
       <TemplateGrid
+        attachment={{ attachmentCode: "JASPER_REPORTS" }}
         apiActions={apiActions}
         data={data}
         setData={setData}
@@ -474,10 +479,7 @@ const ReportGrid: React.FC = () => {
               toast.error("You must enter the jasper report name");
               return false;
             }
-            if (record?.reportType === "Jasper" && !record?.reportJasperPath) {
-              toast.error("You must enter the jasper report path");
-              return false;
-            }
+
             if (
               record?.reportType === "Blueprint" &&
               !record?.reportBluePrintId