Merge pull request #215 from bcgov/TICDI-360_362

Ticdi 360 362
bcgov · Jun 22, 2024 · 21428af · 21428af
2 parents a27b970 + db75f35
commit 21428af
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 9 deletions.
diff --git a/frontend/src/app/components/modal/manage-provisions/EditProvisionModal.tsx b/frontend/src/app/components/modal/manage-provisions/EditProvisionModal.tsx
@@ -90,7 +90,7 @@ const EditProvisionModal: FC<EditProvisionModalProps> = ({ provision, variables,
     try {
       setLoading(true);
       await updateProvision({ ...provisionUpload, id });
-      onHide();
+      handleOnHide();
       refreshTables();
     } catch (err) {
       console.log('Error updating provision');
@@ -134,16 +134,26 @@ const EditProvisionModal: FC<EditProvisionModalProps> = ({ provision, variables,
     }
   };
 
+  const handleOnHide = () => {
+    // Reset the state of the modal when it is closed
+    onHide();
+    setDisplayAddVariable(false);
+    setDisplayEditVariable(false);
+    setDisplayRemoveVariable(false);
+    setDisplayEditProvision(true);
+    setShowError(false);
+  };
+
   return (
-    <Modal show={show} onHide={onHide} size="lg">
+    <Modal show={show} onHide={handleOnHide} size="lg">
       {displayEditProvision && (
         <>
           <EditProvisionModalForm
             provision={provision}
             variables={variables}
             loading={loading}
             updateProvisionHandler={handleUpdateProvision}
-            onHide={onHide}
+            onHide={handleOnHide}
             onDisplayAdd={handleDisplayAddVariable}
             onDisplayEdit={handleDisplayEditVariable}
             onDisplayRemove={handleDisplayRemoveVariable}
@@ -153,7 +163,7 @@ const EditProvisionModal: FC<EditProvisionModalProps> = ({ provision, variables,
       {displayAddVariable && (
         <AddVariableModalForm
           loading={loading}
-          onHide={onHide}
+          onHide={handleOnHide}
           onBack={returnToEditProvision}
           onSave={handleAddVariable}
         />
@@ -162,7 +172,7 @@ const EditProvisionModal: FC<EditProvisionModalProps> = ({ provision, variables,
         <EditVariableModalForm
           variable={currentVariable}
           loading={loading}
-          onHide={onHide}
+          onHide={handleOnHide}
           onBack={returnToEditProvision}
           onSave={handleUpdateVariable}
         />
@@ -171,7 +181,7 @@ const EditProvisionModal: FC<EditProvisionModalProps> = ({ provision, variables,
         <RemoveVariableModalForm
           variable={currentVariable}
           loading={loading}
-          onHide={onHide}
+          onHide={handleOnHide}
           onBack={returnToEditProvision}
           onRemove={handleRemoveVariable}
         />

diff --git a/frontend/src/app/components/modal/manage-provisions/RemoveProvisionModal.tsx b/frontend/src/app/components/modal/manage-provisions/RemoveProvisionModal.tsx
@@ -33,8 +33,20 @@ const RemoveProvisionModal: FC<RemoveProvisionModalProps> = ({ provision, show,
 
   return (
     <Modal show={show} onHide={onHide} size="lg">
-      <Modal.Header closeButton>
+      <Modal.Header>
         <Modal.Title>Remove Document Type</Modal.Title>
+        <Button
+          variant="none"
+          onClick={onHide}
+          style={{
+            marginLeft: 'auto',
+            border: 'none',
+            backgroundColor: 'transparent',
+            color: 'black',
+          }}
+        >
+          &times;
+        </Button>
       </Modal.Header>
       <Modal.Body>
         <Form>

diff --git a/frontend/src/app/components/modal/manage-provisions/forms/EditProvisionModalForm.tsx b/frontend/src/app/components/modal/manage-provisions/forms/EditProvisionModalForm.tsx
@@ -72,8 +72,20 @@ const EditProvisionModalForm: React.FC<EditProvisionModalFormProps> = ({
 
   return (
     <>
-      <Modal.Header closeButton>
+      <Modal.Header>
         <Modal.Title>Edit Provision</Modal.Title>
+        <Button
+          variant="none"
+          onClick={onHide}
+          style={{
+            marginLeft: 'auto',
+            border: 'none',
+            backgroundColor: 'transparent',
+            color: 'black',
+          }}
+        >
+          &times;
+        </Button>
       </Modal.Header>
       <Modal.Body>
         <Form>

diff --git a/frontend/src/app/util/util.ts b/frontend/src/app/util/util.ts
@@ -139,7 +139,13 @@ export const buildDTRDisplayData = (data: DTR): DTRDisplayObject => {
     let country: string = '';
 
     if (firstTenant) {
-      primaryContactName = getFullName(firstTenant.firstName, firstTenant.middleName, firstTenant.lastName);
+      primaryContactName =
+        firstTenant.firstName || firstTenant.middleName || firstTenant.lastName
+          ? getFullName(firstTenant.firstName, firstTenant.middleName, firstTenant.lastName)
+          : firstTenant.legalName
+          ? firstTenant.legalName
+          : '';
+
       primaryContactEmail = firstTenant.emailAddress ? firstTenant.emailAddress : '';
       primaryContactPhone = formatPhoneNumber(
         firstTenant.phoneNumber ? firstTenant.phoneNumber : '',