Skip to content

[6942] Pinia Task 13 - account-team #6952

Merged
cstns merged 17 commits intomainfrom
6942-pinia-task-13-account-team
Apr 7, 2026
Merged

[6942] Pinia Task 13 - account-team #6952
cstns merged 17 commits intomainfrom
6942-pinia-task-13-account-team

Conversation

@n-lark
Copy link
Copy Markdown
Contributor

@n-lark n-lark commented Mar 24, 2026

Description

See details & test plan.

Related Issue(s)

Resolves #6942

Checklist

  • I have read the contribution guidelines
  • Suitable unit/system level tests have been added and they pass
  • Documentation has been updated
    • Upgrade instructions
    • Configuration details
    • Concepts
  • Changes flowforge.yml?
    • Issue/PR raised on FlowFuse/helm to update ConfigMap Template
    • Issue/PR raised on FlowFuse/CloudProject to update values for Staging/Production
  • Link to Changelog Entry PR, or note why one is not needed.

Labels

  • Includes a DB migration? -> add the area:migration label

@n-lark n-lark self-assigned this Mar 24, 2026
@n-lark n-lark linked an issue Mar 24, 2026 that may be closed by this pull request
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 24, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 76.26%. Comparing base (a30c57f) to head (642e705).
⚠️ Report is 18 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #6952   +/-   ##
=======================================
  Coverage   76.26%   76.26%           
=======================================
  Files         403      403           
  Lines       20312    20312           
  Branches     4886     4886           
=======================================
  Hits        15490    15490           
  Misses       4822     4822           
Flag Coverage Δ
backend 76.26% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@n-lark n-lark marked this pull request as ready for review March 26, 2026 14:48
@n-lark n-lark requested a review from cstns March 26, 2026 14:49
Base automatically changed from 6829-pinia-task-12-account-auth to main March 31, 2026 13:18
Copy link
Copy Markdown
Contributor

@cstns cstns left a comment

Choose a reason for hiding this comment

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

This was not a small feat, I appreciate the time and work that you put into this! Most of my comments are nitpicks on naming, placement of thing or praise about cleaning house on leftovers.

There was one thing that should have caught my eyes sooner, and am now worried that it might cause so subtle of side effects that we might even not notice it. That is the loss of reactivity when destructuring pinia store properties (actions are fine).

I left a comment where I noticed it, but please re-do a quick project wide scan of pinia state destructors and use the storeToRefs helper. I know it adds a bit of scope to the current task and I take full responsibility for it as I should have caught them sooner

Here's a quick reference to my findings to help out:

Destructuring from use*Store() directly

File Line Destructuring
store/modules/account/index.js 56 const { user } = useAccountAuthStore()
store/modules/account/index.js 57 const { team, isTrialAccount } = useContextStore()
store/modules/account/index.js 79 const { teamMembership, team } = useContextStore()
stores/_account_bridge.js 13 const { user } = useAccountAuthStore()
stores/_account_bridge.js 14 const { team, teamMembership, isTrialAccount, isTrialAccountExpired } = useContextStore()
stores/ux-navigation.js 37 const { isNewlyCreatedUser, userActions } = useUxStore()
stores/account-team.js 26 const { user } = useAccountAuthStore()
pages/account/Settings.vue 301 const { team, teams } = useAccountTeamStore()
composables/.../InstanceFormHelper.js 10 const { team } = useContextStore()
composables/.../InstanceFormHelper.js 20 const { team } = useContextStore()

Destructuring from useAccountBridge() (bridge composable)

File Line Destructuring
stores/product-expert-insights-agent.js 41 const { team } = useAccountBridge()
stores/product-expert.js 49 const { featuresCheck } = useAccountBridge()
stores/product-expert.js 67 const { featuresCheck } = useAccountBridge()
stores/product-expert.js 79 const { team } = useAccountBridge()
stores/product-expert.js 96 const { featuresCheck } = useAccountBridge()
stores/product-expert.js 111 const { featuresCheck } = useAccountBridge()
stores/product-tables.js 53 const { team } = useAccountBridge()
stores/product-tables.js 59 const { team } = useAccountBridge()
stores/product-tables.js 91 const { team } = useAccountBridge()
stores/ux-navigation.js 418 const { team, teamMembership } = useAccountBridge()
stores/product-brokers.js 18 const { team } = useAccountBridge()
stores/product-brokers.js 45 const { team } = useAccountBridge()
stores/product-brokers.js 50 const { team } = useAccountBridge()
stores/product-brokers.js 56 const { team } = useAccountBridge()
stores/product-brokers.js 62 const { team } = useAccountBridge()
stores/product-brokers.js 69 const { team } = useAccountBridge()
stores/product-brokers.js 83 const { team } = useAccountBridge()

