FIX: admin always see configure default sidebar categories (#20836)

When an admin removes all the categories from their personal sidebar configuration, the section should remain visible to them with the “Configure default categories” prompt.

Similar solution for tags.

/t/95036

app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.hbs

@@ -1,4 +1,4 @@
-{{#if this.shouldDisplay}}
+{{#if (or this.shouldDisplay this.shouldDisplayDefaultConfig)}}
   <Sidebar::Section
     @sectionName="categories"
     @headerLinkText={{i18n "sidebar.sections.categories.header_link_text"}}
@@ -12,6 +12,7 @@
     @collapsable={{@collapsable}}
   >
 
+    {{#if this.shouldDisplay}}
       {{#if (gt this.sectionLinks.length 0)}}
         {{#each this.sectionLinks as |sectionLink|}}
           <Sidebar::SectionLink
@@ -43,13 +44,16 @@
           @content={{i18n
             "sidebar.sections.categories.links.add_categories.content"
           }}
-        @title={{i18n "sidebar.sections.categories.links.add_categories.title"}}
+          @title={{i18n
+            "sidebar.sections.categories.links.add_categories.title"
+          }}
         />
       {{/if}}
 
       <Sidebar::Common::AllCategoriesSectionLink />
+    {{/if}}
 
-    {{#if (and this.currentUser.admin (not this.hasDefaultSidebarCategories))}}
+    {{#if this.shouldDisplayDefaultConfig}}
       <Sidebar::SectionLink
         @linkName="configure-default-sidebar-categories"
         @content={{i18n "sidebar.sections.categories.configure_defaults"}}

app/assets/javascripts/discourse/app/components/sidebar/user/categories-section.js

@@ -64,6 +64,10 @@ export default class SidebarUserCategoriesSection extends SidebarCommonCategorie
     }
   }
 
+  get shouldDisplayDefaultConfig() {
+    return this.currentUser.admin && !this.hasDefaultSidebarCategories;
+  }
+
   get hasDefaultSidebarCategories() {
     return this.siteSettings.default_sidebar_categories.length > 0;
   }

app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.hbs

@@ -1,4 +1,4 @@
-{{#if this.shouldDisplay}}
+{{#if (or this.shouldDisplay this.shouldDisplayDefaultConfig)}}
   <Sidebar::Section
     @sectionName="tags"
     @headerLinkText={{i18n "sidebar.sections.tags.header_link_text"}}
@@ -12,6 +12,7 @@
     @collapsable={{@collapsable}}
   >
 
+    {{#if this.shouldDisplay}}
       {{#if (gt this.sectionLinks.length 0)}}
         {{#each this.sectionLinks as |sectionLink|}}
           <Sidebar::SectionLink
@@ -42,8 +43,9 @@
       {{/if}}
 
       <Sidebar::Common::AllTagsSectionLink />
+    {{/if}}
 
-    {{#if (and this.currentUser.admin (not this.hasDefaultSidebarTags))}}
+    {{#if this.shouldDisplayDefaultConfig}}
       <Sidebar::SectionLink
         @linkName="configure-default-sidebar-tags"
         @content={{i18n "sidebar.sections.tags.configure_defaults"}}

app/assets/javascripts/discourse/app/components/sidebar/user/tags-section.js

@@ -69,6 +69,10 @@ export default class SidebarUserTagsSection extends Component {
     }
   }
 
+  get shouldDisplayDefaultConfig() {
+    return this.currentUser.admin && !this.hasDefaultSidebarTags;
+  }
+
   get hasDefaultSidebarTags() {
     return this.siteSettings.default_sidebar_tags.length > 0;
   }

app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js

@@ -954,7 +954,6 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) {
   });
 
   test("section link to admin site settings page when default sidebar categories have not been configured", async function (assert) {
-    setupUserSidebarCategories();
     updateCurrentUser({ admin: true });
 
     await visit("/");

app/assets/javascripts/discourse/tests/acceptance/sidebar-user-tags-section-test.js

@@ -666,7 +666,11 @@ acceptance("Sidebar - Logged on user - Tags section", function (needs) {
   });
 
   test("section link to admin site settings page when default sidebar tags have not been configured", async function (assert) {
-    updateCurrentUser({ admin: true });
+    updateCurrentUser({ admin: true, sidebar_tags: [] });
+
+    updateCurrentUser({
+      sidebar_tags: [],
+    });
 
     await visit("/");
 

app/assets/javascripts/discourse/tests/acceptance/user-preferences-sidebar-test.js

@@ -109,6 +109,7 @@ acceptance("User Preferences - Sidebar", function (needs) {
   });
 
   test("user adding categories to sidebar when default sidebar categories have not been configured", async function (assert) {
+    updateCurrentUser({ admin: false, display_sidebar_tags: false });
     await visit("/u/eviltrout/preferences/sidebar");
 
     assert.notOk(exists(".sidebar-section[data-section-name='categories']"));