« get me outta code hell

hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/data/things/album.js7
-rw-r--r--src/data/things/thing.js4
2 files changed, 5 insertions, 6 deletions
diff --git a/src/data/things/album.js b/src/data/things/album.js
index 47416521..d371f51f 100644
--- a/src/data/things/album.js
+++ b/src/data/things/album.js
@@ -1,5 +1,6 @@
 import Thing from './thing.js';
 
+import {empty} from '../../util/sugar.js';
 import find from '../../util/find.js';
 
 export class Album extends Thing {
@@ -34,12 +35,12 @@ export class Album extends Thing {
       update: {validate: isDate},
 
       expose: {
-        dependencies: ['date', 'hasCoverArt'],
+        dependencies: ['date', 'coverArtistContribsByRef'],
         transform: (coverArtDate, {
+          coverArtistContribsByRef,
           date,
-          hasCoverArt,
         }) =>
-          (hasCoverArt
+          (!empty(coverArtistContribsByRef)
             ? coverArtDate ?? date ?? null
             : null),
       },
diff --git a/src/data/things/thing.js b/src/data/things/thing.js
index cefcd012..b74f45f5 100644
--- a/src/data/things/thing.js
+++ b/src/data/things/thing.js
@@ -300,9 +300,7 @@ export default class Thing extends CacheableObject {
 
     // Nice 'n simple shorthand for an exposed-only flag which is true when any
     // contributions are present in the specified property.
-    contribsPresent: (
-      contribsByRefProperty
-    ) => ({
+    contribsPresent: (contribsByRefProperty) => ({
       flags: {expose: true},
       expose: {
         dependencies: [contribsByRefProperty],