From e58899f80432f94ad43ec45cb026ab19407e9dd9 Mon Sep 17 00:00:00 2001
From: "Mat.Busby" <mat.busby@ca.ey.com>
Date: Tue, 19 Nov 2024 11:06:42 -0700
Subject: [PATCH 1/2] Rename "Final Application" to "Application"

Updated code references and URLs to change "Final Application" to "Application". This includes link paths, titles, and switch cases to maintain consistency across the project.
---
 .gitignore                                                | 1 +
 .../components/mine/Projects/MajorMineApplicationTab.js   | 4 ++--
 .../core-web/src/components/mine/Projects/Project.tsx     | 6 +++---
 .../src/components/mine/Projects/ProjectOverviewTab.tsx   | 4 ++--
 services/core-web/src/constants/routes.ts                 | 8 ++++----
 .../__snapshots__/ProjectOverviewTab.spec.tsx.snap        | 4 ++--
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index eea12bebe5..ceb7f522dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@ gitops/tenant-gitops-4c2ba9
 .vscode/settings.json
 services/document-manager/document-manager.iml
 /services/filesystem-provider/ej2-amazon-s3-aspcore-file-provider/Folder.DotSettings.user
+/services/core-api/core-api.iml
diff --git a/services/core-web/src/components/mine/Projects/MajorMineApplicationTab.js b/services/core-web/src/components/mine/Projects/MajorMineApplicationTab.js
index 1d627ac938..e4816d0052 100644
--- a/services/core-web/src/components/mine/Projects/MajorMineApplicationTab.js
+++ b/services/core-web/src/components/mine/Projects/MajorMineApplicationTab.js
@@ -76,7 +76,7 @@ export class MajorMineApplicationTab extends Component {
   componentDidUpdate(nextProps) {
     if (
       nextProps.match.params.tab !== this.props.match.params.tab &&
-      this.props.match.params.tab === "final-app"
+      this.props.match.params.tab === "app"
     ) {
       this.fetchData();
     }
@@ -204,7 +204,7 @@ export class MajorMineApplicationTab extends Component {
         <div className={this.state.fixedTop ? "side-menu--fixed" : "side-menu"}>
           <ScrollSideMenu
             menuOptions={menuOptions}
-            featureUrlRoute={routes.PROJECT_FINAL_APPLICATION.hashRoute}
+            featureUrlRoute={routes.PROJECT_APPLICATION.hashRoute}
             featureUrlRouteArguments={[project_guid]}
           />
         </div>
diff --git a/services/core-web/src/components/mine/Projects/Project.tsx b/services/core-web/src/components/mine/Projects/Project.tsx
index 2cfdda3ec5..2f7696a092 100644
--- a/services/core-web/src/components/mine/Projects/Project.tsx
+++ b/services/core-web/src/components/mine/Projects/Project.tsx
@@ -65,7 +65,7 @@ const Project: FC = () => {
 
     switch (newActiveTab) {
       case "final-app":
-        url = routes.PROJECT_FINAL_APPLICATION.dynamicRoute(projectGuid);
+        url = routes.PROJECT_APPLICATION.dynamicRoute(projectGuid);
         break;
       case "decision-package":
         url = routes.PROJECT_DECISION_PACKAGE.dynamicRoute(projectGuid);
@@ -139,8 +139,8 @@ const Project: FC = () => {
       ),
     },
     {
-      key: "final-app",
-      label: "Final Application",
+      key: "app",
+      label: "Application",
       disabled: !hasFinalAplication,
       children: (
         <div className="padding-lg">
diff --git a/services/core-web/src/components/mine/Projects/ProjectOverviewTab.tsx b/services/core-web/src/components/mine/Projects/ProjectOverviewTab.tsx
index 430f4f3e73..498358d5d8 100644
--- a/services/core-web/src/components/mine/Projects/ProjectOverviewTab.tsx
+++ b/services/core-web/src/components/mine/Projects/ProjectOverviewTab.tsx
@@ -97,14 +97,14 @@ export const ProjectOverviewTab: FC = () => {
       ),
     },
     {
-      title: "Final Application",
+      title: "Application",
       key: `ps-${project.major_mine_application.major_mine_application_id}`,
       status: project.major_mine_application.status_code,
       statusHash: majorMineApplicationStatusCodeHash,
       link: (
         <Link
           data-cy="final-application-view-link"
-          to={routes.PROJECT_FINAL_APPLICATION.dynamicRoute(project_guid)}
+          to={routes.PROJECT_APPLICATION.dynamicRoute(project_guid)}
         >
           <Button className="full-mobile margin-small" disabled={!hasFinalAplication}>
             View
diff --git a/services/core-web/src/constants/routes.ts b/services/core-web/src/constants/routes.ts
index 7bf616e5a5..bc099292b7 100644
--- a/services/core-web/src/constants/routes.ts
+++ b/services/core-web/src/constants/routes.ts
@@ -268,10 +268,10 @@ export const MAJOR_MINE_APPLICATION = {
   helpKey: "Major-Mine-Application",
 };
 
-export const PROJECT_FINAL_APPLICATION = {
-  route: "/pre-applications/:projectGuid/final-app",
-  dynamicRoute: (projectGuid) => `/pre-applications/${projectGuid}/final-app`,
-  hashRoute: (projectGuid, link) => `/pre-applications/${projectGuid}/final-app/${link}`,
+export const PROJECT_APPLICATION = {
+  route: "/pre-applications/:projectGuid/app",
+  dynamicRoute: (projectGuid) => `/pre-applications/${projectGuid}/app`,
+  hashRoute: (projectGuid, link) => `/pre-applications/${projectGuid}/app/${link}`,
   component: MajorMineApplicationTab,
   helpKey: "Major-Mine-Application",
 };
diff --git a/services/core-web/src/tests/components/mine/Projects/__snapshots__/ProjectOverviewTab.spec.tsx.snap b/services/core-web/src/tests/components/mine/Projects/__snapshots__/ProjectOverviewTab.spec.tsx.snap
index c28b2645f9..68bdcf192e 100644
--- a/services/core-web/src/tests/components/mine/Projects/__snapshots__/ProjectOverviewTab.spec.tsx.snap
+++ b/services/core-web/src/tests/components/mine/Projects/__snapshots__/ProjectOverviewTab.spec.tsx.snap
@@ -337,7 +337,7 @@ exports[`ProjectOverviewTab renders properly 1`] = `
                             title="Project Stage"
                           >
                             <b>
-                              Final Application
+                              Application
                             </b>
                           </div>
                         </td>
@@ -360,7 +360,7 @@ exports[`ProjectOverviewTab renders properly 1`] = `
                         >
                           <a
                             data-cy="final-application-view-link"
-                            href="/pre-applications/35633148-57f8-4967-be35-7f89abfbd02e/final-app"
+                            href="/pre-applications/35633148-57f8-4967-be35-7f89abfbd02e/app"
                           >
                             <button
                               class="ant-btn ant-btn-default full-mobile margin-small"

From 65288c265ef820611e5085c436f851250f768ed6 Mon Sep 17 00:00:00 2001
From: "Mat.Busby" <mat.busby@ca.ey.com>
Date: Tue, 19 Nov 2024 11:38:06 -0700
Subject: [PATCH 2/2] updated DashboardRoutes.spec.js.snap

---
 .../tests/routes/__snapshots__/DashboardRoutes.spec.js.snap   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core-web/src/tests/routes/__snapshots__/DashboardRoutes.spec.js.snap b/services/core-web/src/tests/routes/__snapshots__/DashboardRoutes.spec.js.snap
index 13f0fc52e2..477dcf8da6 100644
--- a/services/core-web/src/tests/routes/__snapshots__/DashboardRoutes.spec.js.snap
+++ b/services/core-web/src/tests/routes/__snapshots__/DashboardRoutes.spec.js.snap
@@ -340,8 +340,8 @@ exports[`DashboardRoutes  renders properly 1`] = `
   <Route
     component={[Function]}
     exact={true}
-    key="/pre-applications/:projectGuid/final-app"
-    path="/pre-applications/:projectGuid/final-app"
+    key="/pre-applications/:projectGuid/app"
+    path="/pre-applications/:projectGuid/app"
   />
   <Route
     component={[Function]}