π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-994] fix: pages list mutation between projects (#4179)
Aaryan Khandelwal7507cb0a0fab
diff --git a/web/components/pages/list/root.tsx b/web/components/pages/list/root.tsxindex 5833e7851f..226bdaf70a 100644--- a/web/components/pages/list/root.tsx+++ b/web/components/pages/list/root.tsx@@ -1,19 +1,24 @@import { FC } from "react";import { observer } from "mobx-react";+// types+import { TPageNavigationTabs } from "@plane/types";// hooksimport { useProjectPages } from "@/hooks/store";// componentsimport { PageListBlock } from "./";type TPagesListRoot = {- workspaceSlug: string;+ pageType: TPageNavigationTabs;projectId: string;+ workspaceSlug: string;};export const PagesListRoot: FC<TPagesListRoot> = observer((props) => {- const { workspaceSlug, projectId } = props;- // hooks- const { filteredPageIds } = useProjectPages(projectId);+ const { pageType, projectId, workspaceSlug } = props;+ // store hooks+ const { getCurrentProjectFilteredPageIds } = useProjectPages(projectId);+ // derived values+ const filteredPageIds = getCurrentProjectFilteredPageIds(pageType);if (!filteredPageIds) return <></>;return (diff --git a/web/components/pages/list/tab-navigation.tsx b/web/components/pages/list/tab-navigation.tsxindex 37a1ef64b9..fc28d50a23 100644--- a/web/components/pages/list/tab-navigation.tsx+++ b/web/components/pages/list/tab-navigation.tsx@@ -42,21 +42,18 @@ export const PageTabNavigation: FC<TPageTabNavigation> = (props) => {href={`/${workspaceSlug}/projects/${projectId}/pages?type=${tab.key}`}onClick={(e) => handleTabClick(e, tab.key)}>- <div>- <div- className={cn(`p-3 py-4 text-sm font-medium transition-all`, {- "text-custom-primary-100": tab.key === pageType,- })}- >- {tab.label}- </div>- <div- className={cn(`rounded-t border-t-2 transition-all`, {- "border-custom-primary-100": tab.key === pageType,- "border-transparent": tab.key !== pageType,- })}- />- </div>+ <span+ className={cn(`block p-3 py-4 text-sm font-medium transition-all`, {+ "text-custom-primary-100": tab.key === pageType,+ })}+ >+ {tab.label}+ </span>+ <div+ className={cn(`rounded-t border-t-2 transition-all border-transparent`, {+ "border-custom-primary-100": tab.key === pageType,+ })}+ /></Link>))}</div>diff --git a/web/components/pages/pages-list-main-content.tsx b/web/components/pages/pages-list-main-content.tsxindex e961849ecf..60e11dd8ce 100644--- a/web/components/pages/pages-list-main-content.tsx+++ b/web/components/pages/pages-list-main-content.tsx@@ -22,7 +22,10 @@ type Props = {export const PagesListMainContent: React.FC<Props> = observer((props) => {const { children, pageType, projectId } = props;// store hooks- const { loader, filteredPageIds, pageIds, filters } = useProjectPages(projectId);+ const { loader, getCurrentProjectFilteredPageIds, getCurrentProjectPageIds, filters } = useProjectPages(projectId);+ // derived values+ const pageIds = getCurrentProjectPageIds(pageType);+ const filteredPageIds = getCurrentProjectFilteredPageIds(pageType);if (loader === "init-loader") return <PageLoader />;// if no pages exist in the active page typediff --git a/web/components/pages/pages-list-view.tsx b/web/components/pages/pages-list-view.tsxindex 2ff4aead95..7f12cfc923 100644--- a/web/components/pages/pages-list-view.tsx+++ b/web/components/pages/pages-list-view.tsx@@ -18,10 +18,7 @@ export const PagesListView: React.FC<TPageView> = observer((props) => {// store hooksconst { getAllPages } = useProjectPages(projectId);// fetching pages list- useSWR(- projectId && pageType ? `PROJECT_PAGES_${projectId}_${pageType}` : null,- projectId && pageType ? () => getAllPages(pageType) : null- );+ useSWR(projectId ? `PROJECT_PAGES_${projectId}` : null, projectId ? () => getAllPages(pageType) : null);// pages loaderreturn (diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsxindex 6869c242e6..b8e1acfc91 100644--- a/web/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx+++ b/web/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx@@ -36,7 +36,11 @@ const ProjectPagesPage: NextPageWithLayout = observer(() => {projectId={projectId.toString()}pageType={currentPageType()}>- <PagesListRoot workspaceSlug={workspaceSlug.toString()} projectId={projectId.toString()} />+ <PagesListRoot+ pageType={currentPageType()}+ workspaceSlug={workspaceSlug.toString()}+ projectId={projectId.toString()}+ /></PagesListView>);});diff --git a/web/store/pages/project-page.store.ts b/web/store/pages/project-page.store.tsindex ef1560350f..136ce61a53 100644--- a/web/store/pages/project-page.store.ts+++ b/web/store/pages/project-page.store.ts@@ -1,12 +1,14 @@import set from "lodash/set";import unset from "lodash/unset";-import { makeObservable, observable, runInAction, action, computed } from "mobx";+import { makeObservable, observable, runInAction, action } from "mobx";import { computedFn } from "mobx-utils";+// typesimport { TPage, TPageFilters, TPageNavigationTabs } from "@plane/types";// helpersimport { filterPagesByPageType, orderPages, shouldFilterPage } from "@/helpers/page.helper";// servicesimport { PageService } from "@/services/page.service";+// storeimport { IPageStore, PageStore } from "@/store/pages/page.store";import { RootStore } from "../root.store";@@ -17,14 +19,12 @@ type TError = { title: string; description: string };export interface IProjectPageStore {// observablesloader: TLoader;- pageType: TPageNavigationTabs;data: Record<string, IPageStore>; // pageId => PageStoreerror: TError | undefined;filters: TPageFilters;- // computed- pageIds: string[] | undefined;- filteredPageIds: string[] | undefined;// helper actions+ getCurrentProjectPageIds: (pageType: TPageNavigationTabs) => string[] | undefined;+ getCurrentProjectFilteredPageIds: (pageType: TPageNavigationTabs) => string[] | undefined;pageById: (pageId: string) => IPageStore | undefined;updateFilters: <T extends keyof TPageFilters>(filterKey: T, filterValue: TPageFilters[T]) => void;clearAllFilters: () => void;@@ -38,7 +38,6 @@ export interface IProjectPageStore {export class ProjectPageStore implements IProjectPageStore {// observablesloader: TLoader = "init-loader";- pageType: TPageNavigationTabs = "public";data: Record<string, IPageStore> = {}; // pageId => PageStoreerror: TError | undefined = undefined;filters: TPageFilters = {@@ -53,13 +52,9 @@ export class ProjectPageStore implements IProjectPageStore {makeObservable(this, {// observablesloader: observable.ref,- pageType: observable.ref,data: observable,error: observable,filters: observable,- // computed- pageIds: computed,- filteredPageIds: computed,// helper actionsupdateFilters: action,clearAllFilters: action,@@ -73,26 +68,35 @@ export class ProjectPageStore implements IProjectPageStore {this.service = new PageService();}- get pageIds() {+ /**+ * @description get the current project page ids based on the pageType+ * @param {TPageNavigationTabs} pageType+ */+ getCurrentProjectPageIds = computedFn((pageType: TPageNavigationTabs) => {const { projectId } = this.store.app.router;if (!projectId) return undefined;-// helps to filter pages based on the pageType- const pagesByType = filterPagesByPageType(this.pageType, Object.values(this?.data || {}));+ let pagesByType = filterPagesByPageType(pageType, Object.values(this?.data || {}));+ pagesByType = pagesByType.filter((p) => p.project === projectId);const pages = (pagesByType.map((page) => page.id) as string[]) || undefined;return pages ?? undefined;- }+ });- get filteredPageIds() {+ /**+ * @description get the current project filtered page ids based on the pageType+ * @param {TPageNavigationTabs} pageType+ */+ getCurrentProjectFilteredPageIds = computedFn((pageType: TPageNavigationTabs) => {const { projectId } = this.store.app.router;if (!projectId) return undefined;// helps to filter pages based on the pageType- const pagesByType = filterPagesByPageType(this.pageType, Object.values(this?.data || {}));+ const pagesByType = filterPagesByPageType(pageType, Object.values(this?.data || {}));let filteredPages = pagesByType.filter((p) =>+ p.project === projectId &&p.name?.toLowerCase().includes(this.filters.searchQuery.toLowerCase()) &&shouldFilterPage(p, this.filters.filters));@@ -101,15 +105,14 @@ export class ProjectPageStore implements IProjectPageStore {const pages = (filteredPages.map((page) => page.id) as string[]) || undefined;return pages ?? undefined;- }-- pageById = computedFn((pageId: string) => {- const { projectId } = this.store.app.router;- if (!projectId) return undefined;-- return this.data?.[pageId] || undefined;});+ /**+ * @description get the page store by id+ * @param {string} pageId+ */+ pageById = computedFn((pageId: string) => this.data?.[pageId] || undefined);+updateFilters = <T extends keyof TPageFilters>(filterKey: T, filterValue: TPageFilters[T]) => {runInAction(() => {set(this.filters, [filterKey], filterValue);@@ -125,17 +128,15 @@ export class ProjectPageStore implements IProjectPageStore {});/**- * @description fetch all the pages based on the navigation tab- * @param {TPageNavigationTabs} pageType+ * @description fetch all the pages*/getAllPages = async (pageType: TPageNavigationTabs) => {try {const { workspaceSlug, projectId } = this.store.app.router;if (!workspaceSlug || !projectId) return undefined;- const currentPageIds = this.pageIds;+ const currentPageIds = this.getCurrentProjectPageIds(pageType);runInAction(() => {- this.pageType = pageType;this.loader = currentPageIds && currentPageIds.length > 0 ? `mutation-loader` : `init-loader`;this.error = undefined;});