mirror of
https://github.com/makeplane/plane
synced 2025-08-07 19:59:33 +00:00
[WEB-3942] chore: intake url pattern (#7006)
* chore: intake url pattern updated * chore: code refactor * chore: removed unused components --------- Co-authored-by: vamsikrishnamathala <matalav55@gmail.com>
This commit is contained in:
committed by
GitHub
parent
7cdb622663
commit
14ebaf0799
@@ -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]
|
||||
);
|
||||
|
||||
@@ -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]);
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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}`);
|
||||
}
|
||||
}}
|
||||
>
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user