mirror of
https://github.com/home-assistant/frontend.git
synced 2026-07-06 07:32:46 +00:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Petar Petrov
|
f291207b2f |
@@ -1,23 +0,0 @@
|
||||
name: Build frontend target
|
||||
description: Run a gulp build target
|
||||
|
||||
inputs:
|
||||
target:
|
||||
description: gulp target to run
|
||||
required: true
|
||||
github-token:
|
||||
description: GitHub token for fetching nightly translations; omit to build English-only
|
||||
default: ""
|
||||
is-test:
|
||||
description: Set IS_TEST for the build (skips source maps and compression)
|
||||
default: "false"
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- name: Build ${{ inputs.target }}
|
||||
shell: bash
|
||||
run: ./node_modules/.bin/gulp ${{ inputs.target }}
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ inputs.github-token }}
|
||||
IS_TEST: ${{ inputs.is-test }}
|
||||
@@ -1,40 +0,0 @@
|
||||
name: Deploy to Netlify
|
||||
description: Deploy a directory to Netlify (production when alias is empty, otherwise to the alias)
|
||||
|
||||
inputs:
|
||||
dir:
|
||||
description: Directory to deploy
|
||||
required: true
|
||||
alias:
|
||||
description: Deploy alias; leave empty to deploy to production
|
||||
default: ""
|
||||
auth-token:
|
||||
description: NETLIFY_AUTH_TOKEN
|
||||
required: true
|
||||
site-id:
|
||||
description: NETLIFY_SITE_ID
|
||||
required: true
|
||||
|
||||
outputs:
|
||||
netlify_url:
|
||||
description: The deployed URL
|
||||
value: ${{ steps.deploy.outputs.netlify_url }}
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- name: Deploy to Netlify
|
||||
id: deploy
|
||||
shell: bash
|
||||
env:
|
||||
DIR: ${{ inputs.dir }}
|
||||
ALIAS: ${{ inputs.alias }}
|
||||
NETLIFY_AUTH_TOKEN: ${{ inputs.auth-token }}
|
||||
NETLIFY_SITE_ID: ${{ inputs.site-id }}
|
||||
run: |
|
||||
if [ -n "$ALIAS" ]; then
|
||||
npx -y netlify-cli deploy --dir="$DIR" --alias "$ALIAS" --json > deploy_output.json
|
||||
else
|
||||
npx -y netlify-cli deploy --dir="$DIR" --prod --json > deploy_output.json
|
||||
fi
|
||||
echo "netlify_url=$(jq -r '.url // .deploy_url' deploy_output.json)" >> "$GITHUB_OUTPUT"
|
||||
@@ -1,23 +0,0 @@
|
||||
name: Setup Node and install
|
||||
description: Set up Node from .nvmrc and install yarn dependencies
|
||||
|
||||
inputs:
|
||||
immutable:
|
||||
description: Pass --immutable to yarn install
|
||||
default: "true"
|
||||
cache:
|
||||
description: Enable the yarn cache in setup-node
|
||||
default: "true"
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: ${{ inputs.cache == 'true' && 'yarn' || '' }}
|
||||
|
||||
- name: Install dependencies
|
||||
shell: bash
|
||||
run: yarn install ${{ inputs.immutable == 'true' && '--immutable' || '' }}
|
||||
@@ -1,14 +1,7 @@
|
||||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: "github-actions"
|
||||
# Dependabot only scans .github/workflows by default; composite actions
|
||||
# under .github/actions must be listed explicitly to stay updated.
|
||||
# https://github.com/dependabot/dependabot-core/issues/6704
|
||||
directories:
|
||||
- "/"
|
||||
- "/.github/actions/setup"
|
||||
- "/.github/actions/build"
|
||||
- "/.github/actions/netlify-deploy"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: weekly
|
||||
time: "06:00"
|
||||
|
||||
@@ -42,6 +42,5 @@ Dependencies:
|
||||
GitHub Actions:
|
||||
- changed-files:
|
||||
- any-glob-to-any-file:
|
||||
- .github/actions/**
|
||||
- .github/workflows/**
|
||||
- .github/*.yml
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env node
|
||||
// Restricts Task issues to organization members: closes and labels the issue with
|
||||
// an explanatory comment when the author is not an org member. Invoked from the
|
||||
// `check-authorization` job in .github/workflows/restrict-task-creation.yaml via
|
||||
// `check-authorization` job in .github/workflows/restrict-task-creation.yml via
|
||||
// actions/github-script:
|
||||
//
|
||||
// const { default: checkTaskAuthorization } =
|
||||
|
||||
@@ -6,14 +6,12 @@ on:
|
||||
- dev
|
||||
- master
|
||||
paths:
|
||||
- ".github/actions/**"
|
||||
- ".github/workflows/**"
|
||||
pull_request:
|
||||
branches:
|
||||
- dev
|
||||
- master
|
||||
paths:
|
||||
- ".github/actions/**"
|
||||
- ".github/workflows/**"
|
||||
|
||||
concurrency:
|
||||
|
||||
@@ -29,23 +29,28 @@ jobs:
|
||||
ref: dev
|
||||
persist-credentials: false
|
||||
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install --immutable
|
||||
|
||||
- name: Build Cast
|
||||
uses: ./.github/actions/build
|
||||
with:
|
||||
target: build-cast
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: ./node_modules/.bin/gulp build-cast
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Deploy to Netlify
|
||||
id: deploy
|
||||
uses: ./.github/actions/netlify-deploy
|
||||
with:
|
||||
dir: cast/dist
|
||||
alias: dev
|
||||
auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
|
||||
site-id: ${{ secrets.NETLIFY_CAST_SITE_ID }}
|
||||
run: |
|
||||
npx -y netlify-cli deploy --dir=cast/dist --alias dev --json > deploy_output.json
|
||||
echo "netlify_url=$(jq -r '.url // .deploy_url' deploy_output.json)" >> "$GITHUB_OUTPUT"
|
||||
env:
|
||||
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
|
||||
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_CAST_SITE_ID }}
|
||||
|
||||
deploy_master:
|
||||
runs-on: ubuntu-latest
|
||||
@@ -61,19 +66,25 @@ jobs:
|
||||
ref: master
|
||||
persist-credentials: false
|
||||
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install --immutable
|
||||
|
||||
- name: Build Cast
|
||||
uses: ./.github/actions/build
|
||||
with:
|
||||
target: build-cast
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: ./node_modules/.bin/gulp build-cast
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Deploy to Netlify
|
||||
id: deploy
|
||||
uses: ./.github/actions/netlify-deploy
|
||||
with:
|
||||
dir: cast/dist
|
||||
auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
|
||||
site-id: ${{ secrets.NETLIFY_CAST_SITE_ID }}
|
||||
run: |
|
||||
npx -y netlify-cli deploy --dir=cast/dist --prod --json > deploy_output.json
|
||||
echo "netlify_url=$(jq -r '.url // .deploy_url' deploy_output.json)" >> "$GITHUB_OUTPUT"
|
||||
env:
|
||||
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
|
||||
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_CAST_SITE_ID }}
|
||||
|
||||
+26
-23
@@ -12,6 +12,7 @@ on:
|
||||
|
||||
env:
|
||||
NODE_OPTIONS: --max_old_space_size=6144
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
@@ -29,15 +30,17 @@ jobs:
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||
with:
|
||||
persist-credentials: false
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
- name: Install dependencies
|
||||
run: yarn install --immutable
|
||||
- name: Check for duplicate dependencies
|
||||
run: yarn dedupe --check
|
||||
- name: Build resources
|
||||
id: build_resources
|
||||
run: ./node_modules/.bin/gulp gen-icons-json build-translations build-locale-data gather-gallery-pages
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Setup lint cache
|
||||
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
|
||||
with:
|
||||
@@ -50,16 +53,12 @@ jobs:
|
||||
- name: Run eslint
|
||||
run: yarn run lint:eslint --quiet
|
||||
- name: Run tsc
|
||||
if: ${{ !cancelled() && steps.build_resources.outcome == 'success' }}
|
||||
run: yarn run lint:types
|
||||
- name: Run lit-analyzer
|
||||
if: ${{ !cancelled() && steps.build_resources.outcome == 'success' }}
|
||||
run: yarn run lint:lit --quiet
|
||||
- name: Run prettier
|
||||
if: ${{ !cancelled() && steps.build_resources.outcome == 'success' }}
|
||||
run: yarn run lint:prettier
|
||||
- name: Check dependency licenses
|
||||
if: ${{ !cancelled() && steps.build_resources.outcome == 'success' }}
|
||||
run: yarn run lint:licenses
|
||||
test:
|
||||
name: Run tests
|
||||
@@ -69,33 +68,37 @@ jobs:
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||
with:
|
||||
persist-credentials: false
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
- name: Install dependencies
|
||||
run: yarn install --immutable
|
||||
- name: Build resources
|
||||
run: ./node_modules/.bin/gulp gen-icons-json build-translations build-locale-data
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Run Tests
|
||||
run: yarn run test
|
||||
build:
|
||||
name: Build frontend
|
||||
needs:
|
||||
- lint
|
||||
- test
|
||||
needs: [lint, test]
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check out files from GitHub
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||
with:
|
||||
persist-credentials: false
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Build Application
|
||||
uses: ./.github/actions/build
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
target: build-app
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
is-test: true
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
- name: Install dependencies
|
||||
run: yarn install --immutable
|
||||
- name: Build Application
|
||||
run: ./node_modules/.bin/gulp build-app
|
||||
env:
|
||||
IS_TEST: "true"
|
||||
- name: Upload bundle stats
|
||||
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
|
||||
with:
|
||||
|
||||
@@ -30,22 +30,28 @@ jobs:
|
||||
ref: dev
|
||||
persist-credentials: false
|
||||
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install --immutable
|
||||
|
||||
- name: Build Demo
|
||||
uses: ./.github/actions/build
|
||||
with:
|
||||
target: build-demo
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: ./node_modules/.bin/gulp build-demo
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Deploy to Netlify
|
||||
id: deploy
|
||||
uses: ./.github/actions/netlify-deploy
|
||||
with:
|
||||
dir: demo/dist
|
||||
auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
|
||||
site-id: ${{ secrets.NETLIFY_DEMO_DEV_SITE_ID }}
|
||||
run: |
|
||||
npx -y netlify-cli deploy --dir=demo/dist --prod --json > deploy_output.json
|
||||
echo "netlify_url=$(jq -r '.url // .deploy_url' deploy_output.json)" >> "$GITHUB_OUTPUT"
|
||||
env:
|
||||
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
|
||||
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_DEMO_DEV_SITE_ID }}
|
||||
|
||||
deploy_master:
|
||||
runs-on: ubuntu-latest
|
||||
@@ -61,19 +67,25 @@ jobs:
|
||||
ref: master
|
||||
persist-credentials: false
|
||||
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install --immutable
|
||||
|
||||
- name: Build Demo
|
||||
uses: ./.github/actions/build
|
||||
with:
|
||||
target: build-demo
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: ./node_modules/.bin/gulp build-demo
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Deploy to Netlify
|
||||
id: deploy
|
||||
uses: ./.github/actions/netlify-deploy
|
||||
with:
|
||||
dir: demo/dist
|
||||
auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
|
||||
site-id: ${{ secrets.NETLIFY_DEMO_SITE_ID }}
|
||||
run: |
|
||||
npx -y netlify-cli deploy --dir=demo/dist --prod --json > deploy_output.json
|
||||
echo "netlify_url=$(jq -r '.url // .deploy_url' deploy_output.json)" >> "$GITHUB_OUTPUT"
|
||||
env:
|
||||
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
|
||||
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_DEMO_SITE_ID }}
|
||||
|
||||
@@ -23,19 +23,25 @@ jobs:
|
||||
with:
|
||||
persist-credentials: false
|
||||
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install --immutable
|
||||
|
||||
- name: Build Gallery
|
||||
uses: ./.github/actions/build
|
||||
with:
|
||||
target: build-gallery
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: ./node_modules/.bin/gulp build-gallery
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Deploy to Netlify
|
||||
id: deploy
|
||||
uses: ./.github/actions/netlify-deploy
|
||||
with:
|
||||
dir: gallery/dist
|
||||
auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
|
||||
site-id: ${{ secrets.NETLIFY_GALLERY_SITE_ID }}
|
||||
run: |
|
||||
npx -y netlify-cli deploy --dir=gallery/dist --prod --json > deploy_output.json
|
||||
echo "netlify_url=$(jq -r '.url // .deploy_url' deploy_output.json)" >> "$GITHUB_OUTPUT"
|
||||
env:
|
||||
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
|
||||
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_GALLERY_SITE_ID }}
|
||||
|
||||
@@ -28,23 +28,29 @@ jobs:
|
||||
with:
|
||||
persist-credentials: false
|
||||
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install --immutable
|
||||
|
||||
- name: Build Gallery
|
||||
uses: ./.github/actions/build
|
||||
with:
|
||||
target: build-gallery
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: ./node_modules/.bin/gulp build-gallery
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Deploy preview to Netlify
|
||||
id: deploy
|
||||
uses: ./.github/actions/netlify-deploy
|
||||
with:
|
||||
dir: gallery/dist
|
||||
alias: deploy-preview-${{ github.event.number }}
|
||||
auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
|
||||
site-id: ${{ secrets.NETLIFY_GALLERY_SITE_ID }}
|
||||
run: |
|
||||
npx -y netlify-cli deploy --dir=gallery/dist --alias "deploy-preview-${{ github.event.number }}" \
|
||||
--json > deploy_output.json
|
||||
echo "netlify_url=$(jq -r '.url // .deploy_url' deploy_output.json)" >> "$GITHUB_OUTPUT"
|
||||
env:
|
||||
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
|
||||
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_GALLERY_SITE_ID }}
|
||||
|
||||
- name: Generate summary
|
||||
run: echo "${{ steps.deploy.outputs.netlify_url }}" >> "$GITHUB_STEP_SUMMARY"
|
||||
|
||||
+51
-30
@@ -32,14 +32,19 @@ jobs:
|
||||
with:
|
||||
persist-credentials: false
|
||||
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install --immutable
|
||||
|
||||
- name: Build demo
|
||||
uses: ./.github/actions/build
|
||||
with:
|
||||
target: build-demo
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: ./node_modules/.bin/gulp build-demo
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Upload demo build
|
||||
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
|
||||
@@ -59,14 +64,19 @@ jobs:
|
||||
with:
|
||||
persist-credentials: false
|
||||
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install --immutable
|
||||
|
||||
- name: Build e2e test app
|
||||
uses: ./.github/actions/build
|
||||
with:
|
||||
target: build-e2e-test-app
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: ./node_modules/.bin/gulp build-e2e-test-app
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Upload e2e test app build
|
||||
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
|
||||
@@ -86,14 +96,19 @@ jobs:
|
||||
with:
|
||||
persist-credentials: false
|
||||
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install --immutable
|
||||
|
||||
- name: Build gallery
|
||||
uses: ./.github/actions/build
|
||||
with:
|
||||
target: build-gallery
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: ./node_modules/.bin/gulp build-gallery
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Upload gallery build
|
||||
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
|
||||
@@ -118,22 +133,22 @@ jobs:
|
||||
with:
|
||||
persist-credentials: false
|
||||
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
||||
# Resolve the installed Playwright version so the browser cache tracks
|
||||
# Playwright itself, not every unrelated dependency bump.
|
||||
- name: Resolve Playwright version
|
||||
id: playwright-version
|
||||
run: echo "version=$(node -p 'require("@playwright/test/package.json").version')" >> "$GITHUB_OUTPUT"
|
||||
- name: Install dependencies
|
||||
run: yarn install --immutable
|
||||
|
||||
# Cache the downloaded browser build keyed on the installed Playwright
|
||||
# version, so re-runs skip the ~170 MB download unless Playwright changes.
|
||||
# Cache the downloaded browser build keyed on the pinned Playwright
|
||||
# version (yarn.lock), so re-runs skip the ~170 MB download.
|
||||
- name: Cache Playwright browsers
|
||||
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
|
||||
with:
|
||||
path: ~/.cache/ms-playwright
|
||||
key: ${{ runner.os }}-playwright-${{ steps.playwright-version.outputs.version }}
|
||||
key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
|
||||
|
||||
- name: Install Playwright browsers
|
||||
run: yarn playwright install --with-deps chromium
|
||||
@@ -184,8 +199,14 @@ jobs:
|
||||
with:
|
||||
persist-credentials: false
|
||||
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install --immutable
|
||||
|
||||
- name: Download blob report (local)
|
||||
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
|
||||
|
||||
@@ -29,10 +29,14 @@ jobs:
|
||||
with:
|
||||
python-version: ${{ env.PYTHON_VERSION }}
|
||||
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
immutable: false
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install
|
||||
|
||||
- name: Download translations
|
||||
run: ./script/translations_download
|
||||
|
||||
@@ -38,11 +38,13 @@ jobs:
|
||||
- name: Verify version
|
||||
uses: home-assistant/actions/helpers/verify-version@f4ca6f671bd429efb108c0f2fa0ae8af0215986c # master
|
||||
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
immutable: false
|
||||
cache: false
|
||||
node-version-file: ".nvmrc"
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install
|
||||
|
||||
- name: Download Translations
|
||||
run: ./script/translations_download
|
||||
@@ -114,11 +116,12 @@ jobs:
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||
with:
|
||||
persist-credentials: false
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
immutable: false
|
||||
cache: false
|
||||
node-version-file: ".nvmrc"
|
||||
- name: Install dependencies
|
||||
run: yarn install
|
||||
- name: Download Translations
|
||||
run: ./script/translations_download
|
||||
env:
|
||||
|
||||
@@ -22,11 +22,15 @@ jobs:
|
||||
steps:
|
||||
- name: Checkout the repository
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||
with:
|
||||
persist-credentials: false
|
||||
|
||||
- name: Setup Node and install
|
||||
uses: ./.github/actions/setup
|
||||
- name: Set up Node
|
||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install --immutable
|
||||
|
||||
- name: Regenerate numeric device classes
|
||||
run: ./script/gen_numeric_device_classes
|
||||
|
||||
@@ -6,7 +6,6 @@ on:
|
||||
branches:
|
||||
- dev
|
||||
paths:
|
||||
- .github/workflows/translations.yaml
|
||||
- src/translations/en.json
|
||||
|
||||
permissions:
|
||||
@@ -23,6 +22,6 @@ jobs:
|
||||
persist-credentials: false
|
||||
|
||||
- name: Upload Translations
|
||||
run: ./script/translations_upload_base
|
||||
env:
|
||||
LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
|
||||
run: |
|
||||
export LOKALISE_TOKEN="${{ secrets.LOKALISE_TOKEN }}"
|
||||
./script/translations_upload_base
|
||||
|
||||
@@ -6,8 +6,6 @@ build/
|
||||
dist/
|
||||
/hass_frontend/
|
||||
/translations/
|
||||
# Composite action source, not build output
|
||||
!/.github/actions/build/
|
||||
|
||||
# yarn
|
||||
.yarn/*
|
||||
|
||||
+1
-1
@@ -152,7 +152,7 @@
|
||||
"@octokit/rest": "22.0.1",
|
||||
"@playwright/test": "1.61.1",
|
||||
"@rsdoctor/rspack-plugin": "1.5.17",
|
||||
"@rspack/core": "2.1.2",
|
||||
"@rspack/core": "2.1.1",
|
||||
"@rspack/dev-server": "2.1.0",
|
||||
"@types/babel__plugin-transform-runtime": "7.9.5",
|
||||
"@types/chromecast-caf-receiver": "6.0.26",
|
||||
|
||||
@@ -1,8 +1,16 @@
|
||||
import type { BarSeriesOption } from "echarts/types/dist/shared";
|
||||
|
||||
/**
|
||||
* `extraBuckets` (only used when `stacked`) seeds the bucket union with the
|
||||
* expected statistics grid so sparse datasets get zero-filled across the whole
|
||||
* range, including past their last real point. Without it, buckets are only
|
||||
* derived from the data and trailing buckets are never filled (legacy
|
||||
* behavior, kept for callers that don't pass a grid).
|
||||
*/
|
||||
export function fillDataGapsAndRoundCaps(
|
||||
datasets: BarSeriesOption[],
|
||||
stacked = true
|
||||
stacked = true,
|
||||
extraBuckets?: number[]
|
||||
) {
|
||||
if (!stacked) {
|
||||
// For non-stacked charts, we can simply apply an overall border to each stack
|
||||
@@ -44,6 +52,7 @@ export function fillDataGapsAndRoundCaps(
|
||||
dataset.data!.map((datapoint) => Number(datapoint![0]))
|
||||
)
|
||||
.flat()
|
||||
.concat(extraBuckets ?? [])
|
||||
)
|
||||
).sort((a, b) => a - b);
|
||||
|
||||
@@ -61,9 +70,18 @@ export function fillDataGapsAndRoundCaps(
|
||||
const x = item.value?.[0];
|
||||
const stack = datasets[i].stack ?? "";
|
||||
if (x === undefined) {
|
||||
continue;
|
||||
// Past the end of this dataset's data. Only append trailing buckets
|
||||
// when an explicit grid was provided; originally-empty datasets
|
||||
// (e.g. compare placeholders) stay empty either way.
|
||||
if (
|
||||
dataPoint !== undefined ||
|
||||
extraBuckets === undefined ||
|
||||
!datasets[i].data!.length
|
||||
) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if (Number(x) !== bucket) {
|
||||
if (x === undefined || Number(x) !== bucket) {
|
||||
datasets[i].data?.splice(index, 0, {
|
||||
value: [bucket, 0],
|
||||
itemStyle: {
|
||||
|
||||
@@ -5,7 +5,6 @@ import { customElement, property, state } from "lit/decorators";
|
||||
import memoizeOne from "memoize-one";
|
||||
import type { HASSDomEvent } from "../../../common/dom/fire_event";
|
||||
import { navigate } from "../../../common/navigate";
|
||||
import { extractSearchParam } from "../../../common/url/search-params";
|
||||
import "../../../components/ha-dropdown";
|
||||
import type { HaDropdownSelectEvent } from "../../../components/ha-dropdown";
|
||||
import "../../../components/ha-dropdown-item";
|
||||
@@ -24,14 +23,8 @@ import type {
|
||||
StoreAddon,
|
||||
SupervisorStore,
|
||||
} from "../../../data/supervisor/store";
|
||||
import {
|
||||
addStoreRepository,
|
||||
fetchSupervisorStore,
|
||||
} from "../../../data/supervisor/store";
|
||||
import {
|
||||
showAlertDialog,
|
||||
showConfirmationDialog,
|
||||
} from "../../../dialogs/generic/show-dialog-box";
|
||||
import { fetchSupervisorStore } from "../../../data/supervisor/store";
|
||||
import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box";
|
||||
import "../../../layouts/hass-error-screen";
|
||||
import "../../../layouts/hass-loading-screen";
|
||||
import "../../../layouts/hass-subpage";
|
||||
@@ -89,15 +82,7 @@ export class HaConfigAppsAvailable extends LitElement {
|
||||
|
||||
protected firstUpdated(changedProps: PropertyValues<this>) {
|
||||
super.firstUpdated(changedProps);
|
||||
const repositoryUrl = extractSearchParam("repository_url");
|
||||
if (repositoryUrl) {
|
||||
navigate("/config/apps/available", { replace: true });
|
||||
}
|
||||
this._loadData().then(() => {
|
||||
if (repositoryUrl) {
|
||||
this._addRepository(repositoryUrl);
|
||||
}
|
||||
});
|
||||
this._loadData();
|
||||
this.addEventListener("hass-api-called", (ev) => this._apiCalled(ev));
|
||||
}
|
||||
|
||||
@@ -243,40 +228,6 @@ export class HaConfigAppsAvailable extends LitElement {
|
||||
navigate("/config/apps/registries");
|
||||
}
|
||||
|
||||
private async _addRepository(repositoryUrl: string): Promise<void> {
|
||||
if (
|
||||
!this._store ||
|
||||
this._store.repositories.some((repo) => repo.source === repositoryUrl)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (
|
||||
!(await showConfirmationDialog(this, {
|
||||
title: this.hass.localize(
|
||||
"ui.panel.config.apps.my.add_repository_title"
|
||||
),
|
||||
text: this.hass.localize(
|
||||
"ui.panel.config.apps.my.add_repository_store_description",
|
||||
{ repository: repositoryUrl }
|
||||
),
|
||||
confirmText: this.hass.localize("ui.common.add"),
|
||||
dismissText: this.hass.localize("ui.common.cancel"),
|
||||
}))
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await addStoreRepository(this.hass, repositoryUrl);
|
||||
await this._loadData();
|
||||
} catch (err: any) {
|
||||
showAlertDialog(this, {
|
||||
text: extractApiErrorMessage(err),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private async _loadData(): Promise<void> {
|
||||
try {
|
||||
const [addon, store] = await Promise.all([
|
||||
|
||||
@@ -5,6 +5,7 @@ import { customElement, property, state } from "lit/decorators";
|
||||
import memoizeOne from "memoize-one";
|
||||
import { fireEvent } from "../../../common/dom/fire_event";
|
||||
import { caseInsensitiveStringCompare } from "../../../common/string/compare";
|
||||
import { extractSearchParam } from "../../../common/url/search-params";
|
||||
import "../../../components/data-table/ha-data-table";
|
||||
import type { DataTableColumnContainer } from "../../../components/data-table/ha-data-table";
|
||||
import "../../../components/ha-button";
|
||||
@@ -55,7 +56,12 @@ export class HaConfigAppsRepositories extends LitElement {
|
||||
@state() private _error?: string;
|
||||
|
||||
protected firstUpdated() {
|
||||
this._loadData();
|
||||
this._loadData().then(() => {
|
||||
const repositoryUrl = extractSearchParam("repository_url");
|
||||
if (repositoryUrl) {
|
||||
this._addRepository(repositoryUrl);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private _columns = memoizeOne(
|
||||
@@ -218,6 +224,18 @@ export class HaConfigAppsRepositories extends LitElement {
|
||||
});
|
||||
}
|
||||
|
||||
private async _addRepository(url: string) {
|
||||
try {
|
||||
await addStoreRepository(this.hass, url);
|
||||
await this._loadData();
|
||||
fireEvent(this, "apps-collection-refresh", { collection: "store" });
|
||||
} catch (err: any) {
|
||||
showAlertDialog(this, {
|
||||
text: extractApiErrorMessage(err),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private _removeRepository = async (ev: Event) => {
|
||||
const slug = (ev.currentTarget as any).slug;
|
||||
const repo = this._repositories?.find((r) => r.slug === slug);
|
||||
|
||||
@@ -12,12 +12,14 @@ import {
|
||||
startOfMonth,
|
||||
addYears,
|
||||
addMonths,
|
||||
addMinutes,
|
||||
addHours,
|
||||
startOfDay,
|
||||
addDays,
|
||||
subDays,
|
||||
} from "date-fns";
|
||||
import type {
|
||||
BarSeriesOption,
|
||||
CallbackDataParams,
|
||||
LineSeriesOption,
|
||||
TopLevelFormatterParams,
|
||||
@@ -377,12 +379,97 @@ const PERIOD_MS: Record<string, number> = {
|
||||
/**
|
||||
* Offset from a period's start to its midpoint, for centering sub-daily bars
|
||||
* (and forecast lines) between axis ticks — 0 for daily+ periods, which sit at
|
||||
* the start. Derived from the period, not from the data, so the first/only
|
||||
* bucket centers identically to every other bucket. (Previously estimated from
|
||||
* the gap between the first two entries, which collapsed to 0 with one bucket.)
|
||||
* the start.
|
||||
*
|
||||
* `measuredGap` is the gap between the first two entries, when available. It
|
||||
* adapts the offset to data that is finer-grained than the nominal period
|
||||
* (e.g. external forecast data), but is clamped to the nominal period so
|
||||
* sparse data (gaps between readings) can't inflate the offset, and a lone
|
||||
* bucket (no gap to measure) still centers on the nominal midpoint.
|
||||
*/
|
||||
export function getPeriodMidpointOffset(period: string): number {
|
||||
return (PERIOD_MS[period] ?? 0) / 2;
|
||||
export function getPeriodMidpointOffset(
|
||||
period: string,
|
||||
measuredGap?: number
|
||||
): number {
|
||||
const nominal = PERIOD_MS[period] ?? 0;
|
||||
return (measuredGap ? Math.min(measuredGap, nominal) : nominal) / 2;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate the expected statistics-bucket grid across [start, end) so sparse
|
||||
* data can be zero-filled. Without a dense grid, ECharts derives the bar band
|
||||
* width from the minimum gap between data points: sparse data yields
|
||||
* oversized bars, and a single point makes ECharts expand the time axis by
|
||||
* ±40% of its span, ignoring the configured min/max.
|
||||
*
|
||||
* The grid is anchored on the first real data bucket of a non-compare bar
|
||||
* series rather than on `start`: recorder buckets are UTC-aligned, so in
|
||||
* half-hour timezones they don't sit on local period boundaries. Stepping
|
||||
* from a real bucket keeps generated buckets exactly on the data's grid
|
||||
* (midpoints for sub-daily periods, period starts otherwise). Returns an
|
||||
* empty array when there is no data to anchor on.
|
||||
*/
|
||||
export function generateFillBuckets(
|
||||
datasets: BarSeriesOption[],
|
||||
start: Date,
|
||||
end: Date,
|
||||
period: "5minute" | "hour" | "day" | "month"
|
||||
): number[] {
|
||||
let anchor: number | undefined;
|
||||
for (const dataset of datasets) {
|
||||
if (
|
||||
dataset.type !== "bar" ||
|
||||
String(dataset.id).startsWith("compare-") ||
|
||||
!dataset.data?.length
|
||||
) {
|
||||
continue;
|
||||
}
|
||||
const first = dataset.data[0];
|
||||
const value =
|
||||
first && typeof first === "object" && "value" in first
|
||||
? first.value
|
||||
: first;
|
||||
const x = Number((value as number[])?.[0]);
|
||||
if (!Number.isNaN(x)) {
|
||||
anchor = x;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (anchor === undefined) {
|
||||
return [];
|
||||
}
|
||||
|
||||
const anchorDate = new Date(anchor);
|
||||
// Step relative to the anchor (not iteratively) so month-length clamping
|
||||
// and DST shifts can't accumulate drift.
|
||||
const bucketAt = (n: number): number =>
|
||||
(period === "5minute"
|
||||
? addMinutes(anchorDate, 5 * n)
|
||||
: period === "hour"
|
||||
? addHours(anchorDate, n)
|
||||
: period === "day"
|
||||
? addDays(anchorDate, n)
|
||||
: addMonths(anchorDate, n)
|
||||
).getTime();
|
||||
|
||||
const startMs = start.getTime();
|
||||
const endMs = end.getTime();
|
||||
const buckets: number[] = [];
|
||||
for (let n = 0; ; n--) {
|
||||
const ts = bucketAt(n);
|
||||
if (ts < startMs) {
|
||||
break;
|
||||
}
|
||||
buckets.push(ts);
|
||||
}
|
||||
for (let n = 1; ; n++) {
|
||||
const ts = bucketAt(n);
|
||||
if (ts >= endMs) {
|
||||
break;
|
||||
}
|
||||
buckets.push(ts);
|
||||
}
|
||||
return buckets;
|
||||
}
|
||||
|
||||
export interface UntrackedSplit {
|
||||
|
||||
@@ -23,6 +23,7 @@ import {
|
||||
computeStatMidpoint,
|
||||
type EnergyDataPoint,
|
||||
fillDataGapsAndRoundCaps,
|
||||
generateFillBuckets,
|
||||
getCompareTransform,
|
||||
getPeriodMidpointOffset,
|
||||
splitUntrackedConsumption,
|
||||
@@ -238,15 +239,15 @@ function processUntracked(
|
||||
const sortedTimes = Object.keys(consumptionData.used_total).sort(
|
||||
(a, b) => Number(a) - Number(b)
|
||||
);
|
||||
// Only start timestamps available here, so center sub-daily bars using the
|
||||
// gap between the first two entries. With a lone first-of-day bucket there is
|
||||
// no gap to measure, so fall back to the nominal period midpoint — which
|
||||
// matches the device bars' computeStatMidpoint instead of collapsing to the
|
||||
// period start and splitting into a second stack.
|
||||
const periodOffset =
|
||||
(period === "hour" || period === "5minute") && sortedTimes.length >= 2
|
||||
? (Number(sortedTimes[1]) - Number(sortedTimes[0])) / 2
|
||||
: getPeriodMidpointOffset(period);
|
||||
// Only start timestamps available here, so center sub-daily bars from the
|
||||
// gap between the first two entries, clamped to the nominal period so
|
||||
// sparse or lone buckets stay centered on the same grid as the device bars.
|
||||
const periodOffset = getPeriodMidpointOffset(
|
||||
period,
|
||||
sortedTimes.length >= 2
|
||||
? Number(sortedTimes[1]) - Number(sortedTimes[0])
|
||||
: undefined
|
||||
);
|
||||
sortedTimes.forEach((time) => {
|
||||
const ts = Number(time);
|
||||
const x = compare
|
||||
@@ -515,7 +516,11 @@ export function generateEnergyDevicesDetailGraphData(
|
||||
}
|
||||
}
|
||||
|
||||
fillDataGapsAndRoundCaps(datasets);
|
||||
fillDataGapsAndRoundCaps(
|
||||
datasets,
|
||||
true,
|
||||
generateFillBuckets(datasets, start, end, getSuggestedPeriod(start, end))
|
||||
);
|
||||
const yAxisFractionDigits = computeYAxisFractionDigits(yMin, yMax);
|
||||
|
||||
return {
|
||||
|
||||
@@ -12,6 +12,7 @@ import type { HomeAssistant } from "../../../../types";
|
||||
import { getEnergyColor } from "./common/color";
|
||||
import {
|
||||
type EnergyDataPoint,
|
||||
generateFillBuckets,
|
||||
getCompareTransform,
|
||||
} from "./common/energy-chart-options";
|
||||
|
||||
@@ -113,7 +114,11 @@ export function generateEnergyGasGraphData(
|
||||
)
|
||||
);
|
||||
|
||||
fillDataGapsAndRoundCaps(datasets);
|
||||
fillDataGapsAndRoundCaps(
|
||||
datasets,
|
||||
true,
|
||||
generateFillBuckets(datasets, start, end, period)
|
||||
);
|
||||
const yAxisFractionDigits = computeYAxisFractionDigits(yMin, yMax);
|
||||
const chartData = datasets;
|
||||
const total = processTotal(energyData.stats, gasSources);
|
||||
|
||||
@@ -13,6 +13,7 @@ import { getEnergyColor } from "./common/color";
|
||||
import {
|
||||
type EnergyDataPoint,
|
||||
fillDataGapsAndRoundCaps,
|
||||
generateFillBuckets,
|
||||
getCompareTransform,
|
||||
getPeriodMidpointOffset,
|
||||
} from "./common/energy-chart-options";
|
||||
@@ -117,7 +118,11 @@ export function generateEnergySolarGraphData(
|
||||
)
|
||||
);
|
||||
|
||||
fillDataGapsAndRoundCaps(datasets as BarSeriesOption[]);
|
||||
fillDataGapsAndRoundCaps(
|
||||
datasets as BarSeriesOption[],
|
||||
true,
|
||||
generateFillBuckets(datasets as BarSeriesOption[], start, end, period)
|
||||
);
|
||||
|
||||
if (forecasts) {
|
||||
datasets.push(
|
||||
@@ -322,20 +327,18 @@ function processForecast(
|
||||
|
||||
if (forecastsData) {
|
||||
const solarForecastData: LineSeriesOption["data"] = [];
|
||||
// Only center forecast points for sub-daily periods to align with bars.
|
||||
// Only start timestamps available, so estimate midpoint from the gap
|
||||
// between the first two entries; with a lone first bucket there is no
|
||||
// gap to measure, so fall back to the nominal period midpoint.
|
||||
let forecastOffset = 0;
|
||||
if (period === "hour" || period === "5minute") {
|
||||
const forecastTimes = Object.keys(forecastsData)
|
||||
.map(Number)
|
||||
.sort((a, b) => a - b);
|
||||
forecastOffset =
|
||||
forecastTimes.length >= 2
|
||||
? (forecastTimes[1] - forecastTimes[0]) / 2
|
||||
: getPeriodMidpointOffset(period);
|
||||
}
|
||||
// Center forecast points for sub-daily periods from the gap between
|
||||
// the first two entries, clamped to the nominal period so sparse or
|
||||
// lone forecast buckets still align with the bars.
|
||||
const forecastTimes = Object.keys(forecastsData)
|
||||
.map(Number)
|
||||
.sort((a, b) => a - b);
|
||||
const forecastOffset = getPeriodMidpointOffset(
|
||||
period,
|
||||
forecastTimes.length >= 2
|
||||
? forecastTimes[1] - forecastTimes[0]
|
||||
: undefined
|
||||
);
|
||||
for (const [time, value] of Object.entries(forecastsData)) {
|
||||
const kWh = value / 1000;
|
||||
solarForecastData.push([Number(time) + forecastOffset, kWh]);
|
||||
|
||||
@@ -37,6 +37,7 @@ import { hasConfigChanged } from "../../common/has-changed";
|
||||
import {
|
||||
type EnergyDataPoint,
|
||||
fillDataGapsAndRoundCaps,
|
||||
generateFillBuckets,
|
||||
getCommonOptions,
|
||||
getCompareTransform,
|
||||
getPeriodMidpointOffset,
|
||||
@@ -450,7 +451,16 @@ export class HuiEnergyUsageGraphCard
|
||||
|
||||
// @ts-expect-error
|
||||
datasets.sort((a, b) => a.order - b.order);
|
||||
fillDataGapsAndRoundCaps(datasets);
|
||||
fillDataGapsAndRoundCaps(
|
||||
datasets,
|
||||
true,
|
||||
generateFillBuckets(
|
||||
datasets,
|
||||
this._start,
|
||||
this._end,
|
||||
getSuggestedPeriod(this._start, this._end)
|
||||
)
|
||||
);
|
||||
this._yAxisFractionDigits = computeYAxisFractionDigits(yMin, yMax);
|
||||
this._chartData = datasets;
|
||||
this._legendData = this._getLegendData(datasets);
|
||||
@@ -596,15 +606,14 @@ export class HuiEnergyUsageGraphCard
|
||||
|
||||
const uniqueKeys = summedData.timestamps;
|
||||
|
||||
// Only center bars for sub-daily periods (hour/5min). Only start timestamps
|
||||
// available here, so estimate midpoint from the gap between the first two
|
||||
// entries; with a lone first-of-day bucket there is no gap to measure, so
|
||||
// fall back to the nominal period midpoint so the bar stays centered.
|
||||
// Only start timestamps available here, so center sub-daily bars from the
|
||||
// gap between the first two entries, clamped to the nominal period so
|
||||
// sparse or lone buckets stay centered on the same grid as dense data.
|
||||
const period = getSuggestedPeriod(this._start, this._end);
|
||||
const periodOffset =
|
||||
(period === "hour" || period === "5minute") && uniqueKeys.length >= 2
|
||||
? (uniqueKeys[1] - uniqueKeys[0]) / 2
|
||||
: getPeriodMidpointOffset(period);
|
||||
const periodOffset = getPeriodMidpointOffset(
|
||||
period,
|
||||
uniqueKeys.length >= 2 ? uniqueKeys[1] - uniqueKeys[0] : undefined
|
||||
);
|
||||
|
||||
const compareTransform = getCompareTransform(
|
||||
this._start,
|
||||
|
||||
@@ -31,6 +31,7 @@ import {
|
||||
computeStatMidpoint,
|
||||
type EnergyDataPoint,
|
||||
fillDataGapsAndRoundCaps,
|
||||
generateFillBuckets,
|
||||
getCommonOptions,
|
||||
getCompareTransform,
|
||||
} from "./common/energy-chart-options";
|
||||
@@ -263,7 +264,16 @@ export class HuiEnergyWaterGraphCard
|
||||
)
|
||||
);
|
||||
|
||||
fillDataGapsAndRoundCaps(datasets);
|
||||
fillDataGapsAndRoundCaps(
|
||||
datasets,
|
||||
true,
|
||||
generateFillBuckets(
|
||||
datasets,
|
||||
this._start,
|
||||
this._end,
|
||||
getSuggestedPeriod(this._start, this._end)
|
||||
)
|
||||
);
|
||||
this._yAxisFractionDigits = computeYAxisFractionDigits(yMin, yMax);
|
||||
this._chartData = datasets;
|
||||
this._total = this._processTotal(energyData.stats, waterSources);
|
||||
|
||||
@@ -2853,7 +2853,6 @@
|
||||
"my": {
|
||||
"add_repository_title": "Add app repository?",
|
||||
"add_repository_description": "This app requires a repository that is currently not known. Do you want to add the repository {repository}?",
|
||||
"add_repository_store_description": "Do you want to add the app repository {repository}?",
|
||||
"error_repository_not_found": "The repository for this app was not found"
|
||||
},
|
||||
"panel": {
|
||||
|
||||
+875
-2
@@ -25,8 +25,8 @@ exports[`generateEnergyGasGraphData > large 5-minute payload digest is stable (c
|
||||
"unit",
|
||||
"yAxisFractionDigits",
|
||||
],
|
||||
"numberCount": 312488,
|
||||
"numberSum": "2.26308627397e+17",
|
||||
"numberCount": 392840,
|
||||
"numberSum": "2.71986228397e+17",
|
||||
"type": "object",
|
||||
}
|
||||
`;
|
||||
@@ -52,6 +52,15 @@ exports[`generateEnergyGasGraphData > matches snapshot for a single gas source (
|
||||
"color": "#1b7ea07F",
|
||||
"cursor": "default",
|
||||
"data": [
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704069000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderRadius": [
|
||||
@@ -3376,6 +3385,438 @@ exports[`generateEnergyGasGraphData > matches snapshot with compare data 1`] = `
|
||||
0.287,
|
||||
1704063600000,
|
||||
],
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704069000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704072600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704076200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704079800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704083400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704087000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704090600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704094200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704097800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704101400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704105000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704108600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704112200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704115800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704119400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704123000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704126600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704130200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704133800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704137400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704141000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704144600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704148200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704151800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704155400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704159000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704162600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704166200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704169800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704173400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704177000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704180600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704184200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704187800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704191400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704195000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704198600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704202200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704205800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704209400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704213000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704216600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704220200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704223800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704227400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704231000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704234600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704238200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
],
|
||||
"id": "compare-sensor.gas_consumption_0",
|
||||
"itemStyle": {
|
||||
@@ -4110,6 +4551,438 @@ exports[`generateEnergyGasGraphData > matches snapshot with compare data 1`] = `
|
||||
1704063600000,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704069000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704072600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704076200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704079800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704083400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704087000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704090600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704094200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704097800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704101400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704105000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704108600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704112200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704115800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704119400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704123000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704126600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704130200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704133800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704137400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704141000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704144600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704148200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704151800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704155400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704159000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704162600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704166200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704169800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704173400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704177000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704180600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704184200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704187800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704191400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704195000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704198600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704202200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704205800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704209400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704213000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704216600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704220200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704223800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704227400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704231000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704234600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704238200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
],
|
||||
"id": "compare-sensor.gas_consumption_1",
|
||||
"itemStyle": {
|
||||
|
||||
+1100
-2
File diff suppressed because it is too large
Load Diff
+893
-2
@@ -11,8 +11,8 @@ exports[`generateEnergySolarGraphData > large 5-minute payload digest is stable
|
||||
"total",
|
||||
"yAxisFractionDigits",
|
||||
],
|
||||
"numberCount": 232066,
|
||||
"numberSum": "1.50908786888e+17",
|
||||
"numberCount": 285622,
|
||||
"numberSum": "1.81353699874e+17",
|
||||
"type": "object",
|
||||
}
|
||||
`;
|
||||
@@ -1008,6 +1008,15 @@ exports[`generateEnergySolarGraphData > matches snapshot for the daily period 1`
|
||||
1705190400000,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1705276800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderRadius": [
|
||||
@@ -1263,6 +1272,15 @@ exports[`generateEnergySolarGraphData > matches snapshot for the daily period 1`
|
||||
1706745600000,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1706832000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderRadius": [
|
||||
@@ -1639,6 +1657,438 @@ exports[`generateEnergySolarGraphData > matches snapshot for two solar sources w
|
||||
0.287,
|
||||
1704063600000,
|
||||
],
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704069000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704072600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704076200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704079800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704083400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704087000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704090600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704094200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704097800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704101400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704105000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704108600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704112200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704115800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704119400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704123000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704126600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704130200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704133800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704137400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704141000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704144600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704148200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704151800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704155400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704159000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704162600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704166200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704169800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704173400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704177000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704180600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704184200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704187800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704191400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704195000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704198600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704202200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704205800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704209400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704213000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704216600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704220200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704223800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704227400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704231000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704234600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704238200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
],
|
||||
"id": "compare-sensor.solar_production",
|
||||
"itemStyle": {
|
||||
@@ -2373,6 +2823,438 @@ exports[`generateEnergySolarGraphData > matches snapshot for two solar sources w
|
||||
1704063600000,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704069000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704072600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704076200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704079800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704083400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704087000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704090600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704094200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704097800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704101400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704105000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704108600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704112200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704115800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704119400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704123000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704126600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704130200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704133800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704137400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704141000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704144600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704148200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704151800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704155400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704159000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704162600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704166200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704169800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704173400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704177000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704180600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704184200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704187800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704191400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704195000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704198600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704202200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704205800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704209400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704213000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704216600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704220200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704223800000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704227400000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704231000000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704234600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704238200000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
],
|
||||
"id": "compare-sensor.solar_production_1",
|
||||
"itemStyle": {
|
||||
@@ -5594,6 +6476,15 @@ exports[`generateEnergySolarGraphData > matches snapshot with hourly forecast da
|
||||
1704085200000,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderWidth": 0,
|
||||
},
|
||||
"value": [
|
||||
1704090600000,
|
||||
0,
|
||||
],
|
||||
},
|
||||
{
|
||||
"itemStyle": {
|
||||
"borderRadius": [
|
||||
|
||||
@@ -5,7 +5,9 @@ import {
|
||||
computeStatMidpoint,
|
||||
fillDataGapsAndRoundCaps,
|
||||
fillLineGaps,
|
||||
generateFillBuckets,
|
||||
getCompareTransform,
|
||||
getPeriodMidpointOffset,
|
||||
getSuggestedMax,
|
||||
splitUntrackedConsumption,
|
||||
} from "../../../../../../src/panels/lovelace/cards/energy/common/energy-chart-options";
|
||||
@@ -498,6 +500,307 @@ describe("fillDataGapsAndRoundCaps", () => {
|
||||
|
||||
assert.equal(datasets[0].data!.length, 0);
|
||||
});
|
||||
|
||||
it("does not fill trailing buckets without an explicit grid", () => {
|
||||
// Legacy behavior pin: buckets past a dataset's last real point are
|
||||
// only appended when extraBuckets is passed.
|
||||
const datasets: BarSeriesOption[] = [
|
||||
{
|
||||
type: "bar",
|
||||
stack: "a",
|
||||
data: [[1000, 10]],
|
||||
},
|
||||
{
|
||||
type: "bar",
|
||||
stack: "a",
|
||||
data: [
|
||||
[1000, 100],
|
||||
[2000, 200],
|
||||
],
|
||||
},
|
||||
];
|
||||
|
||||
fillDataGapsAndRoundCaps(datasets);
|
||||
|
||||
assert.equal(datasets[0].data!.length, 1);
|
||||
assert.equal(datasets[1].data!.length, 2);
|
||||
});
|
||||
|
||||
it("appends trailing zero buckets from the explicit grid", () => {
|
||||
// The single-reading case: one real point in the first bucket must
|
||||
// be padded with zero buckets across the whole grid, otherwise ECharts
|
||||
// derives a degenerate bar band width and expands the time axis.
|
||||
const datasets: BarSeriesOption[] = [
|
||||
{
|
||||
type: "bar",
|
||||
stack: "a",
|
||||
data: [[1000, 10]],
|
||||
},
|
||||
];
|
||||
|
||||
fillDataGapsAndRoundCaps(datasets, true, [1000, 2000, 3000, 4000]);
|
||||
|
||||
assert.equal(datasets[0].data!.length, 4);
|
||||
assert.equal(getBarItem(datasets[0], 0).value[1], 10);
|
||||
for (const index of [1, 2, 3]) {
|
||||
const item = getBarItem(datasets[0], index);
|
||||
assert.equal(item.value[0], 1000 * (index + 1));
|
||||
assert.equal(item.value[1], 0);
|
||||
assert.equal(item.itemStyle.borderWidth, 0);
|
||||
}
|
||||
});
|
||||
|
||||
it("fills leading and middle buckets from the explicit grid", () => {
|
||||
const datasets: BarSeriesOption[] = [
|
||||
{
|
||||
type: "bar",
|
||||
stack: "a",
|
||||
data: [[3000, 30]],
|
||||
},
|
||||
];
|
||||
|
||||
fillDataGapsAndRoundCaps(datasets, true, [1000, 2000, 3000, 4000]);
|
||||
|
||||
assert.equal(datasets[0].data!.length, 4);
|
||||
assert.deepEqual(
|
||||
datasets[0].data!.map((item) => getX(item)),
|
||||
[1000, 2000, 3000, 4000]
|
||||
);
|
||||
assert.deepEqual(
|
||||
datasets[0].data!.map((item) => getY(item)),
|
||||
[0, 0, 30, 0]
|
||||
);
|
||||
});
|
||||
|
||||
it("keeps originally-empty datasets empty when a grid is passed", () => {
|
||||
// Compare placeholder datasets must stay empty so no-data detection
|
||||
// keeps working.
|
||||
const datasets: BarSeriesOption[] = [
|
||||
{
|
||||
type: "bar",
|
||||
stack: "a",
|
||||
data: [],
|
||||
},
|
||||
{
|
||||
type: "bar",
|
||||
stack: "a",
|
||||
data: [[1000, 10]],
|
||||
},
|
||||
];
|
||||
|
||||
fillDataGapsAndRoundCaps(datasets, true, [1000, 2000]);
|
||||
|
||||
assert.equal(datasets[0].data!.length, 0);
|
||||
assert.equal(datasets[1].data!.length, 2);
|
||||
});
|
||||
|
||||
it("still rounds caps on the real bar when grid buckets are added", () => {
|
||||
const datasets: BarSeriesOption[] = [
|
||||
{
|
||||
type: "bar",
|
||||
stack: "a",
|
||||
data: [[2000, 10]],
|
||||
},
|
||||
];
|
||||
|
||||
fillDataGapsAndRoundCaps(datasets, true, [1000, 2000, 3000]);
|
||||
|
||||
const realItem = getBarItem(datasets[0], 1);
|
||||
assert.equal(realItem.value[1], 10);
|
||||
assert.deepEqual(realItem.itemStyle.borderRadius, [4, 4, 0, 0]);
|
||||
// Zero fills get no border at all
|
||||
assert.equal(getBarItem(datasets[0], 0).itemStyle.borderWidth, 0);
|
||||
assert.equal(getBarItem(datasets[0], 2).itemStyle.borderWidth, 0);
|
||||
});
|
||||
});
|
||||
|
||||
describe("getPeriodMidpointOffset", () => {
|
||||
const HOUR = 60 * 60 * 1000;
|
||||
|
||||
it("returns half the nominal period when no gap was measured", () => {
|
||||
assert.equal(getPeriodMidpointOffset("hour"), HOUR / 2);
|
||||
assert.equal(getPeriodMidpointOffset("5minute"), 2.5 * 60 * 1000);
|
||||
});
|
||||
|
||||
it("returns 0 for daily and longer periods", () => {
|
||||
assert.equal(getPeriodMidpointOffset("day"), 0);
|
||||
assert.equal(getPeriodMidpointOffset("week"), 0);
|
||||
assert.equal(getPeriodMidpointOffset("month"), 0);
|
||||
// Even with a measured gap
|
||||
assert.equal(getPeriodMidpointOffset("day", 24 * HOUR), 0);
|
||||
});
|
||||
|
||||
it("uses half the measured gap for finer-grained data", () => {
|
||||
// e.g. 5-minute data shown with an hourly period
|
||||
assert.equal(
|
||||
getPeriodMidpointOffset("hour", 5 * 60 * 1000),
|
||||
2.5 * 60 * 1000
|
||||
);
|
||||
});
|
||||
|
||||
it("clamps the measured gap to the nominal period for sparse data", () => {
|
||||
// e.g. two readings 12h apart in an hourly view
|
||||
assert.equal(getPeriodMidpointOffset("hour", 12 * HOUR), HOUR / 2);
|
||||
});
|
||||
});
|
||||
|
||||
describe("generateFillBuckets", () => {
|
||||
const HOUR = 60 * 60 * 1000;
|
||||
// Tests run in TZ=Etc/UTC, so local time equals UTC here.
|
||||
const start = new Date("2024-03-15T00:00:00.000Z");
|
||||
const end = new Date("2024-03-16T00:00:00.000Z");
|
||||
|
||||
const barsAt = (xs: number[], id = "main"): BarSeriesOption => ({
|
||||
type: "bar",
|
||||
id,
|
||||
data: xs.map((x) => [x, 1, x - HOUR / 2]),
|
||||
});
|
||||
|
||||
it("expands a single hourly bucket to the full day grid", () => {
|
||||
// Real bucket: 09:00-10:00 centered at 09:30
|
||||
const anchor = start.getTime() + 9.5 * HOUR;
|
||||
const buckets = generateFillBuckets([barsAt([anchor])], start, end, "hour");
|
||||
|
||||
assert.equal(buckets.length, 24);
|
||||
const sorted = [...buckets].sort((a, b) => a - b);
|
||||
assert.equal(sorted[0], start.getTime() + 0.5 * HOUR);
|
||||
assert.equal(sorted[23], start.getTime() + 23.5 * HOUR);
|
||||
for (let i = 1; i < sorted.length; i++) {
|
||||
assert.equal(sorted[i] - sorted[i - 1], HOUR);
|
||||
}
|
||||
assert.include(buckets, anchor);
|
||||
});
|
||||
|
||||
it("keeps the grid anchored on data not aligned to the range start", () => {
|
||||
// Half-hour timezone simulation: recorder buckets sit at :30 local, so
|
||||
// midpoints are on the whole hour. The grid must follow the data, not
|
||||
// the local-midnight range start.
|
||||
const anchor = start.getTime() + 10 * HOUR; // 09:30-10:30 bucket
|
||||
const buckets = generateFillBuckets([barsAt([anchor])], start, end, "hour");
|
||||
|
||||
const sorted = [...buckets].sort((a, b) => a - b);
|
||||
assert.equal(sorted[0], start.getTime());
|
||||
assert.equal(sorted[sorted.length - 1], start.getTime() + 23 * HOUR);
|
||||
assert.isTrue(sorted.every((ts) => (ts - anchor) % HOUR === 0));
|
||||
});
|
||||
|
||||
it("generates 5minute buckets", () => {
|
||||
const fiveMin = 5 * 60 * 1000;
|
||||
const anchor = start.getTime() + fiveMin / 2;
|
||||
const shortEnd = new Date(start.getTime() + HOUR);
|
||||
const buckets = generateFillBuckets(
|
||||
[barsAt([anchor])],
|
||||
start,
|
||||
shortEnd,
|
||||
"5minute"
|
||||
);
|
||||
|
||||
assert.equal(buckets.length, 12);
|
||||
const sorted = [...buckets].sort((a, b) => a - b);
|
||||
for (let i = 1; i < sorted.length; i++) {
|
||||
assert.equal(sorted[i] - sorted[i - 1], fiveMin);
|
||||
}
|
||||
});
|
||||
|
||||
it("generates day buckets at period starts", () => {
|
||||
const weekEnd = new Date("2024-03-22T00:00:00.000Z");
|
||||
const anchor = start.getTime() + 3 * 24 * HOUR; // day 4 of the range
|
||||
const buckets = generateFillBuckets(
|
||||
[barsAt([anchor])],
|
||||
start,
|
||||
weekEnd,
|
||||
"day"
|
||||
);
|
||||
|
||||
assert.equal(buckets.length, 7);
|
||||
const sorted = [...buckets].sort((a, b) => a - b);
|
||||
assert.equal(sorted[0], start.getTime());
|
||||
assert.equal(sorted[6], start.getTime() + 6 * 24 * HOUR);
|
||||
});
|
||||
|
||||
it("generates month buckets with variable month lengths", () => {
|
||||
const yearStart = new Date("2024-01-01T00:00:00.000Z");
|
||||
const yearEnd = new Date("2025-01-01T00:00:00.000Z");
|
||||
const anchor = Date.UTC(2024, 4, 1); // May 1st
|
||||
const buckets = generateFillBuckets(
|
||||
[barsAt([anchor])],
|
||||
yearStart,
|
||||
yearEnd,
|
||||
"month"
|
||||
);
|
||||
|
||||
assert.equal(buckets.length, 12);
|
||||
const sorted = [...buckets].sort((a, b) => a - b);
|
||||
for (let month = 0; month < 12; month++) {
|
||||
assert.equal(sorted[month], Date.UTC(2024, month, 1));
|
||||
}
|
||||
});
|
||||
|
||||
it("ignores compare series and placeholders when picking the anchor", () => {
|
||||
const compareAnchor = start.getTime() + 0.25 * HOUR; // off-grid transform
|
||||
const mainAnchor = start.getTime() + 9.5 * HOUR;
|
||||
const buckets = generateFillBuckets(
|
||||
[
|
||||
{ type: "bar", id: "compare-placeholder", data: [] },
|
||||
barsAt([compareAnchor], "compare-sensor.water"),
|
||||
barsAt([mainAnchor], "sensor.water"),
|
||||
],
|
||||
start,
|
||||
end,
|
||||
"hour"
|
||||
);
|
||||
|
||||
assert.include(buckets, mainAnchor);
|
||||
assert.isTrue(
|
||||
buckets.every((ts) => (ts - mainAnchor) % HOUR === 0),
|
||||
"grid must be anchored on the main series"
|
||||
);
|
||||
});
|
||||
|
||||
it("skips empty main series and anchors on the next one with data", () => {
|
||||
const anchor = start.getTime() + 9.5 * HOUR;
|
||||
const buckets = generateFillBuckets(
|
||||
[barsAt([], "sensor.empty"), barsAt([anchor], "sensor.water")],
|
||||
start,
|
||||
end,
|
||||
"hour"
|
||||
);
|
||||
|
||||
assert.equal(buckets.length, 24);
|
||||
assert.include(buckets, anchor);
|
||||
});
|
||||
|
||||
it("returns an empty grid when there is no data to anchor on", () => {
|
||||
assert.deepEqual(generateFillBuckets([], start, end, "hour"), []);
|
||||
assert.deepEqual(
|
||||
generateFillBuckets(
|
||||
[barsAt([], "sensor.empty"), barsAt([1000], "compare-sensor.water")],
|
||||
start,
|
||||
end,
|
||||
"hour"
|
||||
),
|
||||
[]
|
||||
);
|
||||
});
|
||||
|
||||
it("reads the anchor from object-format data items", () => {
|
||||
const anchor = start.getTime() + 9.5 * HOUR;
|
||||
const buckets = generateFillBuckets(
|
||||
[
|
||||
{
|
||||
type: "bar",
|
||||
id: "main",
|
||||
data: [{ value: [anchor, 1] }],
|
||||
},
|
||||
],
|
||||
start,
|
||||
end,
|
||||
"hour"
|
||||
);
|
||||
|
||||
assert.equal(buckets.length, 24);
|
||||
assert.include(buckets, anchor);
|
||||
});
|
||||
});
|
||||
|
||||
describe("getCompareTransform", () => {
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
* optimization pass — see test/benchmarks/README.md.
|
||||
*/
|
||||
import { describe, expect, it } from "vitest";
|
||||
import type { BarSeriesOption } from "echarts/charts";
|
||||
import { generateEnergyGasGraphData } from "../../../../../src/panels/lovelace/cards/energy/energy-gas-graph-data";
|
||||
import type { EnergyPreferences } from "../../../../../src/data/energy";
|
||||
import type { HomeAssistant } from "../../../../../src/types";
|
||||
@@ -209,4 +210,156 @@ describe("generateEnergyGasGraphData", () => {
|
||||
)
|
||||
).toMatchSnapshot();
|
||||
});
|
||||
|
||||
// Regression tests for #52938: sparse statistics (e.g. a meter that reports
|
||||
// once per day) must be zero-filled across the whole range, otherwise
|
||||
// ECharts derives the bar band width from the data gaps — a lone bucket
|
||||
// makes it expand the time axis by ±40% of its span and draw an oversized
|
||||
// bar.
|
||||
describe("sparse data zero-fill", () => {
|
||||
const HOUR = 60 * 60 * 1000;
|
||||
|
||||
const keepBuckets = (
|
||||
energyData: ReturnType<typeof generateEnergyData>,
|
||||
hourOffsets: number[]
|
||||
) => {
|
||||
const startMs = energyData.start.getTime();
|
||||
const keep = new Set(hourOffsets.map((h) => startMs + h * HOUR));
|
||||
return {
|
||||
...energyData,
|
||||
stats: Object.fromEntries(
|
||||
Object.entries(energyData.stats).map(([id, rows]) => [
|
||||
id,
|
||||
rows.filter((row) => keep.has(row.start)),
|
||||
])
|
||||
),
|
||||
};
|
||||
};
|
||||
|
||||
const getX = (item: any): number => Number(item?.value?.[0] ?? item?.[0]);
|
||||
const getY = (item: any): number => Number(item?.value?.[1] ?? item?.[1]);
|
||||
|
||||
it("fills the full day grid around a single mid-day bucket", () => {
|
||||
const energyData = keepBuckets(
|
||||
generateEnergyData(8, {
|
||||
days: 1,
|
||||
period: "hour",
|
||||
prefs: gasOnlyPrefs(1),
|
||||
}),
|
||||
[10]
|
||||
);
|
||||
const result = generateEnergyGasGraphData({
|
||||
hass: makeHass(),
|
||||
energyData,
|
||||
computedStyles,
|
||||
now,
|
||||
});
|
||||
|
||||
const main = result.chartData.find(
|
||||
(dataset) => dataset.id === "sensor.gas_consumption_0"
|
||||
)!;
|
||||
assertDenseGrid(main.data!, 24, HOUR);
|
||||
const nonZero = main.data!.filter((item) => getY(item) !== 0);
|
||||
expect(nonZero).toHaveLength(1);
|
||||
// The real bar stays centered on its bucket midpoint.
|
||||
expect(getX(nonZero[0])).toBe(energyData.start.getTime() + 10.5 * HOUR);
|
||||
// The compare placeholder stays empty (no-data detection).
|
||||
const placeholder = result.chartData.find((dataset) =>
|
||||
String(dataset.id).startsWith("compare-")
|
||||
)!;
|
||||
expect(placeholder.data).toHaveLength(0);
|
||||
});
|
||||
|
||||
it("fills the gaps between sparse readings", () => {
|
||||
const energyData = keepBuckets(
|
||||
generateEnergyData(9, {
|
||||
days: 1,
|
||||
period: "hour",
|
||||
prefs: gasOnlyPrefs(1),
|
||||
}),
|
||||
[2, 14]
|
||||
);
|
||||
const result = generateEnergyGasGraphData({
|
||||
hass: makeHass(),
|
||||
energyData,
|
||||
computedStyles,
|
||||
now,
|
||||
});
|
||||
|
||||
const main = result.chartData.find(
|
||||
(dataset) => dataset.id === "sensor.gas_consumption_0"
|
||||
)!;
|
||||
assertDenseGrid(main.data!, 24, HOUR);
|
||||
expect(main.data!.filter((item) => getY(item) !== 0)).toHaveLength(2);
|
||||
});
|
||||
|
||||
it("keeps datasets empty when there is no data at all", () => {
|
||||
const energyData = keepBuckets(
|
||||
generateEnergyData(10, {
|
||||
days: 1,
|
||||
period: "hour",
|
||||
prefs: gasOnlyPrefs(1),
|
||||
}),
|
||||
[]
|
||||
);
|
||||
const result = generateEnergyGasGraphData({
|
||||
hass: makeHass(),
|
||||
energyData,
|
||||
computedStyles,
|
||||
now,
|
||||
});
|
||||
|
||||
for (const dataset of result.chartData) {
|
||||
expect(dataset.data).toHaveLength(0);
|
||||
}
|
||||
});
|
||||
|
||||
it("propagates the grid to compare datasets", () => {
|
||||
const dayMs = 24 * HOUR;
|
||||
const base = generateEnergyData(11, {
|
||||
days: 1,
|
||||
period: "hour",
|
||||
compare: true,
|
||||
prefs: gasOnlyPrefs(1),
|
||||
});
|
||||
const energyData = {
|
||||
...keepBuckets(base, [10]),
|
||||
// The fixture doesn't set the compare range; provide it so compare
|
||||
// rows are day-shifted onto the main axis like in the real dashboard.
|
||||
startCompare: new Date(base.start.getTime() - dayMs),
|
||||
endCompare: new Date(base.start.getTime()),
|
||||
};
|
||||
const result = generateEnergyGasGraphData({
|
||||
hass: makeHass(),
|
||||
energyData,
|
||||
computedStyles,
|
||||
now,
|
||||
});
|
||||
|
||||
const compare = result.chartData.find(
|
||||
(dataset) => dataset.id === "compare-sensor.gas_consumption_0"
|
||||
)!;
|
||||
// Compare data is dense here, but it must be aligned to the same
|
||||
// 24-bucket grid as the zero-filled main series.
|
||||
assertDenseGrid(compare.data!, 24, HOUR);
|
||||
const main = result.chartData.find(
|
||||
(dataset) => dataset.id === "sensor.gas_consumption_0"
|
||||
)!;
|
||||
assertDenseGrid(main.data!, 24, HOUR);
|
||||
});
|
||||
|
||||
function assertDenseGrid(
|
||||
data: NonNullable<BarSeriesOption["data"]>,
|
||||
length: number,
|
||||
gap: number
|
||||
) {
|
||||
expect(data).toHaveLength(length);
|
||||
const xs = data.map((item) => getX(item));
|
||||
expect(new Set(xs).size).toBe(length);
|
||||
const sorted = [...xs].sort((a, b) => a - b);
|
||||
for (let i = 1; i < sorted.length; i++) {
|
||||
expect(sorted[i] - sorted[i - 1]).toBe(gap);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
@@ -164,27 +164,26 @@ describe("generateEnergyDevicesDetailGraphData", () => {
|
||||
).toMatchSnapshot();
|
||||
});
|
||||
|
||||
// Regression test for #52937: at the start of the day only the first hour
|
||||
// has data. The untracked/over-reported bars must center on the same period
|
||||
// midpoint as the device bars so they stack as one bar instead of splitting
|
||||
// into a second stack at the period start.
|
||||
it("stacks untracked bars on the device bars for a lone first-of-day bucket", () => {
|
||||
// Full-day range (so getSuggestedPeriod stays "hour") but keep only the
|
||||
// first hourly bucket in every stat. gapChance: 0 makes the bucket dense.
|
||||
const full = generateEnergyData(1, {
|
||||
// Regression test for #52937/#52938: at the start of the day only the first
|
||||
// hour has data. The untracked bars must center on the same period midpoint
|
||||
// as the device bars (one stack, not two), and the whole day must be
|
||||
// zero-filled so ECharts keeps the configured axis range instead of
|
||||
// expanding it around the lone bucket.
|
||||
it("keeps a lone first-of-day bucket on the shared zero-filled grid", () => {
|
||||
const HOUR = 60 * 60 * 1000;
|
||||
const full = generateEnergyData(12, {
|
||||
days: 1,
|
||||
period: "hour",
|
||||
gapChance: 0,
|
||||
prefs: buildPrefs(false),
|
||||
});
|
||||
const firstStart = full.start.getTime();
|
||||
const energyData = {
|
||||
...full,
|
||||
stats: Object.fromEntries(
|
||||
Object.entries(full.stats).map(
|
||||
([id, values]) =>
|
||||
[id, values.filter((s) => s.start === firstStart)] as const
|
||||
)
|
||||
Object.entries(full.stats).map(([id, rows]) => [
|
||||
id,
|
||||
rows.filter((row) => row.start === firstStart),
|
||||
])
|
||||
),
|
||||
};
|
||||
|
||||
@@ -193,26 +192,29 @@ describe("generateEnergyDevicesDetailGraphData", () => {
|
||||
energyData,
|
||||
});
|
||||
|
||||
// Collect the display x of every bar across all series.
|
||||
const xs = new Set<number>();
|
||||
let nonEmptySeries = 0;
|
||||
const nonZeroXs = new Set<number>();
|
||||
for (const series of result.chartData) {
|
||||
const points = series.data ?? [];
|
||||
if (points.length) {
|
||||
nonEmptySeries++;
|
||||
if (!series.data?.length) {
|
||||
continue;
|
||||
}
|
||||
for (const point of points as any[]) {
|
||||
const x = Array.isArray(point) ? point[0] : point?.value?.[0];
|
||||
if (x != null) {
|
||||
xs.add(Number(x));
|
||||
// Every non-empty series covers the full day grid...
|
||||
const xs = series.data.map((item: any) =>
|
||||
Number(item?.value?.[0] ?? item?.[0])
|
||||
);
|
||||
assert.equal(xs.length, 24);
|
||||
const sorted = [...xs].sort((a, b) => a - b);
|
||||
for (let i = 1; i < sorted.length; i++) {
|
||||
assert.equal(sorted[i] - sorted[i - 1], HOUR);
|
||||
}
|
||||
for (const [index, item] of (series.data as any[]).entries()) {
|
||||
const y = Number(item?.value?.[1] ?? item?.[1]);
|
||||
if (y !== 0) {
|
||||
nonZeroXs.add(xs[index]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Device bars + at least one untracked series are present...
|
||||
assert.isAtLeast(nonEmptySeries, 2);
|
||||
// ...and they all share a single x, so they render as one full stack.
|
||||
assert.equal(xs.size, 1);
|
||||
// ...and all real values stack on the single bucket midpoint.
|
||||
assert.deepEqual([...nonZeroXs], [firstStart + HOUR / 2]);
|
||||
});
|
||||
|
||||
// The seeded fixtures above all happen to produce fully-negative untracked
|
||||
|
||||
@@ -209,4 +209,57 @@ describe("generateEnergySolarGraphData", () => {
|
||||
)
|
||||
).toMatchSnapshot();
|
||||
});
|
||||
|
||||
// Regression test for #52938: a lone statistics bucket must be zero-filled
|
||||
// across the day so ECharts keeps the configured axis range, while forecast
|
||||
// line series stay untouched by the bar-bucket fill.
|
||||
it("zero-fills bars around a single bucket without touching forecast lines", () => {
|
||||
const HOUR = 60 * 60 * 1000;
|
||||
const base = generateEnergyData(7, {
|
||||
days: 1,
|
||||
period: "hour",
|
||||
prefs: solarPrefs({ sources: 1, forecast: true }),
|
||||
});
|
||||
const startMs = base.start.getTime();
|
||||
const energyData = {
|
||||
...base,
|
||||
stats: Object.fromEntries(
|
||||
Object.entries(base.stats).map(([id, rows]) => [
|
||||
id,
|
||||
rows.filter((row) => row.start === startMs + 10 * HOUR),
|
||||
])
|
||||
),
|
||||
};
|
||||
const forecasts = buildForecasts(24, HOUR, ["entry_0"]);
|
||||
const result = generateEnergySolarGraphData({
|
||||
hass,
|
||||
energyData,
|
||||
forecasts,
|
||||
computedStyles,
|
||||
now,
|
||||
});
|
||||
|
||||
const bars = result.chartData.find(
|
||||
(d) => d.id === "sensor.solar_production"
|
||||
)!;
|
||||
const xs = bars.data!.map((item: any) =>
|
||||
Number(item?.value?.[0] ?? item?.[0])
|
||||
);
|
||||
expect(xs).toHaveLength(24);
|
||||
const sorted = [...xs].sort((a, b) => a - b);
|
||||
for (let i = 1; i < sorted.length; i++) {
|
||||
expect(sorted[i] - sorted[i - 1]).toBe(HOUR);
|
||||
}
|
||||
|
||||
const forecast = result.chartData.find((d) =>
|
||||
String(d.id).startsWith("forecast-")
|
||||
)!;
|
||||
expect(forecast.data).toHaveLength(24);
|
||||
// Forecast points are centered with the nominal half-period offset.
|
||||
for (const [index, item] of (forecast.data as any[]).entries()) {
|
||||
expect(Number(item?.value?.[0] ?? item?.[0])).toBe(
|
||||
startMs + index * HOUR + HOUR / 2
|
||||
);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
@@ -3758,15 +3758,15 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@napi-rs/wasm-runtime@npm:1.1.6, @napi-rs/wasm-runtime@npm:^1.1.1, @napi-rs/wasm-runtime@npm:^1.1.4":
|
||||
version: 1.1.6
|
||||
resolution: "@napi-rs/wasm-runtime@npm:1.1.6"
|
||||
"@napi-rs/wasm-runtime@npm:1.1.5, @napi-rs/wasm-runtime@npm:^1.1.1, @napi-rs/wasm-runtime@npm:^1.1.4":
|
||||
version: 1.1.5
|
||||
resolution: "@napi-rs/wasm-runtime@npm:1.1.5"
|
||||
dependencies:
|
||||
"@tybys/wasm-util": "npm:^0.10.3"
|
||||
"@tybys/wasm-util": "npm:^0.10.2"
|
||||
peerDependencies:
|
||||
"@emnapi/core": ^1.7.1
|
||||
"@emnapi/runtime": ^1.7.1
|
||||
checksum: 10/3e43425df17547d9d58ab69cce8e6cef38a062eccec4d2def5fc9e10e81cd19ae228b3ab9be4b149b57078d33913687511312d2414089877759b7db1f43625ba
|
||||
checksum: 10/57a4b68f05f15b79bf45240ac173d3eaf72620d1b73261e7db407aa7ba8eb68e670fb1612d2ceef6b8cc500970a5ed6995c71c77661027971012ed2459ce307f
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -4735,110 +4735,110 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@rspack/binding-darwin-arm64@npm:2.1.2":
|
||||
version: 2.1.2
|
||||
resolution: "@rspack/binding-darwin-arm64@npm:2.1.2"
|
||||
"@rspack/binding-darwin-arm64@npm:2.1.1":
|
||||
version: 2.1.1
|
||||
resolution: "@rspack/binding-darwin-arm64@npm:2.1.1"
|
||||
conditions: os=darwin & cpu=arm64
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@rspack/binding-darwin-x64@npm:2.1.2":
|
||||
version: 2.1.2
|
||||
resolution: "@rspack/binding-darwin-x64@npm:2.1.2"
|
||||
"@rspack/binding-darwin-x64@npm:2.1.1":
|
||||
version: 2.1.1
|
||||
resolution: "@rspack/binding-darwin-x64@npm:2.1.1"
|
||||
conditions: os=darwin & cpu=x64
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@rspack/binding-linux-arm64-gnu@npm:2.1.2":
|
||||
version: 2.1.2
|
||||
resolution: "@rspack/binding-linux-arm64-gnu@npm:2.1.2"
|
||||
"@rspack/binding-linux-arm64-gnu@npm:2.1.1":
|
||||
version: 2.1.1
|
||||
resolution: "@rspack/binding-linux-arm64-gnu@npm:2.1.1"
|
||||
conditions: os=linux & cpu=arm64 & libc=glibc
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@rspack/binding-linux-arm64-musl@npm:2.1.2":
|
||||
version: 2.1.2
|
||||
resolution: "@rspack/binding-linux-arm64-musl@npm:2.1.2"
|
||||
"@rspack/binding-linux-arm64-musl@npm:2.1.1":
|
||||
version: 2.1.1
|
||||
resolution: "@rspack/binding-linux-arm64-musl@npm:2.1.1"
|
||||
conditions: os=linux & cpu=arm64 & libc=musl
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@rspack/binding-linux-riscv64-gnu@npm:2.1.2":
|
||||
version: 2.1.2
|
||||
resolution: "@rspack/binding-linux-riscv64-gnu@npm:2.1.2"
|
||||
"@rspack/binding-linux-riscv64-gnu@npm:2.1.1":
|
||||
version: 2.1.1
|
||||
resolution: "@rspack/binding-linux-riscv64-gnu@npm:2.1.1"
|
||||
conditions: os=linux & cpu=riscv64 & libc=glibc
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@rspack/binding-linux-riscv64-musl@npm:2.1.2":
|
||||
version: 2.1.2
|
||||
resolution: "@rspack/binding-linux-riscv64-musl@npm:2.1.2"
|
||||
"@rspack/binding-linux-riscv64-musl@npm:2.1.1":
|
||||
version: 2.1.1
|
||||
resolution: "@rspack/binding-linux-riscv64-musl@npm:2.1.1"
|
||||
conditions: os=linux & cpu=riscv64 & libc=musl
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@rspack/binding-linux-x64-gnu@npm:2.1.2":
|
||||
version: 2.1.2
|
||||
resolution: "@rspack/binding-linux-x64-gnu@npm:2.1.2"
|
||||
"@rspack/binding-linux-x64-gnu@npm:2.1.1":
|
||||
version: 2.1.1
|
||||
resolution: "@rspack/binding-linux-x64-gnu@npm:2.1.1"
|
||||
conditions: os=linux & cpu=x64 & libc=glibc
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@rspack/binding-linux-x64-musl@npm:2.1.2":
|
||||
version: 2.1.2
|
||||
resolution: "@rspack/binding-linux-x64-musl@npm:2.1.2"
|
||||
"@rspack/binding-linux-x64-musl@npm:2.1.1":
|
||||
version: 2.1.1
|
||||
resolution: "@rspack/binding-linux-x64-musl@npm:2.1.1"
|
||||
conditions: os=linux & cpu=x64 & libc=musl
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@rspack/binding-wasm32-wasi@npm:2.1.2":
|
||||
version: 2.1.2
|
||||
resolution: "@rspack/binding-wasm32-wasi@npm:2.1.2"
|
||||
"@rspack/binding-wasm32-wasi@npm:2.1.1":
|
||||
version: 2.1.1
|
||||
resolution: "@rspack/binding-wasm32-wasi@npm:2.1.1"
|
||||
dependencies:
|
||||
"@emnapi/core": "npm:1.11.1"
|
||||
"@emnapi/runtime": "npm:1.11.1"
|
||||
"@napi-rs/wasm-runtime": "npm:1.1.6"
|
||||
"@napi-rs/wasm-runtime": "npm:1.1.5"
|
||||
conditions: cpu=wasm32
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@rspack/binding-win32-arm64-msvc@npm:2.1.2":
|
||||
version: 2.1.2
|
||||
resolution: "@rspack/binding-win32-arm64-msvc@npm:2.1.2"
|
||||
"@rspack/binding-win32-arm64-msvc@npm:2.1.1":
|
||||
version: 2.1.1
|
||||
resolution: "@rspack/binding-win32-arm64-msvc@npm:2.1.1"
|
||||
conditions: os=win32 & cpu=arm64
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@rspack/binding-win32-ia32-msvc@npm:2.1.2":
|
||||
version: 2.1.2
|
||||
resolution: "@rspack/binding-win32-ia32-msvc@npm:2.1.2"
|
||||
"@rspack/binding-win32-ia32-msvc@npm:2.1.1":
|
||||
version: 2.1.1
|
||||
resolution: "@rspack/binding-win32-ia32-msvc@npm:2.1.1"
|
||||
conditions: os=win32 & cpu=ia32
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@rspack/binding-win32-x64-msvc@npm:2.1.2":
|
||||
version: 2.1.2
|
||||
resolution: "@rspack/binding-win32-x64-msvc@npm:2.1.2"
|
||||
"@rspack/binding-win32-x64-msvc@npm:2.1.1":
|
||||
version: 2.1.1
|
||||
resolution: "@rspack/binding-win32-x64-msvc@npm:2.1.1"
|
||||
conditions: os=win32 & cpu=x64
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@rspack/binding@npm:2.1.2":
|
||||
version: 2.1.2
|
||||
resolution: "@rspack/binding@npm:2.1.2"
|
||||
"@rspack/binding@npm:2.1.1":
|
||||
version: 2.1.1
|
||||
resolution: "@rspack/binding@npm:2.1.1"
|
||||
dependencies:
|
||||
"@rspack/binding-darwin-arm64": "npm:2.1.2"
|
||||
"@rspack/binding-darwin-x64": "npm:2.1.2"
|
||||
"@rspack/binding-linux-arm64-gnu": "npm:2.1.2"
|
||||
"@rspack/binding-linux-arm64-musl": "npm:2.1.2"
|
||||
"@rspack/binding-linux-riscv64-gnu": "npm:2.1.2"
|
||||
"@rspack/binding-linux-riscv64-musl": "npm:2.1.2"
|
||||
"@rspack/binding-linux-x64-gnu": "npm:2.1.2"
|
||||
"@rspack/binding-linux-x64-musl": "npm:2.1.2"
|
||||
"@rspack/binding-wasm32-wasi": "npm:2.1.2"
|
||||
"@rspack/binding-win32-arm64-msvc": "npm:2.1.2"
|
||||
"@rspack/binding-win32-ia32-msvc": "npm:2.1.2"
|
||||
"@rspack/binding-win32-x64-msvc": "npm:2.1.2"
|
||||
"@rspack/binding-darwin-arm64": "npm:2.1.1"
|
||||
"@rspack/binding-darwin-x64": "npm:2.1.1"
|
||||
"@rspack/binding-linux-arm64-gnu": "npm:2.1.1"
|
||||
"@rspack/binding-linux-arm64-musl": "npm:2.1.1"
|
||||
"@rspack/binding-linux-riscv64-gnu": "npm:2.1.1"
|
||||
"@rspack/binding-linux-riscv64-musl": "npm:2.1.1"
|
||||
"@rspack/binding-linux-x64-gnu": "npm:2.1.1"
|
||||
"@rspack/binding-linux-x64-musl": "npm:2.1.1"
|
||||
"@rspack/binding-wasm32-wasi": "npm:2.1.1"
|
||||
"@rspack/binding-win32-arm64-msvc": "npm:2.1.1"
|
||||
"@rspack/binding-win32-ia32-msvc": "npm:2.1.1"
|
||||
"@rspack/binding-win32-x64-msvc": "npm:2.1.1"
|
||||
dependenciesMeta:
|
||||
"@rspack/binding-darwin-arm64":
|
||||
optional: true
|
||||
@@ -4864,15 +4864,15 @@ __metadata:
|
||||
optional: true
|
||||
"@rspack/binding-win32-x64-msvc":
|
||||
optional: true
|
||||
checksum: 10/2bb02582435f07cd2e3cf4cc990aecee6fbeda475d3e2dbbf8eba8d98ffffdcc19a687ddb259a29884283c6c7ab48c1e2b8ead50356c5252db1dc565b74e70e9
|
||||
checksum: 10/6b6a34bbc504d0ec344e8b9f383a0141143235cba90036016ff3a011aa4019bdd73b6fcb6c89844bd872c672ef2d4f153cc3091a6168f515ee14dca5dc33b158
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@rspack/core@npm:2.1.2":
|
||||
version: 2.1.2
|
||||
resolution: "@rspack/core@npm:2.1.2"
|
||||
"@rspack/core@npm:2.1.1":
|
||||
version: 2.1.1
|
||||
resolution: "@rspack/core@npm:2.1.1"
|
||||
dependencies:
|
||||
"@rspack/binding": "npm:2.1.2"
|
||||
"@rspack/binding": "npm:2.1.1"
|
||||
peerDependencies:
|
||||
"@module-federation/runtime-tools": ^0.24.1 || ^2.0.0
|
||||
"@swc/helpers": ^0.5.23
|
||||
@@ -4881,7 +4881,7 @@ __metadata:
|
||||
optional: true
|
||||
"@swc/helpers":
|
||||
optional: true
|
||||
checksum: 10/a7a16c2eeba0cc048dd4dd4b03db5778627704def24654e088cbc2f787a9ae86d131d7f1dad445aae0a175d9be7ce500c590048869f7f4ce1725261b03c6960e
|
||||
checksum: 10/a652f39809f557136950e690b14655350e74f50ddd5eb32d4f912a6d40e6dda87f73f5c80a8bd296529b32ce4358bd6f66497f437ee032342151b5be293846b0
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -5402,12 +5402,12 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@tybys/wasm-util@npm:^0.10.3":
|
||||
version: 0.10.3
|
||||
resolution: "@tybys/wasm-util@npm:0.10.3"
|
||||
"@tybys/wasm-util@npm:^0.10.2":
|
||||
version: 0.10.2
|
||||
resolution: "@tybys/wasm-util@npm:0.10.2"
|
||||
dependencies:
|
||||
tslib: "npm:^2.4.0"
|
||||
checksum: 10/6cf39f7a2926b1c8bc6fe3f9f03318a33dd6dae81bdbd059983f9c6ee22d10a827f12564d648c05a2d4926e03c86cbe2799fb20609ee65e9efc39603039b4765
|
||||
checksum: 10/d12f1dafe12d7a573c406b35ffef0038042b9cc9fbcc74d657267eb635499b956276afc05eebdbd81bea582e1c4c921421a1dd7243a93daaa8c8216b19395c23
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -9772,7 +9772,7 @@ __metadata:
|
||||
"@playwright/test": "npm:1.61.1"
|
||||
"@replit/codemirror-indentation-markers": "npm:6.5.3"
|
||||
"@rsdoctor/rspack-plugin": "npm:1.5.17"
|
||||
"@rspack/core": "npm:2.1.2"
|
||||
"@rspack/core": "npm:2.1.1"
|
||||
"@rspack/dev-server": "npm:2.1.0"
|
||||
"@swc/helpers": "npm:0.5.23"
|
||||
"@thomasloven/round-slider": "npm:0.6.0"
|
||||
|
||||
Reference in New Issue
Block a user