Feat/add other metadata types v2 (#2224)

* Fix view fetch bug

* Finished types

* Removed console.log

* Fixed todo

* Reactivate no console

* Change no-console to warn

front/src/modules/metadata/components/MetadataObjectNavItems.tsx

@@ -14,11 +14,6 @@ import { useFindManyMetadataObjects } from '../hooks/useFindManyMetadataObjects'
 export const MetadataObjectNavItems = () => {
   const { metadataObjects } = useFindManyMetadataObjects();
 
-  // eslint-disable-next-line no-console
-  console.log({
-    metadataObjects,
-  });
-
   const createNewTempCustomObject = useCreateNewTempsCustomObject();
 
   const { deleteOneMetadataObject } = useDeleteOneMetadataObject();

front/src/modules/metadata/components/ObjectDataTableEffect.tsx

@@ -63,8 +63,6 @@ export const ObjectDataTableEffect = ({
     const viewId = searchParams.get('view');
     if (viewId) {
       handleViewSelect(viewId);
-    } else {
-      handleViewSelect(objectNamePlural);
     }
   }, [handleViewSelect, searchParams, objectNamePlural]);
 

front/src/modules/metadata/hooks/useCreateNewTempCustomObject.ts

@@ -18,16 +18,55 @@ import { useCreateOneMetadataObject } from './useCreateOneMetadataObject';
 import { useUpdateOneMetadataField } from './useUpdateOneMetadataField';
 import { useUpdateOneMetadataObject } from './useUpdateOneMetadataObject';
 
+const useCreateActiveMetadataField = () => {
+  const { createOneMetadataField } = useCreateOneMetadataField();
+  const { updateOneMetadataField } = useUpdateOneMetadataField();
+
+  return async ({
+    objectId,
+    label,
+    name,
+    type,
+  }: {
+    objectId: string;
+    label: string;
+    name: string;
+    type: FieldType;
+  }) => {
+    const { data: createdField } = await createOneMetadataField({
+      objectId: objectId,
+      label: label,
+      name: name,
+      type: type,
+      description: label,
+      icon: 'IconMap',
+    });
+
+    if (!createdField || !createdField.createOneField.name) {
+      throw new Error('Could not create metadata field');
+    }
+
+    await updateOneMetadataField({
+      fieldIdToUpdate: createdField?.createOneField?.id ?? '',
+      updatePayload: {
+        isActive: true,
+      },
+    });
+
+    return createdField.createOneField;
+  };
+};
+
 export const useCreateNewTempsCustomObject = () => {
   const { createOneMetadataObject } = useCreateOneMetadataObject();
-  const { createOneMetadataField } = useCreateOneMetadataField();
 
   const { updateOneMetadataObject } = useUpdateOneMetadataObject();
-  const { updateOneMetadataField } = useUpdateOneMetadataField();
 
   const [createViewMutation] = useCreateViewMutation();
   const [createViewFieldsMutation] = useCreateViewFieldsMutation();
 
+  const createActiveMetadataField = useCreateActiveMetadataField();
+
   return async () => {
     const date = new Date().toISOString().replace(/[\/:\.\-\_]/g, '');
 
@@ -53,64 +92,67 @@ export const useCreateNewTempsCustomObject = () => {
       },
     });
 
-    const { data: nameFieldData } = await createOneMetadataField({
-      objectId: supplierObjectId,
-      name: 'name',
-      type: 'text',
-      description: 'Name',
+    const nameFieldData = await createActiveMetadataField({
       label: 'Name',
-      icon: 'IconBuilding',
-    });
-
-    if (!nameFieldData || !nameFieldData.createOneField.name) {
-      throw new Error('Could not create metadata field');
-    }
-
-    await updateOneMetadataField({
-      fieldIdToUpdate: nameFieldData?.createOneField?.id ?? '',
-      updatePayload: {
-        isActive: true,
-      },
-    });
-
-    const { data: cityFieldData } = await createOneMetadataField({
+      name: 'name',
       objectId: supplierObjectId,
+      type: 'text',
+    });
+
+    const cityFieldData = await createActiveMetadataField({
       label: 'City',
       name: 'city',
-      type: 'text',
-      description: 'City',
-      icon: 'IconMap',
-    });
-
-    if (!cityFieldData || !cityFieldData.createOneField.name) {
-      throw new Error('Could not create metadata field');
-    }
-
-    await updateOneMetadataField({
-      fieldIdToUpdate: cityFieldData?.createOneField?.id ?? '',
-      updatePayload: {
-        isActive: true,
-      },
-    });
-
-    const { data: emailFieldData } = await createOneMetadataField({
       objectId: supplierObjectId,
+      type: 'text',
+    });
+
+    const emailFieldData = await createActiveMetadataField({
       label: 'Email',
       name: 'email',
-      type: 'url',
-      description: 'Email',
-      icon: 'IconMap',
+      objectId: supplierObjectId,
+      type: 'email',
     });
 
-    if (!emailFieldData || !emailFieldData.createOneField.name) {
-      throw new Error('Could not create metadata field');
-    }
+    const phoneFieldData = await createActiveMetadataField({
+      label: 'Phone',
+      name: 'phone',
+      objectId: supplierObjectId,
+      type: 'phone',
+    });
 
-    await updateOneMetadataField({
-      fieldIdToUpdate: emailFieldData?.createOneField?.id ?? '',
-      updatePayload: {
-        isActive: true,
-      },
+    const twitterFieldData = await createActiveMetadataField({
+      label: 'Twitter',
+      name: 'twitter',
+      objectId: supplierObjectId,
+      type: 'url',
+    });
+
+    const booleanFieldData = await createActiveMetadataField({
+      label: 'Boolean example',
+      name: 'boolexample',
+      objectId: supplierObjectId,
+      type: 'boolean',
+    });
+
+    const employeesFieldData = await createActiveMetadataField({
+      label: 'Employees',
+      name: 'employees',
+      objectId: supplierObjectId,
+      type: 'number',
+    });
+
+    const ARRFieldData = await createActiveMetadataField({
+      label: 'ARR',
+      name: 'arr',
+      objectId: supplierObjectId,
+      type: 'money',
+    });
+
+    const createdAt = await createActiveMetadataField({
+      label: 'Created at',
+      name: 'createdAt',
+      objectId: supplierObjectId,
+      type: 'date',
     });
 
     const objectId = 'suppliers' + date;
@@ -127,9 +169,15 @@ export const useCreateNewTempsCustomObject = () => {
     });
 
     const createdFields = [
-      emailFieldData.createOneField,
-      nameFieldData.createOneField,
-      cityFieldData.createOneField,
+      emailFieldData,
+      nameFieldData,
+      cityFieldData,
+      phoneFieldData,
+      twitterFieldData,
+      booleanFieldData,
+      employeesFieldData,
+      ARRFieldData,
+      createdAt,
     ];
 
     const tempColumnDefinitions: ColumnDefinition<FieldMetadata>[] =

front/src/modules/metadata/hooks/useFindOneMetadataObject.ts

@@ -31,12 +31,6 @@ export const useFindOneMetadataObject = ({
       }),
     ) ?? [];
 
-  // eslint-disable-next-line no-console
-  console.log({
-    foundMetadataObject,
-    columnDefinitions,
-  });
-
   const findManyQuery = foundMetadataObject
     ? generateFindManyCustomObjectsQuery({
         metadataObject: foundMetadataObject,

front/src/modules/metadata/utils/formatMetadataFieldAsColumnDefinition.ts

@@ -10,6 +10,10 @@ const parseFieldType = (fieldType: string): FieldType => {
     return 'urlV2';
   }
 
+  if (fieldType === 'money') {
+    return 'moneyAmountV2';
+  }
+
   return fieldType as FieldType;
 };
 

front/src/modules/metadata/utils/generateFindManyCustomObjectsQuery.ts

@@ -1,9 +1,9 @@
 import { gql } from '@apollo/client';
 
-import { FieldType } from '@/ui/data/field/types/FieldType';
-
 import { MetadataObject } from '../types/MetadataObject';
 
+import { mapFieldMetadataToGraphQLQuery } from './mapFieldMetadataToGraphQLQuery';
+
 export const generateFindManyCustomObjectsQuery = ({
   metadataObject,
   _fromCursor,
@@ -18,22 +18,7 @@ export const generateFindManyCustomObjectsQuery = ({
           node {
             id
             ${metadataObject.fields
-              .map((field) => {
-                // TODO: parse
-                const fieldType = field.type as FieldType;
-
-                if (fieldType === 'text') {
-                  return field.name;
-                } else if (fieldType === 'url') {
-                  return `
-                    ${field.name}
-                    {
-                      text
-                      link
-                    }
-                  `;
-                }
-              })
+              .map(mapFieldMetadataToGraphQLQuery)
               .join('\n')}
           }
           cursor

front/src/modules/metadata/utils/mapFieldMetadataToGraphQLQuery.ts

@@ -0,0 +1,44 @@
+import { FieldType } from '@/ui/data/field/types/FieldType';
+import { Field } from '~/generated/graphql';
+
+export const mapFieldMetadataToGraphQLQuery = (field: Field) => {
+  // TODO: parse
+  const fieldType = field.type as FieldType;
+
+  const fieldIsSimpleValue = (
+    [
+      'text',
+      'phone',
+      'date',
+      'email',
+      'number',
+      'boolean',
+      'date',
+    ] as FieldType[]
+  ).includes(fieldType);
+
+  const fieldIsURL = fieldType === 'url' || fieldType === 'urlV2';
+
+  const fieldIsMoneyAmount =
+    fieldType === 'money' || fieldType === 'moneyAmountV2';
+
+  if (fieldIsSimpleValue) {
+    return field.name;
+  } else if (fieldIsURL) {
+    return `
+      ${field.name}
+      {
+        text
+        link
+      }
+    `;
+  } else if (fieldIsMoneyAmount) {
+    return `
+      ${field.name}
+      {
+        amount
+        currency
+      }
+    `;
+  }
+};