Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MDS-6191] - Rename "Final Application" to "Application" #3310

Merged
merged 2 commits into from
Nov 19, 2024
Merged

[MDS-6191] - Rename "Final Application" to "Application" #3310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e58899f
Rename "Final Application" to "Application"
matbusby-fw Nov 19, 2024
65288c2
updated DashboardRoutes.spec.js.snap
matbusby-fw Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions services/core-web/src/components/mine/Projects/MajorMineApplicationTab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions services/core-web/src/components/mine/Projects/Project.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -139,8 +139,8 @@ const Project: FC = () => {
),
},
{
key: "final-app",
label: "Final Application",
key: "app",
label: "Application",
disabled: !hasFinalAplication,
children: (
<div className="padding-lg">
Expand Down
4 changes: 2 additions & 2 deletions services/core-web/src/components/mine/Projects/ProjectOverviewTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions services/core-web/src/constants/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
};
Expand Down
4 changes: 2 additions & 2 deletions ...ore-web/src/tests/components/mine/Projects/__snapshots__/ProjectOverviewTab.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ exports[`ProjectOverviewTab renders properly 1`] = `
title="Project Stage"
>
<b>
Final Application
Application
</b>
</div>
</td>
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions services/core-web/src/tests/routes/__snapshots__/DashboardRoutes.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]}
Expand Down
Loading