broodjeaap/go-watch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed var3

Browse source
This commit is contained in:
BroodjeAap 2023-02-06 19:53:18 +00:00
parent e5f15a36f3
commit da7d0a6b23
9 changed files with 9 additions and 371 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -402,7 +402,6 @@ It uses the [Golang templating language](https://pkg.go.dev/text/template), filt
- `{{ .Min_Type }}` gets the type of the filter
- `{{ .Min_Var1 }}` gets the first variable, useful for Get URL filters or Schedule filters
- `{{ .Min_Var2 }}` gets the second variable
- `{{ .Min_Var3 }}` gets the third variable
To configure notifiers see the [notifiers](#notifiers) section.

1
models/filter.go
View file

@ -14,7 +14,6 @@ type Filter struct {
Type string `form:"filter_type" yaml:"filter_type" json:"filter_type" binding:"required" validate:"oneof=url xpath json css replace match substring math store condition cron"`
Var1 string `form:"var1" yaml:"var1" json:"var1" binding:"required"`
Var2 *string `form:"var2" yaml:"var2" json:"var2"`
Var3 *string `form:"var3" yaml:"var3" json:"var3"`
Parents []*Filter `gorm:"-:all"`
Children []*Filter `gorm:"-:all"`
Results []string `gorm:"-:all"`

3
todo.md
View file

@ -8,5 +8,4 @@
- config in config?
- gin
- router
- logging?
- need var3?
- logging?

1
web/scraping.go
View file

@ -1118,7 +1118,6 @@ func notifyFilter(filters []Filter, filter *Filter, watch *Watch, web *Web, debu
dataMap[f.Name+"_Type"] = f.Type
dataMap[f.Name+"_Var1"] = f.Var1
dataMap[f.Name+"_Var2"] = f.Var2
dataMap[f.Name+"_Var3"] = f.Var3
}
dataMap["WatchName"] = template.HTML(watch.Name)

173
web/static/edit.js
View file

@ -29,6 +29,8 @@ var __spread = (this && this.__spread) || function () {
for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
return ar;
};
// @ts-ignore
var urlPrefix = getURLPrefix();
function onTypeChange(node) {
var e_1, _a, e_2, _b;
if (node === void 0) { node = null; }
@ -47,14 +49,11 @@ function onTypeChange(node) {
var var3Label = document.getElementById("var3Label");
var var1Value = "";
var var2Value = "";
var var3Value = "";
if (node != null) {
// @ts-ignore
var1Value = node.meta.var1;
// @ts-ignore
var2Value = node.meta.var2;
// @ts-ignore
var3Value = node.meta.var3;
}
switch (type) {
case "gurl": {
@ -75,15 +74,6 @@ function onTypeChange(node) {
var2Input.placeholder = "";
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
var var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Input.placeholder = "";
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "gurls": {
@ -105,15 +95,6 @@ function onTypeChange(node) {
var2Input.placeholder = "";
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
var var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Input.placeholder = "";
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "xpath": {
@ -149,15 +130,6 @@ function onTypeChange(node) {
else {
select_1.value = var2Value;
}
var var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Input.placeholder = "";
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "json": {
@ -177,14 +149,6 @@ function onTypeChange(node) {
var2Input.disabled = true;
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
var var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "css": {
@ -220,14 +184,6 @@ function onTypeChange(node) {
else {
select_2.value = var2Value;
}
var var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "replace": {
@ -247,14 +203,6 @@ function onTypeChange(node) {
var2Input.disabled = false;
var2Label.innerHTML = "With";
var2Div.appendChild(var2Input);
var var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "match": {
@ -274,14 +222,6 @@ function onTypeChange(node) {
var2Input.disabled = true;
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
var var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "substring": {
@ -301,14 +241,6 @@ function onTypeChange(node) {
var2Input.disabled = true;
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
var var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "contains": {
@ -340,14 +272,6 @@ function onTypeChange(node) {
else {
notSelect.value = "false";
}
var var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "math": {
@ -403,15 +327,6 @@ function onTypeChange(node) {
var2Label.innerHTML = "-";
}
var2Div.appendChild(var2Input);
var var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Input.placeholder = "";
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "store": {
@ -432,14 +347,6 @@ function onTypeChange(node) {
var2Input.disabled = true;
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
var var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "unique": {
@ -460,14 +367,6 @@ function onTypeChange(node) {
var2Input.disabled = true;
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
var var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "condition": {
@ -513,14 +412,6 @@ function onTypeChange(node) {
var2Input.disabled = true;
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
var var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
onConditionChange(node);
break;
}
@ -565,14 +456,6 @@ function onTypeChange(node) {
}
var2Div.appendChild(var2Input);
var2Label.innerHTML = "Notify";
var var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "cron": {
@ -604,14 +487,6 @@ function onTypeChange(node) {
}
var2Div.appendChild(enabledSelect);
var2Label.innerHTML = "Enabled";
var var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "brow": {
@ -717,7 +592,7 @@ function onTypeChange(node) {
finally { if (e_2) throw e_2.error; }
}
var2Label.innerHTML = "Snippets";
var2Div.appendChild(snippetDiv);
var3Div.appendChild(snippetDiv);
var var2Input = document.createElement("input");
var2Input.name = "var2";
var2Input.id = "var2Input";
@ -726,14 +601,6 @@ function onTypeChange(node) {
var2Input.disabled = true;
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
var var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
}
@ -744,15 +611,11 @@ function onMathChange(node) {
var var1Label = document.getElementById("var1Label");
var var2Input = document.getElementById("var2Input");
var var2Label = document.getElementById("var2Label");
var var3Input = document.getElementById("var3Input");
var var3Label = document.getElementById("var3Label");
var var2Value = "";
var var3Value = "";
if (node != null) {
// @ts-ignore
var2Value = node.meta.var2;
// @ts-ignore
var3Value = node.meta.var3;
}
if (var1Input.value == "round") {
var2Input.disabled = false;
@ -777,20 +640,16 @@ function onConditionChange(node) {
var var2Label = document.getElementById("var2Label");
var var2Div = document.getElementById("var2Div");
var2Div.innerHTML = "";
var var3Input = document.getElementById("var3Input");
var var3Label = document.getElementById("var3Label");
var var3Div = document.getElementById("var3Div");
var var1Value = "";
var var2Value = "";
var var3Value = "";
if (node != null) {
// @ts-ignore
var1Value = node.meta.var1;
var1Input.value = var1Value;
// @ts-ignore
var2Value = node.meta.var2;
// @ts-ignore
var3Value = node.meta.var3;
}
else {
var1Value = var1Input.value;
@ -862,21 +721,17 @@ function onBrowserlessChange(node) {
var var2Label = document.getElementById("var2Label");
var var2Div = document.getElementById("var2Div");
var2Div.innerHTML = "";
var var3Input = document.getElementById("var3Input");
var var3Label = document.getElementById("var3Label");
var var3Div = document.getElementById("var3Div");
var3Div.innerHTML = "";
var var1Value = "";
var var2Value = "";
var var3Value = "";
if (node != null) {
// @ts-ignore
var1Value = node.meta.var1;
var1Input.value = var1Value;
// @ts-ignore
var2Value = node.meta.var2;
// @ts-ignore
var3Value = node.meta.var3;
}
else {
var1Value = var1Input.value;
@ -916,11 +771,6 @@ function onBrowserlessChange(node) {
if (var2Value != "") {
var2Input_5.value = var2Value;
}
var var3Input_1 = document.createElement("input");
var3Input_1.type = "hidden";
var3Input_1.id = "var3Input";
var3Input_1.name = "var3Input";
var3Div.appendChild(var3Input_1);
var3Label.innerHTML = "Help";
var helpLink1 = document.createElement("a");
helpLink1.href = "https://www.browserless.io/docs/function";
@ -948,11 +798,6 @@ function onBrowserlessChange(node) {
if (var2Value != "") {
var2Input_6.value = var2Value;
}
var var3Input_2 = document.createElement("input");
var3Input_2.type = "hidden";
var3Input_2.id = "var3Input";
var3Input_2.name = "var3Input";
var3Div.appendChild(var3Input_2);
var3Label.innerHTML = "Help";
var helpLink1 = document.createElement("a");
helpLink1.href = "https://www.browserless.io/docs/function";
@ -977,12 +822,10 @@ function onSubmitNewFilter() {
var type = selectType.value;
var var1Input = document.getElementById("var1Input");
var var2Input = document.getElementById("var2Input");
var var3Input = document.getElementById("var3Input");
_diagram.addNode(Math.max.apply(Math, __spread(Array.from(_diagram.nodes.values()).map(function (n) { return n.id; }), [0])) + 1, _diagram.canvas.width / 2 - _diagram.mouseState.offset.x, _diagram.canvas.height / 2 - _diagram.mouseState.offset.y, name, {
type: type,
var1: var1Input.value,
var2: var2Input.value,
var3: var3Input.value,
});
}
function editNode(node) {
@ -999,11 +842,6 @@ function editNode(node) {
if (var2 === undefined) {
var2 = "";
}
// @ts-ignore
var var3 = node.meta.var3;
if (var3 === undefined) {
var3 = "";
}
var nameInput = document.getElementById("nameInput");
nameInput.value = name;
var selectType = document.getElementById("typeInput");
@ -1096,9 +934,6 @@ function submitEditNode(node) {
var var2Input = document.getElementById("var2Input");
// @ts-ignore
node.meta.var2 = var2Input.value;
var var3Input = document.getElementById("var3Input");
// @ts-ignore
node.meta.var3 = var3Input.value;
node.fixType();
node.resize(_diagram.ctx);
var saveWatchButton = document.getElementById("saveButtonMain");
@ -1125,8 +960,6 @@ function saveWatch() {
var1: filter.meta.var1,
// @ts-ignore
var2: filter.meta.var2,
// @ts-ignore
var3: filter.meta.var3,
});
}
}

192
web/static/edit.ts
View file

@ -1,4 +1,6 @@
// @ts-ignore
let urlPrefix = getURLPrefix();
function onTypeChange(node: DiagramNode | null = null){
// @ts-ignore
let urlPrefix = getURLPrefix();
@ -19,14 +21,11 @@ function onTypeChange(node: DiagramNode | null = null){
let var1Value = "";
let var2Value = "";
let var3Value = "";
if (node != null){
// @ts-ignore
var1Value = node.meta.var1;
// @ts-ignore
var2Value = node.meta.var2;
// @ts-ignore
var3Value = node.meta.var3;
}
switch(type){
@ -49,16 +48,6 @@ function onTypeChange(node: DiagramNode | null = null){
var2Input.placeholder = ""
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
let var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Input.placeholder = ""
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "gurls": {
@ -81,16 +70,6 @@ function onTypeChange(node: DiagramNode | null = null){
var2Input.placeholder = ""
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
let var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Input.placeholder = ""
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "xpath": {
@ -126,16 +105,6 @@ function onTypeChange(node: DiagramNode | null = null){
} else {
select.value = var2Value;
}
let var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Input.placeholder = ""
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "json": {
@ -156,15 +125,6 @@ function onTypeChange(node: DiagramNode | null = null){
var2Input.disabled = true;
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
let var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "css": {
@ -200,15 +160,6 @@ function onTypeChange(node: DiagramNode | null = null){
} else {
select.value = var2Value;
}
let var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "replace": {
@ -229,15 +180,6 @@ function onTypeChange(node: DiagramNode | null = null){
var2Input.disabled = false;
var2Label.innerHTML = "With";
var2Div.appendChild(var2Input);
let var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "match": {
@ -258,15 +200,6 @@ function onTypeChange(node: DiagramNode | null = null){
var2Input.disabled = true;
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
let var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "substring": {
@ -287,15 +220,6 @@ function onTypeChange(node: DiagramNode | null = null){
var2Input.disabled = true;
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
let var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "contains": {
@ -327,15 +251,6 @@ function onTypeChange(node: DiagramNode | null = null){
} else {
notSelect.value = "false";
}
let var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "math": {
@ -390,16 +305,6 @@ function onTypeChange(node: DiagramNode | null = null){
var2Label.innerHTML = "-";
}
var2Div.appendChild(var2Input);
let var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Input.placeholder = ""
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "store": {
@ -421,15 +326,6 @@ function onTypeChange(node: DiagramNode | null = null){
var2Input.disabled = true;
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
let var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "unique": {
@ -451,15 +347,6 @@ function onTypeChange(node: DiagramNode | null = null){
var2Input.disabled = true;
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
let var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "condition":{
@ -506,15 +393,6 @@ function onTypeChange(node: DiagramNode | null = null){
var2Input.disabled = true;
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
let var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
onConditionChange(node);
break;
}
@ -549,15 +427,6 @@ function onTypeChange(node: DiagramNode | null = null){
}
var2Div.appendChild(var2Input);
var2Label.innerHTML = "Notify";
let var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "cron":{
@ -589,15 +458,6 @@ function onTypeChange(node: DiagramNode | null = null){
}
var2Div.appendChild(enabledSelect);
var2Label.innerHTML = "Enabled"
let var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
case "brow":{
@ -839,7 +699,7 @@ end
snippetDiv.appendChild(gap);
}
var2Label.innerHTML = "Snippets";
var2Div.appendChild(snippetDiv);
var3Div.appendChild(snippetDiv);
let var2Input = document.createElement("input");
var2Input.name = "var2";
@ -849,15 +709,6 @@ end
var2Input.disabled = true;
var2Label.innerHTML = "-";
var2Div.appendChild(var2Input);
let var3Input = document.createElement("input");
var3Input.name = "var3";
var3Input.id = "var3Input";
var3Input.value = var3Value;
var3Input.classList.add("form-control");
var3Input.disabled = true;
var3Label.innerHTML = "-";
var3Div.appendChild(var3Input);
break;
}
}
@ -868,16 +719,12 @@ function onMathChange(node: DiagramNode | null = null){
let var1Label = document.getElementById("var1Label") as HTMLLabelElement;
let var2Input = document.getElementById("var2Input") as HTMLInputElement;
let var2Label = document.getElementById("var2Label") as HTMLLabelElement;
let var3Input = document.getElementById("var3Input") as HTMLInputElement;
let var3Label = document.getElementById("var3Label") as HTMLLabelElement;
let var2Value = "";
let var3Value = "";
if (node != null){
// @ts-ignore
var2Value = node.meta.var2;
// @ts-ignore
var3Value = node.meta.var3;
}
if (var1Input.value == "round"){
@ -901,21 +748,17 @@ function onConditionChange(node: DiagramNode | null = null){
let var2Label = document.getElementById("var2Label") as HTMLLabelElement;
let var2Div = document.getElementById("var2Div") as HTMLDivElement;
var2Div.innerHTML = "";
let var3Input = document.getElementById("var3Input") as HTMLInputElement;
let var3Label = document.getElementById("var3Label") as HTMLLabelElement;
let var3Div = document.getElementById("var3Div") as HTMLDivElement;
let var1Value = "";
let var2Value = "";
let var3Value = "";
if (node != null){
// @ts-ignore
var1Value = node.meta.var1;
var1Input.value = var1Value;
// @ts-ignore
var2Value = node.meta.var2;
// @ts-ignore
var3Value = node.meta.var3;
} else {
var1Value = var1Input.value;
}
@ -979,22 +822,18 @@ function onBrowserlessChange(node: DiagramNode | null = null){
let var2Label = document.getElementById("var2Label") as HTMLLabelElement;
let var2Div = document.getElementById("var2Div") as HTMLDivElement;
var2Div.innerHTML = "";
let var3Input = document.getElementById("var3Input") as HTMLInputElement;
let var3Label = document.getElementById("var3Label") as HTMLLabelElement;
let var3Div = document.getElementById("var3Div") as HTMLDivElement;
var3Div.innerHTML = "";
let var1Value = "";
let var2Value = "";
let var3Value = "";
if (node != null){
// @ts-ignore
var1Value = node.meta.var1;
var1Input.value = var1Value;
// @ts-ignore
var2Value = node.meta.var2;
// @ts-ignore
var3Value = node.meta.var3;
} else {
var1Value = var1Input.value;
}
@ -1046,12 +885,6 @@ function onBrowserlessChange(node: DiagramNode | null = null){
var2Input.value = var2Value;
}
let var3Input = document.createElement("input");
var3Input.type = "hidden";
var3Input.id = "var3Input";
var3Input.name = "var3Input";
var3Div.appendChild(var3Input);
var3Label.innerHTML = "Help";
let helpLink1 = document.createElement("a");
helpLink1.href = "https://www.browserless.io/docs/function";
@ -1092,12 +925,6 @@ function onBrowserlessChange(node: DiagramNode | null = null){
var2Input.value = var2Value;
}
let var3Input = document.createElement("input");
var3Input.type = "hidden";
var3Input.id = "var3Input";
var3Input.name = "var3Input";
var3Div.appendChild(var3Input);
var3Label.innerHTML = "Help";
let helpLink1 = document.createElement("a");
helpLink1.href = "https://www.browserless.io/docs/function";
@ -1127,7 +954,6 @@ function onSubmitNewFilter(){
let var2Input = document.getElementById("var2Input") as HTMLInputElement;
let var3Input = document.getElementById("var3Input") as HTMLInputElement;
_diagram.addNode(
Math.max(...Array.from(_diagram.nodes.values()).map(n => n.id), 0) + 1,
@ -1137,7 +963,6 @@ function onSubmitNewFilter(){
type: type,
var1: var1Input.value,
var2: var2Input.value,
var3: var3Input.value,
})
}
@ -1155,11 +980,6 @@ function editNode(node: DiagramNode){
if (var2 === undefined){
var2 = "";
}
// @ts-ignore
let var3 = node.meta.var3;
if (var3 === undefined){
var3 = "";
}
let nameInput = document.getElementById("nameInput") as HTMLInputElement;
nameInput.value = name;
@ -1241,10 +1061,6 @@ function submitEditNode(node: DiagramNode){
// @ts-ignore
node.meta.var2 = var2Input.value;
let var3Input = document.getElementById("var3Input") as HTMLInputElement;
// @ts-ignore
node.meta.var3 = var3Input.value;
node.fixType();
node.resize(_diagram.ctx);
let saveWatchButton = document.getElementById("saveButtonMain") as HTMLButtonElement;
@ -1269,8 +1085,6 @@ function saveWatch(){
var1: filter.meta.var1,
// @ts-ignore
var2: filter.meta.var2,
// @ts-ignore
var3: filter.meta.var3,
})
}
let filtersInput = document.getElementById("filtersInput") as HTMLInputElement;

2
web/templates/backup/restore.html
View file

@ -42,7 +42,6 @@ GoWatch Backup Restore
<th>Type</th>
<th>Var1</th>
<th>Var2</th>
<th>Var3</th>
<th>X/Y</th>
</tr>
</thead>
@ -55,7 +54,6 @@ GoWatch Backup Restore
<td class="h5">{{ $filter.Type }}</td>
<td class="h5">{{ $filter.Var1 }}</td>
<td class="h5">{{ $filter.Var2 }}</td>
<td class="h5">{{ $filter.Var3 }}</td>
<td class="h5">{{ $filter.X }}/{{ $filter.Y }}</td>
</tr>
{{ end }}

2
web/templates/backup/test.html
View file

@ -42,7 +42,6 @@ GoWatch Backups
<th>Type</th>
<th>Var1</th>
<th>Var2</th>
<th>Var3</th>
<th>X/Y</th>
</tr>
</thead>
@ -55,7 +54,6 @@ GoWatch Backups
<td class="h5">{{ $filter.Type }}</td>
<td class="h5">{{ $filter.Var1 }}</td>
<td class="h5">{{ $filter.Var2 }}</td>
<td class="h5">{{ $filter.Var3 }}</td>
<td class="h5">{{ $filter.X }}/{{ $filter.Y }}</td>
</tr>
{{ end }}

5
web/templates/watch/edit.html
View file

@ -103,9 +103,9 @@ GoWatch Edit {{ .Watch.Name }}
<div class="col-sm-10 p-2" id="var2Div">
<input type="text" class="form-control" name="var2" id="var2Input" placeholder="" disabled>
</div>
<label for="var3" id="var3Label" class="col-sm-2 col-form-label">-</label>
<label for="var3" id="var3Label" class="col-sm-2 col-form-label"></label>
<div class="col-sm-10 p-2" id="var3Div">
<input type="text" class="form-control" name="var3" id="var3Input" placeholder="" disabled>
</div>
</div>
</form>
@ -203,7 +203,6 @@ function canvasInit() {
type: "{{ .Type }}",
var1: "{{ .Var1 }}",
var2: "{{ .Var2 }}",
var3: "{{ .Var3 }}",
},
[
{{ range .Results }}