From 9de75d0e60ada92fd828d98cac41361c73c45890 Mon Sep 17 00:00:00 2001 From: Isaac Date: Mon, 13 Aug 2018 13:48:36 -0700 Subject: [PATCH] 8 13 localhost --- src/app.config.js | 2 +- src/services/configService.js | 2 +- src/services/models/configModels.js | 7 ++++--- src/store/reducers/packagesReducer.js | 8 ++++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/app.config.js b/src/app.config.js index 0e1fe5343..1730c18db 100644 --- a/src/app.config.js +++ b/src/app.config.js @@ -5,7 +5,7 @@ const validExtensions = ['.png', '.jpeg', '.jpg', '.svg']; const Config = { serviceUrls: { auth: `${baseUrl}/auth/v1/`, - config: `${baseUrl}/config/v1/`, + config: `http://localhost:9005/v1/`, iotHubManager: `${baseUrl}/iothubmanager/v1/`, telemetry: `${baseUrl}/telemetry/v1/`, deviceSimulation: `${baseUrl}/devicesimulation/v1/`, diff --git a/src/services/configService.js b/src/services/configService.js index 5c6a0fac3..14ee261da 100644 --- a/src/services/configService.js +++ b/src/services/configService.js @@ -91,7 +91,7 @@ export class ConfigService { /** Creates a new package */ static createPackage(payload) { return HttpClient.post(`${ENDPOINT}packages`, payload) - .map(toPackageModel); + .map(toNewPackageRequestModel); } /** Returns all the account's packages */ diff --git a/src/services/models/configModels.js b/src/services/models/configModels.js index 5c8e75305..d0ffdbaee 100644 --- a/src/services/models/configModels.js +++ b/src/services/models/configModels.js @@ -69,8 +69,9 @@ export const toPackagesModel = (response = {}) => getItems(response) export const toPackageModel = (response = {}) => { return camelCaseReshape(response, { - 'id': 'id', - 'type': 'type', - 'name': 'name', + 'id': 'Id', + 'type': 'Type', + 'name': 'Name', + 'dateCreated': 'DateCreated' }); }; diff --git a/src/store/reducers/packagesReducer.js b/src/store/reducers/packagesReducer.js index 77d16d51d..5b835327a 100644 --- a/src/store/reducers/packagesReducer.js +++ b/src/store/reducers/packagesReducer.js @@ -44,7 +44,7 @@ const packageListSchema = new schema.Array(packageSchema); // ========================= Reducers - START const initialState = { ...errorPendingInitialState, entities: {}, items: [] }; -const insertpPckageReducer = (state, { payload }) => { +const insertPackageReducer = (state, { payload }) => { const { entities: { rules }, result } = normalize(payload, ruleListSchema); return update(state, { entities: { $merge: rules }, @@ -79,11 +79,11 @@ const updateLastTriggerReducer = (state, { payload: { id, lastTrigger } }) => up /* Action types that cause a pending flag */ const fetchableTypes = [ - epics.actionTypes.fetchRules + epics.actionTypes.fetchPackages ]; export const redux = createReducerScenario({ - insertRules: { type: 'RULE_INSERT', reducer: insertRulesReducer }, + insertPackages: { type: 'PACKAGE_INSERT', reducer: insertPackageReducer }, modifyRules: { type: 'RULES_MODIFY', reducer: modifyRulesReducer }, updateRules: { type: 'RULES_UPDATE', reducer: updateRulesReducer }, updateRuleCount: { type: 'RULES_COUNT_UPDATE', reducer: updateCountReducer }, @@ -96,7 +96,7 @@ export const reducer = { rules: redux.getReducer(initialState) }; // ========================= Reducers - END // ========================= Selectors - START -export const getRulesReducer = state => state.rules; +export const getPackagesReducer = state => state.packages; export const getEntities = state => getRulesReducer(state).entities || {}; const getItems = state => getRulesReducer(state).items || []; export const getRulesLastUpdated = state => getRulesReducer(state).lastUpdated;