Merge branch 'master' into identify_partition_columns_hive

Author: deepgarg-visa

datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java

@@ -91,8 +91,7 @@ private SearchUtils() {}
           EntityType.DATA_PRODUCT,
           EntityType.NOTEBOOK,
           EntityType.BUSINESS_ATTRIBUTE,
-          EntityType.SCHEMA_FIELD,
-          EntityType.DATA_PLATFORM_INSTANCE);
+          EntityType.SCHEMA_FIELD);
 
   /** Entities that are part of autocomplete by default in Auto Complete Across Entities */
   public static final List<EntityType> AUTO_COMPLETE_ENTITY_TYPES =

datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductResult.tsx

@@ -7,7 +7,6 @@ import { useEntityRegistryV2 } from '../../../useEntityRegistry';
 import { PreviewType } from '../../Entity';
 import EditDataProductModal from './EditDataProductModal';
 import { REDESIGN_COLORS } from '../../shared/constants';
-import useDeleteEntity from '../../shared/EntityDropdown/useDeleteEntity';
 
 const TransparentButton = styled(Button)`
     color: ${REDESIGN_COLORS.RED_ERROR};
@@ -62,10 +61,8 @@ export default function DataProductResult({ dataProduct, onUpdateDataProduct, se
         setDeletedDataProductUrns((currentUrns) => [...currentUrns, dataProduct.urn]);
     }
 
-    const { onDeleteEntity } = useDeleteEntity(dataProduct.urn, dataProduct.type, dataProduct, deleteDataProduct);
-
     function onDeleteDataProduct() {
-        onDeleteEntity();
+        deleteDataProduct();
         setTimeout(() => refetch(), 3000);
     }
 

datahub-web-react/src/app/entityV2/shared/EntityDropdown/UpdateDeprecationModal.tsx

@@ -179,7 +179,12 @@ export const UpdateDeprecationModal = ({ urns, resourceRefs, onClose, refetch, z
                         </Button>
                     )}
                     {!replacementUrn && (
-                        <Button variant="outline" size="sm" onClick={() => setIsReplacementModalVisible(true)}>
+                        <Button
+                            variant="outline"
+                            type="button"
+                            size="sm"
+                            onClick={() => setIsReplacementModalVisible(true)}
+                        >
                             Select Replacement
                         </Button>
                     )}

datahub-web-react/src/app/search/SimpleSearchFilters.tsx

@@ -8,12 +8,19 @@ import {
     DEGREE_FILTER_NAME,
     ENTITY_FILTER_NAME,
     ENTITY_INDEX_FILTER_NAME,
+    ENTITY_SUB_TYPE_FILTER_NAME,
     LEGACY_ENTITY_FILTER_NAME,
+    SCHEMA_FIELD_ALIASES_FILTER_NAME,
 } from './utils/constants';
 
 const TOP_FILTERS = ['degree', ENTITY_FILTER_NAME, 'platform', 'tags', 'glossaryTerms', 'domains', 'owners'];
 
-const FILTERS_TO_EXCLUDE = [LEGACY_ENTITY_FILTER_NAME, ENTITY_INDEX_FILTER_NAME];
+const FILTERS_TO_EXCLUDE = [
+    LEGACY_ENTITY_FILTER_NAME,
+    ENTITY_INDEX_FILTER_NAME,
+    ENTITY_SUB_TYPE_FILTER_NAME,
+    SCHEMA_FIELD_ALIASES_FILTER_NAME,
+];
 
 interface Props {
     facets: Array<FacetMetadata>;

datahub-web-react/src/app/search/utils/constants.ts

@@ -40,6 +40,7 @@ export const INCOMPLETE_FORMS_FILTER_NAME = 'incompleteForms';
 export const VERIFIED_FORMS_FILTER_NAME = 'verifiedForms';
 export const COMPLETED_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME = 'completedFormsCompletedPromptIds';
 export const INCOMPLETE_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME = 'incompleteFormsCompletedPromptIds';
+export const SCHEMA_FIELD_ALIASES_FILTER_NAME = 'schemaFieldAliases';
 
 export const LEGACY_ENTITY_FILTER_FIELDS = [ENTITY_FILTER_NAME, LEGACY_ENTITY_FILTER_NAME];
 

datahub-web-react/src/app/searchV2/SimpleSearchFilters.tsx

@@ -11,10 +11,16 @@ import {
     ENTITY_SUB_TYPE_FILTER_NAME,
     DEGREE_FILTER_NAME,
 } from './utils/constants';
+import { SCHEMA_FIELD_ALIASES_FILTER_NAME } from '../search/utils/constants';
 
 const TOP_FILTERS = ['degree', ENTITY_FILTER_NAME, 'platform', 'tags', 'glossaryTerms', 'domains', 'owners'];
 
-const FILTERS_TO_EXCLUDE = [LEGACY_ENTITY_FILTER_NAME, ENTITY_INDEX_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME];
+const FILTERS_TO_EXCLUDE = [
+    LEGACY_ENTITY_FILTER_NAME,
+    ENTITY_INDEX_FILTER_NAME,
+    ENTITY_SUB_TYPE_FILTER_NAME,
+    SCHEMA_FIELD_ALIASES_FILTER_NAME,
+];
 
 interface Props {
     facets: Array<FacetMetadata>;