Merge pull request #105 from TAMULib/2021-june-sprint-staging

2021 June Sprint
TAMULib · Jun 23, 2021 · c65338f · c65338f
2 parents dbb756b + befdea5
commit c65338f
Show file tree

Hide file tree

Showing 17 changed files with 570 additions and 111 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.3.4.RELEASE</version>
+    <version>2.3.11.RELEASE</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
 
   <groupId>edu.tamu.scholars</groupId>
   <artifactId>middleware</artifactId>
-  <version>1.0.2</version>
+  <version>1.1.0</version>
 
   <name>middleware</name>
 
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-solr</artifactId>
-      <version>4.2.4.TAMU.RELEASE</version>
+      <version>4.3.9.TAMU</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -159,7 +159,7 @@
     <dependency>
       <groupId>com.jayway.jsonpath</groupId>
       <artifactId>json-path</artifactId>
-      <version>2.4.0</version>
+      <version>2.6.0</version>
     </dependency>
 
     <dependency>
@@ -189,7 +189,7 @@
     <dependency>
       <groupId>com.github.jsonld-java</groupId>
       <artifactId>jsonld-java</artifactId>
-      <version>0.13.0</version>
+      <version>0.13.3</version>
       <exclusions>
         <exclusion>
           <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/src/main/java/edu/tamu/scholars/middleware/discovery/model/Person.java b/src/main/java/edu/tamu/scholars/middleware/discovery/model/Person.java
