replace last references to original-media-id (with derivative-of-media-ids & replaces-media-id)

Author: twrichards

common-lib/src/main/scala/com/gu/mediaservice/lib/config/CommonConfigWithElastic.scala

@@ -1,5 +1,6 @@
 package com.gu.mediaservice.lib.config
 
+import com.gu.mediaservice.lib.ImageStorageProps
 import com.gu.mediaservice.lib.elasticsearch.{ElasticSearchAliases, ElasticSearchConfig}
 
 class CommonConfigWithElastic(resources: GridConfigResources) extends CommonConfig(resources) {
@@ -15,7 +16,10 @@ class CommonConfigWithElastic(resources: GridConfigResources) extends CommonConf
   )
 
   val persistenceIdentifier = string("persistence.identifier")
-  val queriableIdentifiers = Seq(persistenceIdentifier)
+  val queriableIdentifiers = Seq(
+    persistenceIdentifier,
+    ImageStorageProps.derivativeOfMediaIdsIdentifierKey,
+  )
 
   // note this will match any part of the collection path, e.g. "bar" will match "bar", "foo/bar", "bar/baz"
   val maybePersistOnlyTheseCollections: Option[Set[String]] = getOptionalStringSet("persistence.onlyTheseCollections")

kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html

@@ -765,11 +765,17 @@
 
             <dl ng-repeat="(key, value) in ctrl.identifiers" class="metadata__body image-info__group--dl">
                 <dt class="metadata-line__key image-info__group--dl__key--full-metadata">{{key | spaceWords}}</dt>
-                <dd class="metadata-line__info image-info__group--dl__value--full-metadata">
-                    <a ng-if="ctrl.isSearchableIdentifier(key)"
-                       ui-sref="search.results({query: value, nonFree: true})"
-                       aria-label="Search for images with '{{value}}'">{{value}}</a>
-                    <span ng-if="!ctrl.isSearchableIdentifier(key)">{{value}}</span>
+                <dd class="metadata-line__info image-info__group--dl__value--full-metadata" >
+                    <span ng-switch="key">
+                        <a ng-switch-when="derivative-of-media-ids"
+                           ng-repeat="id in value.split(',')"
+                           ui-sref="search.results({query: id.trim(), nonFree: true})"
+                           aria-label="Search for images with id '{{id.trim()}}'">{{id.trim()}}<br/></a>
+                        <a ng-switch-when="replaces-media-id"
+                           ui-sref="image({imageId: value})"
+                           aria-label="This image replaces image with id '{{value}}'">{{value}}</a>
+                        <span ng-switch-default>{{value}}</span>
+                    </span>
                 </dd>
             </dl>
         </div>

kahuna/public/js/components/gr-image-metadata/gr-image-metadata.js

@@ -421,8 +421,6 @@ module.controller('grImageMetadataCtrl', [
 
       ctrl.isUsefulMetadata = isUsefulMetadata;
 
-      ctrl.isSearchableIdentifier = (identifier) => ["original-media-id"].includes(identifier);
-
     function hasLocationInformation() {
       return ctrl.metadata && (
         ctrl.metadata.subLocation ||

kahuna/public/js/main.js

@@ -443,7 +443,8 @@ kahuna.filter('getInitials', function() {
 kahuna.filter('spaceWords', () => str => {
     switch (str) {
       case 'picdarurn': return 'Picdar URN';
-      case 'original-media-id': return 'Original Media ID';
+      case 'derivative-of-media-ids': return 'Derivative of Media ID(s)';
+      case 'replaces-media-id': return 'Replaces Media ID';
       default: return str.charAt(0).toUpperCase() + str.replace( /([A-Z]+)/g, " $1").slice(1)
     }
   });

media-api/test/scala/lib/querysyntax/ParserTest.scala

@@ -79,16 +79,14 @@ class ParserTest extends AnyFunSpec with Matchers with BeforeAndAfter with Image
       Parser.run("label:cats label:dogs") should be (List(
         Match(labelsField, Words("cats")),
         Match(labelsField, Words("dogs")),
-        ) ++ standardNegations
-      ))
+        ) ++ standardNegations)
     }
 
     it("should match multiple faceted terms on different facets") {
       Parser.run("credit:cats label:dogs") should be (List(
         Match(creditField, Words("cats")),
         Match(labelsField, Words("dogs")),
-        ) ++ standardNegations
-      ))
+        ) ++ standardNegations)
     }
   }
 
@@ -374,8 +372,7 @@ class ParserTest extends AnyFunSpec with Matchers with BeforeAndAfter with Image
       it("should ignore an invalid date argument") {
         Parser.run("date:NAZGUL") should be (List(
           Match(SingleField("date"), Words("NAZGUL")),
-          ) ++ standardNegations
-        ))
+          ) ++ standardNegations)
       }
 
     }