+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/js/components/better-dropdown/better-dropdown.js b/public/js/components/better-dropdown/better-dropdown.js
new file mode 100644
index 00000000..cf3ec335
--- /dev/null
+++ b/public/js/components/better-dropdown/better-dropdown.js
@@ -0,0 +1,81 @@
+
+// hinzufügen eines Controllers zum Modul
+function BetterDropdownController($scope, $timeout, $element) {
+
+
+ const ctrl = this;
+ ctrl.isActive = false;
+
+ ctrl.closeAll = function() {
+ ctrl.rootNode.isActive = false;
+ ctrl.setChildrenActiveState(ctrl.rootNode, false);
+ }
+
+ ctrl.activateNode = function(parent, node) {
+ for(var sibling of parent.children) {
+ sibling.isActive = false;
+ ctrl.setChildrenActiveState(sibling, false);
+ }
+
+ node.isActive = true;
+ }
+
+ ctrl.setChildrenActiveState = function(node, value) {
+ if(node.children == null) {
+ return;
+ }
+
+ for(var child of node.children) {
+ child.isActive = value;
+ ctrl.setChildrenActiveState(child, value);
+ }
+ }
+
+ ctrl.toggleNode = function(node) {
+ node.isActive = !node.isActive;
+
+ if(!node.isActive) {
+ ctrl.setChildrenActiveState(node, false);
+ }
+ }
+
+ ctrl.toggleDropdown = function () {
+ ctrl.isActive = !ctrl.isActive;
+ };
+ ctrl.showDropdown = function () {
+ ctrl.isActive = true;
+ };
+ ctrl.hideDropdown = function () {
+ ctrl.isActive = false;
+ };
+
+ ctrl.showNested = function (parent, node) {
+ if (node.children) {
+ ctrl.cancelShowNested();
+ ctrl.currentTimeout = $timeout(function () {
+ ctrl.activateNode(parent, node);
+ }, 200);
+ }
+ };
+
+ ctrl.cancelShowNested = function() {
+ if(ctrl.currentTimeout != null) {
+ $timeout.cancel(ctrl.currentTimeout);
+ ctrl.currentTimeout = null;
+ }
+ }
+
+ ctrl.toggleNestedDropdown = function (node) {
+ node.showChildren = !node.showChildren;
+ };
+ ctrl.selectNode = function (node) {
+ // Handle the selected node here
+ ctrl.onNodeClicked({ node : node });
+ };
+
+
+
+}
+
+
+module.exports = BetterDropdownController;
diff --git a/public/js/components/databus-icon/databus-icon.js b/public/js/components/databus-icon/databus-icon.js
index 001a403f..308d79ce 100644
--- a/public/js/components/databus-icon/databus-icon.js
+++ b/public/js/components/databus-icon/databus-icon.js
@@ -7,6 +7,8 @@ function DatabusIconController() {
ctrl.iconMap['databus'] = "m 0.76949155,0.7702454 v 5.24959 l 29.33129045,-10e-4 6.27262,8.8675006 -0.002,32.0824 4.7212,-0.002 V 0.7702354 Z m 18.43511045,8.3952603 -5.68354,0.006 7.1979,10.5484003 -0.004,27.24663 4.70393,-0.002 0.0167,-28.60108 z m -9.4730904,0.002 -8.96510005,0.002 0.004,37.7960503 16.79563045,-0.004 0.001,-26.29103 z m 13.2512904,0 5.59825,8.2188903 -0.0396,29.57614 4.70307,-0.002 0.006,-31.09587 -4.55858,-6.6940403 z";
ctrl.iconMap['add'] = "M 11 11 M 2 12 L 11 12 L 11 21 L 12 21 L 12 12 L 21 12 L 21 11 L 12 11 L 12 2 L 11 2 L 11 11 L 2 11 L 2 12";
ctrl.iconMap['remove'] = "M 11 11 M 2 12 L 21 12 L 21 11 L 2 11 L 2 12";
+ ctrl.iconMap['add-thick'] = "m11 11h-7.25c-.414 0-.75.336-.75.75s.336.75.75.75h7.25v7.25c0 .414.336.75.75.75s.75-.336.75-.75v-7.25h7.25c.414 0 .75-.336.75-.75s-.336-.75-.75-.75h-7.25v-7.25c0-.414-.336-.75-.75-.75s-.75.336-.75.75z";
+ ctrl.iconMap['close'] = "m12 10.93 5.719-5.72c.146-.146.339-.219.531-.219.404 0 .75.324.75.749 0 .193-.073.385-.219.532l-5.72 5.719 5.719 5.719c.147.147.22.339.22.531 0 .427-.349.75-.75.75-.192 0-.385-.073-.531-.219l-5.719-5.719-5.719 5.719c-.146.146-.339.219-.531.219-.401 0-.75-.323-.75-.75 0-.192.073-.384.22-.531l5.719-5.719-5.72-5.719c-.146-.147-.219-.339-.219-.532 0-.425.346-.749.75-.749.192 0 .385.073.531.219z";
ctrl.iconMap['delete'] = "M9 3h6v-1.75c0-.066-.026-.13-.073-.177-.047-.047-.111-.073-.177-.073h-5.5c-.066 0-.13.026-.177.073-.047.047-.073.111-.073.177v1.75zm11 1h-16v18c0 .552.448 1 1 1h14c.552 0 1-.448 1-1v-18zm-10 3.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v12c0 .276.224.5.5.5s.5-.224.5-.5v-12zm5 0c0-.276-.224-.5-.5-.5s-.5.224-.5.5v12c0 .276.224.5.5.5s.5-.224.5-.5v-12zm8-4.5v1h-2v18c0 1.105-.895 2-2 2h-14c-1.105 0-2-.895-2-2v-18h-2v-1h7v-2c0-.552.448-1 1-1h6c.552 0 1 .448 1 1v2h7z";
ctrl.iconMap['goto'] = "M21.883 12l-7.527 6.235.644.765 9-7.521-9-7.479-.645.764 7.529 6.236h-21.884v1h21.883z";
ctrl.iconMap['edit'] = "M8.071 21.586l-7.071 1.414 1.414-7.071 14.929-14.929 5.657 5.657-14.929 14.929zm-.493-.921l-4.243-4.243-1.06 5.303 5.303-1.06zm9.765-18.251l-13.3 13.301 4.242 4.242 13.301-13.3-4.243-4.243z";
diff --git a/public/js/components/file-browser/file-browser.html b/public/js/components/file-browser/file-browser.html
index 26e5dd53..7c19b67a 100644
--- a/public/js/components/file-browser/file-browser.html
+++ b/public/js/components/file-browser/file-browser.html
@@ -86,7 +86,7 @@
diff --git a/public/js/components/yasqe-text/yasqe-text.html b/public/js/components/yasqe-text/yasqe-text.html
index 21fe80aa..0cb67e37 100644
--- a/public/js/components/yasqe-text/yasqe-text.html
+++ b/public/js/components/yasqe-text/yasqe-text.html
@@ -1,3 +1,3 @@
diff --git a/public/js/components/yasqe-text/yasqe-text.js b/public/js/components/yasqe-text/yasqe-text.js
index 7f87b94f..5ed23c51 100644
--- a/public/js/components/yasqe-text/yasqe-text.js
+++ b/public/js/components/yasqe-text/yasqe-text.js
@@ -2,37 +2,61 @@ function YasqeTextController($scope, $element) {
var ctrl = this;
- ctrl.textField = $element.find('textarea');
+ ctrl.textField = $element.find('#custom-query');
ctrl.$scope = $scope;
- ctrl.$onInit = function() {
- ctrl.yasqe = YASQE.fromTextArea(ctrl.textField[0], {
- lineNumbers: true,
- viewportMargin: Infinity,
- readOnly: ctrl.readOnly,
- autorefresh: true
- });
+ ctrl.$onInit = function () {
- ctrl.yasqe.on('change', function() {
- ctrl.query = ctrl.yasqe.getValue();
- ctrl.valid = !ctrl.yasqe.queryValid;
+ ctrl.yasqe = new Yasqe(ctrl.textField[0], {
+ lineNumbers: true,
+ viewportMargin: Infinity,
+ readOnly: ctrl.readOnly,
+ autorefresh: true
+ });
- if(!$scope.$root.$$phase) {
- ctrl.$scope.$apply();
- }
+ if (ctrl.autoSize || !ctrl.hasSend) {
+ var styleSheet = document.createElement("style")
+ styleSheet.innerText = "";
- ctrl.onChange();
- });
+ if (ctrl.autoSize) {
+ styleSheet.innerText += ".CodeMirror { height: auto !important; } .CodeMirror-vscrollbar { display: none !important; } .resizeWrapper { display: none !important; }";
+ }
- ctrl.yasqe.setValue(ctrl.query);
+ if (!ctrl.hasSend) {
+ styleSheet.innerText += ".yasqe_buttons { display: none !important; }";
+ }
+
+ ctrl.textField[0].appendChild(styleSheet)
+ }
+
+ ctrl.yasqe.on('query', function() {
+ ctrl.onSend();
+ });
+
+ ctrl.yasqe.on('change', function () {
+ ctrl.query = ctrl.yasqe.getValue();
+ ctrl.valid = !ctrl.yasqe.queryValid;
+
+ if (!$scope.$root.$$phase) {
+ ctrl.$scope.$apply();
+ }
+
+ ctrl.onChange();
+ });
+
+ if (ctrl.query != undefined) {
+ ctrl.yasqe.setValue(ctrl.query);
+ }
}
- ctrl.$doCheck = function() {
- if(ctrl.yasqe != undefined && ctrl.yasqe.getValue() != ctrl.query) {
- ctrl.yasqe.setValue(ctrl.query)
+ ctrl.$doCheck = function () {
+ if (ctrl.yasqe != undefined && ctrl.yasqe.getValue() != ctrl.query) {
+ if (ctrl.query != undefined) {
+ ctrl.yasqe.setValue(ctrl.query);
+ }
}
- setTimeout(function() {
+ setTimeout(function () {
ctrl.yasqe.refresh();
}, 10);
diff --git a/public/js/components/yasr-view/yasr-view.html b/public/js/components/yasr-view/yasr-view.html
new file mode 100644
index 00000000..4fe4872c
--- /dev/null
+++ b/public/js/components/yasr-view/yasr-view.html
@@ -0,0 +1,94 @@
+
+
+
+
diff --git a/public/js/components/yasr-view/yasr-view.js b/public/js/components/yasr-view/yasr-view.js
new file mode 100644
index 00000000..812f19f7
--- /dev/null
+++ b/public/js/components/yasr-view/yasr-view.js
@@ -0,0 +1,72 @@
+function YasrViewController($scope, $element) {
+
+ var ctrl = this;
+
+ ctrl.textField = $element.find('#custom-query');
+ ctrl.$scope = $scope;
+
+ ctrl.$onInit = function () {
+
+
+ ctrl.yasr = new Yasr(ctrl.textField[0], {
+ //lineNumbers: true,
+ //viewportMargin: Infinity,
+ //readOnly: ctrl.readOnly,
+ //autorefresh: true
+ prefixes : {
+ rdf: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+ rdfs: 'http://www.w3.org/2000/01/rdf-schema#',
+ dct: 'http://purl.org/dc/terms/',
+ dcat: 'http://www.w3.org/ns/dcat#',
+ databus: 'https://dataid.dbpedia.org/databus#',
+ sec: 'https://w3id.org/security#',
+ cert: 'http://www.w3.org/ns/auth/cert#',
+ foaf: 'http://xmlns.com/foaf/0.1/',
+ dbo: 'http://dbpedia.org/ontology/',
+ "databus-cv": 'https://dataid.dbpedia.org/databus-cv#'
+ }
+
+ });
+
+
+
+
+ /*
+ if(ctrl.autoSize) {
+
+ var styleSheet = document.createElement("style")
+ styleSheet.innerText = ".CodeMirror { height: auto !important; } .CodeMirror-vscrollbar { display: none !important; } .resizeWrapper { display: none !important; }";
+ ctrl.textField[0].appendChild(styleSheet)
+ }
+
+ ctrl.yasr.on('change', function() {
+ ctrl.query = ctrl.yasqe.getValue();
+ ctrl.valid = !ctrl.yasqe.queryValid;
+
+ if(!$scope.$root.$$phase) {
+ ctrl.$scope.$apply();
+ }
+
+ ctrl.onChange();
+ });
+
+ ctrl.yasqe.setValue(ctrl.query);*/
+ }
+
+
+ ctrl.$doCheck = function () {
+ var dataString = JSON.stringify(ctrl.data);
+ if (ctrl.yasr != undefined && dataString != ctrl.currentDataString) {
+ ctrl.yasr.setResponse(ctrl.data)
+ ctrl.currentDataString = dataString;
+ }
+
+
+ /*
+ setTimeout(function() {
+ ctrl.yasqe.refresh();
+ }, 10);*/
+ }
+}
+
+module.exports = YasrViewController;
\ No newline at end of file
diff --git a/public/js/page-controller/sparql-editor-controller.js b/public/js/page-controller/sparql-editor-controller.js
new file mode 100644
index 00000000..c14cd051
--- /dev/null
+++ b/public/js/page-controller/sparql-editor-controller.js
@@ -0,0 +1,277 @@
+var DatabusWebappUtils = require("../utils/databus-webapp-utils");
+const SparqlExamples = require("../utils/sparql-examples");
+
+// Controller for the header section
+function SparqlEditorController($scope, $http) {
+
+
+ $scope.storageKey = `${DATABUS_RESOURCE_BASE_URL}/sparql`;
+
+ $scope.auth = data.auth;
+ $scope.authenticated = data.auth.authenticated;
+ $scope.utils = new DatabusWebappUtils($scope);
+
+
+ $scope.editor = {};
+
+
+ $scope.editor.exampleQueries = {};
+ $scope.editor.exampleQueries.label = "Databus Example Queries";
+ $scope.editor.exampleQueries.children = [];
+
+ var simpleQueries = {
+ label: "Simple Queries",
+ children : []
+ };
+
+
+ var intermediateQueries = {
+ label: "Intermediate Queries",
+ children : []
+ };
+
+
+ simpleQueries.children.push({
+ label: "Select all Databus Groups",
+ query: `PREFIX databus:
+PREFIX rdf:
+PREFIX rdfs:
+PREFIX dct:
+PREFIX dcat:
+PREFIX sec:
+PREFIX cert:
+PREFIX foaf:
+PREFIX databus-cv:
+PREFIX dbo:
+
+SELECT DISTINCT * WHERE {
+ ?s a databus:Group .
+}`
+ });
+
+ simpleQueries.children.push({
+ label: "Select all Databus Artifacts",
+ query: `PREFIX databus:
+PREFIX rdf:
+PREFIX rdfs:
+PREFIX dct:
+PREFIX dcat:
+PREFIX sec:
+PREFIX cert:
+PREFIX foaf:
+PREFIX databus-cv:
+PREFIX dbo:
+
+SELECT DISTINCT * WHERE {
+ ?s a databus:Artifact .
+}`
+ });
+
+ simpleQueries.children.push({
+ label: "Select all Databus Versions",
+ query: `PREFIX databus:
+PREFIX rdf:
+PREFIX rdfs:
+PREFIX dct:
+PREFIX dcat:
+PREFIX sec:
+PREFIX cert:
+PREFIX foaf:
+PREFIX databus-cv:
+PREFIX dbo:
+
+SELECT DISTINCT * WHERE {
+ ?s a databus:Version .
+}`
+ });
+
+ intermediateQueries.children.push({
+ label: "Latest Version of Artifact",
+ query: `PREFIX databus:
+PREFIX rdf:
+PREFIX rdfs:
+PREFIX dct:
+PREFIX dcat:
+PREFIX sec:
+PREFIX cert:
+PREFIX foaf:
+PREFIX databus-cv:
+PREFIX dbo:
+
+SELECT ?version WHERE
+{
+ GRAPH ?g
+ {
+ ?version databus:artifact .
+ ?version dct:hasVersion ?v .
+ }
+}
+ORDER BY DESC (STR(?v)) LIMIT 1`
+ });
+
+
+ $scope.editor.exampleQueries.children.push(simpleQueries);
+ $scope.editor.exampleQueries.children.push(intermediateQueries);
+
+ $scope.onExampleQueryClicked = function(node) {
+
+ if(node.query == null) {
+ return;
+ }
+
+ $scope.createQueryPage();
+
+ var queryPage = $scope.queryData.pages[$scope.queryData.activeTab];
+
+ queryPage.query = node.query;
+ $scope.saveToStorage();
+ }
+
+ $scope.goToTab = function (index) {
+ $scope.queryData.activeTab = index;
+ $scope.saveToStorage();
+
+ var queryPage = $scope.queryData.pages[$scope.queryData.activeTab];
+
+ if ($scope.resultCache != null && $scope.resultCache[queryPage.name] != null) {
+ $scope.editor.result = $scope.resultCache[queryPage.name];
+ } else {
+ $scope.editor.result = null;
+ }
+ }
+
+ $scope.saveToStorage = function () {
+ localStorage.setItem($scope.storageKey, JSON.stringify($scope.queryData));
+ }
+
+ $scope.deleteQueryPage = function ($index) {
+
+ // Delete result cache entry
+ var queryPage = $scope.queryData.pages[$scope.queryData.activeTab];
+ if ($scope.resultCache != null && $scope.resultCache[queryPage.name] != null) {
+ delete $scope.resultCache[queryPage.name];
+ $scope.saveResultCache();
+ }
+
+ $scope.queryData.pages.splice($index, 1);
+
+ if ($scope.queryData.pages.length == 0) {
+ $scope.initialize();
+ }
+ else {
+ var validTab = Math.min($scope.queryData.activeTab, $scope.queryData.pages.length - 1);
+
+ if (validTab != $scope.queryData.activeTab) {
+ $scope.goToTab(validTab);
+ }
+ }
+ }
+
+ $scope.createQueryPage = function () {
+
+ var queryName = null;
+ var queryNameIndex = 1;
+
+ // find unoccupied name
+ while (queryNameIndex < 100000) {
+
+ // Create a candidate
+ var hasName = true;
+ queryName = `Query ${queryNameIndex}`;
+
+ // Check if already in use
+ for (var queryPage of $scope.queryData.pages) {
+ if (queryPage.name == queryName) {
+ hasName = false;
+ }
+ }
+
+ // Found name, stop searching.
+ if (hasName) {
+ break;
+ }
+
+ queryNameIndex++;
+ }
+
+ $scope.queryData.pages.push({
+ name: queryName,
+ query: simpleQueries.children[0].query,
+ endpoint: defaultEndpoint
+ });
+
+ $scope.goToTab($scope.queryData.pages.length - 1);
+
+ $scope.saveToStorage();
+ }
+
+ $scope.saveResultCache = function () {
+ sessionStorage.setItem($scope.storageKey, JSON.stringify($scope.resultCache));
+ }
+
+ $scope.initialize = function () {
+ $scope.queryData = {};
+ $scope.queryData.activeTab = 0;
+ $scope.queryData.pages = [];
+ $scope.createQueryPage();
+
+ $scope.resultCache = {};
+ $scope.saveResultCache();
+ }
+
+ var defaultEndpoint = `${DATABUS_RESOURCE_BASE_URL}/sparql`;
+
+ var queryDataString = localStorage.getItem($scope.storageKey);
+ var resultCacheString = sessionStorage.getItem($scope.storageKey);
+
+
+ $scope.queryData = null;
+ $scope.resultCache = JSON.parse(resultCacheString);
+
+ try {
+ $scope.queryData = JSON.parse(queryDataString);
+
+ if ($scope.queryData == null || $scope.queryData.pages.length == 0) {
+ $scope.initialize();
+ }
+
+ var queryPage = $scope.queryData.pages[$scope.queryData.activeTab];
+
+ if ($scope.resultCache != null && $scope.resultCache[queryPage.name] != null) {
+ $scope.editor.result = $scope.resultCache[queryPage.name];
+ } else {
+ $scope.editor.result = null;
+ }
+
+ }
+ catch (e) {
+ // Could not parse query data, create new!
+ $scope.initialize();
+ }
+
+ $scope.editor.query = $scope.editor.exampleQueries[0];
+
+ $scope.send = async function () {
+
+ var queryPage = $scope.queryData.pages[$scope.queryData.activeTab];
+
+ var res = await $http.post(queryPage.endpoint, { query: queryPage.query });
+
+ if ($scope.resultCache == null) {
+ $scope.resultCache = {};
+ }
+
+ $scope.resultCache[queryPage.name] = res.data;
+ $scope.saveResultCache();
+
+ $scope.editor.result = res.data;
+ $scope.$apply();
+ }
+
+ $scope.insertExampleQuery = function (query) {
+ $scope.editor.query = query;
+ }
+
+}
+
+module.exports = SparqlEditorController;
diff --git a/public/js/utils/sparql-examples.js b/public/js/utils/sparql-examples.js
new file mode 100644
index 00000000..7f5798bd
--- /dev/null
+++ b/public/js/utils/sparql-examples.js
@@ -0,0 +1,19 @@
+/**
+ * Query Templates can be defined as object with the fields:
+ * > select
+ * > body
+ * > aggregate
+ *
+ * The select is a SPARQL select statement. The body is an array of strings with each string being a line of a
+ * SPARQL query. The string %QUERY% can be used to insert the query generated by the QueryBuilder. The aggregate
+ * is a SPARQL aggregate statement.
+ */
+class SparqlExamples {
+
+ static LIST = `PREFIX databus:
+SELECT DISTINCT * WHERE {
+ ?s a databus:Artifact .
+}`;
+}
+
+module.exports = SparqlExamples;
\ No newline at end of file
diff --git a/public/package.json b/public/package.json
index 367679e2..860a00b8 100644
--- a/public/package.json
+++ b/public/package.json
@@ -7,6 +7,8 @@
"license": "ISC",
"dependencies": {
"@iamadamjowett/angular-click-outside": "^2.10.1",
+ "@triply/yasqe": "^4.2.28",
+ "@triply/yasr": "^4.2.28",
"angular": "^1.7.8",
"angular-content-editable": "^1.2.3",
"angular-drag-and-drop-lists": "^2.1.0",
diff --git a/public/templates/account.ejs b/public/templates/account.ejs
index 4ba6362c..c7cc4021 100644
--- a/public/templates/account.ejs
+++ b/public/templates/account.ejs
@@ -231,10 +231,8 @@
diff --git a/public/templates/footer.ejs b/public/templates/footer.ejs
index 20dc7c8b..563e8884 100644
--- a/public/templates/footer.ejs
+++ b/public/templates/footer.ejs
@@ -6,7 +6,7 @@
DBpedia
-
Global and Unified Access to Knowledge Graphs
+
Global and Unified Access to Knowledge Graphs
© Copyright 2023 by DBpedia. All Rights Reserved.
Imprint |
Report Issue |
Sparql Endpoint |
Forum
diff --git a/public/templates/group.ejs b/public/templates/group.ejs
index 0c943643..5bf39412 100644
--- a/public/templates/group.ejs
+++ b/public/templates/group.ejs
@@ -185,10 +185,8 @@
diff --git a/public/templates/header.ejs b/public/templates/header.ejs
index eecb9b31..02633afd 100644
--- a/public/templates/header.ejs
+++ b/public/templates/header.ejs
@@ -23,7 +23,7 @@
-
+
@@ -96,7 +96,7 @@
Gitbook
-
+
-
+
+
+
+
+
+
+
+
+
SPARQL Editor
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%- include('footer') -%>
\ No newline at end of file
diff --git a/search/gstore-helper.js b/search/gstore-helper.js
new file mode 100644
index 00000000..26849273
--- /dev/null
+++ b/search/gstore-helper.js
@@ -0,0 +1,72 @@
+var rp = require('request-promise');
+const Constants = require('../constants');
+const DatabusMessage = require('../databus-message');
+
+var prefix = encodeURIComponent(`${process.env.DATABUS_RESOURCE_BASE_URL}/`);
+
+
+class GstoreHelper {
+
+
+
+ static async read(repo, path) {
+
+ let options = {
+ url: `${process.env.DATABUS_DATABASE_URL}/graph/read?repo=${repo}&path=${path}`,
+ headers: {
+ 'Accept': 'application/ld+json'
+ },
+ json: true
+ };
+
+ try {
+ var res = await rp.get(options);
+ return res;
+
+ } catch (err) {
+ return null;
+ }
+ }
+
+ static async save(repo, path, content) {
+
+
+ try {
+ var options = {
+ uri: `${process.env.DATABUS_DATABASE_URL}/graph/save?repo=${repo}&prefix=${prefix}&path=${path}`,
+ body: content,
+ json: true
+ };
+
+ await rp.post(options);
+
+ return { isSuccess: true };
+ } catch (err) {
+ console.log(err);
+ return { isSuccess: false };
+ }
+
+ }
+
+ static async delete(repo, path) {
+
+ try {
+
+ var uri = `${process.env.DATABUS_DATABASE_URL}/graph/delete?repo=${repo}&prefix=${prefix}&path=${path}`;
+ var res = await rp.delete(uri);
+
+ process.send({
+ id: DatabusMessage.REQUEST_SEARCH_INDEX_REBUILD
+ });
+
+ return { isSuccess: true };
+ } catch (err) {
+ console.log(err);
+ return { isSuccess: false };
+ }
+
+ }
+
+}
+
+module.exports = GstoreHelper;
\ No newline at end of file
diff --git a/server/app/api/routes/general.js b/server/app/api/routes/general.js
index 81683afa..131aed88 100644
--- a/server/app/api/routes/general.js
+++ b/server/app/api/routes/general.js
@@ -12,15 +12,29 @@ const DatabusLogger = require('../../common/databus-logger');
module.exports = function (router, protector, webdav) {
- router.get('/sparql', cors(), function (req, res) {
+ router.get('/sparql', cors(), function (req, res, next) {
+
+ var query = req.body.query;
+
+ if(query == undefined || query == "") {
+ next('route');
+ return;
+ }
+
+
var url = `${process.env.DATABUS_DATABASE_URL}${req.originalUrl.replace('/system', '')}`;
request(url).pipe(res);
});
router.post('/sparql', cors(), async function (req, res) {
- var sparqlEndpoint = `${process.env.DATABUS_DATABASE_URL}/sparql`;
+
var query = req.body.query;
+
+
+
+
+ var sparqlEndpoint = `${process.env.DATABUS_DATABASE_URL}/sparql`;
var accept = req.headers['accept']
diff --git a/server/app/pages/module.js b/server/app/pages/module.js
index 396111f8..74253279 100644
--- a/server/app/pages/module.js
+++ b/server/app/pages/module.js
@@ -166,32 +166,9 @@ module.exports = function (router, protector) {
});
- /*
- router.get('/system/pages/artifacts-by-group', protector.protect(), async function (req, res, next) {
-
- try {
- var uri = req.query.uri;
-
- if(!UriUtils.isResourceUri(uri)) {
- res.status(400).send('Not a resource uri');
- return;
- }
-
- var splits = UriUtils.splitResourceUri(uri);
-
- var result = await sparql.dataid.getArtifactsByGroup(splits[0], splits[1]);
- res.status(200).send(result);
-
- } catch (err) {
- console.log(err);
- res.status(500).send(err);
- }
- });*/
-
-
-
require('./modules/account-page')(router, protector);
require('./modules/collection-editor')(router, protector);
+ require('./modules/sparql-editor')(router, protector);
require('./modules/publish-wizard')(router, protector);
require('./modules/resource-pages')(router, protector);
diff --git a/server/app/pages/modules/collection-editor.js b/server/app/pages/modules/collection-editor.js
index 9463fc21..70f9f7e5 100644
--- a/server/app/pages/modules/collection-editor.js
+++ b/server/app/pages/modules/collection-editor.js
@@ -15,8 +15,6 @@ module.exports = function (router, protector) {
data.collections = await sparql.collections.getCollectionsByAccount(data.auth.info.accountName);
}
- console.log(data);
-
res.render('collection-editor', {
title: 'Collection Editor',
data: data
diff --git a/server/app/pages/modules/sparql-editor.js b/server/app/pages/modules/sparql-editor.js
new file mode 100644
index 00000000..58f1d357
--- /dev/null
+++ b/server/app/pages/modules/sparql-editor.js
@@ -0,0 +1,19 @@
+var sparql = require("../../common/queries/sparql");
+
+const DatabusCache = require('../../common/cache/databus-cache');
+const ServerUtils = require('../../common/utils/server-utils.js');
+
+
+module.exports = function (router, protector) {
+
+ router.get('/sparql', protector.checkSso(), async function (req, res, next) {
+
+ var data = {};
+ data.auth = ServerUtils.getAuthInfoFromRequest(req);
+
+ res.render('sparql-editor', {
+ title: 'Sparql Editor',
+ data: data
+ });
+ });
+}
\ No newline at end of file