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

Clean and re-organize post table refactoring (#1000)

Browse Source 
* Clean and re-organize post table refactoring

* Fix tests
This commit is contained in:
Charles Bochet
2023-07-30 18:26:32 -07:00
committed by GitHub
parent 86a2d67efd
commit ade5e52e55
336 changed files with 638 additions and 2757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
front/src/pages/companies/Companies.tsx
View File

@ -4,15 +4,13 @@ import styled from '@emotion/styled';
import { GET_COMPANIES } from '@/companies/queries';
import { CompanyTable } from '@/companies/table/components/CompanyTable';
import { CompanyTable as CompanyTableV2 } from '@/companies/table/components/CompanyTableV2';
import { TableActionBarButtonCreateActivityCompany } from '@/companies/table/components/TableActionBarButtonCreateActivityCompany';
import { TableActionBarButtonDeleteCompanies } from '@/companies/table/components/TableActionBarButtonDeleteCompanies';
import { IconBuildingSkyscraper } from '@/ui/icon';
import { WithTopBarContainer } from '@/ui/layout/components/WithTopBarContainer';
import { RecoilScope } from '@/ui/recoil-scope/components/RecoilScope';
import { EntityTableActionBar } from '@/ui/table/action-bar/components/EntityTableActionBar';
import { TableContext } from '@/ui/table/states/TableContext';
import { ACTIVATE_VIEW_FIELDS } from '~/App';
import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
import { useInsertOneCompanyMutation } from '~/generated/graphql';
import { SEARCH_COMPANY_QUERY } from '../../modules/search/queries/search';
@ -43,10 +41,6 @@ export function Companies() {
const theme = useTheme();
const CompanyTableComponent = ACTIVATE_VIEW_FIELDS
? CompanyTableV2
: CompanyTable;
return (
<>
<WithTopBarContainer
@ -56,7 +50,7 @@ export function Companies() {
>
<RecoilScope SpecificContext={TableContext}>
<StyledTableContainer>
<CompanyTableComponent />
<CompanyTable />
</StyledTableContainer>
<EntityTableActionBar>
<TableActionBarButtonCreateActivityCompany />

2
front/src/pages/companies/CompaniesMockMode.tsx
View File

@ -6,9 +6,9 @@ import { TableActionBarButtonCreateActivityCompany } from '@/companies/table/com
import { TableActionBarButtonDeleteCompanies } from '@/companies/table/components/TableActionBarButtonDeleteCompanies';
import { IconBuildingSkyscraper } from '@/ui/icon';
import { WithTopBarContainer } from '@/ui/layout/components/WithTopBarContainer';
import { RecoilScope } from '@/ui/recoil-scope/components/RecoilScope';
import { EntityTableActionBar } from '@/ui/table/action-bar/components/EntityTableActionBar';
import { TableContext } from '@/ui/table/states/TableContext';
import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
const StyledTableContainer = styled.div`
display: flex;

2
front/src/pages/companies/companies-filters.tsx
View File

@ -7,7 +7,7 @@ import {
IconUser,
IconUsers,
} from '@/ui/icon/index';
import { icon } from '@/ui/themes/icon';
import { icon } from '@/ui/theme/constants/icon';
import { FilterDropdownUserSearchSelect } from '@/users/components/FilterDropdownUserSearchSelect';
import { Company } from '~/generated/graphql';