From 522cabafe10516122379118dd76da154633e63a5 Mon Sep 17 00:00:00 2001
From: Waiter Zen <waiter.james1991@gmail.com>
Date: Mon, 14 Mar 2022 17:26:10 +0800
Subject: [PATCH 1/3] [alerts] update permission control

---
 plugins/alerts/frontend/public/javascripts/countly.models.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/alerts/frontend/public/javascripts/countly.models.js b/plugins/alerts/frontend/public/javascripts/countly.models.js
index f1e8f6c8391..da8a4a4fc07 100644
--- a/plugins/alerts/frontend/public/javascripts/countly.models.js
+++ b/plugins/alerts/frontend/public/javascripts/countly.models.js
@@ -158,6 +158,8 @@
                 context.dispatch("countlyAlerts/table/fetchAll", null, {root: true});
             },
             saveAlert: function(context, alertConfig) {
+                delete alertConfig._canUpdate;
+                delete alertConfig._canDelete;
                 return CV.$.ajax({
                     type: "GET",
                     url: countlyCommon.API_PARTS.data.w + "/alert/save",
@@ -205,6 +207,9 @@
                 });
             },
             saveOnlineUsersAlert: function(context, alertConfig) {
+                delete alertConfig._canUpdate;
+                delete alertConfig._canDelete;
+
                 return CV.$.ajax({
                     type: "GET",
                     url: countlyCommon.API_PARTS.data.w + "/concurrent_alert/save",

From 4185bfba91e430b0c17aba3e68ea414562ffad40 Mon Sep 17 00:00:00 2001
From: Waiter Zen <waiter.james1991@gmail.com>
Date: Mon, 14 Mar 2022 17:26:40 +0800
Subject: [PATCH 2/3] [hooks] update permission control

---
 .../frontend/public/javascripts/countly.models.js   | 13 +++++++++++--
 .../frontend/public/javascripts/countly.views.js    |  4 +++-
 .../frontend/public/templates/vue-hooks-detail.html |  6 +++---
 .../hooks/frontend/public/templates/vue-table.html  | 11 ++++++-----
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/plugins/hooks/frontend/public/javascripts/countly.models.js b/plugins/hooks/frontend/public/javascripts/countly.models.js
index dc8558d1c37..32210bd68f4 100644
--- a/plugins/hooks/frontend/public/javascripts/countly.models.js
+++ b/plugins/hooks/frontend/public/javascripts/countly.models.js
@@ -3,11 +3,13 @@
     CV,
     countlyVue,
     countlyGlobal,
+    countlyAuth,
     _,
     moment,
  */
 
 (function(hooksPlugin, jQuery) {
+    var FEATURE_NAME = "hooks";
     var countlyCommon = window.countlyCommon;
 
 
@@ -197,8 +199,11 @@
                     dataType: "json",
                     success: function(data) {
                         if (data.hooksList && data.hooksList.length === 1) {
-                            data.hooksList[0].triggerEffectDom = hooksPlugin.generateTriggerActionsTreeDom(data.hooksList[0]);
-                            context.commit("setDetail", data.hooksList[0]);
+                            var record = data.hooksList[0];
+                            record.triggerEffectDom = hooksPlugin.generateTriggerActionsTreeDom(record);
+                            record._canUpdate = countlyAuth.validateUpdate(FEATURE_NAME, countlyGlobal.member, record.apps[0]),
+                            record._canDelete = countlyAuth.validateDelete(FEATURE_NAME, countlyGlobal.member, record.apps[0]),
+                            context.commit("setDetail", record);
                             context.commit("setDetailLogsInitialized", true);
                         }
                     },
@@ -208,6 +213,8 @@
                 context.dispatch("countlyHooks/table/fetchAll", null, {root: true});
             },
             saveHook: function(context, record) {
+                delete record._canUpdate;
+                delete record._canDelete;
                 return CV.$.ajax({
                     type: "POST",
                     url: countlyCommon.API_PARTS.data.w + "/hook/save?" + "app_id=" + record.apps[0],
@@ -335,6 +342,8 @@
                                 created_at: hookList[i].created_at || 0,
                                 created_at_string: moment(hookList[i].created_at).fromNow(),
                                 triggerEffectColumn: triggerEffectDom || "",
+                                _canUpdate: countlyAuth.validateUpdate(FEATURE_NAME, countlyGlobal.member, hookList[i].apps[0]),
+                                _canDelete: countlyAuth.validateDelete(FEATURE_NAME, countlyGlobal.member, hookList[i].apps[0]),
                             });
                         }
                         context.commit("setInitialized", true);
diff --git a/plugins/hooks/frontend/public/javascripts/countly.views.js b/plugins/hooks/frontend/public/javascripts/countly.views.js
index 9abeb4702e3..4d24e0383f2 100644
--- a/plugins/hooks/frontend/public/javascripts/countly.views.js
+++ b/plugins/hooks/frontend/public/javascripts/countly.views.js
@@ -62,7 +62,9 @@
                     value: "lastTriggerTimestampString",
                     label: CV.i18n('hooks.trigger-last-time'),
                     default: true
-                }]
+                }],
+                tablePersistKey: "hooks_table_" + countlyCommon.ACTIVE_APP_ID,
+
             };
         },
         methods: {
diff --git a/plugins/hooks/frontend/public/templates/vue-hooks-detail.html b/plugins/hooks/frontend/public/templates/vue-hooks-detail.html
index 674a00649c5..e65a563a144 100644
--- a/plugins/hooks/frontend/public/templates/vue-hooks-detail.html
+++ b/plugins/hooks/frontend/public/templates/vue-hooks-detail.html
@@ -13,12 +13,12 @@ <h3>{{hookDetail.name}}</h3>
       </template>
       <template v-slot:header-right>
         <div>
-          <div class="is-option-button" v-if="canUserUpdate || canUserDelete">
+          <div class="is-option-button" v-if="hookDetail._canUpdate || hookDetail._canDelete">
             <cly-more-options size="small" @command="handleHookEditCommand($event, hookDetail)">
-               <el-dropdown-item  icon="el-icon-document-copy" v-if="canUserUpdate" command="edit-comment">
+               <el-dropdown-item  icon="el-icon-document-copy" v-if="hookDetail._canUpdate" command="edit-comment">
                    Edit
                </el-dropdown-item>
-               <el-dropdown-item icon="el-icon-delete" v-if="canUserDelete" command="delete-comment">
+               <el-dropdown-item icon="el-icon-delete" v-if="hookDetail._canDelete" command="delete-comment">
                    Delete
                </el-dropdown-item>
            </cly-more-options>
diff --git a/plugins/hooks/frontend/public/templates/vue-table.html b/plugins/hooks/frontend/public/templates/vue-table.html
index 654c4b4a5a7..0f280bfec30 100644
--- a/plugins/hooks/frontend/public/templates/vue-table.html
+++ b/plugins/hooks/frontend/public/templates/vue-table.html
@@ -1,6 +1,7 @@
 <cly-section>
     <cly-datatable-n
         :force-loading="!initialized"
+        :persist-key="tablePersistKey"
         class="cly-vue-hook-table is-clickable"
         :tracked-fields="localTableTrackedFields"
         :rows="tableRows" :resizable="false"
@@ -28,7 +29,7 @@
                 <template v-slot="rowScope">
                     <el-switch :value="rowScope.row.enabled"
                         class="bu-ml-4  bu-mr-2" 
-                        :disabled="!canUserUpdate"
+                        :disabled="!rowScope.row._canUpdate"
                         @input="scope.patch(rowScope.row, {enabled: !rowScope.row.enabled})">
                     </el-switch>
                 </template>
@@ -79,13 +80,13 @@
                     </div>
                 </template>
             </el-table-column>
-            <el-table-column type="options"  v-if="canUserUpdate || canUserDelete" >
+            <el-table-column type="options">
                 <template v-slot="rowScope">
-                    <cly-more-options v-if="rowScope.row.hover" size="small" @command="handleHookEditCommand($event,rowScope)">
-                        <el-dropdown-item v-if="canUserUpdate" icon="el-icon-document-copy" command="edit-comment">
+                    <cly-more-options v-if="rowScope.row.hover &&(rowScope.row._canUpdate || rowScope.row._canDelete)" size="small" @command="handleHookEditCommand($event,rowScope)">
+                        <el-dropdown-item v-if="rowScope.row._canUpdate" icon="el-icon-document-copy" command="edit-comment">
                             {{i18n('hooks.edit')}}
                         </el-dropdown-item>
-                        <el-dropdown-item v-if="canUserDelete" icon="el-icon-delete" command="delete-comment">
+                        <el-dropdown-item v-if="rowScope.row._canDelete" icon="el-icon-delete" command="delete-comment">
                             {{i18n('hooks.delete')}}
                         </el-dropdown-item>
                     </cly-more-options>

From fe047b3fc60b1d60433f6973c03c8ccfebda01be Mon Sep 17 00:00:00 2001
From: Waiter Zen <waiter.james1991@gmail.com>
Date: Mon, 14 Mar 2022 17:27:00 +0800
Subject: [PATCH 3/3] [reports] update permission control

---
 .../public/javascripts/countly.models.js        | 17 +++++++++++++++++
 .../frontend/public/templates/vue-main.html     |  6 +++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/plugins/reports/frontend/public/javascripts/countly.models.js b/plugins/reports/frontend/public/javascripts/countly.models.js
index 157777babf3..74f48f0625e 100644
--- a/plugins/reports/frontend/public/javascripts/countly.models.js
+++ b/plugins/reports/frontend/public/javascripts/countly.models.js
@@ -1,6 +1,7 @@
 /*global
     countlyCommon,
     countlyGlobal,
+    countlyAuth,
     jQuery,
     CV,
     CountlyHelpers,
@@ -8,6 +9,7 @@
     app,
  */
 (function(countlyReporting, $) {
+    var FEATURE_NAME = "reports";
     //Private Properties
     var _data = {};
     var _metrics = [
@@ -179,6 +181,8 @@
                 });
             },
             saveReport: function(context, args) {
+                delete args._canUpdate;
+                delete args._canDelete;
                 return CV.$.ajax({
                     type: "GET",
                     url: countlyCommon.API_PARTS.data.w + "/reports/" + (args._id ? "update" : "create"),
@@ -290,6 +294,17 @@
                                     ret = ret.substring(0, ret.length - 2);
 
                                     ret += " for " + data[i].appNames.join(", ");
+
+                                    data[i]._canUpdate = true;
+                                    data[i]._canDelete = true;
+                                    for (var aIdx = 0; aIdx < data[i].apps.length; aIdx++) {
+                                        if (!countlyAuth.validateUpdate(FEATURE_NAME, countlyGlobal.member, data[i].apps[aIdx])) {
+                                            data[i]._canUpdate = false;
+                                        }
+                                        if (!countlyAuth.validateDelete(FEATURE_NAME, countlyGlobal.member, data[i].apps[aIdx])) {
+                                            data[i]._canDelete = false;
+                                        }
+                                    }
                                 }
                                 else if (!data[i].pluginEnabled) {
                                     ret = jQuery.i18n.prop("reports.enable-plugin", data[i].report_type);
@@ -308,6 +323,8 @@
                                         }
                                     }
                                     ret = "Dashboard " + (dashboard.name || "");
+                                    data[i]._canUpdate = countlyAuth.validateUpdate(FEATURE_NAME, countlyGlobal.member, countlyCommon.ACTIVE_APP_ID);
+                                    data[i]._canDelete = countlyAuth.validateDelete(FEATURE_NAME, countlyGlobal.member, countlyCommon.ACTIVE_APP_ID);
                                 }
                                 data[i].dataColumn = ret;
 
diff --git a/plugins/reports/frontend/public/templates/vue-main.html b/plugins/reports/frontend/public/templates/vue-main.html
index 4b3a6f3dc17..cab92301765 100644
--- a/plugins/reports/frontend/public/templates/vue-main.html
+++ b/plugins/reports/frontend/public/templates/vue-main.html
@@ -37,7 +37,7 @@ <h2> {{i18n('reports.title')}}
         <template v-slot="scope">
             <el-table-column type="switch" fixed="left" width="88" prop="enabled">
                 <template v-slot="rowScope">
-                    <el-switch :value="rowScope.row.enabled" class="bu-ml-4  bu-mr-2" :disabled="!canUserUpdate"
+                    <el-switch :value="rowScope.row.enabled" class="bu-ml-4  bu-mr-2" :disabled="!rowScope.row._canUpdate"
                         @input="scope.patch(rowScope.row, {enabled: !rowScope.row.enabled})">
                     </el-switch>
                 </template>
@@ -84,7 +84,7 @@ <h2> {{i18n('reports.title')}}
             <el-table-column type="options">
                 <template v-slot="rowScope">
                     <cly-more-options v-if="rowScope.row.hover" size="small" @command="handleReportEditCommand($event,rowScope)">
-                        <el-dropdown-item v-if="canUserUpdate" icon="el-icon-document-copy" command="edit-comment">
+                        <el-dropdown-item v-if="rowScope.row._canUpdate" icon="el-icon-document-copy" command="edit-comment">
                             Edit
                         </el-dropdown-item>
                         <el-dropdown-item  icon="el-icon-position" command="send-comment">
@@ -93,7 +93,7 @@ <h2> {{i18n('reports.title')}}
                         <el-dropdown-item  icon="el-icon-chat-dot-square" command="preview-comment">
                             Preview
                         </el-dropdown-item>
-                        <el-dropdown-item v-if="canUserDelete" icon="el-icon-delete" command="delete-comment">
+                        <el-dropdown-item v-if="rowScope.row._canDelete" icon="el-icon-delete" command="delete-comment">
                             Delete
                         </el-dropdown-item>
                     </cly-more-options>