Compare commits

...

3 Commits

42 changed files with 583 additions and 28 deletions

View File

@ -139,6 +139,120 @@
} }
} }
} }
},
"global-form": {
"projectType": "application",
"schematics": {},
"root": "apps/global-form",
"sourceRoot": "apps/global-form/src",
"prefix": "nested-forms",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/apps/global-form",
"index": "apps/global-form/src/index.html",
"main": "apps/global-form/src/main.ts",
"polyfills": "apps/global-form/src/polyfills.ts",
"tsConfig": "apps/global-form/tsconfig.app.json",
"aot": false,
"assets": [
"apps/global-form/src/favicon.ico",
"apps/global-form/src/assets"
],
"styles": ["apps/global-form/src/styles.css"],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "apps/global-form/src/environments/environment.ts",
"with": "apps/global-form/src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "global-form:build"
},
"configurations": {
"production": {
"browserTarget": "global-form:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "global-form:build"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"apps/global-form/tsconfig.app.json",
"apps/global-form/tsconfig.spec.json"
],
"exclude": ["**/node_modules/**", "!apps/global-form/**"]
}
},
"test": {
"builder": "@nrwl/jest:jest",
"options": {
"jestConfig": "apps/global-form/jest.config.js",
"tsConfig": "apps/global-form/tsconfig.spec.json",
"setupFile": "apps/global-form/src/test-setup.ts"
}
}
}
},
"global-form-e2e": {
"root": "apps/global-form-e2e",
"sourceRoot": "apps/global-form-e2e/src",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@nrwl/cypress:cypress",
"options": {
"cypressConfig": "apps/global-form-e2e/cypress.json",
"tsConfig": "apps/global-form-e2e/tsconfig.e2e.json",
"devServerTarget": "global-form:serve"
},
"configurations": {
"production": {
"devServerTarget": "global-form:serve:production"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["apps/global-form-e2e/tsconfig.e2e.json"],
"exclude": ["**/node_modules/**", "!apps/global-form-e2e/**"]
}
}
}
} }
}, },
"cli": { "cli": {

View File

@ -0,0 +1,11 @@
{
"fileServerFolder": ".",
"fixturesFolder": "./src/fixtures",
"integrationFolder": "./src/integration",
"pluginsFile": "./src/plugins/index",
"supportFile": false,
"video": true,
"videosFolder": "../../dist/cypress/apps/global-form-e2e/videos",
"screenshotsFolder": "../../dist/cypress/apps/global-form-e2e/screenshots",
"chromeWebSecurity": false
}

View File

@ -0,0 +1,4 @@
{
"name": "Using fixtures to represent data",
"email": "hello@cypress.io"
}

View File

@ -0,0 +1,9 @@
import { getGreeting } from '../support/app.po';
describe('global-form', () => {
beforeEach(() => cy.visit('/'));
it('should display welcome message', () => {
getGreeting().contains('Welcome to global-form!');
});
});

View File

@ -0,0 +1,22 @@
// ***********************************************************
// This example plugins/index.js can be used to load plugins
//
// You can change the location of this file or turn off loading
// the plugins file with the 'pluginsFile' configuration option.
//
// You can read more here:
// https://on.cypress.io/plugins-guide
// ***********************************************************
// This function is called when a project is opened or re-opened (e.g. due to
// the project's config changing)
const { preprocessTypescript } = require('@nrwl/cypress/plugins/preprocessor');
module.exports = (on, config) => {
// `on` is used to hook into various events Cypress emits
// `config` is the resolved Cypress config
// Preprocess Typescript
on('file:preprocessor', preprocessTypescript(config));
};

View File

@ -0,0 +1 @@
export const getGreeting = () => cy.get('h1');

View File

@ -0,0 +1,25 @@
// ***********************************************
// This example commands.js shows you how to
// create various custom commands and overwrite
// existing commands.
//
// For more comprehensive examples of custom
// commands please read more here:
// https://on.cypress.io/custom-commands
// ***********************************************
//
//
// -- This is a parent command --
// Cypress.Commands.add("login", (email, password) => { ... })
//
//
// -- This is a child command --
// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
//
//
// -- This is a dual command --
// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
//
//
// -- This will overwrite an existing command --
// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

View File

@ -0,0 +1,17 @@
// ***********************************************************
// This example support/index.js is processed and
// loaded automatically before your test files.
//
// This is a great place to put global configuration and
// behavior that modifies Cypress.
//
// You can change the location of this file or turn off
// automatically serving support files with the
// 'supportFile' configuration option.
//
// You can read more here:
// https://on.cypress.io/configuration
// ***********************************************************
// Import commands.js using ES2015 syntax:
import './commands';

View File

@ -0,0 +1,8 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"sourceMap": false,
"outDir": "../../dist/out-tsc"
},
"include": ["src/**/*.ts"]
}

View File

@ -0,0 +1,7 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"types": ["cypress", "node"]
},
"include": ["**/*.ts"]
}

View File

@ -0,0 +1 @@
{ "extends": "../../tslint.json", "rules": [] }

