Skip to content

chore: sync macros and dashboard fixes to the current PR end state - #8

Merged
Hannott merged 1 commit into
developfrom
sync/macros-and-dashboard-latest
Jul 31, 2026
Merged

chore: sync macros and dashboard fixes to the current PR end state#8
Hannott merged 1 commit into
developfrom
sync/macros-and-dashboard-latest

Conversation

@Hannott

@Hannott Hannott commented Jul 31, 2026

Copy link
Copy Markdown
Owner

Description

Brings develop up to date with the reviewed/final state of the three macros PRs (mainsail-crew#2617, mainsail-crew#2618, mainsail-crew#2619) and the dashboard PR (mainsail-crew#2611), replacing the earlier squashed macros fix (30cd662) and draft dashboard feature (e617487) already on this branch.

Changed vs. what's currently on develop:

  • SettingsMacrosTabExpert.vue: macroListLoaded now treats a fully-loaded, genuinely empty macro list as loaded instead of requiring allMacros.length > 0.
  • Dashboard.vue / store/gui/getters.ts: scoped styles via ::v-deep instead of a global style block, constant drag group instead of a per-viewport getter, comment removed on getStoredPanels — per meteyou's review on feat(dashboard): rearrange panels via drag and drop mainsail-crew/mainsail#2611.

All other files touched by the four PRs already matched byte-for-byte what's on develop, so they aren't part of this diff.

Verified: vitest run (60/60), eslint src --max-warnings 0, vite build.

develop already carried the original squashed macros fix (30cd662) and
an earlier draft of the dashboard drag and drop feature (e617487).
Brings both up to the state of the currently open upstream PRs after
review:

- SettingsMacrosTabExpert.vue: macroListLoaded now treats a genuinely
  empty, fully loaded macro list as loaded instead of requiring
  allMacros.length > 0, so real deletions are reported once Klipper is
  ready rather than only once at least one macro exists.
- Dashboard.vue / store/gui/getters.ts: scoped styles use ::v-deep for
  the three selectors that reach into Panel.vue instead of a global
  style block, the drag group is a constant instead of a per viewport
  getter (only one viewport ever renders), and the comment on
  getStoredPanels is gone, per meteyou's review on mainsail-crew#2611.

All other files already matched between develop and the current PR
branches.

Signed-off-by: Åsmund Collin <aakjaergaard@gmail.com>

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
@Hannott
Hannott merged commit 90f6a8c into develop Jul 31, 2026
8 checks passed
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.

1 participant