Migration to angular-cli / angular 2.0.0 (#108)

* added generated angular2 project

* added AdminLTE2 theme

* applied infiniboard index.html

* fixed layout

* added routing
added pageNotFound

* added mocked dashboards route

* fixed 404 layout

* added not yet implemented page

* package dashy instead of infiniboard-app

* exposed mongo port locally

* changed CORS port to ng development port

* added dashboard service
extracted dev/prod urls to environment

* building dashy instead of infiniboard-app

* added dashboard components for list / details
added widget service

* moved widget service into dashboard

* added dynamic widget creation

* added platform status widget

* added widget type to quartermaster

* added status pipes

* moved to hash location strategy

* added nvm and license

* moved index site

* removed function order

* seperated frontend build steps

* removed linting as long as app- prefix is required

* removed old client

* added installation of angluar-cli to build

* fixed workin dir

* exporting the default port crashes the circleci build as a local mongod is already running

* pinned dependencies

* added definition of transitive dependency

fix taken from: angular/angular-cli#1997

* fixed cache dir

* added linting to build

removed forces prefix

* cleaned up

removed duplicated links.component
removed unimplemented OnInit / constructor
removed unused AdminLTE layout fix

* activated running of specs

* activated singleRun, so tests can be run on circleci

* disabled test to finish, so it can be fixed one by one

* added junit reporter to karma

* updated angular to 2.0.0

* cleaned up tests

added example for mocking services

* fixed moved import

* fixed linting errors

* added mock data

* added tests for pipes

* added dashboard.ts tests

* used toEqual instead of toBe

* added dashboard service tests

* added widget-config tests

* added tests for widget service

cleanup

* prepared for widget service error teststing

* changed error handling method to return server error

Author: matthiasbalke

circle.yml

@@ -15,7 +15,7 @@ dependencies:
   cache_directories:
     - "~/docker"
     - "~/.npm"
-    - "infiniboard-app/node_modules"
+    - "dashy/node_modules"
 
   override:
     - docker version
@@ -24,7 +24,12 @@ dependencies:
     - if [[ -e ~/docker/mongo.tar ]]; then docker load --input ~/docker/mongo.tar; fi
     - if [[ -e ~/docker/java.tar ]]; then docker load --input ~/docker/java.tar; fi
 
-    - cd infiniboard-app && npm install && cd ..
+    - npm install -g angular-cli@webpack
+    - cd dashy && npm install
+    - cd dashy && ng lint
+    - cd dashy && ng test
+    - cd dashy && ng build --prod
+
     - ./gradlew --stacktrace --console=plain build integrationTest
     - if [ "$CIRCLE_PR_NUMBER" = ""  ]; then ./gradlew --stacktrace --console=plain sonarqube; else ./gradlew --stacktrace --console=plain sonarqube -Dsonar.analysis.mode=issues -Dsonar.github.pullRequest=$CIRCLE_PR_NUMBER -Dsonar.github.repository=$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME -Dsonar.github.oauth=$SONAR_GITHUB_OAUTH; fi
     - ./gradlew --stacktrace --console=plain buildDocker
@@ -38,8 +43,13 @@ dependencies:
     - docker save java:8 > ~/docker/java.tar
 
   post:
+    - mkdir -p $CIRCLE_TEST_REPORTS/ng-coverage/
+    - cp -a dashy/build/coverage $CIRCLE_TEST_REPORTS/dashy-istanbul/
     - mkdir -p $CIRCLE_TEST_REPORTS/junit/
+    - cp -a dashy/build/junit/*.xml $CIRCLE_TEST_REPORTS/junit/
+
     - find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
+
     - mkdir -p $CIRCLE_TEST_REPORTS/junit-html/
     - find . -type d -regex ".**/build/reports/tests" -exec sh -c 'cp -a {} $CIRCLE_TEST_REPORTS/junit-html/`echo {} | cut -d / -f2`' \;
 
@@ -57,6 +67,7 @@ test:
     - echo ">> quartermaster <<"; curl --retry 10 --retry-delay 5 -v http://localhost:8090/health
     - echo ">> harvester <<"; curl --retry 10 --retry-delay 5 -v http://localhost:9090/health
     - echo ">> REST API <<"; curl --retry 10 --retry-delay 5 -v http://localhost:8080/api/dashboards
+    - echo ">> Frontend <<"; curl --retry 10 --retry-delay 5 -v http://localhost:8080/#/dashboards
 
   post:
     - echo "Running Docker containers"; docker ps -a

infiniboard-app/.editorconfig renamed to dashy/.editorconfig

@@ -1,12 +1,14 @@
-# http://editorconfig.org
+# Editor configuration, see http://editorconfig.org
 root = true
 
 [*]
+charset = utf-8
 indent_style = space
 indent_size = 2
-charset = utf-8
-trim_trailing_whitespace = true
+end_of_line = lf
 insert_final_newline = true
+trim_trailing_whitespace = true
 
 [*.md]
+max_line_length = 0
 trim_trailing_whitespace = false

dashy/.gitignore

@@ -0,0 +1,33 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+
+# dependencies
+/node_modules
+/bower_components
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+*.launch
+.settings/
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage/*
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+#System Files
+.DS_Store
+Thumbs.db

infiniboard-app/README.md renamed to dashy/README.md

@@ -1,26 +1,41 @@
-# infiniboard-app
+# dashy
+
+This project was generated with [angular-cli](https://github.com/angular/angular-cli) version 1.0.0-beta.11-webpack.8.
 
 ## tooling
 The usage of [nvm](https://github.com/creationix/nvm) is recommended to switch between different versions of node when necessary.
 For Microsoft Windows based development [nvm-windows](https://github.com/coreybutler/nvm-windows) can be used. 
 The currently used node version can be determined by taking a look the machine section of [circle.yml](https://github.com/reflectoring/infiniboard/blob/master/circle.yml).
 
-## building
+## angular-cli
+
+### Development server
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+
+### Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive/pipe/service/class`.
+
+### Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
+
+### Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+### Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/). 
+Before running the tests make sure you are serving the app via `ng serve`.
+
+### Deploying to Github Pages
 
-### install dependencies
-```
-$ npm install
-```
+Run `ng github-pages:deploy` to deploy to Github Pages.
 
-### build infiniboard-app for production usage
-```
-$ gulp
-```
+### Further help
 
-### build infiniboard-app for development usage
-```
-$ gulp dev
-```
+To get more help on the `angular-cli` use `ng --help` or go check out the [Angular-CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
 
 ## license
 

dashy/angular-cli.json

@@ -0,0 +1,49 @@
+{
+  "project": {
+    "version": "1.0.0-beta.11-webpack.8",
+    "name": "dashy"
+  },
+  "apps": [
+    {
+      "root": "src",
+      "outDir": "dist",
+      "assets": "assets",
+      "index": "index.html",
+      "main": "main.ts",
+      "test": "test.ts",
+      "tsconfig": "tsconfig.json",
+      "prefix": "app",
+      "mobile": false,
+      "styles": [
+        "styles.css"
+      ],
+      "scripts": [
+        "../node_modules/admin-lte/plugins/jQuery/jquery-2.2.3.min.js",
+        "../node_modules/admin-lte/bootstrap/js/bootstrap.min.js",
+        "../node_modules/admin-lte/dist/js/app.min.js"
+      ],
+      "environments": {
+        "source": "environments/environment.ts",
+        "prod": "environments/environment.prod.ts",
+        "dev": "environments/environment.dev.ts"
+      }
+    }
+  ],
+  "addons": [],
+  "packages": [],
+  "e2e": {
+    "protractor": {
+      "config": "./protractor.conf.js"
+    }
+  },
+  "test": {
+    "karma": {
+      "config": "./karma.conf.js"
+    }
+  },
+  "defaults": {
+    "styleExt": "css",
+    "prefixInterfaces": false,
+    "lazyRoutePrefix": "+"
+  }
+}

dashy/e2e/app.e2e-spec.ts

@@ -0,0 +1,14 @@
+import { DashyPage } from './app.po';
+
+describe('dashy App', function() {
+  let page: DashyPage;
+
+  beforeEach(() => {
+    page = new DashyPage();
+  });
+
+  it('should display message saying app works', () => {
+    page.navigateTo();
+    expect(page.getParagraphText()).toEqual('app works!');
+  });
+});

dashy/e2e/app.po.ts

@@ -0,0 +1,11 @@
+import { browser, element, by } from 'protractor/globals';
+
+export class DashyPage {
+  navigateTo() {
+    return browser.get('/');
+  }
+
+  getParagraphText() {
+    return element(by.css('app-root h1')).getText();
+  }
+}

dashy/e2e/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "declaration": false,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "../dist/out-tsc-e2e",
+    "sourceMap": true,
+    "target": "es5",
+    "typeRoots": [
+      "../node_modules/@types"
+    ]
+  }
+}

dashy/karma.conf.js

@@ -0,0 +1,48 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/0.13/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', 'angular-cli'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-remap-istanbul'),
+      require('karma-junit-reporter'),
+      require('angular-cli/plugins/karma')
+    ],
+    files: [
+      {pattern: './src/test.ts', watched: false}
+    ],
+    preprocessors: {
+      './src/test.ts': ['angular-cli']
+    },
+    remapIstanbulReporter: {
+      reports: {
+        html: 'build/coverage',
+        lcovonly: './build/coverage/coverage.lcov'
+      }
+    },
+    angularCli: {
+      config: './angular-cli.json',
+      environment: 'dev'
+    },
+    junitReporter: {
+      outputDir: 'build/junit', // results will be saved as $outputDir/$browserName.xml
+      outputFile: undefined, // if included, results will be saved as $outputDir/$browserName/$outputFile
+      suite: '', // suite will become the package name attribute in xml testsuite element
+      useBrowserName: true, // add browser name to report and classes names
+      nameFormatter: undefined, // function (browser, result) to customize the name attribute in xml testcase element
+      classNameFormatter: undefined, // function (browser, result) to customize the classname attribute in xml testcase element
+      properties: {} // key value pair of properties to add to the <properties> section of the report
+    },
+    reporters: ['progress', 'karma-remap-istanbul', 'junit'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: true
+  });
+};

dashy/package.json

@@ -0,0 +1,47 @@
+{
+  "name": "dashy",
+  "version": "0.0.0",
+  "license": "MIT",
+  "angular-cli": {},
+  "scripts": {
+    "start": "ng serve",
+    "lint": "tslint \"src/**/*.ts\"",
+    "test": "ng test",
+    "pree2e": "webdriver-manager update",
+    "e2e": "protractor"
+  },
+  "private": true,
+  "dependencies": {
+    "@angular/common": "2.0.0",
+    "@angular/compiler": "2.0.0",
+    "@angular/core": "2.0.0",
+    "@angular/forms": "2.0.0",
+    "@angular/http": "2.0.0",
+    "@angular/platform-browser": "2.0.0",
+    "@angular/platform-browser-dynamic": "2.0.0",
+    "@angular/router": "3.0.0",
+    "admin-lte": "2.3.6",
+    "core-js": "2.4.1",
+    "rxjs": "5.0.0-beta.12",
+    "ts-helpers": "1.1.1",
+    "zone.js": "0.6.23"
+  },
+  "devDependencies": {
+    "@types/jasmine": "2.2.30",
+    "awesome-typescript-loader": "2.2.1",
+    "angular-cli": "1.0.0-beta.14",
+    "codelyzer": "0.0.26",
+    "jasmine-core": "2.4.1",
+    "jasmine-spec-reporter": "2.5.0",
+    "karma": "1.2.0",
+    "karma-chrome-launcher": "2.0.0",
+    "karma-cli": "1.0.1",
+    "karma-jasmine": "1.0.2",
+    "karma-junit-reporter": "1.1.0",
+    "karma-remap-istanbul": "0.2.1",
+    "protractor": "4.0.5",
+    "ts-node": "1.2.1",
+    "tslint": "3.13.0",
+    "typescript": "2.0.2"
+  }
+}

dashy/protractor.conf.js

@@ -0,0 +1,32 @@
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/docs/referenceConf.js
+
+/*global jasmine */
+var SpecReporter = require('jasmine-spec-reporter');
+
+exports.config = {
+  allScriptsTimeout: 11000,
+  specs: [
+    './e2e/**/*.e2e-spec.ts'
+  ],
+  capabilities: {
+    'browserName': 'chrome'
+  },
+  directConnect: true,
+  baseUrl: 'http://localhost:4200/',
+  framework: 'jasmine',
+  jasmineNodeOpts: {
+    showColors: true,
+    defaultTimeoutInterval: 30000,
+    print: function() {}
+  },
+  useAllAngular2AppRoots: true,
+  beforeLaunch: function() {
+    require('ts-node').register({
+      project: 'e2e'
+    });
+  },
+  onPrepare: function() {
+    jasmine.getEnv().addReporter(new SpecReporter());
+  }
+};