Boxctron development to main (#1813)

* Chompb pre-ingest admin UI (#1787)

* Rename vue permissions app to something more generic

* Setup for admin UI for Chompb pre-ingest projects

* Update project name for CI

* A bit of clean up and fix code coverage path

* Add test for chompb controller

* Merge main into boxctron-development (#1799)

* BXC-4694 - Handle RangeNotSatisfiable (#1785)

* Added new RangeNotSatisfiableException, which gets thrown if the range header exceeds the size of the file. Handle this error with a 416 response

* Log headers when an uncaught exception occurs in fedora content controller

* Add test for exception

* BXC-4667 update datastream controller IT for iiif thumbnails

* BXC-4667 cleanup test

* BXC-4667 cleanup and logic modifications

* BXC-4667 cleaner logic

* BXC-4667 handle collection, admin unit, and folder thumbnails that will not use iiif

* BXC-4667 update access copies unit test to reflect logic change

* BXC-4667 add derivativeContentService test

* Set max refresh attempts (#1792)

* If end of range is equal to or greater than the size of the file, remove it so we get the remainder of the file. Add more testing for FedoraContentService

* Change start of range so that it'll trigger 416

* BXC-4701 - Update clients/tests to solr 9 (#1791) (#1795)

* Update to solr 9, and wiremock 3 due to jetty versions. Update some commons usages which were referencing libraries pulled in by old solr versons

* Update solr config, make paths absolute since it is now required, and don't double load config

* Switch over to wiremock-jre8-standalone to avoid jetty version conflicts with solr

* Running solr 9 in docker for the integration tests that ran it in jetty, since it was failing to start. Add solr logging config

* Adjusting ghactions

* Try solr as docker run

* Reenable build

* Explicitly add solr-api as compile scope, otherwise solr-core pulls it in as test. Add commons-codec directly in a lower module, since it was previously being imported via transitive dependencies, but no longer is

* Clean up of removed performance visualization project (#1797)

---------

Co-authored-by: sharonl <[email protected]>
Co-authored-by: Dean Farrell <[email protected]>

* BXC-4683 - List chompb projects (#1800)

* Basic setup

* Display pre-ingest projects

* Prioritize A/V content over PDFs and fix issue with PDF display getting the wrong PID if the PDF isn't the primary object

* Prioritize A/V content over PDFs and fix issue with PDF display getting the wrong PID if the PDF isn't the primary object

* Return as json, and capture all output from command

* Config chompb base path. Return json, update endpoint path

* Update properties to make response from chompb. Use datatable ajax to load data

* Add property to test properties

---------

Co-authored-by: lfarrell <[email protected]>

* Add cropping report

* Use datatables default search panes instead of our custom ones.

* Add method for getting results from a job. Add test for ChompbPreIngestService. Fix name of controllers package in tests so that test coverage will actually work.

* Implemented controller endpoints for getting files from processing results. Updated report to point to all these urls. Renamed report to velocicroptor. Fixed issue in preIngest page when source not set

* Add unit test for velocicroptorReport

* Cleanup unused method

* Remove log statement

* Address codeclimate

---------

Co-authored-by: Dean Farrell <[email protected]>
Co-authored-by: sharonl <[email protected]>

.github/workflows/build.yml

@@ -86,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]
@@ -103,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

static/css/admin/cdradmin.css

@@ -658,4 +658,52 @@ div.in-admin-iframe,
 
 #streaming_url {
 	min-width: 400px;
+}
+
+#chompb-projects_filter,
+#vue-cdr-admin-app .dataTables_filter {
+	text-align: right;
+}
+
+#chompb-projects_filter input,
+#vue-cdr-admin-app .dataTables_filter input {
+	max-width: 250px;
+}
+
+#chompb-preingest-ui table td a {
+	padding-right: 10px;
+	text-decoration: underline;
+}
+
+#chompb-preingest-ui table td:last-child {
+	padding-right: 0;
+}
+#chompb-projects_wrapper .is-half,
+#vue-cdr-admin-app .dataTables_wrapper .is-half {
+	margin: 25px auto;
+}
+
+#chompb-projects_length label,
+#vue-cdr-admin-app .dataTables_length label {
+    vertical-align: middle;
+}
+
+#chompb-projects_paginate .pagination-list,
+#vue-cdr-admin-app .pagination-list {
+	justify-content: flex-end;
+}
+
+#vue-cdr-admin-app {
+	margin: 15px 20px;
+}
+
+@media (max-width: 768px) {
+	#chompb-projects_filter {
+		text-align: left;
+	}
+
+	#chompb-projects_paginate .pagination,
+	#chompb-projects_paginate .pagination-list {
+		justify-content: flex-start;
+	}
 }