From ad57b8bd27815f4d36b6455f204200a573a76fdf Mon Sep 17 00:00:00 2001
From: Elsio Sanchez <45974454+elsiosanchez@users.noreply.github.com>
Date: Thu, 6 May 2021 10:53:48 -0400
Subject: [PATCH] add record access to the route (#816)

Co-authored-by: elsiosanchez <elsiossanches@gmail.com>
---
 .../ContextMenu/contextMenuDesktop.vue        |  7 ++++
 src/components/ADempiere/Dialog/embedded.vue  | 15 ++++++-
 .../contextMenuField/preference/index.vue     | 40 ++++++++++---------
 .../ADempiere/RecordAccess/recordAccess.js    |  7 ++++
 src/store/modules/ADempiere/contextMenu.js    |  4 +-
 .../ADempiere/Window/windowLogicComponent.js  |  8 ++++
 6 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/src/components/ADempiere/ContextMenu/contextMenuDesktop.vue b/src/components/ADempiere/ContextMenu/contextMenuDesktop.vue
index d1ded097..5ebb52be 100644
--- a/src/components/ADempiere/ContextMenu/contextMenuDesktop.vue
+++ b/src/components/ADempiere/ContextMenu/contextMenuDesktop.vue
@@ -296,6 +296,13 @@ export default {
         this.$store.commit('changeShowRigthPanel', true)
         this.$store.commit('setRecordAccess', true)
         this.$store.commit('attributeEmbedded', action)
+        this.$router.push({
+          name: this.$route.name,
+          query: {
+            ...this.$route.query,
+            typeAction: this.$store.getters.getAttributeEmbedded.action
+          }
+        }, () => {})
         this.runAction(action)
       } else {
         this.runAction(action)
diff --git a/src/components/ADempiere/Dialog/embedded.vue b/src/components/ADempiere/Dialog/embedded.vue
index 13398e7d..a2447da5 100644
--- a/src/components/ADempiere/Dialog/embedded.vue
+++ b/src/components/ADempiere/Dialog/embedded.vue
@@ -17,7 +17,7 @@
 -->
 <template>
   <el-dialog
-    :visible="isVisibleDialog"
+    :visible="isVisibleDialog || showRecordAccess"
     show-close
     :before-close="closeDialog"
     :width="width + '%'"
@@ -27,7 +27,7 @@
     close-on-click-modal
   >
     <span slot="title">
-      {{ attributeEmbedded.name }}
+      {{ $t('data.recordAccess.actions') }}
       <el-tooltip :content="lock ? $t('data.lockRecord') : $t('data.unlockRecord')" placement="top">
         <el-button type="text" @click="lock = !lock">
           <i :class="lock ? 'el-icon-unlock' : 'el-icon-lock'" style="font-size: 25px;color: black;" />
@@ -66,6 +66,10 @@ export default {
     recordId: {
       type: Object,
       default: undefined
+    },
+    visible: {
+      type: String,
+      default: undefined
     }
   },
   data() {
@@ -130,6 +134,13 @@ export default {
           name: ''
         }
       })
+      this.$router.push({
+        name: this.$route.name,
+        query: {
+          ...this.$route.query,
+          typeAction: ''
+        }
+      }, () => {})
       this.$store.commit('setRecordAccess', false)
     },
     runAction(action) {
diff --git a/src/components/ADempiere/Field/contextMenuField/preference/index.vue b/src/components/ADempiere/Field/contextMenuField/preference/index.vue
index 41a3bf61..f0304cd0 100644
--- a/src/components/ADempiere/Field/contextMenuField/preference/index.vue
+++ b/src/components/ADempiere/Field/contextMenuField/preference/index.vue
@@ -159,25 +159,29 @@ export default {
       }
       //  Create Message
       var expl = language.t('components.preference.for')//  components.preference.for
-      if (forCurrentClient.value && forCurrentOrganization.value) {
-        expl = expl.concat(language.t('components.preference.clientAndOrganization'))//  components.preference.clientAndOrganization
-      } else if (forCurrentClient.value && !forCurrentOrganization.value) {
-        expl = expl.concat(language.t('components.preference.allOrganizationOfClient'))//  components.preference.allOrganizationOfClient
-      } else if (!forCurrentClient.value && forCurrentOrganization.value) {
-        forCurrentOrganization.value = false
-        expl = expl.concat(language.t('components.preference.entireSystem'))//  components.preference.entireSystem
-      } else {
-        expl = expl.concat(language.t('components.preference.entireSystem'))//  components.preference.entireSystem
+      if (forCurrentOrganization && forCurrentClient) {
+        if (forCurrentClient.value && forCurrentOrganization.value) {
+          expl = expl.concat(language.t('components.preference.clientAndOrganization'))//  components.preference.clientAndOrganization
+        } else if (forCurrentClient.value && !forCurrentOrganization.value) {
+          expl = expl.concat(language.t('components.preference.allOrganizationOfClient'))//  components.preference.allOrganizationOfClient
+        } else if (!forCurrentClient.value && forCurrentOrganization.value) {
+          forCurrentOrganization.value = false
+          expl = expl.concat(language.t('components.preference.entireSystem'))//  components.preference.entireSystem
+        } else {
+          expl = expl.concat(language.t('components.preference.entireSystem'))//  components.preference.entireSystem
+        }
       }
-      if (forCurrentUser.value) {
-        expl = expl.concat(language.t('components.preference.thisUser'))//  components.preference.thisUser
-      } else {
-        expl = expl.concat(language.t('components.preference.allUsers'))//  components.preference.allUsers
-      }
-      if (forCurrentContainer.value) {
-        expl = expl.concat(language.t('components.preference.thisWindow'))//  components.preference.thisWindow
-      } else {
-        expl = expl.concat(language.t('components.preference.allWindows'))//  components.preference.allWindows
+      if (forCurrentUser && forCurrentContainer) {
+        if (forCurrentUser.value) {
+          expl = expl.concat(language.t('components.preference.thisUser'))//  components.preference.thisUser
+        } else {
+          expl = expl.concat(language.t('components.preference.allUsers'))//  components.preference.allUsers
+        }
+        if (forCurrentContainer.value) {
+          expl = expl.concat(language.t('components.preference.thisWindow'))//  components.preference.thisWindow
+        } else {
+          expl = expl.concat(language.t('components.preference.allWindows'))//  components.preference.allWindows
+        }
       }
       return expl
     }
diff --git a/src/components/ADempiere/RecordAccess/recordAccess.js b/src/components/ADempiere/RecordAccess/recordAccess.js
index 4d66d37a..2d4f107e 100644
--- a/src/components/ADempiere/RecordAccess/recordAccess.js
+++ b/src/components/ADempiere/RecordAccess/recordAccess.js
@@ -199,6 +199,13 @@ export default {
         type: 'window',
         action: undefined
       })
+      this.$router.push({
+        name: this.$route.name,
+        query: {
+          ...this.$route.query,
+          typeAction: ''
+        }
+      }, () => {})
       this.$store.commit('setRecordAccess', false)
       this.$store.commit('changeShowRigthPanel', false)
     }
