From 47d7e19570dc987b469d85db167c8d66b3f4acb5 Mon Sep 17 00:00:00 2001 From: Jeet Desai <52026385+jeet1desai@users.noreply.github.com> Date: Wed, 14 Feb 2024 03:54:21 +0530 Subject: [PATCH] Update custom object placeholder (#3876) * #3874 update custom object placeholder * #3876 removed object-edit folder and file * #3833 update loading image * remove image file --- .../components/SettingsObjectFormSection.tsx | 6 +- .../object-edit/SettingsObjectIconSection.tsx | 68 ------------------- .../SettingsObjectIconWithLabel.tsx | 47 ------------- .../src/modules/ui/display/icon/index.ts | 1 + .../settings/data-model/SettingsNewObject.tsx | 2 +- 5 files changed, 5 insertions(+), 119 deletions(-) delete mode 100644 packages/twenty-front/src/modules/settings/data-model/object-edit/SettingsObjectIconSection.tsx delete mode 100644 packages/twenty-front/src/modules/settings/data-model/object-edit/SettingsObjectIconWithLabel.tsx diff --git a/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFormSection.tsx b/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFormSection.tsx index 5294b7baa..3b8f0ecb6 100644 --- a/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFormSection.tsx +++ b/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFormSection.tsx @@ -45,7 +45,7 @@ const StyledInputContainer = styled.div` export const SettingsObjectFormSection = ({ disabled, - icon = 'IconPigMoney', + icon = 'IconListNumbers', singularName = '', pluralName = '', description = '', @@ -69,7 +69,7 @@ export const SettingsObjectFormSection = ({ { if (!value || validateMetadataLabel(value)) { @@ -81,7 +81,7 @@ export const SettingsObjectFormSection = ({ /> { if (!value || validateMetadataLabel(value)) { diff --git a/packages/twenty-front/src/modules/settings/data-model/object-edit/SettingsObjectIconSection.tsx b/packages/twenty-front/src/modules/settings/data-model/object-edit/SettingsObjectIconSection.tsx deleted file mode 100644 index 1ac210ca6..000000000 --- a/packages/twenty-front/src/modules/settings/data-model/object-edit/SettingsObjectIconSection.tsx +++ /dev/null @@ -1,68 +0,0 @@ -import styled from '@emotion/styled'; - -import { useIcons } from '@/ui/display/icon/hooks/useIcons'; -import { IconComponent } from '@/ui/display/icon/types/IconComponent'; -import { H2Title } from '@/ui/display/typography/components/H2Title'; -import { IconPicker } from '@/ui/input/components/IconPicker'; -import { Section } from '@/ui/layout/section/components/Section'; - -import ArrowRight from '../assets/ArrowRight.svg'; - -import { SettingsObjectIconWithLabel } from './SettingsObjectIconWithLabel'; - -const StyledContainer = styled.div` - align-items: center; - display: flex; - gap: ${({ theme }) => theme.spacing(4)}; -`; - -const StyledArrowContainer = styled.div` - align-items: center; - display: flex; - height: 32px; - justify-content: center; -`; - -type SettingsObjectIconSectionProps = { - disabled?: boolean; - iconKey?: string; - label?: string; - onChange?: (icon: { Icon: IconComponent; iconKey: string }) => void; -}; - -export const SettingsObjectIconSection = ({ - disabled, - iconKey = 'IconPigMoney', - label, - onChange, -}: SettingsObjectIconSectionProps) => { - const { getIcon } = useIcons(); - const Icon = getIcon(iconKey); - - return ( -
- - - { - onChange?.({ Icon: icon.Icon, iconKey: icon.iconKey }); - }} - /> - - Arrow right - - {Icon && ( - - )} - -
- ); -}; diff --git a/packages/twenty-front/src/modules/settings/data-model/object-edit/SettingsObjectIconWithLabel.tsx b/packages/twenty-front/src/modules/settings/data-model/object-edit/SettingsObjectIconWithLabel.tsx deleted file mode 100644 index 4ac844efc..000000000 --- a/packages/twenty-front/src/modules/settings/data-model/object-edit/SettingsObjectIconWithLabel.tsx +++ /dev/null @@ -1,47 +0,0 @@ -import { useTheme } from '@emotion/react'; -import styled from '@emotion/styled'; - -import { IconComponent } from '@/ui/display/icon/types/IconComponent'; - -const StyledContainer = styled.div` - align-items: center; - display: flex; - gap: ${({ theme }) => theme.spacing(3)}; - padding: ${({ theme }) => theme.spacing(1)}; -`; - -const StyledSubContainer = styled.div` - align-items: center; - display: flex; - gap: ${({ theme }) => theme.spacing(1)}; -`; -const StyledItemLabel = styled.div` - color: ${({ theme }) => theme.font.color.secondary}; - font-size: ${({ theme }) => theme.font.size.sm}; - font-style: normal; - font-weight: ${({ theme }) => theme.font.size.md}; - line-height: ${({ theme }) => theme.text.lineHeight.md}; -`; - -type SettingsObjectIconWithLabelProps = { - Icon?: IconComponent; - label: string; -}; - -export const SettingsObjectIconWithLabel = ({ - Icon, - label, -}: SettingsObjectIconWithLabelProps) => { - const theme = useTheme(); - - return ( - - - {!!Icon && ( - - )} - {label} - - - ); -}; diff --git a/packages/twenty-front/src/modules/ui/display/icon/index.ts b/packages/twenty-front/src/modules/ui/display/icon/index.ts index 96f35f00e..90a3e6311 100644 --- a/packages/twenty-front/src/modules/ui/display/icon/index.ts +++ b/packages/twenty-front/src/modules/ui/display/icon/index.ts @@ -77,6 +77,7 @@ export { IconLink, IconLinkOff, IconList, + IconListNumbers, IconLock, IconLogout, IconMail, diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx index f7e8ebcff..97b83f272 100644 --- a/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx +++ b/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx @@ -24,7 +24,7 @@ export const SettingsNewObject = () => { icon: string; labelPlural: string; labelSingular: string; - }>({ icon: 'IconPigMoney', labelPlural: '', labelSingular: '' }); + }>({ icon: 'IconListNumbers', labelPlural: '', labelSingular: '' }); const canSave = !!customFormValues.labelPlural && !!customFormValues.labelSingular;