Merge remote-tracking branch 'acryl/jj--support-batch-domains-backend…

…' into jj--support-batch-domains-backend
datahub-project · Aug 4, 2022 · 6d973fa · 6d973fa
2 parents 6b3d445 + caf4fea
commit 6d973fa
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 33 deletions.
diff --git a/...e/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/BatchSetDomainResolver.java b/...e/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/BatchSetDomainResolver.java
@@ -65,7 +65,7 @@ private void validateInputResources(List<ResourceRefInput> resources, QueryConte
 
   private void validateInputResource(ResourceRefInput resource, QueryContext context) {
     final Urn resourceUrn = UrnUtils.getUrn(resource.getResourceUrn());
-    if (!LabelUtils.isAuthorizedToUpdateTerms(context, resourceUrn, resource.getSubResource())) {
+    if (!DomainUtils.isAuthorizedToUpdateDomainsForEntity(context, resourceUrn)) {
       throw new AuthorizationException("Unauthorized to perform this action. Please contact your DataHub administrator.");
     }
     LabelUtils.validateResource(resourceUrn, resource.getSubResource(), resource.getSubResourceType(), _entityService);

diff --git a/...hql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/LabelUtils.java b/...hql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/mutate/util/LabelUtils.java
@@ -249,6 +249,7 @@ public static void validateLabel(Urn labelUrn, String labelEntityType, EntitySer
     }
   }
 
+  // TODO: Move this out into a separate utilities class.
   public static void validateResource(Urn resourceUrn, String subResource, SubResourceType subResourceType, EntityService entityService) {
     if (!entityService.exists(resourceUrn)) {
       throw new IllegalArgumentException(String.format("Failed to update resource with urn %s. Entity does not exist.", resourceUrn));

diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/action/DomainsDropdown.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/action/DomainsDropdown.tsx
@@ -15,23 +15,24 @@ export default function DomainsDropdown({ urns, disabled = false, refetch }: Pro
     const [isEditModalVisible, setIsEditModalVisible] = useState(false);
     const [batchSetDomainMutation] = useBatchSetDomainMutation();
 
-    const batchUnsetDomains = async () => {
-        try {
-            await batchSetDomainMutation({
-                variables: {
-                    input: {
-                        resources: [...urns.map((urn) => ({ resourceUrn: urn }))],
-                    },
+    const batchUnsetDomains = () => {
+        batchSetDomainMutation({
+            variables: {
+                input: {
+                    resources: [...urns.map((urn) => ({ resourceUrn: urn }))],
                 },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success({ content: 'Removed Domain!', duration: 2 });
+                    refetch?.();
+                }
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to remove assets from Domain: \n ${e.message || ''}`, duration: 3 });
             });
-            message.success({ content: 'Removed Domain!', duration: 2 });
-        } catch (e: unknown) {
-            message.destroy();
-            if (e instanceof Error) {
-                message.error({ content: `Failed to re,pve Domain: \n ${e.message || ''}`, duration: 3 });
-            }
-        }
-        refetch?.();
     };
 
     return (

diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SetDomainModal.tsx
@@ -102,25 +102,25 @@ export const SetDomainModal = ({ urns, onCloseModal, refetch }: Props) => {
         if (!selectedDomain) {
             return;
         }
-        try {
-            await batchSetDomainMutation({
-                variables: {
-                    input: {
-                        resources: [...urns.map((urn) => ({ resourceUrn: urn }))],
-                        domainUrn: selectedDomain.urn,
-                    },
+        batchSetDomainMutation({
+            variables: {
+                input: {
+                    resources: [...urns.map((urn) => ({ resourceUrn: urn }))],
                 },
+            },
+        })
+            .then(({ errors }) => {
+                if (!errors) {
+                    message.success({ content: 'Updated Domain!', duration: 2 });
+                    refetch?.();
+                    onModalClose();
+                    setSelectedDomain(undefined);
+                }
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to add assets to Domain: \n ${e.message || ''}`, duration: 3 });
             });
-            message.success({ content: 'Updated Domain!', duration: 2 });
-        } catch (e: unknown) {
-            message.destroy();
-            if (e instanceof Error) {
-                message.error({ content: `Failed to set Domain: \n ${e.message || ''}`, duration: 3 });
-            }
-        }
-        setSelectedDomain(undefined);
-        refetch?.();
-        onModalClose();
     };
 
     const selectValue = (selectedDomain && [selectedDomain?.displayName]) || undefined;