Upgrade to v3.0.0 (#367)

* remove empty annotation and review datagrid * upgrade to v3.0.0 * update readme

Author: zrekey

.gitignore

@@ -2,6 +2,7 @@
 .DS_Store
 
 # annotation-app
+annotation-app/.angular
 annotation-app/node_modules
 annotation-app/.npmrc
 annotation-app/chart

README.md

@@ -34,6 +34,14 @@ Core features include:
 - [User guide](https://github.com/vmware/data-annotator-for-machine-learning/wiki/DAML-User-Guide)
 - [Tutorial](https://github.com/vmware/data-annotator-for-machine-learning/wiki/Tutorial:-Using-DAML-to-Label-the-Sentiment-of--VMware-Reddit-and-Twitter-Comments)
 
+## DAML upgrade
+
+- DAML upgrade to v3.0.0 that mainly raise UI/UX to a higher standard
+ - [DAML v3.0.0 release note](https://github.com/vmware/data-annotator-for-machine-learning/releases/tag/v2.1.0). The latest code saved in branch master.
+ - [DAML versions older than v3.0.0 releases](https://github.com/vmware/data-annotator-for-machine-learning/releases). The last version v2.1.0 (which still keep our old UI style) before v3.0.0 is saved in branch DAML-v2.1.0.
+- As for DAML UI upgrade, our e2e code also updated
+ - The latest e2e code saved in branch e2e-test.
+ - The old UI e2e code saved in branch DAML-v2.1.0-e2e.
 
 ## What is included
 

annotation-app/.browserslistrc

@@ -2,11 +2,15 @@
 # For additional information regarding the format and rule options, please see:
 # https://github.com/browserslist/browserslist#queries
 
+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
 # You can see what browsers were selected by your queries by running:
 # npx browserslist
 
-> 0.5%
-last 2 versions
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
 Firefox ESR
-not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.

annotation-app/.prettierignore

@@ -1,3 +1,3 @@
 package.json
 package-lock.json
-node_modules
+node_modules

annotation-app/.prettierrc

@@ -1,6 +1,6 @@
 {
- "printWidth": 100,
+ "printWidth": 120,
  "singleQuote": true,
  "trailingComma": "all",
  "tabWidth": 2
-}
+}

annotation-app/angular.json

@@ -3,204 +3,166 @@
  "version": 1,
  "newProjectRoot": "projects",
  "projects": {
- "clarity-seed": {
+ "annotation-app": {
+ "projectType": "application",
+ "schematics": {
+ "@schematics/angular:component": {
+ "style": "scss"
+ }
+ },
  "root": "",
  "sourceRoot": "src",
- "projectType": "application",
+ "prefix": "app",
  "architect": {
  "build": {
  "builder": "@angular-devkit/build-angular:browser",
  "options": {
- "aot": true,
  "outputPath": "dist",
  "index": "src/index.html",
  "main": "src/main.ts",
- "tsConfig": "src/tsconfig.json",
  "polyfills": "src/polyfills.ts",
- "preserveSymlinks": true,
- "allowedCommonJsDependencies": ["lodash", "jwt"],
- "assets": ["src/libs", "src/assets"],
+ "tsConfig": "tsconfig.app.json",
+ "inlineStyleLanguage": "scss",
+ "assets": [
+ "src/favicon.ico",
+ "src/assets"
+ ],
  "styles": [
- "node_modules/@clr/icons/clr-icons.min.css",
- "node_modules/@clr/ui/clr-ui.min.css",
- "node_modules/label-studio/build/static/css/main.css",
- "src/styles.css"
+ "src/styles.scss",
+ "node_modules/@clr/ui/clr-ui.min.css"
  ],
  "scripts": [
- "node_modules/core-js/client/shim.min.js",
- "node_modules/mutationobserver-shim/dist/mutationobserver.min.js",
- "node_modules/@webcomponents/custom-elements/custom-elements.min.js",
- "node_modules/@clr/icons/clr-icons.min.js",
- "node_modules/web-animations-js/web-animations.min.js",
  "src/libs/userChart.js",
  "src/libs/categoryChart.js",
  "src/libs/hierarchicalChart.js",
- "src/libs/modelChart.js",
- "src/libs/feedback.js",
- "node_modules/label-studio/build/static/js/main.js"
+ "src/libs/modelChart.js"
  ]
  },
  "configurations": {
  "production": {
  "budgets": [
+ {
+ "type": "initial",
+ "maximumWarning": "500kb",
+ "maximumError": "1mb"
+ },
  {
  "type": "anyComponentStyle",
- "maximumWarning": "6kb"
+ "maximumWarning": "2kb",
+ "maximumError": "4kb"
  }
  ],
- "optimization": true,
- "outputHashing": "all",
- "sourceMap": false,
- "namedChunks": false,
- "aot": true,
- "extractLicenses": true,
- "vendorChunk": false,
- "buildOptimizer": true,
  "fileReplacements": [
  {
  "replace": "src/environments/environment.ts",
  "with": "src/environments/environment.prod.ts"
  }
- ]
+ ],
+ "outputHashing": "all"
+ },
+ "development": {
+ "buildOptimizer": false,
+ "optimization": false,
+ "vendorChunk": true,
+ "extractLicenses": false,
+ "sourceMap": true,
+ "namedChunks": true
+ }
+ },
+ "defaultConfiguration": "development"
+ },
+ "serve": {
+ "builder": "@angular-devkit/build-angular:dev-server",
+ "configurations": {
+ "production": {
+ "browserTarget": "annotation-app:build:production"
  },
- "staging": {
+ "development": {
+ "browserTarget": "annotation-app:build:development"
+ }
+ },
+ "defaultConfiguration": "development"
+ },
+ "mfe": {
+ "builder": "ngx-build-plus:build",
+ "options": {
+ "singleBundle": true,
+ "outputPath": "dist",
+ "index": "src/index.html",
+ "main": "src/main.ts",
+ "polyfills": "src/polyfills.ts",
+ "tsConfig": "tsconfig.app.json",
+ "inlineStyleLanguage": "scss",
+ "assets": [
+ "src/favicon.ico",
+ "src/assets"
+ ],
+ "styles": [
+ "src/styles.scss",
+ "node_modules/@clr/ui/clr-ui.min.css"
+ ],
+ "scripts": [
+ "src/libs/userChart.js",
+ "src/libs/categoryChart.js",
+ "src/libs/hierarchicalChart.js",
+ "src/libs/modelChart.js"
+ ]
+ },
+ "configurations": {
+ "prod": {
+ "buildOptimizer": false,
+ "optimization": false,
+ "vendorChunk": true,
+ "extractLicenses": false,
+ "sourceMap": true,
+ "namedChunks": true,
  "fileReplacements": [
  {
  "replace": "src/environments/environment.ts",
- "with": "src/environments/environment.stg.ts"
- }
- ],
- "optimization": true,
- "outputHashing": "all",
- "sourceMap": false,
- "namedChunks": false,
- "aot": true,
- "extractLicenses": true,
- "vendorChunk": false,
- "buildOptimizer": true,
- "budgets": [
- {
- "type": "initial",
- "maximumWarning": "2mb",
- "maximumError": "5mb"
- },
- {
- "type": "anyComponentStyle",
- "maximumWarning": "6kb"
+ "with": "src/environments/environment.prod.ts"
  }
  ]
  },
- "test": {
+ "dev": {
+ "buildOptimizer": false,
+ "optimization": false,
+ "vendorChunk": true,
+ "extractLicenses": false,
+ "sourceMap": true,
+ "namedChunks": true,
  "fileReplacements": [
  {
  "replace": "src/environments/environment.ts",
- "with": "src/environments/environment.test.ts"
+ "with": "src/environments/environment.dev.ts"
  }
- ],
- "optimization": true,
- "outputHashing": "all",
- "sourceMap": false,
- "namedChunks": false,
- "aot": true,
- "extractLicenses": true,
- "vendorChunk": false,
- "buildOptimizer": true,
- "budgets": [
- {
- "type": "initial",
- "maximumWarning": "2mb",
- "maximumError": "5mb"
- },
+ ]
+ },
+ "stg": {
+ "buildOptimizer": false,
+ "optimization": false,
+ "vendorChunk": true,
+ "extractLicenses": false,
+ "sourceMap": true,
+ "namedChunks": true,
+ "fileReplacements": [
  {
- "type": "anyComponentStyle",
- "maximumWarning": "6kb"
+ "replace": "src/environments/environment.ts",
+ "with": "src/environments/environment.stg.ts"
  }
  ]
- }
- }
- },
- "serve": {
- "builder": "@angular-devkit/build-angular:dev-server",
- "options": {
- "browserTarget": "clarity-seed:build"
- },
- "configurations": {
- "production": {
- "browserTarget": "clarity-seed:build:production"
  },
- "staging": {
- "browserTarget": "clarity-seed:build:staging"
- },
- "test": {
- "browserTarget": "clarity-seed:build:test"
+ "development": {
+ "buildOptimizer": false,
+ "optimization": false,
+ "vendorChunk": true,
+ "extractLicenses": false,
+ "sourceMap": true,
+ "namedChunks": true
  }
- }
- },
- "extract-i18n": {
- "builder": "@angular-devkit/build-angular:extract-i18n",
- "options": {
- "browserTarget": "clarity-seed:build"
- }
- },
- "test": {
- "builder": "@angular-devkit/build-angular:karma",
- "options": {
- "main": "src/test.ts",
- "karmaConfig": "./karma.conf.js",
- "scripts": [
- "node_modules/core-js/client/shim.min.js",
- "node_modules/mutationobserver-shim/dist/mutationobserver.min.js",
- "node_modules/@webcomponents/custom-elements/custom-elements.min.js",
- "node_modules/@clr/icons/clr-icons.min.js",
- "node_modules/web-animations-js/web-animations.min.js"
- ],
- "styles": [
- "node_modules/@clr/icons/clr-icons.min.css",
- "node_modules/@clr/ui/clr-ui.min.css",
- "src/styles.css"
- ],
- "assets": ["src/libs", "src/assets"]
- }
- },
- "lint": {
- "builder": "@angular-devkit/build-angular:tslint",
- "options": {
- "tsConfig": [],
- "exclude": []
- }
- }
- }
- },
- "clarity-seed-e2e": {
- "root": "e2e",
- "sourceRoot": "e2e",
- "projectType": "application",
- "architect": {
- "e2e": {
- "builder": "@angular-devkit/build-angular:protractor",
- "options": {
- "protractorConfig": "./protractor.config.js",
- "devServerTarget": "clarity-seed:serve"
- }
- },
- "lint": {
- "builder": "@angular-devkit/build-angular:tslint",
- "options": {
- "tsConfig": [],
- "exclude": []
- }
+ },
+ "defaultConfiguration": "development"
  }
  }
  }
- },
- "defaultProject": "clarity-seed",
- "schematics": {
- "@schematics/angular:component": {
- "prefix": "app",
- "style": "scss"
- },
- "@schematics/angular:directive": {
- "prefix": "app"
- }
  }
-}
+}

annotation-app/build-script.js

@@ -0,0 +1,19 @@
+const fs = require('fs');
+const fse = require('fs-extra');
+const concat = require('concat');
+
+const bundleFileName = 'micro-bundle-loop.js';
+const path = './dist/';
+const filesToConcat = [];
+
+const buildFiles = fs.readdirSync(path);
+for (const file of buildFiles) {
+ if ((file.includes('main') || file.includes('src_app_') || file.includes('scripts') || file.includes('vendors-')) && !(file.includes('.map'))) {
+ filesToConcat.push(path + file);
+ }
+}
+
+(async function build() {
+ await fse.ensureDir('elements');
+ await concat(filesToConcat, 'elements/' + bundleFileName);
+})();