Merge pull request #351 from marklogic-community/release/release-2.0.…

…5-candidate

#349 #350

NOTICE.txt

@@ -43,7 +43,7 @@ https://github.com/quasarframework/quasar
 Made available under the MIT License. See Appendix for full text.
 https://spdx.org/licenses/MIT.html
 
-axios 0.18.1
+axios 0.21.1
 Copyright (c) 2014-present Matt Zabriskie
 https://github.com/axios/axios
 Made available under the MIT License. See Appendix for full text.

ml-backend/src/main/ml-modules/services/vppBackendServices.sjs

@@ -274,17 +274,19 @@ function getCollectionDetails () {
 function getDHFEntities () {
 
   return sem.sparql("PREFIX es: <http://marklogic.com/entity-services#>\
-    SELECT DISTINCT ?value ?label ?description WHERE {\
-      ?value a es:EntityType ;\
-             es:title ?label .\
-      OPTIONAL {\
-        ?value es:description ?description .\
-      }\
-      ?def es:definitions ?value. optional { ?def es:description ?description }\
-      FILTER NOT EXISTS {\
-        ?any es:ref ?value .\
-      }\
-    }").toArray()
+          SELECT DISTINCT ?value ?label ?description WHERE {\
+            ?value a es:EntityType ;\
+                   es:title ?label .\
+            BIND( REPLACE(?value, '/[^/]*$','') as ?ent)\
+            OPTIONAL {\
+              ?value es:description ?description\
+            }\
+            ?def es:definitions ?value. optional { ?def es:description ?description }\
+            FILTER NOT EXISTS {\
+              ?any es:ref ?value .\
+              FILTER ( strstarts(?any, ?ent))\
+            }\
+          }").toArray()
 
 }
 

package.json

@@ -13,7 +13,7 @@
     "@json-editor/json-editor": "^1.4.0-beta.0",
     "@quasar/extras": "^1.3.3",
     "autoprefixer": "^9.7.4",
-    "axios": "^0.18.1",
+    "axios": ">=0.21.1",
     "file-saver": "^2.0.2",
     "litegraph.js": "^0.7.0",
     "quasar": "^1.12.8",