@@ -246,7 +246,7 @@ public class Person extends Common {
     private List<String> adviseeOfEndDate;
 
     @Indexed(type = "nested_whole_strings", copyTo = "_text_")
-    @NestedObject(properties = { @Reference(value = "selectedPublicationType", key = "type"), @Reference(value = "selectedPublicationDate", key = "publicationDate"), @Reference(value = "selectedPublicationPublisher", key = "publisher"), @Reference(value = "selectedPublicationVenue", key = "venue") })
+    @NestedObject(properties = { @Reference(value = "selectedPublicationType", key = "type"), @Reference(value = "selectedPublicationDate", key = "publicationDate"), @Reference(value = "selectedPublicationPublisher", key = "publisher"), @Reference(value = "selectedPublicationVenue", key = "venue"), @Reference(value = "selectedPublicationTag", key = "tags") })
     @PropertySource(template = "person/publication", predicate = "http://www.w3.org/2000/01/rdf-schema#label")
     private List<String> publications;
 
@@ -266,6 +266,10 @@ public class Person extends Common {
     @PropertySource(template = "person/selectedPublicationVenue", predicate = "http://www.w3.org/2000/01/rdf-schema#label", unique = true)
     private List<String> selectedPublicationVenue;
 
+    @Indexed(type = "nested_whole_strings")
+    @PropertySource(template = "person/selectedPublicationTag", predicate = "http://purl.obolibrary.org/obo/ARG_0000015")
+    private List<String> selectedPublicationTag;
+
     @Indexed(type = "nested_whole_strings", searchable = false)
     @NestedObject(properties = { @Reference(value = "collectionOrSeriesEditorForType", key = "type"), @Reference(value = "collectionOrSeriesEditorForRole", key = "role"), @Reference(value = "collectionOrSeriesEditorForStartDate", key = "startDate"), @Reference(value = "collectionOrSeriesEditorForEndDate", key = "endDate") })
     @PropertySource(template = "person/collectionOrSeriesEditorFor", predicate = "http://www.w3.org/2000/01/rdf-schema#label")
@@ -1145,6 +1149,14 @@ public void setSelectedPublicationVenue(List<String> selectedPublicationVenue) {
         this.selectedPublicationVenue = selectedPublicationVenue;
     }
 
+    public List<String> getSelectedPublicationTag() {
+        return selectedPublicationTag;
+    }
+
+    public void setSelectedPublicationTag(List<String> selectedPublicationTag) {
+        this.selectedPublicationTag = selectedPublicationTag;
+    }
+
     public List<String> getCollectionOrSeriesEditorFor() {
         return collectionOrSeriesEditorFor;
     }

diff --git a/src/main/resources/defaults/directoryViews.yml b/src/main/resources/defaults/directoryViews.yml
@@ -37,6 +37,14 @@
       pageSize: 10
       collapsed: true
       hidden: false
+    - name: UN Sustainable Development Goals
+      field: selectedPublicationTag
+      type: STRING
+      sort: COUNT
+      direction: DESC
+      pageSize: 10
+      collapsed: true
+      hidden: false
   filters:
     - field: class
       value: Person
@@ -191,6 +199,14 @@
       pageSize: 10
       collapsed: true
       hidden: false
+    - name: UN Sustainable Development Goals
+      field: tags
+      type: STRING
+      sort: COUNT
+      direction: DESC
+      pageSize: 10
+      collapsed: true
+      hidden: false
   filters:
     - field: class
       value: Document

diff --git a/src/main/resources/defaults/directoryViews/research/default.html b/src/main/resources/defaults/directoryViews/research/default.html
@@ -60,7 +60,11 @@
   {{#if tags}}
   {{#each tags}}
   <span class="mr-1">
-    <span class="fa fa-tag" alt="tag icon" role="img" aria-label="tag"></span><span class="badge badge-light">{{this}}</span>
+    <a class="link" href="discovery/Publications?collection=individual&fl=type,title,bookTitle,publicationDate,publisher,authors,authors.organizations,doi,pmcid,uri,tags&facets=type,publicationDate,authors,authors.organizations,publicationVenue,publisher,keywords,tags,altmetricScore,citationCount&type.type=STRING&type.pageSize=10&type.pageNumber=1&type.sort=COUNT,DESC&publicationDate.type=DATE_YEAR&publicationDate.pageSize=10&publicationDate.pageNumber=1&publicationDate.sort=INDEX,DESC&authors.type=STRING&authors.pageSize=10&authors.pageNumber=1&authors.sort=COUNT,DESC&authors.organizations.type=STRING&authors.organizations.pageSize=10&authors.organizations.pageNumber=1&authors.organizations.sort=COUNT,DESC&publicationVenue.type=STRING&publicationVenue.pageSize=10&publicationVenue.pageNumber=1&publicationVenue.sort=COUNT,DESC&publisher.type=STRING&publisher.pageSize=10&publisher.pageNumber=1&publisher.sort=COUNT,DESC&keywords.type=STRING&keywords.pageSize=10&keywords.pageNumber=1&keywords.sort=COUNT,DESC&tags.type=STRING&tags.pageSize=10&tags.pageNumber=1&tags.sort=COUNT,DESC&altmetricScore.type=NUMBER_RANGE&altmetricScore.pageSize=10&altmetricScore.pageNumber=1&altmetricScore.sort=INDEX,DESC&altmetricScore.rangeEnd=2000&altmetricScore.rangeGap=100&citationCount.type=NUMBER_RANGE&citationCount.pageSize=10&citationCount.pageNumber=1&citationCount.sort=INDEX,DESC&citationCount.rangeEnd=20000&citationCount.rangeGap=500&class.filter=Document&class.opKey=EQUALS&tags.filter={{this}}&tags.opKey=EQUALS&filters=class,tags&boost=title,2&boost=keywords,2&boost=abstract,2&sort=score,DESC&sort=title_sort,ASC&hl=title&hl=bookTitle&size=10">
+      <span class="badge badge-light badge-goal {{toUNGoalBadge this}}">
+        {{toUNGoal this}}
+      </span>
+    </a>
   </span>
   {{/each}}
   {{/if}}
@@ -74,4 +78,66 @@
   .badge-custom {
     height: 18px;
   }
-</style>
+
+  .badge-goal {
+    vertical-align: middle;
+    border: 1px solid lightgray;
+    border-radius: 0px;
+    border-left-width: 5px;
+    border-left-style: solid;
+    padding-left: 5px;
+    height: 18px;
+  }
+
+  .badge-sdg-1 {
+    border-left-color: #E5243B;
+  }
+  .badge-sdg-2 {
+    border-left-color: #DDA63A;
+  }
+  .badge-sdg-3 {
+    border-left-color: #4C9F38;
+  }
+  .badge-sdg-4 {
+    border-left-color: #C5192D;
+  }
+  .badge-sdg-5 {
+    border-left-color: #FF3A21;
+  }
+  .badge-sdg-6 {
+    border-left-color: #26BDE2;
+  }
+  .badge-sdg-7 {
+    border-left-color: #FCC30B;
+  }
+  .badge-sdg-8 {
+    border-left-color: #A21942;
+  }
+  .badge-sdg-9 {
+    border-left-color: #FD6925;
+  }
+  .badge-sdg-10 {
+    border-left-color: #DD1367;
+  }
+  .badge-sdg-11 {
+    border-left-color: #FD9D24;
+  }
+  .badge-sdg-12 {
+    border-left-color: #BF8B2E;
+  }
+  .badge-sdg-13 {
+    border-left-color: #3F7E44;
+  }
+  .badge-sdg-14 {
+    border-left-color: #0A97D9;
+  }
+  .badge-sdg-15 {
+    border-left-color: #56C02B;
+  }
+  .badge-sdg-16 {
+    border-left-color: #00689D;
+  }
+  .badge-sdg-17 {
+    border-left-color: #19486A;
+  }
+</style>
diff --git a/src/main/resources/defaults/discoveryViews.yml b/src/main/resources/defaults/discoveryViews.yml
@@ -42,6 +42,14 @@
       pageSize: 10
       collapsed: true
       hidden: false
+    - name: UN Sustainable Development Goals
+      field: selectedPublicationTag
+      type: STRING
+      sort: COUNT
+      direction: DESC
+      pageSize: 10
+      collapsed: true
+      hidden: false
     - name: Published In
       field: selectedPublicationVenue
       type: STRING
@@ -260,7 +268,7 @@
       pageSize: 10
       collapsed: true
       hidden: false
-    - name: Research Tag
+    - name: UN Sustainable Development Goals
       field: tags
       type: STRING
       sort: COUNT

diff --git a/src/main/resources/defaults/discoveryViews/publications/default.html b/src/main/resources/defaults/discoveryViews/publications/default.html
@@ -66,7 +66,11 @@
   {{#if tags}}
   {{#each tags}}
   <span class="mr-1">
-    <span class="fa fa-tag" alt="tag icon" role="img" aria-label="tag"></span><span class="badge badge-light">{{this}}</span>
+    <a class="link" href="discovery/Publications?collection=individual&fl=type,title,bookTitle,publicationDate,publisher,authors,authors.organizations,doi,pmcid,uri,tags&facets=type,publicationDate,authors,authors.organizations,publicationVenue,publisher,keywords,tags,altmetricScore,citationCount&type.type=STRING&type.pageSize=10&type.pageNumber=1&type.sort=COUNT,DESC&publicationDate.type=DATE_YEAR&publicationDate.pageSize=10&publicationDate.pageNumber=1&publicationDate.sort=INDEX,DESC&authors.type=STRING&authors.pageSize=10&authors.pageNumber=1&authors.sort=COUNT,DESC&authors.organizations.type=STRING&authors.organizations.pageSize=10&authors.organizations.pageNumber=1&authors.organizations.sort=COUNT,DESC&publicationVenue.type=STRING&publicationVenue.pageSize=10&publicationVenue.pageNumber=1&publicationVenue.sort=COUNT,DESC&publisher.type=STRING&publisher.pageSize=10&publisher.pageNumber=1&publisher.sort=COUNT,DESC&keywords.type=STRING&keywords.pageSize=10&keywords.pageNumber=1&keywords.sort=COUNT,DESC&tags.type=STRING&tags.pageSize=10&tags.pageNumber=1&tags.sort=COUNT,DESC&altmetricScore.type=NUMBER_RANGE&altmetricScore.pageSize=10&altmetricScore.pageNumber=1&altmetricScore.sort=INDEX,DESC&altmetricScore.rangeEnd=2000&altmetricScore.rangeGap=100&citationCount.type=NUMBER_RANGE&citationCount.pageSize=10&citationCount.pageNumber=1&citationCount.sort=INDEX,DESC&citationCount.rangeEnd=20000&citationCount.rangeGap=500&class.filter=Document&class.opKey=EQUALS&tags.filter={{this}}&tags.opKey=EQUALS&filters=class,tags&boost=title,2&boost=keywords,2&boost=abstract,2&sort=score,DESC&sort=title_sort,ASC&hl=title&hl=bookTitle&size=10">
+      <span class="badge badge-light badge-goal {{toUNGoalBadge this}}">
+        {{toUNGoal this}}
+      </span>
+    </a>
   </span>
   {{/each}}
   {{/if}}
@@ -85,4 +89,66 @@
   .badge-custom {
     height: 18px;
   }
-</style>
+
+  .badge-goal {
+    vertical-align: middle;
+    border: 1px solid lightgray;
+    border-radius: 0px;
+    border-left-width: 5px;
+    border-left-style: solid;
+    padding-left: 5px;
+    height: 18px;
+  }
+
+  .badge-sdg-1 {
+    border-left-color: #E5243B;
+  }
+  .badge-sdg-2 {
+    border-left-color: #DDA63A;
+  }
+  .badge-sdg-3 {
+    border-left-color: #4C9F38;
+  }
+  .badge-sdg-4 {
+    border-left-color: #C5192D;
+  }
+  .badge-sdg-5 {
+    border-left-color: #FF3A21;
+  }
+  .badge-sdg-6 {
+    border-left-color: #26BDE2;
+  }
+  .badge-sdg-7 {
+    border-left-color: #FCC30B;
+  }
+  .badge-sdg-8 {
+    border-left-color: #A21942;
+  }
+  .badge-sdg-9 {
+    border-left-color: #FD6925;
+  }
+  .badge-sdg-10 {
+    border-left-color: #DD1367;
+  }
+  .badge-sdg-11 {
+    border-left-color: #FD9D24;
+  }
+  .badge-sdg-12 {
+    border-left-color: #BF8B2E;
+  }
+  .badge-sdg-13 {
+    border-left-color: #3F7E44;
+  }
+  .badge-sdg-14 {
+    border-left-color: #0A97D9;
+  }
+  .badge-sdg-15 {
+    border-left-color: #56C02B;
+  }
+  .badge-sdg-16 {
+    border-left-color: #00689D;
+  }
+  .badge-sdg-17 {
+    border-left-color: #19486A;
+  }
+</style>