Merge pull request #3546 from bcgov/NDT-418-Bug-RFI-upload-page-shows…

…-unexpected-text fix: remove unwanted status text from RFI
bcgov · Sep 12, 2024 · 550ae17 · 550ae17
2 parents 3b021a0 + 8aab017
commit 550ae17
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [1.190.12](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.190.11...v1.190.12) (2024-09-12)
+
+### Bug Fixes
+
+- remove unwanted status text from RFI ([a760e6d](https://github.com/bcgov/CONN-CCBC-portal/commit/a760e6d0a9d2510a1cbf07e5e2ac4c3b3dd8a151))
+
 ## [1.190.11](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.190.10...v1.190.11) (2024-09-12)
 
 ## [1.190.10](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.190.9...v1.190.10) (2024-09-10)

diff --git a/app/components/Form/GenericFormStatus.tsx b/app/components/Form/GenericFormStatus.tsx
@@ -44,6 +44,7 @@ interface Props {
   error?: JSX.Element;
   projectName: string;
   status: string;
+  showProjectDetails?: boolean;
 }
 
 const GenericFormStatus: React.FC<Props> = ({
@@ -52,6 +53,7 @@ const GenericFormStatus: React.FC<Props> = ({
   error,
   projectName,
   status,
+  showProjectDetails = true,
 }) => {
   let savingStatusIndicator = (
     <>
@@ -76,10 +78,12 @@ const GenericFormStatus: React.FC<Props> = ({
 
   return (
     <StatusContainer>
-      <StatusNameFlex>
-        <AppStatus>{status}</AppStatus>
-        <AppName>{projectName}</AppName>
-      </StatusNameFlex>
+      {showProjectDetails && (
+        <StatusNameFlex>
+          <AppStatus>{status}</AppStatus>
+          <AppName>{projectName}</AppName>
+        </StatusNameFlex>
+      )}
       <SavingStatusContainer aria-live="off" aria-label="form saving status">
         {savingStatusIndicator}
       </SavingStatusContainer>

diff --git a/app/components/Form/RfiFormStatus.tsx b/app/components/Form/RfiFormStatus.tsx
@@ -33,6 +33,7 @@ const RfiFormStatus: React.FC<Props> = ({ application, isSaving, error }) => {
       status={status}
       updatedAt={updatedAt}
       error={error}
+      showProjectDetails={false}
     />
   );
 };

diff --git a/app/tests/pages/analyst/application/[applicationId]/rfi/[rfiId]/upload.test.tsx b/app/tests/pages/analyst/application/[applicationId]/rfi/[rfiId]/upload.test.tsx
@@ -54,7 +54,7 @@ describe('The applicantRfiId Page', () => {
     pageTestingHelper.loadQuery();
     pageTestingHelper.renderPage();
 
-    expect(screen.getAllByText('projName')[1]).toBeInTheDocument();
+    expect(screen.getByText(/Last saved: Dec 1/)).toBeInTheDocument();
   });
 
   it('displays the due by date', () => {

diff --git a/app/tests/pages/applicantportal/form/[id]/rfi/[applicantRfiId].test.tsx b/app/tests/pages/applicantportal/form/[id]/rfi/[applicantRfiId].test.tsx
@@ -72,7 +72,7 @@ describe('The applicantRfiId Page', () => {
     pageTestingHelper.loadQuery();
     pageTestingHelper.renderPage();
 
-    expect(screen.getByText('projName')).toBeInTheDocument();
+    expect(screen.getByText(/Last saved: Dec 1/)).toBeInTheDocument();
   });
 
   it('displays the due by date', () => {

diff --git a/db/sqitch.plan b/db/sqitch.plan
@@ -670,3 +670,4 @@ tables/communities_source_data_001_service_account 2024-08-28T16:32:48Z Rafael S
 @1.190.10 2024-09-10T23:10:53Z CCBC Service Account <[email protected]> # release v1.190.10
 computed_columns/application_assessment_notifications 2024-09-06T21:58:13Z ,,, <ryohani89@NH504670> # Add notifications by assessment type field
 @1.190.11 2024-09-12T18:13:42Z CCBC Service Account <[email protected]> # release v1.190.11
+@1.190.12 2024-09-12T20:48:11Z CCBC Service Account <[email protected]> # release v1.190.12
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CONN-CCBC-portal",
-  "version": "1.190.11",
+  "version": "1.190.12",
   "main": "index.js",
   "repository": "https://github.com/bcgov/CONN-CCBC-portal.git",
   "author": "Romer, Meherzad CITZ:EX <[email protected]>",