From 74997aa204965d206c0e5b82d3fd2250c8f0a7c5 Mon Sep 17 00:00:00 2001 From: Edwin Betancourt Date: Mon, 15 Jul 2024 21:37:14 -0400 Subject: [PATCH] feat: Get menu multitenant. (#2450) --- src/api/ADempiere/dictionary/form.js | 10 ++-------- src/api/ADempiere/dictionary/process.js | 10 ++-------- src/api/ADempiere/dictionary/smart-browser.js | 10 ++-------- src/api/ADempiere/dictionary/window.ts | 2 ++ src/api/ADempiere/security/index.ts | 2 ++ src/router/modules/ADempiere/menu.js | 15 ++++++++------- .../ADempiere/dictionary/browser/actions.js | 9 +-------- .../ADempiere/dictionary/process/actions.js | 11 +---------- .../ADempiere/dictionary/report/actions.js | 11 +---------- .../ADempiere/dictionary/window/actions.js | 11 +---------- src/store/modules/ADempiere/formDefinition.js | 11 ++--------- 11 files changed, 24 insertions(+), 78 deletions(-) diff --git a/src/api/ADempiere/dictionary/form.js b/src/api/ADempiere/dictionary/form.js index bcb33d0861..45596f37a5 100644 --- a/src/api/ADempiere/dictionary/form.js +++ b/src/api/ADempiere/dictionary/form.js @@ -27,20 +27,14 @@ export function requestForm({ id: uuid, // mandatory to open search language, - dictionaryCode, - clientId, - roleId, - userId + dictionaryCode }) { return request({ url: `/dictionary/forms/${uuid}`, method: 'get', params: { language, - dictionary_code: dictionaryCode, - client_id: clientId, - role_id: roleId, - user_id: userId + dictionary_code: dictionaryCode } }) } diff --git a/src/api/ADempiere/dictionary/process.js b/src/api/ADempiere/dictionary/process.js index 203fe09f2d..4da9c181ed 100644 --- a/src/api/ADempiere/dictionary/process.js +++ b/src/api/ADempiere/dictionary/process.js @@ -32,20 +32,14 @@ export function requestProcessMetadata({ id: uuid, // mandatory to open search language, - dictionaryCode, - clientId, - roleId, - userId + dictionaryCode }) { return request({ url: `/dictionary/processes/${uuid}`, method: 'get', params: { language, - dictionary_code: dictionaryCode, - client_id: clientId, - role_id: roleId, - user_id: userId + dictionary_code: dictionaryCode } }) } diff --git a/src/api/ADempiere/dictionary/smart-browser.js b/src/api/ADempiere/dictionary/smart-browser.js index 994d1f9e91..4bef7f5263 100644 --- a/src/api/ADempiere/dictionary/smart-browser.js +++ b/src/api/ADempiere/dictionary/smart-browser.js @@ -27,20 +27,14 @@ import { request } from '@/utils/ADempiere/request' export function requestBrowserMetadata({ id: uuid, language, - dictionaryCode, - clientId, - roleId, - userId + dictionaryCode }) { return request({ url: `/dictionary/browsers/${uuid}`, method: 'get', params: { language, - dictionary_code: dictionaryCode, - client_id: clientId, - role_id: roleId, - user_id: userId + dictionary_code: dictionaryCode } }) } diff --git a/src/api/ADempiere/dictionary/window.ts b/src/api/ADempiere/dictionary/window.ts index f42af00edc..620924c1be 100644 --- a/src/api/ADempiere/dictionary/window.ts +++ b/src/api/ADempiere/dictionary/window.ts @@ -46,12 +46,14 @@ export function requestWindowMetadata({ export function requestTabMetadata({ id: uuid, windowId, + language, dictionaryCode }) { return request({ url: `/dictionary/windows/${windowId}/tabs/${uuid}`, method: 'get', params: { + language, dictionary_code: dictionaryCode } }) diff --git a/src/api/ADempiere/security/index.ts b/src/api/ADempiere/security/index.ts index 6e5520b47c..604f855585 100644 --- a/src/api/ADempiere/security/index.ts +++ b/src/api/ADempiere/security/index.ts @@ -146,6 +146,7 @@ export function requestChangeRole({ */ export function requestMenu({ language, + dictionaryCode, clientId, roleId, userUuid @@ -155,6 +156,7 @@ export function requestMenu({ method: 'get', params: { language, + dictionary_code: dictionaryCode, role_id: roleId, client_id: clientId, user_id: userUuid, diff --git a/src/router/modules/ADempiere/menu.js b/src/router/modules/ADempiere/menu.js index d4abdf473e..d1b18b62bc 100644 --- a/src/router/modules/ADempiere/menu.js +++ b/src/router/modules/ADempiere/menu.js @@ -44,18 +44,19 @@ export function loadMainMenu({ role }) { const language = store.getters['getCurrentLanguage'] - // const { uuid, client } = store.getters['user/getRole'] - const clientId = store.getters['user/getRole'].client.uuid - const roleId = store.getters['user/getRole'].uuid - const userId = store.getters['user/getUserId'] + const dictionaryCode = store.getters['user/getDictionaryCode'] + const { id: roleId, uuid: roleUuid, client } = store.getters['user/getRole'] + const { id: clientId, uuid: clientUuid } = client const organizationId = getCurrentOrganization() + const { uuid: userUuid } = store.getters['user/userInfo'] return new Promise(resolve => { requestMenu({ - roleId, language, - clientId, - userId + dictionaryCode, + clientId: clientUuid, + roleId: roleUuid, + userUuid: userUuid }).then(menuResponse => { const { menus } = menuResponse const asyncRoutesMap = [] diff --git a/src/store/modules/ADempiere/dictionary/browser/actions.js b/src/store/modules/ADempiere/dictionary/browser/actions.js index 023e585ee1..e6cbd1ed31 100644 --- a/src/store/modules/ADempiere/dictionary/browser/actions.js +++ b/src/store/modules/ADempiere/dictionary/browser/actions.js @@ -48,7 +48,6 @@ import { } from '@/utils/ADempiere/dictionary/browser/actionsMenu' import { showMessage, showNotification } from '@/utils/ADempiere/notification.js' import { isLookup } from '@/utils/ADempiere/references' -import { getCurrentClient, getCurrentRole } from '@/utils/ADempiere/auth' import { templateBrowser } from '@/utils/ADempiere/dictionary/browser/templateBrowser.js' export default { @@ -60,17 +59,11 @@ export default { return new Promise(resolve => { const language = rootGetters['getCurrentLanguage'] const dictionaryCode = rootGetters['user/getDictionaryCode'] - const clientId = getCurrentClient() - const roleId = getCurrentRole() - const userId = rootGetters['user/getUserId'] requestBrowserMetadata({ id, language, - dictionaryCode, - clientId, - roleId, - userId + dictionaryCode }) .then(browserResponse => { const browser = templateBrowser(browserResponse) diff --git a/src/store/modules/ADempiere/dictionary/process/actions.js b/src/store/modules/ADempiere/dictionary/process/actions.js index 63ece52a05..950da46858 100644 --- a/src/store/modules/ADempiere/dictionary/process/actions.js +++ b/src/store/modules/ADempiere/dictionary/process/actions.js @@ -33,9 +33,6 @@ import { import { clearParameters, runProcess } from '@/utils/ADempiere/dictionary/process/actionsMenu.ts' -import { - getCurrentClient, getCurrentRole -} from '@/utils/ADempiere/auth' export default { addProcessToList({ commit, dispatch }, processResponse) { @@ -65,18 +62,12 @@ export default { }) { const language = rootGetters['getCurrentLanguage'] const dictionaryCode = rootGetters['user/getDictionaryCode'] - const clientId = getCurrentClient() - const roleId = getCurrentRole() - const userId = rootGetters['user/getUserId'] return new Promise((resolve, reject) => { requestProcessMetadata({ id, language, - dictionaryCode, - clientId, - roleId, - userId + dictionaryCode }) .then(processResponse => { const { processDefinition } = generateProcess({ diff --git a/src/store/modules/ADempiere/dictionary/report/actions.js b/src/store/modules/ADempiere/dictionary/report/actions.js index c7605f333e..313e616c0d 100644 --- a/src/store/modules/ADempiere/dictionary/report/actions.js +++ b/src/store/modules/ADempiere/dictionary/report/actions.js @@ -42,9 +42,6 @@ import { import { generateProcess as generateReport, isDisplayedField } from '@/utils/ADempiere/dictionary/process.js' import { isSalesTransaction } from '@/utils/ADempiere/contextUtils' import { isEmptyValue } from '@/utils/ADempiere/valueUtils.js' -import { - getCurrentClient, getCurrentRole -} from '@/utils/ADempiere/auth' export default { addReportToList({ commit, dispatch }, reportResponse) { @@ -74,17 +71,11 @@ export default { return new Promise((resolve, reject) => { const language = rootGetters['getCurrentLanguage'] const dictionaryCode = rootGetters['user/getDictionaryCode'] - const clientId = getCurrentClient() - const roleId = getCurrentRole() - const userId = rootGetters['user/getUserId'] requestReportMetadata({ id, language, - dictionaryCode, - clientId, - roleId, - userId + dictionaryCode }) .then(async reportResponse => { const { uuid } = reportResponse diff --git a/src/store/modules/ADempiere/dictionary/window/actions.js b/src/store/modules/ADempiere/dictionary/window/actions.js index e361d9734b..dedc0d9df3 100644 --- a/src/store/modules/ADempiere/dictionary/window/actions.js +++ b/src/store/modules/ADempiere/dictionary/window/actions.js @@ -52,9 +52,6 @@ import { openBrowserAssociated, openSequenceTab } from '@/utils/ADempiere/dictionary/window/actionsMenu' -import { - getCurrentClient, getCurrentRole -} from '@/utils/ADempiere/auth' import { panelAdvanceQuery } from '@/utils/ADempiere/dictionary/panel.js' import { exportRecordsSelected, @@ -99,18 +96,12 @@ export default { }) { const language = rootGetters['getCurrentLanguage'] const dictionaryCode = rootGetters['user/getDictionaryCode'] - const clientId = getCurrentClient() - const roleId = getCurrentRole() - const userId = rootGetters['user/getUserId'] return new Promise(resolve => { requestWindowMetadata({ id, language, - dictionaryCode, - clientId, - roleId, - userId + dictionaryCode }) .then(async windowResponse => { const window = generateWindow(windowResponse) diff --git a/src/store/modules/ADempiere/formDefinition.js b/src/store/modules/ADempiere/formDefinition.js index 2f2d33aac6..5dcd4a864d 100644 --- a/src/store/modules/ADempiere/formDefinition.js +++ b/src/store/modules/ADempiere/formDefinition.js @@ -30,9 +30,6 @@ import { requestForm } from '@/api/ADempiere/dictionary/form' // Utils and Helper Methods import { showMessage } from '@/utils/ADempiere/notification' import { isEmptyValue } from '@/utils/ADempiere/valueUtils' -import { - getCurrentClient, getCurrentRole -} from '@/utils/ADempiere/auth' const form = { state: { @@ -73,16 +70,12 @@ const form = { }) { return new Promise(resolve => { const language = rootGetters['getCurrentLanguage'] - const clientId = getCurrentClient() - const roleId = getCurrentRole() - const userId = rootGetters['user/getUserId'] + const dictionaryCode = rootGetters['user/getDictionaryCode'] requestForm({ id, language, - clientId, - roleId, - userId + dictionaryCode }) .then(formResponse => { // Panel for save on store