From 2f6108ad0e121b87614d08988e09e40cd99ce8a6 Mon Sep 17 00:00:00 2001 From: gets0ul Date: Fri, 20 Sep 2019 17:27:37 +0700 Subject: [PATCH 1/3] Error message has been already shown by alert popup. Error page will be only shown for error code 500 (as hard-coded for the CoderBot). --- src/reducers/templates.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/reducers/templates.js b/src/reducers/templates.js index b1e74c96d..6c0851d63 100644 --- a/src/reducers/templates.js +++ b/src/reducers/templates.js @@ -165,14 +165,14 @@ export default function(state = initialState, action) { return { ...state, isLoading: false, - error: action.payload.response.data.result.content.message + error: action.payload.response.data.result.status >= 500 } case UPDATE_PROJECTS_METADATA_FAILURE: Alert.error(`PROJECT METADATA UPDATE FAILED: ${action.payload.response.data.result.content.message}`) return { ...state, isLoading: false, - error: action.payload.response.data.result.content.message + error: action.payload.response.data.result.status >= 500 } case REMOVE_PROJECTS_METADATA_FAILURE: case REMOVE_PRODUCT_CATEGORY_FAILURE: @@ -183,7 +183,7 @@ export default function(state = initialState, action) { return { ...state, isRemoving: false, - error: action.payload.response.data.result.content.message + error: action.payload.response.data.result.status >= 500 } case ADD_PROJECTS_METADATA_SUCCESS: case CREATE_PROJECT_TEMPLATE_SUCCESS: From da95bbd3ecc9efd71c59e3a518a06445d8631fc0 Mon Sep 17 00:00:00 2001 From: gets0ul Date: Tue, 24 Sep 2019 19:37:27 +0700 Subject: [PATCH 2/3] Set error flag as false as it is actually not needed. --- src/reducers/templates.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/reducers/templates.js b/src/reducers/templates.js index 6c0851d63..b312d9fc3 100644 --- a/src/reducers/templates.js +++ b/src/reducers/templates.js @@ -165,14 +165,14 @@ export default function(state = initialState, action) { return { ...state, isLoading: false, - error: action.payload.response.data.result.status >= 500 + error: false } case UPDATE_PROJECTS_METADATA_FAILURE: Alert.error(`PROJECT METADATA UPDATE FAILED: ${action.payload.response.data.result.content.message}`) return { ...state, isLoading: false, - error: action.payload.response.data.result.status >= 500 + error: false } case REMOVE_PROJECTS_METADATA_FAILURE: case REMOVE_PRODUCT_CATEGORY_FAILURE: @@ -183,7 +183,7 @@ export default function(state = initialState, action) { return { ...state, isRemoving: false, - error: action.payload.response.data.result.status >= 500 + error: false } case ADD_PROJECTS_METADATA_SUCCESS: case CREATE_PROJECT_TEMPLATE_SUCCESS: From 5bf51321941d51bd2bce31832c6b974924f31ebf Mon Sep 17 00:00:00 2001 From: gets0ul Date: Tue, 24 Sep 2019 22:22:52 +0700 Subject: [PATCH 3/3] remove error --- src/reducers/templates.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/reducers/templates.js b/src/reducers/templates.js index b312d9fc3..1589787b0 100644 --- a/src/reducers/templates.js +++ b/src/reducers/templates.js @@ -164,15 +164,13 @@ export default function(state = initialState, action) { Alert.error(`PROJECT METADATA CREATE FAILED: ${action.payload.response.data.result.content.message}`) return { ...state, - isLoading: false, - error: false + isLoading: false } case UPDATE_PROJECTS_METADATA_FAILURE: Alert.error(`PROJECT METADATA UPDATE FAILED: ${action.payload.response.data.result.content.message}`) return { ...state, - isLoading: false, - error: false + isLoading: false } case REMOVE_PROJECTS_METADATA_FAILURE: case REMOVE_PRODUCT_CATEGORY_FAILURE: @@ -182,8 +180,7 @@ export default function(state = initialState, action) { Alert.error(`PROJECT METADATA DELETE FAILED: ${action.payload.response.data.result.content.message}`) return { ...state, - isRemoving: false, - error: false + isRemoving: false } case ADD_PROJECTS_METADATA_SUCCESS: case CREATE_PROJECT_TEMPLATE_SUCCESS: