From 7b5409645980ef59c6d3659296284f1bdba76071 Mon Sep 17 00:00:00 2001 From: Texas A&M SAD III <144841721+wwelling@users.noreply.github.com> Date: Wed, 27 Nov 2024 10:28:53 -0600 Subject: [PATCH 1/7] Reduce maven GitHub action runners to ubuntu-latest and Java 17 --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index fe6f38b59..3cda0d393 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -6,8 +6,8 @@ jobs: build: strategy: matrix: - runs-on: [windows-latest, macos-latest, ubuntu-latest] - java-version: [11, 17] + runs-on: [ubuntu-latest] + java-version: [17] runs-on: ${{ matrix.runs-on }} From d065b9b1526e528fe10770e89c210cb28f9f09be Mon Sep 17 00:00:00 2001 From: Texas A&M SAD III <144841721+wwelling@users.noreply.github.com> Date: Mon, 2 Dec 2024 08:10:45 -0600 Subject: [PATCH 2/7] Update pull_request_template.md --- .github/pull_request_template.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d6645cdd5..f070581e0 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,14 +1,16 @@ # Description -> Please provide as much detail as needed to explain the changes. -# Supporting Material -> Please provide any links, screenshots, etc. as necessary to support the description. +Please include a summary of the changes. Please also include relevant motivation and context. At a minimum, providing a bulleted list of changes in your PR is helpful to reviewers. -# Additional Comments -> Please provide any additional feedback here. +## Type of change -# Helper Checklist (optional) -> Please ensure the following has been completed. +Please delete options that are not relevant. -- [ ] Changes are documented to the best of your understanding. -- [ ] Changes are reviewed and accepted. +- [ ] Bug fix (non-breaking change which fixes an issue) +- [ ] New feature (non-breaking change which adds functionality) +- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) +- [ ] This change requires a documentation update + +# Testing Procedures + +Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration. From 0a8fcb5c060603e046ee36949eb89a16477d8085 Mon Sep 17 00:00:00 2001 From: Dbreck-TAMU Date: Wed, 4 Dec 2024 09:27:51 -0600 Subject: [PATCH 3/7] Removed helptext from Scholars Home page --- src/main/resources/defaults/themes.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/defaults/themes.yml b/src/main/resources/defaults/themes.yml index f9586f42c..304b8fa93 100644 --- a/src/main/resources/defaults/themes.yml +++ b/src/main/resources/defaults/themes.yml @@ -10,7 +10,7 @@ imageAlt: Clarendon Building, University of Oxford watermarkImageUri: assets/images/vector-world-map.png watermarkText: worldwide collaboration - helpText: "Tutorials: How To Update" + helpText: "" baseText: Thank you for visiting Scholars@Scholars. We have worked to create the first version of your profile and continue to explore additional data sources to enhance your profile. We request your participation to update @@ -169,7 +169,7 @@ imageAlt: Texas A&M Acedemic Building watermarkImageUri: assets/images/vector-world-map.png watermarkText: worldwide collaboration - helpText: "Tutorials: How To Update" + helpText: "" baseText: Thank you for visiting Scholars@TAMU. We have worked to create the first version of your profile and continue to explore additional data sources to enhance your profile. We request your participation to update From 7089bef923efda4ac8765b7fec7a72ba390358bb Mon Sep 17 00:00:00 2001 From: Dbreck-TAMU Date: Wed, 4 Dec 2024 10:06:52 -0600 Subject: [PATCH 4/7] Renamed 'Type' facet to 'People' --- src/main/resources/defaults/directoryViews.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/defaults/directoryViews.yml b/src/main/resources/defaults/directoryViews.yml index d9b993af9..bf95d0e01 100644 --- a/src/main/resources/defaults/directoryViews.yml +++ b/src/main/resources/defaults/directoryViews.yml @@ -13,7 +13,7 @@ - positions.organizations - thumbnail facets: - - name: Type + - name: People field: type type: STRING sort: COUNT From fbc07ef27727bcb800f54115035b4da3de19c8fa Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Mon, 9 Dec 2024 09:51:07 -0600 Subject: [PATCH 5/7] Removes Idea tab view from defaults --- .../resources/defaults/discoveryViews.yml | 61 ------------------- 1 file changed, 61 deletions(-) diff --git a/src/main/resources/defaults/discoveryViews.yml b/src/main/resources/defaults/discoveryViews.yml index 67bb1764b..9d1b72ef7 100644 --- a/src/main/resources/defaults/discoveryViews.yml +++ b/src/main/resources/defaults/discoveryViews.yml @@ -643,67 +643,6 @@ - columnHeader: Individual valuePath: individual -- name: Ideas - layout: LIST - templates: - default: "defaults/discoveryViews/ideas/default.html" - styles: [] - highlightFields: - - name - - futureResearchIdeaOf - fields: - - type - - name - - futureResearchIdeaOf - - futureResearchIdeaOf.organizations - - createdDate - facets: - - name: People - field: futureResearchIdeaOf_nested_facets - type: STRING - sort: COUNT - direction: DESC - pageSize: 10 - collapsed: true - hidden: false - - name: Organization - field: futureResearchIdeaOf.organizations - type: STRING - sort: COUNT - direction: DESC - pageSize: 10 - collapsed: true - hidden: false - - name: Research Keyword - field: keywords - type: STRING - sort: COUNT - direction: DESC - pageSize: 10 - collapsed: true - hidden: false - filters: - - field: class - value: Concept AND type:FutureResearchIdea - opKey: EXPRESSION - boosts: - - field: name - value: 2 - sort: - - field: score - direction: DESC - - field: name_sort - direction: ASC - export: - - columnHeader: Future Research Idea - valuePath: name - - columnHeader: Researcher - valuePath: futureResearchIdeaOf - - columnHeader: Researcher Organization - valuePath: futureResearchIdeaOf.organizations - - columnHeader: Individual - valuePath: individual - - name: Organizations layout: LIST templates: From 672e6fbf813b835b5495666b0efdb4cc81ce29e0 Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Mon, 9 Dec 2024 09:59:47 -0600 Subject: [PATCH 6/7] Updated the application.yml file to set hibernate.ddl-auto to create to address database persistence issues --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 645988b04..1a5a7c836 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -152,7 +152,7 @@ spring: # database-platform: org.hibernate.dialect.PostgreSQLDialect generate-ddl: false - hibernate.ddl-auto: none + hibernate.ddl-auto: create open-in-view: false properties: hibernate: From 8047c36f94042cfed986b501c3ae50ae13fcf4f9 Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Mon, 9 Dec 2024 11:09:05 -0600 Subject: [PATCH 7/7] Update application.yml Reverted changes in the `application yml file to `hibernate.ddl-auto: none` --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1a5a7c836..645988b04 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -152,7 +152,7 @@ spring: # database-platform: org.hibernate.dialect.PostgreSQLDialect generate-ddl: false - hibernate.ddl-auto: create + hibernate.ddl-auto: none open-in-view: false properties: hibernate: