From 26d19fc1bd0811b2cf3bbf0f27691d06325f48e5 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 10 Jul 2023 11:44:40 -0400
Subject: [PATCH] UX: indicate main sidebar section is always public (#22492)

---
 .../app/components/modal/sidebar-section-form.hbs | 15 +++++++++++----
 app/assets/stylesheets/common/base/sidebar.scss   |  5 +++++
 config/locales/client.en.yml                      |  1 +
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.hbs b/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.hbs
index c8a724ca1e7..5429f6b6ab0 100644
--- a/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/sidebar-section-form.hbs
@@ -73,15 +73,22 @@
         />
 
       {{/if}}
-      {{#if
-        (and this.currentUser.staff (not this.transformedModel.sectionType))
-      }}
-        <div class="row-wrapper mark-public-wrapper">
+      {{#if (and this.currentUser.staff)}}
+        <div
+          class="row-wrapper mark-public-wrapper
+            {{if this.transformedModel.sectionType '-disabled'}}"
+        >
           <label class="checkbox-label">
+            {{#if this.transformedModel.sectionType}}
+              <DTooltip @placement="top-start">
+                {{i18n "sidebar.sections.custom.always_public"}}
+              </DTooltip>
+            {{/if}}
             <Input
               @type="checkbox"
               @checked={{this.transformedModel.public}}
               class="mark-public"
+              disabled={{this.transformedModel.sectionType}}
             />
             {{i18n "sidebar.sections.custom.public"}}
           </label>
diff --git a/app/assets/stylesheets/common/base/sidebar.scss b/app/assets/stylesheets/common/base/sidebar.scss
index 8df62e1ea2f..eb5cf4cf94c 100644
--- a/app/assets/stylesheets/common/base/sidebar.scss
+++ b/app/assets/stylesheets/common/base/sidebar.scss
@@ -190,6 +190,11 @@
       grid-column: 2;
     }
     &.mark-public-wrapper {
+      margin-top: 1em;
+      padding-bottom: 0;
+      &.-disabled label {
+        cursor: not-allowed;
+      }
       label {
         grid-column: 1 / -1;
       }
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 31b336b653d..1fe79a20f97 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4415,6 +4415,7 @@ en:
           delete_confirm: "Are you sure you want to delete this section?"
           reset_confirm: "Are you sure you want to reset this section to default?"
           public: "Make this section public and visible to everyone"
+          always_public: "Content in this section is always public"
           more_menu: "More menu"
           links:
             add: "Add another link"