diff --git a/src/_helpers/util.js b/src/_helpers/util.js index 07b1b18..082b1fe 100644 --- a/src/_helpers/util.js +++ b/src/_helpers/util.js @@ -121,7 +121,7 @@ export const util = { } else if (response.status === 422) { console.log('handleCrudResponse: received 422, error: ' + JSON.stringify(data)); - setValidationErrors(data, messages, errors); + util.setValidationErrors(data, messages, errors); } const error = (data && data.message) || response.statusText; @@ -139,9 +139,11 @@ export const util = { if (parts.length === 3 && parts[0] === 'err') { const field = parts[1]; const messageTemplate = data[i].messageTemplate.replace(/\./g, '_'); - const message = messages.hasOwnProperty(messageTemplate) ? messages[messageTemplate] : '???'+messageTemplate; + const message = messages[messageTemplate]; errors.add({field: field, msg: message}); - console.log('>>>>> field '+field+' added error: '+message+', errors='+JSON.stringify(errors)); + // console.log('>>>>> field '+field+' added error: '+message+', errors='+JSON.stringify(errors)); + // } else { + // console.log('>>>>> data item did not contain a valid error: '+JSON.stringify(data[i])); } } // todo: else add "global" error message for unrecognized/non-field error diff --git a/src/_services/system.service.js b/src/_services/system.service.js index a011117..53bebcf 100644 --- a/src/_services/system.service.js +++ b/src/_services/system.service.js @@ -22,10 +22,10 @@ function loadIsActivated () { .then(activated => { return activated; }); } -function activate (activation) { +function activate (activation, messages, errors) { const requestOptions = util.putNoAuth(activation); return fetch(`${config.apiUrl}/auth/activate`, requestOptions) - .then(util.handleBasicResponse) + .then(util.handleCrudResponse(messages, errors)) .then(admin => { return admin; }); } diff --git a/src/_store/system.module.js b/src/_store/system.module.js index ba18be6..24081a7 100644 --- a/src/_store/system.module.js +++ b/src/_store/system.module.js @@ -52,9 +52,9 @@ const actions = { error => commit('loadIsActivatedFailure', error) ); }, - activate({ commit }, activation) { + activate({ commit }, {activation, messages, errors}) { commit('activateRequest'); - systemService.activate(activation) + systemService.activate(activation, messages, errors) .then( admin => { commit('activateSuccess', admin); @@ -223,7 +223,7 @@ const mutations = { state.activated = activated; }, loadIsActivatedFailure(state, error) { - state.errors.activated = error; + state.error = error; }, activateRequest(state) { @@ -238,7 +238,7 @@ const mutations = { }, activateFailure(state, error) { state.status.activating = false; - state.errors.activated = error; + state.error = error; }, loadSystemConfigsRequest(state) {}, diff --git a/src/auth/ActivationPage.vue b/src/auth/ActivationPage.vue index 87fa5d7..9e709e3 100644 --- a/src/auth/ActivationPage.vue +++ b/src/auth/ActivationPage.vue @@ -5,38 +5,38 @@