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

Uniformize folder structure (#693)

Browse Source 
* Uniformize folder structure

* Fix icons

* Fix icons

* Fix tests

* Fix tests
This commit is contained in:
Charles Bochet
2023-07-16 14:29:28 -07:00
committed by GitHub
parent 900ec5572f
commit 6ced8434bd
462 changed files with 931 additions and 960 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
front/src/App.tsx
View File

@ -4,8 +4,11 @@ import { AnimatePresence, LayoutGroup } from 'framer-motion';
import { RequireOnboarded } from '@/auth/components/RequireOnboarded'; import { RequireOnboarded } from '@/auth/components/RequireOnboarded';
import { RequireOnboarding } from '@/auth/components/RequireOnboarding'; import { RequireOnboarding } from '@/auth/components/RequireOnboarding';
import { AuthModal } from '@/auth/components/ui/Modal'; import { AuthModal } from '@/auth/components/ui/Modal';
import { AuthLayout } from '@/ui/layout/AuthLayout'; import { AppPath } from '@/types/AppPath';
import { DefaultLayout } from '@/ui/layout/DefaultLayout'; import { AuthPath } from '@/types/AuthPath';
import { SettingsPath } from '@/types/SettingsPath';
import { AuthLayout } from '@/ui/layout/components/AuthLayout';
import { DefaultLayout } from '@/ui/layout/components/DefaultLayout';
import { CreateProfile } from '~/pages/auth/CreateProfile'; import { CreateProfile } from '~/pages/auth/CreateProfile';
import { CreateWorkspace } from '~/pages/auth/CreateWorkspace'; import { CreateWorkspace } from '~/pages/auth/CreateWorkspace';
import { Index } from '~/pages/auth/Index'; import { Index } from '~/pages/auth/Index';
@ -20,10 +23,7 @@ import { SettingsWorkspaceMembers } from '~/pages/settings/SettingsWorkspaceMemb
import { CompanyShow } from './pages/companies/CompanyShow'; import { CompanyShow } from './pages/companies/CompanyShow';
import { PersonShow } from './pages/people/PersonShow'; import { PersonShow } from './pages/people/PersonShow';
import { SettingsWorksapce } from './pages/settings/SettingsWorkspace'; import { SettingsWorksapce } from './pages/settings/SettingsWorkspace';
import { AppPath } from './sync-hooks/types/AppPath'; import { AppInternalHooks } from './sync-hooks/AppInternalHooks';
import { AuthPath } from './sync-hooks/types/AuthPath';
import { SettingsPath } from './sync-hooks/types/SettingsPath';
import { AppInternalHooks } from './AppInternalHooks';
/** /**
* AuthRoutes is used to allow transitions between auth pages with framer-motion. * AuthRoutes is used to allow transitions between auth pages with framer-motion.

15
front/src/AppInternalHooks.tsx
View File

@ -1,15 +0,0 @@
import { AnalyticsHook } from './sync-hooks/AnalyticsHook';
import { GotoHotkeysHooks } from './sync-hooks/GotoHotkeysHooks';
import { HotkeyScopeAutoSyncHook } from './sync-hooks/HotkeyScopeAutoSyncHook';
import { HotkeyScopeBrowserRouterSync } from './sync-hooks/HotkeyScopeBrowserRouterSync';
export function AppInternalHooks() {
return (
<>
<AnalyticsHook />
<GotoHotkeysHooks />
<HotkeyScopeAutoSyncHook />
<HotkeyScopeBrowserRouterSync />
</>
);
}

9
front/src/AppNavbar.tsx
View File

@ -10,12 +10,11 @@ import {
IconSettings, IconSettings,
IconTargetArrow, IconTargetArrow,
IconUser, IconUser,
} from '@/ui/icons/index'; } from '@/ui/icon/index';
import { useIsSubNavbarDisplayed } from '@/ui/layout/hooks/useIsSubNavbarDisplayed'; import { useIsSubNavbarDisplayed } from '@/ui/layout/hooks/useIsSubNavbarDisplayed';
import MainNavbar from '@/ui/layout/navbar/MainNavbar'; import MainNavbar from '@/ui/navbar/components/MainNavbar';
import NavItem from '@/ui/navbar/components/NavItem';
import NavItem from './modules/ui/layout/navbar/NavItem'; import NavTitle from '@/ui/navbar/components/NavTitle';
import NavTitle from './modules/ui/layout/navbar/NavTitle';
export function AppNavbar() { export function AppNavbar() {
const theme = useTheme(); const theme = useTheme();

0
front/src/modules/utils/hooks/useFirstMountState.ts → front/src/hooks/useFirstMountState.ts
View File

2
front/src/sync-hooks/hooks/useIsMatchingLocation.ts → front/src/hooks/useIsMatchingLocation.ts
View File

@ -1,7 +1,7 @@
import { matchPath, useLocation } from 'react-router-dom'; import { matchPath, useLocation } from 'react-router-dom';
import { parse } from 'url'; import { parse } from 'url';
import { AppBasePath } from '../types/AppBasePath'; import { AppBasePath } from '@/types/AppBasePath';
export function useIsMatchingLocation() { export function useIsMatchingLocation() {
const location = useLocation(); const location = useLocation();

0
front/src/modules/utils/hooks/usePrevious.ts → front/src/hooks/usePrevious.ts
View File

0
front/src/modules/utils/hooks/useUpdateEffect.ts → front/src/hooks/useUpdateEffect.ts
View File

12
front/src/index.tsx
View File

@ -4,16 +4,16 @@ import { HotkeysProvider } from 'react-hotkeys-hook';
import { BrowserRouter } from 'react-router-dom'; import { BrowserRouter } from 'react-router-dom';
import { RecoilRoot } from 'recoil'; import { RecoilRoot } from 'recoil';
import { INITIAL_HOTKEYS_SCOPES } from '@/lib/hotkeys/constants'; import { ApolloProvider } from '@/apollo/components/ApolloProvider';
import { ClientConfigProvider } from '@/client-config/components/ClientConfigProvider';
import { INITIAL_HOTKEYS_SCOPES } from '@/ui/hotkey/constants';
import { SnackBarProvider } from '@/ui/snack-bar/components/SnackBarProvider';
import { AppThemeProvider } from '@/ui/themes/components/AppThemeProvider';
import { ThemeType } from '@/ui/themes/themes'; import { ThemeType } from '@/ui/themes/themes';
import { UserProvider } from '@/users/components/UserProvider';
import '@emotion/react'; import '@emotion/react';
import { ApolloProvider } from './providers/apollo/ApolloProvider';
import { ClientConfigProvider } from './providers/client-config/ClientConfigProvider';
import { SnackBarProvider } from './providers/snack-bar/SnackBarProvider';
import { AppThemeProvider } from './providers/theme/AppThemeProvider';
import { UserProvider } from './providers/user/UserProvider';
import { App } from './App'; import { App } from './App';
import './index.css'; import './index.css';

5
front/src/modules/comments/components/comment/CommentHeader.tsx → front/src/modules/activities/comment/CommentHeader.tsx
View File

@ -2,12 +2,13 @@ import { Tooltip } from 'react-tooltip';
import { useTheme } from '@emotion/react'; import { useTheme } from '@emotion/react';
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { CommentForDrawer } from '@/comments/types/CommentForDrawer';
import { Avatar } from '@/users/components/Avatar'; import { Avatar } from '@/users/components/Avatar';
import { import {
beautifyExactDate, beautifyExactDate,
beautifyPastDateRelativeToNow, beautifyPastDateRelativeToNow,
} from '@/utils/datetime/date-utils'; } from '~/utils/date-utils';
import { CommentForDrawer } from '../types/CommentForDrawer';
type OwnProps = { type OwnProps = {
comment: Pick<CommentForDrawer, 'id' | 'author' | 'createdAt'>; comment: Pick<CommentForDrawer, 'id' | 'author' | 'createdAt'>;

2
front/src/modules/comments/components/comment/CommentThreadItem.tsx → front/src/modules/activities/comment/CommentThreadItem.tsx
View File

@ -1,6 +1,6 @@
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { CommentForDrawer } from '@/comments/types/CommentForDrawer'; import { CommentForDrawer } from '../types/CommentForDrawer';
import { CommentHeader } from './CommentHeader'; import { CommentHeader } from './CommentHeader';

4
front/src/modules/comments/components/comment/__stories__/CommentHeader.stories.tsx → front/src/modules/activities/comment/__stories__/CommentHeader.stories.tsx
View File

@ -1,11 +1,11 @@
import type { Meta, StoryObj } from '@storybook/react'; import type { Meta, StoryObj } from '@storybook/react';
import { DateTime } from 'luxon'; import { DateTime } from 'luxon';
import { CommentForDrawer } from '@/comments/types/CommentForDrawer'; import { CommentThreadActionBar } from '@/activities/right-drawer/components/CommentThreadActionBar';
import { CommentForDrawer } from '@/activities/types/CommentForDrawer';
import { mockedUsersData } from '~/testing/mock-data/users'; import { mockedUsersData } from '~/testing/mock-data/users';
import { getRenderWrapperForComponent } from '~/testing/renderWrappers'; import { getRenderWrapperForComponent } from '~/testing/renderWrappers';
import { CommentThreadActionBar } from '../../right-drawer/CommentThreadActionBar';
import { CommentHeader } from '../CommentHeader'; import { CommentHeader } from '../CommentHeader';
const meta: Meta<typeof CommentHeader> = { const meta: Meta<typeof CommentHeader> = {

7
front/src/modules/comments/components/comment-thread/CommentThreadBodyEditor.tsx → front/src/modules/activities/components/CommentThreadBodyEditor.tsx
View File

@ -3,15 +3,16 @@ import { getOperationName } from '@apollo/client/utilities';
import { BlockNoteEditor } from '@blocknote/core'; import { BlockNoteEditor } from '@blocknote/core';
import { useBlockNote } from '@blocknote/react'; import { useBlockNote } from '@blocknote/react';
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import debounce from 'lodash.debounce';
import { GET_COMMENT_THREADS_BY_TARGETS } from '@/comments/services'; import { BlockEditor } from '@/ui/editor/components/BlockEditor';
import { BlockEditor } from '@/ui/components/editor/BlockEditor';
import { debounce } from '@/utils/debounce';
import { import {
CommentThread, CommentThread,
useUpdateCommentThreadMutation, useUpdateCommentThreadMutation,
} from '~/generated/graphql'; } from '~/generated/graphql';
import { GET_COMMENT_THREADS_BY_TARGETS } from '../queries/select';
const BlockNoteStyledContainer = styled.div` const BlockNoteStyledContainer = styled.div`
width: 100%; width: 100%;
`; `;

8
front/src/modules/comments/components/comment-thread/CommentThreadComments.tsx → front/src/modules/activities/components/CommentThreadComments.tsx
View File

@ -4,13 +4,13 @@ import { useRecoilValue } from 'recoil';
import { v4 } from 'uuid'; import { v4 } from 'uuid';
import { currentUserState } from '@/auth/states/currentUserState'; import { currentUserState } from '@/auth/states/currentUserState';
import { GET_COMMENT_THREAD } from '@/comments/services'; import { AutosizeTextInput } from '@/ui/input/components/AutosizeTextInput';
import { CommentForDrawer } from '@/comments/types/CommentForDrawer';
import { AutosizeTextInput } from '@/ui/components/inputs/AutosizeTextInput';
import { isNonEmptyString } from '@/utils/type-guards/isNonEmptyString';
import { CommentThread, useCreateCommentMutation } from '~/generated/graphql'; import { CommentThread, useCreateCommentMutation } from '~/generated/graphql';
import { isNonEmptyString } from '~/utils/isNonEmptyString';
import { CommentThreadItem } from '../comment/CommentThreadItem'; import { CommentThreadItem } from '../comment/CommentThreadItem';
import { GET_COMMENT_THREAD } from '../queries';
import { CommentForDrawer } from '../types/CommentForDrawer';
type OwnProps = { type OwnProps = {
commentThread: Pick<CommentThread, 'id'> & { commentThread: Pick<CommentThread, 'id'> & {

6
front/src/modules/comments/components/comment-thread/CommentThreadCreateButton.tsx → front/src/modules/activities/components/CommentThreadCreateButton.tsx
View File

@ -1,8 +1,8 @@
import { useTheme } from '@emotion/react'; import { useTheme } from '@emotion/react';
import { Button } from '@/ui/components/buttons/Button'; import { Button } from '@/ui/button/components/Button';
import { ButtonGroup } from '@/ui/components/buttons/ButtonGroup'; import { ButtonGroup } from '@/ui/button/components/ButtonGroup';
import { IconCheckbox, IconNotes, IconTimelineEvent } from '@/ui/icons/index'; import { IconCheckbox, IconNotes, IconTimelineEvent } from '@/ui/icon/index';
type CommentThreadCreateButtonProps = { type CommentThreadCreateButtonProps = {
onNoteClick?: () => void; onNoteClick?: () => void;

17
front/src/modules/comments/components/comment-thread/CommentThreadRelationPicker.tsx → front/src/modules/activities/components/CommentThreadRelationPicker.tsx
View File

@ -8,24 +8,25 @@ import {
useFloating, useFloating,
} from '@floating-ui/react'; } from '@floating-ui/react';
import { useHandleCheckableCommentThreadTargetChange } from '@/comments/hooks/useHandleCheckableCommentThreadTargetChange';
import { CompanyChip } from '@/companies/components/CompanyChip'; import { CompanyChip } from '@/companies/components/CompanyChip';
import { useFilteredSearchCompanyQuery } from '@/companies/queries'; import { useFilteredSearchCompanyQuery } from '@/companies/queries';
import { usePreviousHotkeyScope } from '@/lib/hotkeys/hooks/usePreviousHotkeyScope';
import { useScopedHotkeys } from '@/lib/hotkeys/hooks/useScopedHotkeys';
import { PersonChip } from '@/people/components/PersonChip'; import { PersonChip } from '@/people/components/PersonChip';
import { useFilteredSearchPeopleQuery } from '@/people/services'; import { useFilteredSearchPeopleQuery } from '@/people/queries';
import { RecoilScope } from '@/recoil-scope/components/RecoilScope';
import { MultipleEntitySelect } from '@/relation-picker/components/MultipleEntitySelect';
import { RelationPickerHotkeyScope } from '@/relation-picker/types/RelationPickerHotkeyScope';
import { useListenClickOutsideArrayOfRef } from '@/ui/hooks/useListenClickOutsideArrayOfRef'; import { useListenClickOutsideArrayOfRef } from '@/ui/hooks/useListenClickOutsideArrayOfRef';
import { flatMapAndSortEntityForSelectArrayOfArrayByName } from '@/ui/utils/flatMapAndSortEntityForSelectArrayByName'; import { usePreviousHotkeyScope } from '@/ui/hotkey/hooks/usePreviousHotkeyScope';
import { useScopedHotkeys } from '@/ui/hotkey/hooks/useScopedHotkeys';
import { RecoilScope } from '@/ui/recoil-scope/components/RecoilScope';
import { MultipleEntitySelect } from '@/ui/relation-picker/components/MultipleEntitySelect';
import { RelationPickerHotkeyScope } from '@/ui/relation-picker/types/RelationPickerHotkeyScope';
import { import {
CommentableType, CommentableType,
CommentThread, CommentThread,
CommentThreadTarget, CommentThreadTarget,
} from '~/generated/graphql'; } from '~/generated/graphql';
import { useHandleCheckableCommentThreadTargetChange } from '../hooks/useHandleCheckableCommentThreadTargetChange';
import { flatMapAndSortEntityForSelectArrayOfArrayByName } from '../utils/flatMapAndSortEntityForSelectArrayByName';
type OwnProps = { type OwnProps = {
commentThread?: Pick<CommentThread, 'id'> & { commentThread?: Pick<CommentThread, 'id'> & {
commentThreadTargets: Array< commentThreadTargets: Array<

4
front/src/modules/comments/components/comment-thread/CommentThreadTypeDropdown.tsx → front/src/modules/activities/components/CommentThreadTypeDropdown.tsx
View File

@ -1,8 +1,8 @@
import { import {
DropdownButton, DropdownButton,
DropdownOptionType, DropdownOptionType,
} from '@/ui/components/buttons/DropdownButton'; } from '@/ui/button/components/DropdownButton';
import { IconCheck, IconNotes } from '@/ui/icons/index'; import { IconCheck, IconNotes } from '@/ui/icon/index';
import { import {
ActivityType, ActivityType,
CommentThread, CommentThread,

0
front/src/modules/comments/components/comment-thread/__stories__/CommentThreadRelationPicker.stories.tsx → front/src/modules/activities/components/__stories__/CommentThreadRelationPicker.stories.tsx
View File

4
front/src/modules/comments/hooks/useHandleCheckableCommentThreadTargetChange.ts → front/src/modules/activities/hooks/useHandleCheckableCommentThreadTargetChange.ts
View File

@ -2,7 +2,7 @@ import { getOperationName } from '@apollo/client/utilities';
import { v4 } from 'uuid'; import { v4 } from 'uuid';
import { GET_COMPANIES } from '@/companies/queries'; import { GET_COMPANIES } from '@/companies/queries';
import { GET_PEOPLE } from '@/people/services'; import { GET_PEOPLE } from '@/people/queries';
import { import {
CommentThread, CommentThread,
CommentThreadTarget, CommentThreadTarget,
@ -10,7 +10,7 @@ import {
useRemoveCommentThreadTargetOnCommentThreadMutation, useRemoveCommentThreadTargetOnCommentThreadMutation,
} from '~/generated/graphql'; } from '~/generated/graphql';
import { GET_COMMENT_THREADS_BY_TARGETS } from '../services'; import { GET_COMMENT_THREADS_BY_TARGETS } from '../queries';
import { CommentableEntityForSelect } from '../types/CommentableEntityForSelect'; import { CommentableEntityForSelect } from '../types/CommentableEntityForSelect';
export function useHandleCheckableCommentThreadTargetChange({ export function useHandleCheckableCommentThreadTargetChange({

8
front/src/modules/comments/hooks/useOpenCommentThreadRightDrawer.ts → front/src/modules/activities/hooks/useOpenCommentThreadRightDrawer.ts
View File

@ -1,10 +1,10 @@
import { useRecoilState } from 'recoil'; import { useRecoilState } from 'recoil';
import { useSetHotkeyScope } from '@/lib/hotkeys/hooks/useSetHotkeyScope'; import { useSetHotkeyScope } from '@/ui/hotkey/hooks/useSetHotkeyScope';
import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope'; import { useOpenRightDrawer } from '@/ui/right-drawer/hooks/useOpenRightDrawer';
import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages'; import { RightDrawerHotkeyScope } from '@/ui/right-drawer/types/RightDrawerHotkeyScope';
import { RightDrawerPages } from '@/ui/right-drawer/types/RightDrawerPages';
import { useOpenRightDrawer } from '../../ui/layout/right-drawer/hooks/useOpenRightDrawer';
import { viewableCommentThreadIdState } from '../states/viewableCommentThreadIdState'; import { viewableCommentThreadIdState } from '../states/viewableCommentThreadIdState';
export function useOpenCommentThreadRightDrawer() { export function useOpenCommentThreadRightDrawer() {

17
front/src/modules/comments/hooks/useOpenCreateCommentDrawerForSelectedRowIds.ts → front/src/modules/activities/hooks/useOpenCreateCommentDrawerForSelectedRowIds.ts
View File

@ -4,22 +4,19 @@ import { v4 } from 'uuid';
import { currentUserState } from '@/auth/states/currentUserState'; import { currentUserState } from '@/auth/states/currentUserState';
import { GET_COMPANIES } from '@/companies/queries'; import { GET_COMPANIES } from '@/companies/queries';
import { useSetHotkeyScope } from '@/lib/hotkeys/hooks/useSetHotkeyScope'; import { GET_PEOPLE } from '@/people/queries';
import { GET_PEOPLE } from '@/people/services'; import { useSetHotkeyScope } from '@/ui/hotkey/hooks/useSetHotkeyScope';
import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope'; import { useOpenRightDrawer } from '@/ui/right-drawer/hooks/useOpenRightDrawer';
import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages'; import { RightDrawerHotkeyScope } from '@/ui/right-drawer/types/RightDrawerHotkeyScope';
import { selectedRowIdsSelector } from '@/ui/tables/states/selectedRowIdsSelector'; import { RightDrawerPages } from '@/ui/right-drawer/types/RightDrawerPages';
import { selectedRowIdsSelector } from '@/ui/table/states/selectedRowIdsSelector';
import { import {
ActivityType, ActivityType,
CommentableType, CommentableType,
useCreateCommentThreadMutation, useCreateCommentThreadMutation,
} from '~/generated/graphql'; } from '~/generated/graphql';
import { useOpenRightDrawer } from '../../ui/layout/right-drawer/hooks/useOpenRightDrawer'; import { GET_COMMENT_THREAD, GET_COMMENT_THREADS_BY_TARGETS } from '../queries';
import {
GET_COMMENT_THREAD,
GET_COMMENT_THREADS_BY_TARGETS,
} from '../services';
import { commentableEntityArrayState } from '../states/commentableEntityArrayState'; import { commentableEntityArrayState } from '../states/commentableEntityArrayState';
import { viewableCommentThreadIdState } from '../states/viewableCommentThreadIdState'; import { viewableCommentThreadIdState } from '../states/viewableCommentThreadIdState';
import { CommentableEntity } from '../types/CommentableEntity'; import { CommentableEntity } from '../types/CommentableEntity';

15
front/src/modules/comments/hooks/useOpenCreateCommentThreadDrawer.ts → front/src/modules/activities/hooks/useOpenCreateCommentThreadDrawer.ts
View File

@ -4,20 +4,17 @@ import { v4 } from 'uuid';
import { currentUserState } from '@/auth/states/currentUserState'; import { currentUserState } from '@/auth/states/currentUserState';
import { GET_COMPANIES } from '@/companies/queries'; import { GET_COMPANIES } from '@/companies/queries';
import { useSetHotkeyScope } from '@/lib/hotkeys/hooks/useSetHotkeyScope'; import { GET_PEOPLE } from '@/people/queries';
import { GET_PEOPLE } from '@/people/services'; import { useSetHotkeyScope } from '@/ui/hotkey/hooks/useSetHotkeyScope';
import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope'; import { useOpenRightDrawer } from '@/ui/right-drawer/hooks/useOpenRightDrawer';
import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages'; import { RightDrawerHotkeyScope } from '@/ui/right-drawer/types/RightDrawerHotkeyScope';
import { RightDrawerPages } from '@/ui/right-drawer/types/RightDrawerPages';
import { import {
ActivityType, ActivityType,
useCreateCommentThreadMutation, useCreateCommentThreadMutation,
} from '~/generated/graphql'; } from '~/generated/graphql';
import { useOpenRightDrawer } from '../../ui/layout/right-drawer/hooks/useOpenRightDrawer'; import { GET_COMMENT_THREAD, GET_COMMENT_THREADS_BY_TARGETS } from '../queries';
import {
GET_COMMENT_THREAD,
GET_COMMENT_THREADS_BY_TARGETS,
} from '../services';
import { commentableEntityArrayState } from '../states/commentableEntityArrayState'; import { commentableEntityArrayState } from '../states/commentableEntityArrayState';
import { viewableCommentThreadIdState } from '../states/viewableCommentThreadIdState'; import { viewableCommentThreadIdState } from '../states/viewableCommentThreadIdState';
import { CommentableEntity } from '../types/CommentableEntity'; import { CommentableEntity } from '../types/CommentableEntity';

8
front/src/modules/comments/hooks/useOpenTimelineRightDrawer.ts → front/src/modules/activities/hooks/useOpenTimelineRightDrawer.ts
View File

@ -1,10 +1,10 @@
import { useRecoilState } from 'recoil'; import { useRecoilState } from 'recoil';
import { useSetHotkeyScope } from '@/lib/hotkeys/hooks/useSetHotkeyScope'; import { useSetHotkeyScope } from '@/ui/hotkey/hooks/useSetHotkeyScope';
import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope'; import { useOpenRightDrawer } from '@/ui/right-drawer/hooks/useOpenRightDrawer';
import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages'; import { RightDrawerHotkeyScope } from '@/ui/right-drawer/types/RightDrawerHotkeyScope';
import { RightDrawerPages } from '@/ui/right-drawer/types/RightDrawerPages';
import { useOpenRightDrawer } from '../../ui/layout/right-drawer/hooks/useOpenRightDrawer';
import { commentableEntityArrayState } from '../states/commentableEntityArrayState'; import { commentableEntityArrayState } from '../states/commentableEntityArrayState';
import { CommentableEntity } from '../types/CommentableEntity'; import { CommentableEntity } from '../types/CommentableEntity';

0
front/src/modules/comments/services/create.ts → front/src/modules/activities/queries/create.ts
View File

0
front/src/modules/comments/services/index.ts → front/src/modules/activities/queries/index.ts
View File

0
front/src/modules/comments/services/select.ts → front/src/modules/activities/queries/select.ts
View File

0
front/src/modules/comments/services/update.ts → front/src/modules/activities/queries/update.ts
View File

19
front/src/modules/comments/components/right-drawer/CommentThread.tsx → front/src/modules/activities/right-drawer/components/CommentThread.tsx
View File

@ -2,20 +2,19 @@ import React, { useEffect, useMemo, useState } from 'react';
import { getOperationName } from '@apollo/client/utilities'; import { getOperationName } from '@apollo/client/utilities';
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { GET_COMMENT_THREAD } from '@/comments/services'; import { CommentThreadBodyEditor } from '@/activities/components/CommentThreadBodyEditor';
import { PropertyBox } from '@/ui/components/property-box/PropertyBox'; import { CommentThreadComments } from '@/activities/components/CommentThreadComments';
import { PropertyBoxItem } from '@/ui/components/property-box/PropertyBoxItem'; import { CommentThreadRelationPicker } from '@/activities/components/CommentThreadRelationPicker';
import { IconArrowUpRight } from '@/ui/icons/index'; import { CommentThreadTypeDropdown } from '@/activities/components/CommentThreadTypeDropdown';
import { debounce } from '@/utils/debounce'; import { GET_COMMENT_THREAD } from '@/activities/queries';
import { PropertyBox } from '@/ui/editable-field/property-box/components/PropertyBox';
import { PropertyBoxItem } from '@/ui/editable-field/property-box/components/PropertyBoxItem';
import { IconArrowUpRight } from '@/ui/icon/index';
import { import {
useGetCommentThreadQuery, useGetCommentThreadQuery,
useUpdateCommentThreadMutation, useUpdateCommentThreadMutation,
} from '~/generated/graphql'; } from '~/generated/graphql';
import { debounce } from '~/utils/debounce';
import { CommentThreadBodyEditor } from '../comment-thread/CommentThreadBodyEditor';
import { CommentThreadComments } from '../comment-thread/CommentThreadComments';
import { CommentThreadRelationPicker } from '../comment-thread/CommentThreadRelationPicker';
import { CommentThreadTypeDropdown } from '../comment-thread/CommentThreadTypeDropdown';
import { CommentThreadActionBar } from './CommentThreadActionBar'; import { CommentThreadActionBar } from './CommentThreadActionBar';

10
front/src/modules/comments/components/right-drawer/CommentThreadActionBar.tsx → front/src/modules/activities/right-drawer/components/CommentThreadActionBar.tsx
View File

@ -3,12 +3,12 @@ import { useTheme } from '@emotion/react';
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { useRecoilState } from 'recoil'; import { useRecoilState } from 'recoil';
import { GET_COMMENT_THREADS_BY_TARGETS } from '@/comments/services'; import { GET_COMMENT_THREADS_BY_TARGETS } from '@/activities/queries';
import { GET_COMPANIES } from '@/companies/queries'; import { GET_COMPANIES } from '@/companies/queries';
import { GET_PEOPLE } from '@/people/services'; import { GET_PEOPLE } from '@/people/queries';
import { Button } from '@/ui/components/buttons/Button'; import { Button } from '@/ui/button/components/Button';
import { IconTrash } from '@/ui/icons'; import { IconTrash } from '@/ui/icon';
import { isRightDrawerOpenState } from '@/ui/layout/right-drawer/states/isRightDrawerOpenState'; import { isRightDrawerOpenState } from '@/ui/right-drawer/states/isRightDrawerOpenState';
import { useDeleteCommentThreadMutation } from '~/generated/graphql'; import { useDeleteCommentThreadMutation } from '~/generated/graphql';
const StyledContainer = styled.div` const StyledContainer = styled.div`

11
front/src/modules/comments/components/right-drawer/RightDrawerTimeline.tsx → front/src/modules/activities/right-drawer/components/RightDrawerTimeline.tsx
View File

@ -1,11 +1,10 @@
import { useRecoilState } from 'recoil'; import { useRecoilState } from 'recoil';
import { commentableEntityArrayState } from '@/comments/states/commentableEntityArrayState'; import { commentableEntityArrayState } from '@/activities/states/commentableEntityArrayState';
import { RightDrawerBody } from '@/ui/layout/right-drawer/components/RightDrawerBody'; import { Timeline } from '@/activities/timeline/components/Timeline';
import { RightDrawerPage } from '@/ui/layout/right-drawer/components/RightDrawerPage'; import { RightDrawerBody } from '@/ui/right-drawer/components/RightDrawerBody';
import { RightDrawerTopBar } from '@/ui/layout/right-drawer/components/RightDrawerTopBar'; import { RightDrawerPage } from '@/ui/right-drawer/components/RightDrawerPage';
import { RightDrawerTopBar } from '@/ui/right-drawer/components/RightDrawerTopBar';
import { Timeline } from '../timeline/Timeline';
export function RightDrawerTimeline() { export function RightDrawerTimeline() {
const [commentableEntityArray] = useRecoilState(commentableEntityArrayState); const [commentableEntityArray] = useRecoilState(commentableEntityArrayState);

8
front/src/modules/comments/components/right-drawer/create/RightDrawerCreateCommentThread.tsx → front/src/modules/activities/right-drawer/components/create/RightDrawerCreateCommentThread.tsx
View File

@ -1,9 +1,9 @@
import { useRecoilValue } from 'recoil'; import { useRecoilValue } from 'recoil';
import { viewableCommentThreadIdState } from '@/comments/states/viewableCommentThreadIdState'; import { viewableCommentThreadIdState } from '@/activities/states/viewableCommentThreadIdState';
import { RightDrawerBody } from '@/ui/layout/right-drawer/components/RightDrawerBody'; import { RightDrawerBody } from '@/ui/right-drawer/components/RightDrawerBody';
import { RightDrawerPage } from '@/ui/layout/right-drawer/components/RightDrawerPage'; import { RightDrawerPage } from '@/ui/right-drawer/components/RightDrawerPage';
import { RightDrawerTopBar } from '@/ui/layout/right-drawer/components/RightDrawerTopBar'; import { RightDrawerTopBar } from '@/ui/right-drawer/components/RightDrawerTopBar';
import { CommentThread } from '../CommentThread'; import { CommentThread } from '../CommentThread';

8
front/src/modules/comments/components/right-drawer/edit/RightDrawerEditCommentThread.tsx → front/src/modules/activities/right-drawer/components/edit/RightDrawerEditCommentThread.tsx
View File

@ -1,9 +1,9 @@
import { useRecoilValue } from 'recoil'; import { useRecoilValue } from 'recoil';
import { viewableCommentThreadIdState } from '@/comments/states/viewableCommentThreadIdState'; import { viewableCommentThreadIdState } from '@/activities/states/viewableCommentThreadIdState';
import { RightDrawerBody } from '@/ui/layout/right-drawer/components/RightDrawerBody'; import { RightDrawerBody } from '@/ui/right-drawer/components/RightDrawerBody';
import { RightDrawerPage } from '@/ui/layout/right-drawer/components/RightDrawerPage'; import { RightDrawerPage } from '@/ui/right-drawer/components/RightDrawerPage';
import { RightDrawerTopBar } from '@/ui/layout/right-drawer/components/RightDrawerTopBar'; import { RightDrawerTopBar } from '@/ui/right-drawer/components/RightDrawerTopBar';
import { CommentThread } from '../CommentThread'; import { CommentThread } from '../CommentThread';

0
front/src/modules/comments/states/commentableEntityArrayState.ts → front/src/modules/activities/states/commentableEntityArrayState.ts
View File

0
front/src/modules/comments/states/viewableCommentThreadIdState.ts → front/src/modules/activities/states/viewableCommentThreadIdState.ts
View File

0
front/src/modules/comments/components/table/CellCommentChip.tsx → front/src/modules/activities/table/components/CellCommentChip.tsx
View File

2
front/src/modules/comments/components/table/CommentChip.tsx → front/src/modules/activities/table/components/CommentChip.tsx
View File

@ -1,7 +1,7 @@
import { useTheme } from '@emotion/react'; import { useTheme } from '@emotion/react';
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { IconComment } from '@/ui/icons'; import { IconComment } from '@/ui/icon';
export type CommentChipProps = { export type CommentChipProps = {
count: number; count: number;

0
front/src/modules/comments/components/table/__stories__/CommentChip.stories.tsx → front/src/modules/activities/table/components/__stories__/CommentChip.stories.tsx
View File

21
front/src/modules/comments/components/timeline/Timeline.tsx → front/src/modules/activities/timeline/components/Timeline.tsx
View File

@ -2,22 +2,21 @@ import React from 'react';
import { Tooltip } from 'react-tooltip'; import { Tooltip } from 'react-tooltip';
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { useOpenCommentThreadRightDrawer } from '@/comments/hooks/useOpenCommentThreadRightDrawer'; import { CommentThreadCreateButton } from '@/activities/components/CommentThreadCreateButton';
import { useOpenCreateCommentThreadDrawer } from '@/comments/hooks/useOpenCreateCommentThreadDrawer'; import { useOpenCommentThreadRightDrawer } from '@/activities/hooks/useOpenCommentThreadRightDrawer';
import { CommentableEntity } from '@/comments/types/CommentableEntity'; import { useOpenCreateCommentThreadDrawer } from '@/activities/hooks/useOpenCreateCommentThreadDrawer';
import { CommentThreadForDrawer } from '@/comments/types/CommentThreadForDrawer'; import { CommentableEntity } from '@/activities/types/CommentableEntity';
import { IconNotes } from '@/ui/icons/index'; import { CommentThreadForDrawer } from '@/activities/types/CommentThreadForDrawer';
import { import { IconNotes } from '@/ui/icon/index';
beautifyExactDate,
beautifyPastDateRelativeToNow,
} from '@/utils/datetime/date-utils';
import { import {
ActivityType, ActivityType,
SortOrder, SortOrder,
useGetCommentThreadsByTargetsQuery, useGetCommentThreadsByTargetsQuery,
} from '~/generated/graphql'; } from '~/generated/graphql';
import {
import { CommentThreadCreateButton } from '../comment-thread/CommentThreadCreateButton'; beautifyExactDate,
beautifyPastDateRelativeToNow,
} from '~/utils/date-utils';
const StyledMainContainer = styled.div` const StyledMainContainer = styled.div`
align-items: flex-start; align-items: flex-start;

0
front/src/modules/comments/types/CommentForDrawer.ts → front/src/modules/activities/types/CommentForDrawer.ts
View File

0
front/src/modules/comments/types/CommentThreadForDrawer.ts → front/src/modules/activities/types/CommentThreadForDrawer.ts
View File

0
front/src/modules/comments/types/CommentableEntity.ts → front/src/modules/activities/types/CommentableEntity.ts
View File

2
front/src/modules/comments/types/CommentableEntityForSelect.ts → front/src/modules/activities/types/CommentableEntityForSelect.ts
View File

@ -1,4 +1,4 @@
import { EntityForSelect } from '@/relation-picker/types/EntityForSelect'; import { EntityForSelect } from '@/ui/relation-picker/types/EntityForSelect';
import { CommentableType } from '~/generated/graphql'; import { CommentableType } from '~/generated/graphql';
export type CommentableEntityForSelect = EntityForSelect & { export type CommentableEntityForSelect = EntityForSelect & {

2
front/src/modules/ui/utils/flatMapAndSortEntityForSelectArrayByName.ts → front/src/modules/activities/utils/flatMapAndSortEntityForSelectArrayByName.ts
View File

@ -1,4 +1,4 @@
import { EntityForSelect } from '@/relation-picker/types/EntityForSelect'; import { EntityForSelect } from '@/ui/relation-picker/types/EntityForSelect';
export function flatMapAndSortEntityForSelectArrayOfArrayByName< export function flatMapAndSortEntityForSelectArrayOfArrayByName<
T extends EntityForSelect, T extends EntityForSelect,

2
front/src/modules/analytics/hooks/useTrackPageView.ts
View File

@ -1,7 +1,7 @@
import { useEffect } from 'react'; import { useEffect } from 'react';
import { useLocation } from 'react-router-dom'; import { useLocation } from 'react-router-dom';
import usePrevious from '@/utils/hooks/usePrevious'; import usePrevious from '~/hooks/usePrevious';
import { useEventTracker } from './useEventTracker'; import { useEventTracker } from './useEventTracker';

0
front/src/modules/analytics/services/index.ts → front/src/modules/analytics/queries/index.ts
View File

0
front/src/providers/apollo/ApolloProvider.tsx → front/src/modules/apollo/components/ApolloProvider.tsx
View File

2
front/src/modules/apollo/hooks/useApolloFactory.ts
View File

@ -4,8 +4,8 @@ import { useRecoilState } from 'recoil';
import { tokenPairState } from '@/auth/states/tokenPairState'; import { tokenPairState } from '@/auth/states/tokenPairState';
import { isDebugModeState } from '@/client-config/states/isDebugModeState'; import { isDebugModeState } from '@/client-config/states/isDebugModeState';
import { useUpdateEffect } from '@/utils/hooks/useUpdateEffect';
import { CommentThreadTarget } from '~/generated/graphql'; import { CommentThreadTarget } from '~/generated/graphql';
import { useUpdateEffect } from '~/hooks/useUpdateEffect';
import { ApolloFactory } from '../services/apollo.factory'; import { ApolloFactory } from '../services/apollo.factory';

6
front/src/modules/apollo/services/apollo.factory.ts
View File

@ -14,10 +14,10 @@ import { createUploadLink } from 'apollo-upload-client';
import { renewToken } from '@/auth/services/AuthService'; import { renewToken } from '@/auth/services/AuthService';
import { AuthTokenPair } from '~/generated/graphql'; import { AuthTokenPair } from '~/generated/graphql';
import { assertNotNull } from '~/utils/assert';
import { loggerLink } from '../../utils/apollo-logger'; import { ApolloManager } from '../types/apolloManager.interface';
import { assertNotNull } from '../../utils/assert'; import { loggerLink } from '../utils';
import { ApolloManager } from '../interfaces/apolloManager.interface';
const logger = loggerLink(() => 'Twenty'); const logger = loggerLink(() => 'Twenty');

0
front/src/modules/apollo/interfaces/apolloManager.interface.ts → front/src/modules/apollo/types/apolloManager.interface.ts
View File

0
front/src/modules/utils/apollo-logger/operation-type.ts → front/src/modules/apollo/types/operation-type.ts
View File

2
front/src/modules/utils/apollo-logger/format-title.ts → front/src/modules/apollo/utils/format-title.ts
View File

@ -1,4 +1,4 @@
import { OperationType } from './operation-type'; import { OperationType } from '../types/operation-type';
const operationTypeColors = { const operationTypeColors = {
query: '#03A9F4', query: '#03A9F4',

0
front/src/modules/utils/apollo-logger/index.ts → front/src/modules/apollo/utils/index.ts
View File

2
front/src/modules/auth/components/ui/Modal.tsx
View File

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { Modal as UIModal } from '@/ui/components/modal/Modal'; import { Modal as UIModal } from '@/ui/modal/components/Modal';
type Props = React.ComponentProps<'div'>; type Props = React.ComponentProps<'div'>;

2
front/src/modules/auth/components/ui/Title.tsx
View File

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { AnimatedTextWord } from '@/ui/components/motion/AnimatedTextWord'; import { AnimatedTextWord } from '@/ui/animation/components/AnimatedTextWord';
type Props = React.PropsWithChildren & { type Props = React.PropsWithChildren & {
animate?: boolean; animate?: boolean;

0
front/src/modules/auth/services/index.ts → front/src/modules/auth/queries/index.ts
View File

0
front/src/modules/auth/services/select.ts → front/src/modules/auth/queries/select.ts
View File

0
front/src/modules/auth/services/update.ts → front/src/modules/auth/queries/update.ts
View File

2
front/src/modules/auth/services/AuthService.ts
View File

@ -6,7 +6,7 @@ import {
UriFunction, UriFunction,
} from '@apollo/client'; } from '@apollo/client';
import { loggerLink } from '@/utils/apollo-logger'; import { loggerLink } from '@/apollo/utils';
import { import {
AuthTokenPair, AuthTokenPair,
RenewTokenDocument, RenewTokenDocument,

2
front/src/modules/auth/states/tokenPairState.ts
View File

@ -1,7 +1,7 @@
import { atom, AtomEffect } from 'recoil'; import { atom, AtomEffect } from 'recoil';
import { cookieStorage } from '@/utils/cookie-storage';
import { AuthTokenPair } from '~/generated/graphql'; import { AuthTokenPair } from '~/generated/graphql';
import { cookieStorage } from '~/utils/cookie-storage';
const cookieStorageEffect = const cookieStorageEffect =
(key: string): AtomEffect<AuthTokenPair | null> => (key: string): AtomEffect<AuthTokenPair | null> =>

0
front/src/providers/client-config/ClientConfigProvider.tsx → front/src/modules/client-config/components/ClientConfigProvider.tsx
View File

8
front/src/modules/command-menu/components/CommandMenu.tsx
View File

@ -3,9 +3,9 @@ import { useTheme } from '@emotion/react';
import { useRecoilValue } from 'recoil'; import { useRecoilValue } from 'recoil';
import { useFilteredSearchCompanyQuery } from '@/companies/queries'; import { useFilteredSearchCompanyQuery } from '@/companies/queries';
import { useScopedHotkeys } from '@/lib/hotkeys/hooks/useScopedHotkeys'; import { useFilteredSearchPeopleQuery } from '@/people/queries';
import { AppHotkeyScope } from '@/lib/hotkeys/types/AppHotkeyScope'; import { useScopedHotkeys } from '@/ui/hotkey/hooks/useScopedHotkeys';
import { useFilteredSearchPeopleQuery } from '@/people/services'; import { AppHotkeyScope } from '@/ui/hotkey/types/AppHotkeyScope';
import { Avatar } from '@/users/components/Avatar'; import { Avatar } from '@/users/components/Avatar';
import { useCommandMenu } from '../hooks/useCommandMenu'; import { useCommandMenu } from '../hooks/useCommandMenu';
@ -49,7 +49,7 @@ export function CommandMenu() {
TODO: Allow performing actions on page through CommandBar TODO: Allow performing actions on page through CommandBar
import { useMatch, useResolvedPath } from 'react-router-dom'; import { useMatch, useResolvedPath } from 'react-router-dom';
import { IconBuildingSkyscraper, IconUser } from '@/ui/icons'; import { IconBuildingSkyscraper, IconUser } from '@/ui/icon';
const createSection = ( const createSection = (
<StyledGroup heading="Create"> <StyledGroup heading="Create">

2
front/src/modules/command-menu/components/CommandMenuItem.tsx
View File

@ -2,7 +2,7 @@ import React from 'react';
import { ReactNode } from 'react'; import { ReactNode } from 'react';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { IconArrowUpRight } from '@/ui/icons'; import { IconArrowUpRight } from '@/ui/icon';
import { useCommandMenu } from '../hooks/useCommandMenu'; import { useCommandMenu } from '../hooks/useCommandMenu';

4
front/src/modules/command-menu/hooks/useCommandMenu.ts
View File

@ -1,7 +1,7 @@
import { useRecoilState } from 'recoil'; import { useRecoilState } from 'recoil';
import { usePreviousHotkeyScope } from '@/lib/hotkeys/hooks/usePreviousHotkeyScope'; import { usePreviousHotkeyScope } from '@/ui/hotkey/hooks/usePreviousHotkeyScope';
import { AppHotkeyScope } from '@/lib/hotkeys/types/AppHotkeyScope'; import { AppHotkeyScope } from '@/ui/hotkey/types/AppHotkeyScope';
import { isCommandMenuOpenedState } from '../states/isCommandMenuOpenedState'; import { isCommandMenuOpenedState } from '../states/isCommandMenuOpenedState';

60
front/src/modules/comments/components/CommentThreadTypeDropdown.tsx Normal file
View File

@ -0,0 +1,60 @@
import {
DropdownButton,
DropdownOptionType,
} from '@/ui/button/components/DropdownButton';
import { IconCheck, IconNotes } from '@/ui/icon';
import {
ActivityType,
CommentThread,
useUpdateCommentThreadMutation,
} from '~/generated/graphql';
type OwnProps = {
commentThread: Pick<CommentThread, 'id' | 'type'>;
};
export function CommentThreadTypeDropdown({ commentThread }: OwnProps) {
const [updateCommentThreadMutation] = useUpdateCommentThreadMutation();
const options: DropdownOptionType[] = [
{ label: 'Note', key: 'note', icon: <IconNotes /> },
{ label: 'Task', key: 'task', icon: <IconCheck /> },
];
function getSelectedOptionKey() {
if (commentThread.type === ActivityType.Note) {
return 'note';
} else if (commentThread.type === ActivityType.Task) {
return 'task';
} else {
return undefined;
}
}
const convertSelectionOptionKeyToActivityType = (key: string) => {
switch (key) {
case 'note':
return ActivityType.Note;
case 'task':
return ActivityType.Task;
default:
return undefined;
}
};
const handleSelect = (selectedOption: DropdownOptionType) => {
updateCommentThreadMutation({
variables: {
id: commentThread.id,
type: convertSelectionOptionKeyToActivityType(selectedOption.key),
},
});
};
return (
<DropdownButton
options={options}
onSelection={handleSelect}
selectedOptionKey={getSelectedOptionKey()}
/>
);
}

2
front/src/modules/companies/__stories__/Board.stories.tsx
View File

@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react'; import { Meta, StoryObj } from '@storybook/react';
import { companyBoardOptions } from '@/companies/components/companyBoardOptions'; import { companyBoardOptions } from '@/companies/components/companyBoardOptions';
import { EntityBoard } from '@/pipeline-progress/components/EntityBoard'; import { EntityBoard } from '@/pipeline/components/EntityBoard';
import { BoardDecorator } from '~/testing/decorators'; import { BoardDecorator } from '~/testing/decorators';
import { graphqlMocks } from '~/testing/graphqlMocks'; import { graphqlMocks } from '~/testing/graphqlMocks';
import { getRenderWrapperForComponent } from '~/testing/renderWrappers'; import { getRenderWrapperForComponent } from '~/testing/renderWrappers';

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

@ -1,7 +1,7 @@
import { PersonChip } from '@/people/components/PersonChip'; import { PersonChip } from '@/people/components/PersonChip';
import { RelationPickerHotkeyScope } from '@/relation-picker/types/RelationPickerHotkeyScope'; import { RelationPickerHotkeyScope } from '@/ui/relation-picker/types/RelationPickerHotkeyScope';
import { EditableCell } from '@/ui/components/editable-cell/EditableCell'; import { EditableCell } from '@/ui/table/editable-cell/components/EditableCell';
import { useEditableCell } from '@/ui/components/editable-cell/hooks/useEditableCell'; import { useEditableCell } from '@/ui/table/editable-cell/hooks/useEditableCell';
import { Company, User } from '~/generated/graphql'; import { Company, User } from '~/generated/graphql';
import { CompanyAccountOwnerPicker } from './CompanyAccountOwnerPicker'; import { CompanyAccountOwnerPicker } from './CompanyAccountOwnerPicker';

10
front/src/modules/companies/components/CompanyAccountOwnerPicker.tsx
View File

@ -1,9 +1,9 @@
import { useRecoilScopedState } from '@/recoil-scope/hooks/useRecoilScopedState';
import { SingleEntitySelect } from '@/relation-picker/components/SingleEntitySelect';
import { relationPickerSearchFilterScopedState } from '@/relation-picker/states/relationPickerSearchFilterScopedState';
import { EntityForSelect } from '@/relation-picker/types/EntityForSelect';
import { Entity } from '@/relation-picker/types/EntityTypeForSelect';
import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery'; import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery';
import { useRecoilScopedState } from '@/ui/recoil-scope/hooks/useRecoilScopedState';
import { SingleEntitySelect } from '@/ui/relation-picker/components/SingleEntitySelect';
import { relationPickerSearchFilterScopedState } from '@/ui/relation-picker/states/relationPickerSearchFilterScopedState';
import { EntityForSelect } from '@/ui/relation-picker/types/EntityForSelect';
import { Entity } from '@/ui/relation-picker/types/EntityTypeForSelect';
import { import {
Company, Company,
User, User,

22
front/src/modules/companies/components/CompanyBoardCard.tsx
View File

@ -2,24 +2,24 @@ import { useCallback } from 'react';
import { getOperationName } from '@apollo/client/utilities'; import { getOperationName } from '@apollo/client/utilities';
import { useTheme } from '@emotion/react'; import { useTheme } from '@emotion/react';
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { IconCurrencyDollar } from '@tabler/icons-react';
import { useRecoilState } from 'recoil'; import { useRecoilState } from 'recoil';
import { companyProgressesFamilyState } from '@/companies/states/companyProgressesFamilyState'; import { companyProgressesFamilyState } from '@/companies/states/companyProgressesFamilyState';
import { GET_PIPELINES } from '@/pipeline-progress/services'; import { GET_PIPELINES } from '@/pipeline/queries';
import { BoardCardContext } from '@/pipeline-progress/states/BoardCardContext'; import { BoardCardContext } from '@/pipeline/states/BoardCardContext';
import { pipelineProgressIdScopedState } from '@/pipeline-progress/states/pipelineProgressIdScopedState'; import { pipelineProgressIdScopedState } from '@/pipeline/states/pipelineProgressIdScopedState';
import { selectedBoardCardsState } from '@/pipeline-progress/states/selectedBoardCardsState'; import { selectedBoardCardsState } from '@/pipeline/states/selectedBoardCardsState';
import { useRecoilScopedState } from '@/recoil-scope/hooks/useRecoilScopedState'; import { BoardCardEditableFieldDate } from '@/ui/board/card-field/components/BoardCardEditableFieldDate';
import { BoardCardEditableFieldDate } from '@/ui/board-card-field-inputs/components/BoardCardEditableFieldDate'; import { BoardCardEditableFieldText } from '@/ui/board/card-field/components/BoardCardEditableFieldText';
import { BoardCardEditableFieldText } from '@/ui/board-card-field-inputs/components/BoardCardEditableFieldText'; import { IconCurrencyDollar } from '@/ui/icon';
import { Checkbox } from '@/ui/components/form/Checkbox'; import { IconCalendarEvent } from '@/ui/icon';
import { IconCalendarEvent } from '@/ui/icons'; import { Checkbox } from '@/ui/input/components/Checkbox';
import { getLogoUrlFromDomainName } from '@/utils/utils'; import { useRecoilScopedState } from '@/ui/recoil-scope/hooks/useRecoilScopedState';
import { import {
PipelineProgress, PipelineProgress,
useUpdateOnePipelineProgressMutation, useUpdateOnePipelineProgressMutation,
} from '~/generated/graphql'; } from '~/generated/graphql';
import { getLogoUrlFromDomainName } from '~/utils';
const StyledBoardCard = styled.div<{ selected: boolean }>` const StyledBoardCard = styled.div<{ selected: boolean }>`
background-color: ${({ theme, selected }) => background-color: ${({ theme, selected }) =>

8
front/src/modules/companies/components/CompanyEditableNameCell.tsx
View File

@ -1,14 +1,14 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { CellCommentChip } from '@/comments/components/table/CellCommentChip'; import { useOpenTimelineRightDrawer } from '@/activities/hooks/useOpenTimelineRightDrawer';
import { useOpenTimelineRightDrawer } from '@/comments/hooks/useOpenTimelineRightDrawer'; import { CellCommentChip } from '@/activities/table/components/CellCommentChip';
import { EditableCellChip } from '@/ui/components/editable-cell/types/EditableChip'; import { EditableCellChip } from '@/ui/table/editable-cell/types/EditableChip';
import { getLogoUrlFromDomainName } from '@/utils/utils';
import { import {
CommentableType, CommentableType,
GetCompaniesQuery, GetCompaniesQuery,
useUpdateCompanyMutation, useUpdateCompanyMutation,
} from '~/generated/graphql'; } from '~/generated/graphql';
import { getLogoUrlFromDomainName } from '~/utils';
import { CompanyChip } from './CompanyChip'; import { CompanyChip } from './CompanyChip';

12
front/src/modules/companies/components/FilterDropdownCompanySearchSelect.tsx
View File

@ -1,9 +1,9 @@
import { FilterDropdownEntitySearchSelect } from '@/lib/filters-and-sorts/components/FilterDropdownEntitySearchSelect'; import { FilterDropdownEntitySearchSelect } from '@/ui/filter-n-sort/components/FilterDropdownEntitySearchSelect';
import { filterDropdownSearchInputScopedState } from '@/lib/filters-and-sorts/states/filterDropdownSearchInputScopedState'; import { filterDropdownSearchInputScopedState } from '@/ui/filter-n-sort/states/filterDropdownSearchInputScopedState';
import { filterDropdownSelectedEntityIdScopedState } from '@/lib/filters-and-sorts/states/filterDropdownSelectedEntityIdScopedState'; import { filterDropdownSelectedEntityIdScopedState } from '@/ui/filter-n-sort/states/filterDropdownSelectedEntityIdScopedState';
import { useRecoilScopedState } from '@/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedState } from '@/ui/recoil-scope/hooks/useRecoilScopedState';
import { useRecoilScopedValue } from '@/recoil-scope/hooks/useRecoilScopedValue'; import { useRecoilScopedValue } from '@/ui/recoil-scope/hooks/useRecoilScopedValue';
import { TableContext } from '@/ui/tables/states/TableContext'; import { TableContext } from '@/ui/table/states/TableContext';
import { useFilteredSearchCompanyQuery } from '../queries'; import { useFilteredSearchCompanyQuery } from '../queries';

6
front/src/pages/opportunities/HookCompanyBoard.tsx → front/src/modules/companies/components/HookCompanyBoard.tsx
View File

@ -7,9 +7,9 @@ import {
CompanyProgress, CompanyProgress,
PipelineProgressForBoard, PipelineProgressForBoard,
} from '@/companies/types/CompanyProgress'; } from '@/companies/types/CompanyProgress';
import { boardState } from '@/pipeline-progress/states/boardState'; import { boardState } from '@/pipeline/states/boardState';
import { currentPipelineState } from '@/pipeline-progress/states/currentPipelineState'; import { currentPipelineState } from '@/pipeline/states/currentPipelineState';
import { isBoardLoadedState } from '@/pipeline-progress/states/isBoardLoadedState'; import { isBoardLoadedState } from '@/pipeline/states/isBoardLoadedState';
import { BoardPipelineStageColumn } from '@/ui/board/components/Board'; import { BoardPipelineStageColumn } from '@/ui/board/components/Board';
import { import {
Pipeline, Pipeline,

20
front/src/modules/companies/components/NewCompanyProgressButton.tsx
View File

@ -3,18 +3,18 @@ import { getOperationName } from '@apollo/client/utilities';
import { useRecoilState } from 'recoil'; import { useRecoilState } from 'recoil';
import { v4 as uuidv4 } from 'uuid'; import { v4 as uuidv4 } from 'uuid';
import { usePreviousHotkeyScope } from '@/lib/hotkeys/hooks/usePreviousHotkeyScope'; import { GET_PIPELINES } from '@/pipeline/queries';
import { GET_PIPELINES } from '@/pipeline-progress/services'; import { BoardColumnContext } from '@/pipeline/states/BoardColumnContext';
import { BoardColumnContext } from '@/pipeline-progress/states/BoardColumnContext'; import { boardState } from '@/pipeline/states/boardState';
import { boardState } from '@/pipeline-progress/states/boardState'; import { currentPipelineState } from '@/pipeline/states/currentPipelineState';
import { currentPipelineState } from '@/pipeline-progress/states/currentPipelineState'; import { pipelineStageIdScopedState } from '@/pipeline/states/pipelineStageIdScopedState';
import { pipelineStageIdScopedState } from '@/pipeline-progress/states/pipelineStageIdScopedState';
import { useRecoilScopedState } from '@/recoil-scope/hooks/useRecoilScopedState';
import { SingleEntitySelect } from '@/relation-picker/components/SingleEntitySelect';
import { relationPickerSearchFilterScopedState } from '@/relation-picker/states/relationPickerSearchFilterScopedState';
import { RelationPickerHotkeyScope } from '@/relation-picker/types/RelationPickerHotkeyScope';
import { BoardPipelineStageColumn } from '@/ui/board/components/Board'; import { BoardPipelineStageColumn } from '@/ui/board/components/Board';
import { NewButton } from '@/ui/board/components/NewButton'; import { NewButton } from '@/ui/board/components/NewButton';
import { usePreviousHotkeyScope } from '@/ui/hotkey/hooks/usePreviousHotkeyScope';
import { useRecoilScopedState } from '@/ui/recoil-scope/hooks/useRecoilScopedState';
import { SingleEntitySelect } from '@/ui/relation-picker/components/SingleEntitySelect';
import { relationPickerSearchFilterScopedState } from '@/ui/relation-picker/states/relationPickerSearchFilterScopedState';
import { RelationPickerHotkeyScope } from '@/ui/relation-picker/types/RelationPickerHotkeyScope';
import { import {
PipelineProgressableType, PipelineProgressableType,
useCreateOnePipelineProgressMutation, useCreateOnePipelineProgressMutation,

5
front/src/modules/companies/components/companyBoardOptions.tsx
View File

@ -1,8 +1,7 @@
import { CompanyBoardCard } from '@/companies/components/CompanyBoardCard'; import { CompanyBoardCard } from '@/companies/components/CompanyBoardCard';
import { NewCompanyProgressButton } from '@/companies/components/NewCompanyProgressButton'; import { NewCompanyProgressButton } from '@/companies/components/NewCompanyProgressButton';
import { RecoilScope } from '@/recoil-scope/components/RecoilScope'; import { BoardOptions } from '@/pipeline/types/BoardOptions';
import { RecoilScope } from '@/ui/recoil-scope/components/RecoilScope';
import { BoardOptions } from '../../pipeline-progress/types/BoardOptions';
export const companyBoardOptions: BoardOptions = { export const companyBoardOptions: BoardOptions = {
newCardComponent: ( newCardComponent: (

13
front/src/modules/companies/fields/components/CompanyAccountOwnerEditableField.tsx → front/src/modules/companies/editable-field/components/CompanyAccountOwnerEditableField.tsx
View File

@ -1,12 +1,11 @@
import { IconUserCircle } from '@tabler/icons-react';
import { PersonChip } from '@/people/components/PersonChip'; import { PersonChip } from '@/people/components/PersonChip';
import { RecoilScope } from '@/recoil-scope/components/RecoilScope'; import { PageHotkeyScope } from '@/types/PageHotkeyScope';
import { RelationPickerHotkeyScope } from '@/relation-picker/types/RelationPickerHotkeyScope'; import { EditableField } from '@/ui/editable-field/components/EditableField';
import { EditableField } from '@/ui/editable-fields/components/EditableField'; import { FieldContext } from '@/ui/editable-field/states/FieldContext';
import { FieldContext } from '@/ui/editable-fields/states/FieldContext'; import { IconUserCircle } from '@/ui/icon';
import { RecoilScope } from '@/ui/recoil-scope/components/RecoilScope';
import { RelationPickerHotkeyScope } from '@/ui/relation-picker/types/RelationPickerHotkeyScope';
import { Company, User } from '~/generated/graphql'; import { Company, User } from '~/generated/graphql';
import { PageHotkeyScope } from '~/sync-hooks/types/PageHotkeyScope';
import { CompanyAccountOwnerPickerFieldEditMode } from './CompanyAccountOwnerPickerFieldEditMode'; import { CompanyAccountOwnerPickerFieldEditMode } from './CompanyAccountOwnerPickerFieldEditMode';

4
front/src/modules/companies/fields/components/CompanyAccountOwnerPickerFieldEditMode.tsx → front/src/modules/companies/editable-field/components/CompanyAccountOwnerPickerFieldEditMode.tsx
View File

@ -1,8 +1,8 @@
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { CompanyAccountOwnerPicker } from '@/companies/components/CompanyAccountOwnerPicker'; import { CompanyAccountOwnerPicker } from '@/companies/components/CompanyAccountOwnerPicker';
import { HotkeyScope } from '@/lib/hotkeys/types/HotkeyScope'; import { useEditableField } from '@/ui/editable-field/hooks/useEditableField';
import { useEditableField } from '@/ui/editable-fields/hooks/useEditableField'; import { HotkeyScope } from '@/ui/hotkey/types/HotkeyScope';
import { Company, User } from '~/generated/graphql'; import { Company, User } from '~/generated/graphql';
const CompanyAccountOwnerPickerContainer = styled.div` const CompanyAccountOwnerPickerContainer = styled.div`

10
front/src/modules/companies/fields/components/CompanyAddressEditableField.tsx → front/src/modules/companies/editable-field/components/CompanyAddressEditableField.tsx
View File

@ -1,10 +1,10 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { IconMap } from '@tabler/icons-react';
import { RecoilScope } from '@/recoil-scope/components/RecoilScope'; import { EditableField } from '@/ui/editable-field/components/EditableField';
import { EditableField } from '@/ui/editable-fields/components/EditableField'; import { FieldContext } from '@/ui/editable-field/states/FieldContext';
import { FieldContext } from '@/ui/editable-fields/states/FieldContext'; import { IconMap } from '@/ui/icon';
import { InplaceInputText } from '@/ui/inplace-inputs/components/InplaceInputText'; import { InplaceInputText } from '@/ui/inplace-input/components/InplaceInputText';
import { RecoilScope } from '@/ui/recoil-scope/components/RecoilScope';
import { Company, useUpdateCompanyMutation } from '~/generated/graphql'; import { Company, useUpdateCompanyMutation } from '~/generated/graphql';
type OwnProps = { type OwnProps = {

14
front/src/modules/companies/fields/components/CompanyCreatedAtEditableField.tsx → front/src/modules/companies/editable-field/components/CompanyCreatedAtEditableField.tsx
View File

@ -1,13 +1,13 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { IconCalendar } from '@tabler/icons-react';
import { RecoilScope } from '@/recoil-scope/components/RecoilScope'; import { EditableField } from '@/ui/editable-field/components/EditableField';
import { EditableField } from '@/ui/editable-fields/components/EditableField'; import { FieldContext } from '@/ui/editable-field/states/FieldContext';
import { FieldContext } from '@/ui/editable-fields/states/FieldContext'; import { EditableFieldEditModeDate } from '@/ui/editable-field/variants/components/EditableFieldEditModeDate';
import { EditableFieldEditModeDate } from '@/ui/editable-fields/variants/components/EditableFieldEditModeDate'; import { IconCalendar } from '@/ui/icon';
import { parseDate } from '@/utils/datetime/date-utils'; import { RecoilScope } from '@/ui/recoil-scope/components/RecoilScope';
import { formatToHumanReadableDate } from '@/utils/utils';
import { Company, useUpdateCompanyMutation } from '~/generated/graphql'; import { Company, useUpdateCompanyMutation } from '~/generated/graphql';
import { formatToHumanReadableDate } from '~/utils';
import { parseDate } from '~/utils/date-utils';
type OwnProps = { type OwnProps = {
company: Pick<Company, 'id' | 'createdAt'>; company: Pick<Company, 'id' | 'createdAt'>;

12
front/src/modules/companies/fields/components/CompanyDomainNameEditableField.tsx → front/src/modules/companies/editable-field/components/CompanyDomainNameEditableField.tsx
View File

@ -1,11 +1,11 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { IconLink } from '@tabler/icons-react';
import { RecoilScope } from '@/recoil-scope/components/RecoilScope'; import { EditableField } from '@/ui/editable-field/components/EditableField';
import { EditableField } from '@/ui/editable-fields/components/EditableField'; import { FieldDisplayURL } from '@/ui/editable-field/components/FieldDisplayURL';
import { FieldDisplayURL } from '@/ui/editable-fields/components/FieldDisplayURL'; import { FieldContext } from '@/ui/editable-field/states/FieldContext';
import { FieldContext } from '@/ui/editable-fields/states/FieldContext'; import { IconLink } from '@/ui/icon';
import { InplaceInputText } from '@/ui/inplace-inputs/components/InplaceInputText'; import { InplaceInputText } from '@/ui/inplace-input/components/InplaceInputText';
import { RecoilScope } from '@/ui/recoil-scope/components/RecoilScope';
import { Company, useUpdateCompanyMutation } from '~/generated/graphql'; import { Company, useUpdateCompanyMutation } from '~/generated/graphql';
type OwnProps = { type OwnProps = {

10
front/src/modules/companies/fields/components/CompanyEmployeesEditableField.tsx → front/src/modules/companies/editable-field/components/CompanyEmployeesEditableField.tsx
View File

@ -1,10 +1,10 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { IconUsers } from '@tabler/icons-react';
import { RecoilScope } from '@/recoil-scope/components/RecoilScope'; import { EditableField } from '@/ui/editable-field/components/EditableField';
import { EditableField } from '@/ui/editable-fields/components/EditableField'; import { FieldContext } from '@/ui/editable-field/states/FieldContext';
import { FieldContext } from '@/ui/editable-fields/states/FieldContext'; import { IconUsers } from '@/ui/icon';
import { InplaceInputText } from '@/ui/inplace-inputs/components/InplaceInputText'; import { InplaceInputText } from '@/ui/inplace-input/components/InplaceInputText';
import { RecoilScope } from '@/ui/recoil-scope/components/RecoilScope';
import { Company, useUpdateCompanyMutation } from '~/generated/graphql'; import { Company, useUpdateCompanyMutation } from '~/generated/graphql';
type OwnProps = { type OwnProps = {

2
front/src/modules/companies/queries/__tests__/select.test.ts
View File

@ -1,4 +1,4 @@
import { reduceSortsToOrderBy } from '@/lib/filters-and-sorts/helpers'; import { reduceSortsToOrderBy } from '@/ui/filter-n-sort/helpers';
import { CompaniesSelectedSortType } from '../select'; import { CompaniesSelectedSortType } from '../select';

6
front/src/modules/companies/queries/select.ts
View File

@ -1,9 +1,8 @@
import { gql } from '@apollo/client'; import { gql } from '@apollo/client';
import { CommentableEntityForSelect } from '@/comments/types/CommentableEntityForSelect'; import { CommentableEntityForSelect } from '@/activities/types/CommentableEntityForSelect';
import { SelectedSortType } from '@/lib/filters-and-sorts/interfaces/sorts/interface';
import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery'; import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery';
import { getLogoUrlFromDomainName } from '@/utils/utils'; import { SelectedSortType } from '@/ui/filter-n-sort/types/interface';
import { import {
CommentableType, CommentableType,
CompanyOrderByWithRelationInput as Companies_Order_By, CompanyOrderByWithRelationInput as Companies_Order_By,
@ -12,6 +11,7 @@ import {
useGetCompaniesQuery, useGetCompaniesQuery,
useSearchCompanyQuery, useSearchCompanyQuery,
} from '~/generated/graphql'; } from '~/generated/graphql';
import { getLogoUrlFromDomainName } from '~/utils';
export type CompaniesSelectedSortType = SelectedSortType<Companies_Order_By>; export type CompaniesSelectedSortType = SelectedSortType<Companies_Order_By>;

4
front/src/modules/companies/table/components/CompanyEntityTableData.tsx
View File

@ -1,8 +1,8 @@
import { useRecoilState } from 'recoil'; import { useRecoilState } from 'recoil';
import { defaultOrderBy } from '@/companies/queries'; import { defaultOrderBy } from '@/companies/queries';
import { isFetchingEntityTableDataState } from '@/ui/tables/states/isFetchingEntityTableDataState'; import { isFetchingEntityTableDataState } from '@/ui/table/states/isFetchingEntityTableDataState';
import { tableRowIdsState } from '@/ui/tables/states/tableRowIdsState'; import { tableRowIdsState } from '@/ui/table/states/tableRowIdsState';
import { import {
PersonOrderByWithRelationInput, PersonOrderByWithRelationInput,
useGetCompaniesQuery, useGetCompaniesQuery,

4
front/src/modules/companies/table/components/CompanyEntityTableDataMocked.tsx
View File

@ -1,8 +1,8 @@
import { useEffect } from 'react'; import { useEffect } from 'react';
import { useRecoilState } from 'recoil'; import { useRecoilState } from 'recoil';
import { isFetchingEntityTableDataState } from '@/ui/tables/states/isFetchingEntityTableDataState'; import { isFetchingEntityTableDataState } from '@/ui/table/states/isFetchingEntityTableDataState';
import { tableRowIdsState } from '@/ui/tables/states/tableRowIdsState'; import { tableRowIdsState } from '@/ui/table/states/tableRowIdsState';
import { mockedCompaniesData } from '~/testing/mock-data/companies'; import { mockedCompaniesData } from '~/testing/mock-data/companies';
import { useSetCompanyEntityTable } from '../hooks/useSetCompanyEntityTable'; import { useSetCompanyEntityTable } from '../hooks/useSetCompanyEntityTable';

21
front/src/pages/companies/CompanyTable.tsx → front/src/modules/companies/table/components/CompanyTable.tsx
View File

@ -1,20 +1,19 @@
import { useCallback, useMemo, useState } from 'react'; import { useCallback, useMemo, useState } from 'react';
import { IconList } from '@tabler/icons-react';
import { CompaniesSelectedSortType, defaultOrderBy } from '@/companies/queries'; import { CompaniesSelectedSortType, defaultOrderBy } from '@/companies/queries';
import { companyColumns } from '@/companies/table/components/companyColumns'; import { companyColumns } from '@/companies/table/components/companyColumns';
import { CompanyEntityTableData } from '@/companies/table/components/CompanyEntityTableData'; import { CompanyEntityTableData } from '@/companies/table/components/CompanyEntityTableData';
import { reduceSortsToOrderBy } from '@/lib/filters-and-sorts/helpers'; import { reduceSortsToOrderBy } from '@/ui/filter-n-sort/helpers';
import { filtersScopedState } from '@/lib/filters-and-sorts/states/filtersScopedState'; import { filtersScopedState } from '@/ui/filter-n-sort/states/filtersScopedState';
import { turnFilterIntoWhereClause } from '@/lib/filters-and-sorts/utils/turnFilterIntoWhereClause'; import { turnFilterIntoWhereClause } from '@/ui/filter-n-sort/utils/turnFilterIntoWhereClause';
import { useRecoilScopedValue } from '@/recoil-scope/hooks/useRecoilScopedValue'; import { IconList } from '@/ui/icon';
import { EntityTable } from '@/ui/components/table/EntityTable'; import { useRecoilScopedValue } from '@/ui/recoil-scope/hooks/useRecoilScopedValue';
import { HooksEntityTable } from '@/ui/components/table/HooksEntityTable'; import { EntityTable } from '@/ui/table/components/EntityTable';
import { TableContext } from '@/ui/tables/states/TableContext'; import { HooksEntityTable } from '@/ui/table/components/HooksEntityTable';
import { TableContext } from '@/ui/table/states/TableContext';
import { CompanyOrderByWithRelationInput } from '~/generated/graphql'; import { CompanyOrderByWithRelationInput } from '~/generated/graphql';
import { companiesFilters } from '~/pages/companies/companies-filters';
import { companiesFilters } from './companies-filters'; import { availableSorts } from '~/pages/companies/companies-sorts';
import { availableSorts } from './companies-sorts';
export function CompanyTable() { export function CompanyTable() {
const [orderBy, setOrderBy] = const [orderBy, setOrderBy] =

12
front/src/pages/companies/CompanyTableMockMode.tsx → front/src/modules/companies/table/components/CompanyTableMockMode.tsx
View File

@ -1,12 +1,10 @@
import { IconList } from '@tabler/icons-react';
import { companyColumns } from '@/companies/table/components/companyColumns'; import { companyColumns } from '@/companies/table/components/companyColumns';
import { CompanyEntityTableDataMocked } from '@/companies/table/components/CompanyEntityTableDataMocked'; import { CompanyEntityTableDataMocked } from '@/companies/table/components/CompanyEntityTableDataMocked';
import { EntityTable } from '@/ui/components/table/EntityTable'; import { IconList } from '@/ui/icon';
import { HooksEntityTable } from '@/ui/components/table/HooksEntityTable'; import { EntityTable } from '@/ui/table/components/EntityTable';
import { HooksEntityTable } from '@/ui/table/components/HooksEntityTable';
import { companiesFilters } from './companies-filters'; import { companiesFilters } from '~/pages/companies/companies-filters';
import { availableSorts } from './companies-sorts'; import { availableSorts } from '~/pages/companies/companies-sorts';
export function CompanyTableMockMode() { export function CompanyTableMockMode() {
return ( return (

2
front/src/modules/companies/table/components/EditableCompanyAccountOwnerCell.tsx
View File

@ -2,7 +2,7 @@ import { useRecoilValue } from 'recoil';
import { CompanyAccountOwnerCell } from '@/companies/components/CompanyAccountOwnerCell'; import { CompanyAccountOwnerCell } from '@/companies/components/CompanyAccountOwnerCell';
import { companyAccountOwnerFamilyState } from '@/companies/states/companyAccountOwnerFamilyState'; import { companyAccountOwnerFamilyState } from '@/companies/states/companyAccountOwnerFamilyState';
import { useCurrentRowEntityId } from '@/ui/tables/hooks/useCurrentEntityId'; import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
export function EditableCompanyAccountOwnerCell() { export function EditableCompanyAccountOwnerCell() {
const currentRowEntityId = useCurrentRowEntityId(); const currentRowEntityId = useCurrentRowEntityId();

4
front/src/modules/companies/table/components/EditableCompanyAddressCell.tsx
View File

@ -2,8 +2,8 @@ import { useEffect, useState } from 'react';
import { useRecoilValue } from 'recoil'; import { useRecoilValue } from 'recoil';
import { companyAddressFamilyState } from '@/companies/states/companyAddressFamilyState'; import { companyAddressFamilyState } from '@/companies/states/companyAddressFamilyState';
import { EditableCellText } from '@/ui/components/editable-cell/types/EditableCellText'; import { EditableCellText } from '@/ui/table/editable-cell/types/EditableCellText';
import { useCurrentRowEntityId } from '@/ui/tables/hooks/useCurrentEntityId'; import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
import { useUpdateCompanyMutation } from '~/generated/graphql'; import { useUpdateCompanyMutation } from '~/generated/graphql';
export function EditableCompanyAddressCell() { export function EditableCompanyAddressCell() {

4
front/src/modules/companies/table/components/EditableCompanyCreatedAtCell.tsx
View File

@ -2,8 +2,8 @@ import { DateTime } from 'luxon';
import { useRecoilValue } from 'recoil'; import { useRecoilValue } from 'recoil';
import { companyCreatedAtFamilyState } from '@/companies/states/companyCreatedAtFamilyState'; import { companyCreatedAtFamilyState } from '@/companies/states/companyCreatedAtFamilyState';
import { EditableCellDate } from '@/ui/components/editable-cell/types/EditableCellDate'; import { EditableCellDate } from '@/ui/table/editable-cell/types/EditableCellDate';
import { useCurrentRowEntityId } from '@/ui/tables/hooks/useCurrentEntityId'; import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
import { useUpdateCompanyMutation } from '~/generated/graphql'; import { useUpdateCompanyMutation } from '~/generated/graphql';
export function EditableCompanyCreatedAtCell() { export function EditableCompanyCreatedAtCell() {

4
front/src/modules/companies/table/components/EditableCompanyDomainNameCell.tsx
View File

@ -2,8 +2,8 @@ import { useEffect, useState } from 'react';
import { useRecoilValue } from 'recoil'; import { useRecoilValue } from 'recoil';
import { companyDomainNameFamilyState } from '@/companies/states/companyDomainNameFamilyState'; import { companyDomainNameFamilyState } from '@/companies/states/companyDomainNameFamilyState';
import { EditableCellText } from '@/ui/components/editable-cell/types/EditableCellText'; import { EditableCellText } from '@/ui/table/editable-cell/types/EditableCellText';
import { useCurrentRowEntityId } from '@/ui/tables/hooks/useCurrentEntityId'; import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
import { useUpdateCompanyMutation } from '~/generated/graphql'; import { useUpdateCompanyMutation } from '~/generated/graphql';
export function EditableCompanyDomainNameCell() { export function EditableCompanyDomainNameCell() {

4
front/src/modules/companies/table/components/EditableCompanyEmployeesCell.tsx
View File

@ -2,8 +2,8 @@ import { useEffect, useState } from 'react';
import { useRecoilValue } from 'recoil'; import { useRecoilValue } from 'recoil';
import { companyEmployeesFamilyState } from '@/companies/states/companyEmployeesFamilyState'; import { companyEmployeesFamilyState } from '@/companies/states/companyEmployeesFamilyState';
import { EditableCellText } from '@/ui/components/editable-cell/types/EditableCellText'; import { EditableCellText } from '@/ui/table/editable-cell/types/EditableCellText';
import { useCurrentRowEntityId } from '@/ui/tables/hooks/useCurrentEntityId'; import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
import { useUpdateCompanyMutation } from '~/generated/graphql'; import { useUpdateCompanyMutation } from '~/generated/graphql';
export function EditableCompanyEmployeesCell() { export function EditableCompanyEmployeesCell() {

2
front/src/modules/companies/table/components/EditableCompanyNameCell.tsx
View File

@ -4,7 +4,7 @@ import { CompanyEditableNameChipCell } from '@/companies/components/CompanyEdita
import { companyCommentCountFamilyState } from '@/companies/states/companyCommentCountFamilyState'; import { companyCommentCountFamilyState } from '@/companies/states/companyCommentCountFamilyState';
import { companyDomainNameFamilyState } from '@/companies/states/companyDomainNameFamilyState'; import { companyDomainNameFamilyState } from '@/companies/states/companyDomainNameFamilyState';
import { companyNameFamilyState } from '@/companies/states/companyNameFamilyState'; import { companyNameFamilyState } from '@/companies/states/companyNameFamilyState';
import { useCurrentRowEntityId } from '@/ui/tables/hooks/useCurrentEntityId'; import { useCurrentRowEntityId } from '@/ui/table/hooks/useCurrentEntityId';
export function EditableCompanyNameCell() { export function EditableCompanyNameCell() {
const currentRowEntityId = useCurrentRowEntityId(); const currentRowEntityId = useCurrentRowEntityId();

4
front/src/pages/companies/table/TableActionBarButtonCreateCommentThreadCompany.tsx → front/src/modules/companies/table/components/TableActionBarButtonCreateCommentThreadCompany.tsx
View File

@ -1,5 +1,5 @@
import { useOpenCreateCommentThreadDrawerForSelectedRowIds } from '@/comments/hooks/useOpenCreateCommentDrawerForSelectedRowIds'; import { useOpenCreateCommentThreadDrawerForSelectedRowIds } from '@/activities/hooks/useOpenCreateCommentDrawerForSelectedRowIds';
import { TableActionBarButtonToggleComments } from '@/ui/components/table/action-bar/TableActionBarButtonOpenComments'; import { TableActionBarButtonToggleComments } from '@/ui/table/action-bar/components/TableActionBarButtonOpenComments';
import { CommentableType } from '~/generated/graphql'; import { CommentableType } from '~/generated/graphql';
export function TableActionBarButtonCreateCommentThreadCompany() { export function TableActionBarButtonCreateCommentThreadCompany() {

8
front/src/pages/companies/table/TableActionBarButtonDeleteCompanies.tsx → front/src/modules/companies/table/components/TableActionBarButtonDeleteCompanies.tsx
View File

@ -2,10 +2,10 @@ import { getOperationName } from '@apollo/client/utilities';
import { useRecoilValue } from 'recoil'; import { useRecoilValue } from 'recoil';
import { GET_COMPANIES } from '@/companies/queries'; import { GET_COMPANIES } from '@/companies/queries';
import { EntityTableActionBarButton } from '@/ui/components/table/action-bar/EntityTableActionBarButton'; import { IconTrash } from '@/ui/icon/index';
import { IconTrash } from '@/ui/icons/index'; import { EntityTableActionBarButton } from '@/ui/table/action-bar/components/EntityTableActionBarButton';
import { useResetTableRowSelection } from '@/ui/tables/hooks/useResetTableRowSelection'; import { useResetTableRowSelection } from '@/ui/table/hooks/useResetTableRowSelection';
import { selectedRowIdsSelector } from '@/ui/tables/states/selectedRowIdsSelector'; import { selectedRowIdsSelector } from '@/ui/table/states/selectedRowIdsSelector';
import { useDeleteCompaniesMutation } from '~/generated/graphql'; import { useDeleteCompaniesMutation } from '~/generated/graphql';
export function TableActionBarButtonDeleteCompanies() { export function TableActionBarButtonDeleteCompanies() {

2
front/src/modules/companies/table/components/companyColumns.tsx
View File

@ -6,7 +6,7 @@ import {
IconMap, IconMap,
IconUser, IconUser,
IconUsers, IconUsers,
} from '@/ui/icons/index'; } from '@/ui/icon/index';
import { EditableCompanyAccountOwnerCell } from './EditableCompanyAccountOwnerCell'; import { EditableCompanyAccountOwnerCell } from './EditableCompanyAccountOwnerCell';
import { EditableCompanyAddressCell } from './EditableCompanyAddressCell'; import { EditableCompanyAddressCell } from './EditableCompanyAddressCell';

6
front/src/modules/people/components/EditablePeopleFullName.tsx
View File

@ -1,8 +1,8 @@
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { CellCommentChip } from '@/comments/components/table/CellCommentChip'; import { useOpenTimelineRightDrawer } from '@/activities/hooks/useOpenTimelineRightDrawer';
import { useOpenTimelineRightDrawer } from '@/comments/hooks/useOpenTimelineRightDrawer'; import { CellCommentChip } from '@/activities/table/components/CellCommentChip';
import { EditableCellDoubleText } from '@/ui/components/editable-cell/types/EditableCellDoubleText'; import { EditableCellDoubleText } from '@/ui/table/editable-cell/types/EditableCellDoubleText';
import { CommentableType, Person } from '~/generated/graphql'; import { CommentableType, Person } from '~/generated/graphql';
import { PersonChip } from './PersonChip'; import { PersonChip } from './PersonChip';

10
front/src/modules/people/components/PeopleCompanyCell.tsx
View File

@ -1,10 +1,10 @@
import { CompanyChip } from '@/companies/components/CompanyChip'; import { CompanyChip } from '@/companies/components/CompanyChip';
import { useRecoilScopedState } from '@/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedState } from '@/ui/recoil-scope/hooks/useRecoilScopedState';
import { RelationPickerHotkeyScope } from '@/relation-picker/types/RelationPickerHotkeyScope'; import { RelationPickerHotkeyScope } from '@/ui/relation-picker/types/RelationPickerHotkeyScope';
import { EditableCell } from '@/ui/components/editable-cell/EditableCell'; import { EditableCell } from '@/ui/table/editable-cell/components/EditableCell';
import { isCreateModeScopedState } from '@/ui/components/editable-cell/states/isCreateModeScopedState'; import { isCreateModeScopedState } from '@/ui/table/editable-cell/states/isCreateModeScopedState';
import { getLogoUrlFromDomainName } from '@/utils/utils';
import { Company, Person } from '~/generated/graphql'; import { Company, Person } from '~/generated/graphql';
import { getLogoUrlFromDomainName } from '~/utils';
import { PeopleCompanyCreateCell } from './PeopleCompanyCreateCell'; import { PeopleCompanyCreateCell } from './PeopleCompanyCreateCell';
import { PeopleCompanyPicker } from './PeopleCompanyPicker'; import { PeopleCompanyPicker } from './PeopleCompanyPicker';

10
front/src/modules/people/components/PeopleCompanyCreateCell.tsx
View File

@ -3,16 +3,16 @@ import { getOperationName } from '@apollo/client/utilities';
import { v4 } from 'uuid'; import { v4 } from 'uuid';
import { GET_COMPANIES } from '@/companies/queries'; import { GET_COMPANIES } from '@/companies/queries';
import { useRecoilScopedState } from '@/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedState } from '@/ui/recoil-scope/hooks/useRecoilScopedState';
import { relationPickerSearchFilterScopedState } from '@/relation-picker/states/relationPickerSearchFilterScopedState'; import { relationPickerSearchFilterScopedState } from '@/ui/relation-picker/states/relationPickerSearchFilterScopedState';
import { isCreateModeScopedState } from '@/ui/components/editable-cell/states/isCreateModeScopedState'; import { isCreateModeScopedState } from '@/ui/table/editable-cell/states/isCreateModeScopedState';
import { EditableCellDoubleTextEditMode } from '@/ui/components/editable-cell/types/EditableCellDoubleTextEditMode'; import { EditableCellDoubleTextEditMode } from '@/ui/table/editable-cell/types/EditableCellDoubleTextEditMode';
import { logError } from '@/utils/logs/logError';
import { import {
Person, Person,
useInsertCompanyMutation, useInsertCompanyMutation,
useUpdatePeopleMutation, useUpdatePeopleMutation,
} from '~/generated/graphql'; } from '~/generated/graphql';
import { logError } from '~/utils/logError';
type OwnProps = { type OwnProps = {
people: Pick<Person, 'id'>; people: Pick<Person, 'id'>;

18
front/src/modules/people/components/PeopleCompanyPicker.tsx
View File

@ -1,15 +1,15 @@
import { Key } from 'ts-key-enum'; import { Key } from 'ts-key-enum';
import { useFilteredSearchCompanyQuery } from '@/companies/queries'; import { useFilteredSearchCompanyQuery } from '@/companies/queries';
import { useScopedHotkeys } from '@/lib/hotkeys/hooks/useScopedHotkeys'; import { useScopedHotkeys } from '@/ui/hotkey/hooks/useScopedHotkeys';
import { useSetHotkeyScope } from '@/lib/hotkeys/hooks/useSetHotkeyScope'; import { useSetHotkeyScope } from '@/ui/hotkey/hooks/useSetHotkeyScope';
import { useRecoilScopedState } from '@/recoil-scope/hooks/useRecoilScopedState'; import { useRecoilScopedState } from '@/ui/recoil-scope/hooks/useRecoilScopedState';
import { SingleEntitySelect } from '@/relation-picker/components/SingleEntitySelect'; import { SingleEntitySelect } from '@/ui/relation-picker/components/SingleEntitySelect';
import { relationPickerSearchFilterScopedState } from '@/relation-picker/states/relationPickerSearchFilterScopedState'; import { relationPickerSearchFilterScopedState } from '@/ui/relation-picker/states/relationPickerSearchFilterScopedState';
import { RelationPickerHotkeyScope } from '@/relation-picker/types/RelationPickerHotkeyScope'; import { RelationPickerHotkeyScope } from '@/ui/relation-picker/types/RelationPickerHotkeyScope';
import { useEditableCell } from '@/ui/components/editable-cell/hooks/useEditableCell'; import { useEditableCell } from '@/ui/table/editable-cell/hooks/useEditableCell';
import { isCreateModeScopedState } from '@/ui/components/editable-cell/states/isCreateModeScopedState'; import { isCreateModeScopedState } from '@/ui/table/editable-cell/states/isCreateModeScopedState';
import { TableHotkeyScope } from '@/ui/tables/types/TableHotkeyScope'; import { TableHotkeyScope } from '@/ui/table/types/TableHotkeyScope';
import { Company, Person, useUpdatePeopleMutation } from '~/generated/graphql'; import { Company, Person, useUpdatePeopleMutation } from '~/generated/graphql';
export type OwnProps = { export type OwnProps = {

6
front/src/modules/people/components/PeopleEntityTableData.tsx
View File

@ -1,14 +1,14 @@
import { useRecoilState } from 'recoil'; import { useRecoilState } from 'recoil';
import { isFetchingEntityTableDataState } from '@/ui/tables/states/isFetchingEntityTableDataState'; import { isFetchingEntityTableDataState } from '@/ui/table/states/isFetchingEntityTableDataState';
import { tableRowIdsState } from '@/ui/tables/states/tableRowIdsState'; import { tableRowIdsState } from '@/ui/table/states/tableRowIdsState';
import { import {
PersonOrderByWithRelationInput, PersonOrderByWithRelationInput,
useGetPeopleQuery, useGetPeopleQuery,
} from '~/generated/graphql'; } from '~/generated/graphql';
import { useSetPeopleEntityTable } from '../hooks/useSetPeopleEntityTable'; import { useSetPeopleEntityTable } from '../hooks/useSetPeopleEntityTable';
import { defaultOrderBy } from '../services'; import { defaultOrderBy } from '../queries';
export function PeopleEntityTableData({ export function PeopleEntityTableData({
orderBy = defaultOrderBy, orderBy = defaultOrderBy,

2
front/src/modules/people/services/__tests__/select.test.ts → front/src/modules/people/queries/__tests__/select.test.ts
View File

@ -1,4 +1,4 @@
import { reduceSortsToOrderBy } from '@/lib/filters-and-sorts/helpers'; import { reduceSortsToOrderBy } from '@/ui/filter-n-sort/helpers';
import { PeopleSelectedSortType } from '../select'; import { PeopleSelectedSortType } from '../select';

0
front/src/modules/people/services/index.ts → front/src/modules/people/queries/index.ts
View File

Some files were not shown because too many files have changed in this diff Show More