From b6ae9f0c15d9eb0249eb4bbdf01d78686143dee9 Mon Sep 17 00:00:00 2001 From: William Welling Date: Fri, 31 Jan 2025 14:35:43 -0600 Subject: [PATCH 1/9] Add frequency graph container type enum --- .../tamu/scholars/middleware/view/model/ContainerType.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 } From 675cfed344066c92dd86fb05051c64b8dcb024a3 Mon Sep 17 00:00:00 2001 From: William Welling Date: Fri, 31 Jan 2025 14:36:12 -0600 Subject: [PATCH 2/9] Add initial temporal graph data and analytic view default --- .../defaults/dataAndanalyticViews.yml | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/main/resources/defaults/dataAndanalyticViews.yml b/src/main/resources/defaults/dataAndanalyticViews.yml index bfb334ae9..6265e93eb 100644 --- a/src/main/resources/defaults/dataAndanalyticViews.yml +++ b/src/main/resources/defaults/dataAndanalyticViews.yml @@ -69,6 +69,36 @@ collapsed: false useDialog: true hidden: false +- 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: Year + field: publicationDate + opKey: BETWEEN + type: DATE_YEAR + sort: INDEX + direction: DESC + pageSize: 10 + expandable: false + collapsible: false + collapsed: false + useDialog: true + hidden: false - name: Download Profile Summaries by Department layout: CONTAINER - type: PROFILE_SUMMARIES_EXPORT + type: PROFILE_SUMMARIES_EXPORT \ No newline at end of file From e75f0b14de7aee2d90074c428d9c7ebb5ae6e303 Mon Sep 17 00:00:00 2001 From: William Welling Date: Fri, 31 Jan 2025 15:02:22 -0600 Subject: [PATCH 3/9] Move temporal graph to the last default data and analytic view --- src/main/resources/defaults/dataAndanalyticViews.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/defaults/dataAndanalyticViews.yml b/src/main/resources/defaults/dataAndanalyticViews.yml index 6265e93eb..90f4d26dd 100644 --- a/src/main/resources/defaults/dataAndanalyticViews.yml +++ b/src/main/resources/defaults/dataAndanalyticViews.yml @@ -69,6 +69,9 @@ collapsed: false useDialog: true hidden: false +- name: Download Profile Summaries by Department + layout: CONTAINER + type: PROFILE_SUMMARIES_EXPORT - name: Temporal Graph layout: CONTAINER type: FREQUENCY_GRAPH @@ -99,6 +102,3 @@ collapsed: false useDialog: true hidden: false -- name: Download Profile Summaries by Department - layout: CONTAINER - type: PROFILE_SUMMARIES_EXPORT \ No newline at end of file From b0c8db349d3a8b9c5defdca944e9a6934ba9bed4 Mon Sep 17 00:00:00 2001 From: David B <145480463+Dbreck-TAMU@users.noreply.github.com> Date: Fri, 31 Jan 2025 15:49:17 -0600 Subject: [PATCH 4/9] Remove Temporal Graph from Organization asideTemplate --- .../defaults/displayViews/organizations/asideTemplate.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 + From 50dd8f1973288cb34b2d9cdef66260be99f1f0e1 Mon Sep 17 00:00:00 2001 From: William Welling Date: Mon, 3 Feb 2025 10:35:19 -0600 Subject: [PATCH 5/9] Replace year with authors facet for temporal graph data and analytic view --- src/main/resources/defaults/dataAndanalyticViews.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/resources/defaults/dataAndanalyticViews.yml b/src/main/resources/defaults/dataAndanalyticViews.yml index 90f4d26dd..2610eb5fc 100644 --- a/src/main/resources/defaults/dataAndanalyticViews.yml +++ b/src/main/resources/defaults/dataAndanalyticViews.yml @@ -90,11 +90,10 @@ collapsed: false useDialog: true hidden: false - - name: Year - field: publicationDate - opKey: BETWEEN - type: DATE_YEAR - sort: INDEX + - name: Authors + field: authors + type: STRING + sort: COUNT direction: DESC pageSize: 10 expandable: false From fa7b6ee0dd2fec012b7e99b6f28ff36302bea16c Mon Sep 17 00:00:00 2001 From: William Welling Date: Mon, 3 Feb 2025 10:36:15 -0600 Subject: [PATCH 6/9] Fix user controller unit test for super admin patch user --- .../middleware/auth/controller/UserControllerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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))) From 23129a444f3d73695d39d31ccc03443c16740cea Mon Sep 17 00:00:00 2001 From: William Welling Date: Mon, 3 Feb 2025 10:48:17 -0600 Subject: [PATCH 7/9] Max page size of facets for front end pagination --- src/main/resources/defaults/dataAndanalyticViews.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/defaults/dataAndanalyticViews.yml b/src/main/resources/defaults/dataAndanalyticViews.yml index 2610eb5fc..cbb0dc2ac 100644 --- a/src/main/resources/defaults/dataAndanalyticViews.yml +++ b/src/main/resources/defaults/dataAndanalyticViews.yml @@ -84,7 +84,7 @@ type: STRING sort: COUNT direction: DESC - pageSize: 10 + pageSize: 2147483647 expandable: false collapsible: false collapsed: false @@ -95,7 +95,7 @@ type: STRING sort: COUNT direction: DESC - pageSize: 10 + pageSize: 2147483647 expandable: false collapsible: false collapsed: false From ce99930f7453e3a612b698aad5c8fdfb032a1e52 Mon Sep 17 00:00:00 2001 From: William Welling Date: Mon, 3 Feb 2025 14:26:37 -0600 Subject: [PATCH 8/9] Restore page size to 10 --- src/main/resources/defaults/dataAndanalyticViews.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/defaults/dataAndanalyticViews.yml b/src/main/resources/defaults/dataAndanalyticViews.yml index cbb0dc2ac..2610eb5fc 100644 --- a/src/main/resources/defaults/dataAndanalyticViews.yml +++ b/src/main/resources/defaults/dataAndanalyticViews.yml @@ -84,7 +84,7 @@ type: STRING sort: COUNT direction: DESC - pageSize: 2147483647 + pageSize: 10 expandable: false collapsible: false collapsed: false @@ -95,7 +95,7 @@ type: STRING sort: COUNT direction: DESC - pageSize: 2147483647 + pageSize: 10 expandable: false collapsible: false collapsed: false From 09004ce9fd8f25464a945f0ef6c807af118c0f8b Mon Sep 17 00:00:00 2001 From: William Welling Date: Fri, 14 Feb 2025 08:51:43 -0600 Subject: [PATCH 9/9] Update MIT license with corrected range --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: