diff --git a/src/components/ADempiere/Panel/index.vue b/src/components/ADempiere/Panel/index.vue index 2b1d5605..6c8d6e99 100644 --- a/src/components/ADempiere/Panel/index.vue +++ b/src/components/ADempiere/Panel/index.vue @@ -615,7 +615,7 @@ export default { return groupsList }, setTagsViewTitle(actionValue) { - if (!this.isEmptyValue(this.$route.params.recordId)) { + if (!this.isEmptyValue(this.$route.params.recordId) && this.getterPanel.isDocument) { this.$store.dispatch('listDocumentStatus', { recordUuid: this.$route.query.action, recordId: this.$route.params.recordId, diff --git a/src/store/modules/ADempiere/contextMenu.js b/src/store/modules/ADempiere/contextMenu.js index 66f4cb34..8edb8e08 100644 --- a/src/store/modules/ADempiere/contextMenu.js +++ b/src/store/modules/ADempiere/contextMenu.js @@ -60,29 +60,31 @@ const contextMenu = { documentAction, documentStatus }) { - requestListDocumentActions({ - tableName, - recordId, - recordUuid, - documentAction, - documentStatus, - pageSize: 0, - pageToken: '' - }) - .then(responseDocumentActios => { - const documentAction = { - defaultDocumentAction: responseDocumentActios.defaultDocumentAction, - documentActionsList: responseDocumentActios.documentActionsList, - recordId, - recordUuid - } + return new Promise(resolve => { + requestListDocumentActions({ + tableName, + recordId, + recordUuid, + documentAction, + documentStatus, + pageSize: 0, + pageToken: '' + }) + .then(responseDocumentActios => { + const documentAction = { + defaultDocumentAction: responseDocumentActios.defaultDocumentAction, + documentActionsList: responseDocumentActios.documentActionsList, + recordId, + recordUuid + } - commit('listDocumentAction', documentAction) - return documentAction - }) - .catch(error => { - console.warn(error) - }) + commit('listDocumentAction', documentAction) + resolve(documentAction) + }) + .catch(error => { + console.warn(`Error getting document action list. Code ${error.code}: ${error.message}.`) + }) + }) }, listDocumentStatus({ commit }, { tableName, @@ -91,27 +93,29 @@ const contextMenu = { documentAction, documentStatus }) { - requestListDocumentStatuses({ - tableName, - recordId, - recordUuid, - documentAction, - documentStatus, - pageSize: 0, - pageToken: '' + return new Promise(resolve => { + requestListDocumentStatuses({ + tableName, + recordId, + recordUuid, + documentAction, + documentStatus, + pageSize: 0, + pageToken: '' + }) + .then(responseDocumentStatus => { + const documentStatus = { + documentActionsList: responseDocumentStatus.documentStatusesList, + recordId, + recordUuid + } + commit('addlistDocumentStatus', documentStatus) + resolve(documentStatus) + }) + .catch(error => { + console.warn(`Error getting document statuses list. Code ${error.code}: ${error.message}.`) + }) }) - .then(responseDocumentStatus => { - const documentStatus = { - documentActionsList: responseDocumentStatus.documentStatusesList, - recordId, - recordUuid - } - commit('addlistDocumentStatus', documentStatus) - return documentStatus - }) - .catch(error => { - console.warn(error) - }) } }, getters: { @@ -131,10 +135,10 @@ const contextMenu = { const menu = state.contextMenu.find( item => item.containerUuid === containerUuid ) - if (menu === undefined) { - return menu + if (menu) { + return menu.actions } - return menu.actions + return menu }, getListDocumentActions: (state) => { return state.listDocumentAction