Merge branch 'dev' into canary

Author: rrooij

WOQL.and(

@@ -0,0 +1,39 @@
+WOQL.and(
+        WOQL.triple("v:Col", "system:collaborator_user", "doc:User_frabit"), 
+        //WOQL.triple("v:Agent", "system:agent_name", 'frabit'),
+        WOQL.triple("v:RES", "system:collaborator", "v:Col"),
+        WOQL.or(
+            WOQL.triple("v:RES", 'type', 'system:Database')
+                .triple("v:ORG", 'system:organization_database', 'v:RES')
+                .eq("v:RES", "v:DB"),
+            WOQL.triple('v:RES', 'system:organization_database', 'v:DB')
+                .eq("v:RES", "v:ORG"),
+        ),
+				WOQL.triple("v:DB", "system:database_name", "v:id")
+            .triple("v:DB", "system:status", "system:active")
+            .triple("v:ORG", "system:organization_database", "v:DB")
+            .triple("v:ORG", "system:organization_name", "v:organization")
+            .triple("v:ORG", "type", "v:orgtype")  
+            .group_by("v:RES", "v:Perm", "v:DBPerms")
+            .triple("v:Col", "system:collaborator_permission", "v:Perm"),
+        WOQL.opt().triple("v:ORG", "label", "v:organization name"),
+        WOQL.opt().triple("v:ORG", "comment", "v:organization comment"),
+        WOQL.opt().triple("v:ORG", "system:profile_icon", "v:organization icon"),
+        WOQL.opt().triple("v:DB", "label", "v:label"),
+        WOQL.opt().triple("v:DB", "comment", "v:comment"),
+        //WOQL.opt().triple("v:DB", "system:profile_icon", "v:icon"),
+        WOQL.opt().triple("v:DB", "system:public", "v:public")
+)
+
+ WOQL.and(
+       // WOQL.triple("v:Ag2", "system:agent_name", "fra-bit")
+        WOQL.triple("v:Col2", "system:collaborator_user", "doc:User_fra-bit")
+        .triple("v:ORG", "system:collaborator", "v:Col2")
+        .triple("v:ORG", "system:organization_name", "v:organization")
+            .triple("v:ORG", "type", "v:orgtype")
+            .group_by("v:Col2", "v:Perm2", "v:OrgPerms")
+            .triple("v:Col2", "system:collaborator_permission", "v:Perm2"),
+        WOQL.opt().triple("v:ORG", "label", "v:organization name"),
+        WOQL.opt().triple("v:ORG", "comment", "v:organization comment"),
+        WOQL.opt().triple("v:ORG", "system:profile_icon", "v:organization icon"),
+    )

docs/README.md

@@ -57,13 +57,11 @@ const TerminusClient = require("@terminusdb/terminusdb-client");
 
 // Connect and configure the TerminusClient
 const client = new TerminusClient.WOQLClient("https://127.0.0.1:6363/", {
-  db: "banker",
+  dbid: "banker",
   user: "admin",
   key: "root",
 });
-
-//to change the starting settings
-client.db("banker01");
+client.db("banker");
 client.organization("admin");
 
 async function postAccount() {
@@ -117,7 +115,7 @@ To initialize `TerminusDB client` with custom options use
 const TerminusClient = require("@terminusdb/terminusdb-client");
 
 const client = new TerminusClient.WOQLClient("https://127.0.0.1:6363/", {
-  id: "test_db",
+  dbid: "test_db",
   user: "admin",
   key: "my_secret_key",
 });

docs/_sidebar.md

@@ -16,8 +16,8 @@
     - [Push](api/woqlClient.js?id=push)
     - [Fetch](api/woqlClient.js?id=fetch)
     - [Insert CSV](api/woqlClient.js?id=insert-csv)
-    - [Update CSV](api/woqlClient.js?id=update-csv)
     - [Get CSV](api/woqlClient.js?id=get-csv)
+    - [Update CSV](api/woqlClient.js?id=update-csv)
     - [Delete CSV](api/woqlClient.js?id=delete-csv)
     - [copy](api/woqlClient.js?id=copy)
     - [server](api/woqlClient.js?id=server)