diff --git a/src/store/modules/ADempiere/contextMenu.js b/src/store/modules/ADempiere/contextMenu.js
index 4b97d80d..d18aef73 100644
--- a/src/store/modules/ADempiere/contextMenu.js
+++ b/src/store/modules/ADempiere/contextMenu.js
@@ -30,7 +30,9 @@ const initStateContextMenu = {
     recordUuid: undefined
   },
   recordAccess: false,
-  embedded: {}
+  embedded: {
+    name: ''
+  }
 }
 
 const contextMenu = {
diff --git a/src/views/ADempiere/Window/windowLogicComponent.js b/src/views/ADempiere/Window/windowLogicComponent.js
index 4741a0e7..68005c87 100644
--- a/src/views/ADempiere/Window/windowLogicComponent.js
+++ b/src/views/ADempiere/Window/windowLogicComponent.js
@@ -353,9 +353,17 @@ export default {
             }
           })
       }
+    },
+    getRecord(value) {
+      if (!this.isEmptyValue(this.windowMetadata.currentTab.tableName) && !this.isEmptyValue(value) && (!this.isEmptyValue(this.$route.query) && this.$route.query.typeAction === 'recordAccess')) {
+        this.$store.commit('setRecordAccess', true)
+      }
     }
   },
   created() {
+    if (!this.isEmptyValue(this.currentRecord) && (!this.isEmptyValue(this.$route.query) && this.$route.query.typeAction === 'recordAccess')) {
+      this.$store.commit('setRecordAccess', true)
+    }
     this.getWindow()
     if (this.isShowedRecordNavigation) {
       this.handleResize()