adata-ui 0.1.13 → 0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adata-ui",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/Header/Header.stories.js

@@ -22,6 +22,7 @@ const Template = (args, { argTypes }) => ({
         },
         showBalance(val) {
             console.log(val);
+            console.log(val);
         },
         showModal(val) {
             console.log(val);
@@ -50,6 +51,6 @@ headerAuthenticated.args = {
     daysRemaining: "остаток дней: 29",
     email: "sboranbayeva@gmail.com",
     loginUrl: "https://id.adtdev.kz/auth/signin?url=https://pk.adata.kz/auth",
-    activeTabKey: 'counterparty',
+    activeTabKey: 'tender',
     balance: 1954900
 }

package/src/components/Header/Header.vue

@@ -9,14 +9,14 @@
           </svg>
         </a>
         <div class="menu" v-if="subheaderItems.length > 0">
-          <div v-for="(item, index) in subheaderItems"
+          <a v-for="(item, index) in subheaderItems"
                :key="index"
                class="menu__wrapper menu__items"
                :class="{active: locationUrl.includes(toAdtdev(item.url))}"
-               @click="handleClick(item.url)"
+               :href="item.url"
           >
             {{ item.name }}
-          </div>
+          </a>
         </div>
       </div>
       <div class="a-header__right">
@@ -29,6 +29,7 @@
             :daysRemaining="daysRemaining"
             :email="email"
             :loginUrl="loginUrl"
+            :activeTabKey="activeTabKey"
             @showBalanceModal="(val) => { $emit('showBalanceModal', val) }"
             @setShowModal="(val) => { $emit('setShowModal', val) }"
             @logout="$emit('logout')"
@@ -119,7 +120,8 @@ export default {
     },
     activeTabKey: {
       type: String,
-      default: 'counterparty'
+      default: "",
+      required: true
     },
     balance: {
       type: Number,

package/src/components/Header/Profile.vue

@@ -51,13 +51,13 @@
                 <div :class="elem.link ? 'profile-menu__balance-link': 'profile-menu__links'"
                      class="gray-text"
                      v-if="elem.url"
-                     @click="handleClick(elem.url, elem.name)">
+                     >
                   <div>
                     {{ elem.name }}
                   </div>
                   <span
                       v-if="elem.link"
-                      @click="setShowModal(true)"
+                      @click="handleClick(elem.url, elem.name)"
                       class="profile-menu__balance"
                   >
                       {{ elem.link }}
@@ -268,6 +268,11 @@ export default {
       type: String,
       default: "",
       required: true
+    },
+    activeTabKey: {
+      type: String,
+      default: "",
+      required: true
     }
   },
   components: {
@@ -287,6 +292,14 @@ export default {
     if (this.profileDropDown && this.profileDropDown.length > 0) {
       this.listDropDown = [...this.profileDropDown]
     }
+    if(this.activeTabKey === 'counterparty') {
+      this.chosenElem = this.listDropDown.find(el => el.name === 'Контрагенты');
+    } else if (this.activeTabKey === 'tender') {
+      this.chosenElem = this.listDropDown.find(el => el.name === 'Тендеры');
+    } else if (this.activeTabKey === 'work') {
+      this.chosenElem = this.listDropDown.find(el => el.name === 'Работа');
+    }
+    this.chosenElem.opened = true;
   },
   computed: {
     someMobileOpened() {
@@ -300,12 +313,16 @@ export default {
     logout() {
       this.$emit("logout");
     },
-    handleClick(url, name) {
+    async handleClick(url, name) {
       if (name.includes('Текущий')) {
-        window.open(this.toAdtdev(url), "_self");
-        this.$emit("setIsReplenishModal", true);
+        if(window.location.href.includes(this.toAdtdev(url))) {
+          this.$emit("setIsReplenishModal", true);
+          this.setShowModal(true);
+        } else {
+          await window.open(this.toAdtdev(url) + "&modal=show", "_blank")
+        }
       } else {
-        window.open(this.toAdtdev(url), "_self");
+        await window.open(this.toAdtdev(url), "_self");
       }
       this.active = false;
       if (this.chosenElem) this.chosenElem.opened = false;