Skip to content

More fixes related to #153#155

Merged
ildar170975 merged 16 commits intoiantrich:devfrom
PaulSD:master
Feb 16, 2025
Merged

More fixes related to #153#155
ildar170975 merged 16 commits intoiantrich:devfrom
PaulSD:master

Conversation

@PaulSD
Copy link
Copy Markdown

@PaulSD PaulSD commented Feb 15, 2025

After more testing, I found and fixed a bunch of issues with the commits in #153.
To avoid having broken commits in the history (in case anyone needs to bisect bugs), I've corrected the commits instead of adding more commits to fix them.

@ildar170975 Please discard the current dev branch and re-create it with these commits.

Built copy for anyone who wants to test this: https://github.com/PaulSD/config-template-card/releases/tag/1.3.6.2

@ildar170975
Copy link
Copy Markdown
Collaborator

Please discard the current dev branch and re-create it with these commits.

Do you mean:
-- just delete the "dev" branch,
-- re-create dev based on "base",
-- merge THIS pull request into "dev" - and this will contain ALL commits (old unreleased + you required fixes)
?

@PaulSD
Copy link
Copy Markdown
Author

PaulSD commented Feb 15, 2025

Recreate the dev branch from master, then pull these changes into dev. Discard the old unreleased commits.

@ildar170975
Copy link
Copy Markdown
Collaborator

Discard the old unreleased commits.

Why it is needed? These commits do work (like from #109).
Let's just add your changes?

@PaulSD PaulSD marked this pull request as draft February 15, 2025 20:35
@PaulSD
Copy link
Copy Markdown
Author

PaulSD commented Feb 15, 2025

I was trying to make the commit history more sane. But, OK, we can just add my changes.
Let me rework this PR...

@ildar170975
Copy link
Copy Markdown
Collaborator

May be I understood you in a wrong way.
I wanted the history keep actual authors (all changes added by John Smith should be marked as "of John Smith").

@ildar170975
Copy link
Copy Markdown
Collaborator

Also, could you take a look at ALL workflow files? Imho they need to be updated.

@PaulSD
Copy link
Copy Markdown
Author

PaulSD commented Feb 15, 2025

Ok, will look.

PaulSD and others added 12 commits February 15, 2025 22:50
Allow multiple templates anywhere in property value
Use lit 2.8.0 to match HA frontend version.

Fixes iantrich#91, Closes iantrich#123, Closes iantrich#128, Closes iantrich#129, Closes iantrich#135
If multiple variables are defined then subsequent variables can
currently reference prior variables using `vars['name']` but not just
`name`.  This enables variables to reference prior variables by name,
like templates can.
This will drastically improve performance if any variable templates are
expensive to eval.
@PaulSD
Copy link
Copy Markdown
Author

PaulSD commented Feb 16, 2025

Ok, I've fixed the authors, updated the workflow files, fixed a few more issues in the code.

These commits don't apply cleanly on top of my prior commits in the dev branch, so we still need to re-create dev from master then apply this PR on dev.

@PaulSD PaulSD marked this pull request as ready for review February 16, 2025 05:19
@ildar170975 ildar170975 changed the base branch from master to dev February 16, 2025 13:58
@ildar170975
Copy link
Copy Markdown
Collaborator

@PaulSD
Thanks a lot! Let's merge it to recreated dev.

@ildar170975 ildar170975 merged commit 2547116 into iantrich:dev Feb 16, 2025
@ildar170975
Copy link
Copy Markdown
Collaborator

@PaulSD
Can we add a js file to "assets"? Cannot find it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants