added state checks to newAssetRequest
This commit is contained in:
parent
8e94d4e162
commit
588ebfb55a
6 changed files with 28 additions and 13 deletions
|
@ -1,7 +1,7 @@
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import View from './view';
|
import View from './view';
|
||||||
import { fileRequested } from 'actions/show';
|
import { fileRequested } from 'actions/show';
|
||||||
import selectAsset from 'selectors/asset';
|
import { selectAsset } from 'selectors/show';
|
||||||
|
|
||||||
const mapStateToProps = ({ show }) => {
|
const mapStateToProps = ({ show }) => {
|
||||||
// select error and status
|
// select error and status
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import View from './view';
|
import View from './view';
|
||||||
import selectAsset from 'selectors/asset';
|
import { selectAsset } from 'selectors/show';
|
||||||
|
|
||||||
const mapStateToProps = ({ show }) => {
|
const mapStateToProps = ({ show }) => {
|
||||||
// select asset
|
// select asset
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import View from './view';
|
import View from './view';
|
||||||
import selectAsset from 'selectors/asset';
|
import { selectAsset } from 'selectors/show';
|
||||||
|
|
||||||
const mapStateToProps = ({ show }) => {
|
const mapStateToProps = ({ show }) => {
|
||||||
// select title
|
// select title
|
||||||
|
|
|
@ -7,10 +7,10 @@ const initialState = {
|
||||||
type : null,
|
type : null,
|
||||||
id : null,
|
id : null,
|
||||||
},
|
},
|
||||||
requestList: {},
|
requestList : {},
|
||||||
channelList : {},
|
channelList : {},
|
||||||
assetList : {},
|
assetList : {},
|
||||||
displayAsset : {
|
displayAsset: {
|
||||||
error : null,
|
error : null,
|
||||||
status: LOCAL_CHECK,
|
status: LOCAL_CHECK,
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,11 +1,19 @@
|
||||||
import { call, put, takeLatest } from 'redux-saga/effects';
|
import { call, put, select, takeLatest } from 'redux-saga/effects';
|
||||||
import * as actions from 'constants/show_action_types';
|
import * as actions from 'constants/show_action_types';
|
||||||
import { addRequestToRequestList, onRequestError, addAssetToAssetList } from 'actions/show';
|
import { addRequestToRequestList, onRequestError, addAssetToAssetList } from 'actions/show';
|
||||||
import { getLongClaimId, getShortId, getClaimData } from 'api/assetApi';
|
import { getLongClaimId, getShortId, getClaimData } from 'api/assetApi';
|
||||||
|
import { selectShowState } from 'selectors/show';
|
||||||
|
|
||||||
function* newAssetRequest (action) {
|
function* newAssetRequest (action) {
|
||||||
const { requestId, name, modifier } = action.data;
|
const { requestId, name, modifier } = action.data;
|
||||||
// get long id
|
const state = yield select(selectShowState);
|
||||||
|
// is this an existing request?
|
||||||
|
// If this uri is in the request list, it's already been fetched
|
||||||
|
if (state.requestList[requestId]) {
|
||||||
|
console.log('that request already exists in the request list!');
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
// get long id && add request to request list
|
||||||
console.log(`getting asset long id ${name}`);
|
console.log(`getting asset long id ${name}`);
|
||||||
let longId;
|
let longId;
|
||||||
try {
|
try {
|
||||||
|
@ -14,9 +22,14 @@ function* newAssetRequest (action) {
|
||||||
console.log('error:', error);
|
console.log('error:', error);
|
||||||
return yield put(onRequestError(error.message));
|
return yield put(onRequestError(error.message));
|
||||||
}
|
}
|
||||||
// put action to add request to asset request list
|
|
||||||
const assetKey = `a#${name}#${longId}`;
|
const assetKey = `a#${name}#${longId}`;
|
||||||
yield put(addRequestToRequestList(requestId, null, assetKey));
|
yield put(addRequestToRequestList(requestId, null, assetKey));
|
||||||
|
// is this an existing asset?
|
||||||
|
// If this asset is in the asset list, it's already been fetched
|
||||||
|
if (state.assetList[assetKey]) {
|
||||||
|
console.log('that asset already exists in the asset list!');
|
||||||
|
return null;
|
||||||
|
}
|
||||||
// get short Id
|
// get short Id
|
||||||
console.log(`getting asset short id ${name} ${longId}`);
|
console.log(`getting asset short id ${name} ${longId}`);
|
||||||
let shortId;
|
let shortId;
|
||||||
|
@ -33,7 +46,7 @@ function* newAssetRequest (action) {
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return yield put(onRequestError(error.message));
|
return yield put(onRequestError(error.message));
|
||||||
}
|
}
|
||||||
// put action to add asset to asset list
|
// add asset to asset list
|
||||||
yield put(addAssetToAssetList(assetKey, null, name, longId, shortId, claimData));
|
yield put(addAssetToAssetList(assetKey, null, name, longId, shortId, claimData));
|
||||||
// clear any errors in request error
|
// clear any errors in request error
|
||||||
yield put(onRequestError(null));
|
yield put(onRequestError(null));
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
const selectAsset = (show) => {
|
export const selectAsset = (show) => {
|
||||||
const request = show.requestList[show.request.id];
|
const request = show.requestList[show.request.id];
|
||||||
const assetKey = request.key;
|
const assetKey = request.key;
|
||||||
return show.assetList[assetKey];
|
return show.assetList[assetKey];
|
||||||
};
|
};
|
||||||
|
|
||||||
export default selectAsset;
|
export const selectShowState = (state) => {
|
||||||
|
return state.show;
|
||||||
|
};
|
Loading…
Reference in a new issue