Skip to content

Change projects urls #975

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

Open
dana-cfc4 wants to merge 2 commits into
base: staging
Choose a base branch
from
Open

Change projects urls #975

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
1f8bac3
Change projects urls
dana-cfc4 Dec 19, 2025
3f85de6
Merge main
dana-cfc4 Dec 19, 2025
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
68 changes: 34 additions & 34 deletions frontend/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ function RedirectToSection() {
return <Redirect to={'/business-plans'} />
}
if (isOnlyProjectsUser) {
return <Redirect to={'/projects-listing/listing'} />
return <Redirect to={'/projects/listing'} />
}
return <Redirect to={'/country-programme/reports'} />
}
Expand Down Expand Up @@ -281,156 +281,156 @@ export default function App() {
<Route path="/project-submissions/">
<ProjectSubmissionsPage />
</Route> */}
{/* <Route path="/projects/:project_id">
{/* <Route path="/projects-listing/:project_id">
<ProjectsProjectPage />
</Route>
<Route path="/projects">
<Route path="/projects-listing">
<ProjectsPage />
</Route> */}
<Route path="/projects-listing">
<Redirect to="/projects-listing/listing" replace />
<Route path="/projects">
<Redirect to="/projects/listing" replace />
</Route>
<Route path="/projects-listing/listing">
<Route path="/projects/listing">
<ProjectsDataProvider>
<ProjectsListingPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/create">
<Route path="/projects/create">
<ProjectsDataProvider>
<ProjectsCreatePage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/:project_id/associate">
<Route path="/projects/:project_id/associate">
<ProjectsDataProvider>
<ProjectsAssociationPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/export/:export_type">
<Route path="/projects/export/:export_type">
<ProjectsDataProvider>
<ProjectsExportPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/approval-summary">
<Route path="/projects/approval-summary">
<ProjectsDataProvider>
<ProjectsApprovalSummaryPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/summary-of-projects">
<Route path="/projects/summary-of-projects">
<ProjectsDataProvider>
<SummaryOfProjectsPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/blanket-approval-details">
<Route path="/projects/blanket-approval-details">
<ProjectsDataProvider>
<BlanketApprovalDetailsPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/settings">
<Route path="/projects/settings">
<ProjectsDataProvider>
<ProjectsSettingsPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/update-mya-data">
<Route path="/projects/update-mya-data">
<ProjectsDataProvider>
<ProjectsUpdateMyaDataPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/update-mya-data/:metaproject_id">
<Route path="/projects/update-mya-data/:metaproject_id">
<ProjectsDataProvider>
<ProjectsUpdateMyaDataPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/enterprises">
<Route path="/projects/enterprises">
<ProjectsDataProvider>
<EnterprisesPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/enterprises/create">
<Route path="/projects/enterprises/create">
<ProjectsDataProvider>
<EnterpriseCreatePage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/enterprises/:enterprise_id">
<Route path="/projects/enterprises/:enterprise_id">
<ProjectsDataProvider>
<EnterprisePage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/enterprises/:enterprise_id/edit">
<Route path="/projects/enterprises/:enterprise_id/edit">
<ProjectsDataProvider>
<EnterpriseEditPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/projects-enterprises/:project_id">
<Route path="/projects/projects-enterprises/:project_id">
<ProjectsDataProvider>
<ProjectsEnterprisesPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/projects-enterprises/:project_id/create">
<Route path="/projects/projects-enterprises/:project_id/create">
<ProjectsDataProvider>
<ProjectsEnterprisesCreatePage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/projects-enterprises/:project_id/view/:enterprise_id">
<Route path="/projects/projects-enterprises/:project_id/view/:enterprise_id">
<ProjectsDataProvider>
<ProjectsEnterprisesViewPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/projects-enterprises/:project_id/edit/:enterprise_id">
<Route path="/projects/projects-enterprises/:project_id/edit/:enterprise_id">
<ProjectsDataProvider>
<ProjectsEnterprisesEditPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/:project_id">
<Route path="/projects/:project_id">
<ProjectsDataProvider>
<ProjectsListingProjectPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/:project_id/archive/:version">
<Route path="/projects/:project_id/archive/:version">
<ProjectsDataProvider>
<ProjectsListingArchiveProjectPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/:project_id/compare-versions">
<Route path="/projects/:project_id/compare-versions">
<ProjectsDataProvider>
<ProjectsCompareVersionsPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/:project_id/edit">
<Route path="/projects/:project_id/edit">
<ProjectsDataProvider>
<ProjectsEditPage mode="edit" />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/:project_id/approval">
<Route path="/projects/:project_id/approval">
<ProjectsDataProvider>
<ProjectsApprovalUpdatePage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/:project_id/post-excom-update">
<Route path="/projects/:project_id/post-excom-update">
<ProjectsDataProvider>
<ProjectsPostExComUpdatePage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/:project_id/submit">
<Route path="/projects/:project_id/submit">
<ProjectsDataProvider>
<ProjectsSubmitPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/:project_id/recommend">
<Route path="/projects/:project_id/recommend">
<ProjectsDataProvider>
<ProjectsRecommendPage />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/create/:project_id/copy">
<Route path="/projects/create/:project_id/copy">
<ProjectsDataProvider>
<ProjectsEditPage mode="copy" />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/create/:project_id/full-copy/additional-component">
<Route path="/projects/create/:project_id/full-copy/additional-component">
<ProjectsDataProvider>
<ProjectsEditPage mode="full-link" />
</ProjectsDataProvider>
</Route>
<Route path="/projects-listing/create/:project_id/partial-copy/additional-component">
<Route path="/projects/create/:project_id/partial-copy/additional-component">
<ProjectsDataProvider>
<ProjectsEditPage mode="partial-link" />
</ProjectsDataProvider>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/annual-project-report/[year]/mlfs/workspace/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ export default function APRMLFSWorkspace() {
return (
<PageWrapper>
{/* "~" means absolute, outside the nested context */}
<BackLink url="~/projects-listing" text="IA/BA Portal" />
<BackLink url="~/projects" text="IA/BA Portal" />
<PageHeading className="mb-1 flex min-w-fit items-center gap-x-2">
{`Secretariat - Annual Project Report Workspace`}
<AprYearDropdown />
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/annual-project-report/[year]/workspace/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export default function APRWorkspace() {
return (
<PageWrapper>
{/* "~" means absolute, outside the nested context */}
<BackLink url="~/projects-listing" text="IA/BA Portal" />
<BackLink url="~/projects" text="IA/BA Portal" />
<div className="mb-2 flex justify-between">
<PageHeading className="flex min-w-fit items-center gap-x-2">
{`Annual Progress Report workspace`}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects_listing/[project_id]/approval/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function ProjectsApprovalUpdatePage() {
const { canApproveProjects } = useContext(PermissionsContext)

if (!canApproveProjects) {
return <Redirect to="/projects-listing/listing" />
return <Redirect to="/projects/listing" />
}

return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects_listing/[project_id]/archive/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function Project() {
const { canViewProjects } = useContext(PermissionsContext)

if (!canViewProjects) {
return <Redirect to="/projects-listing/listing" />
return <Redirect to="/projects/listing" />
}

return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects_listing/[project_id]/compare-versions/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function SubmitProject() {
const { canViewProjects } = useContext(PermissionsContext)

if (!canViewProjects) {
return <Redirect to="/projects-listing/listing" />
return <Redirect to="/projects/listing" />
}

return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects_listing/[project_id]/edit/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function EditProject({ mode }: { mode: string }) {
(mode === 'edit' && !canEditProjects) ||
(mode !== 'edit' && !canUpdateProjects)
) {
return <Redirect to="/projects-listing/listing" />
return <Redirect to="/projects/listing" />
}

return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects_listing/[project_id]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function Project() {
const { canViewProjects } = useContext(PermissionsContext)

if (!canViewProjects) {
return <Redirect to="/projects-listing/listing" />
return <Redirect to="/projects/listing" />
}

return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects_listing/[project_id]/post-excom-update/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function PostExComUpdateProject() {
const { canUpdatePostExcom } = useContext(PermissionsContext)

if (!canUpdatePostExcom) {
return <Redirect to="/projects-listing/listing" />
return <Redirect to="/projects/listing" />
}

return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects_listing/[project_id]/recommend/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function RecommendProject() {
useContext(PermissionsContext)

if (!canViewProjects || !canRecommendProjects) {
return <Redirect to="/projects-listing/listing" />
return <Redirect to="/projects/listing" />
}

return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects_listing/[project_id]/submit/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function SubmitProject() {
const { canViewProjects, canSubmitProjects } = useContext(PermissionsContext)

if (!canViewProjects || !canSubmitProjects) {
return <Redirect to="/projects-listing/listing" />
return <Redirect to="/projects/listing" />
}

return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects_listing/approval-summary/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function Projects() {
const { canApproveProjects } = useContext(PermissionsContext)

if (!canApproveProjects) {
return <Redirect to="/projects-listing/listing" />
return <Redirect to="/projects/listing" />
}

return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects_listing/associate/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function ProjectsAssociationPage() {
useContext(PermissionsContext)

if (!canViewProjects || !canAssociateProjects) {
return <Redirect to="/projects-listing/listing" />
return <Redirect to="/projects/listing" />
}

return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects_listing/blanket-approval-details/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function Projects() {
const { canViewProjects } = useContext(PermissionsContext)

if (!canViewProjects) {
return <Redirect to="/projects-listing/listing" />
return <Redirect to="/projects/listing" />
}

return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects_listing/create/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default function CreateProject() {
const { canUpdateProjects } = useContext(PermissionsContext)

if (!canUpdateProjects) {
return <Redirect to="/projects-listing/listing" />
return <Redirect to="/projects/listing" />
}

return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects_listing/export/[export_type]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function Projects() {
const { canViewProjects } = useContext(PermissionsContext)

if (!canViewProjects || !['mya', 'all'].includes(export_type)) {
return <Redirect to="/projects-listing/listing" />
return <Redirect to="/projects/listing" />
}

return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects_listing/settings/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default function ProjectsSettingsWrapper() {
const { canSetProjectSettings } = useContext(PermissionsContext)

if (!canSetProjectSettings) {
return <Redirect to="/projects-listing/listing" />
return <Redirect to="/projects/listing" />
}

const { data, setParams } = useGetProjectSettings()
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects_listing/summary-of-projects/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function Projects() {
const { canApproveProjects } = useContext(PermissionsContext)

if (!canApproveProjects) {
return <Redirect to="/projects-listing/listing" />
return <Redirect to="/projects/listing" />
}

return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects_listing/update-mya-data/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default function ProjectsUpdateMyaDataPage() {
{!!metaproject_id && (
<CancelLinkButton
title="All MYA data"
href="/projects-listing/update-mya-data"
href="/projects/update-mya-data"
/>
)}
</div>
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/components/manage/Blocks/ProjectSubmissions/schema.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export function usePSListingGridOptions() {
return (
<Link
className={cx(props.className)}
href={`/projects/${props.data.id}`}
href={`/projects-listing/${props.data.id}`}
>
{props.value}
</Link>
Expand Down Expand Up @@ -224,7 +224,9 @@ export function usePSListingGridOptions() {
},
},
cellRenderer: (props: any) => {
const subsectorNames = props.data.subsectors?.map((s: ProjectSubSectorType) => s.name).join(",")
const subsectorNames = props.data.subsectors
?.map((s: ProjectSubSectorType) => s.name)
.join(',')
return <AgCellRenderer {...props} value={subsectorNames} />
},
field: 'subsectors',
Expand Down
Loading