Fix getting entity/class/property by id that has special characters s…

…uch as /

CHANGELOG.md

@@ -9,6 +9,10 @@
 - Users can export the linked entities
 - Importing a dataset, if the readable labels are not available for nodes/edges in the semantic descriptions, users can generate a default one via `add-missing-readable-label` flag.
 
+### Fixed
+
+- Fix getting entity/class/property by id that has special characters such as /
+
 ## [4.1.0] - 2024-04-13
 
 ### Added

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "web-sand"
-version = "4.1.0"
+version = "4.1.1"
 description = "UI for browsing/editing semantic descriptions"
 authors = ["Binh Vu <[email protected]>"]
 repository = "https://github.com/usc-isi-i2/sand"
@@ -21,7 +21,7 @@ peewee = "^3.15.2"
 Flask = "^2.2.2"
 python-dotenv = ">= 0.19.0, < 0.20.0"
 tornado = "^6.2"
-gena = "^1.6.4"
+gena = "^1.7.0"
 loguru = "^0.7.0"
 orjson = ">= 3.9.0, < 4.0.0"
 drepr = "^2.10.0"

sand/app.py

@@ -3,6 +3,7 @@
 from dependency_injector.wiring import Provide, inject
 from flask import jsonify
 from gena import generate_api, generate_app, generate_readonly_api_4dict
+from sm.misc.funcs import identity_func
 from werkzeug.exceptions import HTTPException
 
 import sand.deserializer as sand_deser

sand/models/ontology.py

@@ -56,17 +56,17 @@ def readable_label(self):
 
 def semweb_default_props():
     return {
-        str(RDFS.label): OntProperty(
-            id=str(RDFS.label),
+        "rdfs:label": OntProperty(
+            id="rdfs:label",
             uri=str(RDFS.label),
             label="rdfs:label",
             aliases=[],
             datatype="string",
             description="Provides a human-readable version of a resource's name.",
             parents=[],
         ),
-        str(RDF.type): OntProperty(
-            id=str(RDF.type),
+        "rdf:type": OntProperty(
+            id="rdf:type",
             uri=str(RDF.type),
             label="rdf:type",
             aliases=[],

www/package.json

@@ -29,7 +29,7 @@
     "antd": "^4.19.5",
     "axios": "^0.21.4",
     "fuse.js": "^6.4.6",
-    "gena-app": "^3.0.1",
+    "gena-app": "^4.2.0",
     "hyphenation.en-us": "^0.2.1",
     "lodash": "^4.17.21",
     "memoize-one": "^5.2.1",

www/src/models/entity/EntityStore.ts

@@ -48,4 +48,12 @@ export class EntityStore extends RStore<string, Entity> {
       record.properties
     );
   }
+
+  protected createFetchByIdRequest(id: string): Promise<any> {
+    return axios.get(`${this.remoteURL}/find_by_id`, {
+      params: {
+        id,
+      },
+    });
+  }
 }

www/src/models/ontology/ClassStore.ts

@@ -89,4 +89,12 @@ export class ClassStore extends RStore<string, Class> {
     record.ancestors = new Set(record.ancestors);
     return record;
   }
+
+  protected createFetchByIdRequest(id: string): Promise<any> {
+    return axios.get(`${this.remoteURL}/find_by_id`, {
+      params: {
+        id,
+      },
+    });
+  }
 }

www/src/models/ontology/PropertyStore.ts

@@ -89,4 +89,12 @@ export class PropertyStore extends RStore<string, Property> {
       new Set(record.ancestors)
     );
   }
+
+  protected createFetchByIdRequest(id: string): Promise<any> {
+    return axios.get(`${this.remoteURL}/find_by_id`, {
+      params: {
+        id,
+      },
+    });
+  }
 }