Merge branch 'can/feature/new-ui' of https://github.com/Countly/countly-server into can/feature/new-ui

Author: can-keklik

frontend/express/public/javascripts/countly/countly.auth.js

@@ -168,6 +168,23 @@
         return validateWrite('d', feature, member, app_id);
     };
 
+    /**
+     * validate all types of requests for specific feature on specific app
+     * @param {string} accessType - write process type [c, r, u, d]
+     * @param {string} feature - feature name that required access right
+     * @param {object} member - countly member object
+     * @param {string} app_id - countly application id
+     * @return {boolean} result of permission check
+     */
+    countlyAuth.validate = function(accessType, feature, member, app_id) {
+        if (accessType === "r") {
+            return countlyAuth.validateRead(feature, member, app_id);
+        }
+        else {
+            return validateWrite(accessType, feature, member, app_id);
+        }
+    };
+
     /**
      * Validate is this user global admin or not
      * @returns {boolean} is this user global admin or not?

frontend/express/public/javascripts/countly/vue/components/helpers.js

@@ -1,4 +1,4 @@
-/* global Vue, CV, app, countlyEvent, countlyGlobal*/
+/* global Vue, CV, app, countlyEvent, countlyGlobal, countlyAuth*/
 
 (function(countlyVue) {
 
@@ -447,6 +447,13 @@
                 type: Number,
                 default: 0,
                 required: false
+            },
+            auth: {
+                type: Object,
+                default: function() {
+                    return {};
+                },
+                required: false
             }
         },
         computed: {
@@ -461,6 +468,24 @@
             },
             apps: function() {
                 var apps = countlyGlobal.apps || {};
+
+                if (this.auth && this.auth.feature && this.auth.permission) {
+                    var expectedPermission = this.auth.permission,
+                        targetFeature = this.auth.feature;
+
+                    return Object.keys(apps).reduce(function(acc, key) {
+                        var currentApp = apps[key];
+
+                        if (countlyAuth.validate(expectedPermission, targetFeature, null, currentApp._id)) {
+                            acc.push({
+                                label: currentApp.name,
+                                value: currentApp._id
+                            });
+                        }
+                        return acc;
+                    }, []);
+                }
+
                 return Object.keys(apps).map(function(key) {
                     return {
                         label: apps[key].name,

frontend/express/public/javascripts/utils/vue/element-ui.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",

frontend/express/public/stylesheets/vue/element-ui.css

@@ -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);

plugins/alerts/frontend/public/javascripts/countly.models.js

@@ -62,7 +62,9 @@
                     value: "lastTriggerTimestampString",
                     label: CV.i18n('hooks.trigger-last-time'),
                     default: true
-                }]
+                }],
+                tablePersistKey: "hooks_table_" + countlyCommon.ACTIVE_APP_ID,
+
             };
         },
         methods: {

plugins/hooks/frontend/public/javascripts/countly.models.js

@@ -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>

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

@@ -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>

plugins/hooks/frontend/public/templates/vue-hooks-detail.html

@@ -815,7 +815,7 @@
                 newElement.setAttribute("data-user-property-label", userProperty.l);
                 newElement.setAttribute("data-user-property-value", userProperty.k);
                 newElement.setAttribute("data-user-property-fallback", userProperty.f);
-                newElement.innerText = userProperty.k + "|" + userProperty.f;
+                newElement.innerText = userProperty.l + "|" + userProperty.f;
                 return newElement.outerHTML;
             },
             decodeMessage: function(message) {
@@ -1308,10 +1308,7 @@
                 return {
                     _id: dto._id || null,
                     status: this.mapStatus(dto),
-                    createdDateTime: {
-                        date: moment(dto.created).valueOf(),
-                        time: moment(dto.created).format("H:mm")
-                    },
+                    createdAt: dto.info && dto.info.created || null,
                     name: dto.info && dto.info.title,
                     createdBy: dto.info && dto.info.createdByName || '',
                     platforms: this.mapPlatforms(dto.platforms),

plugins/hooks/frontend/public/templates/vue-table.html

@@ -29,7 +29,7 @@ <h2> {{pushNotification.name || '-' }} </h2>
                 </div>
                 <div class="bu-level-item cly-vue-push-notification-details-sub-header">
                     <div class="text-medium color-cool-gray-50"><i class="far fa-clock bu-pr-1"></i></div>
-                    <span class="cly-vue-push-notification-details-sub-header-title"> {{i18n('push-notification-details.created-by',pushNotification.createdDateTime && formatTimeAgoText(pushNotification.createdDateTime.date),pushNotification.createdBy)}}</span>
+                    <span class="cly-vue-push-notification-details-sub-header-title"> {{i18n('push-notification-details.created-by',pushNotification.createdAt && formatTimeAgoText(pushNotification.createdAt),pushNotification.createdBy)}}</span>
                 </div>
                 <div class="bu-level-item cly-vue-push-notification-details-sub-header">
                     <div class="text-medium color-cool-gray-50" style="padding-right: 5.33px;"><i class="ion ion-pricetags"></i></div>

plugins/push/frontend/public/javascripts/countly.models.js

@@ -1,13 +1,15 @@
 /*global
     countlyCommon,
     countlyGlobal,
+    countlyAuth,
     jQuery,
     CV,
     CountlyHelpers,
     countlyVue,
     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;
 

plugins/push/frontend/public/templates/push-notification-details.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>

plugins/reports/frontend/public/javascripts/countly.models.js

@@ -442,6 +442,11 @@
         ],
         data: function() {
             return {
+                empty: {
+                    title: CV.i18n("ratings.empty.title"),
+                    body: CV.i18n("ratings.empty.body"),
+                    image: "/star-rating/images/star-rating/ratings-empty.svg"
+                },
                 widgets: [],
                 drawerSettings: {
                     createTitle: CV.i18n('feedback.add-widget'),
@@ -657,19 +662,24 @@
                 // reset cumulative data
                 self.cumulativeData = [{
                     count: 0,
-                    percent: 0
+                    percent: 0,
+                    rating: 0
                 }, {
                     count: 0,
-                    percent: 0
+                    percent: 0,
+                    rating: 1
                 }, {
                     count: 0,
-                    percent: 0
+                    percent: 0,
+                    rating: 2
                 }, {
                     count: 0,
-                    percent: 0
+                    percent: 0,
+                    rating: 3
                 }, {
                     count: 0,
-                    percent: 0
+                    percent: 0,
+                    rating: 4
                 }];
 
                 var ratingArray = [];

plugins/reports/frontend/public/templates/vue-main.html

@@ -170,3 +170,5 @@ ratings.tooltip.drawer-visibility = When checked, the Ratings sticker will be hi
 ratings.tooltip.widget-detail-ratings = Number of Ratings surveys received.
 ratings.tooltip.widget-detail-rate = Rate of ratings calculated by Ratings Count / Times Shown
 ratings.tooltip.drawer-logo = Add your own company or app logo to customize your Ratings widget. Please limit logo file with XXX and PNG, JPEG file types.
+ratings.empty.title = Create your first Ratings Widget
+ratings.empty.body = Create a Ratings Widget to collect, store, search, and track user feedback from web and mobile applications.