Merge branch 'main' into OSDEV-1795/fix-database-connection

Author: roninzp

doc/release/RELEASE-NOTES.md

@@ -58,6 +58,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 * [OSDEV-1787](https://opensupplyhub.atlassian.net/browse/OSDEV-1787) - The tooltip messages for the Claim button have been removed for all statuses of moderation events on the `Contribution Record` page and changed according to the design on `Thanks for adding data for this production location` pop-up.
 * [OSDEV-1789](https://opensupplyhub.atlassian.net/browse/OSDEV-1789) - Fixed an issue where the scroll position was not resetting to the top when navigating through SLC workflow pages.
 * [OSDEV-1795](https://opensupplyhub.atlassian.net/browse/OSDEV-1795) - Resolved database connection issue after PostgreSQL 16.3 upgrade by upgrading pg8000 module version.
+* [OSDEV-1803](https://opensupplyhub.atlassian.net/browse/OSDEV-1803) - Updated text from `Facility Type` to `Location Type` and `Facility Name` to `Location Name` on the SLC `Thank You for Your Submission` page. 
 
 ### Release instructions:
 * Ensure that the following commands are included in the `post_deployment` command:

src/react/src/__tests__/components/ProductionLocationDialog.test.js

@@ -79,7 +79,7 @@ describe('ProductionLocationDialog', () => {
 
         expect(screen.getByText(/Thanks for adding data for this production location!/i)).toBeInTheDocument();
 
-        expect(screen.getByText(/Facility name/i)).toBeInTheDocument();
+        expect(screen.getAllByText(/Location name/i)).toHaveLength(2);
         expect(screen.getByText(/Production Location Name/i)).toBeInTheDocument();
 
         expect(screen.getByText(/Address/i)).toBeInTheDocument();
@@ -89,6 +89,7 @@ describe('ProductionLocationDialog', () => {
         expect(screen.getByText(/US2021250D1DTN7/i)).toBeInTheDocument();
 
         expect(screen.getByText(/Pending/i)).toBeInTheDocument();
+        expect(screen.getByText(/Location Type/i)).toBeInTheDocument();
 
         expect(screen.getByText(/Number of workers/i)).toBeInTheDocument();
         expect(screen.getByText(/35 - 60/i)).toBeInTheDocument();

src/react/src/components/Contribute/ProductionLocationDialog.jsx

@@ -208,7 +208,7 @@ const ProductionLocationDialog = ({
                                 className={classes.leftContainerColumn}
                             >
                                 <Typography className={classes.label}>
-                                    Facility name
+                                    Location name
                                 </Typography>
                                 <Typography className={classes.primaryText}>
                                     {productionLocationName ||

src/react/src/components/Contribute/ProductionLocationDialogFields.jsx

@@ -9,6 +9,15 @@ const ProductionLocationDialogFields = ({
     startFrom,
     classes,
 }) => {
+    // TODO: Remove transformLabel usage in scope of https://opensupplyhub.atlassian.net/browse/OSDEV-1657
+    const transformLabel = key => {
+        switch (key) {
+            case 'facility_type':
+                return 'location_type';
+            default:
+                return key;
+        }
+    };
     const formatLabel = key =>
         key.replace(/_/g, ' ').replace(/\b\w/g, char => char.toUpperCase());
 
@@ -63,14 +72,15 @@ const ProductionLocationDialogFields = ({
     return (
         <>
             {map(filteredEntries, ([key, value]) => {
+                const title = transformLabel(key);
                 const renderedValue = renderValue(value);
                 if (!renderedValue) {
                     return null;
                 }
                 return (
-                    <div key={key}>
+                    <div key={title}>
                         <Typography className={classes.label}>
-                            {formatLabel(key)}
+                            {formatLabel(title)}
                         </Typography>
                         <Typography className={classes.primaryText}>
                             {renderedValue}