Clean and re-organize post table refactoring (#1000)
* Clean and re-organize post table refactoring * Fix tests
This commit is contained in:
@ -14,10 +14,10 @@ import { currentUserState } from '@/auth/states/currentUserState';
|
||||
import { ProfilePictureUploader } from '@/settings/profile/components/ProfilePictureUploader';
|
||||
import { PageHotkeyScope } from '@/types/PageHotkeyScope';
|
||||
import { MainButton } from '@/ui/button/components/MainButton';
|
||||
import { useScopedHotkeys } from '@/ui/hotkey/hooks/useScopedHotkeys';
|
||||
import { TextInput } from '@/ui/input/components/TextInput';
|
||||
import { TextInput } from '@/ui/input/text/components/TextInput';
|
||||
import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar';
|
||||
import { H2Title } from '@/ui/title/components/H2Title';
|
||||
import { H2Title } from '@/ui/typography/components/H2Title';
|
||||
import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
|
||||
import { GET_CURRENT_USER } from '@/users/queries';
|
||||
import { useUpdateUserMutation } from '~/generated/graphql';
|
||||
|
||||
|
||||
@ -11,10 +11,10 @@ import { Title } from '@/auth/components/Title';
|
||||
import { WorkspaceLogoUploader } from '@/settings/workspace/components/WorkspaceLogoUploader';
|
||||
import { PageHotkeyScope } from '@/types/PageHotkeyScope';
|
||||
import { MainButton } from '@/ui/button/components/MainButton';
|
||||
import { useScopedHotkeys } from '@/ui/hotkey/hooks/useScopedHotkeys';
|
||||
import { TextInput } from '@/ui/input/components/TextInput';
|
||||
import { TextInput } from '@/ui/input/text/components/TextInput';
|
||||
import { useSnackBar } from '@/ui/snack-bar/hooks/useSnackBar';
|
||||
import { H2Title } from '@/ui/title/components/H2Title';
|
||||
import { H2Title } from '@/ui/typography/components/H2Title';
|
||||
import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
|
||||
import { GET_CURRENT_USER } from '@/users/queries';
|
||||
import { useUpdateWorkspaceMutation } from '~/generated/graphql';
|
||||
|
||||
|
||||
@ -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 />
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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';
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@ import {
|
||||
import { reduceSortsToOrderBy } from '@/ui/filter-n-sort/helpers';
|
||||
import { IconTargetArrow } from '@/ui/icon/index';
|
||||
import { WithTopBarContainer } from '@/ui/layout/components/WithTopBarContainer';
|
||||
import { RecoilScope } from '@/ui/recoil-scope/components/RecoilScope';
|
||||
import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
|
||||
import { PipelineProgressOrderByWithRelationInput } from '~/generated/graphql';
|
||||
import { opportunitiesBoardOptions } from '~/pages/opportunities/opportunitiesBoardOptions';
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ import {
|
||||
IconCurrencyDollar,
|
||||
IconUser,
|
||||
} from '@/ui/icon/index';
|
||||
import { icon } from '@/ui/themes/icon';
|
||||
import { icon } from '@/ui/theme/constants/icon';
|
||||
import { PipelineProgress } from '~/generated/graphql';
|
||||
|
||||
import { FilterDropdownPeopleSearchSelect } from '../../modules/people/components/FilterDropdownPeopleSearchSelect';
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import { CompanyBoardCard } from '@/companies/components/CompanyBoardCard';
|
||||
import { NewCompanyProgressButton } from '@/companies/components/NewCompanyProgressButton';
|
||||
import { BoardOptions } from '@/pipeline/types/BoardOptions';
|
||||
import { RecoilScope } from '@/ui/recoil-scope/components/RecoilScope';
|
||||
import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
|
||||
|
||||
import { opportunitiesFilters } from './opportunities-filters';
|
||||
import { opportunitiesSorts } from './opportunities-sorts';
|
||||
|
||||
@ -4,15 +4,13 @@ import styled from '@emotion/styled';
|
||||
|
||||
import { GET_PEOPLE } from '@/people/queries';
|
||||
import { PeopleTable } from '@/people/table/components/PeopleTable';
|
||||
import { PeopleTable as PeopleTableV2 } from '@/people/table/components/PeopleTableV2';
|
||||
import { TableActionBarButtonCreateActivityPeople } from '@/people/table/components/TableActionBarButtonCreateActivityPeople';
|
||||
import { TableActionBarButtonDeletePeople } from '@/people/table/components/TableActionBarButtonDeletePeople';
|
||||
import { IconUser } 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 { useInsertOnePersonMutation } from '~/generated/graphql';
|
||||
|
||||
const StyledTableContainer = styled.div`
|
||||
@ -37,10 +35,6 @@ export function People() {
|
||||
|
||||
const theme = useTheme();
|
||||
|
||||
const PeopleTableComponent = ACTIVATE_VIEW_FIELDS
|
||||
? PeopleTableV2
|
||||
: PeopleTable;
|
||||
|
||||
return (
|
||||
<RecoilScope SpecificContext={TableContext}>
|
||||
<WithTopBarContainer
|
||||
@ -49,7 +43,7 @@ export function People() {
|
||||
onAddButtonClick={handleAddButtonClick}
|
||||
>
|
||||
<StyledTableContainer>
|
||||
<PeopleTableComponent />
|
||||
<PeopleTable />
|
||||
</StyledTableContainer>
|
||||
<EntityTableActionBar>
|
||||
<TableActionBarButtonCreateActivityPeople />
|
||||
|
||||
@ -9,7 +9,7 @@ import {
|
||||
IconUser,
|
||||
} from '@/ui/icon/index';
|
||||
import { TableContext } from '@/ui/table/states/TableContext';
|
||||
import { icon } from '@/ui/themes/icon';
|
||||
import { icon } from '@/ui/theme/constants/icon';
|
||||
import { Person } from '~/generated/graphql';
|
||||
|
||||
export const peopleFilters: FilterDefinitionByEntity<Person>[] = [
|
||||
|
||||
@ -4,9 +4,9 @@ import { ColorSchemePicker } from '@/ui/color-scheme/components/ColorSchemePicke
|
||||
import { IconSettings } from '@/ui/icon';
|
||||
import { SubMenuTopBarContainer } from '@/ui/layout/components/SubMenuTopBarContainer';
|
||||
import { Section } from '@/ui/section/components/Section';
|
||||
import { useColorScheme } from '@/ui/themes/hooks/useColorScheme';
|
||||
import { H1Title } from '@/ui/title/components/H1Title';
|
||||
import { H2Title } from '@/ui/title/components/H2Title';
|
||||
import { useColorScheme } from '@/ui/theme/hooks/useColorScheme';
|
||||
import { H1Title } from '@/ui/typography/components/H1Title';
|
||||
import { H2Title } from '@/ui/typography/components/H2Title';
|
||||
|
||||
const StyledContainer = styled.div`
|
||||
display: flex;
|
||||
|
||||
@ -7,8 +7,8 @@ import { ProfilePictureUploader } from '@/settings/profile/components/ProfilePic
|
||||
import { IconSettings } from '@/ui/icon';
|
||||
import { SubMenuTopBarContainer } from '@/ui/layout/components/SubMenuTopBarContainer';
|
||||
import { Section } from '@/ui/section/components/Section';
|
||||
import { H1Title } from '@/ui/title/components/H1Title';
|
||||
import { H2Title } from '@/ui/title/components/H2Title';
|
||||
import { H1Title } from '@/ui/typography/components/H1Title';
|
||||
import { H2Title } from '@/ui/typography/components/H2Title';
|
||||
|
||||
const StyledContainer = styled.div`
|
||||
display: flex;
|
||||
|
||||
@ -6,8 +6,8 @@ import { WorkspaceLogoUploader } from '@/settings/workspace/components/Workspace
|
||||
import { IconSettings } from '@/ui/icon';
|
||||
import { SubMenuTopBarContainer } from '@/ui/layout/components/SubMenuTopBarContainer';
|
||||
import { Section } from '@/ui/section/components/Section';
|
||||
import { H1Title } from '@/ui/title/components/H1Title';
|
||||
import { H2Title } from '@/ui/title/components/H2Title';
|
||||
import { H1Title } from '@/ui/typography/components/H1Title';
|
||||
import { H2Title } from '@/ui/typography/components/H2Title';
|
||||
|
||||
const StyledContainer = styled.div`
|
||||
display: flex;
|
||||
|
||||
@ -11,8 +11,8 @@ import {
|
||||
import { IconSettings, IconTrash } from '@/ui/icon';
|
||||
import { SubMenuTopBarContainer } from '@/ui/layout/components/SubMenuTopBarContainer';
|
||||
import { Section } from '@/ui/section/components/Section';
|
||||
import { H1Title } from '@/ui/title/components/H1Title';
|
||||
import { H2Title } from '@/ui/title/components/H2Title';
|
||||
import { H1Title } from '@/ui/typography/components/H1Title';
|
||||
import { H2Title } from '@/ui/typography/components/H2Title';
|
||||
import { WorkspaceInviteLink } from '@/workspace/components/WorkspaceInviteLink';
|
||||
import { WorkspaceMemberCard } from '@/workspace/components/WorkspaceMemberCard';
|
||||
import {
|
||||
|
||||
Reference in New Issue
Block a user