LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

pass host to api functions from state

Browse source
This commit is contained in:
bill bittner 2018-03-15 16:31:01 -07:00
parent 097e454069
commit acd36414f5
7 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
index.js
View file

File diff suppressed because one or more lines are too long

2
index.js.map
View file

File diff suppressed because one or more lines are too long

10
public/bundle/bundle.js
View file

File diff suppressed because one or more lines are too long

2
public/bundle/bundle.js.map
View file

File diff suppressed because one or more lines are too long

12
react/api/assetApi.js
View file

@ -1,6 +1,6 @@
import Request from 'utils/request'; import Request from 'utils/request';
export function getLongClaimId (name, modifier) { export function getLongClaimId (host, name, modifier) {
let body = {}; let body = {};
// create request params // create request params
if (modifier) { if (modifier) {
@ -18,17 +18,17 @@ export function getLongClaimId (name, modifier) {
body : JSON.stringify(body), body : JSON.stringify(body),
}; };
// create url // create url
const url = `/api/claim/long-id`; const url = `${host}/api/claim/long-id`;
// return the request promise // return the request promise
return Request(url, params); return Request(url, params);
}; };
export function getShortId (name, claimId) { export function getShortId (host, name, claimId) {
const url = `/api/claim/short-id/${claimId}/${name}`; const url = `${host}/api/claim/short-id/${claimId}/${name}`;
return Request(url); return Request(url);
}; };
export function getClaimData (name, claimId) { export function getClaimData (host, name, claimId) {
const url = `/api/claim/data/${name}/${claimId}`; const url = `${host}/api/claim/data/${name}/${claimId}`;
return Request(url); return Request(url);
}; };

8
react/sagas/show_asset.js
View file

@ -3,6 +3,7 @@ import * as actions from 'constants/show_action_types';
import { addRequestToRequestList, onRequestError, onRequestUpdate, addAssetToAssetList } from 'actions/show'; import { addRequestToRequestList, onRequestError, onRequestUpdate, addAssetToAssetList } from 'actions/show';
import { getLongClaimId, getShortId, getClaimData } from 'api/assetApi'; import { getLongClaimId, getShortId, getClaimData } from 'api/assetApi';
import { selectShowState } from 'selectors/show'; import { selectShowState } from 'selectors/show';
import { selectSiteHost } from 'selectors/site';
export function * newAssetRequest (action) { export function * newAssetRequest (action) {
const { requestType, requestId, name, modifier } = action.data; const { requestType, requestId, name, modifier } = action.data;
@ -11,13 +12,14 @@ export function * newAssetRequest (action) {
// is this an existing request? // is this an existing request?
// If this uri is in the request list, it's already been fetched // If this uri is in the request list, it's already been fetched
const state = yield select(selectShowState); const state = yield select(selectShowState);
const host = yield select(selectSiteHost);
if (state.requestList[requestId]) { if (state.requestList[requestId]) {
return null; return null;
} }
// get long id && add request to request list // get long id && add request to request list
let longId; let longId;
try { try {
({data: longId} = yield call(getLongClaimId, name, modifier)); ({data: longId} = yield call(getLongClaimId, host, name, modifier));
} catch (error) { } catch (error) {
return yield put(onRequestError(error.message)); return yield put(onRequestError(error.message));
} }
@ -31,14 +33,14 @@ export function * newAssetRequest (action) {
// get short Id // get short Id
let shortId; let shortId;
try { try {
({data: shortId} = yield call(getShortId, name, longId)); ({data: shortId} = yield call(getShortId, host, name, longId));
} catch (error) { } catch (error) {
return yield put(onRequestError(error.message)); return yield put(onRequestError(error.message));
} }
// get asset claim data // get asset claim data
let claimData; let claimData;
try { try {
({data: claimData} = yield call(getClaimData, name, longId)); ({data: claimData} = yield call(getClaimData, host, name, longId));
} catch (error) { } catch (error) {
return yield put(onRequestError(error.message)); return yield put(onRequestError(error.message));
} }

4
react/selectors/site.js
View file

@ -1,3 +1,7 @@
export const selectSiteState = (state) => { export const selectSiteState = (state) => {
return state.site; return state.site;
}; };
export const selectSiteHost = (state) => {
return state.site.host;
};