Catch up fe to internal - includes module consolidations for faster b…

…uild times (#1947)

datahub-web/.eslintrc.js

@@ -55,7 +55,8 @@ module.exports = {
         '**/testem.js',
         '**/index.js',
         '**/config/**/*.js',
-        '**/lib/*/**.js'
+        '**/lib/*/**.js',
+        '**/eyeglass-exports.js'
       ],
       parserOptions: {
         sourceType: 'script',

datahub-web/@datahub/data-models/package.json

@@ -33,7 +33,8 @@
     "ember-cli-typescript": "^3.1.3",
     "ember-fetch": "^7.0.0",
     "ember-lodash": "^4.18.0",
-    "faker": "^4.1.0"
+    "faker": "^4.1.0",
+    "ember-cli-eyeglass": "^6.4.3"
   },
   "devDependencies": {
     "@babel/core": "^7.8.4",

datahub-web/@datahub/data-models/types/entity/rendering/page-components.d.ts

@@ -2,7 +2,7 @@ import { INachoTableConfigs } from '@nacho-ui/table/types/nacho-table';
 import { KeyNamesWithValueType } from '@datahub/utils/types/base';
 import { IDynamicComponent } from '@datahub/shared/types/dynamic-component';
 import { IStandardDynamicProperty } from '@datahub/data-models/types/entity/rendering/properties-panel';
-import { INachoDropdownOption } from '@nacho-ui/dropdown/types/nacho-dropdown';
+import { INachoDropdownOption } from '@nacho-ui/core/types/nacho-dropdown';
 
 // TODO https://jira01.corp.linkedin.com:8443/browse/META-10764: Investigate how to solve the 'wrapper' components scalability issue in generic entity page and search
 /**

datahub-web/@datahub/datasets-core/README.md

@@ -19,8 +19,6 @@ The following styling requirements should be met in order to apply stylings for
 
 ```scss
 // Host application app.scss
-@import 'nacho-core-theme';
-@import 'nacho-core';
 @import 'nacho-table';
 @import 'nacho-pill';
 

datahub-web/@datahub/datasets-core/addon/components/datasets/dataset-schema.hbs

@@ -2,7 +2,7 @@
   <div class="row dataset-schema__header">
     <div class="col-xs-12">
       <div class="btn-group">
-        <Placeholder::NachoToggle
+        <NachoButton::NachoToggle
           aria-label="Toggle Table / JSON Schema View"
           @value={{this.isShowingTable}}
           @leftOptionValue={{true}}

datahub-web/@datahub/datasets-core/addon/components/datasets/relationships/dataset-relationship-table.ts

@@ -13,7 +13,7 @@ import {
   filterLineageByType
 } from '@datahub/datasets-core/utils/lineage';
 import { AppRoute } from '@datahub/data-models/types/entity/shared';
-import { INachoDropdownOption } from '@nacho-ui/dropdown/types/nacho-dropdown';
+import { INachoDropdownOption } from '@nacho-ui/core/types/nacho-dropdown';
 
 /**
  * Shortcut typing to reference dropdown options for relationship types

datahub-web/@datahub/datasets-core/addon/mirage-addon/scenarios/default.ts

@@ -26,7 +26,7 @@ export default function(server: Server | IMirageServer): void {
   generateDatasetSchemaFields(fieldNames, (server as unknown) as Server);
 
   server.createList('datasetPurgePolicy', 1);
-  server.createList('datasets', 1);
+  server.createList('dataset', 1);
   server.createList('datasetComplianceInfo', 1);
   server.createList('datasetExportPolicy', 1);
   server.createList('platform', 20);

datahub-web/@datahub/datasets-core/app/styles/datasets-core/_all.scss → datahub-web/@datahub/datasets-core/addon/styles/datasets-core/_all.scss

@@ -4,4 +4,3 @@
 @import 'interactivity/all';
 @import 'lineage/all';
 @import 'placeholder-nacho-tooltip';
-@import 'placeholder-nacho-toggle';

datahub-web/@datahub/datasets-core/addon/templates/components/datasets/relationships/dataset-relationship-table.hbs

@@ -54,17 +54,17 @@
           {{#if showAllRelationships}}
 
             See Less
-            {{fa-icon
-              "caret-up"
+            <FaIcon
+              @icon="caret-up"
               aria-label="See less relationships"
-            }}
+            />
           {{else}}
 
             See More
-            {{fa-icon
-              "caret-down"
+            <FaIcon
+              @icon="caret-down"
               aria-label="See more relationships"
-            }}
+            />
 
           {{/if}}
         </button>

datahub-web/@datahub/datasets-core/addon/utils/lineage.ts

@@ -1,6 +1,6 @@
 import { IDatasetLineage, DatasetLineageList } from '@datahub/metadata-types/types/entity/dataset/lineage';
 import { arrayFilter, take } from '@datahub/utils/array/index';
-import { INachoDropdownOption } from '@nacho-ui/dropdown/types/nacho-dropdown';
+import { INachoDropdownOption } from '@nacho-ui/core/types/nacho-dropdown';
 
 /**
  * Shortcut typing to reference dropdown options for relationship types

datahub-web/@datahub/datasets-core/eyeglass-exports.js

@@ -0,0 +1,11 @@
+/* eslint-env node */
+
+'use strict';
+
+const path = require('path');
+
+module.exports = function eyeglassExports(/* eyeglass, sass */) {
+  return {
+    sassDir: path.join(__dirname, 'addon', 'styles')
+  };
+};

datahub-web/@datahub/datasets-core/package.json

@@ -3,7 +3,8 @@
   "version": "0.0.1",
   "description": "The handler for datasets as an entity under DataHub",
   "keywords": [
-    "ember-addon"
+    "ember-addon",
+    "eyeglass-module"
   ],
   "repository": "",
   "license": "MIT",
@@ -25,12 +26,10 @@
     "@datahub/data-models": "0.0.0",
     "@datahub/metadata-types": "0.0.0",
     "@datahub/utils": "0.0.0",
-    "@fortawesome/ember-fontawesome": "^0.1.13",
+    "@fortawesome/ember-fontawesome": "^0.2.2",
     "@fortawesome/free-regular-svg-icons": "^5.9.0",
     "@fortawesome/free-solid-svg-icons": "^5.9.0",
-    "@nacho-ui/animations": "^0.0.38",
     "@nacho-ui/core": "^0.0.38",
-    "@nacho-ui/dropdown": "^0.0.38",
     "@nacho-ui/pill": "^0.0.38",
     "@nacho-ui/table": "^0.0.38",
     "@types/ember-resolver": "^5.0.7",
@@ -40,7 +39,10 @@
     "ember-cli-htmlbars": "^4.2.2",
     "ember-cli-typescript": "^3.1.3",
     "ember-composable-helpers": "^3.0.3",
-    "ember-concurrency": "^1.1.2"
+    "ember-concurrency": "^1.1.2",
+    "ember-cli-eyeglass": "^6.4.3",
+    "eyeglass": "^2.4.2",
+    "eyeglass-restyle": "^1.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.8.4",
@@ -60,7 +62,6 @@
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-mirage": "^0.4.15",
-    "ember-cli-sass": "^10.0.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-typescript-blueprints": "^3.0.0",
     "ember-cli-uglify": "^3.0.0",
@@ -88,5 +89,10 @@
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"
+  },
+  "eyeglass": {
+    "needs": "^2.4.2",
+    "name": "datahub-datasets",
+    "exports": "eyeglass-exports.js"
   }
 }

datahub-web/@datahub/datasets-core/tests/dummy/app/styles/app.scss

@@ -1,11 +1,9 @@
 @import 'nacho-core';
 @import 'datahub-utils';
 @import 'nacho-table';
-@import 'nacho-animations';
 @import 'nacho-pill';
-@import 'nacho-dropdown';
 
-@import 'datasets-core';
+@import 'datahub-datasets';
 
 html {
   font-family: 'Source Sans Pro';