π₯π₯π₯ 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-1026] chore: clear search query on project change (#4225)
Aaryan Khandelwal0d70960e4eb8
diff --git a/web/components/cycles/quick-actions.tsx b/web/components/cycles/quick-actions.tsxindex 33a7df8360..9ba012cc42 100644--- a/web/components/cycles/quick-actions.tsx+++ b/web/components/cycles/quick-actions.tsx@@ -168,15 +168,14 @@ export const CycleQuickActions: React.FC<Props> = observer((props) => {</span></CustomMenu.MenuItem>)}+ <hr className="my-2 border-custom-border-200" />{!isCompleted && isEditingAllowed && (- <div className="border-t pt-1 mt-1">- <CustomMenu.MenuItem onClick={handleDeleteCycle}>- <span className="flex items-center justify-start gap-2">- <Trash2 className="h-3 w-3" />- <span>Delete cycle</span>- </span>- </CustomMenu.MenuItem>- </div>+ <CustomMenu.MenuItem onClick={handleDeleteCycle}>+ <span className="flex items-center justify-start gap-2">+ <Trash2 className="h-3 w-3" />+ <span>Delete cycle</span>+ </span>+ </CustomMenu.MenuItem>)}</CustomMenu></>diff --git a/web/components/headers/projects.tsx b/web/components/headers/projects.tsxindex 64c370d17f..267dad5810 100644--- a/web/components/headers/projects.tsx+++ b/web/components/headers/projects.tsx@@ -13,7 +13,7 @@ import { FiltersDropdown } from "@/components/issues";import { ProjectFiltersSelection, ProjectOrderByDropdown } from "@/components/project";import { EUserWorkspaceRoles } from "@/constants/workspace";import { cn } from "@/helpers/common.helper";-import { useApplication, useEventTracker, useMember, useProject, useProjectFilter, useUser } from "@/hooks/store";+import { useApplication, useEventTracker, useMember, useProjectFilter, useUser } from "@/hooks/store";import useOutsideClickDetector from "@/hooks/use-outside-click-detector";export const ProjectsHeader = observer(() => {@@ -30,7 +30,6 @@ export const ProjectsHeader = observer(() => {const {membership: { currentWorkspaceRole },} = useUser();- const { workspaceProjectIds } = useProject();const {currentWorkspaceDisplayFilters: displayFilters,currentWorkspaceFilters: filters,@@ -89,52 +88,50 @@ export const ProjectsHeader = observer(() => {</div></div><div className="w-full flex items-center justify-end gap-3">- {workspaceProjectIds && workspaceProjectIds?.length > 0 && (- <div className="flex items-center">- {!isSearchOpen && (+ <div className="flex items-center">+ {!isSearchOpen && (+ <button+ type="button"+ className="-mr-1 p-2 hover:bg-custom-background-80 rounded text-custom-text-400 grid place-items-center"+ onClick={() => {+ setIsSearchOpen(true);+ inputRef.current?.focus();+ }}+ >+ <Search className="h-3.5 w-3.5" />+ </button>+ )}+ <div+ className={cn(+ "ml-auto flex items-center justify-start gap-1 rounded-md border border-transparent bg-custom-background-100 text-custom-text-400 w-0 transition-[width] ease-linear overflow-hidden opacity-0",+ {+ "w-64 px-2.5 py-1.5 border-custom-border-200 opacity-100": isSearchOpen,+ }+ )}+ >+ <Search className="h-3.5 w-3.5" />+ <input+ ref={inputRef}+ className="w-full max-w-[234px] border-none bg-transparent text-sm text-custom-text-100 placeholder:text-custom-text-400 focus:outline-none"+ placeholder="Search"+ value={searchQuery}+ onChange={(e) => updateSearchQuery(e.target.value)}+ onKeyDown={handleInputKeyDown}+ />+ {isSearchOpen && (<buttontype="button"- className="-mr-1 p-2 hover:bg-custom-background-80 rounded text-custom-text-400 grid place-items-center"+ className="grid place-items-center"onClick={() => {- setIsSearchOpen(true);- inputRef.current?.focus();+ updateSearchQuery("");+ setIsSearchOpen(false);}}>- <Search className="h-3.5 w-3.5" />+ <X className="h-3 w-3" /></button>)}- <div- className={cn(- "ml-auto flex items-center justify-start gap-1 rounded-md border border-transparent bg-custom-background-100 text-custom-text-400 w-0 transition-[width] ease-linear overflow-hidden opacity-0",- {- "w-64 px-2.5 py-1.5 border-custom-border-200 opacity-100": isSearchOpen,- }- )}- >- <Search className="h-3.5 w-3.5" />- <input- ref={inputRef}- className="w-full max-w-[234px] border-none bg-transparent text-sm text-custom-text-100 focus:outline-none"- placeholder="Search"- value={searchQuery}- onChange={(e) => updateSearchQuery(e.target.value)}- onKeyDown={handleInputKeyDown}- />- {isSearchOpen && (- <button- type="button"- className="grid place-items-center"- onClick={() => {- updateSearchQuery("");- setIsSearchOpen(false);- }}- >- <X className="h-3 w-3" />- </button>- )}- </div></div>- )}+ </div><ProjectOrderByDropdownvalue={displayFilters?.order_by}onChange={(val) => {diff --git a/web/components/inbox/inbox-filter/sorting/order-by.tsx b/web/components/inbox/inbox-filter/sorting/order-by.tsxindex c01c9977ea..4eb9dde225 100644--- a/web/components/inbox/inbox-filter/sorting/order-by.tsx+++ b/web/components/inbox/inbox-filter/sorting/order-by.tsx@@ -42,7 +42,7 @@ export const InboxIssueOrderByDropdown: FC = observer(() => {{inboxSorting?.order_by?.includes(option.key) && <Check className="h-3 w-3" />}</CustomMenu.MenuItem>))}- <hr className="my-2" />+ <hr className="my-2 border-custom-border-200" />{INBOX_ISSUE_SORT_BY_OPTIONS.map((option) => (<CustomMenu.MenuItemkey={option.key}diff --git a/web/components/modules/dropdowns/order-by.tsx b/web/components/modules/dropdowns/order-by.tsxindex dc309a97ac..d6fd3548b2 100644--- a/web/components/modules/dropdowns/order-by.tsx+++ b/web/components/modules/dropdowns/order-by.tsx@@ -46,7 +46,7 @@ export const ModuleOrderByDropdown: React.FC<Props> = (props) => {{value?.includes(option.key) && <Check className="h-3 w-3" />}</CustomMenu.MenuItem>))}- <hr className="my-2" />+ <hr className="my-2 border-custom-border-200" /><CustomMenu.MenuItemclassName="flex items-center justify-between gap-2"onClick={() => {diff --git a/web/components/modules/modules-list-view.tsx b/web/components/modules/modules-list-view.tsxindex b0ff676092..82d63fdcc3 100644--- a/web/components/modules/modules-list-view.tsx+++ b/web/components/modules/modules-list-view.tsx@@ -1,16 +1,13 @@import { observer } from "mobx-react-lite";import Image from "next/image";import { useRouter } from "next/router";-// hooks// componentsimport { EmptyState } from "@/components/empty-state";import { ModuleCardItem, ModuleListItem, ModulePeekOverview, ModulesListGanttChartView } from "@/components/modules";-// uiimport { CycleModuleBoardLayout, CycleModuleListLayout, GanttLayoutLoader } from "@/components/ui";-// assets// constantsimport { EmptyStateType } from "@/constants/empty-state";-import { calculateTotalFilters } from "@/helpers/filter.helper";+// hooksimport { useApplication, useEventTracker, useModule, useModuleFilter } from "@/hooks/store";import AllFiltersImage from "public/empty-state/module/all-filters.svg";import NameFilterImage from "public/empty-state/module/name-filter.svg";@@ -22,14 +19,13 @@ export const ModulesListView: React.FC = observer(() => {// store hooksconst { commandPalette: commandPaletteStore } = useApplication();const { setTrackElement } = useEventTracker();- const { getFilteredModuleIds, loader } = useModule();- const { currentProjectDisplayFilters: displayFilters, searchQuery, currentProjectFilters } = useModuleFilter();+ const { getProjectModuleIds, getFilteredModuleIds, loader } = useModule();+ const { currentProjectDisplayFilters: displayFilters, searchQuery } = useModuleFilter();// derived values+ const projectModuleIds = projectId ? getProjectModuleIds(projectId.toString()) : undefined;const filteredModuleIds = projectId ? getFilteredModuleIds(projectId.toString()) : undefined;- const totalFilters = calculateTotalFilters(currentProjectFilters ?? {});-- if (loader || !filteredModuleIds)+ if (loader || !projectModuleIds || !filteredModuleIds)return (<>{displayFilters?.layout === "list" && <CycleModuleListLayout />}@@ -38,7 +34,18 @@ export const ModulesListView: React.FC = observer(() => {</>);- if (totalFilters > 0 && filteredModuleIds.length === 0)+ if (projectModuleIds.length === 0)+ return (+ <EmptyState+ type={EmptyStateType.PROJECT_MODULE}+ primaryButtonOnClick={() => {+ setTrackElement("Module empty state");+ commandPaletteStore.toggleCreateModuleModal(true);+ }}+ />+ );++ if (filteredModuleIds.length === 0)return (<div className="h-full w-full grid place-items-center"><div className="text-center">@@ -59,55 +66,43 @@ export const ModulesListView: React.FC = observer(() => {return (<>- {filteredModuleIds.length > 0 ? (- <>- {displayFilters?.layout === "list" && (- <div className="h-full overflow-y-auto">- <div className="flex h-full w-full justify-between">- <div className="flex h-full w-full flex-col overflow-y-auto vertical-scrollbar scrollbar-lg">- {filteredModuleIds.map((moduleId) => (- <ModuleListItem key={moduleId} moduleId={moduleId} />- ))}- </div>- <ModulePeekOverview- projectId={projectId?.toString() ?? ""}- workspaceSlug={workspaceSlug?.toString() ?? ""}- />- </div>+ {displayFilters?.layout === "list" && (+ <div className="h-full overflow-y-auto">+ <div className="flex h-full w-full justify-between">+ <div className="flex h-full w-full flex-col overflow-y-auto vertical-scrollbar scrollbar-lg">+ {filteredModuleIds.map((moduleId) => (+ <ModuleListItem key={moduleId} moduleId={moduleId} />+ ))}</div>- )}- {displayFilters?.layout === "board" && (- <div className="h-full w-full">- <div className="flex h-full w-full justify-between">- <div- className={`grid h-full w-full grid-cols-1 gap-6 overflow-y-auto p-8 ${- peekModule- ? "lg:grid-cols-1 xl:grid-cols-2 3xl:grid-cols-3"- : "lg:grid-cols-2 xl:grid-cols-3 3xl:grid-cols-4"- } auto-rows-max transition-all vertical-scrollbar scrollbar-lg`}- >- {filteredModuleIds.map((moduleId) => (- <ModuleCardItem key={moduleId} moduleId={moduleId} />- ))}- </div>- <ModulePeekOverview- projectId={projectId?.toString() ?? ""}- workspaceSlug={workspaceSlug?.toString() ?? ""}- />- </div>+ <ModulePeekOverview+ projectId={projectId?.toString() ?? ""}+ workspaceSlug={workspaceSlug?.toString() ?? ""}+ />+ </div>+ </div>+ )}+ {displayFilters?.layout === "board" && (+ <div className="h-full w-full">+ <div className="flex h-full w-full justify-between">+ <div+ className={`grid h-full w-full grid-cols-1 gap-6 overflow-y-auto p-8 ${+ peekModule+ ? "lg:grid-cols-1 xl:grid-cols-2 3xl:grid-cols-3"+ : "lg:grid-cols-2 xl:grid-cols-3 3xl:grid-cols-4"+ } auto-rows-max transition-all vertical-scrollbar scrollbar-lg`}+ >+ {filteredModuleIds.map((moduleId) => (+ <ModuleCardItem key={moduleId} moduleId={moduleId} />+ ))}</div>- )}- {displayFilters?.layout === "gantt" && <ModulesListGanttChartView />}- </>- ) : (- <EmptyState- type={EmptyStateType.PROJECT_MODULE}- primaryButtonOnClick={() => {- setTrackElement("Module empty state");- commandPaletteStore.toggleCreateModuleModal(true);- }}- />+ <ModulePeekOverview+ projectId={projectId?.toString() ?? ""}+ workspaceSlug={workspaceSlug?.toString() ?? ""}+ />+ </div>+ </div>)}+ {displayFilters?.layout === "gantt" && <ModulesListGanttChartView />}</>);});diff --git a/web/components/modules/quick-actions.tsx b/web/components/modules/quick-actions.tsxindex a6938c10a9..a1805937e8 100644--- a/web/components/modules/quick-actions.tsx+++ b/web/components/modules/quick-actions.tsx@@ -163,15 +163,14 @@ export const ModuleQuickActions: React.FC<Props> = observer((props) => {</span></CustomMenu.MenuItem>)}+ <hr className="my-2 border-custom-border-200" />{isEditingAllowed && (- <div className="border-t pt-1 mt-1">- <CustomMenu.MenuItem onClick={handleDeleteModule}>- <span className="flex items-center justify-start gap-2">- <Trash2 className="h-3 w-3" />- <span>Delete module</span>- </span>- </CustomMenu.MenuItem>- </div>+ <CustomMenu.MenuItem onClick={handleDeleteModule}>+ <span className="flex items-center justify-start gap-2">+ <Trash2 className="h-3 w-3" />+ <span>Delete module</span>+ </span>+ </CustomMenu.MenuItem>)}</CustomMenu></>diff --git a/web/components/pages/list/order-by.tsx b/web/components/pages/list/order-by.tsxindex 5055b68e89..493e5c06ee 100644--- a/web/components/pages/list/order-by.tsx+++ b/web/components/pages/list/order-by.tsx@@ -47,7 +47,7 @@ export const PageOrderByDropdown: React.FC<Props> = (props) => {{sortKey === option.key && <Check className="h-3 w-3" />}</CustomMenu.MenuItem>))}- <hr className="my-2" />+ <hr className="my-2 border-custom-border-200" /><CustomMenu.MenuItemclassName="flex items-center justify-between gap-2"onClick={() => {diff --git a/web/components/project/dropdowns/order-by.tsx b/web/components/project/dropdowns/order-by.tsxindex 048513d08a..c2bf1a87ba 100644--- a/web/components/project/dropdowns/order-by.tsx+++ b/web/components/project/dropdowns/order-by.tsx@@ -49,7 +49,7 @@ export const ProjectOrderByDropdown: React.FC<Props> = (props) => {{value?.includes(option.key) && <Check className="h-3 w-3" />}</CustomMenu.MenuItem>))}- <hr className="my-2" />+ <hr className="my-2 border-custom-border-200" /><CustomMenu.MenuItemclassName="flex items-center justify-between gap-2"onClick={() => {diff --git a/web/store/cycle_filter.store.ts b/web/store/cycle_filter.store.tsindex 182ab0251d..ce899cbf30 100644--- a/web/store/cycle_filter.store.ts+++ b/web/store/cycle_filter.store.ts@@ -63,6 +63,7 @@ export class CycleFilterStore implements ICycleFilterStore {(projectId) => {if (!projectId) return;this.initProjectCycleFilters(projectId);+ this.searchQuery = "";});}diff --git a/web/store/module_filter.store.ts b/web/store/module_filter.store.tsindex 5b46e17321..8d9315671f 100644--- a/web/store/module_filter.store.ts+++ b/web/store/module_filter.store.ts@@ -63,6 +63,7 @@ export class ModuleFilterStore implements IModuleFilterStore {(projectId) => {if (!projectId) return;this.initProjectModuleFilters(projectId);+ this.searchQuery = "";});}diff --git a/web/store/pages/project-page.store.ts b/web/store/pages/project-page.store.tsindex a9572e7d84..628b931c41 100644--- a/web/store/pages/project-page.store.ts+++ b/web/store/pages/project-page.store.ts@@ -1,6 +1,6 @@import set from "lodash/set";import unset from "lodash/unset";-import { makeObservable, observable, runInAction, action } from "mobx";+import { makeObservable, observable, runInAction, action, reaction } from "mobx";import { computedFn } from "mobx-utils";// typesimport { TPage, TPageFilters, TPageNavigationTabs } from "@plane/types";@@ -64,8 +64,16 @@ export class ProjectPageStore implements IProjectPageStore {createPage: action,removePage: action,});-+ // servicethis.service = new PageService();+ // initialize display filters of the current project+ reaction(+ () => this.store.app.router.projectId,+ (projectId) => {+ if (!projectId) return;+ this.filters.searchQuery = "";+ }+ );}/**diff --git a/web/store/project/project_filter.store.ts b/web/store/project/project_filter.store.tsindex 94d5f70736..297c31cad8 100644--- a/web/store/project/project_filter.store.ts+++ b/web/store/project/project_filter.store.ts@@ -59,6 +59,7 @@ export class ProjectFilterStore implements IProjectFilterStore {(workspaceSlug) => {if (!workspaceSlug) return;this.initWorkspaceFilters(workspaceSlug);+ this.searchQuery = "";});}