Merge pull request #5617 from Countly/SER-1927

[SER-1927] Create Event Group Button missing from data-manager

Author: ArtursKadikis

plugins/data-manager/frontend/public/javascripts/countly.views.js

@@ -964,6 +964,14 @@
             },
             canUserCreateTransform: function() {
                 return countlyAuth.validateCreate(SUB_FEATURE_TRANSFORMATIONS);
+            },
+            showMoreOptions: function() {
+                return (
+                    (this.isDrill && this.canUserCreateTransform && (this.currentSecondaryTab === 'events' || this.currentSecondaryTab === 'segmentation')) ||
+                    (this.isDrill && this.canUserCreate && this.currentSecondaryTab === 'events') ||
+                    (this.canUserCreate && this.currentSecondaryTab === 'event-groups') ||
+                    (this.isDrill && this.canUserCreateTransform && this.currentSecondaryTab === 'transformations')
+                );
             }
         },
         components: {

plugins/data-manager/frontend/public/templates/events.html

@@ -9,21 +9,21 @@
           <div v-if="isDrill">
               <cly-report-manager-dialog class="bu-mr-2" origin="data-manager"></cly-report-manager-dialog>
           </div>
-          <div v-if="isDrill && currentSecondaryTab !== 'validations'">
-            <cly-more-options v-if="canUserCreate || canUserCreateTransform" size="small" text="Create new" type="success" icon="el-icon-circle-plus" @command="handleCreateCommand($event, currentSecondaryTab)">
-                <el-dropdown-item v-if="canUserCreateTransform && (currentSecondaryTab === 'events' || currentSecondaryTab === 'segmentation') " command="create-transform">
+          <div v-if="currentSecondaryTab !== 'validations'">
+            <cly-more-options v-if="showMoreOptions" size="small" text="Create new" type="success" icon="el-icon-circle-plus" @command="handleCreateCommand($event, currentSecondaryTab)">
+                <el-dropdown-item v-if="isDrill && canUserCreateTransform && (currentSecondaryTab === 'events' || currentSecondaryTab === 'segmentation') " command="create-transform">
                     {{i18n('data-manager.create-transformation')}}
                 </el-dropdown-item>
-                <el-dropdown-item v-if="canUserCreate && (currentSecondaryTab === 'events' )" command="create-event">
+                <el-dropdown-item v-if="isDrill && canUserCreate && (currentSecondaryTab === 'events' )" command="create-event">
                     {{i18n('data-manager.create-event')}}
                 </el-dropdown-item>
                 <el-dropdown-item v-if="canUserCreate && (currentSecondaryTab === 'event-groups') " command="create-event-group">
                     {{i18n('data-manager.create-group')}}
                 </el-dropdown-item>
-                <el-dropdown-item v-if="canUserCreateTransform && (currentSecondaryTab === 'transformations') " command="create-event-transform">
+                <el-dropdown-item v-if="isDrill && canUserCreateTransform && (currentSecondaryTab === 'transformations') " command="create-event-transform">
                     {{i18n('data-manager.create-event-transformation')}}
                 </el-dropdown-item>
-                <el-dropdown-item v-if="canUserCreateTransform && (currentSecondaryTab === 'transformations') " command="create-segment-transform">
+                <el-dropdown-item v-if="isDrill && canUserCreateTransform && (currentSecondaryTab === 'transformations') " command="create-segment-transform">
                     {{i18n('data-manager.create-segment-transformation')}}
                 </el-dropdown-item>
             </cly-more-options>