Skip to content

Commit

Permalink
Move to proper place and fix imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@martmull
martmull committed Apr 30, 2024
1 parent d09bbb3 commit defabbb
Show file tree
Hide file tree
Showing 23 changed files with 30 additions and 29 deletions.
2 changes: 1 addition & 1 deletion ...c/modules/activities/calendar/components/CalendarEventParticipantsResponseStatusField.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { IconCheck, IconQuestionMark, IconX } from 'twenty-ui';
import { CalendarEventParticipant } from '@/activities/calendar/types/CalendarEventParticipant';
import { ParticipantChip } from '@/activities/components/ParticipantChip';
import { PropertyBox } from '@/object-record/record-inline-cell/property-box/components/PropertyBox';
import { ExpandableList } from '@/ui/display/expandable-list/ExpandableList';
import { EllipsisDisplay } from '@/ui/field/display/components/EllipsisDisplay';
import { ExpandableList } from '@/ui/layout/expandable-list/ExpandableList';
import { isRightDrawerAnimationCompletedState } from '@/ui/layout/right-drawer/states/isRightDrawerAnimationCompleted.ts';

const StyledInlineCellBaseContainer = styled.div`
Expand Down
2 changes: 1 addition & 1 deletion packages/twenty-front/src/modules/activities/components/ActivityTargetChips.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { RecordChip } from '@/object-record/components/RecordChip';
import {
ExpandableList,
ExpandableListProps,
} from '@/ui/display/expandable-list/ExpandableList';
} from '@/ui/layout/expandable-list/ExpandableList';

const StyledContainer = styled.div<{ maxWidth?: number }>`
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
} from 'twenty-ui';

import { useOpenActivityRightDrawer } from '@/activities/hooks/useOpenActivityRightDrawer';
import { ActivityTargetsInlineCell } from '@/activities/inline-cell/components/ActivityTargetsInlineCell.tsx';
import { ActivityTargetsInlineCell } from '@/activities/inline-cell/components/ActivityTargetsInlineCell';
import { Activity } from '@/activities/types/Activity';
import { getActivitySummary } from '@/activities/utils/getActivitySummary';
import { Checkbox, CheckboxShape } from '@/ui/input/components/Checkbox';
Expand Down
2 changes: 1 addition & 1 deletion packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpForm.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { captchaProviderState } from '@/client-config/states/captchaProviderStat
import { Loader } from '@/ui/feedback/loader/components/Loader';
import { MainButton } from '@/ui/input/button/components/MainButton';
import { TextInput } from '@/ui/input/components/TextInput';
import { ActionLink } from '@/ui/navigation/link/components/ActionLink.tsx';
import { ActionLink } from '@/ui/navigation/link/components/ActionLink';
import { AnimatedEaseIn } from '@/ui/utilities/animation/components/AnimatedEaseIn';
import { isDefined } from '~/utils/isDefined';

Expand Down
2 changes: 1 addition & 1 deletion packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResetPassword.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useCallback } from 'react';

import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
import { useEmailPasswordResetLinkMutation } from '~/generated/graphql.tsx';
import { useEmailPasswordResetLinkMutation } from '~/generated/graphql';

