review

Author: Francesca-Bit

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"),
+    )

lib/query/woqlLibrary.js

@@ -1293,20 +1293,6 @@ WOQLLibrary.prototype.assets_overview = function(dbs, client, with_size) {
             let rec = res[i]
             if (rec) {
                 formatDBInfo(dbmeta, rec)
-               /*if (rec['branches'] && rec['branches'] != 'system:unknown') {
-                    mbranches = unWindBranches(rec['branches'])
-                    for (var k in mbranches) {
-                        dbmeta[k] = mbranches[k]
-                    }
-                }
-                if (rec['created'] && rec['created']['@value'])
-                    dbmeta.created = rec['created']['@value']
-                if (rec['remote_url'] && rec['remote_url']['@value'])
-                    dbmeta.remote_url = rec['remote_url']['@value']
-                if (rec['schema'] && rec['schema'] != 'system:unknown') dbmeta.schema = true
-                if (rec['size'] && rec['size']['@value']) dbmeta.size = rec['size']['@value']
-                if (rec['prefixes'] && rec['prefixes'] != 'system:unknown')
-                    dbmeta.prefixes = unWindPrefixes(rec['prefixes'])*/
             }
             dbmetas.push(dbmeta)
         }