From 0b87640f57b956d5d89424b60bfff653f02b9ab8 Mon Sep 17 00:00:00 2001
From: andy <bunce.andy@gmail.com>
Date: Sun, 22 Oct 2017 22:14:33 +0100
Subject: [PATCH] namespaces

---
 .../users.vue => components/qd-table.vue}     |  47 +++---
 src/vue-poc/components/vis-time-line.vue      |   2 +-
 src/vue-poc/data/vue-poc/namespaces.xml       |   9 ++
 src/vue-poc/features/entity.vue               |  18 +++
 src/vue-poc/features/images/images.xqm        |   2 +-
 src/vue-poc/features/namespace.vue            |  18 +++
 src/vue-poc/features/users/users.vue          |  32 ++++
 src/vue-poc/features/users/users.xqm          |  20 +++
 src/vue-poc/lib/xqdoc/parsepaths.xq           |  13 ++
 src/vue-poc/models.gen.xqm                    |  36 ++++-
 src/vue-poc/models/namespace.xml              |  24 +++
 src/vue-poc/router.js                         |   2 +
 src/vue-poc/static/app-gen.js                 | 137 ++++++++++++++----
 src/vue-poc/static/app.html                   |   8 +-
 src/vue-poc/vue-poc.vue                       |   8 +-
 15 files changed, 313 insertions(+), 63 deletions(-)
 rename src/vue-poc/{features/users.vue => components/qd-table.vue} (60%)
 create mode 100644 src/vue-poc/features/entity.vue
 create mode 100644 src/vue-poc/features/namespace.vue
 create mode 100644 src/vue-poc/features/users/users.vue
 create mode 100644 src/vue-poc/features/users/users.xqm
 create mode 100644 src/vue-poc/lib/xqdoc/parsepaths.xq
 create mode 100644 src/vue-poc/models/namespace.xml
diff --git a/src/vue-poc/features/users.vue b/src/vue-poc/components/qd-table.vue
similarity index 60%
rename from src/vue-poc/features/users.vue
rename to src/vue-poc/components/qd-table.vue
index cd35519..809b65a 100644
--- a/src/vue-poc/features/users.vue
+++ b/src/vue-poc/components/qd-table.vue
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
-<template id="users">
+<!-- card showing table -->
+<template id="qd-table">
  <v-container fluid>
   <v-card >
    <v-toolbar >
@@ -10,7 +11,8 @@
         hide-details
         v-model="search"
       ></v-text-field>   
-      <v-spacer></v-spacer>     
+      <v-spacer></v-spacer>
+      <v-btn @click="getData">Refresh</v-btn>   
     </v-toolbar>
 <v-data-table
       :headers="headers"
@@ -22,15 +24,7 @@
       no-data-text="No users found @todo"
     >
     <template slot="items" scope="props">
-    <td class="vtop">
-        <v-checkbox
-          primary
-          hide-details
-          v-model="props.selected"
-        ></v-checkbox>
-      </td>
-      <td class="vtop">{{ props.item.name }}</td>
-      <td class="vtop "><div>{{ props.item.permission }}</div>
+    <slot></slot>
     </template>
   </v-data-table>
   </v-card>
