mirror of
https://github.com/aspnet/JavaScriptServices.git
synced 2025-12-22 09:37:45 +00:00
Update templates to domain-task 2.0.0. Fixes #166.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import { fetch } from 'domain-task/fetch';
|
||||
import { fetch, addTask } from 'domain-task';
|
||||
import { typeName, isActionType, Action, Reducer } from 'redux-typed';
|
||||
import { ActionCreator } from './';
|
||||
import { Genre } from './GenreList';
|
||||
@@ -51,7 +51,7 @@ export const actionCreators = {
|
||||
requestAlbumDetails: (albumId: number): ActionCreator => (dispatch, getState) => {
|
||||
// Only load if it's not already loaded (or currently being loaded)
|
||||
if (albumId !== getState().albumDetails.requestedAlbumId) {
|
||||
fetch(`/api/albums/${ albumId }`)
|
||||
let fetchTask = fetch(`/api/albums/${ albumId }`)
|
||||
.then(results => results.json())
|
||||
.then(album => {
|
||||
// Only replace state if it's still the most recent request
|
||||
@@ -60,6 +60,7 @@ export const actionCreators = {
|
||||
}
|
||||
});
|
||||
|
||||
addTask(fetchTask); // Ensure server-side prerendering waits for this to complete
|
||||
dispatch(new RequestAlbumDetails(albumId));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { fetch } from 'domain-task/fetch';
|
||||
import { fetch, addTask } from 'domain-task';
|
||||
import { typeName, isActionType, Action, Reducer } from 'redux-typed';
|
||||
import { ActionCreator } from './';
|
||||
|
||||
@@ -39,10 +39,11 @@ class ReceiveFeaturedAlbums extends Action {
|
||||
export const actionCreators = {
|
||||
requestFeaturedAlbums: (): ActionCreator => (dispatch, getState) => {
|
||||
if (!getState().featuredAlbums.isLoaded) {
|
||||
fetch('/api/albums/mostPopular')
|
||||
let fetchTask = fetch('/api/albums/mostPopular')
|
||||
.then(results => results.json())
|
||||
.then(albums => dispatch(new ReceiveFeaturedAlbums(albums)));
|
||||
|
||||
addTask(fetchTask); // Ensure server-side prerendering waits for this to complete
|
||||
return dispatch(new RequestFeaturedAlbums());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { fetch } from 'domain-task/fetch';
|
||||
import { fetch, addTask } from 'domain-task';
|
||||
import { typeName, isActionType, Action, Reducer } from 'redux-typed';
|
||||
import { ActionCreator } from './';
|
||||
import { Album } from './FeaturedAlbums';
|
||||
@@ -39,7 +39,7 @@ export const actionCreators = {
|
||||
requestGenreDetails: (genreId: number): ActionCreator => (dispatch, getState) => {
|
||||
// Only load if it's not already loaded (or currently being loaded)
|
||||
if (genreId !== getState().genreDetails.requestedGenreId) {
|
||||
fetch(`/api/genres/${ genreId }/albums`)
|
||||
let fetchTask = fetch(`/api/genres/${ genreId }/albums`)
|
||||
.then(results => results.json())
|
||||
.then(albums => {
|
||||
// Only replace state if it's still the most recent request
|
||||
@@ -48,6 +48,7 @@ export const actionCreators = {
|
||||
}
|
||||
});
|
||||
|
||||
addTask(fetchTask); // Ensure server-side prerendering waits for this to complete
|
||||
dispatch(new RequestGenreDetails(genreId));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { fetch } from 'domain-task/fetch';
|
||||
import { fetch, addTask } from 'domain-task';
|
||||
import { typeName, isActionType, Action, Reducer } from 'redux-typed';
|
||||
import { ActionCreator } from './';
|
||||
|
||||
@@ -34,9 +34,10 @@ class ReceiveGenresList extends Action {
|
||||
export const actionCreators = {
|
||||
requestGenresList: (): ActionCreator => (dispatch, getState) => {
|
||||
if (!getState().genreList.isLoaded) {
|
||||
fetch('/api/genres')
|
||||
let fetchTask = fetch('/api/genres')
|
||||
.then(results => results.json())
|
||||
.then(genres => dispatch(new ReceiveGenresList(genres)));
|
||||
addTask(fetchTask); // Ensure server-side prerendering waits for this to complete
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
"aspnet-webpack-react": "^1.0.1",
|
||||
"bootstrap": "^3.3.6",
|
||||
"domain-context": "^0.5.1",
|
||||
"domain-task": "^1.0.0",
|
||||
"domain-task": "^2.0.0",
|
||||
"history": "^2.0.0",
|
||||
"isomorphic-fetch": "^2.2.1",
|
||||
"memory-fs": "^0.3.0",
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
"dependencies": {
|
||||
"babel-core": "^6.4.5",
|
||||
"bootstrap": "^3.3.5",
|
||||
"domain-task": "^1.0.0",
|
||||
"domain-task": "^2.0.0",
|
||||
"formsy-react": "^0.17.0",
|
||||
"formsy-react-components": "^0.6.3",
|
||||
"griddle-react": "^0.3.1",
|
||||
|
||||
Reference in New Issue
Block a user