Add color to object icon picker in data model (#19368)
Closes [#2291](https://github.com/twentyhq/core-team-issues/issues/2291)
This commit is contained in:
+14
-1
@@ -1,6 +1,7 @@
|
||||
import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';
|
||||
import { parseThemeColor } from '@/navigation-menu-item/common/utils/parseThemeColor';
|
||||
import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';
|
||||
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
|
||||
import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';
|
||||
import { isObjectMetadataReadOnly } from '@/object-record/read-only/utils/isObjectMetadataReadOnly';
|
||||
import { computeUpdatedNavigationMemorizedUrlAfterObjectNamePluralChange } from '@/settings/data-model/object-details/utils/computeUpdatedNavigationMemorizedUrlAfterObjectNamePluralChange';
|
||||
import { SettingsDataModelObjectAboutForm } from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm';
|
||||
@@ -60,6 +61,9 @@ export const SettingsUpdateDataModelObjectAboutForm = ({
|
||||
labelSingular,
|
||||
namePlural,
|
||||
nameSingular,
|
||||
...(objectMetadataItem.isCustom
|
||||
? { color: parseThemeColor(objectMetadataItem.color) }
|
||||
: {}),
|
||||
},
|
||||
});
|
||||
|
||||
@@ -99,6 +103,14 @@ export const SettingsUpdateDataModelObjectAboutForm = ({
|
||||
labelSingular: updatedObject?.data?.updateOneObject.labelSingular,
|
||||
namePlural: updatedObject?.data?.updateOneObject.namePlural,
|
||||
nameSingular: updatedObject?.data?.updateOneObject.nameSingular,
|
||||
...(objectMetadataItem.isCustom
|
||||
? {
|
||||
color: parseThemeColor(
|
||||
updatedObject?.data?.updateOneObject.color ??
|
||||
objectMetadataItem.color,
|
||||
),
|
||||
}
|
||||
: {}),
|
||||
});
|
||||
} else {
|
||||
formConfig.reset(formValues);
|
||||
@@ -134,6 +146,7 @@ export const SettingsUpdateDataModelObjectAboutForm = ({
|
||||
nameSingular: _nameSingular,
|
||||
namePlural: _namePlural,
|
||||
isLabelSyncedWithName: _isLabelSyncedWithName,
|
||||
color: _color,
|
||||
...payloadWithoutNames
|
||||
} = updatePayload;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user