re-factor / cleanup

ayanova/src/views/cust-users.vue

@@ -2,9 +2,9 @@
   <div>
     <gz-report-selector ref="reportSelector"></gz-report-selector>
     <gz-extensions
+      ref="extensions"
       :aya-type="aType"
       :selected-items="selectedItems"
-      ref="extensions"
     >
     </gz-extensions>
     <gz-data-table
@@ -13,8 +13,8 @@
       data-list-key="OutsideUserDataList"
       :show-select="rights.read"
       :reload="reload"
-      @selection-change="handleSelected"
       data-cy="custUsersTable"
+      @selection-change="handleSelected"
     >
     </gz-data-table>
   </div>
@@ -23,14 +23,6 @@
 <script>
 const FORM_KEY = "contact-users";
 export default {
-  created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.User);
-    window.$gz.eventBus.$on("menu-click", clickHandler);
-    generateMenu(this);
-  },
-  beforeDestroy() {
-    window.$gz.eventBus.$off("menu-click", clickHandler);
-  },
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
@@ -39,6 +31,14 @@ export default {
       reload: false
     };
   },
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.User);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    generateMenu(this);
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
   methods: {
     handleSelected(selected) {
       this.selectedItems = selected;
@@ -57,11 +57,13 @@ async function clickHandler(menuItem) {
   if (m.owner == FORM_KEY && !m.disabled) {
     switch (m.key) {
       case "extensions":
-        const res = await m.vm.$refs.extensions.open(
-          m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.User)
-        );
-        if (res && res.refresh == true) {
-          m.vm.reload = !m.vm.reload;
+        {
+          const res = await m.vm.$refs.extensions.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.User)
+          );
+          if (res && res.refresh == true) {
+            m.vm.reload = !m.vm.reload;
+          }
         }
         break;
       case "report":
@@ -78,18 +80,20 @@ async function clickHandler(menuItem) {
         break;
       case "directnotify":
         //nav to direct notify with list of users appended to route
-        const selected = m.vm.$refs.gzdatatable.getDataListSelection(
-          window.$gz.type.User
-        ).selectedRowIds;
-        if (selected.length == 0) {
-          m.vm.$router.push({
-            name: "home-notify-direct"
-          });
-        } else {
-          m.vm.$router.push({
-            name: "home-notify-direct",
-            params: { userIdList: selected.toString() }
-          });
+        {
+          const selected = m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.User
+          ).selectedRowIds;
+          if (selected.length == 0) {
+            m.vm.$router.push({
+              name: "home-notify-direct"
+            });
+          } else {
+            m.vm.$router.push({
+              name: "home-notify-direct",
+              params: { userIdList: selected.toString() }
+            });
+          }
         }
         break;
       default: