Merge pull request #7292 from Countly/fix/dashboards-public-disabled-message

[SER-2798] [core] Fix/dashboards public disabled message

Author: tryshank

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

@@ -512,12 +512,9 @@
                 ];
 
                 var allowPublicDashboards = countlyGlobal.allow_public_dashboards !== false;
-                var sharingOptions = allowPublicDashboards ? allSharingOptions : allSharingOptions.filter(function(option) {
-                    return option.value !== "all-users";
-                });
-
                 return {
-                    sharingOptions: sharingOptions
+                    sharingOptions: allSharingOptions,
+                    isPublicDisabled: !allowPublicDashboards
                 };
             },
             canShare: function() {
@@ -666,6 +663,14 @@
                         doc.share_with = "none";
                     }
                 }
+                else {
+                    var allowPublicDashboards = countlyGlobal.allow_public_dashboards !== false;
+                    if (!allowPublicDashboards &&
+                        (doc.__action === "create" || doc.__action === "duplicate") &&
+                        doc.share_with === "all-users") {
+                        doc.share_with = "";
+                    }
+                }
             },
             onClose: function() {
                 this.$store.dispatch("countlyDashboards/requests/drawerOpenStatus", false);

plugins/dashboards/frontend/public/localization/dashboards.properties

@@ -51,6 +51,7 @@ dashboards.access-denied = This dashboard is no longer shared with you or an err
 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.
 dashboards.sharing-denied = Dashboard sharing has been disabled. Please ask your global administrator if you think this is due to an issue.
+dashboards.public-dashboards-disabled-info = Public dashboards are disabled. Contact an administrator to enable this option.
 dashboards.widget-warning.time = This widget has data for {0} to {1}. Please select a date range in this period.
 
 systemlogs.action.widget_added = Widget Added

plugins/dashboards/frontend/public/templates/dashboards-drawer.html

@@ -19,6 +19,9 @@
                 {{i18n('dashboards.share-with')}}
                 <cly-tooltip-icon :tooltip="i18n('dashboards.share-with-tooltip-content')" data-test-id="dashboard-visibility-tooltip"></cly-tooltip-icon>
             </div>
+            <div v-if="constants.isPublicDisabled" class="text-small color-cool-gray-50 bu-mb-2">
+                {{i18n('dashboards.public-dashboards-disabled-info')}}
+            </div>
             <cly-form-field name="share_with" rules="required">
                 <el-radio-group :disabled="!canShare" v-model="drawerScope.editedObject.share_with" style="width: 100%;">
                     <el-radio
@@ -27,9 +30,14 @@
                         :test-id="'dashboard-visibility-option-' + item.value"
                         v-for="(item) in constants.sharingOptions"
                         :label="item.value"
-                        :key="item.value">
+                        :key="item.value"
+                        :disabled="constants.isPublicDisabled && item.value === 'all-users'">
                         <div>
                             {{item.name}}
+                            <cly-tooltip-icon
+                                v-if="constants.isPublicDisabled && item.value === 'all-users'"
+                                :tooltip="i18n('dashboards.share.all-users.description') + ' ' + i18n('dashboards.public-dashboards-disabled-info')">
+                            </cly-tooltip-icon>
                         </div>
                         <div class="text-small color-cool-gray-50">
                             {{item.description}}