Skip to content

fix: Migrate to ha-spinner #1234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akloeckner merged 17 commits into from
May 29, 2025
+3 −5
Merged

fix: Migrate to ha-spinner #1234

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d389885
migrate to ha-spinner
ildar170975 Apr 28, 2025
3c48ea2
migrate to ha-spinner
ildar170975 Apr 28, 2025
901b854
Merge branch 'dev' into ha-spinner
ildar170975 Apr 29, 2025
2e0d842
Merge branch 'dev' into ha-spinner
ildar170975 Apr 29, 2025
7b7b16c
restore style for ha-circular-progress
ildar170975 May 28, 2025
41d737c
added isPre2025_5
ildar170975 May 28, 2025
c73a295
added isPre2025_5
ildar170975 May 28, 2025
6e739ab
lint
ildar170975 May 28, 2025
359c8be
lint
ildar170975 May 28, 2025
e6d5d31
fix in isPre2025_5
ildar170975 May 28, 2025
5c59030
fix in isPre2025_5
ildar170975 May 28, 2025
30220ee
lint
ildar170975 May 28, 2025
838a44c
Merge branch 'dev' into ha-spinner
ildar170975 May 28, 2025
13bf9a1
fix styles
ildar170975 May 29, 2025
553ecf2
remove old indicator
ildar170975 May 29, 2025
582b2c9
remove old indicator
ildar170975 May 29, 2025
64f62e2
remove old indicator
ildar170975 May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
getFirstDefinedItem,
compareArray,
log,
isPre2025_5,
} from './utils';

class MiniGraphCard extends LitElement {
Expand Down Expand Up @@ -332,6 +333,9 @@ class MiniGraphCard extends LitElement {
&& this.config.entities[index].show_graph !== false,
))
|| this.config.show.loading_indicator === false;
const loadingElement = isPre2025_5(this._hass)

@akloeckner akloeckner May 29, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering if we really need to make this distinction. Couldn't we just put both tags in the card. Only one will be shown, because the other is not defined?

Or we wait another month and only insert the new spinner?

@ildar170975 ildar170975 May 29, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't we just put both tags in the card. Only one will be shown, because the other is not defined?

Seems that currently only one spinner (the latest one) is available in HA. So, see no need to wait a month.

? html`<ha-circular-progress indeterminate></ha-circular-progress>`
: html`<ha-spinner aria-label="Loading" size="small"></ha-spinner>`;
return this.config.show.graph ? html`
<div class="graph">
${ready ? html`
Expand All @@ -343,9 +347,7 @@ class MiniGraphCard extends LitElement {
</div>
</div>
${this.renderLegend()}
` : html`
<ha-circular-progress indeterminate></ha-circular-progress>
`}
` : loadingElement}
</div>` : '';
}

Expand Down
5 changes: 4 additions & 1 deletion src/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ const style = css`
cursor: pointer;
}
ha-circular-progress {
margin: auto;
margin: auto; /*pre 2025.5*/
}
ha-spinner {
margin: 4px auto;
}
.flex {
display: flex;
Expand Down
5 changes: 5 additions & 0 deletions src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,13 @@ const log = (message) => {
console.warn('mini-graph-card: ', message);
};

const isPre2025_5 = hass => hass

@akloeckner akloeckner May 29, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be false for things like 2024.6. If we really want to handle versions differently, we should maybe make this more generic to compare arbitrary versions, like isVersionBefore('2025.4.1', '2025.5')?

But it will be complicated and we'll be starting to support old versions. Considering this, I think, we should take the decision to just support the most recent version. At least actively.

@ildar170975 ildar170975 May 29, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right, the whole function must be revised.
(if we decide to support older versions)

&& Number(hass.config.version.split('.')[0]) <= 2025
&& Number(hass.config.version.split('.')[1]) < 5;

export {
getMin, getAvg, getMax, getTime, getMilli, compress, decompress, log,
getFirstDefinedItem,
compareArray,
isPre2025_5,
};