Merge pull request #301 from armd-pro/master

#273 Мелкие правки
geophystech · Dec 28, 2018 · 9882ea5 · 9882ea5
2 parents 7ffb5ca + cdf15e4
commit 9882ea5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/components/Analytics.vue b/src/components/Analytics.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="analytics">
     <CountersHeader
+      :filtersData="filtersParams"
       :count="eventsCount"
       :startDate="startDate"
       :endDate="endDate" />
@@ -49,10 +50,10 @@
     data() {
       return {
         disabledFilters: false,
-        endDate: '',
-        eventsCount: 0,
         filtersParams: {},
-        startDate: ''
+        eventsCount: 0,
+        startDate: '',
+        endDate: ''
       }
     },
     metaInfo: {

diff --git a/src/components/AppHeader.vue b/src/components/AppHeader.vue
@@ -25,7 +25,7 @@
         </b-col>
 
         <b-col class="social-media-links text-right text-md-center" md="3" cols="6" order="2" order-md="4">
-          <a href="https://telegram.me/eqalert_ru_bot"><i class="fa fa-telegram" aria-hidden="true" /></a>
+          <a href="tg://resolve?domain=eqalert_ru_bot"><i class="fa fa-telegram" aria-hidden="true" /></a>
         </b-col>
 
         <b-col class="sign-block text-right" cols="4" md="2" order="5" order-md="5">

diff --git a/src/components/CountersHeader.vue b/src/components/CountersHeader.vue
@@ -13,7 +13,7 @@
     <b-col cols="5" md="4">
       <div class="pull-right">
         <ModalMap v-if="showModalMap && count > 0" :filtersData="filtersData" />
-        <ExportDropDown @export2xls="export2xls" />
+        <ExportDropDown v-if="count > 0" @export2xls="export2xls" />
       </div>
     </b-col>
   </b-row>

diff --git a/test/unit/specs/AppHeader.spec.js b/test/unit/specs/AppHeader.spec.js
@@ -62,7 +62,7 @@ describe('AppHeader.vue', () => {
       expect(socialMediaLinksContainer.classes()).to.contain('text-md-center')
 
       expect(socialMediaLinks.length).to.equal(1)
-      expect(telegramLink.attributes().href).to.equal('https://telegram.me/eqalert_ru_bot')
+      expect(telegramLink.attributes().href).to.equal('tg://resolve?domain=eqalert_ru_bot')
     })
   })