frontend details

data-dot-all · Dec 5, 2024 · b8efec6 · b8efec6
1 parent 5fdc070
commit b8efec6
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 13 deletions.
diff --git a/backend/dataall/modules/metadata_forms/api/types.py b/backend/dataall/modules/metadata_forms/api/types.py
@@ -176,5 +176,6 @@
     fields=MetadataFormEnforcementRule.fields[:]
     + [
         gql.Field(name='attached', type=gql.String),
+        gql.Field(name='metadataFormName', type=gql.String),
     ],
 )
diff --git a/backend/dataall/modules/metadata_forms/services/metadata_form_enforcement_service.py b/backend/dataall/modules/metadata_forms/services/metadata_form_enforcement_service.py
@@ -333,8 +333,9 @@ def get_rules_that_affect_entity(entity_type, entity_uri):
                     )
                 )
 
-        for r in all_rules:
-            attached = MetadataFormEnforcementService.get_attachement_for_rule(r, entity_uri)
-            r.attached = attached.uri if attached else None
+            for r in all_rules:
+                attached = MetadataFormEnforcementService.get_attachement_for_rule(r, entity_uri)
+                r.attached = attached.uri if attached else None
+                r.metadataFormName = MetadataFormRepository.get_metadata_form(session, r.metadataFormUri).name
 
         return all_rules
diff --git a/frontend/src/modules/Metadata_Forms/components/MetadataFormEnforcement.js b/frontend/src/modules/Metadata_Forms/components/MetadataFormEnforcement.js
@@ -136,6 +136,9 @@ const CreateEnforcementRuleModal = (props) => {
       await fetchOrganizations();
       await fetchDatasets();
     }
+    setEntityTypes([
+      ...entityTypesOptions.map((t) => ({ ...t, disabled: false }))
+    ]);
   }, [client, open, dispatch]);
 
   async function submit(values, setStatus, setSubmitting, setErrors) {
@@ -218,13 +221,20 @@ const CreateEnforcementRuleModal = (props) => {
                       };
                     })}
                     defaultValue={enforcementScopeDict['Global']}
-                    onChange={(event, value) => {
-                      setFieldValue('scope', value.value);
-                      setEntityTypes(
-                        entityTypesOptions.filter((entityType) => {
-                          return entityType.levels.includes(value.value);
-                        })
-                      );
+                    onChange={async (event, value) => {
+                      entityTypesOptions.forEach((entityType) => {
+                        entityType.disabled = !entityType.levels.includes(
+                          value.value
+                        );
+                      });
+                      setEntityTypes([...entityTypesOptions]);
+                      const active = entityTypesOptions
+                        .filter((t) => !t.disabled)
+                        .map((t) => t.name);
+                      await setFieldValue('scope', value.value);
+                      await setFieldValue('entityTypes', [
+                        ...values.entityTypes.filter((t) => active.includes(t))
+                      ]);
                     }}
                     renderInput={(params) => (
                       <TextField
@@ -348,6 +358,10 @@ const CreateEnforcementRuleModal = (props) => {
                         <FormControlLabel
                           control={
                             <Checkbox
+                              disabled={entityType.disabled}
+                              checked={values.entityTypes.includes(
+                                entityType.name
+                              )}
                               id={entityType.name}
                               onChange={(event, value) => {
                                 if (value) {
@@ -435,8 +449,8 @@ export const MetadataFormEnforcement = (props) => {
       editable: false,
       renderCell: (params) => {
         return (
-          <Label color={params.attached ? 'success' : 'error'}>
-            {params.attached ? 'Yes' : 'No'}
+          <Label color={params.row.attached ? 'success' : 'error'}>
+            {params.row.attached ? 'Yes' : 'No'}
           </Label>
         );
       }

diff --git a/frontend/src/modules/Metadata_Forms/components/metadataAttachment.js b/frontend/src/modules/Metadata_Forms/components/metadataAttachment.js
@@ -270,7 +270,7 @@ export const MetadataAttachment = (props) => {
                         maxLines: 1
                       }}
                     >
-                      {rule.metadataFormUri + ' v.' + rule.version}
+                      {rule.metadataFormName + ' v.' + rule.version}
                     </Typography>
                   </Grid>
                   <Grid item lg={3} xl={3}>

diff --git a/frontend/src/modules/Metadata_Forms/services/listAffectingRulesForEntity.js b/frontend/src/modules/Metadata_Forms/services/listAffectingRulesForEntity.js
@@ -17,6 +17,7 @@ export const listRulesThatAffectEntity = (uri, type) => ({
         homeEntityName
         entityTypes
         metadataFormUri
+        metadataFormName
         version
         severity
         attached