Skip to content

Update example to store 6.3.0 #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 20, 2017
Merged

Update example to store 6.3.0 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a3fa37
Update example to store 6.3.0
May 19, 2017
da33c93
fix unit test
May 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
},
"private": true,
"dependencies": {
"@angular-redux/form": "^6.2.0",
"@angular-redux/router": "^6.2.0",
"@angular-redux/store": "^6.2.0",
"@angular-redux/form": "^6.3.0",
"@angular-redux/router": "^6.3.0",
"@angular-redux/store": "^6.3.0",
"@angular/common": "^4.1.0",
"@angular/compiler": "^4.1.0",
"@angular/core": "^4.1.0",
Expand Down
2 changes: 2 additions & 0 deletions src/app/animals/animal.actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Injectable } from '@angular/core';
import { dispatch } from '@angular-redux/store';
import { Action } from 'redux';

@Injectable()
Expand All @@ -7,6 +8,7 @@ export class AnimalActions {
static readonly LOAD_SUCCEEDED = 'LOAD_SUCCEEDED';
static readonly LOAD_FAILED = 'LOAD_FAILED';

@dispatch()
loadAnimals(animalType) {
return {
type: AnimalActions.LOAD_STARTED,
Expand Down
6 changes: 2 additions & 4 deletions src/app/elephants/elephant-page.container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ export class ElephantPageComponent {
@select(['elephants', 'loading']) readonly loading$: Observable<boolean>;
@select(['elephants', 'error']) readonly error$: Observable<any>;

constructor(
ngRedux: NgRedux<IAppState>,
actions: AnimalActions) {
ngRedux.dispatch(actions.loadAnimals(ANIMAL_TYPES.ELEPHANT));
constructor(actions: AnimalActions) {
actions.loadAnimals(ANIMAL_TYPES.ELEPHANT);
}
}
2 changes: 1 addition & 1 deletion src/app/feedback/feedback-form/feedback-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h2>Feedback Form</h2>
<label for="comments">Comments:
<textarea
name="comments"
[maxLength]="MAX_COMMENT_CHARS"
[maxLength]="getMaxCommentChars()"
ngControl
ngModel></textarea>
<p>{{ charsLeft$ | async }} characters remaining.
Expand Down
17 changes: 9 additions & 8 deletions src/app/feedback/feedback-form/feedback-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
import { Component, ChangeDetectionStrategy } from '@angular/core';
import { Connect } from '@angular-redux/form';
import { NgRedux, select } from '@angular-redux/store';
import { NgRedux, select$ } from '@angular-redux/store';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs/observable/of';
import { IAppState } from '../../store/root.types';

const MAX_COMMENT_CHARS = 300;

export const charsLeft = (obs$: Observable<string>): Observable<number> =>
obs$.map(comments => comments || '')
.map(comments => MAX_COMMENT_CHARS - comments.length);

@Component({
selector: 'zoo-feedback-form',
templateUrl: './feedback-form.component.html',
styleUrls: [ './feedback-form.component.css' ],
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class FeedbackFormComponent {
readonly MAX_COMMENT_CHARS = 300;
readonly charsLeft$: Observable<number>;
@select$(['feedback', 'comments'], charsLeft) readonly charsLeft$: Observable<number>;

constructor(store: NgRedux<IAppState>) {
this.charsLeft$ = store.select<string>(['feedback', 'comments'])
.map(comments => comments || '')
.map(comments => this.MAX_COMMENT_CHARS - comments.length);
}
getMaxCommentChars = () => MAX_COMMENT_CHARS;
}
10 changes: 5 additions & 5 deletions src/app/feedback/feedback-form/feedback-form.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ describe('Feedback Form Component', () => {
const form = fixture.debugElement.componentInstance;

const expectedCharsLeftSequence = [
form.MAX_COMMENT_CHARS - 1,
form.MAX_COMMENT_CHARS - 2,
form.MAX_COMMENT_CHARS - 3,
form.MAX_COMMENT_CHARS - 4,
form.MAX_COMMENT_CHARS - 5,
form.getMaxCommentChars() - 1,
form.getMaxCommentChars() - 2,
form.getMaxCommentChars() - 3,
form.getMaxCommentChars() - 4,
form.getMaxCommentChars() - 5,
];

const feedbackCommentsStub = MockNgRedux.getSelectorStub(['feedback', 'comments']);
Expand Down
6 changes: 2 additions & 4 deletions src/app/lions/lion-page.container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ export class LionPageComponent {
@select(['lions', 'loading']) readonly loading$: Observable<boolean>;
@select(['lions', 'error']) readonly error$: Observable<any>;

constructor(
store: NgRedux<IAppState>,
actions: AnimalActions) {
store.dispatch(actions.loadAnimals(ANIMAL_TYPES.LION));
constructor(actions: AnimalActions) {
actions.loadAnimals(ANIMAL_TYPES.LION);
}
}
47 changes: 18 additions & 29 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
# yarn lockfile v1


"@angular-redux/form@^6.2.0":
version "6.2.0"
resolved "https://registry.yarnpkg.com/@angular-redux/form/-/form-6.2.0.tgz#888ee96bd9adb1aa131d31de0c932876e76b4343"
"@angular-redux/form@^6.3.0":
version "6.3.0"
resolved "https://registry.yarnpkg.com/@angular-redux/form/-/form-6.3.0.tgz#04d97a95da93cb69c852406ffbb8a5c633712977"
dependencies:
immutable "^3.8.1"

"@angular-redux/router@^6.2.0":
version "6.2.0"
resolved "https://registry.yarnpkg.com/@angular-redux/router/-/router-6.2.0.tgz#d5a2f4e0cd966670aa7131524e7f20c665e52c77"
"@angular-redux/router@^6.3.0":
version "6.3.0"
resolved "https://registry.yarnpkg.com/@angular-redux/router/-/router-6.3.0.tgz#0ece17ad5a4eb8a40f54d7e3a67e67598f03d2cd"

"@angular-redux/store@^6.2.0":
version "6.2.0"
resolved "https://registry.yarnpkg.com/@angular-redux/store/-/store-6.2.0.tgz#e0289d6fc9134523468c27c62e88576fc1ccd725"
"@angular-redux/store@^6.3.0":
version "6.3.0"
resolved "https://registry.yarnpkg.com/@angular-redux/store/-/store-6.3.0.tgz#1c5cb08073fc04645dda6291e7410a981cd1fb37"

"@angular/[email protected]":
version "1.0.1"
Expand Down Expand Up @@ -1189,12 +1189,18 @@ date-now@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"

debug@*, debug@2, debug@2.6.1, debug@^2.1.3, debug@^2.2.0:
debug@*, [email protected], debug@^2.1.3, debug@^2.2.0:
version "2.6.1"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351"
dependencies:
ms "0.7.2"

debug@2, [email protected], debug@^2.6.3:
version "2.6.3"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
dependencies:
ms "0.7.2"

[email protected], debug@~2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
Expand All @@ -1207,12 +1213,6 @@ [email protected]:
dependencies:
ms "0.7.2"

[email protected], debug@^2.6.3:
version "2.6.3"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
dependencies:
ms "0.7.2"

decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
Expand Down Expand Up @@ -2416,11 +2416,7 @@ istanbul-instrumenter-loader@^2.0.0:
loader-utils "^0.2.16"
object-assign "^4.1.0"

istanbul-lib-coverage@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.1.tgz#f263efb519c051c5f1f3343034fc40e7b43ff212"

istanbul-lib-coverage@^1.1.0:
istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.0.tgz#caca19decaef3525b5d6331d701f3f3b7ad48528"

Expand Down Expand Up @@ -5072,20 +5068,13 @@ wrappy@1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"

[email protected]:
[email protected], ws@^1.0.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.2.tgz#8a244fa052401e08c9886cf44a85189e1fd4067f"
dependencies:
options ">=0.0.5"
ultron "1.0.x"

ws@^1.0.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.1.tgz#082ddb6c641e85d4bb451f03d52f06eabdb1f018"
dependencies:
options ">=0.0.5"
ultron "1.0.x"

[email protected]:
version "1.0.0"
resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"
Expand Down