change recent collections sort to use expanded datePublished field (req. new index) #406

services/fin/models/collection/schema.json

@@ -32,7 +32,12 @@
         }
       }
     },
-
+
+    "@graph.datePublished" : {
+      "type" : "date",
+      "format": "yyyy-MM-dd||yyyy-MM||yyyy"
+    },
+
     "@graph.yearPublished" : {
       "type" : "integer"
     },

services/fin/ucd-lib-client/client/public/elements/utils/app-browse-by.js

@@ -300,10 +300,7 @@ export default class AppBrowseBy extends Mixin(LitElement)
     if( sortBy.label === 'A-Z' ) {
       sort = {"name" : "asc"};
     } else if( sortBy.label === 'Recent' ) {
-      sort = [
-          {'@graph.yearPublished': {order : "desc" }},
-          {'@graph.lastModified': {order : "desc" }}
-        ];
+      sort = config.elasticSearch.textFields.recentCollectionSortBy;
     } else {
       sort = {"@graph.itemCount" : "desc"};
     }

services/fin/ucd-lib-client/client/public/lib/config.js

@@ -51,9 +51,16 @@ config.elasticSearch = {
   // and update the overlay .env vars with the current working set of fields, until reindexing is done
   textFields : {
     record : APP_CONFIG.itemTextFields.split(',').map(f => f.trim()),
-    collection : APP_CONFIG.collectionTextFields.split(',').map(f => f.trim())
+    collection : APP_CONFIG.collectionTextFields.split(',').map(f => f.trim()),
+    recentCollectionSortBy : APP_CONFIG.recentCollectionsSortByFields.split(',').map(f => {
+      let parts = f.trim().split(':');
+      return {
+        [parts[0]]: { order: parts[1] || 'desc' }
+      };
+    })
   },
 
+
   // max number of facets filter options
   maxFacetCount : 50
 }

services/fin/ucd-lib-client/client/public/lib/models/CollectionModel.js

@@ -5,6 +5,8 @@ const CollectionService = require('../services/CollectionService');
 const RecordStore = require('../stores/RecordStore');
 const AppStateModel = require('./AppStateModel');
 
+const config = require('../config');
+
 const {getLogger} = require('@ucd-lib/cork-app-utils');
 
 class CollectionModel extends BaseModel {
@@ -110,10 +112,7 @@ class CollectionModel extends BaseModel {
       // TODO: change to 'uploadDate'
       let searchDocument = {
         limit,
-        sort: [
-          {'@graph.yearPublished': {order : "desc" }},
-          {'@graph.lastModified': {order : "desc" }}
-        ]
+        sort: config.elasticSearch.textFields.recentCollectionSortBy
       };
       // searchDocument = {limit: 3};
       return this.search(searchDocument);

services/fin/ucd-lib-client/client/public/lib/services/CollectionService.js

@@ -81,6 +81,8 @@ class CollectionService extends BaseService {
 
     searchDocument.textFields = config.elasticSearch.textFields.collection;
     searchDocument.limit = 1000;
+
+    searchDocument['simple_query_string'] = true;
 
     let id = await digest(searchDocument);
 

services/fin/ucd-lib-client/config.js

@@ -31,6 +31,10 @@ config.client = {
   itemTextFields : process.env.ITEM_TEXT_FIELDS || '@graph.text_search_description, name.punctuation_insensitive, name.stem, @graph.identifier, @graph.about, @graph.keywords, @graph.indexableContent',
   collectionTextFields : process.env.COLLECTION_TEXT_FIELDS || '@graph.name.stem, @graph.description.stem, @graph.about.stem, @graph.keywords.stem',
 
+  // similar as textFields above, but for recent collections sorting on the home page and browse page
+  // field:sortOrder, comma-separated
+  recentCollectionsSortByFields : process.env.RECENT_COLLECTIONS_SORTBY_FIELDS || '@graph.datePublished:desc',
+
   env : {
     CLIENT_ENV : env,
     FIN_APP_VERSION : process.env.FIN_APP_VERSION || '',

services/fin/ucd-lib-client/controllers/static.js

@@ -57,6 +57,7 @@ module.exports = async (app) => {
         featuredImages : config.client.featuredImages,
         itemTextFields : config.client.itemTextFields,
         collectionTextFields : config.client.collectionTextFields,
+        recentCollectionsSortByFields : config.client.recentCollectionsSortByFields,
         env : config.client.env,
         disableFileDownloads : config.gateway.proxy.disableFileDownloads,
         downloadMirrorUrl : config.fcrepo.dataMirror.url,