feat: MetadataModelRequirement uses organisation ID as objectID (✅ relies on #5325 - deployed) (#5326)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: Zaimwa9

api/tests/unit/metadata/test_serializers.py

@@ -72,13 +72,13 @@ def test_metadata_serializer_validate_validates_field_value_type_correctly(
             "project",
             False,
             "The requirement organisation does not match the field organisation",
-            lambda **kwargs: kwargs["metadata_field"].organisation.id,
+            lambda **kwargs: 9999,
         ),
         (
             "organisation",
             False,
             "The requirement organisation does not match the field organisation",
-            lambda **kwargs: kwargs["project"].id,
+            lambda **kwargs: 9999,
         ),
     ],
 )
@@ -99,7 +99,7 @@ def test_metadata_model_field_serializer_validation(
         else project_content_type
     )
     object_id = get_object_id(project=project, metadata_field=a_metadata_field)
-
+    print(f"Metadata field org_id: {a_metadata_field.organisation.id}")
     # Given
     data: Dict[str, Any] = {
         "field": a_metadata_field.id,

frontend/web/components/metadata/MetadataPage.tsx

@@ -18,6 +18,7 @@ type MetadataPageType = {
   organisationId: string
   projectId: string
 }
+
 type MergeMetadata = {
   content_type_fields: MetadataModelField[]
   id: number
@@ -48,7 +49,7 @@ const MetadataPage: FC<MetadataPageType> = ({ organisationId, projectId }) => {
           ...item1,
           content_type_fields: matchingItems2,
         }
-      })
+      })?.sort((a, b) => a.id - b.id)
     }
     return null
   }, [metadataFieldList, MetadataModelFieldList])
@@ -63,7 +64,6 @@ const MetadataPage: FC<MetadataPageType> = ({ organisationId, projectId }) => {
       <CreateMetadataField
         onComplete={metadataCreatedToast}
         organisationId={organisationId}
-        projectId={projectId}
         isEdit={false}
       />,
       'side-modal create-feature-modal',
@@ -80,7 +80,6 @@ const MetadataPage: FC<MetadataPageType> = ({ organisationId, projectId }) => {
         onComplete={() => {
           toast('Custom Field Updated')
         }}
-        projectId={projectId}
         organisationId={organisationId}
       />,
       'side-modal create-feature-modal',
@@ -179,6 +178,7 @@ const MetadataPage: FC<MetadataPageType> = ({ organisationId, projectId }) => {
           }
         />
       </FormGroup>
+      
     </PlanBasedBanner>
   )
 }

frontend/web/components/modals/CreateMetadataField.tsx

@@ -32,7 +32,6 @@ type CreateMetadataFieldType = {
   metadataModelFieldList?: MetadataModelField[]
   onComplete?: () => void
   organisationId: string
-  projectId: string
 }
 
 type QueryBody = Omit<MetadataModelField, 'id'>
@@ -54,13 +53,17 @@ type metadataFieldUpdatedSelectListType = MetadataModelField & {
   new: boolean
 }
 
+export enum MetadataContentType {
+  ORGANISATION = 'organisation',
+  PROJECT = 'project',
+}
+
 const CreateMetadataField: FC<CreateMetadataFieldType> = ({
   id,
   isEdit,
   metadataModelFieldList,
   onComplete,
   organisationId,
-  projectId,
 }) => {
   const metadataTypes: MetadataType[] = [
     { id: 1, label: 'int', value: 'int' },
@@ -88,9 +91,10 @@ const CreateMetadataField: FC<CreateMetadataFieldType> = ({
   const [updateMetadataModelField] = useUpdateMetadataModelFieldMutation()
 
   const [deleteMetadataModelField] = useDeleteMetadataModelFieldMutation()
-  const projectContentType: ContentType =
-    supportedContentTypes &&
-    Utils.getContentType(supportedContentTypes, 'model', 'project')
+  const metadataContentType: ContentType =
+  supportedContentTypes &&
+  Utils.getContentType(supportedContentTypes, 'model', MetadataContentType.ORGANISATION)
+  
   useEffect(() => {
     if (data && !isLoading) {
       setName(data.name)
@@ -142,8 +146,8 @@ const CreateMetadataField: FC<CreateMetadataFieldType> = ({
         is_required_for: isRequiredFor
           ? ([
               {
-                content_type: projectContentType.id,
-                object_id: parseInt(projectId),
+                content_type: metadataContentType.id,
+                object_id: parseInt(organisationId),
               } as isRequiredFor,
             ] as isRequiredFor[])
           : [],
@@ -191,8 +195,8 @@ const CreateMetadataField: FC<CreateMetadataFieldType> = ({
                 const query = generateDataQuery(
                   m.content_type,
                   m.field,
-                  m.is_required_for,
-                  m.id,
+                  !!m.is_required_for,
+                  parseInt(m.id),
                   m.new,
                 )
                 if (!m.removed && !m.new) {