nested domain analytics (datahub-project#1743)

joshuaeilers · web-flow · commit 99fe0b56a884 · 2023-09-08T08:39:48.000-07:00
diff --git a/datahub-web-react/src/app/analytics/event.ts b/datahub-web-react/src/app/analytics/event.ts
@@ -55,6 +55,7 @@ export enum EventType {
     ShowStandardHomepageEvent,
     CreateGlossaryEntityEvent,
     CreateDomainEvent,
+    MoveDomainEvent,
     CreateIngestionSourceEvent,
     UpdateIngestionSourceEvent,
     DeleteIngestionSourceEvent,
@@ -454,6 +455,13 @@ export interface CreateGlossaryEntityEvent extends BaseEvent {
 
 export interface CreateDomainEvent extends BaseEvent {
     type: EventType.CreateDomainEvent;
+    parentDomainUrn?: string;
+}
+
+export interface MoveDomainEvent extends BaseEvent {
+    type: EventType.MoveDomainEvent;
+    oldParentDomainUrn?: string;
+    parentDomainUrn?: string;
 }
 
 // Managed Ingestion Events
@@ -653,6 +661,7 @@ export type Event =
     | ShowStandardHomepageEvent
     | CreateGlossaryEntityEvent
     | CreateDomainEvent
+    | MoveDomainEvent
     | CreateIngestionSourceEvent
     | UpdateIngestionSourceEvent
     | DeleteIngestionSourceEvent
diff --git a/datahub-web-react/src/app/domain/CreateDomainModal.tsx b/datahub-web-react/src/app/domain/CreateDomainModal.tsx
@@ -57,6 +57,7 @@ export default function CreateDomainModal({ onClose, onCreate }: Props) {
                 if (!errors) {
                     analytics.event({
                         type: EventType.CreateDomainEvent,
+                        parentDomainUrn: selectedParentUrn || undefined,
                     });
                     message.success({
                         content: `Created domain!`,
diff --git a/datahub-web-react/src/app/domain/DomainSearch.tsx b/datahub-web-react/src/app/domain/DomainSearch.tsx
@@ -80,7 +80,6 @@ function DomainSearch() {
             setQuery(q);
         }, 250);
     };
-    console.log({ data });
 
     return (
         <DomainSearchWrapper>
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveDomainModal.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveDomainModal.tsx
@@ -1,11 +1,13 @@
 import React, { useState } from 'react';
 import styled from 'styled-components/macro';
 import { message, Button, Modal, Typography, Form } from 'antd';
-import { useEntityData, useRefetch } from '../EntityContext';
+import { useRefetch } from '../EntityContext';
 import { useEntityRegistry } from '../../../useEntityRegistry';
 import { useMoveDomainMutation } from '../../../../graphql/domain.generated';
 import DomainParentSelect from './DomainParentSelect';
 import { useHandleMoveDomainComplete } from './useHandleMoveDomainComplete';
+import { useDomainsContext } from '../../../domain/DomainsContext';
+import { EntityType } from '../../../../types.generated';
 
 const StyledItem = styled(Form.Item)`
     margin-bottom: 0;
@@ -21,7 +23,8 @@ interface Props {
 
 function MoveDomainModal(props: Props) {
     const { onClose } = props;
-    const { urn: entityDataUrn, entityType } = useEntityData();
+    const { entityData } = useDomainsContext();
+    const domainUrn = entityData?.urn;
     const [form] = Form.useForm();
     const entityRegistry = useEntityRegistry();
     const [selectedParentUrn, setSelectedParentUrn] = useState('');
@@ -32,21 +35,23 @@ function MoveDomainModal(props: Props) {
     const { handleMoveDomainComplete } = useHandleMoveDomainComplete();
 
     function moveDomain() {
+        if (!domainUrn) return;
+
         moveDomainMutation({
             variables: {
                 input: {
-                    resourceUrn: entityDataUrn,
-                    parentDomain: selectedParentUrn || null,
+                    resourceUrn: domainUrn,
+                    parentDomain: selectedParentUrn || undefined,
                 },
             },
         })
             .then(() => {
                 message.loading({ content: 'Updating...', duration: 2 });
                 const newParentToUpdate = selectedParentUrn || undefined;
-                handleMoveDomainComplete(entityDataUrn, newParentToUpdate);
+                handleMoveDomainComplete(domainUrn, newParentToUpdate);
                 setTimeout(() => {
                     message.success({
-                        content: `Moved ${entityRegistry.getEntityName(entityType)}!`,
+                        content: `Moved ${entityRegistry.getEntityName(EntityType.Domain)}!`,
                         duration: 2,
                     });
                     refetch();
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/useHandleMoveDomainComplete.ts b/datahub-web-react/src/app/entity/shared/EntityDropdown/useHandleMoveDomainComplete.ts
@@ -2,6 +2,8 @@ import { useApolloClient } from '@apollo/client';
 import { removeFromListDomainsCache, updateListDomainsCache } from '../../../domain/utils';
 import { useDomainsContext } from '../../../domain/DomainsContext';
 import { Domain } from '../../../../types.generated';
+import analytics from '../../../analytics/analytics';
+import { EventType } from '../../../analytics';
 
 export function useHandleMoveDomainComplete() {
     const client = useApolloClient();
@@ -12,6 +14,13 @@ export function useHandleMoveDomainComplete() {
 
         const domain = entityData as Domain;
         const oldParentUrn = domain.parentDomains?.domains.length ? domain.parentDomains.domains[0].urn : undefined;
+
+        analytics.event({
+            type: EventType.MoveDomainEvent,
+            oldParentDomainUrn: oldParentUrn,
+            parentDomainUrn: newParentUrn,
+        });
+
         removeFromListDomainsCache(client, urn, 1, 1000, oldParentUrn);
         updateListDomainsCache(
             client,
diff --git a/metadata-service/services/src/main/java/com/linkedin/metadata/datahubusage/DataHubUsageEventType.java b/metadata-service/services/src/main/java/com/linkedin/metadata/datahubusage/DataHubUsageEventType.java
@@ -53,6 +53,7 @@ public enum DataHubUsageEventType {
   SHOW_STANDARD_HOME_PAGE_EVENT("ShowStandardHomepageEvent"),
   CREATE_GLOSSARY_ENTITY_EVENT("CreateGlossaryEntityEvent"),
   CREATE_DOMAIN_EVENT("CreateDomainEvent"),
+  MOVE_DOMAIN_EVENT("MoveDomainEvent"),
   CREATE_INGESTION_SOURCE_EVENT("CreateIngestionSourceEvent"),
   UPDATE_INGESTION_SOURCE_EVENT("UpdateIngestionSourceEvent"),
   DELETE_INGESTION_SOURCE_EVENT("DeleteIngestionSourceEvent"),