(They may not all warrant the use of pinia's helper)

@n-lark
Copy link
Copy Markdown
Contributor Author

n-lark commented Apr 2, 2026

Hi @cstns here is the summary of the fixes I made for the deconstruction/storeToRefs issues. It they were not introduced in this PR, then I didn't fix them since the diff here is already unmanageable. I'll raise another PR for a sweep of the codebase or tackle in Task 15 Teardown.

Pinia Reactivity Fix Tracking

Destructuring from use*Store() directly

File Line Destructuring Fixed? Notes
store/modules/account/index.js 56 const { user } = useAccountAuthStore() ✅ Yes Fixed in this PR — storeToRefs + alias pattern
store/modules/account/index.js 57 const { team, isTrialAccount } = useContextStore() ✅ Yes Fixed in this PR — storeToRefs + alias pattern
store/modules/account/index.js 79 const { teamMembership, team } = useContextStore() ✅ Yes Fixed in this PR — storeToRefs + alias pattern
stores/_account_bridge.js 13 const { user } = useAccountAuthStore() ✅ Yes Fixed in this PR — storeToRefs
stores/_account_bridge.js 14 const { team, teamMembership, isTrialAccount, isTrialAccountExpired } = useContextStore() ✅ Yes Fixed in this PR — storeToRefs
stores/ux-navigation.js 37 const { isNewlyCreatedUser, userActions } = useUxStore() ❌ No Not introduced in this PR — needs a separate fix
stores/account-team.js 26 const { user } = useAccountAuthStore() ✅ Yes Fixed in this PR — direct store proxy access (useAccountAuthStore().user) to preserve test mock compatibility
pages/account/Settings.vue 301 const { team, teams } = useAccountTeamStore() ✅ Yes Fixed in this PR — storeToRefs for teams; team corrected to read from useContextStore() (was a migration bug — team does not exist on useAccountTeamStore)
composables/.../InstanceFormHelper.js 10 const { team } = useContextStore() ✅ Yes Fixed in this PR — storeToRefs + alias pattern
composables/.../InstanceFormHelper.js 20 const { team } = useContextStore() ✅ Yes Fixed in this PR — storeToRefs + alias pattern

Destructuring from useAccountBridge() (bridge composable)

Just to note - const { featuresCheck } = useAccountBridge() is still coming off of Vuex at this point in time. I will ensure this is right when I move it into Pinia in Task 14.

// in _account_bridge.js this is still Vuex. 

        featuresCheck: store.getters['account/featuresCheck'],
        requiresBilling: store.getters['account/requiresBilling'],
File Line Destructuring Fixed? Notes
stores/product-expert-insights-agent.js 41 const { team } = useAccountBridge() ➡️ N/A In an action — one-shot call, reactivity does not apply
stores/product-expert.js 49 const { featuresCheck } = useAccountBridge() ➡️ N/A In an action — one-shot call, reactivity does not apply. Also, featuresCheck comes from Vuex store.getters (direct property access, not destructured from Pinia)
stores/product-expert.js 67 const { featuresCheck } = useAccountBridge() ➡️ N/A In an action — same as above
stores/product-expert.js 79 const { team } = useAccountBridge() ➡️ N/A In an action — one-shot call, reactivity does not apply
stores/product-expert.js 96 const { featuresCheck } = useAccountBridge() ➡️ N/A In an action — same as above
stores/product-expert.js 111 const { featuresCheck } = useAccountBridge() ➡️ N/A In an action — same as above
stores/product-tables.js 53 const { team } = useAccountBridge() ➡️ N/A In an action — one-shot call, reactivity does not apply
stores/product-tables.js 59 const { team } = useAccountBridge() ➡️ N/A In an action — one-shot call, reactivity does not apply
stores/product-tables.js 91 const { team } = useAccountBridge() ➡️ N/A In an action — one-shot call, reactivity does not apply
stores/ux-navigation.js 418 const { team, teamMembership } = useAccountBridge() ✅ Effectively fixed In a getter — not introduced in this PR. Destructuring plain values from useAccountBridge() is safe: the getter reruns on dependency change, the bridge is called fresh each time, and reactive tracking flows through the bridge's internal storeToRefs accesses. No further change needed.
stores/product-brokers.js 18 const { team } = useAccountBridge() ✅ Effectively fixed In a getter — same reasoning as above.
stores/product-brokers.js 45 const { team } = useAccountBridge() ➡️ N/A In an action — one-shot call, reactivity does not apply
stores/product-brokers.js 50 const { team } = useAccountBridge() ➡️ N/A In an action — one-shot call, reactivity does not apply
stores/product-brokers.js 56 const { team } = useAccountBridge() ➡️ N/A In an action — one-shot call, reactivity does not apply
stores/product-brokers.js 62 const { team } = useAccountBridge() ➡️ N/A In an action — one-shot call, reactivity does not apply
stores/product-brokers.js 69 const { team } = useAccountBridge() ➡️ N/A In an action — one-shot call, reactivity does not apply
stores/product-brokers.js 83 const { team } = useAccountBridge() ➡️ N/A In an action — one-shot call, reactivity does not apply

Additional fixes not original list

File Issue Fix
pages/account/Settings.vue team was destructured from useAccountTeamStore()team is not state on that store, so it was always undefined. The active team lives in useContextStore. This was a silent migration bug: the if (team?.id === teamId) guard never fired, meaning a deleted team would never trigger the fallback to a different team. Changed to useContextStore().team so the check works correctly

@n-lark n-lark requested a review from cstns April 2, 2026 15:22
Copy link
Copy Markdown
Contributor

@cstns cstns left a comment

Choose a reason for hiding this comment

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

Looking good! I'll approve it today but we should postpone it's release to next week as discussed on slack.

Awesome work!

@cstns cstns merged commit 2f4ad13 into main Apr 7, 2026
30 checks passed
@cstns cstns deleted the 6942-pinia-task-13-account-team branch April 7, 2026 09:28
@cstns
Copy link
Copy Markdown
Contributor

cstns commented Apr 7, 2026

merged, keeping an eye on sentry for the day

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.

Pinia Task 13 - account-team

3 participants