Merge main into Zip files development

indexing-solr/src/test/java/edu/unc/lib/boxc/indexing/solr/test/TestCorpus.java

@@ -135,9 +135,10 @@ public List<SolrInputDocument> populate() {
         newDoc.addField("ancestorIds", makeAncestorIds(pid1, pid2));
         newDoc.addField("ancestorPath", makeAncestorPath(pid1, pid2));
         newDoc.addField("resourceType", ResourceType.Work.name());
-        imgDatastreams.set(0, imgDatastreams.get(0) + pid6File.getId());
-        imgDatastreams.set(1, imgDatastreams.get(1) + pid6File.getId());
-        newDoc.addField(SearchFieldKey.DATASTREAM.getSolrField(), imgDatastreams);
+        List<String> workDatastreams = Arrays.asList(
+                ORIGINAL_FILE.getId() + "|image/png|file.png|png|766|urn:sha1:checksum|" + pid6File.getId() + "|1200x1200",
+                DatastreamType.JP2_ACCESS_COPY.getId() + "|image/jp2|bunny.jp2|jp2|||" + pid6File.getId() + "|1200x1200");
+        newDoc.addField(SearchFieldKey.DATASTREAM.getSolrField(), workDatastreams);
         newDoc.addField(SearchFieldKey.FILE_FORMAT_CATEGORY.getSolrField(), ContentCategory.image.getDisplayName());
         newDoc.addField(SearchFieldKey.FILE_FORMAT_TYPE.getSolrField(), "png");
         docs.add(newDoc);
@@ -152,6 +153,9 @@ public List<SolrInputDocument> populate() {
         newDoc.addField("ancestorIds", makeAncestorIds(pid1, pid3));
         newDoc.addField("ancestorPath", makeAncestorPath(pid1));
         newDoc.addField("resourceType", "Collection");
+        List<String> collection2Datastream = List.of(
+                DatastreamType.JP2_ACCESS_COPY.getId() + "|image/jp2|bunny.jp2|jp2|||" + pid2.getId() + "|120x120");
+        newDoc.addField(SearchFieldKey.DATASTREAM.getSolrField(), collection2Datastream);
         docs.add(newDoc);
 
         return docs;

operations/src/main/java/edu/unc/lib/boxc/operations/api/images/ImageServerUtil.java

@@ -30,7 +30,7 @@ public static String getImageServiceId(String id) {
      * @return
      */
     public static String getImageServerEncodedId(String id) {
-        return URLEncoder.encode(getImageServiceId(id));
+        return URLEncoder.encode(getImageServiceId(id), StandardCharsets.UTF_8);
     }
 
     /**

search-solr/src/main/java/edu/unc/lib/boxc/search/solr/models/DatastreamImpl.java

@@ -62,7 +62,7 @@ public DatastreamImpl(String datastream) {
 
     @Override
     public String toString() {
-        //DS name|mimetype|extension|filesize|checksum|owner|extent
+        //DS name|mimetype|filename|extension|filesize|checksum|owner|extent
         StringBuilder sb = new StringBuilder();
         if (name != null) {
             sb.append(name);

services-camel-app/src/main/java/edu/unc/lib/boxc/services/camel/images/ImageDerivativeProcessor.java

@@ -19,7 +19,8 @@ public class ImageDerivativeProcessor implements Processor {
 
     private static final Pattern MIMETYPE_PATTERN = Pattern.compile("^(image.*$|application.*?(photoshop|psd)$)");
 
-    private static final Pattern DISALLOWED_PATTERN = Pattern.compile(".*(vnd\\.fpx|x-icon).*");
+    private static final Pattern DISALLOWED_PATTERN =
+            Pattern.compile(".*(vnd\\.fpx|x-icon|x-raw-panasonic|vnd\\.microsoft\\.icon).*");
 
     /**
      * Returns true if the subject of the exchange is a binary which

services-camel-app/src/main/java/edu/unc/lib/boxc/services/camel/thumbnails/ImportThumbnailRequestProcessor.java

@@ -36,6 +36,8 @@ public void process(Exchange exchange) throws IOException {
         in.setHeader(CdrBinaryPath, storagePath.toString());
         in.setHeader(CdrBinaryMimeType, mimetype);
         in.setHeader(FCREPO_URI, repoPath);
+        // force access copy regeneration when importing a thumbnail
+        in.setHeader("force", "true");
     }
 
     /**

services-camel-app/src/test/java/edu/unc/lib/boxc/services/camel/images/ImageDerivativeProcessorTest.java

@@ -0,0 +1,83 @@
+package edu.unc.lib.boxc.services.camel.images;
+
+import edu.unc.lib.boxc.services.camel.util.CdrFcrepoHeaders;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.openMocks;
+
+/**
+ * @author bbpennel
+ */
+public class ImageDerivativeProcessorTest {
+    @Mock
+    private Exchange exchange;
+    @Mock
+    private Message messageIn;
+    private AutoCloseable closeable;
+    private ImageDerivativeProcessor processor;
+
+    @BeforeEach
+    public void init() {
+        closeable = openMocks(this);
+
+        when(exchange.getIn()).thenReturn(messageIn);
+        when(messageIn.getHeader(CdrFcrepoHeaders.CdrBinaryPath)).thenReturn("path/to/binary");
+
+        processor = new ImageDerivativeProcessor();
+    }
+
+    @AfterEach
+    public void close() throws Exception {
+        closeable.close();
+    }
+
+    @Test
+    public void testAllowedImageTypePanasonicRaw() {
+        when(messageIn.getHeader(CdrFcrepoHeaders.CdrBinaryMimeType)).thenReturn("image/x-raw-panasonic");
+
+        assertFalse(ImageDerivativeProcessor.allowedImageType(exchange));
+    }
+
+    @Test
+    public void testAllowedImageTypePanasonicRw2() {
+        when(messageIn.getHeader(CdrFcrepoHeaders.CdrBinaryMimeType)).thenReturn("image/x-panasonic-rw2");
+
+        assertTrue(ImageDerivativeProcessor.allowedImageType(exchange));
+    }
+
+    @Test
+    public void testAllowedImageTypeIcon() {
+        when(messageIn.getHeader(CdrFcrepoHeaders.CdrBinaryMimeType)).thenReturn("image/x-icon");
+
+        assertFalse(ImageDerivativeProcessor.allowedImageType(exchange));
+    }
+
+    @Test
+    public void testAllowedImageTypeJpeg() {
+        when(messageIn.getHeader(CdrFcrepoHeaders.CdrBinaryMimeType)).thenReturn("image/jpeg");
+
+        assertTrue(ImageDerivativeProcessor.allowedImageType(exchange));
+    }
+
+    @Test
+    public void testAllowedImageTypePhotoshop() {
+        when(messageIn.getHeader(CdrFcrepoHeaders.CdrBinaryMimeType)).thenReturn("application/photoshop");
+
+        assertTrue(ImageDerivativeProcessor.allowedImageType(exchange));
+    }
+
+    @Test
+    public void testAllowedImageTypeMicrosoft() {
+        when(messageIn.getHeader(CdrFcrepoHeaders.CdrBinaryMimeType)).thenReturn("image/vnd.microsoft.icon");
+
+        assertFalse(ImageDerivativeProcessor.allowedImageType(exchange));
+    }
+}

services-camel-app/src/test/java/edu/unc/lib/boxc/services/camel/thumbnails/ImportThumbnailProcessorTest.java

@@ -71,6 +71,7 @@ public void testImportThumbnail() throws IOException {
         verify(message).setHeader(FCREPO_URI, pid.getRepositoryPath());
         verify(message).setHeader(CdrBinaryMimeType, mimetype);
         verify(message).setHeader(CdrBinaryPath, path.toString());
+        verify(message).setHeader("force", "true");
     }
 
     @Test

static/css/sass/cdr_ui_styles.scss

@@ -713,7 +713,6 @@ table.dataTable {
   .restricted-access {
     border: 1px solid;
     border-radius: 5px;
-    padding: 15px;
 
     .button {
       text-align: left;
@@ -1092,6 +1091,7 @@ a.navbar-item:hover {
     }
   }
 
+
   .relateditem {
     margin-left: 5px;
     margin-right: 5px;