diff --git a/LICENSE b/LICENSE index 5ad2768cb..dac705e5b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ The MIT License (MIT) -Copyright © 2023 Texas A&M University Libraries +Copyright © 2020-2025 Texas A&M University Libraries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/src/main/java/edu/tamu/scholars/middleware/view/model/ContainerType.java b/src/main/java/edu/tamu/scholars/middleware/view/model/ContainerType.java index 6eb49cc1f..665cfa526 100644 --- a/src/main/java/edu/tamu/scholars/middleware/view/model/ContainerType.java +++ b/src/main/java/edu/tamu/scholars/middleware/view/model/ContainerType.java @@ -4,5 +4,8 @@ * An initial enumeration for describing to the client which type of container a view is to be within. */ public enum ContainerType { - ACADEMIC_AGE_GROUP, QUANTITY_DISTRIBUTION, PROFILE_SUMMARIES_EXPORT + ACADEMIC_AGE_GROUP, + QUANTITY_DISTRIBUTION, + FREQUENCY_GRAPH, + PROFILE_SUMMARIES_EXPORT } diff --git a/src/main/resources/defaults/dataAndanalyticViews.yml b/src/main/resources/defaults/dataAndanalyticViews.yml index bfb334ae9..2610eb5fc 100644 --- a/src/main/resources/defaults/dataAndanalyticViews.yml +++ b/src/main/resources/defaults/dataAndanalyticViews.yml @@ -72,3 +72,32 @@ - name: Download Profile Summaries by Department layout: CONTAINER type: PROFILE_SUMMARIES_EXPORT +- name: Temporal Graph + layout: CONTAINER + type: FREQUENCY_GRAPH + filters: + - field: class + value: Document + facets: + - name: Author organization + field: authorOrganization + type: STRING + sort: COUNT + direction: DESC + pageSize: 10 + expandable: false + collapsible: false + collapsed: false + useDialog: true + hidden: false + - name: Authors + field: authors + type: STRING + sort: COUNT + direction: DESC + pageSize: 10 + expandable: false + collapsible: false + collapsed: false + useDialog: true + hidden: false diff --git a/src/main/resources/defaults/displayViews/organizations/asideTemplate.html b/src/main/resources/defaults/displayViews/organizations/asideTemplate.html index adcb7315d..3c7b570a4 100644 --- a/src/main/resources/defaults/displayViews/organizations/asideTemplate.html +++ b/src/main/resources/defaults/displayViews/organizations/asideTemplate.html @@ -2,10 +2,6 @@

-
- temporal graph icon - Temporal Graph -
map of science icon Map of Science @@ -19,4 +15,4 @@ height: 25px; margin: auto; } - \ No newline at end of file + diff --git a/src/test/java/edu/tamu/scholars/middleware/auth/controller/UserControllerTest.java b/src/test/java/edu/tamu/scholars/middleware/auth/controller/UserControllerTest.java index c71318d56..790c382f0 100644 --- a/src/test/java/edu/tamu/scholars/middleware/auth/controller/UserControllerTest.java +++ b/src/test/java/edu/tamu/scholars/middleware/auth/controller/UserControllerTest.java @@ -79,9 +79,9 @@ public void testGetUsers() throws Exception { @Test public void testPatchUser() throws Exception { - User admin = createMockAdmin(); + User superAdmin = createMockSuperAdmin(); // @formatter:off - mockMvc.perform(patch("/users/{id}", admin.getId()).cookie(login(admin)).content("{\"role\": \"ROLE_USER\", \"active\": false}")) + mockMvc.perform(patch("/users/{id}", superAdmin.getId()).cookie(login(superAdmin)).content("{\"role\": \"ROLE_USER\", \"active\": false}")) .andExpect(status().isOk()) .andExpect(content().contentType(HAL_JSON_VALUE)) .andExpect(jsonPath("active", equalTo(false)))