Full text: update query, show note

src/client/components/facet_results/ReactVirtualizedTable.js

@@ -68,7 +68,7 @@ class MuiVirtualizedTable extends React.PureComponent {
 
   cellRenderer = ({ cellData, columnIndex }) => {
     const { columns /* classes, rowHeight, onRowClick */ } = this.props
-    const { id, valueType, makeLink, externalLink, sortValues, numberedList, minWidth } = columns[columnIndex]
+    const { id, valueType, makeLink, externalLink, sortValues, numberedList, minWidth, collapsedMaxWords } = columns[columnIndex]
     return (
       <ResultTableCell
         columnId={id}
@@ -80,7 +80,8 @@ class MuiVirtualizedTable extends React.PureComponent {
         sortValues={sortValues}
         minWidth={minWidth}
         container='div'
-        expanded
+        expanded={false}
+        collapsedMaxWords={collapsedMaxWords}
       />
     )
   };
@@ -189,7 +190,7 @@ const rootStyle = {
 }
 
 const tableContainer = {
-  width: 700,
+  width: 1100,
   height: '100%',
   marginLeft: 'auto',
   marginRight: 'auto'

src/client/reducers/sampo/fullTextSearch.js

@@ -23,12 +23,22 @@ export const INITIAL_STATE = {
     },
     {
       id: 'type',
-      valueType: 'string',
+      valueType: 'object',
       makeLink: false,
       externalLink: false,
       sortValues: false,
       numberedList: false,
       minWidth: 300
+    },
+    {
+      id: 'note',
+      valueType: 'string',
+      makeLink: false,
+      externalLink: false,
+      sortValues: false,
+      numberedList: false,
+      minWidth: 400,
+      collapsedMaxWords: 4
     }
   ],
   fetching: false
@@ -62,13 +72,15 @@ const fullTextSearch = (state = INITIAL_STATE, action) => {
           sortBy = action.sortBy
           sortDirection = 'asc'
         }
+        const sortByProperty = state.properties.find(property => property.id === sortBy)
+        const sortByPath = sortByProperty.valueType === 'object' ? `${sortBy}.prefLabel` : sortBy
         return {
           ...state,
           sortBy,
           sortDirection,
           results: orderBy(
             state.results,
-            sortBy === 'prefLabel' ? 'prefLabel.prefLabel' : sortBy,
+            sortByPath,
             sortDirection
           )
         }

src/client/translations/sampo/localeEN.js

@@ -677,10 +677,14 @@ export default {
           label: 'Type',
           description: ''
         },
-        source: {
-          label: 'Source',
+        note: {
+          label: 'Note',
           description: ''
         }
+        // source: {
+        //   label: 'Source',
+        //   description: ''
+        // }
       }
     },
     manuscripts: {

src/server/sparql/JenaQuery.js

@@ -18,7 +18,7 @@ export const queryJenaIndex = async ({
     endpoint = backendSearchConfig[config.perspectiveID].endpoint
   }
   const { properties } = config
-  q = q.replace('<QUERY>', `?id text:query ('${queryTerm.toLowerCase()}' 2000) .`)
+  q = q.replace('<QUERY>', `(?id ?score) text:query ('${queryTerm.toLowerCase()}' 2000) .`)
   q = q.replace('<RESULT_SET_PROPERTIES>', properties)
   const results = await runSelectQuery({
     query: endpoint.prefixes + q,

src/server/sparql/SparqlQueriesGeneral.js

@@ -24,13 +24,11 @@ export const jenaQuery = `
 `
 
 export const fullTextQuery = `
-  SELECT ?id ?prefLabel__id ?prefLabel__prefLabel ?prefLabel__dataProviderUrl 
-  (SAMPLE(?type_) as ?type) 
+  SELECT *
   WHERE {
     <QUERY>
     <RESULT_SET_PROPERTIES>
   }
-  GROUP BY ?id ?prefLabel__id ?prefLabel__prefLabel ?prefLabel__dataProviderUrl
 `
 
 export const facetResultSetQuery = `

src/server/sparql/sampo/sparql_queries/SparqlQueriesFullText.js

 export const fullTextSearchProperties = `
   {
-    VALUES ?type_uri {
+    VALUES ?type__id {
       frbroo:F4_Manifestation_Singleton 
       frbroo:F1_Work
       frbroo:F2_Expression
@@ -16,8 +16,12 @@ export const fullTextSearchProperties = `
       crm:E53_Place
       crm:E78_Collection
     }
-    ?id a ?type_uri .
-    ?type_uri skos:prefLabel|rdfs:label ?type_ . 
+    ?id a ?type__id .
+    ?type__id skos:prefLabel|rdfs:label ?type__prefLabel . 
+  }
+  UNION
+  {
+    ?id crm:P3_has_note ?note . # crm:P3_has_note has been added to text index
   }
   UNION
   {