View File

@ -0,0 +1,12 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries
# You can see what browsers were selected by your queries by running:
# npx browserslist
> 0.5%
last 2 versions
Firefox ESR
not dead
not IE 9-11 # For IE 9-11 support, remove 'not'.

View File

@ -0,0 +1,9 @@
module.exports = {
name: 'global-form',
preset: '../../jest.config.js',
coverageDirectory: '../../coverage/apps/global-form',
snapshotSerializers: [
'jest-preset-angular/AngularSnapshotSerializer.js',
'jest-preset-angular/HTMLCommentSerializer.js'
]
};

View File

@ -0,0 +1,7 @@
<form [formGroup]="form">
<nested-forms-name [nameGroup]="form.get('nameGroup')"></nested-forms-name>
</form>
<hr />
<pre>
{{ form.value | json }}
</pre>

View File

@ -0,0 +1,21 @@
import { ReactiveFormsModule } from '@angular/forms';
import { RouterTestingModule } from '@angular/router/testing';
import { TestBed, async } from '@angular/core/testing';
import { AppComponent } from './app.component';
import { NameComponent } from './name/name.component';
describe('AppComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [RouterTestingModule, ReactiveFormsModule],
declarations: [AppComponent, NameComponent]
}).compileComponents();
}));
it('should create the app', () => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app).toBeTruthy();
});
});

View File

@ -0,0 +1,23 @@
import { FormGroup, FormBuilder } from '@angular/forms';
import { Component } from '@angular/core';
@Component({
selector: 'nested-forms-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.css']
})
export class AppComponent {
form: FormGroup;
constructor(private fb: FormBuilder) {
this.form = this.fb.group({
nameGroup: this.fb.group({
firstName: [], // new FormControl(this.name ? this.name.firstName : ''),
lastName: [], // new FormControl(this.name ? this.name.lastName : ''),
middleName: [], // new FormControl(this.name ? this.name.middleName : ''),
prefix: [], // new FormControl(this.name ? this.name.prefix : ''),
suffix: [], // new FormControl(this.name ? this.name.suffix : ''),
})
});
}
}

View File

@ -0,0 +1,19 @@
import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
import { AppComponent } from './app.component';
import { RouterModule } from '@angular/router';
import { ReactiveFormsModule } from '@angular/forms';
import { NameComponent } from './name/name.component';
@NgModule({
declarations: [AppComponent, NameComponent],
imports: [
BrowserModule,
RouterModule.forRoot([], { initialNavigation: 'enabled' }),
ReactiveFormsModule
],
providers: [],
bootstrap: [AppComponent]
})
export class AppModule {}

View File

@ -0,0 +1 @@
<p>name works!</p>

View File

@ -0,0 +1,24 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { NameComponent } from './name.component';
describe('NameComponent', () => {
let component: NameComponent;
let fixture: ComponentFixture<NameComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [NameComponent]
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(NameComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -0,0 +1,14 @@
import { FormGroup } from '@angular/forms';
import { Component, OnInit, Input } from '@angular/core';
@Component({
selector: 'nested-forms-name',
templateUrl: './name.component.html',
styleUrls: ['./name.component.css']
})
export class NameComponent implements OnInit {
@Input() nameGroup: FormGroup;
constructor() {}
ngOnInit() {}
}

View File

View File

@ -0,0 +1,3 @@
export const environment = {
production: true
};

View File

@ -0,0 +1,16 @@
// This file can be replaced during build by using the `fileReplacements` array.
// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
// The list of file replacements can be found in `angular.json`.
export const environment = {
production: false
};
/*
* For easier debugging in development mode, you can import the following file
* to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
*
* This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown.
*/
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

@ -0,0 +1,14 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>GlobalForm</title>
<base href="/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" type="image/x-icon" href="favicon.ico" />
</head>
<body>
<nested-forms-root></nested-forms-root>
</body>
</html>

View File

@ -0,0 +1,13 @@
import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app/app.module';
import { environment } from './environments/environment';
if (environment.production) {
enableProdMode();
}
platformBrowserDynamic()
.bootstrapModule(AppModule)
.catch(err => console.error(err));

View File

@ -0,0 +1,62 @@
/**
* This file includes polyfills needed by Angular and is loaded before the app.
* You can add your own extra polyfills to this file.
*
* This file is divided into 2 sections:
* 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
* 2. Application imports. Files imported after ZoneJS that should be loaded before your main
* file.
*
* The current setup is for so-called "evergreen" browsers; the last versions of browsers that
* automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
* Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
*
* Learn more in https://angular.io/guide/browser-support
*/
/***************************************************************************************************
* BROWSER POLYFILLS
*/
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.
/**
* Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
*/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
/**
* By default, zone.js will patch all possible macroTask and DomEvents
* user can disable parts of macroTask/DomEvents patch by setting following flags
* because those flags need to be set before `zone.js` being loaded, and webpack
* will put import in the top of bundle, so user need to create a separate file
* in this directory (for example: zone-flags.ts), and put the following flags
* into that file, and then add the following code before importing zone.js.
* import './zone-flags.ts';
*
* The flags allowed in zone-flags.ts are listed here.
*
* The following flags will work for all browsers.
*
* (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
* (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
* (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
*
* in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
* with the following flag, it will bypass `zone.js` patch for IE/Edge
*
* (window as any).__Zone_enable_cross_context_check = true;
*
*/
/***************************************************************************************************
* Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.
/***************************************************************************************************
* APPLICATION IMPORTS
*/

View File

@ -0,0 +1 @@
/* You can add global styles to this file, and also import other style files */

View File

@ -0,0 +1 @@
import 'jest-preset-angular';

View File

@ -0,0 +1,9 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"types": []
},
"include": ["**/*.ts"],
"exclude": ["src/test-setup.ts", "**/*.spec.ts"]
}

View File

@ -0,0 +1,7 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"types": ["node", "jest"]
},
"include": ["**/*.ts"]
}

