FEMS-Backports 2024-08 (2) (#2771)

* UI: fix sum chart in consumption history
  - Wrong variable used in consumption detail html
* UI: add routing guards for settings
  - Introduction of [Routing Guards](https://v17.angular.io/api/router#types)
  - Not visible routes could be accessed through manually going there
  - Adding edge role check before accessing this route
* UI: center refresher-spinner
  - Center refresh-content-spinner
* Rrd4j: Fix query for custom range
  - fix start for timeranges with not the first day of the month
  - fix readonly only worked with debugmode
* UI: Migration to angular 18
  - Update Angular, Zone.js, Typescript
* UI: Eslint: no-multiple-empty-lines
* UI: fix tooltip afterTitle display bug
* UI: enforce double quotes
  - Enforce usage of double quotes
  - prohibit single quotes
  - backticks are still usable -> [ref](https://eslint.org/docs/latest/rules/quotes#double)
* UI: add exhaustive switch eslint rule
  - Add eslint rule [`switch-exhaustiveness-check`](https://typescript-eslint.io/rules/switch-exhaustiveness-check/)
* UI: App: Update android api due to googles new policy
  - Updating android api level due to googles new policy, enforcing `ANDROID_API_LEVEL=34` to be minimum version
* Build android app
  - Add CI pipeline for building Android apps
* GridOptimizedCharge: avoid fail state in OFF
* UI: Reduce history queries & overloading of chartData
  - If a history chart takes too long to load and the user switches the timerange, the old timerange will be shown instead of the actual one (at least for a few seconds, until the new chart is finished)
* UI: Replace `setCurrentComponent` with `getCurrentEdge`
  - Replace `setCurrentComponent` with `getCurrentEdge`, setCurrentComponent is already deprecated and shouldnt be used anymore
* UI: Unify fixDigitalOutput & singlethreshold history (#1315)
  - Unify and refactor all FixDigitalOutputControllers and SingleThresholds in one widget in history
  - Refactoring them and using the new `CumulatedLevelActiveTime`-Channel
* UI: fix TimeOfUseTariff powerSocChart
  - Fix `TypeError: this.options.plugins is undefined`
  - To reproduce the error see "live" screen and open the modal for Time-of-Use with ADMIN role.

---------

Co-authored-by: Lukas Rieger <[email protected]>
Co-authored-by: Michael Grill <[email protected]>
Co-authored-by: Kai Jeschek <[email protected]>
Co-authored-by: Johann Kaufmann <[email protected]>
Co-authored-by: Fabian Brandtner <[email protected]>
Co-authored-by: Sebastian Asen <[email protected]>

Reviewed-by: Sagar Venu <[email protected]>
Reviewed-by: Lukas Rieger <[email protected]>
Reviewed-by: Sebastian Asen <[email protected]>
Reviewed-by: Stefan Feilmeier <[email protected]>
Reviewed-by: Hueseyin Sahutoglu <[email protected]>

Author: sfeilmeier

.woodpecker/ui-build.yml

@@ -0,0 +1,80 @@
+variables:
+  - &sftp-settings
+    server: ${CACHE_SERVER}
+    username: user
+    password: pass
+    ignore_branch: true
+    port: 2222
+    path: /cache
+    mount:
+      - cache
+
+  - &rsync-settings
+    user: fenecon-docs
+    hosts:
+      - ${ARTIFACT_SERVER}
+    port: 22
+    key:
+      from_secret: ssh_key_intranet
+    args: '-v'
+
+  - &main-build
+    - branch: [main, develop]
+    - evaluate: 'CI_COMMIT_MESSAGE contains "[APP]"'
+    - path:
+        include: ['.woodpecker/ui-build.yml']
+        on_empty: false
+
+when:
+  event:
+    - push
+
+matrix:
+  THEME:
+    - fenecon
+    - heckert
+
+clone:
+  git:
+    when: *main-build
+    image: woodpeckerci/plugin-git
+
+steps:
+  restore-cache:
+    when: *main-build
+    image: appleboy/drone-sftp-cache
+    settings:
+      restore: true
+      <<: *sftp-settings
+
+  prepare-environment:
+    when: *main-build
+    image: openems-bash
+    commands:
+      - export CACHE=$CI_WORKSPACE/cache
+      - mkdir -p $CI_WORKSPACE/cache build/target
+      - source tools/common.sh
+      - common_initialize_environment
+      - common_build_snapshot_version
+      - common_save_environment $CI_WORKSPACE/.openems-env
+    depends_on: [restore-cache]
+
+  build-android-app:
+    when: *main-build
+    image: openems-android:20.32
+    environment:
+      - THEME=${THEME}
+    commands:
+      - source $CI_WORKSPACE/.openems-env
+      - source tools/common.sh
+      - common_build_android_app
+    depends_on: [prepare-environment]
+
+  refresh-dev-android:
+    when: *main-build
+    image: woodpeckerci/rsync:latest
+    settings:
+      <<: *rsync-settings
+      source: $CI_WORKSPACE/ui/android/target/
+      target: /var/opt/develop/fems-artifacts/html/${CI_COMMIT_BRANCH}
+    depends_on: [build-android-app]

io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/ControllerEssGridOptimizedChargeImpl.java

@@ -145,8 +145,7 @@ private void updateConfig(Config config) {
 
 	@Override
 	public void run() throws OpenemsNamedException {
-
-		if (!this.ess.isManaged()) {
+		if (!this.ess.isManaged() && this.config.mode() != Mode.OFF) {
 			this._setConfiguredEssIsNotManaged(true);
 			return;
 		}

io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/RecordWorker.java

@@ -202,8 +202,10 @@ public void collectData() {
 	protected void forever() throws InterruptedException {
 		final var record = this.records.take();
 
-		if (this.config.readOnly() && this.config.debugMode()) {
-			this.log.info("Read-Only-Mode is activated. Not writing record: " + record.toString());
+		if (this.config.readOnly()) {
+			if (this.config.debugMode()) {
+				this.log.info("Read-Only-Mode is activated. Not writing record: " + record.toString());
+			}
 			return;
 		}
 

io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jReadHandler.java

@@ -4,6 +4,7 @@
 import java.time.Instant;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -479,10 +480,10 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 				}, (t, u) -> t, TreeMap::new));
 	}
 
-	private static record Range(ZonedDateTime from, ZonedDateTime to) {
+	protected static record Range(ZonedDateTime from, ZonedDateTime to) {
 	}
 
-	private static Stream<Range> streamRanges(//
+	protected static Stream<Range> streamRanges(//
 			final ZonedDateTime from, //
 			final ZonedDateTime to, //
 			final Resolution resolution //
@@ -493,15 +494,16 @@ private static Stream<Range> streamRanges(//
 		final var builder = Stream.<Range>builder();
 
 		var fromRange = from;
-		var toRange = increase(from, resolution);
+
+		var toRange = truncate(increase(from, resolution), resolution);
 		if (toRange.isAfter(to)) {
 			toRange = to;
 		}
 
 		while (!fromRange.equals(toRange)) {
 			builder.accept(new Range(fromRange, toRange));
 			fromRange = toRange;
-			toRange = increase(toRange, resolution);
+			toRange = truncate(increase(fromRange, resolution), resolution);
 			if (toRange.isAfter(to)) {
 				toRange = to;
 			}
@@ -510,6 +512,18 @@ private static Stream<Range> streamRanges(//
 		return builder.build();
 	}
 
+	private static ZonedDateTime truncate(ZonedDateTime date, Resolution resolution) {
+		return switch (resolution.getUnit()) {
+		case DAYS, HALF_DAYS, HOURS, SECONDS, MINUTES, MILLIS, NANOS, MICROS -> {
+			yield date.truncatedTo(resolution.getUnit());
+		}
+		case CENTURIES, DECADES, ERAS, FOREVER, MILLENNIA, YEARS, WEEKS -> {
+			throw new UnsupportedOperationException();
+		}
+		case MONTHS -> date.withDayOfMonth(1).truncatedTo(ChronoUnit.DAYS);
+		};
+	}
+
 	private static ZonedDateTime increase(ZonedDateTime date, Resolution resolution) {
 		return switch (resolution.getUnit()) {
 		case DAYS, HALF_DAYS, HOURS, SECONDS, MINUTES, MILLIS, NANOS, MICROS -> {

io.openems.edge.timedata.rrd4j/test/io/openems/edge/timedata/rrd4j/Rrd4jReadHandlerTest.java

@@ -163,6 +163,21 @@ public void testQueryHistoricDataWithResolution15minutes() throws Exception {
 		), this.query(new Resolution(15, ChronoUnit.MINUTES)));
 	}
 
+	@Test
+	public void testStreamRanges() throws Exception {
+		final var utc = ZoneId.of("UTC");
+		final var from = ZonedDateTime.of(2023, 12, 26, 0, 0, 0, 0, utc);
+		final var to = ZonedDateTime.of(2024, 3, 8, 0, 0, 0, 0, utc);
+		final var result = Rrd4jReadHandler.streamRanges(from, to, new Resolution(1, ChronoUnit.MONTHS)).toList();
+		assertEquals(4, result.size());
+		assertEquals(new Rrd4jReadHandler.Range(from, ZonedDateTime.of(2024, 1, 1, 0, 0, 0, 0, utc)), result.get(0));
+		assertEquals(new Rrd4jReadHandler.Range(ZonedDateTime.of(2024, 1, 1, 0, 0, 0, 0, utc),
+				ZonedDateTime.of(2024, 2, 1, 0, 0, 0, 0, utc)), result.get(1));
+		assertEquals(new Rrd4jReadHandler.Range(ZonedDateTime.of(2024, 2, 1, 0, 0, 0, 0, utc),
+				ZonedDateTime.of(2024, 3, 1, 0, 0, 0, 0, utc)), result.get(2));
+		assertEquals(new Rrd4jReadHandler.Range(ZonedDateTime.of(2024, 3, 1, 0, 0, 0, 0, utc), to), result.get(3));
+	}
+
 	private SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> query(Resolution resolution)
 			throws IllegalArgumentException, OpenemsNamedException {
 		return this.readHandler.queryHistoricData(this.rrdbId, //

tools/common.sh

@@ -11,8 +11,9 @@ common_initialize_environment() {
     SRC_ANDROID_GRADLE="ui/android/app/build.gradle"
 
     # Set environment variables
-    THEME="openems"
+    THEME="${THEME:-openems}"
     PACKAGE_NAME="openems-edge"
+
     VERSION_STRING=""
     VERSION="$(cd ui && node -p "require('./package.json').version" && cd ..)"
     local tmp_version=$(echo $VERSION | cut -d'-' -f1)
@@ -120,6 +121,36 @@ common_build_ui() {
     fi
 }
 
+common_build_android_app() {
+    echo "# Build OpenEMS Android APP"
+    if [ "${NODE_MODULES_CACHE}" != "" -a -d "$NODE_MODULES_CACHE" ]; then
+        echo "## Use cached node_modules"
+        mv -f "${NODE_MODULES_CACHE}" "ui/node_modules"
+    fi
+    cd ui
+
+    # Install dependencies from package.json
+    npm ci
+    if [ "${NG_CLI_CACHE_PATH}" != "" ]; then 
+        echo "## Angular Cache: $NG_CLI_CACHE_PATH"
+        node_modules/.bin/ng config cli.cache.path "$NG_CLI_CACHE_PATH"
+    fi
+
+    case "${THEME^^}" in
+        "FENECON") NODE_ENV="FENECON";;
+        "HECKERT") NODE_ENV="Heckert";;
+    esac
+
+    # Install depencencies for capacitor
+    NODE_ENV=${NODE_ENV} ionic cap build android -c "${THEME},${THEME}-backend-deploy-app"
+
+    # Build App
+    cd android
+    THEME=${THEME} ./gradlew buildThemeRelease
+
+    cd ../..
+}
+
 common_save_environment() {
     local file=${1:-build.environment}
     echo "
@@ -132,4 +163,4 @@ common_save_environment() {
     export VERSION_DEV_COMMIT=\"$VERSION_DEV_COMMIT\"
     export VERSION_DEV_BUILD_TIME=\"$VERSION_DEV_BUILD_TIME\"
     " | tee $file
-}
+}

tools/drone/openems-android.sh

@@ -2,10 +2,10 @@
 
 NODE_MAJOR=20
 
-ANDROID_SDK_VERSION=9477386
+ANDROID_SDK_VERSION=11076708
 ANDROID_HOME="/opt/android-sdk"
-ANDROID_BUILD_TOOLS_VERSION=32.0.0
-ANDROID_PLATFORMS_VERSION=32
+ANDROID_BUILD_TOOLS_VERSION=34.0.0
+ANDROID_PLATFORMS_VERSION=34
 
 # Build/Update 'openems-android' Container for Drone/Woodpecker CI
 
@@ -14,6 +14,8 @@ docker pull node:${NODE_MAJOR}
 docker build -t openems-android:${NODE_MAJOR}.${ANDROID_PLATFORMS_VERSION} -f - . <<EOF
 FROM node:${NODE_MAJOR}
 
+SHELL ["/bin/bash", "-c"]
+
 RUN apt-get update  \
         && apt-get install --no-install-recommends -y git nodejs wget unzip android-sdk;
 

ui/.eslintrc.json

@@ -88,7 +88,18 @@
             }
           }
         ],
-        "@typescript-eslint/member-ordering": "error"
+        "@typescript-eslint/member-ordering": "error",
+        "no-multiple-empty-lines": "error",
+        "quotes": [
+          "error",
+          "double"
+        ],
+        "@typescript-eslint/switch-exhaustiveness-check": [
+          "error",
+          {
+            "allowDefaultCaseForExhaustiveSwitch": false
+          }
+        ]
       }
     },
     {

ui/.vscode/settings.json

@@ -18,7 +18,8 @@
         "editor.codeActionsOnSave": {
             "source.organizeImports": "explicit",
             "source.removeUnusedImports": "explicit"
-        }
+        },
+        "typescript.preferences.quoteStyle": "double"
     },
     "[jsonc]": {
         "editor.defaultFormatter": "vscode.json-language-features"
@@ -46,5 +47,5 @@
         "**/node_modules",
         "*.svg",
         "*.scss"
-    ]
+    ],
 }