Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI updates: improve build reliability

Rich Turner2da25dc1e9e2
diff --git a/ui/app/main/package.json b/ui/app/main/package.json
index 803dcb9fc..0b3b9aa66 100644
--- a/ui/app/main/package.json
+++ b/ui/app/main/package.json
@@ -9,9 +9,9 @@
"clean": "npx shx rm -rf dist",
"modelBuild": "node ../../model-build.js",
"modelWatch": "node ../../model-watch.js",
- "build": "npx tsc -b && npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production",
+ "build": "npx tsc -b -f && npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production",
"serve": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack-dev-server --mode development",
- "watch": "npx tsc -b -w",
+ "watch": "npx tsc -b -f -w",
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
diff --git a/ui/component/or-rules/src/or-rule-validity.ts b/ui/component/or-rules/src/or-rule-validity.ts
index 49c37e3a1..fc7f08100 100644
--- a/ui/component/or-rules/src/or-rule-validity.ts
+++ b/ui/component/or-rules/src/or-rule-validity.ts
@@ -131,14 +131,14 @@ export class OrRuleValidity extends translate(i18next)(LitElement) {
case "until":
if (this.rrule.options.until) {
const newDate = moment(value)
- origOptions["until"] = new Date(moment(origOptions["until"]).set({year: newDate.year(), month: newDate.month(), date: newDate.date()}).format())
+ origOptions["until"] = new Date(moment(origOptions.until).set({year: newDate.year(), month: newDate.month(), date: newDate.date()}).format())
}
if (this.getValidityType() === "validityRecurrence") this.rrule = new RRule(origOptions);
break;
case "dtstart-time":
const timeParts = value.split(':');
origOptions.dtstart = moment(origOptions.dtstart).set({hour:timeParts[0],minute:timeParts[1],second:0,millisecond:0}).toDate();
- validity.start = moment(origOptions["dtstart"]).toDate().getTime();
+ validity.start = moment(origOptions.dtstart).toDate().getTime();
if (this.getValidityType() === "validityRecurrence") this.rrule = new RRule(origOptions);
break;
case "until-time":