Merge from dev to master

.travis.yml

@@ -2,7 +2,7 @@ language: node_js
 node_js:
   - "6.9"
 before_script: 
-  - npm install -g --silent @angular/cli@1.1.3
+  - npm install -g --silent @angular/cli@1.2.6
   - npm install -g --silent yarn
 script:
   - cd server && yarn install && yarn run gulp build-all && tsc && cd ../AzureFunctions.AngularClient && yarn install && ng build -prod 

AzureFunctions.AngularClient/.vscode/settings.json

@@ -1,2 +1,6 @@
 // Place your settings in this file to overwrite default and user settings.
-{}
+{
+    "[typescript]": {
+        "editor.formatOnSave": true
+    }    
+}

AzureFunctions.AngularClient/package.json

@@ -1,67 +1,70 @@
 {
-  "name": "azure-functions-client",
-  "version": "0.0.0",
-  "license": "MIT",
-  "angular-cli": {},
-  "scripts": {
-    "ng": "ng",
-    "watch": "ng b -w",
-    "start": "ng serve",
-    "build": "ng build",
-    "test": "ng test",
-    "lint": "ng lint",
-    "e2e": "ng e2e",
-    "bundle-report": "webpack-bundle-analyzer ../azurefunctions/ng-full/stats.json"
-  },
-  "private": true,
-  "dependencies": {
-    "@angular/common": "^4.0.0",
-    "@angular/compiler": "^4.0.0",
-    "@angular/core": "^4.0.0",
-    "@angular/forms": "^4.0.0",
-    "@angular/http": "^4.0.0",
-    "@angular/platform-browser": "^4.0.0",
-    "@angular/platform-browser-dynamic": "^4.0.0",
-    "@angular/router": "^4.0.0",
-    "@ngx-translate/core": "^6.0.1",
-    "angular2-uuid": "^1.1.1",
-    "azure-mobile-apps-client": "^2.0.1",
-    "bootstrap": "^3.3.7",
-    "core-js": "^2.4.1",
-    "font-awesome": "^4.7.0",
-    "jsonschema": "^1.1.1",
-    "marked": "^0.3.9",
-    "moment": "^2.17.0",
-    "monaco-editor": "^0.10.0",
-    "ng-sidebar": "^6.0.1",
-    "ng2-cookies": "^1.0.3",
-    "ng2-file-upload": "~1.2.1",
-    "ng2-popover": "^0.0.14",
-    "node-sass": "^4.7.2",
-    "rxjs": "^5.1.0",
-    "swagger-editor": "git+/~https://github.com/azure/swagger-editor.git#ff974a50cc7c756f0a96a66f1e92f1286324c549",
-    "ts-helpers": "^1.1.1",
-    "zone.js": "^0.8.4"
-  },
-  "devDependencies": {
-    "@angular/cli": "^1.1.3",
-    "@angular/compiler-cli": "^4.0.0",
-    "@types/jasmine": "2.5.38",
-    "@types/jsonschema": "^1.1.1",
-    "@types/node": "~6.0.60",
-    "codelyzer": "~2.0.0",
-    "jasmine-core": "~2.5.2",
-    "jasmine-spec-reporter": "~3.2.0",
-    "karma": "~1.4.1",
-    "karma-chrome-launcher": "~2.0.0",
-    "karma-cli": "~1.0.1",
-    "karma-coverage-istanbul-reporter": "^0.2.0",
-    "karma-jasmine": "~1.1.0",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.1.0",
-    "ts-node": "~2.0.0",
-    "tslint": "~4.5.0",
-    "typescript": "^2.4.1",
-    "webpack-bundle-analyzer": "^2.9.0"
-  }
+    "name": "azure-functions-client",
+    "version": "0.0.0",
+    "license": "MIT",
+    "angular-cli": {},
+    "scripts": {
+        "ng": "ng",
+        "watch": "ng b -w",
+        "start": "ng serve",
+        "build": "ng build",
+        "test": "ng test",
+        "lint": "ng lint",
+        "e2e": "ng e2e",
+        "bundle-report": "webpack-bundle-analyzer ../azurefunctions/ng-full/stats.json"
+    },
+    "private": true,
+    "dependencies": {
+        "@angular/common": "^4.0.0",
+        "@angular/compiler": "^4.0.0",
+        "@angular/core": "^4.0.0",
+        "@angular/forms": "^4.0.0",
+        "@angular/http": "^4.0.0",
+        "@angular/platform-browser": "^4.0.0",
+        "@angular/platform-browser-dynamic": "^4.0.0",
+        "@angular/router": "^4.0.0",
+        "@ngx-translate/core": "^6.0.1",
+        "angular2-uuid": "^1.1.1",
+        "azure-mobile-apps-client": "^2.0.1",
+        "bootstrap": "^3.3.7",
+        "core-js": "^2.4.1",
+        "font-awesome": "^4.7.0",
+        "jsonschema": "^1.1.1",
+        "marked": "^0.3.9",
+        "moment": "^2.17.0",
+        "monaco-editor": "^0.10.0",
+        "ng-sidebar": "^6.0.1",
+        "ng2-cookies": "^1.0.3",
+        "ng2-file-upload": "~1.2.1",
+        "ng2-popover": "^0.0.14",
+        "node-sass": "^4.7.2",
+        "rxjs": "^5.1.0",
+        "swagger-editor": "git+/~https://github.com/azure/swagger-editor.git#ff974a50cc7c756f0a96a66f1e92f1286324c549",
+        "ts-helpers": "^1.1.1",
+        "zone.js": "^0.8.4",
+        "ng-sidebar": "^6.0.1",
+        "lodash": "4.17.4"
+    },
+    "devDependencies": {
+        "@angular/cli": "^1.1.3",
+        "@angular/compiler-cli": "^4.0.0",
+        "@types/jasmine": "2.5.38",
+        "@types/jsonschema": "^1.1.1",
+        "@types/node": "~6.0.60",
+        "@types/lodash": "^4.14.80",
+        "codelyzer": "~2.0.0",
+        "jasmine-core": "~2.5.2",
+        "jasmine-spec-reporter": "~3.2.0",
+        "karma": "~1.4.1",
+        "karma-chrome-launcher": "~2.0.0",
+        "karma-cli": "~1.0.1",
+        "karma-coverage-istanbul-reporter": "^0.2.0",
+        "karma-jasmine": "~1.1.0",
+        "karma-jasmine-html-reporter": "^0.2.2",
+        "protractor": "~5.1.0",
+        "ts-node": "~2.0.0",
+        "tslint": "~4.5.0",
+        "typescript": "^2.4.1",
+        "webpack-bundle-analyzer": "^2.9.0"
+    }
 }

