binarybeach/bb-plane-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[WEB-2294] fix: remove 'Add Project' button from archives route and remove it from the dropdown in header (#5469)

Browse source 
* fix: remove 'Add Project' button from archives route and remove it from the dropdown in header

* Improved Code Logic

* Fixed Clear All Button and UI Fixes
This commit is contained in:
Ketan Sharma 2024-08-30 19:08:35 +05:30 • committed by GitHub
parent c1d3da0cab
commit 2e890e4d6f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
web/core/components/project/card-list.tsx
View file

@ -45,7 +45,7 @@ export const ProjectCardList = observer(() => {
<p className="whitespace-pre-line text-base text-custom-text-400">
{searchQuery.trim() === ""
? "Remove the filters to see all projects"
: "No projects detected with the matching\ncriteria. Create a new project instead"}
: "No projects detected with the matching criteria.\nCreate a new project instead"}
</p>
</div>
</div>

9
web/core/components/project/dropdowns/filters/root.tsx
View file

@ -51,15 +51,6 @@ export const ProjectFiltersSelection: React.FC<Props> = observer((props) => {
}
title="My projects"
/>
<FilterOption
isChecked={!!displayFilters.archived_projects}
onClick={() =>
handleDisplayFiltersUpdate({
archived_projects: !displayFilters.archived_projects,
})
}
title="Archived"
/>
</div>
{/* access */}

2
web/core/components/project/header.tsx
View file

@ -177,7 +177,7 @@ export const ProjectsBaseHeader = observer(() => {
/>
</FiltersDropdown>
</div>
{isAuthorizedUser && (
{isAuthorizedUser && !isArchived && (
<Button
size="sm"
onClick={() => {

19
web/core/components/project/root.tsx
View file

@ -30,6 +30,12 @@ const Root = observer(() => {
// derived values
const pageTitle = currentWorkspace?.name ? `${currentWorkspace?.name} - Projects` : undefined;
const isArchived = pathname.includes("/archives");
const allowedDisplayFilters = currentWorkspaceAppliedDisplayFilters?.filter(
(filter) => filter !== "archived_projects"
) ?? [];
const handleRemoveFilter = useCallback(
(key: keyof TProjectFilters, value: string | null) => {
if (!workspaceSlug) return;
@ -55,25 +61,24 @@ const Root = observer(() => {
if (!workspaceSlug) return;
clearAllFilters(workspaceSlug.toString());
clearAllAppliedDisplayFilters(workspaceSlug.toString());
if (isArchived) updateDisplayFilters(workspaceSlug.toString(), { archived_projects: true });
}, [clearAllFilters, clearAllAppliedDisplayFilters, workspaceSlug]);
useEffect(() => {
if (pathname.includes("/archives")) {
updateDisplayFilters(workspaceSlug.toString(), { archived_projects: true });
} else {
updateDisplayFilters(workspaceSlug.toString(), { archived_projects: false });
}
isArchived ? updateDisplayFilters(workspaceSlug.toString(), { archived_projects: true }) :
updateDisplayFilters(workspaceSlug.toString(), { archived_projects: false });
}, [pathname]);
return (
<>
<PageHead title={pageTitle} />
<div className="flex h-full w-full flex-col">
{(calculateTotalFilters(currentWorkspaceFilters ?? {}) !== 0 ||
currentWorkspaceAppliedDisplayFilters?.length !== 0) && (
(allowedDisplayFilters.length>0)) && (
<div className="border-b border-custom-border-200 px-5 py-3">
<ProjectAppliedFiltersList
appliedFilters={currentWorkspaceFilters ?? {}}
appliedDisplayFilters={currentWorkspaceAppliedDisplayFilters ?? []}
appliedDisplayFilters={allowedDisplayFilters}
handleClearAllFilters={handleClearAllFilters}
handleRemoveFilter={handleRemoveFilter}
handleRemoveDisplayFilter={handleRemoveDisplayFilter}