From 8dbd77974bf614cf66350e3206296911581683f5 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Fri, 22 Sep 2023 15:21:20 +0530 Subject: [PATCH] chore: create update view modal and sidebar global issues redirection --- web/components/command-palette/command-pallette.tsx | 1 + web/components/core/views/all-views.tsx | 5 +++++ web/components/core/views/issues-view.tsx | 1 + web/components/workspace/sidebar-menu.tsx | 4 ++-- .../[workspaceSlug]/projects/[projectId]/views/index.tsx | 3 +++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/web/components/command-palette/command-pallette.tsx b/web/components/command-palette/command-pallette.tsx index f183de9c6..8e17cbafd 100644 --- a/web/components/command-palette/command-pallette.tsx +++ b/web/components/command-palette/command-pallette.tsx @@ -161,6 +161,7 @@ export const CommandPalette: React.FC = observer(() => { /> setIsCreateViewModalOpen(false)} + viewType="project" isOpen={isCreateViewModalOpen} user={user} /> diff --git a/web/components/core/views/all-views.tsx b/web/components/core/views/all-views.tsx index 67804e5e6..75038f57b 100644 --- a/web/components/core/views/all-views.tsx +++ b/web/components/core/views/all-views.tsx @@ -12,6 +12,7 @@ import stateService from "services/state.service"; // hooks import useUser from "hooks/use-user"; import { useProjectMyMembership } from "contexts/project-member.context"; +import useSpreadsheetIssuesView from "hooks/use-spreadsheet-issues-view"; // components import { AllLists, @@ -86,6 +87,8 @@ export const AllViews: React.FC = ({ const { groupedIssues, isEmpty, displayFilters } = viewProps; + const { spreadsheetIssues, mutateIssues } = useSpreadsheetIssuesView(); + const { data: stateGroups } = useSWR( workspaceSlug && projectId ? STATES_LIST(projectId as string) : null, workspaceSlug @@ -174,6 +177,8 @@ export const AllViews: React.FC = ({ ) : displayFilters?.layout === "spreadsheet" ? ( = ({ setCreateViewModal(null)} + viewType="project" preLoadedData={createViewModal} user={user} /> diff --git a/web/components/workspace/sidebar-menu.tsx b/web/components/workspace/sidebar-menu.tsx index 946f4b708..f2a468a4c 100644 --- a/web/components/workspace/sidebar-menu.tsx +++ b/web/components/workspace/sidebar-menu.tsx @@ -34,8 +34,8 @@ const workspaceLinks = (workspaceSlug: string) => [ }, { Icon: TaskAltOutlined, - name: "My Issues", - href: `/${workspaceSlug}/me/my-issues`, + name: "Issues", + href: `/${workspaceSlug}/workspace-views`, }, ]; diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx index 9a5511037..ea37a777a 100644 --- a/web/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx +++ b/web/pages/[workspaceSlug]/projects/[projectId]/views/index.tsx @@ -88,12 +88,14 @@ const ProjectViews: NextPage = () => { > setCreateUpdateViewModal(false)} data={selectedViewToUpdate} user={user} /> { handleEditView(view)} handleDeleteView={() => handleDeleteView(view)} />