datapoint.go

@@ -242,11 +242,11 @@ func DatapointRetrieve(id int, name string) (dp Datapoint, err error) { // {{{
 	var query string
 	var param any
 	if id > 0 {
-		query = `SELECT id, "group", name, "datatype", comment, last_value, nodata_problem_seconds, nodata_is_problem, true AS found FROM public.datapoint WHERE id = $1`
+		query = `SELECT *, true AS found FROM datapoint WHERE id = $1`
 		param = id
 		dp.ID = id
 	} else {
-		query = `SELECT id, "group", name, "datatype", comment, last_value, nodata_problem_seconds, nodata_is_problem, true AS found FROM public.datapoint WHERE name = $1`
+		query = `SELECT *, true AS found FROM datapoint WHERE name = $1`
 		param = name
 	}
 

main.go

@@ -29,7 +29,7 @@ import (
 	"time"
 )
 
-const VERSION = "v41"
+const VERSION = "v38"
 
 var (
 	logger              *slog.Logger
@@ -663,27 +663,6 @@ func pageDatapointEdit(w http.ResponseWriter, r *http.Request, _ *session.T) { /
 		}
 	}
 
-	/* Triggers using this datapoint is provided as a list to update
-	 * if changing the datapoint name. Parsing expr and automatically
-	 * changing it to renamed datapoints would be nice in the future. */
-	var triggers []Trigger
-	triggers, err = TriggersRetrieveByDatapoint(datapoint.Name)
-	if err != nil {
-		httpError(w, werr.Wrap(err).Log())
-		return
-	}
-	slices.SortFunc(triggers, func(a, b Trigger) int {
-		an := strings.ToUpper(a.Name)
-		bn := strings.ToUpper(b.Name)
-		if an < bn {
-			return -1
-		}
-		if an > bn {
-			return 1
-		}
-		return 0
-	})
-
 	page := Page{
 		LAYOUT: "main",
 		PAGE:   "datapoint_edit",
@@ -695,7 +674,6 @@ func pageDatapointEdit(w http.ResponseWriter, r *http.Request, _ *session.T) { /
 
 	page.Data = map[string]any{
 		"Datapoint": datapoint,
-		"Triggers":  triggers,
 	}
 	page.Render(w, r)
 	return
@@ -711,15 +689,8 @@ func actionDatapointUpdate(w http.ResponseWriter, r *http.Request, _ *session.T)
 	var nodataSeconds int
 	nodataSeconds, _ = strconv.Atoi(r.FormValue("nodata_seconds"))
 
-	// Datapoint needs to be retrieved from database for the name.
-	// If name has changed, trigger expressions needs to be updated.
 	var dp Datapoint
-	dp, err = DatapointRetrieve(id, "")
+	dp.ID = id
-	if err != nil {
-		httpError(w, werr.Wrap(err).WithData(id).Log())
-		return
-	}
-	prevDatapointName := dp.Name
 	dp.Group = r.FormValue("group")
 	dp.Name = r.FormValue("name")
 	dp.Datatype = DatapointType(r.FormValue("datatype"))
@@ -731,29 +702,6 @@ func actionDatapointUpdate(w http.ResponseWriter, r *http.Request, _ *session.T)
 		return
 	}
 
-	// Update the trigger expressions using this
-	// datapoint name if changed.
-	if prevDatapointName != dp.Name {
-		var triggers []Trigger
-		triggers, err = TriggersRetrieveByDatapoint(dp.Name)
-		if err != nil {
-			httpError(w, werr.Wrap(err).WithData(dp.Name))
-			return
-		}
-		for _, trigger := range triggers {
-			err = trigger.RenameDatapoint(prevDatapointName, dp.Name)
-			if err != nil {
-				httpError(w, werr.Wrap(err).WithData([]string{prevDatapointName, dp.Name}))
-				return
-			}
-			err = trigger.Update()
-			if err != nil {
-				httpError(w, werr.Wrap(err).WithData([]string{prevDatapointName, dp.Name, trigger.Name}))
-				return
-			}
-		}
-	}
-
 	w.Header().Add("Location", "/datapoints")
 	w.WriteHeader(302)
 } // }}}

sql/00027.sql

@@ -1,22 +0,0 @@
-/* Updating a datapoint name also updates the jsonb array entry */
-CREATE OR REPLACE FUNCTION update_triggers_datapoint_name()
-	RETURNS TRIGGER
-	LANGUAGE PLPGSQL
-	AS
-$$
-BEGIN
-UPDATE "trigger"
-	SET
-		datapoints = (datapoints - OLD.name) || jsonb_build_array(NEW.name)
-	WHERE
-		datapoints ? OLD.name;
-
-	RETURN NEW;
-END;
-$$;
-
-CREATE TRIGGER datapoint_renamed
-	AFTER UPDATE
-	ON public.datapoint
-	FOR EACH ROW
-	EXECUTE PROCEDURE update_triggers_datapoint_name();

static/js/datapoint_edit.mjs

@@ -1,6 +1,5 @@
 export class UI {
-	constructor(datapointData) {
+	constructor() {
-		this.datapoint = datapointData
 		document.addEventListener('keydown', evt=>this.keyHandler(evt))
 		document.querySelector('input[name="group"]').focus()
 	}

trigger.go

@@ -4,8 +4,6 @@ import (
 	// External
 	werr "git.gibonuddevalla.se/go/wrappederror"
 	"github.com/expr-lang/expr"
-	"github.com/expr-lang/expr/ast"
-	"github.com/expr-lang/expr/parser"
 	"github.com/lib/pq"
 
 	// Standard
@@ -24,17 +22,6 @@ type Trigger struct {
 	DatapointValues map[string]any
 }
 
-type ExprRenamePatcher struct {
-	OldName string
-	NewName string
-}
-
-func (p ExprRenamePatcher) Visit(node *ast.Node) {
-	if n, ok := (*node).(*ast.IdentifierNode); ok && n.Value == p.OldName {
-		ast.Patch(node, &ast.IdentifierNode{Value: p.NewName})
-	}
-}
-
 func TriggerCreate(sectionID int, name string) (t Trigger, err error) { // {{{
 	t.SectionID = sectionID
 	t.Name = name
@@ -140,14 +127,6 @@ func TriggerRetrieve(id int) (trigger Trigger, err error) { // {{{
 	err = json.Unmarshal(jsonData, &trigger)
 	return
 } // }}}
-func TriggerDelete(id int) (err error) { // {{{
-	_, err = service.Db.Conn.Exec(`DELETE FROM public.trigger WHERE id=$1`, id)
-	if err != nil {
-		return werr.Wrap(err).WithData(id)
-	}
-	return
-} // }}}
-
 func (t *Trigger) Validate() (ok bool, err error) { // {{{
 	if strings.TrimSpace(t.Name) == "" {
 		err = fmt.Errorf("Name can't be empty")
@@ -233,6 +212,14 @@ func (t *Trigger) Update() (err error) { // {{{
 	}
 	return
 } // }}}
+func TriggerDelete(id int) (err error) { // {{{
+	_, err = service.Db.Conn.Exec(`DELETE FROM public.trigger WHERE id=$1`, id)
+	if err != nil {
+		return werr.Wrap(err).WithData(id)
+	}
+	return
+} // }}}
+
 func (t *Trigger) Run() (output any, err error) { // {{{
 	datapoints := make(map[string]Datapoint)
 	for _, dpname := range t.Datapoints {
@@ -261,14 +248,3 @@ func (t *Trigger) Run() (output any, err error) { // {{{
 	}
 	return
 } // }}}
-func (t *Trigger) RenameDatapoint(from, to string) error { // {{{
-	tree, err := parser.Parse(t.Expression)
-	if err != nil {
-		return werr.Wrap(err).WithData(t.Expression)
-	}
-
-	ast.Walk(&tree.Node, ExprRenamePatcher{from, to})
-	t.Expression = tree.Node.String()
-
-	return nil
-} // }}}

views/pages/datapoint_edit.gotmpl

@@ -3,59 +3,48 @@
 
 	<script type="module" defer>
 		import {UI} from "/js/{{ .VERSION }}/datapoint_edit.mjs"
-		window._ui = new UI({{ .Data.Datapoint }})
+		window._ui = new UI()
 	</script>
 
 	{{ block "page_label" . }}{{end}}
 
 	<form id="form-trigger" action="/datapoint/update/{{ .Data.Datapoint.ID }}" method="post">
-		<div id="widgets" class="widgets">
+	<div id="widgets" class="widgets">
-			<div class="label">Group</div>
+		<div class="label">Group</div>
-			<div><input type="text" name="group" value="{{ .Data.Datapoint.Group }}"></div>
+		<div><input type="text" name="group" value="{{ .Data.Datapoint.Group }}"></div>
 
-			<div class="label">Name</div>
+		<div class="label">Name</div>
-			<div><input type="text" name="name" value="{{ .Data.Datapoint.Name }}"></div>
+		<div><input type="text" name="name" value="{{ .Data.Datapoint.Name }}"></div>
+		
+		<div class="label">Datatype</div>
+		<div>
+			<select name="datatype">
+				<option {{ if eq .Data.Datapoint.Datatype "INT" }}selected{{end}}>INT</option>
+				<option {{ if eq .Data.Datapoint.Datatype "STRING" }}selected{{end}}>STRING</option>
+				<option {{ if eq .Data.Datapoint.Datatype "DATETIME" }}selected{{end}}>DATETIME</option>
+			</select>
+		</div>
 
-			<div class="label">Datatype</div>
+		<div class="label">No data<br>problem time<br>(seconds)</div>
-			<div>
+		<div>
-				<select name="datatype">
+			<input type="text" name="nodata_seconds" value="{{ .Data.Datapoint.NodataProblemSeconds }}">
-					<option {{ if eq .Data.Datapoint.Datatype "INT" }}selected{{end}}>INT</option>
+			<div class="description">A problem is raised and notified if an entry isn't made within this time.</div>
-					<option {{ if eq .Data.Datapoint.Datatype "STRING" }}selected{{end}}>STRING</option>
+			<div class="description">Set to 0 to disable.</div>
-					<option {{ if eq .Data.Datapoint.Datatype "DATETIME" }}selected{{end}}>DATETIME</option>
+		</div>
-				</select>
-			</div>
 
-			<div class="label">No data<br>problem time<br>(seconds)</div>
+		<div class="label">Comment</div>
-			<div>
+		<div>
-				<input type="text" name="nodata_seconds" value="{{ .Data.Datapoint.NodataProblemSeconds }}">
+			<textarea name="comment" rows=4>{{ .Data.Datapoint.Comment }}</textarea>
-				<div class="description">A problem is raised and notified if an entry isn't made within this time.</div>
+		</div>
-				<div class="description">Set to 0 to disable.</div>
-			</div>
-
-			<div class="label">Comment</div>
-			<div>
-				<textarea name="comment" rows=4>{{ .Data.Datapoint.Comment }}</textarea>
-			</div>
 
 
-			<div></div>
+		<div></div>
-			<div class="action">
+		<div class="action">
-				{{ if eq .Data.Datapoint.ID 0 }}
+			{{ if eq .Data.Datapoint.ID 0 }}
-				<button id="button-update">Create</button>
+			<button id="button-update">Create</button>
-				{{ else }}
+			{{ else }}
-				<button id="button-update">Update</button>
+			<button id="button-update">Update</button>
-				{{ end }}
+			{{ end }}
-			</div>
-
-			<div></div>
-			<div style="margin-top: 32px">
-				<b>Used in the following triggers:</b>
-				<ul>
-					{{ range .Data.Triggers }}
-					<li><a href="/trigger/edit/{{ .ID }}">{{ .Name }}</a></li>
-					{{ end }}
-				</ul>
-			</div>
 		</div>
 	</form>