Admin UI Tags tab now showing tags.

Author: riclolsen

src/htdocs-admin/src/components/TabbedOptions.vue

@@ -43,7 +43,7 @@
       </v-tab-item>
 
       <v-tab-item :value="'tab-' + 5">
-        <v-card-text>Under Construction...</v-card-text>
+        <Tags />
       </v-tab-item>
 
     </v-tabs>
@@ -70,6 +70,7 @@ import Users from "@/components/Users";
 import Roles from "@/components/Roles";
 import ProtocolDriverInstances from "@/components/ProtocolDriverInstances";
 import ProtocolConnections from "@/components/ProtocolConnections";
+import Tags from "@/components/Tags";
 
 export default {
   name: "TabbedOptions",
@@ -84,7 +85,8 @@ export default {
     Users,
     Roles,
     ProtocolDriverInstances,
-    ProtocolConnections
+    ProtocolConnections,
+    Tags
   },
 };
 </script>

src/server_realtime_auth/app/controllers/auth.controller.js

@@ -11,6 +11,39 @@ const UserActionsQueue = require('../../userActionsQueue')
 
 var jwt = require('jsonwebtoken')
 var bcrypt = require('bcryptjs')
+const { response } = require('express')
+
+exports.listTags = async (req, res) => {
+  console.log('listTags')
+  console.log(req.body)
+
+  let skip = 0
+  if ("page" in req.body && "itemsPerPage" in req.body)
+    skip = req.body.itemsPerPage * (req.body.page-1)
+  let filter = {}
+  let limit = req.body.itemsPerPage || 10
+  let orderby = {}
+  if ("sortBy" in req.body && "sortDesc" in req.body) {
+    for(let i=0; i<req.body.sortBy.length; i++) 
+      orderby[req.body.sortBy[i]] = req.body.sortDesc[i]? -1:1
+    if (req.body.sortBy.length === 0)
+      orderby = { tag: 1 }
+    }
+  else
+    orderby = { tag: 1 }
+
+  console.log(orderby)
+
+  let count = await Tag.count(filter)  
+  Tag.find(filter).skip(skip).limit(limit).sort(orderby).exec(function (err, tags) {
+    if (err) {
+      res.status(200).send({ error: err })
+      return
+    }
+    let ret = { tags: tags, countTotal: count }
+    res.status(200).send(ret)
+  })
+}
 
 exports.updateProtocolConnection = async (req, res) => {
   registerUserAction(req, 'updateProtocolConnection')

src/server_realtime_auth/app/models/tag.model.js

@@ -7,6 +7,9 @@ const Tag = mongoose.model(
     _id: {type: Number},
     tag: {type: String},
     group1: {type: String},
+    group2: {type: String},
+    group3: {type: String},
+    description: {type: String},
     value: {type: Double}
   }),
   "realtimeData"

src/server_realtime_auth/app/routes/auth.routes.js

@@ -23,6 +23,11 @@ module.exports = function (app, accessPoint) {
   app.post(accessPoint + 'auth/signin', controller.signin)
   app.post(accessPoint + 'auth/signout', controller.signout)
 
+  app.use(
+    accessPoint + 'auth/listTags',
+    [authJwt.isAdmin],
+    controller.listTags
+  )  
   app.post(
     accessPoint + 'auth/updateProtocolConnection',
     [authJwt.isAdmin],