Convert metadata tables to camelCase (#2400)
* Convert metadata tables to camelCase * datasourcemetadataid to datasourceid * refactor metadata folders * fix command * move commands out of metadata * fix seed * rename objectId and fieldId in objectMetadataId and fieldMetadataId in FE * fix field-metadata * Fix * Fix * remove logs --------- Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
@ -29,9 +29,9 @@ import { useUpdateOneObject } from '../hooks/useUpdateOneObject';
|
||||
import { formatMetadataFieldAsColumnDefinition } from '../utils/formatMetadataFieldAsColumnDefinition';
|
||||
|
||||
export const RecordShowPage = () => {
|
||||
const { objectNameSingular, objectId } = useParams<{
|
||||
const { objectNameSingular, objectMetadataId } = useParams<{
|
||||
objectNameSingular: string;
|
||||
objectId: string;
|
||||
objectMetadataId: string;
|
||||
}>();
|
||||
|
||||
const { icons } = useLazyLoadIcons();
|
||||
@ -41,11 +41,11 @@ export const RecordShowPage = () => {
|
||||
});
|
||||
|
||||
const [, setEntityFields] = useRecoilState(
|
||||
entityFieldsFamilyState(objectId ?? ''),
|
||||
entityFieldsFamilyState(objectMetadataId ?? ''),
|
||||
);
|
||||
|
||||
const { object } = useFindOneObject({
|
||||
objectId: objectId,
|
||||
objectMetadataId: objectMetadataId,
|
||||
objectNameSingular,
|
||||
onCompleted: (data) => {
|
||||
setEntityFields(data);
|
||||
|
||||
@ -14,6 +14,7 @@ const defaultFieldValues: Record<FieldMetadataType, unknown> = {
|
||||
[FieldMetadataType.Email]: '',
|
||||
[FieldMetadataType.Enum]: null,
|
||||
[FieldMetadataType.Number]: null,
|
||||
[FieldMetadataType.Relation]: null,
|
||||
[FieldMetadataType.Phone]: '',
|
||||
[FieldMetadataType.Text]: '',
|
||||
[FieldMetadataType.Url]: { link: '', text: '' },
|
||||
|
||||
@ -8,10 +8,10 @@ export const useFindOneObject = <
|
||||
ObjectType extends { id: string } & Record<string, any>,
|
||||
>({
|
||||
objectNameSingular,
|
||||
objectId,
|
||||
objectMetadataId,
|
||||
onCompleted,
|
||||
}: Pick<ObjectMetadataItemIdentifier, 'objectNameSingular'> & {
|
||||
objectId: string | undefined;
|
||||
objectMetadataId: string | undefined;
|
||||
onCompleted?: (data: ObjectType) => void;
|
||||
}) => {
|
||||
const { foundObjectMetadataItem, objectNotFoundInMetadata, findOneQuery } =
|
||||
@ -21,11 +21,11 @@ export const useFindOneObject = <
|
||||
|
||||
const { data, loading, error } = useQuery<
|
||||
{ [nameSingular: string]: ObjectType },
|
||||
{ objectId: string }
|
||||
{ objectMetadataId: string }
|
||||
>(findOneQuery, {
|
||||
skip: !foundObjectMetadataItem || !objectId,
|
||||
skip: !foundObjectMetadataItem || !objectMetadataId,
|
||||
variables: {
|
||||
objectId: objectId ?? '',
|
||||
objectMetadataId: objectMetadataId ?? '',
|
||||
},
|
||||
onCompleted: (data) => {
|
||||
if (onCompleted && objectNameSingular) {
|
||||
|
||||
@ -14,13 +14,13 @@ export const useMetadataField = () => {
|
||||
|
||||
const createMetadataField = (
|
||||
input: Pick<Field, 'label' | 'icon' | 'description'> & {
|
||||
objectId: string;
|
||||
objectMetadataId: string;
|
||||
type: MetadataFieldDataType;
|
||||
},
|
||||
) =>
|
||||
createOneMetadataField({
|
||||
...formatMetadataFieldInput(input),
|
||||
objectId: input.objectId,
|
||||
objectMetadataId: input.objectMetadataId,
|
||||
type: input.type,
|
||||
});
|
||||
|
||||
@ -28,19 +28,19 @@ export const useMetadataField = () => {
|
||||
input: Pick<Field, 'id' | 'label' | 'icon' | 'description'>,
|
||||
) =>
|
||||
updateOneMetadataField({
|
||||
fieldIdToUpdate: input.id,
|
||||
fieldMetadataIdToUpdate: input.id,
|
||||
updatePayload: formatMetadataFieldInput(input),
|
||||
});
|
||||
|
||||
const activateMetadataField = (metadataField: Field) =>
|
||||
updateOneMetadataField({
|
||||
fieldIdToUpdate: metadataField.id,
|
||||
fieldMetadataIdToUpdate: metadataField.id,
|
||||
updatePayload: { isActive: true },
|
||||
});
|
||||
|
||||
const disableMetadataField = (metadataField: Field) =>
|
||||
updateOneMetadataField({
|
||||
fieldIdToUpdate: metadataField.id,
|
||||
fieldMetadataIdToUpdate: metadataField.id,
|
||||
updatePayload: { isActive: false },
|
||||
});
|
||||
|
||||
|
||||
@ -22,10 +22,10 @@ export const useUpdateOneMetadataField = () => {
|
||||
});
|
||||
|
||||
const updateOneMetadataField = async ({
|
||||
fieldIdToUpdate,
|
||||
fieldMetadataIdToUpdate,
|
||||
updatePayload,
|
||||
}: {
|
||||
fieldIdToUpdate: UpdateOneMetadataFieldMutationVariables['idToUpdate'];
|
||||
fieldMetadataIdToUpdate: UpdateOneMetadataFieldMutationVariables['idToUpdate'];
|
||||
updatePayload: Pick<
|
||||
UpdateOneMetadataFieldMutationVariables['updatePayload'],
|
||||
'description' | 'icon' | 'isActive' | 'label' | 'name'
|
||||
@ -33,7 +33,7 @@ export const useUpdateOneMetadataField = () => {
|
||||
}) => {
|
||||
return await mutate({
|
||||
variables: {
|
||||
idToUpdate: fieldIdToUpdate,
|
||||
idToUpdate: fieldMetadataIdToUpdate,
|
||||
updatePayload: {
|
||||
...updatePayload,
|
||||
label: updatePayload.label ?? undefined,
|
||||
|
||||
@ -19,7 +19,7 @@ export const formatMetadataFieldAsColumnDefinition = ({
|
||||
icons: Record<string, IconComponent>;
|
||||
}): ColumnDefinition<FieldMetadata> => ({
|
||||
position,
|
||||
fieldId: field.id,
|
||||
fieldMetadataId: field.id,
|
||||
label: field.label,
|
||||
size: 100,
|
||||
type: parseFieldType(field.type),
|
||||
|
||||
@ -9,7 +9,7 @@ export const formatMetadataFieldAsFilterDefinition = ({
|
||||
field: ObjectMetadataItem['fields'][0];
|
||||
icons: Record<string, any>;
|
||||
}): FilterDefinition => ({
|
||||
fieldId: field.id,
|
||||
fieldMetadataId: field.id,
|
||||
label: field.label,
|
||||
Icon: icons[field.icon ?? 'Icon123'],
|
||||
type: 'TEXT',
|
||||
|
||||
@ -9,7 +9,7 @@ export const formatMetadataFieldAsSortDefinition = ({
|
||||
field: ObjectMetadataItem['fields'][0];
|
||||
icons: Record<string, any>;
|
||||
}): SortDefinition => ({
|
||||
fieldId: field.id,
|
||||
fieldMetadataId: field.id,
|
||||
label: field.label,
|
||||
Icon: icons[field.icon ?? 'Icon123'],
|
||||
});
|
||||
|
||||
@ -10,10 +10,10 @@ export const generateFindOneCustomObjectQuery = ({
|
||||
objectMetadataItem: ObjectMetadataItem;
|
||||
}) => {
|
||||
return gql`
|
||||
query FindOne${objectMetadataItem.nameSingular}($objectId: UUID!) {
|
||||
query FindOne${objectMetadataItem.nameSingular}($objectMetadataId: UUID!) {
|
||||
${objectMetadataItem.nameSingular}(filter: {
|
||||
id: {
|
||||
eq: $objectId
|
||||
eq: $objectMetadataId
|
||||
}
|
||||
}){
|
||||
id
|
||||
|
||||
Reference in New Issue
Block a user