[crud-context] plugins, monetization and group related fixes.

Author: frknbasaran

api/utils/requestProcessor.js

@@ -1293,7 +1293,7 @@ const processRequest = (params) => {
                     break;
                 case 'permissions':
                     validateRead(params, 'core', function() {
-                        var features = ["core", "events", "global_configurations", "global_plugins", "global_applications", "global_users", "global_jobs"];
+                        var features = ["core", "events", "global_configurations", "global_applications", "global_users", "global_jobs"];
                         plugins.dispatch("/permissions/features", {params: params, features: features}, function() {
                             common.returnOutput(params, features);
                         });

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

@@ -168,7 +168,8 @@
     };
 
     countlyAuth.clearDrawer = function(parent_el, sets) {
-        $(parent_el + ' #manage-users-admin-app-selector')[0].selectize.setValue([]);
+        var selector = parent_el.indexOf('group') ? 'groups' : 'users';
+        $('#manage-' + selector + '-admin-app-selector')[0].selectize.setValue([]);
         for (var i = 0; i < sets.length; i++) {
             $(parent_el + ' #user-app-selector-' + i)[0].selectize.setValue([]);
         }
@@ -199,22 +200,14 @@
                 permissionObject[accessType][countlyApp] = {};
                 permissionObject[accessType][countlyApp].all = false;
                 permissionObject[accessType][countlyApp].allowed = {};
-                if (accessType === "r") {
-                    permissionObject[accessType][countlyApp].allowed.core = true;
-                }
                 permissionObject[accessType].global = {};
                 permissionObject[accessType].global.all = false;
                 permissionObject[accessType].global.allowed = {};
             }
         }
 
-        if (permissionSets.length === 0) {
-            permissionSets.push({c: {all: false, allowed: {}}, r: {all: false, allowed: { core: true }}, u: {all: false, allowed: {}}, d: {all: false, allowed: {}}});
-        }
-        else if (permissionSets.length > 0) {
-            permissionSets = [];
-            permissionSets.push({c: {all: false, allowed: {}}, r: {all: false, allowed: { core: true }}, u: {all: false, allowed: {}}, d: {all: false, allowed: {}}});
-        }
+        permissionSets = [];
+        permissionSets.push({c: {all: false, allowed: {}}, r: {all: false, allowed: { core: true }}, u: {all: false, allowed: {}}, d: {all: false, allowed: {}}});
 
         return {
             permissionObject: permissionObject,
@@ -288,15 +281,15 @@
                         $('#mark-all-' + countlyAuth.typeNames[j] + '-' + i).countlyCheckbox().set(true);
 
                         for (var k = 0; k < countlyAuth.features.length; k++) {
-                            $('#' + countlyAuth.types[j] + '-' + countlyAuth.features[k] + '-' + i).countlyCheckbox().set(true).setDisabled();
+                            $(parent_el + ' #' + countlyAuth.types[j] + '-' + countlyAuth.features[k] + '-' + i).countlyCheckbox().set(true).setDisabled();
                         }
 
                         permission_sets[i][countlyAuth.types[j]].all = true;
                     }
                     else {
                         for (var feature in permission_object[countlyAuth.types[j]][user_apps[i][0]].allowed) {
                             permission_sets[i] = countlyAuth.giveFeaturePermission(countlyAuth.types[j], feature, permission_sets[i]);
-                            $('#' + countlyAuth.types[j] + '-' + feature + '-' + i).countlyCheckbox().set(true);
+                            $(parent_el + ' #' + countlyAuth.types[j] + '-' + feature + '-' + i).countlyCheckbox().set(true);
                         }
                     }
                 }

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

@@ -3377,7 +3377,7 @@ window.ManageUsersView = countlyView.extend({
 
         // link checkboxes after dom injection
         for (var i in types) {
-            $('#mark-all-' + types[i] + '-' + index).countlyCheckbox();
+            $('.create-user-drawer #mark-all-' + types[i] + '-' + index).countlyCheckbox();
         }
 
         // jQuery selectize handler for projection input
@@ -3420,7 +3420,7 @@ window.ManageUsersView = countlyView.extend({
         self.features.forEach(function(feature) {
             $('#permission-table-' + index).append(countlyAuth.renderFeatureTemplate(feature, index));
             for (var i in types) {
-                $('#' + types[i][0] + '-' + feature + '-' + index).countlyCheckbox();
+                $('.create-user-drawer #' + types[i][0] + '-' + feature + '-' + index).countlyCheckbox();
             }
         });
     },
@@ -3680,6 +3680,11 @@ window.ManageUsersView = countlyView.extend({
             $('.create-user-drawer .discard-changes').hide();
             $('#create-user-drawer-title').html($.i18n.map['management-users.create-new-user']);
             $('.create-user-drawer #create-user-button').html($.i18n.map['management-users.create-user']);
+            $('.access-area').show();
+            $('#sub-header-1th').show();
+            $('.add-new-permission-set').show();
+            $('.create-user-drawer #manage-users-admin-app-selector')[0].selectize.setValue([]);
+            
             // clean inputs
             userCreateDrawer.addClass("open");
             userCreateDrawer.find('.full-name-text').val('');
@@ -4036,16 +4041,16 @@ window.ManageUsersView = countlyView.extend({
 
             if ($('.create-user-drawer #mark-all-' + type + '-' + index).countlyCheckbox().get()) {
                 for (var i = 0; i < self.features.length; i++) {
-                   $('#' + type.substr(0, 1) + '-' + self.features[i] + '-' + index).countlyCheckbox().set(true);
-                   $('#' + type.substr(0, 1) + '-' + self.features[i] + '-' + index).countlyCheckbox().setDisabled();
+                   $('.create-user-drawer #' + type.substr(0, 1) + '-' + self.features[i] + '-' + index).countlyCheckbox().set(true);
+                   $('.create-user-drawer #' + type.substr(0, 1) + '-' + self.features[i] + '-' + index).countlyCheckbox().setDisabled();
                 }
 
                 self.permissionSets[index] = countlyAuth.updatePermissionByType(type.substr(0, 1), self.permissionSets[index], true);
             }
             else {
                 for (var j = 0; j < self.features.length; j++) {
-                   $('#' + type.substr(0, 1) + '-' + self.features[j] + '-' + index).countlyCheckbox().set(false);
-                   $('#' + type.substr(0, 1) + '-' + self.features[j] + '-' + index).countlyCheckbox().unsetDisabled();
+                   $('.create-user-drawer #' + type.substr(0, 1) + '-' + self.features[j] + '-' + index).countlyCheckbox().set(false);
+                   $('.create-user-drawer #' + type.substr(0, 1) + '-' + self.features[j] + '-' + index).countlyCheckbox().unsetDisabled();
                 }
 
                 self.permissionSets[index] = countlyAuth.updatePermissionByType(type.substr(0, 1), self.permissionSets[index], false);

plugins/plugins/api/api.js

@@ -175,7 +175,6 @@ const FEATURE_NAME = 'global_plugins';
                 });
             });
         };
-        
         validateRead(params, FEATURE_NAME, function() {
             var dir = path.resolve(__dirname, "../../");
             walk(dir, function(err, results) {

plugins/video-intelligence-monetization/api/api.js

@@ -5,7 +5,7 @@ var common = require('../../../api/utils/common.js'),
     crypto = require('crypto'),
     countlyModel = require('../../../api/lib/countly.model.js'),
     countlyEvents = countlyModel.load("event"),
-    { validateRead } = require('../../api/utils/right.js');
+    { validateRead } = require('../../../api/utils/rights.js');
 
 const FEATURE_NAME = 'monetization';