AzureFunctions.AngularClient/src/app/app.module.ts

@@ -17,6 +17,7 @@ import 'rxjs/add/operator/distinctUntilChanged';
 import 'rxjs/add/operator/do';
 import 'rxjs/add/operator/filter';
 import 'rxjs/add/operator/first';
+import 'rxjs/add/observable/forkJoin';
 import 'rxjs/add/operator/map';
 import 'rxjs/add/operator/merge';
 import 'rxjs/add/operator/mergeMap';

AzureFunctions.AngularClient/src/app/controls/form-wizard/components/wizard-completion-step.component.css

@@ -0,0 +1,4 @@
+:host {
+  height: auto;
+  width: 100%;
+}

AzureFunctions.AngularClient/src/app/controls/form-wizard/components/wizard-completion-step.component.html

@@ -0,0 +1 @@
+<ng-content></ng-content>

AzureFunctions.AngularClient/src/app/controls/form-wizard/components/wizard-completion-step.component.spec.ts

@@ -0,0 +1,139 @@
+/**
+ * Created by marc on 20.05.17.
+ */
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {WizardCompletionStepComponent} from './wizard-completion-step.component';
+import {ViewChild, Component} from '@angular/core';
+import {WizardComponent} from './wizard.component';
+import {MovingDirection} from '../util/moving-direction.enum';
+import {By} from '@angular/platform-browser';
+import {WizardModule} from '../wizard.module';
+
+@Component({
+  selector: 'test-wizard',
+  template: `
+    <wizard>
+      <wizard-step title='Steptitle 1' (stepEnter)="enterInto($event, 1)" (stepExit)="exitFrom($event, 1)">Step 1</wizard-step>
+      <wizard-step title='Steptitle 2' [canExit]="isValid"
+                   optionalStep (stepEnter)="enterInto($event, 2)" (stepExit)="exitFrom($event, 2)">Step 2</wizard-step>
+      <wizard-completion-step title='Completion steptitle 3' (stepEnter)="enterInto($event, 3)">Step 3</wizard-completion-step>
+    </wizard>
+  `
+})
+class WizardTestComponent {
+  @ViewChild(WizardComponent)
+  public wizard: WizardComponent;
+
+  public isValid: any = true;
+
+  public eventLog: Array<string> = new Array<string>();
+
+  enterInto(direction: MovingDirection, destination: number): void {
+    this.eventLog.push(`enter ${MovingDirection[direction]} ${destination}`);
+  }
+
+  exitFrom(direction: MovingDirection, source: number): void {
+    this.eventLog.push(`exit ${MovingDirection[direction]} ${source}`);
+  }
+}
+
+describe('WizardCompletionStepComponent', () => {
+  let wizardTest: WizardTestComponent;
+  let wizardTestFixture: ComponentFixture<WizardTestComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [WizardTestComponent],
+      imports: [WizardModule]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    wizardTestFixture = TestBed.createComponent(WizardTestComponent);
+    wizardTest = wizardTestFixture.componentInstance;
+    wizardTestFixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(wizardTest).toBeTruthy();
+    expect(wizardTestFixture.debugElement.queryAll(By.css('wizard-step')).length).toBe(2);
+    expect(wizardTestFixture.debugElement.queryAll(By.css('wizard-completion-step')).length).toBe(1);
+  });
+
+  it('should have correct step title', () => {
+    expect(wizardTest).toBeTruthy();
+    expect(wizardTest.wizard.getStepAtIndex(0).title).toBe('Steptitle 1');
+    expect(wizardTest.wizard.getStepAtIndex(1).title).toBe('Steptitle 2');
+    expect(wizardTest.wizard.getStepAtIndex(2).title).toBe('Completion steptitle 3');
+  });
+
+  it('should enter first step after initialisation', () => {
+    expect(wizardTest.eventLog).toEqual(['enter Forwards 1']);
+  });
+
+  it('should enter completion step after first step', () => {
+    expect(wizardTest.wizard.currentStepIndex).toBe(0);
+
+    wizardTest.wizard.goToNextStep();
+    wizardTestFixture.detectChanges();
+
+    expect(wizardTest.wizard.currentStepIndex).toBe(1);
+    expect(wizardTest.eventLog).toEqual(['enter Forwards 1', 'exit Forwards 1', 'enter Forwards 2']);
+
+    wizardTest.wizard.goToNextStep();
+    wizardTestFixture.detectChanges();
+
+    expect(wizardTest.wizard.currentStepIndex).toBe(2);
+    expect(wizardTest.eventLog).toEqual(['enter Forwards 1', 'exit Forwards 1', 'enter Forwards 2',
+      'exit Forwards 2', 'enter Forwards 3']);
+  });
+
+  it('should enter completion step after jumping over second optional step', () => {
+    wizardTest.wizard.goToStep(2);
+    wizardTestFixture.detectChanges();
+
+    expect(wizardTest.eventLog).toEqual(['enter Forwards 1', 'exit Forwards 1', 'enter Forwards 3']);
+  });
+
+  it('should set the wizard as completed after entering the completion step', () => {
+    wizardTest.wizard.goToStep(2);
+    wizardTestFixture.detectChanges();
+
+    expect(wizardTest.wizard.completed).toBe(true);
+  });
+
+  it('should be unable to leave the completion step', () => {
+    wizardTest.wizard.goToStep(2);
+    wizardTestFixture.detectChanges();
+
+    expect(wizardTest.wizard.canGoToStep(0)).toBe(false);
+    expect(wizardTest.wizard.canGoToStep(1)).toBe(false);
+  });
+
+
+  it('should not be able to leave the completion step in any direction', () => {
+    wizardTest.isValid = false;
+
+    wizardTest.wizard.goToStep(2);
+    wizardTestFixture.detectChanges();
+
+    expect(wizardTest.wizard.currentStepIndex).toBe(2);
+    expect(wizardTest.wizard.currentStep.canExit).toBe(false);
+  });
+
+  it('should not leave the completion step if it can\'t be exited', () => {
+    wizardTest.isValid = false;
+
+    wizardTest.wizard.goToStep(2);
+    wizardTestFixture.detectChanges();
+
+    expect(wizardTest.wizard.currentStepIndex).toBe(2);
+
+    wizardTest.wizard.goToPreviousStep();
+    wizardTestFixture.detectChanges();
+
+    expect(wizardTest.wizard.currentStepIndex).toBe(2);
+    expect(wizardTest.eventLog)
+      .toEqual(['enter Forwards 1', 'exit Forwards 1', 'enter Forwards 3', 'enter Stay 3']);
+  });
+});