From 7c3b5a790b22deb06e0b829a32777abb35872110 Mon Sep 17 00:00:00 2001 From: EdwinBetanc0urt Date: Sat, 29 May 2021 00:21:33 -0400 Subject: [PATCH] fix: Load Smart Browser. --- src/api/ADempiere/browser.js | 5 +++-- .../ADempiere/DataTable/dataTables-Script.js | 7 +++--- .../modules/ADempiere/browserDefinition.js | 22 ++++++++++++++++--- src/utils/ADempiere/apiConverts/dictionary.js | 9 ++++++-- 4 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/api/ADempiere/browser.js b/src/api/ADempiere/browser.js index b4b525a7651..212db637240 100644 --- a/src/api/ADempiere/browser.js +++ b/src/api/ADempiere/browser.js @@ -47,14 +47,15 @@ export function requestBrowserSearch({ }) { const filters = parametersList.map(parameter => { return { - key: parameter.columnName, + column_name: parameter.columnName, value: parameter.value, - values: parameter.values + value_to: parameter.valueTo } }) return request({ url: '/user-interface/smart-browser/browser-items', + method: 'post', data: { // Running Parameters uuid, diff --git a/src/components/ADempiere/DataTable/dataTables-Script.js b/src/components/ADempiere/DataTable/dataTables-Script.js index 7603c25309f..d3934e03286 100644 --- a/src/components/ADempiere/DataTable/dataTables-Script.js +++ b/src/components/ADempiere/DataTable/dataTables-Script.js @@ -357,12 +357,11 @@ export default { }) }, headerLabel(field) { - if (field.isMandatory || field.isMandatoryFromLogic && field.isDisplayedGrid) { + if (field.isMandatory || field.isMandatoryFromLogic) { return '* ' + field.name } - if (field.isDisplayedGrid) { - return field.name - } + + return field.name }, /** * @param {object} row, row data diff --git a/src/store/modules/ADempiere/browserDefinition.js b/src/store/modules/ADempiere/browserDefinition.js index 5b557af6f3f..1afc8e61624 100644 --- a/src/store/modules/ADempiere/browserDefinition.js +++ b/src/store/modules/ADempiere/browserDefinition.js @@ -1,3 +1,19 @@ +// ADempiere-Vue (Frontend) for ADempiere ERP & CRM Smart Business Solution +// Copyright (C) 2017-Present E.R.P. Consultores y Asociados, C.A. +// Contributor(s): Edwin Betancourt EdwinBetanc0urt@outlook.com www.erpya.com +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + import { requestBrowserMetadata } from '@/api/ADempiere/dictionary/smart-browser.js' import { showMessage } from '@/utils/ADempiere/notification' import { isEmptyValue } from '@/utils/ADempiere/valueUtils' @@ -50,8 +66,7 @@ const browser = { } const { query, - whereClause, - process + whereClause } = browserResponse // Convert from gRPC @@ -132,7 +147,8 @@ const browser = { // Convert from gRPC process list const actions = [] - if (process) { + if (!isEmptyValue(browserResponse.process)) { + const { process } = browserResponse actions.push({ type: 'process', panelType: 'process', diff --git a/src/utils/ADempiere/apiConverts/dictionary.js b/src/utils/ADempiere/apiConverts/dictionary.js index b5a96dd43d3..76bee64014a 100644 --- a/src/utils/ADempiere/apiConverts/dictionary.js +++ b/src/utils/ADempiere/apiConverts/dictionary.js @@ -20,10 +20,13 @@ import { } from '@/utils/ADempiere/apiConverts/field.js' import { convertContextInfo } from '@/utils/ADempiere/apiConverts/core.js' import { camelizeObjectKeys } from '../transformObject' +import { isEmptyValue } from '@/utils/ADempiere/valueUtils.js' export function convertProcess(process) { const convertedProcess = camelizeObjectKeys(process) - convertedProcess.parameters = process.parameters.map(parameter => convertField(parameter)) + if (!isEmptyValue(process.parameters)) { + convertedProcess.parameters = process.parameters.map(parameter => convertField(parameter)) + } return convertedProcess } @@ -35,7 +38,9 @@ export function convertReportExportType(reportExportType) { export function convertBrowser(browser) { const convertedBrowser = camelizeObjectKeys(browser) convertedBrowser.window = convertWindow(browser.window) - convertedBrowser.process = convertProcess(browser.process) + if (!isEmptyValue(browser.process)) { + convertedBrowser.process = convertProcess(browser.process) + } convertedBrowser.fields = browser.fields.map(fieldItem => convertField(fieldItem)) return convertedBrowser }