Work on webclient master template settings

service/nexmon/netlink.go

@@ -0,0 +1 @@
+package nexmon

web_client/hvueComponentsDialog.go

@@ -8,6 +8,7 @@ import (
 )
 
 func InitComponentsDialog() {
+
 	hvue.NewComponent(
 		"select-string-from-array",
 		hvue.Template(templateSelectStringModal),
@@ -22,7 +23,7 @@ func InitComponentsDialog() {
 		}),
 		hvue.Mounted(func(vm *hvue.VM) {
 			vm.Set("CurrentSelection", vm.Get("values").Index(0))
-			println("Index 0 on mount", vm.Get("values").Index(0))
+//			println("Index 0 on mount", vm.Get("values").Index(0))
 		}),
 		hvue.ComputedWithGetSet(
 			"visible",
@@ -38,7 +39,6 @@ func InitComponentsDialog() {
 			func(vm *hvue.VM) {
 				vm.Call("$emit", "load", vm.Get("CurrentSelection"))
 				//println(vm.Get("CurrentSelection"))
-
 			},
 		),
 		hvue.Method(

web_client/hvueComponentsGeneric.go

@@ -5,98 +5,364 @@ package main
 import (
 	"github.com/gopherjs/gopherjs/js"
 	"github.com/mame82/hvue"
+	"strings"
 )
 
-func LogLevelClass(vm *hvue.VM, level int) string {
+type jsMasterTemplate struct {
-	prefix := "log-entry log-entry-level-"
+	*js.Object
-	switch level {
+	TemplateNameBluetooth      string   `js:"TemplateNameBluetooth"`
-	case 1:
+	TemplateNameUSB            string   `js:"TemplateNameUSB"`
-		return prefix + "critical"
+	TemplateNameWiFi           string   `js:"TemplateNameWiFi"`
-	case 2:
+	TemplateNameTriggerActions string   `js:"TemplateNameTriggerActions"`
-		return prefix + "error"
+	TemplateNamesNetwork       []string `js:"TemplateNamesNetwork"`
-	case 3:
-		return prefix + "warning"
-	case 4:
-		return prefix + "information"
-	case 5:
-		return prefix + "verbose"
-	default:
-		return prefix + "undefined"
-	}
 }
 
+func NewMasterTemplate() (res *jsMasterTemplate) {
+	res = &jsMasterTemplate{Object: O()}
+	res.TemplateNameBluetooth = ""
+	res.TemplateNameWiFi = ""
+	res.TemplateNameUSB = ""
+	res.TemplateNameTriggerActions = ""
+	res.TemplateNamesNetwork = []string{}
 
-func InitCompLogger()  {
+	return res
+}
+
+func InitComponentsGeneric() {
 
 	hvue.NewComponent(
-		"logger",
+		"generic",
-		hvue.Template(compLoggerTemplate),
+		hvue.Template(compGeneric),
+	)
+	hvue.NewComponent(
+		"startup-settings",
+		hvue.Template(compStartupSettings),
+	)
+	hvue.NewComponent(
+		"system",
+		hvue.Template(compSystem),
+	)
+	hvue.NewComponent(
+		"master-template",
+		hvue.Template(compMasterTemplate),
 		hvue.DataFunc(func(vm *hvue.VM) interface{} {
 			data := &struct {
 				*js.Object
-				Pagination *jsDataTablePagination `js:"pagination"`
+				MasterTemplate *jsMasterTemplate `js:"MasterTemplate"`
-			}{Object:O()}
 
-			data.Pagination = newPagination(0, 1)
+				ShowTemplateSelectBluetooth bool `js:"ShowTemplateSelectBluetooth"`
+				ShowTemplateSelectWiFi bool `js:"ShowTemplateSelectWiFi"`
+				ShowTemplateSelectUSB bool `js:"ShowTemplateSelectUSB"`
+				ShowTemplateSelectTriggerAction bool `js:"ShowTemplateSelectTriggerAction"`
+				ShowTemplateSelectNetwork bool `js:"ShowTemplateSelectNetwork"`
+
+			}{Object: O()}
+
+			data.MasterTemplate = NewMasterTemplate()
+			data.ShowTemplateSelectBluetooth = false
+			data.ShowTemplateSelectWiFi = false
+			data.ShowTemplateSelectUSB = false
+			data.ShowTemplateSelectTriggerAction = false
+			data.ShowTemplateSelectNetwork = false
 
 			return data
 		}),
-		hvue.Method("logLevelClass", LogLevelClass),
-		hvue.PropObj("max-entries", hvue.Types(hvue.PNumber), hvue.Default(5)),
-
-		hvue.Computed("classFromLevel", func(vm *hvue.VM) interface{} {
-			return "info"
-		}),
-		hvue.Method("formatDate", func(vm *hvue.VM, timestamp *js.Object) interface{} {
-			return js.Global.Get("Quasar").Get("utils").Get("date").Call("formatDate", timestamp, "YYYY-MM-DD HH:mm:ss Z")
-		}),
-		hvue.Computed("logArray",
-			func(vm *hvue.VM) interface{} {
-				return vm.Get("$store").Get("state").Get("EventProcessor").Get("logArray")
-			}),
 	)
+	hvue.NewComponent(
+		"database",
+		hvue.Template(compDatabase),
+	)
+
+
+
+	hvue.NewComponent(
+		"select-network-templates",
+		hvue.Template(templateSelectNetworkTemplatesModal),
+		hvue.DataFunc(func(vm *hvue.VM) interface{} {
+			data := struct {
+				*js.Object
+				CurrentSelection []string `js:"CurrentSelection"`
+			}{Object:O()}
+			data.CurrentSelection = []string{}
+
+			return &data
+		}),
+		/*
+		hvue.Mounted(func(vm *hvue.VM) {
+			vm.Set("CurrentSelection", vm.Get("values").Index(0))
+			//			println("Index 0 on mount", vm.Get("values").Index(0))
+		}),
+		*/
+		hvue.Computed("options", func(vm *hvue.VM) interface{} {
+			inVals := vm.Get("values")
+			options := js.Global.Get("Array").New()
+
+			for i:=0; i < inVals.Length(); i++ {
+				val := inVals.Index(i).String()
+				entry := struct{
+					*js.Object
+					Label string `js:"label"`
+					Value string `js:"value"`
+				}{Object:O()}
+				entry.Label = val
+				entry.Value = val
+
+				options.Call("push", entry)
+			}
+
+			return options
+		}),
+
+		hvue.ComputedWithGetSet(
+			"visible",
+			func(vm *hvue.VM) interface{} {
+				return vm.Get("show")
+			},
+			func(vm *hvue.VM, newValue *js.Object) {
+				vm.Call("$emit", "show", newValue)
+			},
+		),
+		hvue.ComputedWithGetSet("selection",
+			func(vm *hvue.VM) interface{} {
+				return vm.Get("value")
+			},
+			func(vm *hvue.VM, newValue *js.Object) {
+				vm.Call("$emit", "input", newValue)
+			}),
+		hvue.Computed("available", func(vm *hvue.VM) interface{} {
+
+
+			sel := vm.Get("selection")
+			selection := make(map[string]bool, 0)
+			selectionPrefix := make(map[string]bool, 0)
+			for i:=0; i<sel.Length(); i++ {
+				name := sel.Index(i).String()
+				selection[name] = true
+				selectionPrefix[strings.Split(name,"_")[0]] = true
+			}
+
+			vals := vm.Get("values")
+			values := make([]string, vals.Length())
+			for i:=0; i<vals.Length(); i++ {
+				values[i] = vals.Index(i).String()
+			}
+
+			var res []string
+
+			for _,v := range values {
+				prefix := strings.Split(v,"_")[0]
+				_,inPrefix := selectionPrefix[prefix]
+				_,inSelected := selection[v]
+
+				if !inPrefix || inSelected {
+					res = append(res, v)
+				}
+			}
+
+			return res
+		}),
+		hvue.Method(
+			"onLoadPressed",
+			func(vm *hvue.VM) {
+				vm.Call("$emit", "input", vm.Get("selection"))
+			},
+		),
+		hvue.Method(
+			"onDeletePressed",
+			func(vm *hvue.VM, name *js.Object) {
+				vm.Call("$emit", "delete", name)
+			},
+		),
+		hvue.PropObj(
+			"values",
+			hvue.Required,
+		),
+		hvue.PropObj(
+			"show",
+			hvue.Required,
+			hvue.Types(hvue.PBoolean),
+		),
+		hvue.PropObj(
+			"with-delete",
+			hvue.Types(hvue.PBoolean),
+			hvue.Default(false),
+		),
+		hvue.PropObj(
+			"title",
+			hvue.Types(hvue.PString),
+		),
+		hvue.PropObj(
+			"value",
+		),
+	)
+
 	//return o.NewComponent()
 }
 
-const (
+/*
+- Startup settings (templates)
+- Reboot & shutdown
+- States (CPU load, memory usage etc.)
+- DB backup & Restore
+ */
 
-	compLoggerTemplate = `
+const compGeneric = `
 <q-page padding>
-	<q-card>
+	<div class="row gutter-sm">
-		<div>
+		<div class="col-12 col-lg">
-			<q-table
+			<master-template />
-				:data="logArray"
+		</div>
-				:columns="[{name:'logTime', field: 'time', label: 'Time', align: 'left'}, {name:'logSource', field: 'source', label: 'Source', align: 'left'}, {name:'logLevel', field: 'level', label: 'Level', align: 'left'}, {name:'logMessage', field: 'message', label: 'Message', align: 'left'}]"
+
-				row-key="name"
+		<div class="col-12 col-lg">
-				:pagination="pagination"
+			<startup-settings />
-				hide-bottom
+		</div>
-			>
+
-  <q-td slot="body-cell-logTime" slot-scope="props" :props="props">
+		<div class="col-12 col-lg">
-    {{ formatDate(props.value) }}
+			<system />
-  </q-td>
+		</div>
-			</q-table>
+
+		<div class="col-12 col-lg">
+			<database />
 		</div>
-	</q-card>
 
-<!--
-	<div class="logger">
-	<table class="log-entries">
-		<tr>
-			<th>time</th>
-			<th>source</th>
-			<th>level</th>
-			<th>message</th>
-		</tr>
-        <tr v-for="(logEntry,idx) in logArray" :key="idx" :class="logLevelClass(logEntry.level)">
-			<td class="log-entry-time">{{ logEntry.time }}</td>
-	        <td class="log-entry-source">{{ logEntry.source }}</td>
-			<td class="log-entry-level">{{ logEntry.level }}</td>
-			<td class="log-entry-message">{{ logEntry.message }}</td>
-	    </tr>
-	</table>
 	</div>
--->
 </q-page>
 `
-)
 
+const compStartupSettings = `
+<q-card>
+	<q-card-title>
+		Startup Settings
+	</q-card-title>
+
+	<q-card-main>
+		<div class="row gutter-sm">
+
+		</div>
+	</q-card-main>
+</q-card>
+`
+
+const compMasterTemplate = `
+<q-card>
+	<q-card-title>
+		Master Template
+	</q-card-title>
+
+	{{ $data }}
+
+	<q-card-main>
+		
+
+		<div class="row gutter-sm">
+
+			<q-item tag="label">
+<select-string-from-array :values="$store.state.StoredUSBSettingsList"  v-model="ShowTemplateSelectUSB" title="Select USB template" @load="MasterTemplate.TemplateNameUSB=$event"></select-string-from-array>
+				<q-item-main>
+					<q-item-tile label>USB Template</q-item-tile>
+					<q-item-tile sublabel>If not empty, the selected USB settings are deployed along with the master template</q-item-tile>
+					<q-item-tile>
+<q-input @click="ShowTemplateSelectUSB=true" v-model="MasterTemplate.TemplateNameUSB" color="primary" inverted readonly :after="[{icon: 'more_horiz', handler(){}}]"></q-input>
+					</q-item-tile>
+				</q-item-main>
+			</q-item>
+
+			<q-item tag="label">
+<select-network-templates 
+	:values="$store.state.StoredEthernetInterfaceSettingsList" 
+	:show="ShowTemplateSelectNetwork" 
+	@show="ShowTemplateSelectNetwork=$event"
+	title="Select Network templates" 
+	v-model="MasterTemplate.TemplateNamesNetwork" 
+/>
+				<q-item-main>
+					<q-item-tile label>Networks templates</q-item-tile>
+					<q-item-tile sublabel>If not empty, the selected network templates are deployed along with the master template. Only one template could be selected per interface.</q-item-tile>
+					<q-item-tile>
+<q-chips-input v-model="MasterTemplate.TemplateNamesNetwork"  color="primary" inverted :after="[{icon: 'add', handler(){ShowTemplateSelectNetwork=true}}]" />
+					</q-item-tile>
+				</q-item-main>
+			</q-item>
+
+
+
+		</div>
+	</q-card-main>
+</q-card>
+`
+
+const compSystem = `
+<q-card>
+	<q-card-title>
+		System
+	</q-card-title>
+
+	<q-card-main>
+		<div class="row gutter-sm">
+			<div class="col"> <q-btn class="fit" color="warning" label="reboot" icon="refresh" /> </div>
+			<div class="col"> <q-btn class="fit" color="negative" label="shutdown" icon="power_settings_new" /> </div>
+		</div>
+	</q-card-main>
+</q-card>
+`
+
+const compDatabase = `
+<q-card>
+	<q-card-title>
+		Database
+	</q-card-title>
+
+	<q-card-main>
+		<div class="row gutter-sm">
+			<div class="col"> <q-btn class="fit" color="primary" label="backup" icon="cloud_upload" /> </div>
+			<div class="col"> <q-btn class="fit" color="negative" label="restore" icon="cloud_download" /> </div>
+		</div>
+	</q-card-main>
+</q-card>
+`
+
+const templateSelectNetworkTemplatesModal = `
+	<q-modal v-model="visible">
+		<q-modal-layout>
+			<q-toolbar slot="header">
+				<q-toolbar-title>
+					{{ title }}
+    				<span slot="subtitle">
+      					Only one template could be selected per interface
+    				</span>
+				</q-toolbar-title>
+			</q-toolbar>
+
+			<q-list>
+
+				<q-item link tag="label" v-for="name in available" :key="name">
+					<q-item-side>
+						<q-checkbox v-model="selection" :val="name"/>
+					</q-item-side>
+					<q-item-main>
+						<q-item-tile label>{{ name }}</q-item-tile>
+					</q-item-main>
+					<q-item-side v-if="withDelete" right>
+						<q-btn icon="delete" color="negative" @click="onDeletePressed(name)" round flat />
+					</q-item-side>
+				</q-item>
+
+
+			</q-list>
+
+			<q-list slot="footer">
+				<q-item tag="label">
+					<q-item-main>
+						<q-item-tile>
+<!--
+							<q-btn color="primary" v-show="CurrentSelection != undefined" label="ok" @click="onLoadPressed(); visible=false"/>							
+-->
+							<q-btn color="secondary" v-close-overlay label="close" />
+						</q-item-tile>
+					</q-item-main>
+				</q-item>
+			</q-list>
+
+		</q-modal-layout>
+	</q-modal>
+`

web_client/main.go

@@ -66,6 +66,7 @@ func main() {
 		VueRouterRoute("/wifi","", "<wifi></wifi>"),
 		VueRouterRoute("/triggeractions","", "<triggeraction-manager></triggeraction-manager>"),
 		VueRouterRoute("/bluetooth","", "<bluetooth></bluetooth>"),
+		VueRouterRoute("/generic","", "<generic></generic>"),
 	)
 
 
@@ -83,6 +84,7 @@ func main() {
 	InitComponentsWiFi()
 	InitComponentsTriggerActions()
 	InitComponentsBluetooth()
+	InitComponentsGeneric()
 
 	vm := hvue.NewVM(
 		hvue.El("#app"),
@@ -119,6 +121,7 @@ const templateMainApp = `
                 <q-route-tab slot="title" to="hid" name="tab-hid-script" icon="keyboard" label="HIDScript"></q-route-tab>
  <!--               <q-route-tab slot="title" to="hidjobs" name="tab-hid-jobs" icon="schedule" label="HID Events"></q-route-tab> -->
                 <q-route-tab slot="title" to="logger" name="tab-logger" icon="message" label="Event Log"></q-route-tab>
+                <q-route-tab slot="title" to="generic" name="tab-generic" icon="settings" label="Generic settings"></q-route-tab>
             </q-tabs>
         </q-layout-header>