export const useHandleResetPassword = () => {
const { enqueueSnackBar } = useSnackBar();
Expand Down
2 changes: 1 addition & 1 deletion packages/twenty-front/src/modules/auth/sign-in-up/hooks/useNavigateAfterSignInUp.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { CurrentWorkspace } from '@/auth/states/currentWorkspaceState';
import { previousUrlState } from '@/auth/states/previousUrlState';
import { billingState } from '@/client-config/states/billingState';
import { AppPath } from '@/types/AppPath';
import { WorkspaceMember } from '~/generated/graphql.tsx';
import { WorkspaceMember } from '~/generated/graphql';

export const useNavigateAfterSignInUp = () => {
const navigate = useNavigate();
Expand Down
2 changes: 1 addition & 1 deletion packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceFromInviteHash.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useParams } from 'react-router-dom';

import { useGetWorkspaceFromInviteHashQuery } from '~/generated/graphql.tsx';
import { useGetWorkspaceFromInviteHashQuery } from '~/generated/graphql';

export const useWorkspaceFromInviteHash = () => {
const workspaceInviteHash = useParams().workspaceInviteHash;
Expand Down
2 changes: 1 addition & 1 deletion packages/twenty-front/src/modules/billing/components/SubscriptionCard.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import styled from '@emotion/styled';

import { SubscriptionCardPrice } from '@/billing/components/SubscriptionCardPrice.tsx';
import { SubscriptionCardPrice } from '@/billing/components/SubscriptionCardPrice';
import { capitalize } from '~/utils/string/capitalize';

type SubscriptionCardProps = {
Expand Down
4 changes: 2 additions & 2 deletions packages/twenty-front/src/modules/object-record/record-field/components/FieldDisplay.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useContext } from 'react';

import { ExpandableListProps } from '@/ui/display/expandable-list/ExpandableList';
import { ExpandableListProps } from '@/ui/layout/expandable-list/ExpandableList';

import { FieldContext } from '../contexts/FieldContext';
import { AddressFieldDisplay } from '../meta-types/display/components/AddressFieldDisplay';
Expand All @@ -12,7 +12,7 @@ import { EmailFieldDisplay } from '../meta-types/display/components/EmailFieldDi
import { FullNameFieldDisplay } from '../meta-types/display/components/FullNameFieldDisplay';
import { JsonFieldDisplay } from '../meta-types/display/components/JsonFieldDisplay';
import { LinkFieldDisplay } from '../meta-types/display/components/LinkFieldDisplay';
import { MultiSelectFieldDisplay } from '../meta-types/display/components/MultiSelectFieldDisplay.tsx';
import { MultiSelectFieldDisplay } from '../meta-types/display/components/MultiSelectFieldDisplay';
import { NumberFieldDisplay } from '../meta-types/display/components/NumberFieldDisplay';
import { PhoneFieldDisplay } from '../meta-types/display/components/PhoneFieldDisplay';
import { RelationFieldDisplay } from '../meta-types/display/components/RelationFieldDisplay';
Expand Down
2 changes: 1 addition & 1 deletion packages/twenty-front/src/modules/object-record/record-field/components/FieldInput.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useContext } from 'react';
import { AddressFieldInput } from '@/object-record/record-field/meta-types/input/components/AddressFieldInput';
import { DateFieldInput } from '@/object-record/record-field/meta-types/input/components/DateFieldInput';
import { FullNameFieldInput } from '@/object-record/record-field/meta-types/input/components/FullNameFieldInput';
import { MultiSelectFieldInput } from '@/object-record/record-field/meta-types/input/components/MultiSelectFieldInput.tsx';
import { MultiSelectFieldInput } from '@/object-record/record-field/meta-types/input/components/MultiSelectFieldInput';
import { RawJsonFieldInput } from '@/object-record/record-field/meta-types/input/components/RawJsonFieldInput';
import { SelectFieldInput } from '@/object-record/record-field/meta-types/input/components/SelectFieldInput';
import { RecordFieldInputScope } from '@/object-record/record-field/scopes/RecordFieldInputScope';
Expand Down
4 changes: 2 additions & 2 deletions ...ules/object-record/record-field/meta-types/display/components/MultiSelectFieldDisplay.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { useMultiSelectField } from '@/object-record/record-field/meta-types/hooks/useMultiSelectField';
import { Tag } from '@/ui/display/tag/components/Tag';
import {
ExpandableList,
ExpandableListProps,
} from '@/ui/display/expandable-list/ExpandableList';
import { Tag } from '@/ui/display/tag/components/Tag';
} from '@/ui/layout/expandable-list/ExpandableList';

