Merge pull request datahub-project#1499 from theseyi/datahub

Updates the origin facet to origin instead of datatorigin
DingHe · Sep 18, 2019 · 33a493e · 33a493e
2 parents e482add + 424e7f7
commit 33a493e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/datahub-web/@datahub/data-models/addon/entity/dataset/fields.ts b/datahub-web/@datahub/data-models/addon/entity/dataset/fields.ts
@@ -8,12 +8,12 @@ import { IDatasetApiView } from '@datahub/metadata-types/types/entity/dataset/da
 export const fields: Array<ISearchEntityRenderProps> = [
   {
     showInAutoCompletion: true,
-    fieldName: 'dataorigin',
+    fieldName: 'origin',
     showInResultsPreview: true,
-    displayName: 'Data Origin',
+    displayName: 'Origin',
     showInFacets: true,
-    desc: 'The data origin of the dataset',
-    example: 'dataorigin:PROD'
+    desc: 'The origin of the dataset',
+    example: 'origin:PROD'
   },
   {
     showInAutoCompletion: true,
@@ -23,7 +23,7 @@ export const fields: Array<ISearchEntityRenderProps> = [
     showInFacets: false,
     desc: 'The name of the dataset',
     example: 'name:TRACKING.PageViewEvent',
-    compute(dataset: IDatasetApiView) {
+    compute(dataset: IDatasetApiView): string {
       const name = dataset.nativeName;
       const platform: DatasetPlatform = dataset.platform;
       // UMP datasets have been defined as <bucket>.<datasetName> format, so we want to extract out only

diff --git a/datahub-web/packages/data-portal/mirage/helpers/search/entity.ts b/datahub-web/packages/data-portal/mirage/helpers/search/entity.ts
@@ -1,12 +1,7 @@
 import { IFunctionRouteHandler } from '@datahub/utils/types/vendor/ember-cli-mirage-deprecated';
 import { DatasetEntity } from '@datahub/data-models/entity/dataset/dataset-entity';
 import searchResponse from 'wherehows-web/mirage/fixtures/search-response';
-import { IEntitySearchResult } from 'wherehows-web/typings/api/search/entity';
-
-interface ISearchResultMetadata {
-  name: string;
-  aggregations: {};
-}
+import { IEntitySearchResult, IAggregationMetadata } from 'wherehows-web/typings/api/search/entity';
 
 export const getEntitySearchResults = function(
   this: IFunctionRouteHandler,
@@ -40,7 +35,7 @@ export const getEntitySearchResults = function(
       return entity;
     });
 
-  let metas: Array<ISearchResultMetadata> = [];
+  let metas: Array<IAggregationMetadata> = [];
 
   return {
     elements: data,