Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

[WEB-3942] chore: intake url pattern (#7006)

Anmol Singh Bhatia14ebaf079968
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/inbox/layout.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/intake/layout.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/inbox/layout.tsx
rename to web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/intake/layout.tsx
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/inbox/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/intake/page.tsx
similarity index 100%
rename from web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/inbox/page.tsx
rename to web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/intake/page.tsx
diff --git a/web/core/components/inbox/content/inbox-issue-header.tsx b/web/core/components/inbox/content/inbox-issue-header.tsx
index c86529d6d1..f1ae748ebc 100644
--- a/web/core/components/inbox/content/inbox-issue-header.tsx
+++ b/web/core/components/inbox/content/inbox-issue-header.tsx
@@ -105,7 +105,7 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
const currentInboxIssueId = inboxIssue?.issue?.id;
- const intakeIssueLink = `${workspaceSlug}/projects/${issue?.project_id}/inbox/?currentTab=${currentTab}&inboxIssueId=${currentInboxIssueId}`;
+ const intakeIssueLink = `${workspaceSlug}/projects/${issue?.project_id}/intake/?currentTab=${currentTab}&inboxIssueId=${currentInboxIssueId}`;
const redirectIssue = (): string | undefined => {
let nextOrPreviousIssueId: string | undefined = undefined;
@@ -122,9 +122,9 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
if (!isNotificationEmbed) {
if (nextOrPreviousIssueId)
router.push(
- `/${workspaceSlug}/projects/${projectId}/inbox?currentTab=${currentTab}&inboxIssueId=${nextOrPreviousIssueId}`
+ `/${workspaceSlug}/projects/${projectId}/intake?currentTab=${currentTab}&inboxIssueId=${nextOrPreviousIssueId}`
);
- else router.push(`/${workspaceSlug}/projects/${projectId}/inbox?currentTab=${currentTab}`);
+ else router.push(`/${workspaceSlug}/projects/${projectId}/intake?currentTab=${currentTab}`);
}
};
@@ -156,7 +156,7 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
const handleInboxIssueDelete = async () => {
if (!inboxIssue || !currentInboxIssueId) return;
await deleteInboxIssue(workspaceSlug, projectId, currentInboxIssueId).then(() => {
- if (!isNotificationEmbed) router.push(`/${workspaceSlug}/projects/${projectId}/inbox`);
+ if (!isNotificationEmbed) router.push(`/${workspaceSlug}/projects/${projectId}/intake`);
});
};
@@ -192,7 +192,7 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
: (currentIssueIndex - 1 + filteredInboxIssueIds.length) % filteredInboxIssueIds.length;
const nextIssueId = filteredInboxIssueIds[nextIssueIndex];
if (!nextIssueId) return;
- router.push(`/${workspaceSlug}/projects/${projectId}/inbox?inboxIssueId=${nextIssueId}`);
+ router.push(`/${workspaceSlug}/projects/${projectId}/intake?inboxIssueId=${nextIssueId}`);
},
[currentInboxIssueId, currentIssueIndex, filteredInboxIssueIds, projectId, router, workspaceSlug]
);
diff --git a/web/core/components/inbox/content/root.tsx b/web/core/components/inbox/content/root.tsx
index 81be3d0e78..dc8d1f0181 100644
--- a/web/core/components/inbox/content/root.tsx
+++ b/web/core/components/inbox/content/root.tsx
@@ -45,7 +45,7 @@ export const InboxContentRoot: FC<TInboxContentRoot> = observer((props) => {
useEffect(() => {
if (!isIssueAvailable && inboxIssueId && !isNotificationEmbed) {
- router.replace(`/${workspaceSlug}/projects/${projectId}/inbox?currentTab=${currentTab}`);
+ router.replace(`/${workspaceSlug}/projects/${projectId}/intake?currentTab=${currentTab}`);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [isIssueAvailable, isNotificationEmbed]);
diff --git a/web/core/components/inbox/modals/create-modal/create-root.tsx b/web/core/components/inbox/modals/create-modal/create-root.tsx
index 48b566c978..b0a7cb342b 100644
--- a/web/core/components/inbox/modals/create-modal/create-root.tsx
+++ b/web/core/components/inbox/modals/create-modal/create-root.tsx
@@ -162,7 +162,7 @@ export const InboxIssueCreateRoot: FC<TInboxIssueCreateRoot> = observer((props)
setUploadedAssetIds([]);
}
if (!createMore) {
- router.push(`/${workspaceSlug}/projects/${projectId}/inbox/?currentTab=open&inboxIssueId=${res?.issue?.id}`);
+ router.push(`/${workspaceSlug}/projects/${projectId}/intake/?currentTab=open&inboxIssueId=${res?.issue?.id}`);
handleModalClose();
} else {
descriptionEditorRef?.current?.clearEditor();
diff --git a/web/core/components/inbox/sidebar/inbox-list-item.tsx b/web/core/components/inbox/sidebar/inbox-list-item.tsx
index 1b21c97be2..05fcf9f3c1 100644
--- a/web/core/components/inbox/sidebar/inbox-list-item.tsx
+++ b/web/core/components/inbox/sidebar/inbox-list-item.tsx
@@ -52,7 +52,7 @@ export const InboxIssueListItem: FC<InboxIssueListItemProps> = observer((props)
<Link
id={`inbox-issue-list-item-${issue.id}`}
key={`${projectId}_${issue.id}`}
- href={`/${workspaceSlug}/projects/${projectId}/inbox?currentTab=${currentTab}&inboxIssueId=${issue.id}`}
+ href={`/${workspaceSlug}/projects/${projectId}/intake?currentTab=${currentTab}&inboxIssueId=${issue.id}`}
onClick={(e) => handleIssueRedirection(e, issue.id)}
>
<Row
diff --git a/web/core/components/inbox/sidebar/root.tsx b/web/core/components/inbox/sidebar/root.tsx
index e40359087e..f30f5565d3 100644
--- a/web/core/components/inbox/sidebar/root.tsx
+++ b/web/core/components/inbox/sidebar/root.tsx
@@ -75,7 +75,7 @@ export const InboxSidebar: FC<IInboxSidebarProps> = observer((props) => {
if (workspaceSlug && projectId && currentTab && filteredInboxIssueIds.length > 0) {
if (inboxIssueId === undefined) {
router.push(
- `/${workspaceSlug}/projects/${projectId}/inbox?currentTab=${currentTab}&inboxIssueId=${filteredInboxIssueIds[0]}`
+ `/${workspaceSlug}/projects/${projectId}/intake?currentTab=${currentTab}&inboxIssueId=${filteredInboxIssueIds[0]}`
);
}
}
@@ -95,7 +95,7 @@ export const InboxSidebar: FC<IInboxSidebarProps> = observer((props) => {
onClick={() => {
if (currentTab != option?.key) {
handleCurrentTab(workspaceSlug, projectId, option?.key);
- router.push(`/${workspaceSlug}/projects/${projectId}/inbox?currentTab=${option?.key}`);
+ router.push(`/${workspaceSlug}/projects/${projectId}/intake?currentTab=${option?.key}`);
}
}}
>
diff --git a/web/core/components/workspace/sidebar/project-navigation.tsx b/web/core/components/workspace/sidebar/project-navigation.tsx
index 3c73a7e03c..8a94fbcf60 100644
--- a/web/core/components/workspace/sidebar/project-navigation.tsx
+++ b/web/core/components/workspace/sidebar/project-navigation.tsx
@@ -104,7 +104,7 @@ export const ProjectNavigation: FC<TProjectItemsProps> = observer((props) => {
{
i18n_key: "sidebar.intake",
name: "Intake",
- href: `/${workspaceSlug}/projects/${projectId}/inbox`,
+ href: `/${workspaceSlug}/projects/${projectId}/intake`,
icon: Intake,
access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
shouldRender: project.inbox_view,
diff --git a/web/next.config.js b/web/next.config.js
index 7f83ec7420..9327753a17 100644
--- a/web/next.config.js
+++ b/web/next.config.js
@@ -54,6 +54,11 @@ const nextConfig = {
],
async redirects() {
return [
+ {
+ source: "/:workspaceSlug/projects/:projectId/inbox",
+ destination: "/:workspaceSlug/projects/:projectId/intake",
+ permanent: true,
+ },
{
source: "/accounts/sign-up",
destination: "/sign-up",