admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

POC: Save view as url param (#1710)

Browse Source 
* - save view as url param

* - fix tests
This commit is contained in:
brendanlaschke
2023-09-28 11:50:44 +02:00
committed by GitHub
parent b2bac0b217
commit 485bc64b4f
8 changed files with 105 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/modules/ui/action-bar/components/__stories__/ActionBar.stories.tsx
View File

@ -25,8 +25,8 @@ const meta: Meta<typeof ActionBar> = {
decorators: [
(Story) => (
<RecoilScope CustomRecoilScopeContext={TableRecoilScopeContext}>
<CompanyTableMockMode />
<MemoryRouter>
<CompanyTableMockMode />
<Story />
</MemoryRouter>
</RecoilScope>

6
front/src/modules/ui/board/components/BoardHeader.tsx
View File

@ -1,4 +1,5 @@
import { useContext } from 'react';
import { useSearchParams } from 'react-router-dom';
import { useRecoilCallback, useRecoilState, useRecoilValue } from 'recoil';
import { BoardContext } from '@/companies/states/contexts/BoardContext';
@ -60,6 +61,7 @@ export const BoardHeader = ({ className, onStageAdd }: BoardHeaderProps) => {
savedBoardCardFieldsFamilyState(currentViewId),
);
const [_, setSearchParams] = useSearchParams();
const [boardColumns, setBoardColumns] = useRecoilState(boardColumnsState);
const [, setSavedBoardColumns] = useRecoilState(savedBoardColumnsState);
@ -80,8 +82,9 @@ export const BoardHeader = ({ className, onStageAdd }: BoardHeaderProps) => {
boardCardFieldsScopedState(boardRecoilScopeId),
savedBoardCardFields,
);
setSearchParams({ view: viewId });
},
[boardRecoilScopeId],
[boardRecoilScopeId, setSearchParams],
);
const handleCurrentViewSubmit = async () => {
@ -106,6 +109,7 @@ export const BoardHeader = ({ className, onStageAdd }: BoardHeaderProps) => {
onCurrentViewSubmit: handleCurrentViewSubmit,
onViewBarReset: handleViewBarReset,
onViewSelect: handleViewSelect,
onViewCreate: (view) => setSearchParams({ view: view.id }),
}}
>
<ViewBar

2
front/src/modules/ui/context-menu/components/__stories__/ContextMenu.stories.tsx
View File

@ -31,8 +31,8 @@ const meta: Meta<typeof ContextMenu> = {
decorators: [
(Story) => (
<RecoilScope CustomRecoilScopeContext={TableRecoilScopeContext}>
<CompanyTableMockMode></CompanyTableMockMode>
<MemoryRouter>
<CompanyTableMockMode></CompanyTableMockMode>
<Story />
</MemoryRouter>
</RecoilScope>

47
front/src/modules/ui/table/components/EntityTableEffect.tsx
View File

@ -1,12 +1,22 @@
import { useEffect } from 'react';
import { useSearchParams } from 'react-router-dom';
import { useRecoilCallback } from 'recoil';
import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimisticEffect';
import { OptimisticEffectDefinition } from '@/apollo/optimistic-effect/types/OptimisticEffectDefinition';
import { useSetEntityTableData } from '@/ui/table/hooks/useSetEntityTableData';
import { useRecoilScopeId } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopeId';
import { currentViewIdScopedState } from '@/ui/view-bar/states/currentViewIdScopedState';
import { filtersScopedState } from '@/ui/view-bar/states/filtersScopedState';
import { savedFiltersFamilyState } from '@/ui/view-bar/states/savedFiltersFamilyState';
import { savedSortsFamilyState } from '@/ui/view-bar/states/savedSortsFamilyState';
import { sortsScopedState } from '@/ui/view-bar/states/sortsScopedState';
import { FilterDefinition } from '@/ui/view-bar/types/FilterDefinition';
import { SortDefinition } from '@/ui/view-bar/types/SortDefinition';
import { SortOrder } from '~/generated/graphql';
import { TableRecoilScopeContext } from '../states/recoil-scope-contexts/TableRecoilScopeContext';
export const EntityTableEffect = ({
useGetRequest,
getRequestResultKey,
@ -52,10 +62,45 @@ export const EntityTableEffect = ({
},
});
const [searchParams] = useSearchParams();
const tableRecoilScopeId = useRecoilScopeId(TableRecoilScopeContext);
const handleViewSelect = useRecoilCallback(
({ set, snapshot }) =>
async (viewId: string) => {
const currentView = await snapshot.getPromise(
currentViewIdScopedState(tableRecoilScopeId),
);
if (currentView === viewId) {
return;
}
const savedFilters = await snapshot.getPromise(
savedFiltersFamilyState(viewId),
);
const savedSorts = await snapshot.getPromise(
savedSortsFamilyState(viewId),
);
set(filtersScopedState(tableRecoilScopeId), savedFilters);
set(sortsScopedState(tableRecoilScopeId), savedSorts);
set(currentViewIdScopedState(tableRecoilScopeId), viewId);
},
[tableRecoilScopeId],
);
useEffect(() => {
const viewId = searchParams.get('view');
if (viewId) {
handleViewSelect(viewId);
}
setActionBarEntries?.();
setContextMenuEntries?.();
}, [setActionBarEntries, setContextMenuEntries]);
}, [
handleViewSelect,
searchParams,
setActionBarEntries,
setContextMenuEntries,
]);
return <></>;
};

6
front/src/modules/ui/table/table-header/components/TableHeader.tsx
View File

@ -1,4 +1,5 @@
import { useContext } from 'react';
import { useSearchParams } from 'react-router-dom';
import { useRecoilCallback } from 'recoil';
import { DropdownRecoilScopeContext } from '@/ui/dropdown/states/recoil-scope-contexts/DropdownRecoilScopeContext';
@ -18,6 +19,7 @@ export const TableHeader = () => {
const { onCurrentViewSubmit, ...viewBarContextProps } =
useContext(ViewBarContext);
const tableRecoilScopeId = useRecoilScopeId(TableRecoilScopeContext);
const [_, setSearchParams] = useSearchParams();
const handleViewSelect = useRecoilCallback(
({ set, snapshot }) =>
@ -26,8 +28,9 @@ export const TableHeader = () => {
savedTableColumnsFamilyState(viewId),
);
set(tableColumnsScopedState(tableRecoilScopeId), savedTableColumns);
setSearchParams({ view: viewId });
},
[tableRecoilScopeId],
[tableRecoilScopeId, setSearchParams],
);
return (
@ -37,6 +40,7 @@ export const TableHeader = () => {
...viewBarContextProps,
onCurrentViewSubmit,
onViewSelect: handleViewSelect,
onViewCreate: (view) => setSearchParams({ view: view.id }),
}}
>
<ViewBar