@@ -38,26 +32,34 @@
 </template>
 
 <script>{
+	  props: {
+	    headers: {
+	      default: [
+	        {
+	          text: 'Name',
+	          left: true,
+	          value: 'id'
+	        },
+	        { text: 'Permission', value: 'state' }
+	      ]
+	  },
+	  dataUri:{
+	    default: "users"
+	  }
+  },
   data:  function(){
     return {
       loading: false,
       items: [],
       search: null,
       selected: [],
-      headers: [
-        {
-          text: 'Name',
-          left: true,
-          value: 'id'
-        },
-        { text: 'Permission', value: 'state' }
-      ] 
+
       }
   },
   methods:{
-      getUsers(){
+      getData(){
         this.loading=true;
-        HTTP.get("user")
+        HTTP.get(this.dataUri)
         .then(r=>{
            this.loading=false
            this.items=r.data
@@ -65,7 +67,8 @@
      }
   },
   created:function(){
-    console.log("notfound",this.$route.query.q)
+    console.log("qd-table")
+    this.getData()
   }
 }
 </script>
diff --git a/src/vue-poc/components/vis-time-line.vue b/src/vue-poc/components/vis-time-line.vue
index 45048a1..12a695c 100644
--- a/src/vue-poc/components/vis-time-line.vue
+++ b/src/vue-poc/components/vis-time-line.vue
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- 
-for vis-time-line
+for vis-time-line http://visjs.org/docs/graph2d/
  -->
 <template id="vis-time-line">
   <div></div>
diff --git a/src/vue-poc/data/vue-poc/namespaces.xml b/src/vue-poc/data/vue-poc/namespaces.xml
index 2502838..ce6cfac 100644
--- a/src/vue-poc/data/vue-poc/namespaces.xml
+++ b/src/vue-poc/data/vue-poc/namespaces.xml
@@ -67,4 +67,13 @@
     <description>Geo 
     </description>
   </namespace>
+  
+  <namespace uri="http://www.w3.org/ns/xproc" prefix="xproc">
+    <description>XProc 
+    </description>
+  </namespace>
+   <namespace uri="http://www.w3.org/ns/xproc-step" prefix="c">
+    <description>XProc step
+    </description>
+  </namespace>
 </namespaces>
\ No newline at end of file
diff --git a/src/vue-poc/features/entity.vue b/src/vue-poc/features/entity.vue
new file mode 100644
index 0000000..5740da9
--- /dev/null
+++ b/src/vue-poc/features/entity.vue
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<template id="entity">
+ <v-container fluid>
+Entities
+ </v-container>
+</template>
+
+<script>{
+  data:  function(){
+    return {
+      message: 'bad route!'
+      }
+  },
+  created:function(){
+    console.log("notfound",this.$route.query.q)
+  }
+}
+</script>
diff --git a/src/vue-poc/features/images/images.xqm b/src/vue-poc/features/images/images.xqm
index 8d13cf4..d02c938 100644
--- a/src/vue-poc/features/images/images.xqm
+++ b/src/vue-poc/features/images/images.xqm
@@ -1,4 +1,4 @@
-(:~
+ (:~
  : vue-poc thumbnail api.
  :
  : @author Andy Bunce may-2017
diff --git a/src/vue-poc/features/namespace.vue b/src/vue-poc/features/namespace.vue
new file mode 100644
index 0000000..c890be1
--- /dev/null
+++ b/src/vue-poc/features/namespace.vue
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<template id="namespace">
+ <v-container fluid>
+namespaces
+ </v-container>
+</template>
+
+<script>{
+  data:  function(){
+    return {
+      message: 'bad route!'
+      }
+  },
+  created:function(){
+    console.log("notfound",this.$route.query.q)
+  }
+}
+</script>
diff --git a/src/vue-poc/features/users/users.vue b/src/vue-poc/features/users/users.vue
new file mode 100644
index 0000000..7d8c257
--- /dev/null
+++ b/src/vue-poc/features/users/users.vue
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<template id="users">
+ <v-container fluid>
+   <qd-table :headers="headers" data-uri="data/users">
+   </qd-table>
+ </v-container>
+
+</template>
+
+<script>{
+  data:  function(){
+    return {
+      loading: false,
+      items: [],
+      search: null,
+      selected: [],
+      headers: [
+        {
+          text: 'Name',
+          left: true,
+          value: 'id'
+        },
+        { text: 'Permissions', value: 'state' }
+      ] 
+      }
+  },
+ 
+  created:function(){
+    console.log("qd-table")
+  }
+}
+</script>
diff --git a/src/vue-poc/features/users/users.xqm b/src/vue-poc/features/users/users.xqm
new file mode 100644
index 0000000..f027d6c
--- /dev/null
+++ b/src/vue-poc/features/users/users.xqm
@@ -0,0 +1,20 @@
+module namespace d = 'quodatum.api.data';
+
+(:~
+ :  users
+ :)
+declare
+%rest:GET %rest:path("/vue-poc/api/data/users")
+%output:method("json")   
+function d:list()
+as element(json)
+{
+ let $jlist:=()
+ return <json type="array">
+ {for $j in $jlist
+ return <_ type="object">
+  {()}
+ </_>
+ }</json>
+};
+
diff --git a/src/vue-poc/lib/xqdoc/parsepaths.xq b/src/vue-poc/lib/xqdoc/parsepaths.xq
new file mode 100644
index 0000000..03574ae
--- /dev/null
+++ b/src/vue-poc/lib/xqdoc/parsepaths.xq
@@ -0,0 +1,13 @@
+declare variable $xp:=doc("C:\tmp\xqdoc\classify.xqm\xparse.xml")/*;
+
+declare function local:imports($xp as element(XQuery)) as xs:string*
+{
+  $xp/LibraryModule/Prolog/ModuleImport
+};
+declare function local:variables($xp as element(XQuery)){
+  $xp/LibraryModule/Prolog/AnnotatedDecl/VarDecl
+};
+declare function local:functions($xp as element(XQuery)){
+  $xp/LibraryModule/Prolog/AnnotatedDecl/FunctionDecl
+};
+local:functions( $xp)/string()
\ No newline at end of file
diff --git a/src/vue-poc/models.gen.xqm b/src/vue-poc/models.gen.xqm
index 7e50376..8a4af97 100644
--- a/src/vue-poc/models.gen.xqm
+++ b/src/vue-poc/models.gen.xqm
@@ -1,5 +1,5 @@
 (: entity access maps 
- : auto generated from xml files in entities folder at: 2017-10-15T22:56:50.395+01:00 
+ : auto generated from xml files in entities folder at: 2017-10-22T20:37:22.427+01:00 
  :)
 
 module namespace entity = 'quodatum.models.generated';
@@ -97,6 +97,40 @@ declare variable $entity:list:=map {
        
        "views": map{ 
        
+       }
+   },
+  "namespace": map{
+     "name": "namespace",
+     "description": "An XML namespace",
+     "access": map{ 
+       "description": function($_ as element()) as xs:string {$_/description },
+       "prefix": function($_ as element()) as xs:string {$_/@prefix },
+       "xmlns": function($_ as element()) as xs:string {$_/@uri } },
+    
+     "filter": function($item,$q) as xs:boolean{ 
+         some $e in ( $item/@uri, $item/description) satisfies
+         fn:contains($e,$q, 'http://www.w3.org/2005/xpath-functions/collation/html-ascii-case-insensitive')
+      },
+       "json":   map{ 
+           "description": function($_ as element()) as element(description)? {
+            (: xs:string :)
+                        fn:data($_/description)!element description {  .} 
+                 },
+           "prefix": function($_ as element()) as element(prefix)? {
+            (: xs:string :)
+                        fn:data($_/@prefix)!element prefix {  .} 
+                 },
+           "xmlns": function($_ as element()) as element(xmlns)? {
+            (: xs:string :)
+                        fn:data($_/@uri)!element xmlns {  .} 
+                 } },
+       
+      "data": function() as element(namespace)*
+       { collection("vuepoc")/namespaces/namespace
+	 },
+       
+       "views": map{ 
+       'filter': 'xmlns description'
        }
    },
   "query": map{
diff --git a/src/vue-poc/models/namespace.xml b/src/vue-poc/models/namespace.xml
new file mode 100644
index 0000000..cea38cb
--- /dev/null
+++ b/src/vue-poc/models/namespace.xml
@@ -0,0 +1,24 @@
+<entity name="namespace" xmlns="https://github.com/Quodatum/app-doc/entity">
+	<description>An XML namespace</description>
+	<fields>
+		<field name="xmlns" type="xs:string">
+			<description>namespace</description>
+			<xpath>@uri</xpath>
+		</field>
+		<field name="prefix" type="xs:string">
+			<description>commonly used namespace prefixes </description>
+			<xpath>@prefix</xpath>
+		</field>
+		<field name="description" type="xs:string">
+            <description>about the namespace</description>
+            <xpath>description</xpath>
+        </field>
+      
+	</fields>
+	   <views>
+        <view name="filter">xmlns description</view>
+    </views>
+	<iconclass>label</iconclass>
+	<data type="element(namespace)">collection("vuepoc")/namespaces/namespace
+	</data>
+</entity>
\ No newline at end of file
diff --git a/src/vue-poc/router.js b/src/vue-poc/router.js
index bf1ab84..e3fd327 100644
--- a/src/vue-poc/router.js
+++ b/src/vue-poc/router.js
@@ -14,6 +14,8 @@ const router = new VueRouter({
     { path: '/images/dates', component: Dates, meta:{title:"Image dates"} },
     { path: '/images/people', component: People, meta:{title:"Image people"} },
     
+    { path: '/entity', component: Entity, meta:{title:"Entities"} },
+    { path: '/namespace', component: Namespace, meta:{title:"Namespaces"} },
     { path: '/select', component: Select, meta:{title:"Select"} },
     { path: '/search', component: Search, meta:{title:"Search"} },
     { path: '/tabs', component: Tabs,meta:{title:"tab test",requiresAuth: true} },
diff --git a/src/vue-poc/static/app-gen.js b/src/vue-poc/static/app-gen.js
index bf5c89b..cd56cb5 100644
--- a/src/vue-poc/static/app-gen.js
+++ b/src/vue-poc/static/app-gen.js
@@ -1,4 +1,4 @@
-// generated 2017-10-15T22:47:08.186+01:00
+// generated 2017-10-22T22:09:51.205+01:00
 Vue.component('qd-confirm',{template:` 
   <v-dialog v-model="value">
        <v-card>
@@ -133,6 +133,64 @@
     }
 }
 
+      );
+      Vue.component('qd-table',{template:` 
+ <v-container fluid="">
+  <v-card>
+   <v-toolbar>
+    <v-text-field append-icon="search" label="Filter user" single-line="" hide-details="" v-model="search"></v-text-field>   
+      <v-spacer></v-spacer>
+      <v-btn @click="getData">Refresh</v-btn>   
+    </v-toolbar>
+<v-data-table :headers="headers" :items="items" :search="search" v-model="selected" select-all="" class="elevation-1" no-data-text="No users found @todo">
+    <template slot="items" scope="props">
+    <slot></slot>
+    </template>
+  </v-data-table>
+  </v-card>
+ </v-container>
+ `,
+      
+	  props: {
+	    headers: {
+	      default: [
+	        {
+	          text: 'Name',
+	          left: true,
+	          value: 'id'
+	        },
+	        { text: 'Permission', value: 'state' }
+	      ]
+	  },
+	  dataUri:{
+	    default: "users"
+	  }
+  },
+  data:  function(){
+    return {
+      loading: false,
+      items: [],
+      search: null,
+      selected: [],
+
+      }
+  },
+  methods:{
+      getData(){
+        this.loading=true;
+        HTTP.get(this.dataUri)
+        .then(r=>{
+           this.loading=false
+           this.items=r.data
+        })
+     }
+  },
+  created:function(){
+    console.log("qd-table")
+    this.getData()
+  }
+}
+
       );
       Vue.component('vis-time-line',{template:` 
   <div></div>
@@ -1035,6 +1093,23 @@ Vue.filter('round', function(value, decimals) {
   }
 }
 
+      );
+      const Entity=Vue.extend({template:` 
+ <v-container fluid="">
+Entities
+ </v-container>
+ `,
+      
+  data:  function(){
+    return {
+      message: 'bad route!'
+      }
+  },
+  created:function(){
+    console.log("notfound",this.$route.query.q)
+  }
+}
+
       );
       const Eval=Vue.extend({template:` 
  <v-container fluid="">
@@ -2024,6 +2099,23 @@ people
   }
 }
 
+      );
+      const Namespace=Vue.extend({template:` 
+ <v-container fluid="">
+namespaces
+ </v-container>
+ `,
+      
+  data:  function(){
+    return {
+      message: 'bad route!'
+      }
+  },
+  created:function(){
+    console.log("notfound",this.$route.query.q)
+  }
+}
+
       );
       const Ping=Vue.extend({template:` 
  <v-container fluid="">
@@ -3159,22 +3251,10 @@ created(){
       );
       const Users=Vue.extend({template:` 
  <v-container fluid="">
-  <v-card>
-   <v-toolbar>
-    <v-text-field append-icon="search" label="Filter user" single-line="" hide-details="" v-model="search"></v-text-field>   
-      <v-spacer></v-spacer>     
-    </v-toolbar>
-<v-data-table :headers="headers" :items="items" :search="search" v-model="selected" select-all="" class="elevation-1" no-data-text="No users found @todo">
-    <template slot="items" scope="props">
-    <td class="vtop">
-        <v-checkbox primary="" hide-details="" v-model="props.selected"></v-checkbox>
-      </td>
-      <td class="vtop">{{ props.item.name }}</td>
-      <td class="vtop "><div>{{ props.item.permission }}</div>
-    </td></template>
-  </v-data-table>
-  </v-card>
+   <qd-table :headers="headers" data-uri="data/users">
+   </qd-table>
  </v-container>
+
  `,
       
   data:  function(){
@@ -3189,22 +3269,13 @@ created(){
           left: true,
           value: 'id'
         },
-        { text: 'Permission', value: 'state' }
+        { text: 'Permissions', value: 'state' }
       ] 
       }
   },
-  methods:{
-      getUsers(){
-        this.loading=true;
-        HTTP.get("user")
-        .then(r=>{
-           this.loading=false
-           this.items=r.data
-        })
-     }
-  },
+ 
   created:function(){
-    console.log("notfound",this.$route.query.q)
+    console.log("qd-table")
   }
 }
 
@@ -3420,6 +3491,8 @@ created(){
     { path: '/images/dates', component: Dates, meta:{title:"Image dates"} },
     { path: '/images/people', component: People, meta:{title:"Image people"} },
     
+    { path: '/entity', component: Entity, meta:{title:"Entities"} },
+    { path: '/namespace', component: Namespace, meta:{title:"Namespaces"} },
     { path: '/select', component: Select, meta:{title:"Select"} },
     { path: '/search', component: Search, meta:{title:"Search"} },
     { path: '/tabs', component: Tabs,meta:{title:"tab test",requiresAuth: true} },
@@ -3588,15 +3661,15 @@ router.beforeEach((to, from, next) => {
     items: [
       {href: '/',text: 'Home', icon: 'home'    },
       {
-        icon: 'directions_run',
+        icon: 'input',
         text: 'Actions' ,
         model: false,
         children: [
       {href: '/eval',text: 'Query',icon: 'play_circle_outline'},
       {href: '/edit',text: 'Edit',icon: 'mode_edit'},
       {href: '/validate',text: 'Validate',icon: 'playlist_add_check'},
-      {href: '/transform',text: 'XSLT Transform',icon: 'input'},
-      {href: '/tasks',text: 'Tasks',icon: 'history'}
+      {href: '/transform',text: 'XSLT Transform',icon: 'forward'},
+      {href: '/tasks',text: 'Tasks',icon: 'update'}
       ]},
       {
         icon: 'folder_open',
@@ -3612,6 +3685,8 @@ router.beforeEach((to, from, next) => {
         text: 'Models' ,
         model: false,
         children: [
+          {href: '/namespace', text: 'Namespaces',icon: 'label' },
+          {href: '/entity', text: 'Entities',icon: 'redeem' },
       ]},
       {
         icon: 'cast_connected',
diff --git a/src/vue-poc/static/app.html b/src/vue-poc/static/app.html
index 4ada287..8248c3b 100644
--- a/src/vue-poc/static/app.html
+++ b/src/vue-poc/static/app.html
@@ -9,7 +9,7 @@
 <title>Vue Router Test</title>
 <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic">
 <link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">
-<link href="https://unpkg.com/vuetify@0.16.6/dist/vuetify.min.css" rel="stylesheet" type="text/css">
+<link href="https://unpkg.com/vuetify@0.16.9/dist/vuetify.min.css" rel="stylesheet" type="text/css">
 <link href="https://unpkg.com/vue-multiselect@2.0.0-beta.15/dist/vue-multiselect.min.css"  rel="stylesheet" type="text/css">
 <link rel="stylesheet" href="https://unpkg.com/leaflet@1.2.0/dist/leaflet.css"
   integrity="sha512-M2wvCLH6DSRazYeZRIm1JnYyh22purTM+FDB5CsyxtQJYeKq83arPe5wgbNmcFXGqiSH2XR8dT/fJISVA1r/zQ=="
@@ -41,10 +41,10 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/axios/0.16.1/axios.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/qs/6.4.0/qs.js"></script>
-<script src="https://unpkg.com/vuetify@0.16.6/dist/vuetify.min.js"></script>
+<script src="https://unpkg.com/vuetify@0.16.9/dist/vuetify.min.js"></script>
 <script src="https://unpkg.com/vue-multiselect@2.0.0-beta.15/dist/vue-multiselect.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.7/ace.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.7/ext-language_tools.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ext-language_tools.js"></script>
 <script src="https://d3js.org/d3.v3.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.6.12/beautify.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.6.12/beautify-css.js"></script>
diff --git a/src/vue-poc/vue-poc.vue b/src/vue-poc/vue-poc.vue
index 45469c8..0ca7b77 100644
--- a/src/vue-poc/vue-poc.vue
+++ b/src/vue-poc/vue-poc.vue
@@ -133,15 +133,15 @@
     items: [
       {href: '/',text: 'Home', icon: 'home'    },
       {
-        icon: 'directions_run',
+        icon: 'input',
         text: 'Actions' ,
         model: false,
         children: [
       {href: '/eval',text: 'Query',icon: 'play_circle_outline'},
       {href: '/edit',text: 'Edit',icon: 'mode_edit'},
       {href: '/validate',text: 'Validate',icon: 'playlist_add_check'},
-      {href: '/transform',text: 'XSLT Transform',icon: 'input'},
-      {href: '/tasks',text: 'Tasks',icon: 'history'}
+      {href: '/transform',text: 'XSLT Transform',icon: 'forward'},
+      {href: '/tasks',text: 'Tasks',icon: 'update'}
       ]},
       {
         icon: 'folder_open',
@@ -157,6 +157,8 @@
         text: 'Models' ,
         model: false,
         children: [
+          {href: '/namespace', text: 'Namespaces',icon: 'label' },
+          {href: '/entity', text: 'Entities',icon: 'redeem' },
       ]},
       {
         icon: 'cast_connected',
