docs(cb-form-validation): ward's tweaks

renamed from cb-validation to cb-form-validation
other refactorings and text changes

Author: wardbell

public/docs/_examples/cb-validation/e2e-spec.ts renamed to public/docs/_examples/cb-form-validation/e2e-spec.ts

@@ -1,12 +1,10 @@
-// #docplaster
 // #docregion
 import { Component } from '@angular/core';
 
 @Component({
   selector: 'my-app',
   template: `<hero-form-template></hero-form-template>
              <hr>
-             <hero-form-model></hero-form-model>`
+             <hero-form-reactive></hero-form-reactive>`
 })
 export class AppComponent { }
-// #enddocregion

public/docs/_examples/cb-validation/ts/app/app.component.ts renamed to public/docs/_examples/cb-form-validation/ts/app/app.component.ts

@@ -0,0 +1,18 @@
+// #docregion
+import { NgModule }      from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+
+import { AppComponent }           from './app.component';
+import { HeroFormTemplateModule } from './template/hero-form-template.module';
+import { HeroFormReactiveModule } from './reactive/hero-form-reactive.module';
+
+@NgModule({
+  imports: [
+    BrowserModule,
+    HeroFormTemplateModule,
+    HeroFormReactiveModule
+  ],
+  declarations: [ AppComponent ],
+  bootstrap:    [ AppComponent ]
+})
+export class AppModule { }

public/docs/_examples/cb-form-validation/ts/app/app.module.ts

@@ -1,8 +1,6 @@
-// #docplaster
 // #docregion
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 import { AppModule } from './app.module';
 
 platformBrowserDynamic().bootstrapModule(AppModule);
-// #enddocregion

public/docs/_examples/cb-validation/ts/app/main.ts renamed to public/docs/_examples/cb-form-validation/ts/app/main.ts

@@ -0,0 +1,45 @@
+ <!-- #docregion -->
+<div class="container">
+  <div [hidden]="submitted">
+    <h1>Hero Form (Reactive)</h1>
+    <form [formGroup]="heroForm" *ngIf="active" (ngSubmit)="onSubmit()">
+      <div class="form-group">
+        <!-- #docregion name-with-error-msg -->
+        <label for="name">Name</label>
+        <input type="text" id="name" class="form-control"
+               formControlName="name"
+               [ngClass]="{'required': isRequired('name')}">
+        <div *ngIf="formError.name" class="alert alert-danger">
+          {{ formError.name }}
+        </div>
+        <!-- #enddocregion name-with-error-msg -->
+      </div>
+
+      <div class="form-group">
+        <label for="alterEgo">Alter Ego</label>
+        <input type="text" id="alterEgo" class="form-control"
+            formControlName="alterEgo"
+            [ngClass]="{'required': isRequired('alterEgo')}" >
+      </div>
+
+      <div class="form-group">
+        <label for="power">Hero Power</label>
+        <select id="power" class="form-control"
+            formControlName="power"
+            [ngClass]="{'required': isRequired('power')}" >
+          <option *ngFor="let p of powers" [value]="p">{{p}}</option>
+        </select>
+        <div *ngIf="formError.power" class="alert alert-danger">
+          {{ formError.power }}
+        </div>
+      </div>
+
+      <button type="submit" class="btn btn-default"
+             [disabled]="!heroForm.valid">Submit</button>
+      <button type="button" class="btn btn-default"
+             (click)="newHero()">New Hero</button>
+    </form>
+  </div>
+
+  <hero-submitted [hero]="model" [(submitted)]="submitted"></hero-submitted>
+</div>

public/docs/_examples/cb-form-validation/ts/app/reactive/hero-form-reactive.component.html

@@ -0,0 +1,107 @@
+/* tslint:disable: member-ordering forin */
+// #docplaster
+// #docregion
+import { Component, OnInit }                  from '@angular/core';
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+
+import { Hero } from '../shared/hero';
+
+@Component({
+  moduleId:  module.id,
+  selector: 'hero-form-reactive',
+  templateUrl: 'hero-form-reactive.component.html'
+})
+// #docregion class
+export class HeroFormReactiveComponent implements OnInit {
+
+  powers = ['Really Smart', 'Super Flexible', 'Weather Changer'];
+
+  model = new Hero(18, 'Dr. WhatIsHisWayTooLongName', this.powers[0], 'Dr. What');
+
+  submitted = false;
+
+  onSubmit() {
+    this.submitted = true;
+    this.model = this.heroForm.value;
+  }
+// #enddocregion class
+
+  // Reset the form with a new hero AND restore 'pristine' class state
+  // by toggling 'active' flag which causes the form
+  // to be removed/re-added in a tick via NgIf
+  // TODO: Workaround until NgForm has a reset method (#6822)
+  // #docregion new-hero
+  active = true;
+
+// #docregion class
+  newHero() {
+    this.model = new Hero(42, '', '');
+    this.buildForm();
+    this.onValueChanged('');
+// #enddocregion class
+
+    this.active = false;
+    setTimeout(() => this.active = true, 0);
+// #docregion class
+  }
+
+  //// New with Reactive Form
+
+  heroForm: FormGroup;
+  constructor(private builder: FormBuilder) { }
+
+  ngOnInit(): void { this.buildForm();  }
+
+  formError = {
+    'name': '',
+    'power': ''
+  };
+
+  validationMessages = {
+    'name': {
+      'required':  'Name is required.',
+      'minlength': 'Name must be at least 4 characters long.',
+      'maxlength': 'Name cannot be more than 24 characters long.'
+    },
+    'power': {
+      'required': 'Power is required.'
+    }
+  };
+
+  buildForm(): void {
+    this.heroForm = this.builder.group({
+      'name': [this.model.name, [
+          Validators.required,
+          Validators.minLength(4),
+          Validators.maxLength(24)
+        ]
+      ],
+      'alterEgo': [this.model.alterEgo],
+      'power':    [this.model.power, Validators.required]
+    });
+    this.heroForm.valueChanges
+      .subscribe(data => this.onValueChanged(data));
+  }
+
+  onValueChanged(data: any) {
+    const controls = this.heroForm ? this.heroForm.controls : {};
+    for (const field in this.formError) {
+      // clear previous error message (if any)
+      this.formError[field] = '';
+      const control = controls[field];
+      if (control && control.dirty && !control.valid) {
+        const messages = this.validationMessages[field];
+        for (const key in control.errors) {
+          this.formError[field] += messages[key] + ' ';
+        }
+      }
+    }
+  }
+
+  isRequired(controlName: string): boolean {
+    const msgs = this.validationMessages[controlName];
+    return msgs && msgs['required'];
+  }
+}
+// #enddocregion class
+// #enddocregion

public/docs/_examples/cb-form-validation/ts/app/reactive/hero-form-reactive.component.ts

@@ -0,0 +1,13 @@
+// #docregion
+import { NgModule }            from '@angular/core';
+import { ReactiveFormsModule } from '@angular/forms';
+
+import { SharedModule } from '../shared/shared.module';
+import { HeroFormReactiveComponent } from './hero-form-reactive.component';
+
+@NgModule({
+  imports:      [ SharedModule, ReactiveFormsModule ],
+  declarations: [ HeroFormReactiveComponent ],
+  exports:      [ HeroFormReactiveComponent ]
+})
+export class HeroFormReactiveModule { }

public/docs/_examples/cb-form-validation/ts/app/reactive/hero-form-reactive.module.ts

@@ -1,13 +1,9 @@
-// #docplaster
 // #docregion
 export class Hero {
-
   constructor(
     public id: number,
     public name: string,
     public power: string,
     public alterEgo?: string
   ) {  }
-
 }
-// #enddocregion

public/docs/_examples/cb-validation/ts/app/hero.ts renamed to public/docs/_examples/cb-form-validation/ts/app/shared/hero.ts

@@ -0,0 +1,12 @@
+// #docregion
+import { NgModule }            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+
+import { SubmittedComponent } from './submitted.component';
+
+@NgModule({
+  imports:      [ CommonModule],
+  declarations: [ SubmittedComponent ],
+  exports:      [ CommonModule, SubmittedComponent ]
+})
+export class SharedModule { }

public/docs/_examples/cb-form-validation/ts/app/shared/shared.module.ts

@@ -0,0 +1,32 @@
+// #docregion
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+
+import { Hero } from './hero';
+
+@Component({
+  selector: 'hero-submitted',
+  template: `
+  <div *ngIf="submitted">
+    <h2>You submitted the following:</h2>
+    <div class="row">
+      <div class="col-xs-3">Name</div>
+      <div class="col-xs-9  pull-left">{{ hero.name }}</div>
+    </div>
+    <div class="row">
+      <div class="col-xs-3">Alter Ego</div>
+      <div class="col-xs-9 pull-left">{{ hero.alterEgo }}</div>
+    </div>
+    <div class="row">
+      <div class="col-xs-3">Power</div>
+      <div class="col-xs-9 pull-left">{{ hero.power }}</div>
+    </div>
+    <br>
+    <button class="btn btn-default" (click)="onClick()">Edit</button>
+  </div>`
+})
+export class SubmittedComponent {
+  @Input()  hero: Hero;
+  @Input()  submitted = false;
+  @Output() submittedChange = new EventEmitter<boolean>();
+  onClick() { this.submittedChange.emit(false); }
+}