Merging in the latest

datahub-project · Aug 3, 2022 · f19c050 · f19c050
1 parent 6c55151
commit f19c050
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 24 deletions.
diff --git a/datahub-web-react/src/app/analytics/event.ts b/datahub-web-react/src/app/analytics/event.ts
@@ -15,6 +15,7 @@ export enum EventType {
     EntityViewEvent,
     EntitySectionViewEvent,
     EntityActionEvent,
+    BatchEntityActionEvent,
     RecommendationImpressionEvent,
     RecommendationClickEvent,
     SearchAcrossLineageEvent,
@@ -156,10 +157,16 @@ export const EntityActionType = {
 export interface EntityActionEvent extends BaseEvent {
     type: EventType.EntityActionEvent;
     actionType: string;
-    entityType: EntityType;
+    entityType?: EntityType;
     entityUrn: string;
 }
 
+export interface BatchEntityActionEvent extends BaseEvent {
+    type: EventType.BatchEntityActionEvent;
+    actionType: string;
+    entityUrns: string[];
+}
+
 export interface RecommendationImpressionEvent extends BaseEvent {
     type: EventType.RecommendationImpressionEvent;
     renderId: string; // TODO : Determine whether we need a render id to join with click event.
@@ -221,4 +228,5 @@ export type Event =
     | SearchAcrossLineageEvent
     | SearchAcrossLineageResultsViewEvent
     | DownloadAsCsvEvent
-    | RecommendationClickEvent;
+    | RecommendationClickEvent
+    | BatchEntityActionEvent;
diff --git a/datahub-web-react/src/app/entity/group/GroupOwnerSideBarSection.tsx b/datahub-web-react/src/app/entity/group/GroupOwnerSideBarSection.tsx
@@ -54,7 +54,7 @@ export default function GroupOwnerSideBarSection({ urn, ownership, refetch }: Pr
                 <EditOwnersModal
                     urns={[urn]}
                     hideOwnerType
-                    type={EntityType.CorpGroup}
+                    entityType={EntityType.CorpGroup}
                     refetch={refetch}
                     onCloseModal={() => {
                         setShowAddModal(false);

diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectActions.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/SearchSelectActions.tsx
@@ -16,7 +16,11 @@ import { SelectActionGroups } from './types';
  *
  * Currently, only the change tags action is implemented.
  */
-const DEFAULT_ACTION_GROUPS = [SelectActionGroups.CHANGE_TAGS, SelectActionGroups.CHANGE_GLOSSARY_TERMS, SelectActionGroups.CHANGE_OWNERS];
+const DEFAULT_ACTION_GROUPS = [
+    SelectActionGroups.CHANGE_TAGS,
+    SelectActionGroups.CHANGE_GLOSSARY_TERMS,
+    SelectActionGroups.CHANGE_OWNERS,
+];
 
 type Props = {
     selectedEntities: EntityAndType[];

diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/action/OwnersDropdown.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/action/OwnersDropdown.tsx
@@ -1,5 +1,4 @@
 import React, { useState } from 'react';
-import { EntityType } from '../../../../../../../types.generated';
 import { EditOwnersModal, OperationType } from '../../../../containers/profile/sidebar/Ownership/EditOwnersModal';
 import ActionDropdown from './ActionDropdown';
 
@@ -39,7 +38,6 @@ export default function OwnersDropdown({ urns, disabled = false, refetch }: Prop
             {isEditModalVisible && (
                 <EditOwnersModal
                     urns={urns}
-                    type={EntityType.Dataset} // TODO: Remove
                     operationType={operationType}
                     onCloseModal={() => {
                         setIsEditModalVisible(false);

diff --git a/...-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx b/...-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal.tsx
@@ -35,12 +35,12 @@ export enum OperationType {
 
 type Props = {
     urns: string[];
-    type: EntityType;
     defaultOwnerType?: OwnershipType;
     hideOwnerType?: boolean | undefined;
     operationType?: OperationType;
     onCloseModal: () => void;
     refetch?: () => Promise<any>;
+    entityType?: EntityType; // Only used for tracking events
 };
 
 // value: {ownerUrn: string, ownerEntityType: EntityType}
@@ -51,12 +51,12 @@ type SelectedOwner = {
 
 export const EditOwnersModal = ({
     urns,
-    type,
     hideOwnerType,
     defaultOwnerType,
     operationType = OperationType.ADD,
     onCloseModal,
     refetch,
+    entityType,
 }: Props) => {
     const entityRegistry = useEntityRegistry();
     const [inputValue, setInputValue] = useState('');
@@ -82,12 +82,12 @@ export const EditOwnersModal = ({
     }, [ownershipTypes]);
 
     // Invokes the search API as the owner types
-    const handleSearch = (entityType: EntityType, text: string, searchQuery: any) => {
+    const handleSearch = (type: EntityType, text: string, searchQuery: any) => {
         if (text.length > 2) {
             searchQuery({
                 variables: {
                     input: {
-                        type: entityType,
+                        type,
                         query: text,
                         start: 0,
                         count: 5,
@@ -185,6 +185,23 @@ export const EditOwnersModal = ({
         );
     };
 
+    const emitAnalytics = async () => {
+        if (urns.length > 1) {
+            analytics.event({
+                type: EventType.BatchEntityActionEvent,
+                actionType: EntityActionType.UpdateOwnership,
+                entityUrns: urns,
+            });
+        } else {
+            analytics.event({
+                type: EventType.EntityActionEvent,
+                actionType: EntityActionType.UpdateOwnership,
+                entityType,
+                entityUrn: urns[0],
+            });
+        }
+    };
+
     const batchAddOwners = async (inputs) => {
         try {
             await batchAddOwnersMutation({
@@ -196,12 +213,7 @@ export const EditOwnersModal = ({
                 },
             });
             message.success({ content: 'Owners Added', duration: 2 });
-            analytics.event({
-                type: EventType.EntityActionEvent,
-                actionType: EntityActionType.UpdateOwnership,
-                entityType: type,
-                entityUrn: urns[0],
-            });
+            emitAnalytics();
         } catch (e: unknown) {
             message.destroy();
             if (e instanceof Error) {
@@ -224,12 +236,7 @@ export const EditOwnersModal = ({
                 },
             });
             message.success({ content: 'Owners Removed', duration: 2 });
-            analytics.event({
-                type: EventType.EntityActionEvent,
-                actionType: EntityActionType.UpdateOwnership,
-                entityType: type,
-                entityUrn: urns[0],
-            });
+            emitAnalytics();
         } catch (e: unknown) {
             message.destroy();
             if (e instanceof Error) {

diff --git a/...-react/src/app/entity/shared/containers/profile/sidebar/Ownership/SidebarOwnerSection.tsx b/...-react/src/app/entity/shared/containers/profile/sidebar/Ownership/SidebarOwnerSection.tsx
@@ -42,7 +42,7 @@ export const SidebarOwnerSection = ({ properties }: { properties?: any }) => {
                     urns={[mutationUrn]}
                     defaultOwnerType={properties?.defaultOwnerType}
                     hideOwnerType={properties?.hideOwnerType || false}
-                    type={entityType}
+                    entityType={entityType}
                     refetch={refetch}
                     onCloseModal={() => {
                         setShowAddModal(false);

diff --git a/datahub-web-react/src/app/shared/TagStyleEntity.tsx b/datahub-web-react/src/app/shared/TagStyleEntity.tsx
@@ -427,7 +427,7 @@ export default function TagStyleEntity({ urn, useGetSearchResults = useWrappedSe
                                     setShowAddModal(false);
                                 }}
                                 urns={[urn]}
-                                type={EntityType.Tag}
+                                entityType={EntityType.Tag}
                             />
                         )}
                     </div>