content: gCommentaryContentHeading: parity w/ gReadCommentaryLine

3 files changed, 24 insertions, 11 deletions

diff --git a/src/content/dependencies/generateCommentaryContentHeading.js b/src/content/dependencies/generateCommentaryContentHeading.js
index 92405010..cf5667fa 100644
--- a/src/content/dependencies/generateCommentaryContentHeading.js
+++ b/src/content/dependencies/generateCommentaryContentHeading.js
@@ -1,20 +1,31 @@
+import {empty} from '#sugar';
+
 export default {
   contentDependencies: ['generateContentContentHeading'],
   extraDependencies: ['language'],
 
-  relations: (relation, thing) => ({
+  query: (thing) => ({
+    entries:
+      (thing.isTrack
+        ? [...thing.commentary, ...thing.commentaryFromMainRelease]
+        : thing.commentary),
+  }),
+
+  relations: (relation, _query, thing) => ({
     contentContentHeading:
       relation('generateContentContentHeading', thing),
   }),
 
-  data: (thing) => ({
+  data: (query, _thing) => ({
     hasWikiEditorCommentary:
-      thing.commentary
-        .some(entry => entry.isWikiEditorCommentary),
+      query.entries.some(entry => entry.isWikiEditorCommentary),
 
     onlyWikiEditorCommentary:
-      thing.commentary
-        .every(entry => entry.isWikiEditorCommentary),
+      !empty(query.entries) &&
+      query.entries.every(entry => entry.isWikiEditorCommentary),
+
+    hasAnyCommentary:
+      !empty(query.entries),
   }),
 
   generate: (data, relations, {language}) =>
@@ -28,6 +39,8 @@ export default {
             ? language.encapsulate(capsule, 'onlyWikiCommentary')
          : data.hasWikiEditorCommentary
             ? language.encapsulate(capsule, 'withWikiCommentary')
-            : capsule)),
+         : data.hasAnyCommentary
+            ? capsule
+            : null)),
     }),
 };
diff --git a/src/content/dependencies/generateContentContentHeading.js b/src/content/dependencies/generateContentContentHeading.js
index 314ef197..555abb6b 100644
--- a/src/content/dependencies/generateContentContentHeading.js
+++ b/src/content/dependencies/generateContentContentHeading.js
@@ -28,12 +28,14 @@ export default {
       attributes: slots.attributes,
 
       title:
+        slots.string &&
         language.$(slots.string, {
           thing:
             html.tag('i', data.name),
         }),
 
       stickyTitle:
+        slots.string &&
         language.$(slots.string, 'sticky'),
     }),
 };
diff --git a/src/content/dependencies/generateReadCommentaryLine.js b/src/content/dependencies/generateReadCommentaryLine.js
index a7a7a4da..6f99256f 100644
--- a/src/content/dependencies/generateReadCommentaryLine.js
+++ b/src/content/dependencies/generateReadCommentaryLine.js
@@ -12,13 +12,11 @@ export default {
 
   data: (query, _thing) => ({
     hasWikiEditorCommentary:
-      query.entries
-        .some(entry => entry.isWikiEditorCommentary),
+      query.entries.some(entry => entry.isWikiEditorCommentary),
 
     onlyWikiEditorCommentary:
       !empty(query.entries) &&
-      query.entries
-        .every(entry => entry.isWikiEditorCommentary),
+      query.entries.every(entry => entry.isWikiEditorCommentary),
 
     hasAnyCommentary:
       !empty(query.entries),