allow to display SPARQL queries next to resources

ali1k · Feb 8, 2017 · 27bc888 · 27bc888
1 parent 86f99ef
commit 27bc888
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 25 deletions.
diff --git a/components/dataset/Dataset.js b/components/dataset/Dataset.js
@@ -56,12 +56,21 @@ class Dataset extends React.Component {
         return (
             <div className="ui page grid" ref="dataset">
                 <div className="ui column">
-                    <div className="ui segment top attached">
-                        <h3>{this.props.total ? <a target="_blank" href={'/export/NTriples/' + encodeURIComponent(this.props.datasetURI)}><span className="ui big blue circular label">{this.state.searchMode ? this.addCommas(this.props.resources.length) + '/' :''}{this.addCommas(this.props.total)}</span></a> : ''} Resources of type {typeSt} in {datasetTitle ? datasetTitle : ' all local datasets'}</h3>
-                        <ResourceList enableAuthentication={this.props.enableAuthentication} resources={this.props.resources} datasetURI={this.props.datasetURI} isBig={true} config={this.props.config} onCloneResource={this.props.onCloneResource}/>
-                    </div>
-                    <div className= "ui secondary segment bottom attached">
-                        <ResourceListPager onSearchMode={this.handleSearchMode.bind(this)} datasetURI={this.props.datasetURI} visibleResourcesTotal={this.props.resources.length} total={this.props.total} threshold={10} currentPage={this.props.page} maxNumberOfResourcesOnPage={this.props.config.maxNumberOfResourcesOnPage}/>
+                    <h3 className="ui header">
+                        {this.props.total ? <a target="_blank" href={'/export/NTriples/' + encodeURIComponent(this.props.datasetURI)}><span className="ui big blue circular label">{this.state.searchMode ? this.addCommas(this.props.resources.length) + '/' :''}{this.addCommas(this.props.total)}</span></a> : ''} Resources of type {typeSt} in {datasetTitle ? datasetTitle : ' all local datasets'}
+                    </h3>
+                    <div className="ui segments">
+                        <div className="ui segment">
+                            <ResourceList enableAuthentication={this.props.enableAuthentication} resources={this.props.resources} datasetURI={this.props.datasetURI} isBig={true} config={this.props.config} onCloneResource={this.props.onCloneResource}/>
+                        </div>
+                        <div className="ui secondary segment">
+                            <ResourceListPager onSearchMode={this.handleSearchMode.bind(this)} datasetURI={this.props.datasetURI} visibleResourcesTotal={this.props.resources.length} total={this.props.total} threshold={10} currentPage={this.props.page} maxNumberOfResourcesOnPage={this.props.config.maxNumberOfResourcesOnPage}/>
+                        </div>
+                        {this.props.config && this.props.config.displayQueries ?
+                            <div className= "ui tertiary segment">
+                                {this.props.resourceQuery}
+                           </div>
+                        : ''}
                     </div>
                     <div className= "ui bottom attached">
                         {createResourceDIV}

diff --git a/components/dataset/FacetedBrowser.js b/components/dataset/FacetedBrowser.js
@@ -277,11 +277,18 @@ class FacetedBrowser extends React.Component {
                                 <h3 className="ui header">
                                     {this.props.FacetedBrowserStore.total ? <a target="_blank" href={'/export/NTriples/' + encodeURIComponent(this.props.FacetedBrowserStore.datasetURI)}><span className="ui blue circular label">{this.state.searchMode ? this.addCommas(this.props.FacetedBrowserStore.resources.length) + '/' :''}{this.addCommas(this.props.FacetedBrowserStore.total)}</span></a> : ''} Resources {typeSt ? <span>of type{typeSt}</span>: ''} from {datasetTitle}
                                  </h3>
-                                <div className="ui segment top attached">
-                                    <ResourceList resources={this.props.FacetedBrowserStore.resources} datasetURI={this.props.FacetedBrowserStore.datasetURI} OpenInNewTab={true} isBig={!showFactes} config={dcnf}/>
-                                </div>
-                                 <div className= "ui secondary segment bottom attached">
-                                     <ResourceListPager onSearchMode={this.handleSearchMode.bind(this)} visibleResourcesTotal={this.props.FacetedBrowserStore.resources.length} selection={{prevSelection: this.state.selection}} onExpandCollapse={this.toggleResourceCol.bind(this)} handleClick={this.gotoPage.bind(this)} datasetURI={this.props.FacetedBrowserStore.datasetURI} total={this.props.FacetedBrowserStore.total} threshold={pagerSize} currentPage={this.props.FacetedBrowserStore.page} maxNumberOfResourcesOnPage={dcnf.maxNumberOfResourcesOnPage}/>
+                                <div className="ui segments">
+                                    <div className="ui segment">
+                                        <ResourceList resources={this.props.FacetedBrowserStore.resources} datasetURI={this.props.FacetedBrowserStore.datasetURI} OpenInNewTab={true} isBig={!showFactes} config={dcnf}/>
+                                    </div>
+                                     <div className= "ui secondary segment ">
+                                         <ResourceListPager onSearchMode={this.handleSearchMode.bind(this)} visibleResourcesTotal={this.props.FacetedBrowserStore.resources.length} selection={{prevSelection: this.state.selection}} onExpandCollapse={this.toggleResourceCol.bind(this)} handleClick={this.gotoPage.bind(this)} datasetURI={this.props.FacetedBrowserStore.datasetURI} total={this.props.FacetedBrowserStore.total} threshold={pagerSize} currentPage={this.props.FacetedBrowserStore.page} maxNumberOfResourcesOnPage={dcnf.maxNumberOfResourcesOnPage}/>
+                                    </div>
+                                    {dcnf.displayQueries ?
+                                        <div className= "ui tertiary segment">
+                                            {this.props.FacetedBrowserStore.resourceQuery}
+                                       </div>
+                                    : ''}
                                 </div>
                               </div>;
             }

diff --git a/components/reactors/DatasetReactor.js b/components/reactors/DatasetReactor.js
@@ -40,14 +40,15 @@ class DatasetReactor extends React.Component {
         let total = this.props.DatasetStore.dataset.total;
         let isComplete = this.props.DatasetStore.isComplete;
         let config = this.props.DatasetStore.dataset.config;
+        let resourceQuery = this.props.DatasetStore.dataset.resourceQuery;
         let datasetReactor;
         if(config && config.datasetReactor){
             switch(config.datasetReactor[0]){
                 case 'Dataset':
-                    datasetReactor = <Dataset enableAuthentication={enableAuthentication} datasetURI={datasetURI} resources={resources} page={page} total={total} config={this.configMinus(config, ['datasetReactor'])} onCloneResource={this.handleCloneResource.bind(this)} onCreateResource={this.handleCreateResource.bind(this)}/>;
+                    datasetReactor = <Dataset enableAuthentication={enableAuthentication} datasetURI={datasetURI} resources={resources} page={page} total={total} config={this.configMinus(config, ['datasetReactor'])} resourceQuery={resourceQuery} onCloneResource={this.handleCloneResource.bind(this)} onCreateResource={this.handleCreateResource.bind(this)}/>;
                 break;
                 default:
-                    datasetReactor = <Dataset enableAuthentication={enableAuthentication} datasetURI={datasetURI} resources={resources} page={page} total={total} config={this.configMinus(config, ['datasetReactor'])} onCloneResource={this.handleCloneResource.bind(this)} onCreateResource={this.handleCreateResource.bind(this)}/>;
+                    datasetReactor = <Dataset enableAuthentication={enableAuthentication} datasetURI={datasetURI} resources={resources} page={page} total={total} config={this.configMinus(config, ['datasetReactor'])} resourceQuery={resourceQuery} onCloneResource={this.handleCloneResource.bind(this)} onCreateResource={this.handleCreateResource.bind(this)}/>;
             }
         }
 

diff --git a/data/autocompletes.js b/data/autocompletes.js
@@ -56,6 +56,7 @@ module.exports = {
             {title: 'ldr:allowResourceNew'},
             {title: 'ldr:allowPropertyNew'},
             {title: 'ldr:allowNewValue'},
+            {title: 'ldr:displayQueries'},
             {title: 'ldr:allowInlineConfig'},
             {title: 'ldr:allowExtension'},
             {title: 'ldr:hasBlankNode'},

diff --git a/services/dataset.js b/services/dataset.js
@@ -13,7 +13,7 @@ const outputFormat = 'application/sparql-results+json';
 const headers = {'Accept': 'application/sparql-results+json'};
 let user;
 /*-----------------------------------*/
-let endpointParameters, datasetURI, dg, graphName, query, queryObject, utilObject, configurator, propertyURI;
+let endpointParameters, datasetURI, dg, graphName, query, query2, queryObject, utilObject, configurator, propertyURI;
 queryObject = new DatasetQuery();
 utilObject = new DatasetUtil();
 configurator = new Configurator();
@@ -27,7 +27,7 @@ export default {
             //control access on authentication
             if(enableAuthentication){
                 if(!req.user){
-                    callback(null, {datasetURI: datasetURI, graphName: graphName, resources: [], page: params.page, config: rconfig});
+                    callback(null, {datasetURI: datasetURI, graphName: graphName, resources: [], page: params.page, config: rconfig, resourceQuery: ''});
                     return 0;
                 }else{
                     user = req.user;
@@ -46,20 +46,21 @@ export default {
                     let page = params.page ? params.page : 1;
                     let offset = (page - 1) * maxOnPage;
                     let searchTerm = params.searchTerm ? params.searchTerm : '';
-                    query = queryObject.getResourcesByType(endpointParameters, graphName, searchTerm,rconfig, maxOnPage, offset);
+                    query2 = queryObject.getResourcesByType(endpointParameters, graphName, searchTerm,rconfig, maxOnPage, offset);
                     //build http uri
                     //send request
-                    rp.get({uri: getHTTPGetURL(getHTTPQuery('read', query, endpointParameters, outputFormat)), headers: headers}).then(function(res){
+                    rp.get({uri: getHTTPGetURL(getHTTPQuery('read', query2, endpointParameters, outputFormat)), headers: headers}).then(function(res){
                         callback(null, {
                             datasetURI: datasetURI,
                             graphName: graphName,
                             resources: utilObject.parseResourcesByType(user, res, datasetURI),
                             page: page,
-                            config: rconfig
+                            config: rconfig,
+                            resourceQuery: query2
                         });
                     }).catch(function (err) {
                         console.log(err);
-                        callback(null, {datasetURI: datasetURI, graphName: graphName, resources: [], page: page, config: rconfig});
+                        callback(null, {datasetURI: datasetURI, graphName: graphName, resources: [], page: page, config: rconfig, resourceQuery: ''});
                     });
                 });
             });

diff --git a/services/facet.js b/services/facet.js
@@ -108,7 +108,7 @@ export default {
             //control access on authentication
             if(enableAuthentication){
                 if(!req.user){
-                    callback(null, {datasetURI: datasetURI, graphName: '', facets: {}, total: 0, page: 1});
+                    callback(null, {datasetURI: datasetURI, graphName: '', facets: {}, total: 0, page: 1, resourceQuery: ''});
                 }else{
                     user = req.user;
                 }
@@ -138,23 +138,24 @@ export default {
                     //send request
                     rp.get({uri: getHTTPGetURL(getHTTPQuery('read', query, endpointParameters, outputFormat)), headers: headers}).then(function(res){
                         let query2 = queryObject.getSecondLevelPropertyValues(endpointParameters, graphName, searchTerm, rftconfig, params.selection.prevSelection, maxOnPage, page);
-                         //console.log(query2);
+                        //console.log(query2);
                         rp.get({uri: getHTTPGetURL(getHTTPQuery('read', query2, endpointParameters, outputFormat)), headers: headers}).then(function(res2){
                             callback(null, {
                                 datasetURI: datasetURI,
                                 graphName: graphName,
                                 resourceFocusType: rftconfig.type,
                                 page: page,
                                 facets: {items: utilObject.parseSecondLevelPropertyValues(user, datasetURI, res2)},
-                                total: utilObject.parseCountResourcesByType(res)
+                                total: utilObject.parseCountResourcesByType(res),
+                                resourceQuery: query2
                             });
                         }).catch(function (err2) {
                             console.log(err2);
-                            callback(null, {datasetURI: datasetURI, graphName: graphName, facets: {}, total: 0, page: 1});
+                            callback(null, {datasetURI: datasetURI, graphName: graphName, facets: {}, total: 0, page: 1, resourceQuery: query2});
                         });
                     }).catch(function (err) {
                         console.log(err);
-                        callback(null, {datasetURI: datasetURI, graphName: graphName, facets: {}, total: 0, page: 1});
+                        callback(null, {datasetURI: datasetURI, graphName: graphName, facets: {}, total: 0, page: 1, resourceQuery: ''});
                     });
                 });
             });

diff --git a/stores/DatasetStore.js b/stores/DatasetStore.js
@@ -18,7 +18,8 @@ class DatasetStore extends BaseStore {
             resources: payload.resources,
             page: payload.page,
             config: payload.config,
-            total: this.dataset.total
+            total: this.dataset.total,
+            resourceQuery: payload.resourceQuery
         };
         this.emitChange();
     }

diff --git a/stores/FacetedBrowserStore.js b/stores/FacetedBrowserStore.js
@@ -9,6 +9,7 @@ class FacetedBrowserStore extends BaseStore {
         this.facets = {};
         this.resources = [];
         this.total = 0;
+        this.resourceQuery = '';
         this.page = 1;
         this.graphName = '';
         this.datasetURI = '';
@@ -74,6 +75,7 @@ class FacetedBrowserStore extends BaseStore {
         this.page = payload.page;
         this.graphName = payload.graphName;
         this.datasetURI = payload.datasetURI;
+        this.resourceQuery = payload.resourceQuery;
         this.emitChange();
     }
     updateMasterFacets(payload) {
@@ -105,6 +107,7 @@ class FacetedBrowserStore extends BaseStore {
             config: this.config,
             resources: this.resources,
             total: this.total,
+            resourceQuery: this.resourceQuery,
             page: this.page
         };
     }
@@ -120,6 +123,7 @@ class FacetedBrowserStore extends BaseStore {
         this.resources = state.resources;
         this.total = state.total;
         this.page = state.page;
+        this.resourceQuery = state.resourceQuery;
     }
 }