View File

@ -0,0 +1,10 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"module": "commonjs",
"types": ["jest", "node"]
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
}

View File

@ -0,0 +1,7 @@
{
"extends": "../../tslint.json",
"rules": {
"directive-selector": [true, "attribute", "nestedForms", "camelCase"],
"component-selector": [true, "element", "nested-forms", "kebab-case"]
}
}

View File

@ -1,42 +1,35 @@
import { ContactService } from './../../../../libs/contact-model/src/lib/contact.service';
import { Contact } from '@nested-forms/contact-model'; import { Contact } from '@nested-forms/contact-model';
import { Component } from '@angular/core'; import { Component, OnInit, OnDestroy } from '@angular/core';
import { FormGroup, FormBuilder } from '@angular/forms'; import { FormGroup, FormBuilder } from '@angular/forms';
import { Subscription } from 'rxjs';
@Component({ @Component({
selector: 'nested-forms-root', selector: 'nested-forms-root',
templateUrl: './app.component.html', templateUrl: './app.component.html',
styleUrls: ['./app.component.css'] styleUrls: ['./app.component.css']
}) })
export class AppComponent { export class AppComponent implements OnInit, OnDestroy {
title = 'parent-form'; title = 'parent-form';
contact: Contact = { contact: Contact;
name: {
firstName: 'John',
lastName: 'Public',
middleName: 'Q',
prefix: 'Mr',
suffix: 'III',
},
addresses: [
{
line_1: '123 Main Street',
city: 'New York',
state: 'NY',
postalCode: '12345',
},
{
line_1: '123 South Street',
city: 'Boston',
state: 'MA',
postalCode: '54321',
},
],
};
form: FormGroup; form: FormGroup;
constructor(private fb: FormBuilder) { private subscription: Subscription
constructor(private fb: FormBuilder, private service: ContactService) {
this.form = this.fb.group({}); this.form = this.fb.group({});
} }
public ngOnInit() {
this.subscription = this.service.loadContact().subscribe((data: Contact) => {
this.contact = data;
});
}
public ngOnDestroy() {
if (this.subscription) {
this.subscription.unsubscribe();
}
}
} }

View File

@ -5,5 +5,6 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest' '^.+\\.[tj]sx?$': 'ts-jest'
}, },
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
coverageDirectory: '../../coverage/libs/contact-model' coverageDirectory: '../../coverage/libs/contact-model',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts']
}; };

View File

@ -1 +1,2 @@
export * from './lib/contact-model'; export * from './lib/contact-model';
export * from './lib/contact.service';

View File

@ -0,0 +1,22 @@
import { Contact } from './contact-model';
import { TestBed, async } from '@angular/core/testing';
import { ContactService } from './contact.service';
describe('ContactService', () => {
let service: ContactService;
beforeEach(() => {
service = new ContactService();
});
it('should be created', () => {
expect(service).toBeTruthy();
});
it('should return a contact', async(() => {
service.loadContact().subscribe((data: Contact) => {
expect(data).toBeTruthy();
});
}));
});

View File

@ -0,0 +1,39 @@
import { Injectable } from '@angular/core';
import { Contact } from '@nested-forms/contact-model';
import { Observable, of } from 'rxjs';
const contact: Contact = {
name: {
firstName: 'John',
lastName: 'Public',
middleName: 'Q',
prefix: 'Mr',
suffix: 'III',
},
addresses: [
{
line_1: '123 Main Street',
city: 'New York',
state: 'NY',
postalCode: '12345',
},
{
line_1: '123 South Street',
city: 'Boston',
state: 'MA',
postalCode: '54321',
},
],
};
@Injectable({
providedIn: 'root'
})
export class ContactService {
constructor() { }
public loadContact(): Observable<Contact> {
return of({...contact});
}
}

View File

@ -0,0 +1 @@
import 'jest-preset-angular';

View File

@ -16,6 +16,12 @@
}, },
"parent-form": { "parent-form": {
"tags": [] "tags": []
},
"global-form-e2e": {
"tags": []
},
"global-form": {
"tags": []
} }
} }
} }