METRON-1749 Update Angular to latest release in Management UI (sardell via nickwallen) closes apache/metron#1217
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/0c4c622b Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/0c4c622b Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/0c4c622b Branch: refs/heads/master Commit: 0c4c622b927d1ba3161779dc2e745d5b74ae06b6 Parents: 0e2a434 Author: sardell <sard...@hortonworks.com> Authored: Wed Nov 14 15:02:53 2018 -0500 Committer: nickallen <nickal...@apache.org> Committed: Wed Nov 14 15:02:53 2018 -0500 ---------------------------------------------------------------------- .../docker/rpm-docker/SPECS/metron.spec | 5 +- metron-interface/metron-config/angular-cli.json | 51 - metron-interface/metron-config/angular.json | 155 + metron-interface/metron-config/karma.conf.js | 60 +- .../metron-config/package-lock.json | 18987 ++++++----------- metron-interface/metron-config/package.json | 70 +- metron-interface/metron-config/pom.xml | 10 +- .../scripts/prepend_license_header.sh | 2 +- .../metron-config/scripts/start_dev.sh | 2 +- .../metron-config/src/app/_fonts.scss | 101 + .../metron-config/src/app/_main.scss | 112 - .../metron-config/src/app/app.component.spec.ts | 64 +- .../metron-config/src/app/app.component.ts | 3 +- .../metron-config/src/app/app.config.ts | 4 +- .../metron-config/src/app/app.module.ts | 17 +- .../metron-config/src/app/app.routes.ts | 10 +- .../general-settings.component.spec.ts | 85 +- .../general-settings.component.ts | 48 +- .../metron-config/src/app/global.scss | 2 +- .../default-headers.interceptor.ts | 32 + .../src/app/login/login.component.spec.ts | 42 +- .../metron-config/src/app/model/rest-error.ts | 4 +- .../src/app/navbar/navbar.component.spec.ts | 19 +- .../src/app/navbar/navbar.component.ts | 31 +- .../metron-config/src/app/navbar/navbar.html | 2 +- .../metron-config/src/app/rxjs-operators.ts | 32 - .../sensor-field-schema.component.html | 2 +- .../sensor-field-schema.component.spec.ts | 1088 +- .../sensor-grok/sensor-grok.component.spec.ts | 137 +- .../sensor-grok/sensor-grok.component.ts | 2 +- ...sor-parser-config-readonly.component.spec.ts | 430 +- .../sensor-parser-config-readonly.component.ts | 389 +- .../sensor-parser-config.component.spec.ts | 615 +- .../sensor-parser-config.component.ts | 442 +- .../sensor-parser-list.component.spec.ts | 512 +- .../sensor-raw-json.component.spec.ts | 345 +- .../sensor-storm-settings.component.spec.ts | 294 +- .../sensor-threat-triage.component.spec.ts | 129 +- .../app/service/authentication.service.spec.ts | 276 +- .../src/app/service/authentication.service.ts | 73 +- .../app/service/global-config.service.spec.ts | 101 +- .../src/app/service/global-config.service.ts | 25 +- .../app/service/grok-validation.service.spec.ts | 122 +- .../src/app/service/grok-validation.service.ts | 53 +- .../src/app/service/hdfs.service.spec.ts | 129 +- .../src/app/service/hdfs.service.ts | 63 +- .../src/app/service/kafka.service.spec.ts | 123 +- .../src/app/service/kafka.service.ts | 57 +- .../sensor-enrichment-config.service.spec.ts | 240 +- .../service/sensor-enrichment-config.service.ts | 76 +- .../sensor-indexing-config.service.spec.ts | 150 +- .../service/sensor-indexing-config.service.ts | 62 +- ...sensor-parser-config-history.service.spec.ts | 107 +- .../sensor-parser-config-history.service.ts | 55 +- .../sensor-parser-config.service.spec.ts | 206 +- .../app/service/sensor-parser-config.service.ts | 130 +- .../src/app/service/stellar.service.spec.ts | 187 +- .../src/app/service/stellar.service.ts | 72 +- .../src/app/service/storm.service.spec.ts | 402 +- .../src/app/service/storm.service.ts | 156 +- .../shared/ace-editor/ace-editor.component.ts | 9 +- .../metron-config/src/app/shared/auth-guard.ts | 2 +- .../src/app/shared/metron-dialog-box.ts | 6 +- .../sample-data/sample-data.component.html | 2 +- .../sample-data/sample-data.component.spec.ts | 41 +- .../metron-config/src/app/util/httpUtil.ts | 24 +- .../src/app/util/httpUtils.spec.ts | 57 +- .../verticalnavbar.component.spec.ts | 30 +- .../verticalnavbar/verticalnavbar.component.ts | 3 - .../src/app/verticalnavbar/verticalnavbar.html | 4 +- metron-interface/metron-config/src/styles.scss | 2 +- metron-interface/metron-config/src/test.ts | 66 +- .../metron-config/src/tsconfig.app.json | 23 + .../metron-config/src/tsconfig.json | 24 - .../metron-config/src/tsconfig.spec.json | 24 + metron-interface/metron-config/src/typings.d.ts | 2 +- metron-interface/metron-config/tsconfig.json | 20 + 77 files changed, 10885 insertions(+), 16654 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/0c4c622b/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec b/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec index ed22a28..14c08a1 100644 --- a/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec +++ b/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec @@ -461,15 +461,16 @@ This package installs the Metron Management UI %{metron_home} %attr(0755,root,root) %{metron_home}/web/expressjs/node_modules/.bin/* %attr(0755,root,root) %{metron_home}/web/expressjs/server.js %attr(0644,root,root) %{metron_home}/web/expressjs/package.json +%attr(0644,root,root) %{metron_home}/web/management-ui/styles.*.css %attr(0644,root,root) %{metron_home}/web/management-ui/favicon.ico %attr(0644,root,root) %{metron_home}/web/management-ui/index.html %attr(0644,root,root) %{metron_home}/web/management-ui/*.js -%attr(0644,root,root) %{metron_home}/web/management-ui/*.js.gz %attr(0644,root,root) %{metron_home}/web/management-ui/*.ttf %attr(0644,root,root) %{metron_home}/web/management-ui/*.svg %attr(0644,root,root) %{metron_home}/web/management-ui/*.eot %attr(0644,root,root) %{metron_home}/web/management-ui/*.woff %attr(0644,root,root) %{metron_home}/web/management-ui/*.woff2 +%attr(0644,root,root) %{metron_home}/web/management-ui/3rdpartylicenses.txt %attr(0644,root,root) %{metron_home}/web/management-ui/assets/ace/*.js %attr(0644,root,root) %{metron_home}/web/management-ui/assets/ace/LICENSE %attr(0644,root,root) %{metron_home}/web/management-ui/assets/ace/snippets/*.js @@ -589,6 +590,8 @@ chkconfig --del metron-management-ui chkconfig --del metron-alerts-ui %changelog +* Wed Oct 31 2018 Apache Metron <d...@metron.apache.org> - 0.6.1 +- Update files in Management UI from Angular upgrade * Thu Aug 30 2018 Apache Metron <d...@metron.apache.org> - 0.6.1 - Update compiled css file name for Alerts UI * Fri Aug 24 2018 Apache Metron <d...@metron.apache.org> - 0.6.1 http://git-wip-us.apache.org/repos/asf/metron/blob/0c4c622b/metron-interface/metron-config/angular-cli.json ---------------------------------------------------------------------- diff --git a/metron-interface/metron-config/angular-cli.json b/metron-interface/metron-config/angular-cli.json deleted file mode 100644 index 7e99b78..0000000 --- a/metron-interface/metron-config/angular-cli.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "project": { - "version": "1.0.0-beta.15", - "name": "metron-config" - }, - "apps": [ - { - "root": "src", - "outDir": "dist", - "assets": "assets", - "index": "index.html", - "main": "main.ts", - "test": "test.ts", - "tsconfig": "tsconfig.json", - "prefix": "metron-config", - "mobile": false, - "styles": [ - "../node_modules/bootstrap/dist/css/bootstrap.css", - "../node_modules/font-awesome/css/font-awesome.css", - "styles.scss" - ], - "scripts": [ - "../node_modules/jquery/dist/jquery.js", - "../node_modules/tether/dist/js/tether.js", - "../node_modules/bootstrap/dist/js/bootstrap.js", - "../node_modules/ace-builds/src-noconflict/ace.js" - ], - "environments": { - "source": "environments/environment.ts", - "dev": "environments/environment.ts", - "prod": "environments/environment.prod.ts" - } - } - ], - "addons": [], - "packages": [], - "e2e": { - "protractor": { - "config": "./protractor.conf.js" - } - }, - "test": { - "karma": { - "config": "./karma.conf.js" - } - }, - "defaults": { - "styleExt": "scss", - "prefixInterfaces": false - } -} http://git-wip-us.apache.org/repos/asf/metron/blob/0c4c622b/metron-interface/metron-config/angular.json ---------------------------------------------------------------------- diff --git a/metron-interface/metron-config/angular.json b/metron-interface/metron-config/angular.json new file mode 100644 index 0000000..06c4596 --- /dev/null +++ b/metron-interface/metron-config/angular.json @@ -0,0 +1,155 @@ +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "metron-config": { + "root": "", + "sourceRoot": "src", + "projectType": "application", + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "dist", + "index": "src/index.html", + "main": "src/main.ts", + "tsConfig": "src/tsconfig.app.json", + "assets": [ + "src/assets" + ], + "styles": [ + "node_modules/bootstrap/dist/css/bootstrap.css", + "node_modules/font-awesome/css/font-awesome.css", + "src/styles.scss" + ], + "scripts": [ + "node_modules/jquery/dist/jquery.js", + "node_modules/tether/dist/js/tether.js", + "node_modules/bootstrap/dist/js/bootstrap.js", + "node_modules/ace-builds/src-noconflict/ace.js" + ] + }, + "configurations": { + "production": { + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "extractCss": true, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ] + }, + "e2e": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.e2e.ts" + } + ] + } + } + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "options": { + "browserTarget": "metron-config:build" + }, + "configurations": { + "source": { + "browserTarget": "metron-config:build:source" + }, + "dev": { + "browserTarget": "metron-config:build:dev" + }, + "production": { + "browserTarget": "metron-config:build:production" + } + } + }, + "extract-i18n": { + "builder": "@angular-devkit/build-angular:extract-i18n", + "options": { + "browserTarget": "metron-config:build" + } + }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "src/test.ts", + "karmaConfig": "./karma.conf.js", + "polyfills": "src/polyfills.ts", + "tsConfig": "src/tsconfig.spec.json", + "scripts": [ + "node_modules/jquery/dist/jquery.js", + "node_modules/tether/dist/js/tether.js", + "node_modules/bootstrap/dist/js/bootstrap.js", + "node_modules/ace-builds/src-noconflict/ace.js" + ], + "styles": [ + "node_modules/bootstrap/dist/css/bootstrap.css", + "node_modules/font-awesome/css/font-awesome.css", + "src/vendor.scss", + "src/styles.scss" + ], + "assets": [ + "src/assets", + "src/favicon.ico" + ] + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": [ + "src/tsconfig.app.json", + "src/tsconfig.spec.json" + ], + "exclude": [] + } + } + } + }, + "metron-config-e2e": { + "root": "e2e", + "sourceRoot": "e2e", + "projectType": "application", + "architect": { + "e2e": { + "builder": "@angular-devkit/build-angular:protractor", + "options": { + "protractorConfig": "./protractor.conf.js", + "devServerTarget": "metron-config:serve" + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": [ + "e2e/tsconfig.e2e.json" + ], + "exclude": [] + } + } + } + } + }, + "defaultProject": "metron-config", + "schematics": { + "@schematics/angular:component": { + "prefix": "metron-config", + "styleext": "scss" + }, + "@schematics/angular:directive": { + "prefix": "metron-config" + } + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/metron/blob/0c4c622b/metron-interface/metron-config/karma.conf.js ---------------------------------------------------------------------- diff --git a/metron-interface/metron-config/karma.conf.js b/metron-interface/metron-config/karma.conf.js index 6023550..aa71b96 100644 --- a/metron-interface/metron-config/karma.conf.js +++ b/metron-interface/metron-config/karma.conf.js @@ -15,50 +15,56 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - // Karma configuration file, see link for more information // https://karma-runner.github.io/0.13/config/configuration-file.html +process.env.CHROME_BIN = require('puppeteer').executablePath() + module.exports = function (config) { config.set({ basePath: '', - frameworks: ['jasmine', 'angular-cli'], + frameworks: ['jasmine', '@angular-devkit/build-angular'], plugins: [ require('karma-jasmine'), require('karma-chrome-launcher'), - require('karma-remap-istanbul'), - require('karma-phantomjs-launcher'), - require('angular-cli/plugins/karma') + require('karma-jasmine-html-reporter'), + require('karma-coverage-istanbul-reporter'), + require('@angular-devkit/build-angular/plugins/karma') ], + client:{ + clearContext: false // leave Jasmine Spec Runner output visible in browser + }, mime: { 'text/x-typescript': ['ts','tsx'] }, - files: [ - { pattern: './src/test.ts', watched: false }, - { pattern: './src/assets/**', watched: false, included: false, nocache: false, served: true } - ], - proxies: { - '/assets': '/base/src/assets/' - }, - preprocessors: { - './src/test.ts': ['angular-cli'] + coverageIstanbulReporter: { + dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly', 'text-summary' ], + fixWebpackSourcePaths: true }, - remapIstanbulReporter: { - reports: { - html: 'coverage', - lcovonly: './coverage/coverage.lcov' - } - }, - angularCli: { - config: './angular-cli.json', - environment: 'dev' - }, - reporters: ['progress', 'karma-remap-istanbul'], + captureTimeout: 30000, + browserDisconnectTolerance: 3, + browserDisconnectTimeout : 30000, + browserNoActivityTimeout : 30000, + + reporters: config.angularCli && config.angularCli.codeCoverage + ? ['progress', 'coverage-istanbul'] + : ['progress', 'kjhtml'], port: 9876, colors: true, logLevel: config.LOG_INFO, autoWatch: true, - browsers: ['PhantomJS'], + browsers: ['Chrome','ChromeHeadless'], + customLaunchers: { + ChromeHeadless: { + base: 'Chrome', + flags: [ + '--no-sandbox', + '--headless', + '--disable-gpu', + '--remote-debugging-port=9222' + ] + } + }, singleRun: false }); -}; +}; \ No newline at end of file
