some sparql editor fixes

dbpedia · Feb 15, 2024 · e8cef0e · e8cef0e
1 parent 1f53e80
commit e8cef0e
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 44 deletions.
diff --git a/public/css/_sparql.scss b/public/css/_sparql.scss
@@ -0,0 +1,31 @@
+
+.yasqe .yasqe_buttons {
+  right: 16px !important;
+  top: 16px !important;
+}
+
+.yasqe .yasqe_buttons .yasqe_share {
+  display: none;
+}
+
+.yasqe .yasqe_buttons .yasqe_queryButton {
+  margin-right: .2em;
+  margin-top: .2em;
+}
+
+.error-box {
+  background-color: #ffdbdb;
+  color:#f13232;
+  border: 1px solid #f13232;
+  padding: 1em;
+  white-space: pre-line;
+  display: grid;
+}
+
+.error-box h1 {
+  font-weight: 600;
+  padding: 0;
+  margin: 0;
+  margin-bottom: 1em;
+  font-size: 1em;
+}
diff --git a/public/css/website.css b/public/css/website.css
@@ -10619,7 +10619,7 @@ template {
 }
 .databus-navbar .databus-navbar-item.link {
   cursor: pointer;
-  color: #d5d5d5;
+  color: #c4c4c4;
   padding: 0em 0.75em;
 }
 .databus-navbar .databus-navbar-item.link:hover {
@@ -10885,6 +10885,37 @@ template {
   background-size: 150px;
 }
 
+.yasqe .yasqe_buttons {
+  right: 16px !important;
+  top: 16px !important;
+}
+
+.yasqe .yasqe_buttons .yasqe_share {
+  display: none;
+}
+
+.yasqe .yasqe_buttons .yasqe_queryButton {
+  margin-right: 0.2em;
+  margin-top: 0.2em;
+}
+
+.error-box {
+  background-color: #ffdbdb;
+  color: #f13232;
+  border: 1px solid #f13232;
+  padding: 1em;
+  white-space: pre-line;
+  display: grid;
+}
+
+.error-box h1 {
+  font-weight: 600;
+  padding: 0;
+  margin: 0;
+  margin-bottom: 1em;
+  font-size: 1em;
+}
+
 * {
   margin: 0px;
   padding: 0px;
@@ -11119,15 +11150,6 @@ body.has-navbar-fixed-top {
   fill: rgb(200, 200, 200);
 }
 
-.yasqe .yasqe_buttons .yasqe_share {
-  display: none;
-}
-
-.yasqe .yasqe_buttons .yasqe_queryButton {
-  margin-right: 0.2em;
-  margin-top: 0.2em;
-}
-
 .editable-collection-element {
   margin: 0 !important;
 }

diff --git a/public/css/website.scss b/public/css/website.scss
@@ -23,6 +23,7 @@
 @import 'normalize';
 @import 'nav';
 @import 'frontpage';
+@import 'sparql';
 
 * {
   margin: 0px;
@@ -273,14 +274,6 @@ body.has-navbar-fixed-top {
   fill: rgba(200, 200, 200, 1);
 }
 
-.yasqe .yasqe_buttons .yasqe_share {
-  display: none;
-}
-
-.yasqe .yasqe_buttons .yasqe_queryButton {
-  margin-right: .2em;
-  margin-top: .2em;
-}
 
 .editable-collection-element {
   margin: 0 !important;

diff --git a/public/dist/main.js b/public/dist/main.js
diff --git a/public/js/page-controller/sparql-editor-controller.js b/public/js/page-controller/sparql-editor-controller.js
@@ -255,16 +255,24 @@ ORDER BY DESC (STR(?v)) LIMIT 1`
 
     var queryPage = $scope.queryData.pages[$scope.queryData.activeTab];
 
-    var res = await $http.post(queryPage.endpoint, { query: queryPage.query });
+    try {
+
+      var res = await $http.post(queryPage.endpoint, { query: queryPage.query });
 
-    if ($scope.resultCache == null) {
-      $scope.resultCache = {};
-    }
+      if ($scope.resultCache == null) {
+        $scope.resultCache = {};
+      }
 
-    $scope.resultCache[queryPage.name] = res.data;
-    $scope.saveResultCache();
+      $scope.resultCache[queryPage.name] = res.data;
+      $scope.saveResultCache();
+
+      delete queryPage.err;
+      $scope.editor.result = res.data;
+    } catch(err) {
+      console.log(err);
+      queryPage.err = err;
+    }
 
-    $scope.editor.result = res.data;
     $scope.$apply();
   }