Merge pull request #6918 from Countly/feat/public-dashboards-setting

tryshank · web-flow · commit 5c5a6d9f1fb6 · 2025-11-12T18:58:26.000+01:00
feat: add setting to disable public dashboards
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ Enterprise Fixes:
 - [concurrent_users] Fix alert threshold comparison
 - [surveys] Handle multiple survey submission from same user based on survey visibility
 - [users] Set correct users widget table rows amount according to selected setting
+- [users] Display user property limits in user profiles when exceeded
+- [dashboards] Add setting to disable public dashboards
 
 ## Version 25.03.26
 Fixes:
diff --git a/countly-community b/countly-community
@@ -0,0 +1 @@
+Subproject commit f772bcd2c0e918dcf337ef3d978efbaa986bd882
diff --git a/plugins/dashboards/api/api.js b/plugins/dashboards/api/api.js
@@ -17,7 +17,8 @@ var pluginOb = {},
 var ejs = require("ejs");
 
 plugins.setConfigs("dashboards", {
-    sharing_status: true
+    sharing_status: true,
+    allow_public_dashboards: true
 });
 
 (function() {
@@ -455,17 +456,24 @@ plugins.setConfigs("dashboards", {
                     groups = [groups];
                 }
                 groups = groups.map(group_id => group_id + "");
+
+                var orConditions = [
+                    {owner_id: memberId},
+                    {shared_with_edit: memberId},
+                    {shared_with_view: memberId},
+                    {shared_email_view: memberEmail},
+                    {shared_email_edit: memberEmail},
+                    {shared_user_groups_edit: {$in: groups}},
+                    {shared_user_groups_view: {$in: groups}}
+                ];
+
+                var allowPublicDashboards = plugins.getConfig("dashboards").allow_public_dashboards;
+                if (allowPublicDashboards !== false) {
+                    orConditions.push({share_with: "all-users"});
+                }
+
                 filterCond = {
-                    $or: [
-                        {owner_id: memberId},
-                        {share_with: "all-users"},
-                        {shared_with_edit: memberId},
-                        {shared_with_view: memberId},
-                        {shared_email_view: memberEmail},
-                        {shared_email_edit: memberEmail},
-                        {shared_user_groups_edit: {$in: groups}},
-                        {shared_user_groups_view: {$in: groups}}
-                    ]
+                    $or: orConditions
                 };
             }
             let projection = {};
@@ -686,6 +694,12 @@ plugins.setConfigs("dashboards", {
                 sharedUserGroupView = [];
             }
 
+            var allowPublicDashboards = plugins.getConfig("dashboards").allow_public_dashboards;
+            if (shareWith === "all-users" && allowPublicDashboards === false) {
+                common.returnMessage(params, 400, 'Public dashboards are disabled');
+                return true;
+            }
+
             var sharing = checkSharingStatus(params.member, shareWith, sharedEmailEdit, sharedEmailView, sharedUserGroupEdit, sharedUserGroupView);
 
             if (!sharing) {
@@ -978,6 +992,12 @@ plugins.setConfigs("dashboards", {
                 sharedUserGroupView = [];
             }
 
+            var allowPublicDashboards = plugins.getConfig("dashboards").allow_public_dashboards;
+            if (shareWith === "all-users" && allowPublicDashboards === false) {
+                common.returnMessage(params, 400, 'Public dashboards are disabled');
+                return true;
+            }
+
             common.db.collection("dashboards").findOne({_id: common.db.ObjectID(dashboardId)}, function(err, dashboard) {
                 if (err || !dashboard) {
                     common.returnMessage(params, 400, "Dashboard with the given id doesn't exist");
@@ -1747,6 +1767,16 @@ plugins.setConfigs("dashboards", {
         }
 
         if (dashboard.share_with === "all-users") {
+            var allowPublicDashboards = plugins.getConfig("dashboards").allow_public_dashboards;
+            if (allowPublicDashboards === false) {
+                if (member._id + "" === dashboard.owner_id) {
+                    return cb(null, true);
+                }
+                if (member.global_admin) {
+                    return cb(null, true);
+                }
+                return cb(null, false);
+            }
             return cb(null, true);
         }
 
@@ -1817,6 +1847,13 @@ plugins.setConfigs("dashboards", {
             return cb(null, false);
         }
 
+        if (dashboard.share_with === "all-users") {
+            var allowPublicDashboards = plugins.getConfig("dashboards").allow_public_dashboards;
+            if (allowPublicDashboards === false) {
+                return cb(null, false);
+            }
+        }
+
         if ((Array.isArray(dashboard.shared_with_edit) && dashboard.shared_with_edit.indexOf(member._id + "") !== -1) ||
             (Array.isArray(dashboard.shared_email_edit) && dashboard.shared_email_edit.indexOf(member.email) !== -1)) {
             return cb(null, true);
diff --git a/plugins/dashboards/frontend/app.js b/plugins/dashboards/frontend/app.js
@@ -10,6 +10,7 @@ var countlyFs = require('../../../api/utils/countlyFs.js');
 
     plugin.renderDashboard = function(ob) {
         ob.data.countlyGlobal.sharing_status = plugins.getConfig("dashboards").sharing_status;
+        ob.data.countlyGlobal.allow_public_dashboards = plugins.getConfig("dashboards").allow_public_dashboards;
     };
 
     plugin.staticPaths = function(app/*, countlyDb*/) {
diff --git a/plugins/dashboards/frontend/public/javascripts/countly.views.js b/plugins/dashboards/frontend/public/javascripts/countly.views.js
@@ -484,25 +484,6 @@
                 saveButtonLabel: "",
                 sharingAllowed: countlyGlobal.sharing_status || AUTHENTIC_GLOBAL_ADMIN,
                 groupSharingAllowed: countlyGlobal.plugins.indexOf("groups") > -1 && AUTHENTIC_GLOBAL_ADMIN,
-                constants: {
-                    sharingOptions: [
-                        {
-                            value: "all-users",
-                            name: this.i18nM("dashboards.share.all-users"),
-                            description: this.i18nM("dashboards.share.all-users.description"),
-                        },
-                        {
-                            value: "selected-users",
-                            name: this.i18nM("dashboards.share.selected-users"),
-                            description: this.i18nM("dashboards.share.selected-users.description"),
-                        },
-                        {
-                            value: "none",
-                            name: this.i18nM("dashboards.share.none"),
-                            description: this.i18nM("dashboards.share.none.description"),
-                        }
-                    ]
-                },
                 sharedEmailEdit: [],
                 sharedEmailView: [],
                 sharedGroupEdit: [],
@@ -511,6 +492,34 @@
             };
         },
         computed: {
+            constants: function() {
+                var allSharingOptions = [
+                    {
+                        value: "all-users",
+                        name: this.i18nM("dashboards.share.all-users"),
+                        description: this.i18nM("dashboards.share.all-users.description"),
+                    },
+                    {
+                        value: "selected-users",
+                        name: this.i18nM("dashboards.share.selected-users"),
+                        description: this.i18nM("dashboards.share.selected-users.description"),
+                    },
+                    {
+                        value: "none",
+                        name: this.i18nM("dashboards.share.none"),
+                        description: this.i18nM("dashboards.share.none.description"),
+                    }
+                ];
+
+                var allowPublicDashboards = countlyGlobal.allow_public_dashboards !== false;
+                var sharingOptions = allowPublicDashboards ? allSharingOptions : allSharingOptions.filter(function(option) {
+                    return option.value !== "all-users";
+                });
+
+                return {
+                    sharingOptions: sharingOptions
+                };
+            },
             canShare: function() {
                 var canShare = this.sharingAllowed && (this.controls.initialEditedObject.is_owner || AUTHENTIC_GLOBAL_ADMIN);
                 return canShare;
diff --git a/plugins/dashboards/frontend/public/localization/dashboards.properties b/plugins/dashboards/frontend/public/localization/dashboards.properties
@@ -45,6 +45,8 @@ dashboards.compared-to-prev-period = compared to prev.period
 
 dashboards.sharing_status = Allow Dashboard Sharing
 configs.help.dashboards-sharing_status = Enable dashboard sharing for users to share a dashboard with other users. If set to off, dashboards cannot be shared with others.
+dashboards.allow_public_dashboards = Allow public dashboards
+configs.help.dashboards-allow_public_dashboards = Allow sharing dashboards with all Countly dashboard users
 dashboards.access-denied = This dashboard is no longer shared with you or an error has occurred. Please ask your global administrator if you think this is due to an issue.
 dashbaords.access-denied-title = Access Denied
 dashboards.edit-access-denied = You don't have the edit permission for this dashboard. Please ask your global administrator if you think this is due to an issue.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit f772bcd2c0e918dcf337ef3d978efbaa986bd882`