cover topics with one post and no timeline

discourse · Jan 4, 2024 · bd76123 · bd76123
1 parent b6e398b
commit bd76123
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/javascripts/discourse/components/toc-timeline.gjs b/javascripts/discourse/components/toc-timeline.gjs
@@ -22,12 +22,18 @@ export default class TocTimeline extends Component {
       return false;
     }
 
+    // should always show on docs routes
     if (this.tocProcessor.isDocs) {
-      // should always show on docs routes
       return true;
     }
 
     if (this.args.renderTimeline) {
+      // single post topics might not have a timeline
+      // so we should ignore state
+      if (this.args.topic?.posts_count === 1) {
+        return true;
+      }
+
       // timeline state controlled by localStorage
       return this.tocProcessor.isTocVisible;
     } else {
@@ -58,7 +64,7 @@ export default class TocTimeline extends Component {
           @renderTimeline={{@renderTimeline}}
         />
         {{#if @renderTimeline}}
-          <TocToggle />
+          <TocToggle @topic={{@topic}} />
         {{/if}}
       {{/if}}
     </div>

diff --git a/javascripts/discourse/components/toc-toggle.gjs b/javascripts/discourse/components/toc-toggle.gjs
@@ -7,18 +7,25 @@ export default class TocToggle extends Component {
   @service tocProcessor;
 
   <template>
-    {{#unless this.tocProcessor.isDocs}}
-      {{#if this.tocProcessor.hasTOC}}
-        <DButton
-          @action={{this.tocProcessor.toggleTocVisibility}}
-          @icon={{this.toggleIcon}}
-          @translatedLabel={{i18n (themePrefix this.toggleLabel)}}
-          @class="btn btn-default timeline-toggle"
-        />
-      {{/if}}
-    {{/unless}}
+    {{#if this.shouldShow}}
+      <DButton
+        @action={{this.tocProcessor.toggleTocVisibility}}
+        @icon={{this.toggleIcon}}
+        @translatedLabel={{i18n (themePrefix this.toggleLabel)}}
+        @class="btn btn-default timeline-toggle"
+      />
+    {{/if}}
   </template>
 
+  get shouldShow() {
+    // docs and topics with 1 post don't need a toggle
+    if (this.tocProcessor.isDocs || this.args.topic?.posts_count === 1) {
+      return false;
+    }
+
+    return this.tocProcessor.hasTOC;
+  }
+
   get toggleLabel() {
     if (this.tocProcessor.isTocVisible) {
       return "toggle_toc.show_timeline";

diff --git a/javascripts/discourse/connectors/timeline-footer-controls-after/d-toc-toggle.hbs b/javascripts/discourse/connectors/timeline-footer-controls-after/d-toc-toggle.hbs
@@ -1 +1 @@
-<TocToggle />
+<TocToggle @topic={{@outletArgs.model}} />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<TocToggle />
		<TocToggle @topic={{@outletArgs.model}} />