@asaleh37/ui-base 25.9.6 → 25.9.16

package/package.json

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

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

@@ -123,7 +123,7 @@ const AttachmentConfigGrid: React.FC = () => {
       props: {
         fieldLabel: "Include App Code in attachment path",
         fieldName: "includeAppCodeInPath",
-        required: false,
+        required: true,
         fieldType: "checkbox",
       },
     },

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

@@ -127,6 +127,7 @@ export type TemplateGridProps = {
   enableExport?: boolean;
   enableDensitySelector?: boolean;
   hideInfoBar?: boolean;
+  hideCreateBtn?: boolean;
   hideBackButton?: boolean;
   apiActions: ApiActions;
   rowSelectionModel?: GridRowSelectionModel;

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

@@ -58,6 +58,8 @@ const ComboBox: React.FC<ComboBoxProps> = (props) => {
           setComboboxData([]);
         },
       });
+    } else if (props?.options) {
+      setComboboxData(props.options);
     }
   };
   useEffect(() => {

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

@@ -11,6 +11,7 @@ const TemplateTextField: React.FC<Omit<TextFieldProps, "outlined">> = (
       hidden={true}
       slotProps={{ inputLabel: { shrink: true, sx: { fontWeight: "bold" } } }}
       label={<>{props?.label ? t(props.label) : ""}</>}
+      error={props?.error}
       helperText={props?.helperText ? t(props.helperText) : undefined}
     />
   );

package/src/components/templates/DataEntryTemplates/TemplateDataForm/TemplateForm.tsx

@@ -33,14 +33,7 @@ const TemplateForm: React.FC<TemplateFormProps> = (
       minHeight: 500,
       minWidth: 400,
     });
-  const { Window: WorkflowWindow, setWindowState: setWorkflowWindowState } =
-    useWindow({
-      windowTitle: "Approvals",
-      windowIcon: "stamp",
-      height: "fit-content",
-      minHeight: 500,
-      width: 800,
-    });
+
   const [attachmentPanelEnabledForRecord, setAttachmentPanelEnabledForRecord] =
     useState<boolean>(true);
   const { t } = useTranslation();
@@ -142,6 +135,19 @@ const TemplateForm: React.FC<TemplateFormProps> = (
     }
   };
 
