fix(ui): enable search for tag entity in advanced filters and views

datahub-web-react/src/app/buildEntityRegistry.ts

@@ -24,8 +24,9 @@ import { RoleEntity } from './entity/Access/RoleEntity';
 import { RestrictedEntity } from './entity/restricted/RestrictedEntity';
 import { BusinessAttributeEntity } from './entity/businessAttribute/BusinessAttributeEntity';
 import { SchemaFieldPropertiesEntity } from './entity/schemaField/SchemaFieldPropertiesEntity';
+import { FeatureFlagsConfig } from '../types.generated';
 
-export default function buildEntityRegistry() {
+export default function buildEntityRegistry(featureFlags: FeatureFlagsConfig) {
     const registry = new EntityRegistry();
     registry.register(new DatasetEntity());
     registry.register(new DashboardEntity());
@@ -48,9 +49,16 @@ export default function buildEntityRegistry() {
     registry.register(new DataPlatformEntity());
     registry.register(new DataProductEntity());
     registry.register(new DataPlatformInstanceEntity());
-    registry.register(new ERModelRelationshipEntity());
     registry.register(new RestrictedEntity());
-    registry.register(new BusinessAttributeEntity());
     registry.register(new SchemaFieldPropertiesEntity());
+
+    if (featureFlags.businessAttributeEntityEnabled) {
+        registry.register(new BusinessAttributeEntity());
+    }
+
+    if (featureFlags.erModelRelationshipFeatureEnabled) {
+        registry.register(new ERModelRelationshipEntity());
+    }
+
     return registry;
 }

datahub-web-react/src/app/entity/ermodelrelationships/ERModelRelationshipEntity.tsx

@@ -54,7 +54,7 @@ export class ERModelRelationshipEntity implements Entity<ErModelRelationship> {
 
     getPathName = () => 'erModelRelationship';
 
-    getCollectionName = () => '';
+    getCollectionName = () => 'ER-Model-Relationships';
 
     getEntityName = () => 'ER-Model-Relationship';
 

datahub-web-react/src/app/entity/schemaField/SchemaFieldPropertiesEntity.tsx

@@ -24,11 +24,9 @@ export class SchemaFieldPropertiesEntity implements Entity<SchemaFieldEntity> {
     // Currently unused.
     getPathName = () => 'schemaField';
 
-    // Currently unused.
-    getEntityName = () => 'schemaField';
+    getEntityName = () => 'Schema Field';
 
-    // Currently unused.
-    getCollectionName = () => 'schemaFields';
+    getCollectionName = () => 'Schema Fields';
 
     // Currently unused.
     renderProfile = (_: string) => <></>;

datahub-web-react/src/app/entity/tag/Tag.tsx

@@ -38,7 +38,7 @@ export class TagEntity implements Entity<Tag> {
         );
     };
 
-    isSearchEnabled = () => false;
+    isSearchEnabled = () => true;
 
     isBrowseEnabled = () => false;
 

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

@@ -16,6 +16,10 @@ export const ChooseEntityTypeModal = ({ defaultValues, onCloseModal, onOk, title
     const entityRegistry = useEntityRegistry();
     const entityTypes = entityRegistry.getSearchEntityTypes();
 
+    entityTypes.sort((a, b) => {
+        return entityRegistry.getCollectionName(a).localeCompare(entityRegistry.getCollectionName(b));
+    });
+
     const [stagedValues, setStagedValues] = useState(defaultValues || []);
 
     const addEntityType = (newType) => {

datahub-web-react/src/app/useBuildEntityRegistry.ts

@@ -1,8 +1,12 @@
 import { useMemo } from 'react';
 import buildEntityRegistry from './buildEntityRegistry';
+import { useAppConfig } from './useAppConfig';
 
 export default function useBuildEntityRegistry() {
+    const appConfig = useAppConfig();
+    const { featureFlags } = appConfig.config;
+
     return useMemo(() => {
-        return buildEntityRegistry();
-    }, []);
+        return buildEntityRegistry(featureFlags);
+    }, [featureFlags]);
 }