Merge branch 'main' into clover-viewer

.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
         ports:
           - 46380:6379
       fedora:
-        image: fcrepo/fcrepo:5.1.1
+        image: fcrepo/fcrepo:5.1.1-multiplatform
         ports:
           - 48085:8080
         volumes:
@@ -38,7 +38,7 @@ jobs:
     - name: Get Container ID of fedora service
       id: get_container_id
       run: |
-        CONTAINER_ID=$(docker ps --format "{{.ID}}" -f "ancestor=fcrepo/fcrepo:5.1.1")
+        CONTAINER_ID=$(docker ps --format "{{.ID}}" -f "ancestor=fcrepo/fcrepo:5.1.1-multiplatform")
         echo "CONTAINER_ID=$CONTAINER_ID" >> $GITHUB_ENV
     - name: Restart fedora now that the repository has been checked out so config files are available
       run: docker restart ${{ env.CONTAINER_ID }}
@@ -47,6 +47,17 @@ jobs:
       run: |
         docker run -d --rm -p 43030:3030 atomgraph/fuseki --mem /test
 
+    - name: Make directory for solr config
+      run: mkdir -p /tmp/solr-config
+
+    # Need to copy the config is outside of the source path, otherwise it produces permission conflicts
+    - name: Copy Solr Config into container
+      run: sudo cp -r ${{ github.workspace }}/etc/solr-config/* /tmp/solr-config/
+
+    - name: Run solr container as command to trigger core creation
+      run: |
+        docker run -v /tmp/solr-config:/solr_config -d --rm -p 48983:8983 solr:9 solr-precreate access /solr_config/access
+
     - name: Checkout submodules
       run: git submodule update --init --recursive
 
@@ -75,11 +86,11 @@ jobs:
         restore-keys: v1-npm-deps-
 
     - run: npm --prefix static/js/vue-cdr-access install
-    - run: npm --prefix static/js/admin/vue-permissions-editor install
+    - run: npm --prefix static/js/admin/vue-cdr-admin install
 
     - run: npm install -g [email protected]
     - run: npm --prefix static/js/vue-cdr-access run test
-    - run: npm --prefix static/js/admin/vue-permissions-editor run test
+    - run: npm --prefix static/js/admin/vue-cdr-admin run test
 
     - name: Report to CodeClimate
       uses: paambaati/[email protected]
@@ -92,7 +103,7 @@ jobs:
           ${{github.workspace}}/**/target/site/jacoco/jacoco.xml:jacoco
           ${{github.workspace}}/**/target/site/jacoco-it/jacoco.xml:jacoco
           ${{github.workspace}}/static/js/vue-cdr-access/coverage/lcov.info:lcov
-          ${{github.workspace}}/static/js/admin/vue-permissions-editor/coverage/lcov.info:lcov
+          ${{github.workspace}}/static/js/admin/vue-cdr-admin/coverage/lcov.info:lcov
 
     - name: View fedora service logs
       if: always()

.gitignore

@@ -24,6 +24,7 @@ static/js/cdr-access.js
 static/css/cdr_access.css
 static/css/cdr_vue_modal_styles.css
 static/js/vue-access-index.js
+static/js/vue-admin-index.js
 static/js/vue-permissions-index.js
 static/js/vue-cdr-access/.env
 static/css/cdr-ui.css

Makefile

@@ -33,7 +33,7 @@ build-admin-concat:
 		static/css/admin/fontawesome/all.min.css \
 		static/css/structure_browse.css \
 		static/css/cdr_vue_modal_styles.css \
-		static/js/admin/vue-permissions-editor/dist/assets/index.css \
+		static/js/admin/vue-cdr-admin/dist/assets/index.css \
 		> static/css/cdr_admin.css
 
 ifneq ($(VERSION), "")
@@ -44,11 +44,11 @@ ifneq ($(VERSION), "")
 endif
 
 build-admin-npm:
-	# Build vue permissions application files
-	npm --prefix static/js/admin/vue-permissions-editor ci
-	npm --prefix static/js/admin/vue-permissions-editor run build
+	# Build vue admin application files
+	npm --prefix static/js/admin/vue-cdr-admin ci
+	npm --prefix static/js/admin/vue-cdr-admin run build
 
-	cp static/js/admin/vue-permissions-editor/dist/assets/vue-permissions-index.js static/js/vue-permissions-index.js
+	cp static/js/admin/vue-cdr-admin/dist/assets/vue-admin-index.js static/js/vue-admin-index.js
 
 build-access-concat:
 	# Make sure file is empty

auth-api/src/main/java/edu/unc/lib/boxc/auth/api/services/DatastreamPermissionUtil.java

@@ -30,8 +30,6 @@ public class DatastreamPermissionUtil {
         DS_PERMISSION_MAP.put(DatastreamType.ORIGINAL_FILE, Permission.viewOriginal);
         DS_PERMISSION_MAP.put(DatastreamType.TECHNICAL_METADATA, Permission.viewHidden);
         DS_PERMISSION_MAP.put(DatastreamType.TECHNICAL_METADATA_HISTORY, Permission.viewHidden);
-        DS_PERMISSION_MAP.put(DatastreamType.THUMBNAIL_SMALL, Permission.viewAccessCopies);
-        DS_PERMISSION_MAP.put(DatastreamType.THUMBNAIL_LARGE, Permission.viewAccessCopies);
     }
 
     private DatastreamPermissionUtil() {

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   fedora:
-    image: fcrepo/fcrepo:5.1.1
+    image: fcrepo/fcrepo:5.1.1-multiplatform
     ports:
       - "48085:8080"
     volumes:
@@ -21,4 +21,14 @@ services:
     image: atomgraph/fuseki
     ports:
       - "43030:3030"
-    command: --mem /test
+    command: --mem /test
+  solr:
+    image: solr:9
+    ports:
+      - "48983:8983"
+    volumes:
+      - ./etc/solr-config:/var/solr/data/access/conf
+    command:
+      - solr-precreate
+      - access
+      - /var/solr/data/access/conf