From 8258da6001306bb5581e747c51a0c84a20bd0d48 Mon Sep 17 00:00:00 2001
From: Edwin Betancourt <EdwinBetanc0urt@hotmail.com>
Date: Tue, 24 Mar 2020 21:28:51 -0400
Subject: [PATCH] fix: Console error when login redirect to window. (#412)

* fix: Console error when login redirect.

* Update file.
---
 src/components/ADempiere/DataTable/index.vue  |  4 +--
 .../ADempiere/DataTable/menu/index.vue        | 21 +++++++------
 src/views/login/forgotPassword.vue            | 11 ++-----
 src/views/login/index.vue                     | 26 ++++++----------
 src/views/login/loginMixin.js                 | 25 +++++++++++++++
 src/views/login/setPassword.vue               | 31 +++++++++----------
 src/views/login/userEnrollment.vue            | 31 +++++++------------
 7 files changed, 76 insertions(+), 73 deletions(-)
 create mode 100644 src/views/login/loginMixin.js

diff --git a/src/components/ADempiere/DataTable/index.vue b/src/components/ADempiere/DataTable/index.vue
index 786669e6..9793504b 100644
--- a/src/components/ADempiere/DataTable/index.vue
+++ b/src/components/ADempiere/DataTable/index.vue
@@ -326,14 +326,14 @@ export default {
   computed: {
     getterContextMenu() {
       const process = this.$store.getters.getContextMenu(this.containerUuid)
-      if (process) {
+      if (process && !this.isEmptyValue(process.actions)) {
         return process.actions.filter(menu => {
           if (menu.type === 'process' || menu.type === 'application') {
             return menu
           }
         })
       }
-      return false
+      return []
     },
     getShowContextMenuTable() {
       return this.$store.getters.getShowContextMenuTable
diff --git a/src/components/ADempiere/DataTable/menu/index.vue b/src/components/ADempiere/DataTable/menu/index.vue
index ee81498f..f6f7c4fa 100644
--- a/src/components/ADempiere/DataTable/menu/index.vue
+++ b/src/components/ADempiere/DataTable/menu/index.vue
@@ -22,16 +22,17 @@
       >
         {{ $t('table.dataTable.deleteSelection') }}
       </el-menu-item>
-      <el-menu-item
-        v-for="(process, key) in processMenu"
-        v-show="isPanelWindow && processMenu"
-        :key="key"
-        :disabled="process.type === 'application' ? false : Boolean(getDataSelection.length < 1)"
-        index="process"
-        @click="process.type === 'application' ? sortTab(process) : showModalTable(process)"
-      >
-        {{ process.name }}
-      </el-menu-item>
+      <template v-if="isPanelWindow && !isEmptyValue(processMenu)">
+        <el-menu-item
+          v-for="(process, key) in processMenu"
+          :key="key"
+          :disabled="process.type === 'application' ? false : Boolean(getDataSelection.length < 1)"
+          index="process"
+          @click="process.type === 'application' ? sortTab(process) : showModalTable(process)"
+        >
+          {{ process.name }}
+        </el-menu-item>
+      </template>
       <el-menu-item
         @click="exporZipRecordTable"
       >
diff --git a/src/views/login/forgotPassword.vue b/src/views/login/forgotPassword.vue
index ca0ccf5c..0d7bd99e 100644
--- a/src/views/login/forgotPassword.vue
+++ b/src/views/login/forgotPassword.vue
@@ -40,7 +40,7 @@
         {{ $t('login.submit') }}
       </el-button>
 
-      <el-button type="text" style="float: left" @click.native.prevent="$router.push({ path: 'login' })">
+      <el-button type="text" style="float: left" @click.native.prevent="pathRedirect('login')">
         {{ $t('login.title') }}
       </el-button>
     </el-form>
@@ -48,11 +48,11 @@
 </template>
 
 <script>
-import LangSelect from '@/components/LangSelect'
+import { loginMixin } from '@/views/login/loginMixin'
 
 export default {
   name: 'ForgotPassword',
-  components: { LangSelect },
+  mixins: [loginMixin],
   data() {
     return {
       forgotForm: {
@@ -65,11 +65,6 @@ export default {
     }
   },
   methods: {
-    showPwd() {
-      this.$nextTick(() => {
-        this.$refs.userName.focus()
-      })
-    },
     handleSubmit() {
       if (!this.isEmptyValue(this.forgotForm.userName)) {
         this.loading = true
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index ff5ec9d5..61a0c15a 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -59,14 +59,14 @@
       <el-button
         type="text"
         style="float: left"
-        @click.native.prevent="$router.push({ path: 'forgotPassword' })"
+        @click.native.prevent="pathRedirect('forgotPassword')"
       >
         {{ $t('route.forgotPassword') }}
       </el-button>
       <el-button
         type="text"
         style="float: right"
-        @click.native.prevent="$router.push({ path: 'userEnrollment' })"
+        @click.native.prevent="pathRedirect('userEnrollment')"
       >
         {{ $t('route.userEnrollment') }}
       </el-button>
@@ -94,12 +94,13 @@
 </template>
 
 <script>
-import LangSelect from '@/components/LangSelect'
+import { loginMixin } from '@/views/login/loginMixin'
 import SocialSign from './components/SocialSignin'
 
 export default {
   name: 'Login',
-  components: { LangSelect, SocialSign },
+  components: { SocialSign },
+  mixins: [loginMixin],
   data() {
     const validateUsername = (rule, value, callback) => {
       if ((value.trim()).length < 1) {
@@ -165,16 +166,6 @@ export default {
         this.capsTooltip = false
       }
     },
-    showPwd() {
-      if (this.passwordType === 'password') {
-        this.passwordType = ''
-      } else {
-        this.passwordType = 'password'
-      }
-      this.$nextTick(() => {
-        this.$refs.password.focus()
-      })
-    },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
@@ -186,11 +177,12 @@ export default {
               })
             })
             .catch(error => {
+              let message = this.$t('login.unexpectedError')
               if (error.code === 13) {
-                this.$message.error(this.$t('login.invalidLogin'))
-              } else {
-                this.$message.error(this.$t('login.unexpectedError'))
+                message = this.$t('login.invalidLogin')
               }
+
+              this.$message.error(message)
             })
             .finally(() => {
               this.loading = false
diff --git a/src/views/login/loginMixin.js b/src/views/login/loginMixin.js
new file mode 100644
index 00000000..27d7bf2e
--- /dev/null
+++ b/src/views/login/loginMixin.js
@@ -0,0 +1,25 @@
+import LangSelect from '@/components/LangSelect'
+
+export const loginMixin = {
+  name: 'loginMixin',
+  components: {
+    LangSelect
+  },
+  methods: {
+    showPwd() {
+      if (this.passwordType === 'password') {
+        this.passwordType = ''
+      } else {
+        this.passwordType = 'password'
+      }
+      this.$nextTick(() => {
+        this.$refs.password.focus()
+      })
+    },
+    pathRedirect(path) {
+      this.$router.push({
+        path
+      })
+    }
+  }
+}
diff --git a/src/views/login/setPassword.vue b/src/views/login/setPassword.vue
index d05242d1..62cd62ba 100644
--- a/src/views/login/setPassword.vue
+++ b/src/views/login/setPassword.vue
@@ -31,7 +31,7 @@
             @keyup.native="checkCapslock"
             @blur="capsTooltip = false"
           />
-          <span class="show-pwd" @click="showPassword">
+          <span class="show-pwd" @click="showPwd">
             <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
           </span>
         </el-form-item>
@@ -61,7 +61,7 @@
       </el-tooltip>
 
       <el-button
-        :disabled="isEmptyValue(changePasswordForm.password) || changePasswordForm.password !== changePasswordForm.passwordConfirm"
+        :disabled="isDisabled"
         :loading="loading"
         type="primary"
         style="width:100%;margin-bottom:30px;"
@@ -70,7 +70,7 @@
         {{ $t('login.submit') }}
       </el-button>
 
-      <el-button type="text" style="float: left" @click.native.prevent="$router.push({ path: 'login' })">
+      <el-button type="text" style="float: left" @click.native.prevent="pathRedirect('login')">
         {{ $t('login.title') }}
       </el-button>
     </el-form>
@@ -78,11 +78,11 @@
 </template>
 
 <script>
-import LangSelect from '@/components/LangSelect'
+import { loginMixin } from '@/views/login/loginMixin'
 
 export default {
   name: 'ChangePassword',
-  components: { LangSelect },
+  mixins: [loginMixin],
   data() {
     const validatePass = (rule, value, callback) => {
       if (this.isEmptyValue(value)) {
@@ -119,6 +119,15 @@ export default {
   computed: {
     formName() {
       return this.$route.name
+    },
+    isDisabled() {
+      if (this.isEmptyValue(this.changePasswordForm.password)) {
+        return true
+      }
+      if (this.changePasswordForm.password !== this.changePasswordForm.passwordConfirm) {
+        return true
+      }
+      return false
     }
   },
   methods: {
@@ -141,17 +150,7 @@ export default {
       }
     },
     checkCapslockNew({ shiftKey, key } = {}, isNew = true) {
-      this.checkCapslock({ shiftKey: shiftKey, key: key }, true)
-    },
-    showPassword() {
-      if (this.passwordType === 'password') {
-        this.passwordType = ''
-      } else {
-        this.passwordType = 'password'
-      }
-      this.$nextTick(() => {
-        this.$refs.password.focus()
-      })
+      this.checkCapslock({ shiftKey, key }, true)
     },
     showPasswordConfirm() {
       if (this.passwordConfirmType === 'password') {
diff --git a/src/views/login/userEnrollment.vue b/src/views/login/userEnrollment.vue
index 97651d5b..e5fec21a 100644
--- a/src/views/login/userEnrollment.vue
+++ b/src/views/login/userEnrollment.vue
@@ -71,7 +71,7 @@
             @keyup.native="checkCapslock"
             @blur="capsTooltip = false"
           />
-          <span class="show-pwd" @click="showPassword">
+          <span class="show-pwd" @click="showPwd">
             <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
           </span>
         </el-form-item>
@@ -110,7 +110,7 @@
         {{ $t('login.submit') }}
       </el-button>
 
-      <el-button type="text" style="float: left" @click.native.prevent="$router.push({ path: 'login' })">
+      <el-button type="text" style="float: left" @click.native.prevent="pathRedirect('login')">
         {{ $t('login.title') }}
       </el-button>
     </el-form>
@@ -118,11 +118,11 @@
 </template>
 
 <script>
-import LangSelect from '@/components/LangSelect'
+import { loginMixin } from '@/views/login/loginMixin'
 
 export default {
   name: 'UserEnrollment',
-  components: { LangSelect },
+  mixins: [loginMixin],
   data() {
     const validateField = (rule, value, callback) => {
       if (this.isEmptyValue(value)) {
@@ -189,20 +189,21 @@ export default {
   },
   computed: {
     isReadyFormSubmit() {
-      if (this.isEmptyValue(this.enrollmentUserForm.name)) {
+      const { name, userName, eMail, password, passwordConfirm } = this.enrollmentUserForm
+      if (this.isEmptyValue(name)) {
         return false
       }
-      if (this.isEmptyValue(this.enrollmentUserForm.userName)) {
+      if (this.isEmptyValue(userName)) {
         return false
       }
-      if (this.isEmptyValue(this.enrollmentUserForm.eMail) || !this.eMailPattern.test(this.enrollmentUserForm.eMail)) {
+      if (this.isEmptyValue(eMail) || !this.eMailPattern.test(eMail)) {
         return false
       }
       if (this.isShowPassword) {
-        if (this.isEmptyValue(this.enrollmentUserForm.password)) {
+        if (this.isEmptyValue(password)) {
           return false
         }
-        if (this.enrollmentUserForm.password !== this.enrollmentUserForm.passwordConfirm) {
+        if (password !== passwordConfirm) {
           return false
         }
       }
@@ -229,17 +230,7 @@ export default {
       }
     },
     checkCapslockNew({ shiftKey, key } = {}, isNew = true) {
-      this.checkCapslock({ shiftKey: shiftKey, key: key }, true)
-    },
-    showPassword() {
-      if (this.passwordType === 'password') {
-        this.passwordType = ''
-      } else {
-        this.passwordType = 'password'
-      }
-      this.$nextTick(() => {
-        this.$refs.password.focus()
-      })
+      this.checkCapslock({ shiftKey, key }, true)
     },
     showPasswordConfirm() {
       if (this.passwordConfirmType === 'password') {