diff --git a/package.json b/package.json index f38b1d61..dc806c10 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ }, "dependencies": { "@adempiere/grpc-access-client": "^1.1.8", - "@adempiere/grpc-data-client": "^1.9.2", + "@adempiere/grpc-data-client": "^1.9.8", "@adempiere/grpc-dictionary-client": "^1.3.5", "@adempiere/grpc-enrollment-client": "^1.0.7", "autoprefixer": "^9.5.1", diff --git a/src/api/ADempiere/data.js b/src/api/ADempiere/data.js index 6fda45dc..d9958738 100644 --- a/src/api/ADempiere/data.js +++ b/src/api/ADempiere/data.js @@ -267,7 +267,7 @@ export function runCallOutRequest({ windowUuid, windowNo, tabUuid, tableName, co } export function getDefaultValueFromServer(query) { - return Instance.call(this).getDefaultValue(query) + return Instance.call(this).requestGetDefaultValue(query) } export function getContextInfoValueFromServer({ uuid, query }) { diff --git a/src/components/ADempiere/Dashboard/docstatus/index.vue b/src/components/ADempiere/Dashboard/docstatus/index.vue index 9b5fad68..40b61814 100644 --- a/src/components/ADempiere/Dashboard/docstatus/index.vue +++ b/src/components/ADempiere/Dashboard/docstatus/index.vue @@ -57,7 +57,7 @@ export default { getPendingDocuments() { const userUuid = this.$store.getters['user/getUserUuid'] const roleUuid = this.$store.getters.getRoleUuid - return new Promise((resolve, reject) => { + return new Promise(resolve => { getPendingDocumentsFromServer({ userUuid, roleUuid }) .then(response => { const documentsList = response.pendingDocumentsList.map(documentItem => { diff --git a/src/components/ADempiere/Dashboard/favourites/index.vue b/src/components/ADempiere/Dashboard/favourites/index.vue index 7386ff5f..1f0540f5 100644 --- a/src/components/ADempiere/Dashboard/favourites/index.vue +++ b/src/components/ADempiere/Dashboard/favourites/index.vue @@ -58,7 +58,7 @@ export default { methods: { getFavoritesList() { const userUuid = this.$store.getters['user/getUserUuid'] - return new Promise((resolve, reject) => { + return new Promise(resolve => { getFavoritesFromServer({ userUuid }) .then(response => { const favorites = response.favoritesList.map(favoriteElement => { diff --git a/src/components/ADempiere/Dashboard/index.vue b/src/components/ADempiere/Dashboard/index.vue index 85ff6731..669dacd9 100644 --- a/src/components/ADempiere/Dashboard/index.vue +++ b/src/components/ADempiere/Dashboard/index.vue @@ -10,7 +10,9 @@ class="custom-collapse-item" > { + return new Promise(resolve => { getRecentItemsFromServer({ pageToken, pageSize }) .then(response => { const recentItems = response.recentItemsList.map(item => { diff --git a/src/components/ADempiere/Field/FieldSelect.vue b/src/components/ADempiere/Field/FieldSelect.vue index 73ab85cb..b7d97fd7 100644 --- a/src/components/ADempiere/Field/FieldSelect.vue +++ b/src/components/ADempiere/Field/FieldSelect.vue @@ -115,7 +115,6 @@ export default { }, 'metadata.displayColumn'(value) { if (!this.isEmptyValue(this.value)) { - // console.log('display wacth') if (!this.isEmptyValue(value)) { // verify if exists to add if (!this.findLabel(this.value)) { diff --git a/src/lang/ADempiere/en.js b/src/lang/ADempiere/en.js index fc5b1975..e6af98e6 100644 --- a/src/lang/ADempiere/en.js +++ b/src/lang/ADempiere/en.js @@ -273,12 +273,12 @@ export default { notes: 'Notes', changeLog: 'Change Log', workflowLog: 'Workflow Log', - changeDetail: 'Detalle del cambio', + changeDetail: 'Change Detail', eventType: { insert: 'Insert', update: 'Update', delete: 'Delete', - field: 'The Fiel', + field: 'The Field', newValue: 'New Value', oldValue: 'Old Value' } diff --git a/src/store/modules/ADempiere/browser.js b/src/store/modules/ADempiere/browser.js index dfb01069..93477a3b 100644 --- a/src/store/modules/ADempiere/browser.js +++ b/src/store/modules/ADempiere/browser.js @@ -23,7 +23,7 @@ const browser = { containerUuid, routeToDelete }) { - return new Promise((resolve, reject) => { + return new Promise(resolve => { getBrowserMetadata(containerUuid) .then(browserResponse => { const panelType = 'browser' @@ -142,8 +142,7 @@ const browser = { message: language.t('login.unexpectedError'), type: 'error' }) - console.warn(`Dictionary Browser - Error ${error.code}: ${error.message}`) - reject(error) + console.warn(`Dictionary Browser - Error ${error.code}: ${error.message}.`) }) }) }, diff --git a/src/store/modules/ADempiere/containerInfo.js b/src/store/modules/ADempiere/containerInfo.js index dace1216..bbba5e54 100644 --- a/src/store/modules/ADempiere/containerInfo.js +++ b/src/store/modules/ADempiere/containerInfo.js @@ -26,9 +26,9 @@ const containerInfo = { listWorkflowLogs({ commit, state }, params) { const tableName = params.tableName const recordId = params.recordId - const page_size = 0 - const page_token = 0 - return requestListWorkflowsLogs({ tableName, recordId, page_size, page_token }) + const pageSize = 0 + const pageToken = 0 + return requestListWorkflowsLogs({ tableName, recordId, pageSize, pageToken }) .then(response => { commit('addListWorkflow', response) }) @@ -39,9 +39,9 @@ const containerInfo = { listRecordLogs({ commit, state }, params) { const tableName = params.tableName const recordId = params.recordId - const page_size = 0 - const page_token = 0 - return requestListRecordsLogs({ tableName, recordId, page_size, page_token }) + const pageSize = 0 + const pageToken = 0 + return requestListRecordsLogs({ tableName, recordId, pageSize, pageToken }) .then(response => { var listRecord = { recordCount: response.recordCount, @@ -53,27 +53,25 @@ const containerInfo = { console.warn(`Error getting List Record Logs: ${error.message}. Code: ${error.code}.`) }) }, - listChatEntries({ commit, state }, params) { + listChatEntries({ commit }, params) { const tableName = params.tableName const recordId = params.recordId - const page_size = 0 - const page_token = 0 - return requestListRecordChats({ tableName, recordId, page_size, page_token }) + const pageSize = 0 + const pageToken = 0 + return requestListRecordChats({ tableName, recordId, pageSize, pageToken }) .then(response => { - console.log('requestListRecordChats response =>', response) commit('addListChatEntries', response) }) .catch(error => { console.warn(`Error getting List Chat: ${error.message}. Code: ${error.code}.`) }) }, - listRecordChat({ commit, state }, params) { + listRecordChat({ commit }, params) { const uuid = params.uuid - const page_size = 0 - const page_token = 0 - return requestListChatEntries({ uuid, page_size, page_token }) + const pageSize = 0 + const pageToken = 0 + return requestListChatEntries({ uuid, pageSize, pageToken }) .then(response => { - console.log('requestListChatEntries response =>', response) commit('addListChatEntries', response) }) .catch(error => { @@ -88,7 +86,7 @@ const containerInfo = { getRecordLogs: (state) => { const recordLogs = state.listRecordLogs.recorLogs if (isEmptyValue(recordLogs)) { - var listRecord = [{ + const listRecord = [{ columnName: 'Compañía', description: 'Compañía', displayColumnName: 'Compañía', @@ -127,9 +125,8 @@ const containerInfo = { userUuid: '' }] return listRecord - } else { - return state.listRecordLogs } + return state.listRecordLogs }, getChatEntries: (state) => { return state.listChatEntries diff --git a/src/store/modules/ADempiere/dashboard.js b/src/store/modules/ADempiere/dashboard.js index 7638c6ac..e4305809 100644 --- a/src/store/modules/ADempiere/dashboard.js +++ b/src/store/modules/ADempiere/dashboard.js @@ -1,6 +1,8 @@ // Default store for handle dashboard refresh and other functionalities import { requestLisDashboards, getRecentItems } from '@/api/ADempiere/data' import { convertAction } from '@/utils/ADempiere/dictionaryUtils' +import { isEmptyValue } from '@/utils/ADempiere/valueUtils' +import { getCurrentRole } from '@/utils/auth' const dashboard = { state: { @@ -22,8 +24,13 @@ const dashboard = { refreshDashboard({ commit }, parameters) { commit('notifyDashboardRefresh', parameters) }, - listDashboard({ commit }, roleUuid) { - return new Promise((resolve, reject) => { + listDashboard({ commit, rootGetters }, roleUuid) { + if (isEmptyValue(roleUuid)) { + roleUuid = rootGetters.getRoleUuid + } else if (isEmptyValue(roleUuid)) { + roleUuid = getCurrentRole() + } + return new Promise(resolve => { requestLisDashboards({ roleUuid }) .then(dashboardResponse => { const roleDashboards = { @@ -34,12 +41,12 @@ const dashboard = { resolve(roleDashboards) }) .catch(error => { - reject(error) + console.warn(`Error getting List Dashboards: ${error.message}. Code: ${error.code}.`) }) }) }, getRecentItemsFromServer({ commit }) { - return new Promise((resolve, reject) => { + return new Promise(resolve => { getRecentItems({ pageToken: undefined, pageSize: undefined }) .then(recentItemsResponse => { const recentItems = recentItemsResponse.recentItemsList.map(item => { @@ -55,8 +62,7 @@ const dashboard = { resolve(recentItems) }) .catch(error => { - console.warn(`Error gettin recent items: ${error.message}. Code: ${error.code}.`) - reject(error) + console.warn(`Error getting recent items: ${error.message}. Code: ${error.code}.`) }) }) } diff --git a/src/store/modules/ADempiere/languageControl.js b/src/store/modules/ADempiere/languageControl.js index 37a9e936..79bb2c49 100644 --- a/src/store/modules/ADempiere/languageControl.js +++ b/src/store/modules/ADempiere/languageControl.js @@ -29,14 +29,14 @@ const languageControl = { }, actions: { getLanguagesFromServer({ commit }) { - return new Promise((resolve, reject) => { + return new Promise(resolve => { requestLanguages({ pageToke: undefined, pageSize: undefined }) .then(languageResponse => { commit('setlanguagesList', languageResponse.languagesList) resolve(languageResponse.languagesList) }) .catch(error => { - reject(error) + console.warn(`Error getting Languages List: ${error.message}. Code: ${error.code}.`) }) }) }, diff --git a/src/store/modules/ADempiere/process.js b/src/store/modules/ADempiere/process.js index 058ac316..bbf03489 100644 --- a/src/store/modules/ADempiere/process.js +++ b/src/store/modules/ADempiere/process.js @@ -33,7 +33,7 @@ const process = { .then(response => { printFormatsAvailable = response }) - return new Promise((resolve, reject) => { + return new Promise(resolve => { getProcessMetadata(containerUuid) .then(responseProcess => { responseProcess.printFormatsAvailable = printFormatsAvailable @@ -61,8 +61,7 @@ const process = { message: language.t('login.unexpectedError'), type: 'error' }) - console.warn(`Dictionary Process (State) - Error ${error.message}.`) - reject(error) + console.warn(`Dictionary Process - Error ${error.message}.`) }) }) }, diff --git a/src/utils/ADempiere/contextUtils.js b/src/utils/ADempiere/contextUtils.js index eedaf54c..3f78b4b5 100644 --- a/src/utils/ADempiere/contextUtils.js +++ b/src/utils/ADempiere/contextUtils.js @@ -104,7 +104,7 @@ export function parseContext({ const secondIndexTag = inStr.indexOf('@') // next @ // no exists second tag if (secondIndexTag < 0) { - console.log(`No second tag: ${inStr}`) + console.info(`No second tag: ${inStr}`) return { value: undefined, isError: true, diff --git a/src/views/ADempiere/Browser/index.vue b/src/views/ADempiere/Browser/index.vue index ab52e157..bdefc9b5 100644 --- a/src/views/ADempiere/Browser/index.vue +++ b/src/views/ADempiere/Browser/index.vue @@ -163,9 +163,6 @@ export default { .finally(() => { this.isLoaded = true }) - .catch(error => { - console.warn('Dictionary Browser - Error ' + error.code + ': ' + error.message) - }) } }, defaultSearch() { diff --git a/src/views/ADempiere/Process/index.vue b/src/views/ADempiere/Process/index.vue index a8f7271d..33530889 100644 --- a/src/views/ADempiere/Process/index.vue +++ b/src/views/ADempiere/Process/index.vue @@ -98,8 +98,6 @@ export default { routeToDelete: this.$route }).then(() => { this.processMetadata = this.getterProcess - }).catch(error => { - console.log('Dictionary Process - Error ' + error.code + ': ' + error.message) }).finally(() => { this.isLoadedMetadata = true }) diff --git a/src/views/profile/components/RolesNavbar.vue b/src/views/profile/components/RolesNavbar.vue index 031a9242..22545695 100644 --- a/src/views/profile/components/RolesNavbar.vue +++ b/src/views/profile/components/RolesNavbar.vue @@ -79,9 +79,6 @@ export default { }, getLanguageData() { this.$store.dispatch('getLanguagesFromServer') - .catch(error => { - console.warn(`Error getting language list: ${error.message}. Code: ${error.code}.`) - }) } } } diff --git a/src/views/profile/components/role.vue b/src/views/profile/components/role.vue index ef373149..461bbb5d 100644 --- a/src/views/profile/components/role.vue +++ b/src/views/profile/components/role.vue @@ -123,9 +123,6 @@ export default { getLanguageData() { if (this.isEmptyValue(this.getterLanguageList)) { this.$store.dispatch('getLanguagesFromServer') - .catch(error => { - console.warn(`Error getting languages list: ${error.message}. Code: ${error.code}.`) - }) } } }