Skip to content

Commit af7d41c

Browse files
authored
Merge pull request #1818 from UNC-Libraries/uv-cleanup
Fully remove Universal Viewer
2 parents eeec51e + 51d959b commit af7d41c

File tree

10 files changed

+5
-129
lines changed

10 files changed

+5
-129
lines changed

etc/solr-config/access/conf/schema.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
<field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
226226
<!-- Descriptive Fields -->
227227
<field name="title" type="sortableText" indexed="true" stored="true" required="true"/>
228-
<!-- View behavior for UV -->
228+
<!-- View behavior for Clover -->
229229
<field name="viewBehavior" type="string" indexed="true" stored="true" />
230230

231231
<!-- Index fields -->

operations-jms/src/main/java/edu/unc/lib/boxc/operations/jms/viewSettings/ViewSettingRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import edu.unc.lib.boxc.auth.fcrepo.models.AgentPrincipalsImpl;
77

88
/**
9-
* Request object for updating the view settings of the UV
9+
* Request object for updating the view settings of Clover
1010
* @author sharonluong
1111
*/
1212
public class ViewSettingRequest {

services-camel-app/src/main/java/edu/unc/lib/boxc/services/camel/viewSettings/ViewSettingRouter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import static org.slf4j.LoggerFactory.getLogger;
1010

1111
/**
12-
* Router for processing requests to update view setting of UV
12+
* Router for processing requests to update view setting of Clover
1313
*
1414
* @author snluong
1515
*/

static/css/sass/cdr_ui_styles.scss

-31
Original file line numberDiff line numberDiff line change
@@ -832,37 +832,6 @@ table.dataTable {
832832
color: white;
833833
}
834834

835-
/* UV image viewer */
836-
.uv {
837-
.footer {
838-
background-color: white;
839-
padding: 0;
840-
}
841-
842-
.search {
843-
a {
844-
margin-left: 0;
845-
}
846-
}
847-
848-
.tabs {
849-
margin-bottom: 0;
850-
851-
.tab.on {
852-
display: inherit !important;
853-
}
854-
}
855-
856-
.title {
857-
color: white;
858-
font-size: inherit;
859-
}
860-
861-
li {
862-
text-indent: 0;
863-
}
864-
}
865-
866835
/* MODs display for work and file pages, plus modalMetadata.vue component */
867836
#mods_data_display {
868837
margin: auto;

static/js/vue-cdr-access/tests/unit/fileRecord.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ const record = {
113113
],
114114
timestamp: 1679922126871
115115
},
116-
viewerType: "uv",
116+
viewerType: "clover",
117117
neighborList: [
118118
{
119119
filesizeTotal: 69481,

static/js/vue-cdr-access/tests/unit/restrictedContent.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ const record = {
9898
],
9999
timestamp: 1679922126871
100100
},
101-
viewerType: "uv",
101+
viewerType: "clover",
102102
dataFileUrl: "content/4db695c0-5fd5-4abf-9248-2e115d43f57d",
103103
markedForDeletion: false,
104104
resourceType: "File"

static/plugins/uv/unc-uv-config.json

-19
This file was deleted.

static/plugins/uv/uv_init.js

-44
This file was deleted.

web-access-app/src/main/java/edu/unc/lib/boxc/web/access/controllers/FullRecordController.java

-12
Original file line numberDiff line numberDiff line change
@@ -273,18 +273,6 @@ public String handlePdfViewerRequest(@PathVariable("pid") String pidString, Mode
273273
return "fullRecord/pdfViewer";
274274
}
275275

276-
@GetMapping("/{pid}/uvViewer")
277-
public String handleUvViewerRequest(@PathVariable("pid") String pidString, Model model) {
278-
PID pid = PIDs.get(pidString);
279-
280-
AccessGroupSet principals = getAgentPrincipals().getPrincipals();
281-
aclService.assertHasAccess("Insufficient permissions to access pdf for " + pidString,
282-
pid, principals, Permission.viewAccessCopies);
283-
284-
model.addAttribute("template", "ajax");
285-
return "fullRecord/uvViewer";
286-
}
287-
288276
private Map<String, Object> getViewerProperties(ContentObjectRecord briefObject, AccessGroupSet principals) {
289277
String viewerType = null;
290278
String viewerPid = null;

web-access-app/src/main/webapp/WEB-INF/jsp/fullRecord/uvViewer.jsp

-18
This file was deleted.

0 commit comments

Comments
 (0)