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

Fix Views on People page (#2265)

Browse Source 
* fetching viewId for url

* fixed option menu name input

* fix table import

* fix unnecessary rerenders

* people working

---------

Co-authored-by: bosiraphael <raphael.bosi@gmail.com>
This commit is contained in:
Charles Bochet
2023-10-27 18:20:58 +02:00
committed by GitHub
parent 35237c05f3
commit afd4b7c634
14 changed files with 202 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
front/src/modules/companies/components/HooksCompanyBoardEffect.tsx
View File

@ -25,7 +25,6 @@ export const HooksCompanyBoardEffect = () => {
setAvailableFilters,
setAvailableSorts,
setEntityCountInCurrentView,
setCurrentViewId,
} = useView();
const { currentViewFilters } = useViewInternalStates();
@ -106,10 +105,6 @@ export const HooksCompanyBoardEffect = () => {
useEffect(() => {
if (!loading && pipeline && pipelineProgresses && companiesData) {
const viewId = searchParams.get('view');
if (viewId) {
//setCurrentViewId(viewId);
}
setActionBarEntries();
setContextMenuEntries();
updateCompanyBoard(pipeline, pipelineProgresses, companiesData.companies);
@ -125,7 +120,6 @@ export const HooksCompanyBoardEffect = () => {
setContextMenuEntries,
searchParams,
setEntityCountInCurrentView,
setCurrentViewId,
]);
return <></>;

6
front/src/modules/companies/table/components/CompanyTable.tsx
View File

@ -3,6 +3,7 @@ import styled from '@emotion/styled';
import { getCompaniesOptimisticEffectDefinition } from '@/companies/graphql/optimistic-effect-definitions/getCompaniesOptimisticEffectDefinition';
import { useCompanyTableActionBarEntries } from '@/companies/hooks/useCompanyTableActionBarEntries';
import { useCompanyTableContextMenuEntries } from '@/companies/hooks/useCompanyTableContextMenuEntries';
import { useSpreadsheetCompanyImport } from '@/companies/hooks/useSpreadsheetCompanyImport';
import { DataTable } from '@/ui/data/data-table/components/DataTable';
import { DataTableEffect } from '@/ui/data/data-table/components/DataTableEffect';
import { TableContext } from '@/ui/data/data-table/contexts/TableContext';
@ -66,6 +67,9 @@ export const CompanyTable = () => {
});
};
const { openCompanySpreadsheetImport: onImport } =
useSpreadsheetCompanyImport();
const StyledContainer = styled.div`
display: flex;
flex-direction: column;
@ -92,7 +96,7 @@ export const CompanyTable = () => {
<ViewBarEffect />
<ViewBar
optionsDropdownButton={<TableOptionsDropdown />}
optionsDropdownButton={<TableOptionsDropdown onImport={onImport} />}
optionsDropdownScopeId="table-dropdown-option"
/>
<CompanyTableEffect />