From a8dff3413948a4def563bdb417156f402068b8f8 Mon Sep 17 00:00:00 2001 From: andy Date: Sun, 15 Jul 2018 22:55:09 +0100 Subject: [PATCH] query-a --- src/vue-poc/api.xqm | 16 +- src/vue-poc/app.vue | 3 +- src/vue-poc/core.js | 2 + src/vue-poc/features/about.vue | 7 +- src/vue-poc/features/eval/eval.xqm | 4 +- src/vue-poc/features/form/formschema.vue | 2 +- .../images/tasks/pics-02-store-meta.xq | 2 +- .../images/tasks/pics-04-store-thumbs.xq | 4 +- src/vue-poc/features/model/entity.vue | 9 +- src/vue-poc/features/model/namespace.vue | 10 +- src/vue-poc/features/model/rxq-entity.xqm | 17 +++ src/vue-poc/features/ping/ping.xqm | 2 +- src/vue-poc/features/session.vue | 44 +++--- .../features/tasks/model.build/rxq-model.xqm | 2 +- src/vue-poc/features/tasks/task/task.xqm | 2 +- .../tasks/vue-compile/rxq-vue-compile.xqm | 2 +- .../features/tasks/xqdoc/rxq-xqdoc.xqm | 38 +++-- src/vue-poc/features/tasks/xqdoc/tx-xqdoc.xq | 35 +++++ src/vue-poc/features/tasks/xqdoc/xqdoc.vue | 2 +- src/vue-poc/features/validate/rq-validate.xqm | 32 ++-- src/vue-poc/features/validate/tx-validate.xq | 22 +++ src/vue-poc/features/validate/validate.vue | 73 ++++++--- src/vue-poc/layout.xq | 64 -------- src/vue-poc/lib/cons.xqm | 2 +- src/vue-poc/lib/dice.xqm | 43 +++--- src/vue-poc/lib/query-a.xqm | 53 +++++++ .../{features/validate => lib}/validate.xqm | 0 src/vue-poc/models.gen.xqm | 2 +- src/vue-poc/models/entities/adminlog.xml | 2 +- src/vue-poc/models/schemas/pipeline.rnc | 51 +++++++ src/vue-poc/static/app-gen.js | 138 +++++++++++------- src/vue-poc/static/app.html | 2 +- 32 files changed, 428 insertions(+), 259 deletions(-) create mode 100644 src/vue-poc/features/tasks/xqdoc/tx-xqdoc.xq create mode 100644 src/vue-poc/features/validate/tx-validate.xq delete mode 100644 src/vue-poc/layout.xq create mode 100644 src/vue-poc/lib/query-a.xqm rename src/vue-poc/{features/validate => lib}/validate.xqm (100%) create mode 100644 src/vue-poc/models/schemas/pipeline.rnc diff --git a/src/vue-poc/api.xqm b/src/vue-poc/api.xqm index cb877d7..753c0b8 100644 --- a/src/vue-poc/api.xqm +++ b/src/vue-poc/api.xqm @@ -50,21 +50,7 @@ function vue-api:search($q ) return dice:response($items,$entity,web:dice()) }; -(:~ - : Returns data results - :) -declare -%rest:path("/vue-poc/api/data/{$entity}") -%rest:query-param("q", "{$q}") -%rest:produces("application/json") -%output:method("json") -function vue-api:data($entity as xs:string,$q ) -{ - let $entity:=$entity:list($entity) - let $items:=$entity("data")() - - return dice:response($items,$entity,web:dice()) -}; + (:~ : Returns test list for select. diff --git a/src/vue-poc/app.vue b/src/vue-poc/app.vue index c1ebd12..e85a3fa 100644 --- a/src/vue-poc/app.vue +++ b/src/vue-poc/app.vue @@ -264,7 +264,8 @@ HTTP.get("status") .then(r=>{ console.log("status",r) - //Object.assign(Auth,r.data) + this.$auth=Object.assign(this.$auth,r.data); + console.log("AFTER: ",this.$auth); //this.$forceUpdate() }) }, diff --git a/src/vue-poc/core.js b/src/vue-poc/core.js index e840eb5..5234955 100644 --- a/src/vue-poc/core.js +++ b/src/vue-poc/core.js @@ -51,6 +51,8 @@ const axios_json={ headers: {accept: 'application/json'}}; const Auth={ user:"guest", permission:null, + session:null, + created:null, install: function(Vue){ Object.defineProperty(Vue.prototype, '$auth', { get () { return Auth } diff --git a/src/vue-poc/features/about.vue b/src/vue-poc/features/about.vue index 59dd1ea..107bcd8 100644 --- a/src/vue-poc/features/about.vue +++ b/src/vue-poc/features/about.vue @@ -32,13 +32,16 @@ diff --git a/src/vue-poc/features/eval/eval.xqm b/src/vue-poc/features/eval/eval.xqm index 82c918c..93ae47c 100644 --- a/src/vue-poc/features/eval/eval.xqm +++ b/src/vue-poc/features/eval/eval.xqm @@ -44,7 +44,7 @@ function vue-api:response($r,$query) return ( replace value of node $vue-api:id with $id, db:replace($vue-api:db,"/jobruns/" || $id || ".xml",$jobrun), - db:output($out) + update:output($out) ) }; @@ -98,7 +98,7 @@ function vue-api:invoke($path ) let $opts:=map{"base-uri":$path,"cache":true()} let $r:=jobs:eval($xq,$bindings,$opts) - return db:output( + return update:output( {$r} diff --git a/src/vue-poc/features/form/formschema.vue b/src/vue-poc/features/form/formschema.vue index 874e05b..79bb7ad 100644 --- a/src/vue-poc/features/form/formschema.vue +++ b/src/vue-poc/features/form/formschema.vue @@ -2,7 +2,7 @@