Merge pull request #7229 from Countly/anna/master

small UI fixes views and data migration

Author: ar2rsawseen

plugins/data_migration/frontend/app.js

@@ -20,7 +20,10 @@ const path = require('path');
                                 res.download(myfile, req.query.id + '.tar.gz');
                                 return;
                             }
-
+                            else {
+                                res.status(404).send('Export file not found');
+                                return;
+                            }
                         }
                     });
                 }
@@ -30,6 +33,10 @@ const path = require('path');
                         res.download(path.resolve(__dirname, '../../../log/' + req.query.logfile), req.query.logfile);
                         return;
                     }
+                    else {
+                        res.status(404).send('Log file not found');
+                        return;
+                    }
 
                 }
             }

plugins/data_migration/frontend/public/javascripts/countly.views.js

@@ -86,7 +86,8 @@
             return {
                 list: [],
                 exportsTablePersistKey: 'exports_table_' + countlyCommon.ACTIVE_APP_ID,
-                isLoading: false
+                isLoading: false,
+                isGlobalAdmin: countlyGlobal.member.global_admin
             };
         },
         methods: {

plugins/data_migration/frontend/public/templates/exports-tab.html

@@ -33,8 +33,8 @@
           <el-table-column width="100">
             <template v-slot="rowScope">
               <cly-more-options v-if="rowScope.row.hover" size="small" @command="handleCommand($event, scope, rowScope.row)">
-                <el-dropdown-item command="download-log">{{i18n('data-migration.download-log')}}</el-dropdown-item>
-                <el-dropdown-item command="download-export">{{i18n('data-migration.download-export')}}</el-dropdown-item>
+                <el-dropdown-item v-if="isGlobalAdmin" command="download-log">{{i18n('data-migration.download-log')}}</el-dropdown-item>
+                <el-dropdown-item v-if="isGlobalAdmin" command="download-export">{{i18n('data-migration.download-export')}}</el-dropdown-item>
                 <el-dropdown-item v-if="canUserCreate && !rowScope.row.only_export" command="resend">{{i18n('data-migration.resend-export')}}</el-dropdown-item>
                 <el-dropdown-item v-if="canUserDelete && rowScope.row.status !== 'progress'" command="delete-export">{{i18n('data-migration.delete-export')}}</el-dropdown-item>
                 <el-dropdown-item v-if="canUserUpdate && rowScope.row.status === 'progress'" command="stop-export">{{i18n('data-migration.stop-export')}}</el-dropdown-item>

plugins/data_migration/frontend/public/templates/main.html

@@ -1,6 +1,7 @@
 <div class="data_migration__main">
     <cly-header
         :title="i18n('data-migration.page-title')"
+        :tooltip="{description: 'Plugin allows migrating full data for application. Full rights are available only for global admin.'}"
     >
         <template v-slot:header-right>
             <cly-more-options v-if="canUserCreate" @command="handleCommand">

plugins/views/frontend/public/javascripts/countly.views.js

@@ -362,6 +362,9 @@
             self.$store.dispatch('countlyViews/fetchTotals').then(function() {
                 self.totalCards = self.calculateTotalCards();
             });
+            this.$store.dispatch("countlyViews/fetchViewsMainTable", {"segmentKey": this.$store.state.countlyViews.selectedSegment, "segmentValue": this.$store.state.countlyViews.selectedSegmentValue}).then(function() {
+                self.isTableLoading = false;
+            });
 
         },
         methods: {