feat: Enable/Disable actions based on rules (#817)
This commit is contained in:
commit
3162b33ea9
|
|
@ -93,7 +93,7 @@ function setupVue (i18nSettings) {
|
||||||
|
|
||||||
function setupErrorDisplay (errorMessage) {
|
function setupErrorDisplay (errorMessage) {
|
||||||
const ErrorApp = {
|
const ErrorApp = {
|
||||||
render() {
|
render () {
|
||||||
return h('section', { class: 'bad', style: 'padding: 2em; text-align: center; margin: 2em auto;' }, [
|
return h('section', { class: 'bad', style: 'padding: 2em; text-align: center; margin: 2em auto;' }, [
|
||||||
h('h2', 'OliveTin Init Failed'),
|
h('h2', 'OliveTin Init Failed'),
|
||||||
h('p', errorMessage),
|
h('p', errorMessage),
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,39 @@
|
||||||
|
#
|
||||||
|
# Integration Test Config: EnabledExpression
|
||||||
|
#
|
||||||
|
|
||||||
|
listenAddressSingleHTTPFrontend: 0.0.0.0:1337
|
||||||
|
|
||||||
|
logLevel: "DEBUG"
|
||||||
|
checkForUpdates: false
|
||||||
|
|
||||||
|
actions:
|
||||||
|
- title: Turn On Light
|
||||||
|
shell: echo "Turning on light"
|
||||||
|
icon: light
|
||||||
|
entity: light
|
||||||
|
enabledExpression: "{{ eq .CurrentEntity.powered_on false }}"
|
||||||
|
|
||||||
|
- title: Turn Off Light
|
||||||
|
shell: echo "Turning off light"
|
||||||
|
icon: light
|
||||||
|
entity: light
|
||||||
|
enabledExpression: "{{ eq .CurrentEntity.powered_on true }}"
|
||||||
|
|
||||||
|
- title: Always Enabled Action
|
||||||
|
shell: echo "Always enabled"
|
||||||
|
icon: check
|
||||||
|
|
||||||
|
entities:
|
||||||
|
- file: entities/lights.yaml
|
||||||
|
name: light
|
||||||
|
|
||||||
|
dashboards:
|
||||||
|
- title: LightDashboard
|
||||||
|
contents:
|
||||||
|
- title: Light Controls
|
||||||
|
type: fieldset
|
||||||
|
entity: light
|
||||||
|
contents:
|
||||||
|
- title: Turn On Light
|
||||||
|
- title: Turn Off Light
|
||||||
|
|
@ -0,0 +1,150 @@
|
||||||
|
import { describe, it, before, after } from 'mocha'
|
||||||
|
import { expect } from 'chai'
|
||||||
|
import { By, until, Condition } from 'selenium-webdriver'
|
||||||
|
import {
|
||||||
|
getRootAndWait,
|
||||||
|
takeScreenshotOnFailure,
|
||||||
|
} from '../../lib/elements.js'
|
||||||
|
|
||||||
|
describe('config: enabledExpression', function () {
|
||||||
|
this.timeout(30000) // Increase timeout for async operations
|
||||||
|
|
||||||
|
before(async function () {
|
||||||
|
await runner.start('enabledExpression')
|
||||||
|
})
|
||||||
|
|
||||||
|
after(async () => {
|
||||||
|
await runner.stop()
|
||||||
|
})
|
||||||
|
|
||||||
|
afterEach(function () {
|
||||||
|
takeScreenshotOnFailure(this.currentTest, webdriver);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('Action with enabledExpression for lights enable the correct action', async function() {
|
||||||
|
await getRootAndWait()
|
||||||
|
|
||||||
|
// Navigate to the Lights Dashboard
|
||||||
|
// Use the path with space encoded as %20 - Vue Router should decode it
|
||||||
|
await webdriver.get(runner.baseUrl() + '/dashboards/LightDashboard')
|
||||||
|
|
||||||
|
// Wait for the URL to change and the route to be processed
|
||||||
|
await webdriver.wait(new Condition('wait for URL to contain dashboards', async function() {
|
||||||
|
const url = await webdriver.getCurrentUrl()
|
||||||
|
return url.includes('/dashboards/')
|
||||||
|
}), 5000)
|
||||||
|
|
||||||
|
// Wait for dashboard to load by checking the loaded-dashboard attribute
|
||||||
|
// The attribute should be set to the decoded title "LightDashboard"
|
||||||
|
await webdriver.wait(new Condition('wait for loaded-dashboard', async function() {
|
||||||
|
const body = await webdriver.findElement(By.tagName('body'))
|
||||||
|
const attr = await body.getAttribute('loaded-dashboard')
|
||||||
|
if (attr) {
|
||||||
|
console.log('Current loaded-dashboard attribute:', attr)
|
||||||
|
}
|
||||||
|
// Accept either decoded or encoded version (component should decode, but handle both)
|
||||||
|
return attr === 'LightDashboard'
|
||||||
|
}), 10000)
|
||||||
|
|
||||||
|
// Verify we got the correct dashboard (prefer decoded, but accept encoded)
|
||||||
|
const body = await webdriver.findElement(By.tagName('body'))
|
||||||
|
const attr = await body.getAttribute('loaded-dashboard')
|
||||||
|
if (attr !== 'LightDashboard') {
|
||||||
|
const currentUrl = await webdriver.getCurrentUrl()
|
||||||
|
throw new Error(`Dashboard not loaded correctly. Expected "LightDashboard", got "${attr}". Current URL: ${currentUrl}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wait for dashboard content to appear - check for dashboard rows first
|
||||||
|
await webdriver.wait(until.elementsLocated(By.css('.dashboard-row')), 5000)
|
||||||
|
|
||||||
|
// Debug: Check what's on the page
|
||||||
|
const dashboardRows = await webdriver.findElements(By.css('.dashboard-row'))
|
||||||
|
console.log(`Found ${dashboardRows.length} dashboard rows`)
|
||||||
|
|
||||||
|
for (let i = 0; i < dashboardRows.length; i++) {
|
||||||
|
const row = dashboardRows[i]
|
||||||
|
const h2Elements = await row.findElements(By.css('h2'))
|
||||||
|
if (h2Elements.length > 0) {
|
||||||
|
const h2Text = await h2Elements[0].getText()
|
||||||
|
console.log(`Row ${i} h2: "${h2Text}"`)
|
||||||
|
}
|
||||||
|
const fieldsets = await row.findElements(By.css('fieldset'))
|
||||||
|
console.log(`Row ${i} has ${fieldsets.length} fieldsets`)
|
||||||
|
if (fieldsets.length > 0) {
|
||||||
|
const buttons = await fieldsets[0].findElements(By.css('.action-button button'))
|
||||||
|
console.log(`Row ${i} fieldset has ${buttons.length} buttons`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Find buttons by looking within entity fieldsets
|
||||||
|
// Both rows have h2 title "Light Controls", so we identify them by which buttons are enabled
|
||||||
|
// Living Room Light (powered_on: false) - Turn On should be enabled, Turn Off disabled
|
||||||
|
// Bedroom Light (powered_on: true) - Turn Off should be enabled, Turn On disabled
|
||||||
|
let turnOnButton = null
|
||||||
|
let turnOffButton = null
|
||||||
|
|
||||||
|
for (const row of dashboardRows) {
|
||||||
|
// Get the fieldset in this row
|
||||||
|
const fieldsets = await row.findElements(By.css('fieldset'))
|
||||||
|
if (fieldsets.length === 0) continue
|
||||||
|
|
||||||
|
const buttons = await fieldsets[0].findElements(By.css('.action-button button'))
|
||||||
|
|
||||||
|
// Check each button to identify which entity this row represents
|
||||||
|
for (const btn of buttons) {
|
||||||
|
const title = await btn.getAttribute('title')
|
||||||
|
const disabled = await btn.getAttribute('disabled')
|
||||||
|
const isEnabled = disabled === null
|
||||||
|
|
||||||
|
if (title === 'Turn On Light' && isEnabled) {
|
||||||
|
// This is the Living Room Light row (Turn On is enabled because powered_on: false)
|
||||||
|
turnOnButton = btn
|
||||||
|
}
|
||||||
|
|
||||||
|
if (title === 'Turn Off Light' && isEnabled) {
|
||||||
|
// This is the Bedroom Light row (Turn Off is enabled because powered_on: true)
|
||||||
|
turnOffButton = btn
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(turnOnButton).to.not.be.null
|
||||||
|
expect(turnOffButton).to.not.be.null
|
||||||
|
|
||||||
|
// Check that Turn On button is enabled (light is off)
|
||||||
|
const turnOnDisabled = await turnOnButton.getAttribute('disabled')
|
||||||
|
expect(turnOnDisabled).to.be.null
|
||||||
|
|
||||||
|
// Check that Turn Off button is enabled (light is on)
|
||||||
|
const turnOffDisabled = await turnOffButton.getAttribute('disabled')
|
||||||
|
expect(turnOffDisabled).to.be.null
|
||||||
|
})
|
||||||
|
|
||||||
|
it('Action without enabledExpression is always enabled', async function() {
|
||||||
|
await getRootAndWait()
|
||||||
|
|
||||||
|
// Navigate to actions view
|
||||||
|
await webdriver.get(runner.baseUrl())
|
||||||
|
|
||||||
|
// Wait for action buttons
|
||||||
|
await webdriver.wait(until.elementLocated(By.css('.action-button')), 10000)
|
||||||
|
|
||||||
|
// Find "Always Enabled Action" button
|
||||||
|
const actionButtons = await webdriver.findElements(By.css('.action-button button'))
|
||||||
|
let alwaysEnabledButton = null
|
||||||
|
|
||||||
|
for (const btn of actionButtons) {
|
||||||
|
const title = await btn.getAttribute('title')
|
||||||
|
if (title === 'Always Enabled Action') {
|
||||||
|
alwaysEnabledButton = btn
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(alwaysEnabledButton).to.not.be.null
|
||||||
|
|
||||||
|
// Check that it's enabled
|
||||||
|
const disabled = await alwaysEnabledButton.getAttribute('disabled')
|
||||||
|
expect(disabled).to.be.null
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
- name: "Living Room Light"
|
||||||
|
powered_on: false
|
||||||
|
|
||||||
|
- name: "Bedroom Light"
|
||||||
|
powered_on: true
|
||||||
|
|
@ -1,6 +1,11 @@
|
||||||
package api
|
package api
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
|
||||||
apiv1 "github.com/OliveTin/OliveTin/gen/olivetin/api/v1"
|
apiv1 "github.com/OliveTin/OliveTin/gen/olivetin/api/v1"
|
||||||
acl "github.com/OliveTin/OliveTin/internal/acl"
|
acl "github.com/OliveTin/OliveTin/internal/acl"
|
||||||
authpublic "github.com/OliveTin/OliveTin/internal/auth/authpublic"
|
authpublic "github.com/OliveTin/OliveTin/internal/auth/authpublic"
|
||||||
|
|
@ -55,14 +60,61 @@ func buildEffectivePolicy(policy *config.ConfigurationPolicy) *apiv1.EffectivePo
|
||||||
return ret
|
return ret
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func evaluateEnabledExpression(action *config.Action, entity *entities.Entity) bool {
|
||||||
|
if action.EnabledExpression == "" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
result := entities.ParseTemplateWith(action.EnabledExpression, entity)
|
||||||
|
result = strings.TrimSpace(result)
|
||||||
|
|
||||||
|
if result == "" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
if isTemplateError(result, action) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return evaluateResultValue(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
func isTemplateError(result string, action *config.Action) bool {
|
||||||
|
if !strings.HasPrefix(result, "tpl ") || !strings.Contains(result, "error") {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
log.WithFields(log.Fields{
|
||||||
|
"actionTitle": action.Title,
|
||||||
|
"enabledExpression": action.EnabledExpression,
|
||||||
|
"result": result,
|
||||||
|
}).Warn("enabledExpression template evaluation failed, treating as disabled")
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func evaluateResultValue(result string) bool {
|
||||||
|
if strings.EqualFold(result, "true") {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
if num, err := strconv.Atoi(result); err == nil {
|
||||||
|
return num != 0
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
func buildAction(actionBinding *executor.ActionBinding, rr *DashboardRenderRequest) *apiv1.Action {
|
func buildAction(actionBinding *executor.ActionBinding, rr *DashboardRenderRequest) *apiv1.Action {
|
||||||
action := actionBinding.Action
|
action := actionBinding.Action
|
||||||
|
|
||||||
|
aclCanExec := acl.IsAllowedExec(rr.cfg, rr.AuthenticatedUser, action)
|
||||||
|
enabledExprCanExec := evaluateEnabledExpression(action, actionBinding.Entity)
|
||||||
|
|
||||||
btn := apiv1.Action{
|
btn := apiv1.Action{
|
||||||
BindingId: actionBinding.ID,
|
BindingId: actionBinding.ID,
|
||||||
Title: entities.ParseTemplateWith(action.Title, actionBinding.Entity),
|
Title: entities.ParseTemplateWith(action.Title, actionBinding.Entity),
|
||||||
Icon: entities.ParseTemplateWith(action.Icon, actionBinding.Entity),
|
Icon: entities.ParseTemplateWith(action.Icon, actionBinding.Entity),
|
||||||
CanExec: acl.IsAllowedExec(rr.cfg, rr.AuthenticatedUser, action),
|
CanExec: aclCanExec && enabledExprCanExec,
|
||||||
PopupOnStart: action.PopupOnStart,
|
PopupOnStart: action.PopupOnStart,
|
||||||
Order: int32(actionBinding.ConfigOrder),
|
Order: int32(actionBinding.ConfigOrder),
|
||||||
Timeout: int32(action.Timeout),
|
Timeout: int32(action.Timeout),
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ import (
|
||||||
|
|
||||||
apiv1 "github.com/OliveTin/OliveTin/gen/olivetin/api/v1"
|
apiv1 "github.com/OliveTin/OliveTin/gen/olivetin/api/v1"
|
||||||
apiv1connect "github.com/OliveTin/OliveTin/gen/olivetin/api/v1/apiv1connect"
|
apiv1connect "github.com/OliveTin/OliveTin/gen/olivetin/api/v1/apiv1connect"
|
||||||
|
authpublic "github.com/OliveTin/OliveTin/internal/auth/authpublic"
|
||||||
config "github.com/OliveTin/OliveTin/internal/config"
|
config "github.com/OliveTin/OliveTin/internal/config"
|
||||||
"github.com/OliveTin/OliveTin/internal/entities"
|
"github.com/OliveTin/OliveTin/internal/entities"
|
||||||
"github.com/OliveTin/OliveTin/internal/executor"
|
"github.com/OliveTin/OliveTin/internal/executor"
|
||||||
|
|
@ -173,3 +174,164 @@ func validateConsistency(t *testing.T, client apiv1connect.OliveTinApiServiceCli
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestEvaluateEnabledExpression(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
expression string
|
||||||
|
entity *entities.Entity
|
||||||
|
expectedResult bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "empty expression returns true",
|
||||||
|
expression: "",
|
||||||
|
entity: nil,
|
||||||
|
expectedResult: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "literal true returns true",
|
||||||
|
expression: "true",
|
||||||
|
entity: nil,
|
||||||
|
expectedResult: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "literal True returns true (case insensitive)",
|
||||||
|
expression: "True",
|
||||||
|
entity: nil,
|
||||||
|
expectedResult: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "literal 1 returns true",
|
||||||
|
expression: "1",
|
||||||
|
entity: nil,
|
||||||
|
expectedResult: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "literal false returns false",
|
||||||
|
expression: "false",
|
||||||
|
entity: nil,
|
||||||
|
expectedResult: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "literal 0 returns false",
|
||||||
|
expression: "0",
|
||||||
|
entity: nil,
|
||||||
|
expectedResult: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "empty result returns false",
|
||||||
|
expression: "{{ .NonExistent }}",
|
||||||
|
entity: nil,
|
||||||
|
expectedResult: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "expression with CurrentEntity true",
|
||||||
|
expression: "{{ eq .CurrentEntity.powered_on true }}",
|
||||||
|
entity: &entities.Entity{Data: map[string]any{"powered_on": true}},
|
||||||
|
expectedResult: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "expression with CurrentEntity false",
|
||||||
|
expression: "{{ eq .CurrentEntity.powered_on true }}",
|
||||||
|
entity: &entities.Entity{Data: map[string]any{"powered_on": false}},
|
||||||
|
expectedResult: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "expression with CurrentEntity integer 1",
|
||||||
|
expression: "{{ .CurrentEntity.status }}",
|
||||||
|
entity: &entities.Entity{Data: map[string]any{"status": 1}},
|
||||||
|
expectedResult: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "expression with CurrentEntity integer 0",
|
||||||
|
expression: "{{ .CurrentEntity.status }}",
|
||||||
|
entity: &entities.Entity{Data: map[string]any{"status": 0}},
|
||||||
|
expectedResult: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "template parse error returns false",
|
||||||
|
expression: "{{ invalid syntax }}",
|
||||||
|
entity: nil,
|
||||||
|
expectedResult: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "template exec error returns false",
|
||||||
|
expression: "{{ .CurrentEntity.nonexistent }}",
|
||||||
|
entity: nil,
|
||||||
|
expectedResult: false,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
action := &config.Action{
|
||||||
|
EnabledExpression: tt.expression,
|
||||||
|
}
|
||||||
|
result := evaluateEnabledExpression(action, tt.entity)
|
||||||
|
assert.Equal(t, tt.expectedResult, result, "evaluateEnabledExpression should return expected result")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBuildActionWithEnabledExpression(t *testing.T) {
|
||||||
|
cfg := config.DefaultConfig()
|
||||||
|
cfg.DefaultPermissions.Exec = true
|
||||||
|
|
||||||
|
action := &config.Action{
|
||||||
|
Title: "Test Action",
|
||||||
|
Shell: "echo test",
|
||||||
|
EnabledExpression: "{{ eq .CurrentEntity.enabled true }}",
|
||||||
|
}
|
||||||
|
cfg.Actions = append(cfg.Actions, action)
|
||||||
|
|
||||||
|
ex := executor.DefaultExecutor(cfg)
|
||||||
|
ex.RebuildActionMap()
|
||||||
|
|
||||||
|
binding := findBindingByTitle(ex, "Test Action")
|
||||||
|
assert.NotNil(t, binding, "Binding should be found")
|
||||||
|
|
||||||
|
rr := &DashboardRenderRequest{
|
||||||
|
AuthenticatedUser: &authpublic.AuthenticatedUser{Username: "testuser"},
|
||||||
|
cfg: cfg,
|
||||||
|
ex: ex,
|
||||||
|
}
|
||||||
|
|
||||||
|
testWithEntity(t, binding, rr, true, true, "Action should be executable when entity.enabled is true")
|
||||||
|
testWithEntity(t, binding, rr, false, false, "Action should not be executable when entity.enabled is false")
|
||||||
|
|
||||||
|
bindingNoExpr := findBindingByTitle(ex, "Test Action No Expression")
|
||||||
|
if bindingNoExpr == nil {
|
||||||
|
actionNoExpression := &config.Action{
|
||||||
|
Title: "Test Action No Expression",
|
||||||
|
Shell: "echo test",
|
||||||
|
}
|
||||||
|
cfg.Actions = append(cfg.Actions, actionNoExpression)
|
||||||
|
ex.RebuildActionMap()
|
||||||
|
bindingNoExpr = findBindingByTitle(ex, "Test Action No Expression")
|
||||||
|
}
|
||||||
|
|
||||||
|
actionResult := buildAction(bindingNoExpr, rr)
|
||||||
|
assert.True(t, actionResult.CanExec, "Action without enabledExpression should be executable")
|
||||||
|
}
|
||||||
|
|
||||||
|
func findBindingByTitle(ex *executor.Executor, title string) *executor.ActionBinding {
|
||||||
|
ex.MapActionIdToBindingLock.RLock()
|
||||||
|
defer ex.MapActionIdToBindingLock.RUnlock()
|
||||||
|
|
||||||
|
for _, b := range ex.MapActionIdToBinding {
|
||||||
|
if b.Action.Title == title {
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func testWithEntity(t *testing.T, binding *executor.ActionBinding, rr *DashboardRenderRequest, enabled bool, expectedCanExec bool, message string) {
|
||||||
|
binding.Entity = &entities.Entity{
|
||||||
|
UniqueKey: "test-entity",
|
||||||
|
Data: map[string]any{"enabled": enabled},
|
||||||
|
}
|
||||||
|
|
||||||
|
actionResult := buildAction(binding, rr)
|
||||||
|
assert.Equal(t, expectedCanExec, actionResult.CanExec, message)
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue