Major changes: logic add to panel, local variables, panel histor, users management...
This commit is contained in:
+38
-11
@@ -1,8 +1,10 @@
|
||||
import { h } from 'preact';
|
||||
import { useState, useEffect } from 'preact/hooks';
|
||||
import { wsClient } from '../lib/ws';
|
||||
import { getSignalStore } from '../lib/stores';
|
||||
import type { Widget } from '../lib/types';
|
||||
import { getSignalStore, getMetaStore } from '../lib/stores';
|
||||
import { logicEngine } from '../lib/logic';
|
||||
import { useAuth, canWrite } from '../lib/auth';
|
||||
import type { Widget, SignalMeta } from '../lib/types';
|
||||
|
||||
interface Props { widget: Widget; onContextMenu?: (e: MouseEvent) => void; }
|
||||
|
||||
@@ -15,8 +17,12 @@ export default function Button({ widget, onContextMenu }: Props) {
|
||||
const mode = widget.options['mode'] ?? 'oneshot';
|
||||
const resetTimeSec = parseFloat(widget.options['resetTime'] ?? '1');
|
||||
const confirmOpt = widget.options['confirm'] === 'true';
|
||||
// Optional panel-logic sequence fired on click (in addition to any signal write).
|
||||
const action = widget.options['action'] ?? '';
|
||||
|
||||
const me = useAuth();
|
||||
const [signalVal, setSignalVal] = useState<any>(null);
|
||||
const [meta, setMeta] = useState<SignalMeta | null>(null);
|
||||
|
||||
// Subscribe to signal only for persistent mode (to track whether it is active)
|
||||
useEffect(() => {
|
||||
@@ -24,6 +30,20 @@ export default function Button({ widget, onContextMenu }: Props) {
|
||||
return getSignalStore(sigRef).subscribe(sv => setSignalVal(sv.value));
|
||||
}, [sigRef?.ds, sigRef?.name, mode]);
|
||||
|
||||
// Track the target signal's writability so the button can be disabled when
|
||||
// the user has no permission to write it (real signals only; local panel
|
||||
// vars are written client-side and have no backend metadata).
|
||||
useEffect(() => {
|
||||
if (!sigRef || sigRef.ds === 'local') return;
|
||||
return getMetaStore(sigRef).subscribe(setMeta);
|
||||
}, [sigRef?.ds, sigRef?.name]);
|
||||
|
||||
// A button that drives a real signal is disabled when the user cannot write
|
||||
// it (read-only access, or the signal reports it is not writable). Buttons
|
||||
// that only run a logic action — or target a local var — stay enabled.
|
||||
const drivesRealSignal = !!sigRef && sigRef.ds !== 'local';
|
||||
const writeAllowed = !drivesRealSignal || (canWrite(me.level) && meta?.writable !== false);
|
||||
|
||||
const parsedSend = isNaN(parseFloat(sendValue)) ? sendValue : parseFloat(sendValue);
|
||||
const parsedReset = isNaN(parseFloat(resetValue)) ? resetValue : parseFloat(resetValue);
|
||||
|
||||
@@ -38,18 +58,23 @@ export default function Button({ widget, onContextMenu }: Props) {
|
||||
}
|
||||
|
||||
function execute() {
|
||||
if (mode === 'setReset') {
|
||||
doWrite(parsedSend);
|
||||
setTimeout(() => doWrite(parsedReset), Math.max(0, resetTimeSec) * 1000);
|
||||
} else if (mode === 'persistent') {
|
||||
doWrite(isPressed ? parsedReset : parsedSend);
|
||||
} else {
|
||||
doWrite(parsedSend);
|
||||
if (sigRef) {
|
||||
if (mode === 'setReset') {
|
||||
doWrite(parsedSend);
|
||||
setTimeout(() => doWrite(parsedReset), Math.max(0, resetTimeSec) * 1000);
|
||||
} else if (mode === 'persistent') {
|
||||
doWrite(isPressed ? parsedReset : parsedSend);
|
||||
} else {
|
||||
doWrite(parsedSend);
|
||||
}
|
||||
}
|
||||
if (action) logicEngine.runAction(action);
|
||||
}
|
||||
|
||||
function handleClick() {
|
||||
if (!sigRef) return;
|
||||
// A button may drive a signal, a logic sequence, or both.
|
||||
if (!sigRef && !action) return;
|
||||
if (!writeAllowed) return;
|
||||
if (confirmOpt) {
|
||||
if (window.confirm(`Send ${label}?`)) execute();
|
||||
} else {
|
||||
@@ -63,7 +88,9 @@ export default function Button({ widget, onContextMenu }: Props) {
|
||||
style={`left:${widget.x}px;top:${widget.y}px;width:${widget.w}px;height:${widget.h}px;`}
|
||||
onContextMenu={onContextMenu}
|
||||
>
|
||||
<button class={`btn${isPressed ? ' btn-pressed' : ''}`} onClick={handleClick}>
|
||||
<button class={`btn${isPressed ? ' btn-pressed' : ''}`} onClick={handleClick}
|
||||
disabled={!writeAllowed}
|
||||
title={writeAllowed ? '' : 'You do not have permission to write this signal'}>
|
||||
{label}
|
||||
{mode === 'setReset' && (
|
||||
<span class="btn-mode-hint">{resetTimeSec}s</span>
|
||||
|
||||
Reference in New Issue
Block a user