« get me outta code hell

hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/content/dependencies/generateArtTagNavLinks.js6
-rw-r--r--src/content/dependencies/generateCoverArtworkArtTagDetails.js4
-rw-r--r--src/content/dependencies/linkArtTagDynamically.js14
-rw-r--r--src/content/dependencies/linkArtTagInfo.js (renamed from src/content/dependencies/linkArtTag.js)0
-rw-r--r--src/replacer.js4
5 files changed, 21 insertions, 7 deletions
diff --git a/src/content/dependencies/generateArtTagNavLinks.js b/src/content/dependencies/generateArtTagNavLinks.js
index df6d7cf0..9061a09f 100644
--- a/src/content/dependencies/generateArtTagNavLinks.js
+++ b/src/content/dependencies/generateArtTagNavLinks.js
@@ -1,7 +1,7 @@
 export default {
   contentDependencies: [
     'generateInterpageDotSwitcher',
-    'linkArtTag',
+    'linkArtTagInfo',
     'linkArtTagGallery',
   ],
 
@@ -15,10 +15,10 @@ export default {
       relation('generateInterpageDotSwitcher'),
 
     mainLink:
-      relation('linkArtTag', tag),
+      relation('linkArtTagInfo', tag),
 
     infoLink:
-      relation('linkArtTag', tag),
+      relation('linkArtTagInfo', tag),
 
     galleryLink:
       relation('linkArtTagGallery', tag),
diff --git a/src/content/dependencies/generateCoverArtworkArtTagDetails.js b/src/content/dependencies/generateCoverArtworkArtTagDetails.js
index c9475f1f..b4edbbdd 100644
--- a/src/content/dependencies/generateCoverArtworkArtTagDetails.js
+++ b/src/content/dependencies/generateCoverArtworkArtTagDetails.js
@@ -1,7 +1,7 @@
 import {stitchArrays} from '#sugar';
 
 export default {
-  contentDependencies: ['linkArtTag'],
+  contentDependencies: ['linkArtTagGallery'],
   extraDependencies: ['html'],
 
   query: (artTags) => ({
@@ -13,7 +13,7 @@ export default {
   relations: (relation, query, _artTags) => ({
     artTagLinks:
       query.linkableArtTags
-        .map(tag => relation('linkArtTag', tag)),
+        .map(tag => relation('linkArtTagGallery', tag)),
   }),
 
   data: (query, _artTags) => {
diff --git a/src/content/dependencies/linkArtTagDynamically.js b/src/content/dependencies/linkArtTagDynamically.js
new file mode 100644
index 00000000..964258e1
--- /dev/null
+++ b/src/content/dependencies/linkArtTagDynamically.js
@@ -0,0 +1,14 @@
+export default {
+  contentDependencies: ['linkArtTagGallery', 'linkArtTagInfo'],
+  extraDependencies: ['pagePath'],
+
+  relations: (relation, artTag) => ({
+    galleryLink: relation('linkArtTagGallery', artTag),
+    infoLink: relation('linkArtTagInfo', artTag),
+  }),
+
+  generate: (relations, {pagePath}) =>
+    (pagePath[0] === 'artTagInfo'
+      ? relations.infoLink
+      : relations.galleryLink),
+};
diff --git a/src/content/dependencies/linkArtTag.js b/src/content/dependencies/linkArtTagInfo.js
index 409cb3c0..409cb3c0 100644
--- a/src/content/dependencies/linkArtTag.js
+++ b/src/content/dependencies/linkArtTagInfo.js
diff --git a/src/replacer.js b/src/replacer.js
index a16d1ab8..07c38478 100644
--- a/src/replacer.js
+++ b/src/replacer.js
@@ -152,12 +152,12 @@ export const replacerSpec = {
 
   'tag': {
     find: 'artTag',
-    link: 'linkArtTagGallery',
+    link: 'linkArtTagDynamically',
   },
 
   'tag-info': {
     find: 'artTag',
-    link: 'linkArtTag',
+    link: 'linkArtTagInfo',
   },
 
   'track': {