From b160070320c258f4c3de9519203403333f9d9479 Mon Sep 17 00:00:00 2001 From: EdwinBetanc0urt Date: Tue, 21 Jan 2020 14:01:17 -0400 Subject: [PATCH] feat: Add support to gRPC Business Data Client version 1.9.0 (#236) --- package.json | 2 +- src/api/ADempiere/data.js | 143 +++++++++++++----- src/api/ADempiere/index.js | 4 + .../ADempiere/Dashboard/favourites/index.vue | 2 +- .../ADempiere/Dashboard/recentItems/index.vue | 6 +- src/components/ADempiere/Dialog/index.vue | 2 +- src/store/modules/ADempiere/dashboard.js | 6 +- .../modules/ADempiere/languageControl.js | 2 +- src/store/modules/ADempiere/processControl.js | 10 +- src/store/modules/ADempiere/reportControl.js | 10 +- 10 files changed, 131 insertions(+), 56 deletions(-) diff --git a/package.json b/package.json index 3e678ab2..ed380b9d 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ }, "dependencies": { "@adempiere/grpc-access-client": "^1.1.8", - "@adempiere/grpc-data-client": "^1.8.8", + "@adempiere/grpc-data-client": "^1.9.0", "@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 871023af..0c9a094a 100644 --- a/src/api/ADempiere/data.js +++ b/src/api/ADempiere/data.js @@ -80,14 +80,23 @@ export function getEntity({ tableName, recordId, recordUuid }) { * @param {string} orderByClause * @param {string} nextPageToken */ -export function getEntitiesList({ tableName, query, whereClause, conditions: conditionsList = [], orderByClause, nextPageToken }) { +export function getEntitiesList({ + tableName, + query, + whereClause, + conditions: conditionsList = [], + orderByClause, + nextPageToken: pageToken, + pageSize +}) { return Instance.call(this).requestEntitiesList({ tableName, query, whereClause, conditionsList, orderByClause, - nextPageToken + pageToken, + pageSize }) } @@ -97,7 +106,11 @@ export function getEntitiesList({ tableName, query, whereClause, conditions: con * @param {number} recordId * @param {string} eventType */ -export function rollbackEntity({ tableName, recordId, eventType }) { +export function rollbackEntity({ + tableName, + recordId, + eventType +}) { return Instance.call(this).rollbackEntityRequest({ tableName, recordId, @@ -112,7 +125,11 @@ export function rollbackEntity({ tableName, recordId, eventType }) { * @param {string} directQuery * @param {string|number} value */ -export function getLookup({ tableName, directQuery, value }) { +export function getLookup({ + tableName, + directQuery, + value +}) { return Instance.call(this).requestLookupFromReference({ tableName, directQuery, @@ -126,10 +143,17 @@ export function getLookup({ tableName, directQuery, value }) { * @param {string} tableName * @param {string} query */ -export function getLookupList({ tableName, query }) { - return Instance.call(this).requestLookupListFromReference({ +export function getLookupList({ + tableName, + query, + pageToken, + pageSize +}) { + return Instance.call(this).requestListLookupFromReference({ tableName, - query + query, + pageToken, + pageSize }) } @@ -174,26 +198,27 @@ export function runProcess({ uuid, reportType, tableName, recordId, parameters: * value * }] */ -export function getBrowserSearch({ uuid, parameters: parametersList = [], query, whereClause, orderByClause, nextPageToken }) { +export function getBrowserSearch({ uuid, parameters: parametersList = [], query, whereClause, orderByClause, nextPageToken: pageToken, pageSize }) { // Run browser - return Instance.call(this).requestBrowserSearch({ + return Instance.call(this).requestListBrowserSearch({ uuid, parametersList, query, whereClause, orderByClause, - nextPageToken + pageToken, + pageSize }) } // Request a Process Activity list -export function requestProcessActivity() { +export function requestProcessActivity({ pageToken, pageSize }) { // Get Process Activity - return Instance.call(this).requestProcessActivity() + return Instance.call(this).requestListProcessesLogs({ pageToken, pageSize }) } -export function getRecentItems() { - return Instance.call(this).requestRecentItems() +export function getRecentItems({ pageToken, pageSize }) { + return Instance.call(this).requestListRecentItems({ pageToken, pageSize }) } /** @@ -203,12 +228,14 @@ export function getRecentItems() { * @param {string} recordUuid * @param {number} recordId */ -export function getReferencesList({ windowUuid, tableName, recordId, recordUuid }) { - return Instance.call(this).listReferencesRequest({ +export function getReferencesList({ windowUuid, tableName, recordId, recordUuid, pageToken, pageSize }) { + return Instance.call(this).requestListReferences({ windowUuid, tableName, recordId, - recordUuid + recordUuid, + pageToken, + pageSize }) } @@ -275,14 +302,16 @@ export function unlockPrivateAccessFromServer({ tableName, recordId, userUuid }) * Request Favorites List * @param {string} userUuid */ -export function getFavoritesFromServer(userUuid) { - return Instance.call(this).requestFavorites(userUuid) +export function getFavoritesFromServer({ userUuid, pageToken, pageSize }) { + return Instance.call(this).requestListFavorites({ userUuid, pageToken, pageSize }) } -export function getPendingDocumentsFromServer({ userUuid, roleUuid }) { - return Instance.call(this).requestPendingDocuments({ +export function getPendingDocumentsFromServer({ userUuid, roleUuid, pageToken, pageSize }) { + return Instance.call(this).requestListPendingDocuments({ userUuid, - roleUuid + roleUuid, + pageToken, + pageSize }) } @@ -291,27 +320,35 @@ export function getPendingDocumentsFromServer({ userUuid, roleUuid }) { * @param {string} tableName * @param {string} processUuid */ -export function requestReportViews({ tableName, processUuid }) { - return Instance.call(this).requestReportViews({ +export function requestReportViews({ tableName, processUuid, pageToken, pageSize }) { + return Instance.call(this).requestListReportViews({ tableName, - processUuid + processUuid, + pageToken, + pageSize }) } -export function requestPrintFormats({ tableName, reportViewUuid, processUuid }) { - return Instance.call(this).requestPrintFormats({ +export function requestPrintFormats({ tableName, reportViewUuid, processUuid, pageToken, pageSize }) { + return Instance.call(this).requestListPrintFormats({ tableName, reportViewUuid, - processUuid + processUuid, + pageToken, + pageSize }) } -export function requestLisDashboards(roleUuid) { - return Instance.call(this).requestDashboards(roleUuid) +export function requestLisDashboards({ roleUuid, pageToken, pageSize }) { + return Instance.call(this).requestListDashboards({ + roleUuid, + pageToken, + pageSize + }) } -export function requestLanguages() { - return Instance.call(this).requestLanguages() +export function requestLanguages({ pageToken, pageSize }) { + return Instance.call(this).requestListLanguages({ pageToken, pageSize }) } /** @@ -321,17 +358,23 @@ export function requestLanguages() { * @param {string} recordUuid * @param {integer} recordId */ -export function requestTranslations({ tableName, language, recordUuid, recordId }) { +export function requestTranslations({ tableName, language, recordUuid, recordId, pageToken, pageSize }) { return Instance.call(this).requestTranslations({ tableName, recordUuid, recordId, - language + language, + pageToken, + pageSize }) } -export function requestDrillTables(tableName) { - return Instance.call(this).requestDrillTables(tableName) +export function requestDrillTables({ tableName, pageToken, pageSize }) { + return Instance.call(this).requestListDrillTables({ + tableName, + pageToken, + pageSize + }) } export function getReportOutput({ @@ -353,3 +396,31 @@ export function getReportOutput({ reportType }) } + +export function requestListRecordsLogs({ + tableName, + recordId, + pageToken, + pageSize +}) { + return Instance.call(this).requestListRecordsLogs({ + tableName, + recordId, + pageToken, + pageSize + }) +} + +export function requestListWorkflowsLogs({ + tableName, + recordId, + pageToken, + pageSize +}) { + return Instance.call(this).requestListWorkflowsLogs({ + tableName, + recordId, + pageToken, + pageSize + }) +} diff --git a/src/api/ADempiere/index.js b/src/api/ADempiere/index.js index e77829ff..9f4a9c5c 100644 --- a/src/api/ADempiere/index.js +++ b/src/api/ADempiere/index.js @@ -1,4 +1,8 @@ // Export dictionary connection export * from './dictionary' + // Export data connection export * from './data' + +// Export enrollment user connection +export * from './enrollment' diff --git a/src/components/ADempiere/Dashboard/favourites/index.vue b/src/components/ADempiere/Dashboard/favourites/index.vue index 9f292240..7575643b 100644 --- a/src/components/ADempiere/Dashboard/favourites/index.vue +++ b/src/components/ADempiere/Dashboard/favourites/index.vue @@ -62,7 +62,7 @@ export default { getFavoritesList() { const userUuid = this.$store.getters['user/getUserUuid'] return new Promise((resolve, reject) => { - getFavoritesFromServer(userUuid) + getFavoritesFromServer({ userUuid }) .then(response => { const favorites = response.favoritesList.map(favoriteElement => { const actionConverted = convertAction(favoriteElement.action) diff --git a/src/components/ADempiere/Dashboard/recentItems/index.vue b/src/components/ADempiere/Dashboard/recentItems/index.vue index 24ff13cc..01a76504 100644 --- a/src/components/ADempiere/Dashboard/recentItems/index.vue +++ b/src/components/ADempiere/Dashboard/recentItems/index.vue @@ -59,16 +59,16 @@ export default { } }, mounted() { - this.getRecentItems() + this.getRecentItems({ pageToken: undefined, pageSize: undefined }) this.subscribeChanges() }, methods: { checkOpened(uuid) { return this.cachedViews.includes(uuid) }, - getRecentItems() { + getRecentItems({ pageToken, pageSize }) { return new Promise((resolve, reject) => { - getRecentItemsFromServer() + getRecentItemsFromServer({ pageToken, pageSize }) .then(response => { const recentItems = response.recentItemsList.map(item => { const actionConverted = convertAction(item.action) diff --git a/src/components/ADempiere/Dialog/index.vue b/src/components/ADempiere/Dialog/index.vue index 08771c4a..4cd33ccc 100644 --- a/src/components/ADempiere/Dialog/index.vue +++ b/src/components/ADempiere/Dialog/index.vue @@ -150,7 +150,7 @@ export default { const selection = this.$store.getters.getProcessSelect if (porcesTabla) { // selection.forEach(element => { - this.$store.dispatch('SelectionProcess', { + this.$store.dispatch('selectionProcess', { action: action, // process metadata parentUuid: this.parentUuid, containerUuid: this.containerUuid, diff --git a/src/store/modules/ADempiere/dashboard.js b/src/store/modules/ADempiere/dashboard.js index 8929ad84..7638c6ac 100644 --- a/src/store/modules/ADempiere/dashboard.js +++ b/src/store/modules/ADempiere/dashboard.js @@ -24,7 +24,7 @@ const dashboard = { }, listDashboard({ commit }, roleUuid) { return new Promise((resolve, reject) => { - requestLisDashboards(roleUuid) + requestLisDashboards({ roleUuid }) .then(dashboardResponse => { const roleDashboards = { roleUuid: roleUuid, @@ -40,7 +40,7 @@ const dashboard = { }, getRecentItemsFromServer({ commit }) { return new Promise((resolve, reject) => { - getRecentItems() + getRecentItems({ pageToken: undefined, pageSize: undefined }) .then(recentItemsResponse => { const recentItems = recentItemsResponse.recentItemsList.map(item => { const actionConverted = convertAction(item.action) @@ -55,7 +55,7 @@ const dashboard = { resolve(recentItems) }) .catch(error => { - console.warn(`Error gettin recent items: ${error.message}. Code: ${error.code}`) + console.warn(`Error gettin recent items: ${error.message}. Code: ${error.code}.`) reject(error) }) }) diff --git a/src/store/modules/ADempiere/languageControl.js b/src/store/modules/ADempiere/languageControl.js index 9fed2644..37a9e936 100644 --- a/src/store/modules/ADempiere/languageControl.js +++ b/src/store/modules/ADempiere/languageControl.js @@ -30,7 +30,7 @@ const languageControl = { actions: { getLanguagesFromServer({ commit }) { return new Promise((resolve, reject) => { - requestLanguages() + requestLanguages({ pageToke: undefined, pageSize: undefined }) .then(languageResponse => { commit('setlanguagesList', languageResponse.languagesList) resolve(languageResponse.languagesList) diff --git a/src/store/modules/ADempiere/processControl.js b/src/store/modules/ADempiere/processControl.js index 587db830..1b3de633 100644 --- a/src/store/modules/ADempiere/processControl.js +++ b/src/store/modules/ADempiere/processControl.js @@ -553,7 +553,7 @@ const processControl = { message: error.message, isProcessing: false }) - console.warn(`Error running the process ${error.message}. Code: ${error.code}`) + console.warn(`Error running the process ${error.message}. Code: ${error.code}.`) reject(error) }) .finally(() => { @@ -597,7 +597,7 @@ const processControl = { }) }, // Supported to process selection - SelectionProcess({ commit, state, dispatch, getters, rootGetters }, params) { + selectionProcess({ commit, state, dispatch, getters, rootGetters }, params) { // get info metadata process const processDefinition = rootGetters.getProcess(params.action.uuid) var reportType = 'pdf' @@ -785,7 +785,7 @@ const processControl = { message: error.message, isProcessing: false }) - console.warn(`Error running the process ${error}`) + console.warn(`Error running the process ${error}.`) }) } }) @@ -798,7 +798,7 @@ const processControl = { // process Activity return requestProcessActivity() .then(processActivityResponse => { - const responseList = processActivityResponse.responsesList.map(businessProcessItem => { + const responseList = processActivityResponse.processLogsList.map(businessProcessItem => { const processMetadata = rootGetters.getProcess(businessProcessItem.uuid) // if no exists metadata process in store and no request progess if (processMetadata === undefined && getters.getInRequestMetadata(businessProcessItem.uuid) === undefined) { @@ -832,7 +832,7 @@ const processControl = { message: error.message, type: 'error' }) - console.warn(`Error getting process activity: ${error.message}. Code: ${error.code}`) + console.warn(`Error getting process activity: ${error.message}. Code: ${error.code}.`) }) }, /** diff --git a/src/store/modules/ADempiere/reportControl.js b/src/store/modules/ADempiere/reportControl.js index a736c8ba..b0a770c7 100644 --- a/src/store/modules/ADempiere/reportControl.js +++ b/src/store/modules/ADempiere/reportControl.js @@ -46,7 +46,7 @@ const contextMenu = { return printFormatList }) .catch(error => { - console.warn(`Error getting print formats: ${error.message}. Code: ${error.code}`) + console.warn(`Error getting print formats: ${error.message}. Code: ${error.code}.`) }) }, requestReportViews({ commit }, { @@ -75,7 +75,7 @@ const contextMenu = { return reportViewList }) .catch(error => { - console.warn(`Error getting report views: ${error.message}. Code: ${error.code}`) + console.warn(`Error getting report views: ${error.message}. Code: ${error.code}.`) }) }, requestDrillTables({ commit }, { @@ -86,7 +86,7 @@ const contextMenu = { tableName, reportViewUuid }) { - return requestDrillTables(tableName) + return requestDrillTables({ tableName }) .then(responseDrillTables => { const drillTablesList = responseDrillTables.drillTablesList.map(drillTableItem => { return { @@ -108,7 +108,7 @@ const contextMenu = { return drillTablesList }) .catch(error => { - console.warn(`Error getting drill tables: ${error.message}. Code: ${error.code}`) + console.warn(`Error getting drill tables: ${error.message}. Code: ${error.code}.`) }) }, getReportOutputFromServer({ commit, getters, rootGetters }, parameters) { @@ -174,7 +174,7 @@ const contextMenu = { isReport: true, option: '' } - console.warn(`Error getting report output: ${error.message}. Code: ${error.code}`) + console.warn(`Error getting report output: ${error.message}. Code: ${error.code}.`) return reportOutput }) }