add fix capability issue

Author: Francesca-Bit

index.js

@@ -3,6 +3,10 @@ module.exports = {
      * @type {typeof import('./lib/woqlClient')}
      */
     WOQLClient: require('./lib/woqlClient'),
+    /**
+     * @type {typeof import('./lib/woqlClientTools')}
+     */
+    WOQLClientTools: require('./lib/woqlClientTools'),
     /**
      * @type {typeof import('./lib/utils')}
      */

lib/connectionCapabilities.js

@@ -36,6 +36,7 @@ ConnectionCapabilities.prototype.setCapabilities = function(capabilities) {
     if (capabilities['@context']) this._load_connection_context(capabilities['@context'])
     this.user = this._extract_user_info(capabilities)
     this._extract_database_organizations() //find the organization which owns the db
+    console.log("___AFTER_SET_CAPABILITIES",this.databases[1])
     return this.user
 }
 

lib/query/woqlBuilder.js

@@ -124,6 +124,8 @@ WOQLQuery.prototype.nuke = function(g) {
  */
 
 WOQLQuery.prototype.property = function(proId, type_or_value) {
+    //get the name of the last class it used only here!!!
+    //the value is setted in add_class (woqlSchema)
     if (this._adding_class()) {
         let part = this.findLastSubject(this.cursor)
         let g = false
@@ -140,7 +142,6 @@ WOQLQuery.prototype.property = function(proId, type_or_value) {
     return this
 }
 
-
 WOQLQuery.prototype.node = function(node, type) {
     type = type || false
     if (type == 'add_quad') type = 'AddQuad'
@@ -185,7 +186,7 @@ WOQLQuery.prototype.insert_data = function(data, refGraph) {
 }
 
 /**
- * @description Creates a pattern matching rule for a quad [Subject, Predicate, Object, Graph] or for a triple [Subject, Predicate, Object] 
+ * @description Creates a pattern matching rule for a quad [Subject, Predicate, Object, Graph] or for a triple [Subject, Predicate, Object]
  * add extra information about the type of the value object
  * @param {string} subject - The IRI of a triple’s subject or a variable
  * @param {string} predicate - The IRI of a property or a variable
@@ -226,13 +227,16 @@ WOQLQuery.prototype.domain = function(d) {
     d = this.cleanClass(d)
     return this._add_partial(false, 'rdfs:domain', d)
 }
+/**
+ * @param {string} labelVar - the label variable name or string "v:Label" or "My Label"
+ * @param {string} [lang] - the label language
+ */
 
-WOQLQuery.prototype.label = function(l, lang) {
-    lang = lang ? lang : 'en'
-    if (l.substring(0, 2) == 'v:') {
-        var d = l
+WOQLQuery.prototype.label = function(labelVar, lang = 'en') {
+    if (labelVar.substring(0, 2) == 'v:') {
+        var d = labelVar
     } else {
-        var d = {'@value': l, '@type': 'xsd:string', '@language': lang}
+        var d = {'@value': labelVar, '@type': 'xsd:string', '@language': lang}
     }
     return this._add_partial(false, 'rdfs:label', d)
 }
@@ -283,6 +287,15 @@ WOQLQuery.prototype._add_partial = function(s, p, o, g) {
     s = s || ctxt.subject
     g = g || ctxt.graph
     let lastsubj = this.findLastSubject(this.cursor)
+    //if the last subject is a cardinality restriction quad
+    //I'm looking for the last property
+    if (
+        lastsubj['woql:predicate'] &&
+        lastsubj['woql:predicate']['woql:node'] &&
+        lastsubj['woql:predicate']['woql:node'].indexOf('Cardinality') > -1
+    ) {
+        lastsubj = this.findLastProperty(this.cursor)
+    }
     if (lastsubj && !s) s = lastsubj['woql:subject']
     let t = ctxt.action || lastsubj['@type']
     if (!g) {
@@ -379,70 +392,53 @@ WOQLQuery.prototype._string_matches_object = function(str, node) {
 }
 
 /**
- * 
- * @param {string} n 
+ *
+ * @param {number} cardValue
  * @param {string} which
- * @returns {WOQLQuery} 
+ * @returns {WOQLQuery}
  */
 
-WOQLQuery.prototype._card = function(n, which) {
+WOQLQuery.prototype._card = function(cardValue, which) {
     //need to generate a new id for the cardinality restriction object
     //and point it at the property in question via the onProperty function
     let ctxt = this.triple_builder_context || {}
-    let s = ctxt.subject
-    let g = ctxt.graph
+    let subject = ctxt.subject
+    let graph = ctxt.graph
     let lastsubj = this.findLastProperty(this.cursor)
-    if (lastsubj && !s) s = lastsubj['woql:subject']
-    if (typeof s == 'object') {
-        if (s['woql:node']) s = s['woql:node']
-        else return
+    if (lastsubj && !subject) subject = lastsubj['woql:subject']
+    if (typeof subject === 'object') {
+        if (subject['woql:node']) subject = subject['woql:node']
+        else return this
     }
-    if (lastsubj && !g) {
+
+    if (lastsubj && !graph) {
         const gobj = lastsubj['woql:graph_filter'] || lastsubj['woql:graph']
-        g = gobj ? gobj['@value'] : false
+        graph = gobj ? gobj['@value'] : false
+    }
+    let cardId = subject + '_' + which + '_' + cardValue
+
+    //important!! this add_quad have to stay in this position
+    //then make the domain of the property into a subclass of the restriction
+    let classDomain = this._get_object(subject, 'rdfs:domain')
+    if (classDomain) {
+        this.and(new WOQLQuery().add_quad(classDomain, 'subClassOf', cardId, graph))
     }
-    let newid = s + '_' + which + '_' + n
     this.and(
         new WOQLQuery()
-            .add_quad(newid, 'type', 'owl:Restriction', g)
-            .add_quad(newid, 'owl:onProperty', s, g),
+            .add_quad(cardId, 'type', 'owl:Restriction', graph)
+            .add_quad(cardId, 'owl:onProperty', subject, graph),
+    )
+    const cardObj = {min: 'owl:minCardinality', max: 'owl:maxCardinality'}
+    let cardType = cardObj[which] ? cardObj[which] : 'owl:Cardinality'
+
+    this.and(
+        new WOQLQuery().add_quad(
+            cardId,
+            cardType,
+            {'@value': cardValue, '@type': 'xsd:nonNegativeInteger'},
+            graph,
+        ),
     )
-    switch (which) {
-        case 'max':
-            this.and(
-                new WOQLQuery().add_quad(
-                    newid,
-                    'owl:maxCardinality',
-                    {'@value': n, '@type': 'xsd:nonNegativeInteger'},
-                    g,
-                ),
-            )
-            break
-        case 'min':
-            this.and(
-                new WOQLQuery().add_quad(
-                    newid,
-                    'owl:minCardinality',
-                    {'@value': n, '@type': 'xsd:nonNegativeInteger'},
-                    g,
-                ),
-            )
-            break
-        default:
-            this.and(
-                new WOQLQuery().add_quad(
-                    newid,
-                    'owl:cardinality',
-                    {'@value': n, '@type': 'xsd:nonNegativeInteger'},
-                    g,
-                ),
-            )
-    }
-    //then make the domain of the property into a subclass of the restriction
-    let od = this._get_object(s, 'rdfs:domain')
-    if (od) {
-        this.and(new WOQLQuery().add_quad(od, 'subClassOf', newid, g))
-    }
     return this
 }
 

lib/query/woqlCore.js

@@ -495,6 +495,7 @@ WOQLQuery.prototype.findLastSubject = function(json) {
         let ls = this.findLastSubject(json['woql:query'])
         if (ls) return ls
     }
+    //check for cardinality here
     if (json && json['woql:subject']) {
         return json
     }

lib/query/woqlLibrary.js

@@ -1165,7 +1165,7 @@ WOQLLibrary.prototype.add_multiple = function(client, parts, varlist, clause, ex
         })
         p.and(clause(item, nvarlist, extra))
     })
-    console.log("___GET_DB_INFO____",p.prettyPrint())
+    //console.log("___GET_DB_INFO____",p.prettyPrint())
     return client.query(p, commit).then(results => {
         let res = []
         if (results && results.bindings && results.bindings.length) {
@@ -1184,7 +1184,7 @@ WOQLLibrary.prototype.add_multiple = function(client, parts, varlist, clause, ex
     })
 }
 
-WOQLLibrary.prototype.asset_overview = function(using, v, with_size) {
+WOQLLibrary.prototype.asset_overview = function(using, vars, with_size) {
     let q = new WOQLQuery()
     let commits = using + '/local/_commits'
     let meta = using + '/_meta'
@@ -1209,7 +1209,7 @@ WOQLLibrary.prototype.asset_overview = function(using, v, with_size) {
         NoParent,
         created,
         dbsize,
-    ] = v
+    ] = vars
     let cs = []
     cs.push(
         new WOQLQuery()
@@ -1292,7 +1292,8 @@ WOQLLibrary.prototype.assets_overview = function(dbs, client, with_size) {
                 dbmeta.organization = dbmeta.organization.substring(1)
             let rec = res[i]
             if (rec) {
-                if (rec['branches'] && rec['branches'] != 'system:unknown') {
+                formatDBInfo(dbmeta, rec)
+               /*if (rec['branches'] && rec['branches'] != 'system:unknown') {
                     mbranches = unWindBranches(rec['branches'])
                     for (var k in mbranches) {
                         dbmeta[k] = mbranches[k]
@@ -1305,14 +1306,65 @@ WOQLLibrary.prototype.assets_overview = function(dbs, client, with_size) {
                 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'])
+                    dbmeta.prefixes = unWindPrefixes(rec['prefixes'])*/
             }
             dbmetas.push(dbmeta)
         }
 
         return dbmetas
     })
 }
+WOQLLibrary.prototype.assets_overview_result = function(using, dbInfo, client, with_size) {
+    const vars = [
+        'v:RemoteIRI',
+        'v:remote_url',
+        'v:AnyCommit',
+        'v:schema',
+        'v:prefix',
+        'v:prefix_URI',
+        'v:PrefixPairIRI',
+        'v:prefixes',
+        'v:BranchIRI',
+        'v:branch',
+        'v:BranchHeadIRI',
+        'v:branch_head',
+        'v:branch_time',
+        'v:author',
+        'v:message',
+        'v:branches',
+        'v:FirstCommitIRI',
+        'v:NoParent',
+        'v:created',
+        'v:size',
+    ]
+    const wquery = this.asset_overview(using, vars, with_size)
+
+    return client.query(wquery).then(result => {
+        //format the result data
+        if (result.bindings && result.bindings.length) {
+            return formatDBInfo(dbInfo, result.bindings[0])
+        }
+    })
+}
+
+function formatDBInfo(dbmeta, queryResult) {
+    if (queryResult['branches'] && queryResult['branches'] != 'system:unknown') {
+        const mbranches = unWindBranches(queryResult['branches'])
+        for (var k in mbranches) {
+            dbmeta[k] = mbranches[k]
+        }
+    }
+    if (queryResult['created'] && queryResult['created']['@value'])
+        dbmeta.created = queryResult['created']['@value']
+    if (queryResult['remote_url'] && queryResult['remote_url']['@value'])
+        dbmeta.remote_url = queryResult['remote_url']['@value']
+    if (queryResult['schema'] && queryResult['schema'] != 'system:unknown') dbmeta.schema = true
+    if (queryResult['size'] && queryResult['size']['@value'])
+        dbmeta.size = queryResult['size']['@value']
+    if (queryResult['prefixes'] && queryResult['prefixes'] != 'system:unknown')
+        dbmeta.prefixes = unWindPrefixes(queryResult['prefixes'])
+    return dbmeta
+}
 
 function unWindPrefixes(prefixes) {
     let prefs = []

lib/utils.js

@@ -138,7 +138,7 @@ Utils.compareIDs = function(ida, idb) {
  */
 Utils.shorten = function(url, prefixes) {
     if (!url) return undefined
-    if(typeof url == "function") return undefined
+    if (typeof url === 'function') return undefined
     prefixes = prefixes || Utils.standard_urls
     for (const pref in prefixes) {
         if (prefixes[pref] == url.substring(0, prefixes[pref].length)) {

lib/viewer/chartConfig.js

@@ -27,6 +27,9 @@ WOQLChartConfig.prototype.prettyPrint = function() {
     if (typeof this.layout() != 'undefined') {
         str += "view.layout('" + this.layout() + "')\n"
     }
+    if (typeof this.align() != 'undefined') {
+        str += "view.align('" + this.align() + "')\n"
+    }
 
     str += this.getBasicPrettyPrint()
     return str
@@ -49,6 +52,9 @@ WOQLChartConfig.prototype.json = function() {
     if (typeof this.layout() != 'undefined') {
         conf['layout'] = this.layout()
     }
+    if (typeof this.align() != 'undefined') {
+        conf['align'] = this.align()
+    }
 
     let mj = {chart: conf, rules: this.getRulesJSON()}
     return mj
@@ -75,6 +81,9 @@ WOQLChartConfig.prototype.loadJSON = function(config, rules) {
     if (typeof config.layout != 'undefined') {
         this.layout(config.layout)
     }
+    if (typeof config.align != 'undefined') {
+        this.align(config.align)
+    }
 }
 
 WOQLChartConfig.prototype.title = function(title) {
@@ -93,14 +102,22 @@ WOQLChartConfig.prototype.description = function(description) {
     return this._description
 }
 
-//layout "vertical" | "horizontal"
+//legend layout "vertical" | "horizontal"
 WOQLChartConfig.prototype.layout = function(layout) {
     if (layout) {
         this._layout = layout
         return this
     }
     return this._layout
 }
+//legend align'left', 'center', 'right'
+WOQLChartConfig.prototype.align = function(align) {
+    if (align) {
+        this._align = align
+        return this
+    }
+    return this._align
+}
 //default is { top: 10, right: 30, left: 0, bottom: 80 }
 WOQLChartConfig.prototype.margin = function(marginObj) {
     if (marginObj) {
@@ -366,7 +383,8 @@ WOQLChartRule.prototype.customColors = function(colorsObj) {
 }
 
 /*
- * @param {array} payload array of the object for descrive the legend [{value:"legend label",color:"#ff0000",type:"rect"}]
+ * @param {array} payload array of the object for descrive the legend 
+ [{value:"legend label",color:"#ff0000",type:"rect","id":'element id'}]
  */
 
 WOQLChartRule.prototype.payload = function(payloadArr) {