type MultiSelectFieldDisplayProps = ExpandableListProps;
export const MultiSelectFieldDisplay = ({
Expand Down
2 changes: 1 addition & 1 deletion ...enty-front/src/modules/object-record/record-field/meta-types/hooks/useMultiSelectField.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { assertFieldMetadata } from '@/object-record/record-field/types/guards/a
import { isFieldMultiSelect } from '@/object-record/record-field/types/guards/isFieldMultiSelect';
import { isFieldMultiSelectValue } from '@/object-record/record-field/types/guards/isFieldMultiSelectValue';
import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
import { FieldMetadataType } from '~/generated/graphql.tsx';
import { FieldMetadataType } from '~/generated/graphql';

export const useMultiSelectField = () => {
const { entityId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
Expand Down
2 changes: 1 addition & 1 deletion .../modules/object-record/record-field/meta-types/input/components/MultiSelectFieldInput.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { MenuItemMultiSelectTag } from '@/ui/navigation/menu-item/components/MenuItemMultiSelectTag.tsx';
import { MenuItemMultiSelectTag } from '@/ui/navigation/menu-item/components/MenuItemMultiSelectTag';
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
import { isDefined } from '~/utils/isDefined';

Expand Down
4 changes: 2 additions & 2 deletions ...ont/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import { motion } from 'framer-motion';
import { IconComponent } from 'twenty-ui';

import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
import { AnimationDivProps } from '@/object-record/record-table/record-table-cell/components/RecordTableCellButton.tsx';
import { ExpandableListProps } from '@/ui/display/expandable-list/ExpandableList';
import { AnimationDivProps } from '@/object-record/record-table/record-table-cell/components/RecordTableCellButton';
import { EllipsisDisplay } from '@/ui/field/display/components/EllipsisDisplay';
import { ExpandableListProps } from '@/ui/layout/expandable-list/ExpandableList';
import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';

import { useInlineCell } from '../hooks/useInlineCell';
Expand Down
2 changes: 1 addition & 1 deletion ...ules/object-record/record-table/record-table-cell/components/RecordTableCellContainer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { useOpenRecordTableCellFromCell } from '@/object-record/record-table/rec
import { RecordTableScopeInternalContext } from '@/object-record/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext';
import { isSoftFocusOnTableCellComponentFamilyState } from '@/object-record/record-table/states/isSoftFocusOnTableCellComponentFamilyState';
import { isTableCellInEditModeComponentFamilyState } from '@/object-record/record-table/states/isTableCellInEditModeComponentFamilyState';
import { ExpandableListProps } from '@/ui/display/expandable-list/ExpandableList';
import { ExpandableListProps } from '@/ui/layout/expandable-list/ExpandableList';
import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
import { getScopeIdOrUndefinedFromComponentId } from '@/ui/utilities/recoil-scope/utils/getScopeIdOrUndefinedFromComponentId';
Expand Down
2 changes: 1 addition & 1 deletion ...les/object-record/record-table/record-table-cell/components/RecordTableCellEditButton.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import styled from '@emotion/styled';
import { motion } from 'framer-motion';
import { IconComponent } from 'twenty-ui';

import { AnimationDivProps } from '@/object-record/record-table/record-table-cell/components/RecordTableCellButton.tsx';
import { AnimationDivProps } from '@/object-record/record-table/record-table-cell/components/RecordTableCellButton';
import { FloatingIconButton } from '@/ui/input/button/components/FloatingIconButton';

const StyledEditButtonContainer = styled(motion.div)`
Expand Down
2 changes: 1 addition & 1 deletion packages/twenty-front/src/modules/ui/display/info/components/Info.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { css, useTheme } from '@emotion/react';
import styled from '@emotion/styled';
import { IconInfoCircle } from 'twenty-ui';

import { Button } from '@/ui/input/button/components/Button.tsx';
import { Button } from '@/ui/input/button/components/Button';

export type InfoAccent = 'blue' | 'danger';
export type InfoProps = {
Expand Down
3 changes: 2 additions & 1 deletion packages/twenty-front/src/modules/ui/input/components/CardPicker.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React from 'react';
import styled from '@emotion/styled';

import { Radio } from '@/ui/input/components/Radio.tsx';
import { Radio } from '@/ui/input/components/Radio';

const StyledSubscriptionCardContainer = styled.button`
background-color: ${({ theme }) => theme.background.secondary};
border: 1px solid ${({ theme }) => theme.border.color.medium};
Expand Down
2 changes: 1 addition & 1 deletion ...lay/expandable-list/ChildrenContainer.tsx → ...out/expandable-list/ChildrenContainer.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Dispatch, ReactElement, SetStateAction } from 'react';
import styled from '@emotion/styled';

import { ChildrenProperty } from '@/ui/display/expandable-list/ExpandableList';
import { ChildrenProperty } from '@/ui/layout/expandable-list/ExpandableList';

const StyledChildContainer = styled.div<{
shrink?: number;
Expand Down
10 changes: 5 additions & 5 deletions ...isplay/expandable-list/ExpandableList.tsx → ...layout/expandable-list/ExpandableList.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import { offset, useFloating } from '@floating-ui/react';
import { motion } from 'framer-motion';
import { Chip, ChipVariant } from 'twenty-ui';

import { AnimationDivProps } from '@/object-record/record-table/record-table-cell/components/RecordTableCellButton.tsx';
import { ChildrenContainer } from '@/ui/display/expandable-list/ChildrenContainer.tsx';
import { getChipContentWidth } from '@/ui/display/expandable-list/getChipContentWidth.ts';
import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu.tsx';
import { AnimationDivProps } from '@/object-record/record-table/record-table-cell/components/RecordTableCellButton';
import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
import { ChildrenContainer } from '@/ui/layout/expandable-list/ChildrenContainer';
import { getChipContentWidth } from '@/ui/layout/expandable-list/getChipContentWidth';

const GAP_WIDTH = 4;

Expand Down Expand Up @@ -54,8 +54,8 @@ export type ChildrenProperty = {
export const ExpandableList = ({
children,
isHovered,
forceDisplayHiddenCount = false,
reference,
forceDisplayHiddenCount = false,
withOutline = false,
}: {
children: ReactElement[];
Expand Down
0 ...ay/expandable-list/getChipContentWidth.ts → ...ut/expandable-list/getChipContentWidth.ts
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/twenty-front/src/modules/ui/navigation/link/components/GithubVersionLink.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useTheme } from '@emotion/react';
import { IconBrandGithub } from 'twenty-ui';

import { ActionLink } from '@/ui/navigation/link/components/ActionLink.tsx';
import { ActionLink } from '@/ui/navigation/link/components/ActionLink';

import packageJson from '../../../../../../package.json';
import { GITHUB_LINK } from '../constants/GithubLink';
Expand Down
2 changes: 1 addition & 1 deletion ...twenty-front/src/modules/ui/navigation/link/components/__stories__/ActionLink.stories.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
import { ComponentDecorator } from 'twenty-ui';

import { ActionLink } from '@/ui/navigation/link/components/ActionLink.tsx';
import { ActionLink } from '@/ui/navigation/link/components/ActionLink';

const meta: Meta<typeof ActionLink> = {
title: 'UI/navigation/link/ActionLink',
Expand Down

0 comments on commit defabbb

Please sign in to comment.