diff --git a/web_client/hvueComponentsLoadTemplateModals.go b/web_client/hvueComponentsLoadTemplateModals.go new file mode 100644 index 0000000..a4b4038 --- /dev/null +++ b/web_client/hvueComponentsLoadTemplateModals.go @@ -0,0 +1,74 @@ +package main + +import ( + "github.com/gopherjs/gopherjs/js" + "github.com/mame82/hvue" +) + + +type modalLoadBashScriptData struct { + *js.Object + IsVisible bool `js:"isVisible"` +} + +func InitCompsLoadModals() { + hvue.NewComponent( + "modalLoadBashScript", + hvue.Template(templateLoadBashScript), + hvue.DataFunc(func(vm *hvue.VM) interface{} { + data := &modalLoadBashScriptData{Object:O()} + data.IsVisible = false + + return data + }), + hvue.PropObj( + "show", + hvue.Types(hvue.PBoolean), + ), + hvue.Method("setVisible", + func(vm *hvue.VM, visible bool) { + data := &modalLoadBashScriptData{Object:vm.Data} + data.IsVisible = visible + }, + ), + hvue.Mounted(func(vm *hvue.VM) { + data := &modalLoadBashScriptData{Object:vm.Data} + data.IsVisible = vm.Get("show").Bool() + // ToDo: update BashScriptList via vuex store action + return + }), + ) +} + +const templateLoadBashScript = ` + + + + + Load WiFi settings + + + + + + + + + + {{ tname }} + + + + + + + + + + + + + + + +` diff --git a/web_client/hvueComponentsTriggerActions.go b/web_client/hvueComponentsTriggerActions.go index cbb8b1a..2122426 100644 --- a/web_client/hvueComponentsTriggerActions.go +++ b/web_client/hvueComponentsTriggerActions.go @@ -161,41 +161,126 @@ func InitComponentsTriggerActions() { ) + hvue.NewComponent( - "triggeraction", + "TriggerAction", hvue.Template(templateTriggerAction), + hvue.PropObj("ta"), + ) + + hvue.NewComponent( + "TriggerActionOverview", + hvue.Template(templateTriggerActionOverview), + hvue.PropObj("ta"), + hvue.Computed("computedColor", func(vm *hvue.VM) interface{} { + ta := &jsTriggerAction{Object: vm.Get("ta")} + switch { + case ta.Immutable: + return "dark" + /* + case !ta.IsActive: + return "light" + */ + default: + return "" + } + + }), + hvue.Computed("strTrigger", func(vm *hvue.VM) interface{} { + ta := &jsTriggerAction{Object: vm.Get("ta")} + strTrigger := triggerNames[ta.TriggerType] + + switch { + case ta.IsTriggerGroupReceive(): + t := jsTriggerGroupReceive{Object: ta.TriggerData} + strTrigger += " (" + strTrigger += t.GroupName + strTrigger += ": " + strconv.Itoa(int(t.Value)) + strTrigger += ")" + case ta.IsTriggerGroupReceiveSequence(): + t := jsTriggerGroupReceiveSequence{Object: ta.TriggerData} + strTrigger += " (" + strTrigger += t.GroupName + strTrigger += ": [" + for idx,val := range t.ValueSequence { + if idx != 0 { + strTrigger += ", " + } + strTrigger += strconv.Itoa(int(val)) + } + strTrigger += "]" + if !t.IgnoreOutOfOrder { + strTrigger += ", out-of-order allowed" + } + strTrigger += ")" + case ta.IsTriggerGPIOIn(): + t := jsTriggerGPIOIn{Object: ta.TriggerData} + strTrigger += " (" + strTrigger += gpioNumNames[t.GpioNum] + strTrigger += ": " + gpioInEdgeNames[t.Edge] + strTrigger += ", resistor: " + gpioInPullUpDownNames[t.PullUpDown] + strTrigger += ")" + } + + return strTrigger + }), + hvue.Computed("strAction", func(vm *hvue.VM) interface{} { + ta := &jsTriggerAction{Object: vm.Get("ta")} + strAction := actionNames[ta.ActionType] + switch { + case ta.IsActionGroupSend(): + tgs := jsActionGroupSend{Object: ta.ActionData} + strAction += " (" + strAction += tgs.GroupName + strAction += ": " + strconv.Itoa(int(tgs.Value)) + strAction += ")" + case ta.IsActionGPIOOut(): + a := jsActionGPIOOut{Object: ta.ActionData} + strAction += " (" + strAction += gpioNumNames[a.GpioNum] + strAction += ": " + gpioOutValueNames[a.Value] + strAction += ")" + case ta.IsActionBashScript(): + a := jsActionStartBashScript{Object: ta.ActionData} + strAction += " ('" + strAction += a.ScriptName + strAction += "')" + case ta.IsActionDeploySettingsTemplate(): + a := jsActionDeploySettingsTemplate{Object: ta.ActionData} + strAction += " (" + strAction += templateTypeNames[a.Type] + strAction += ": '" + a.TemplateName + strAction += "')" + case ta.IsActionHidScript(): + a := jsActionStartHIDScript{Object: ta.ActionData} + strAction += " ('" + strAction += a.ScriptName + strAction += "')" + } + return strAction + }), + hvue.Mounted(func(vm *hvue.VM) { + data := TriggerActionCompData{Object: vm.Data} + data.EditMode = vm.Get("overview").Bool() + }), hvue.DataFunc(func(vm *hvue.VM) interface{} { data := &TriggerActionCompData{Object: O()} data.EditMode = false return data }), - hvue.PropObj("ta"), - hvue.PropObj( - "overview", - hvue.Types(hvue.PBoolean), - ), - hvue.Computed("strTrigger", func(vm *hvue.VM) interface{} { - ta := &jsTriggerAction{Object: vm.Get("ta")} - strTrigger := triggerNames[ta.TriggerType] - return strTrigger - }), - hvue.Computed("strAction", func(vm *hvue.VM) interface{} { - ta := &jsTriggerAction{Object: vm.Get("ta")} - strTrigger := actionNames[ta.ActionType] - return strTrigger - }), - hvue.Mounted(func(vm *hvue.VM) { - data := TriggerActionCompData{Object: vm.Data} - data.EditMode = vm.Get("overview").Bool() - }), hvue.Method( - "toggleEditMode", + "enableEditMode", func(vm *hvue.VM) { data := TriggerActionCompData{Object: vm.Data} - data.EditMode = !data.EditMode + data.EditMode = true }), ) + hvue.NewComponent( + "TriggerActionEdit", + hvue.Template(templateTriggerActionEdit), + hvue.PropObj("ta"), + ) hvue.NewComponent( "trigger", hvue.Props("ta"), @@ -330,29 +415,52 @@ func InitComponentsTriggerActions() { ) } -// const templateTriggerAction = ` - +
+ + +
+` +const templateTriggerActionOverview = ` +
+ + + + + + + + + + + - TriggerAction ({{ ta.IsActive ? "active" : "inactive" }}) + {{ ta.Immutable ? "immutable, " : "" }} + {{ ta.IsActive ? "enabled" : "disabled" }} + TriggerAction + {{ strTrigger }} - - {{ strAction }}{{ta.OneShot ? " (only once)" : "" }} +
+ {{ strAction }}{{ta.OneShot ? " only once" : "" }} - - - - - - - +
+ + +
+ + +
+` + +const templateTriggerActionEdit = ` + TriggerAction ID {{ ta.Id }} - + @@ -376,17 +484,19 @@ const templateTriggerAction = ` -
-
- -
+
+
+ +
-
- -
-
- +
+ +
+
+ + + ` const templateTrigger = ` @@ -434,7 +544,7 @@ const templateTrigger = ` Ignore out-of-order values - If enabled, the trigger fires even if other values arrive in between the ones of the sequence. If disabled, no other values are allowed in between the sequence + If enabled the sequence may be interrupted by other values. If disabled they have to arrive in exact order. @@ -483,11 +593,12 @@ const templateAction = ` + Script path Path to the BashScript which should be issued - + @@ -572,18 +683,19 @@ const templateAction = ` const templateTriggerActionManager = ` - - - - - -
-
- +
+
+ + + + +
-
- +
+ +
+
` diff --git a/web_client/jsDataTriggerAction.go b/web_client/jsDataTriggerAction.go index da2be40..d3f059e 100644 --- a/web_client/jsDataTriggerAction.go +++ b/web_client/jsDataTriggerAction.go @@ -27,21 +27,21 @@ const ( ActionGroupSend = actionType(5) ) var triggerNames = map[triggerType]string{ - TriggerServiceStarted: "service has been started", - TriggerUsbGadgetConnected: "USB gadget has connected to host", - TriggerUsbGadgetDisconnected: "USB Gadget has disconnected from host", + TriggerServiceStarted: "service started", + TriggerUsbGadgetConnected: "USB gadget connected to host", + TriggerUsbGadgetDisconnected: "USB Gadget disconnected from host", TriggerWifiAPStarted: "WiFi Access Point is up", - TriggerWifiConnectedAsSta: "joined an existing WiFi", - TriggerSshLogin: "a user logged in via SSH", - TriggerDhcpLeaseGranted: "a DHCP lease has been issued", - TriggerGPIOIn: "received input on GPIO", - TriggerGroupReceive: "received a value on a group channel", - TriggerGroupReceiveSequence: "received a sequence of values on a group channel", + TriggerWifiConnectedAsSta: "joined existing WiFi", + TriggerSshLogin: "SSH user login", + TriggerDhcpLeaseGranted: "DHCP lease issued", + TriggerGPIOIn: "input on GPIO", + TriggerGroupReceive: "a value on a group channel", + TriggerGroupReceiveSequence: "value sequence on a group channel", } var actionNames = map[actionType]string{ ActionLog: "write log entry", ActionHidScript: "start a HIDScript", - ActionDeploySettingsTemplate: "load and deploy settings from a template", + ActionDeploySettingsTemplate: "load and deploy settings template", ActionBashScript: "run a bash script", ActionGPIOOut: "set output on GPIO", ActionGroupSend: "send a value to a group channel", @@ -295,16 +295,16 @@ func (ta *jsTriggerAction) ChangeActionType(newAt actionType) { data = d.Object case ActionHidScript: d := &jsActionStartHIDScript{Object:O()} - d.ScriptName = "somescript" + d.ScriptName = "some-hid-script.js" data = d.Object case ActionDeploySettingsTemplate: d := &jsActionDeploySettingsTemplate{Object:O()} - d.TemplateName = "somescript" + d.TemplateName = "some-template" d.Type = availableTemplateTypes[0] data = d.Object case ActionBashScript: d := &jsActionStartBashScript{Object:O()} - d.ScriptName = "/path/to/some/script" + d.ScriptName = "some-bash-script.sh" data = d.Object case ActionGPIOOut: d := &jsActionGPIOOut{Object:O()} @@ -313,7 +313,7 @@ func (ta *jsTriggerAction) ChangeActionType(newAt actionType) { data = d.Object case ActionGroupSend: d := &jsActionGroupSend{Object:O()} - d.GroupName = "Channel1" + d.GroupName = "Group1" d.Value = 1 data = d.Object default: @@ -380,12 +380,12 @@ func (ta *jsTriggerAction) ChangeTriggerType(newTt triggerType) { data = d.Object case TriggerGroupReceive: d := &jsTriggerGroupReceive{Object:O()} - d.GroupName = "Channel1" + d.GroupName = "Group1" d.Value = 0 data = d.Object case TriggerGroupReceiveSequence: d := &jsTriggerGroupReceiveSequence{Object:O()} - d.GroupName = "Channel1" + d.GroupName = "Group1" d.IgnoreOutOfOrder = false d.ValueSequence = []int32{1,1} data = d.Object diff --git a/web_client/main.go b/web_client/main.go index 900614d..51064bb 100644 --- a/web_client/main.go +++ b/web_client/main.go @@ -79,6 +79,7 @@ func main() { InitComponentsNetwork() InitComponentsWiFi() InitComponentsTriggerActions() + InitCompsLoadModals() vm := hvue.NewVM( hvue.El("#app"), //add "testString" to data