+  const { Window: WorkflowWindow, setWindowState: setWorkflowWindowState } =
+    useWindow({
+      windowTitle: "Approvals",
+      windowIcon: "stamp",
+      height: "fit-content",
+      minHeight: 500,
+      width: "fit-content",
+      // width: 1100,
+      onCloseCallBack: async () => {
+        await loadRecord();
+      },
+    });
+
   const formActions = {
     setFieldValue: (fieldName: string, fieldValue: any) => {
       formManager.setValue(fieldName, fieldValue);
@@ -223,6 +229,7 @@ const TemplateForm: React.FC<TemplateFormProps> = (
             }}
             cancelActionCallBk={() => {
               setWorkflowWindowState(false);
+              loadRecord();
             }}
           />
         </WorkflowWindow>

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

@@ -104,7 +104,8 @@ const TemplateGrid: React.FC<TemplateGridProps> = (props) => {
       windowIcon: "stamp",      
       height: "fit-content",
       minHeight: 500,
-      width:800,      
+      width: "fit-content",
+      // width:1100,      
       onCloseCallBack: () => {
         props?.apiActions?.reloadData(props.gridLoadParametersValues);
       },

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

@@ -83,13 +83,18 @@ const TemplateGridTopBar: React.FC<TemplateGridTopBarProps> = (
       {isCreationEnabled &&
       isCreationAuthorized &&
       props?.templateProps?.editMode?.editMode != "none" ? (
-        <Button onClick={props?.handleCreateNewRecord}>
-          <FontAwesomeIcon
-            icon="add"
-            style={{ marginRight: 5, marginLeft: 5 }}
-          />
-          {t("ADD_BTN_LABEL")}
-        </Button>
+        props?.templateProps?.hideCreateBtn === undefined ||
+        props?.templateProps?.hideCreateBtn === false ? (
+          <Button onClick={props?.handleCreateNewRecord}>
+            <FontAwesomeIcon
+              icon="add"
+              style={{ marginRight: 5, marginLeft: 5 }}
+            />
+            {t("ADD_BTN_LABEL")}
+          </Button>
+        ) : (
+          <></>
+        )
       ) : (
         <></>
       )}

package/src/components/templates/attachment/AttachmentImageViewer.tsx

@@ -30,8 +30,10 @@ const AttachmentImageViewer: React.FC<AttachmentImageViewerProps> = (props) => {
     setImgSrc(imagePath);
   };
   useEffect(() => {
-    handleImageSrc();
-  }, [props]);
+    if (props?.refKey) {
+      handleImageSrc();
+    }
+  }, [props.refKey]);
   {
     /* </Avatar>
       src={imgSrc}

package/src/components/templates/attachment/AttachmentPanel.tsx

@@ -93,8 +93,7 @@ const AttachmentPanel: React.FC<AttachmentPanelProps> = (props) => {
     if (!files) {
       toast.error("You must add files to upload");
       return;
-    }
-    debugger;
+    }    
     for (const file of files) {
       if (file.type.startsWith("image/")) {
         const MAX_SIZE_KB = 600;
@@ -176,6 +175,7 @@ const AttachmentPanel: React.FC<AttachmentPanelProps> = (props) => {
         display: "flex",
         flexDirection: "column",
         width: "100%",
+        minHeight:400,
         alignItems: "center",
         justifyContent: "flex-start",
         overflow: "hidden",

package/src/components/templates/workflow/WorkflowDocumentPanel.tsx

@@ -123,7 +123,7 @@ const WorkflowDocumentPanel: React.FC<WorkflowDocumentPanelProps> = (props) => {
         refDocumentId: props.refDocumentId,
       },
       successCallBkFn: (response: any) => {
-        setWorkflowDocumentInfo(response.data);
+        setWorkflowDocumentInfo(structuredClone(response.data));        
       },
       failureCallBkFn: () => {
         setWorkflowDocumentInfo({
@@ -358,7 +358,7 @@ const WorkflowDocumentPanel: React.FC<WorkflowDocumentPanelProps> = (props) => {
             sx={{
               padding: 2,
               display: "flex",
-              flex: 1,
+              // flex: 1,
               margin: 1,
               flexDirection: "column",
               alignItems: "center",
@@ -563,7 +563,7 @@ const WorkflowDocumentPanel: React.FC<WorkflowDocumentPanelProps> = (props) => {
             sx={{
               display: "flex",
               flexDirection: "column",
-              flexGrow: 1,
+              width: 600,
               padding: 2,
               margin: 1,
               alignItems: "center",

package/src/components/templates/workflow/WorkflowDocumentTimeLine.tsx

@@ -20,7 +20,8 @@ const WorkflowDocumentTimeLine: React.FC<WorkflowDocumentTimeLineProp> = (
       sx={{
         display: "flex",
         flexDirection: "column",
-        flexGrow: 1,
+        // flexGrow: 1,
+        width: 600,
         padding: 1,
         margin: 1,
         alignItems: "center",
@@ -96,7 +97,11 @@ const WorkflowDocumentTimeLine: React.FC<WorkflowDocumentTimeLineProp> = (
                   <AttachmentImageViewer
                     showAsAvatar={true}
                     attachmentCode="EMPLOYEE_PHOTOS"
-                    refKey={actionHistoryRecord?.personId + "" || "0"}
+                    refKey={
+                      actionHistoryRecord?.personId
+                        ? actionHistoryRecord?.personId + ""
+                        : undefined
+                    }
                     style={{ m: 1, width: 70, height: 70 }}
                   />
                   {index !== props.actionHistory.length - 1 ? (