chore(release): prepare v1.2.0 - #361
Merged
Merged
Conversation
fix(asset): update access from admin to editor
Bump the version to 1.2.0. staging has read 1.1.0 since July, because the 1.1.1 and 1.1.2 hotfix bumps went straight to production and were never merged back. Also restore editor access to Unassociated Assets. The v1.1.1 hotfix (cac1710) changed both the nav entry and the access-control policy, but staging carries only part of that: the policy here had reverted to adminRoles while production grants editorRoles. Merging staging into production would have kept production's nav line and taken staging's policy, leaving a nav link editors can see behind a permission check that turns them away. Git reports no conflict on that file, so nothing would have flagged it. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Back-merge production so staging stops drifting from it. The 1.1.1 and 1.1.2 hotfixes shipped straight to production and were never merged back, which is why staging still read 1.1.0 and why the Unassociated Assets policy had reverted to admin-only here. Conflict resolutions: - package.json: keep 1.2.0. - .gitignore: keep staging's Claude Code entries; production has none. - authentik-provider: keep staging's buildAuthentikUrl helper. It strips trailing slashes from the base URL (src/config/auth.ts:7), so the v1.1.1 fix for a trailing slash in AUTHENTIK_URL survives. - accessControl.test: keep both sides. hydrograph-correction is new on staging, asset-unassociated comes from the v1.1.1 hotfix, and editors should have both. With this in place the staging into production merge is conflict-free. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Preview DeploymentPreview URL: https://preview-release-v1-2-0-auejgdbofq-uc.a.run.app |
1 similar comment
Preview DeploymentPreview URL: https://preview-release-v1-2-0-auejgdbofq-uc.a.run.app |
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Version bump, one access-control repair, and a back-merge of production, ahead of merging staging into production as v1.2.0.
Version
staging has read
1.1.0since July. The1.1.1and1.1.2bumps went straight to production on hotfix branches and were never merged back, so the number on staging has been behind for two releases. This sets it to1.2.0.Editor access to Unassociated Assets
The v1.1.1 hotfix (
cac1710) gave editors access to Unassociated Assets, changing two things: the nav entry insrc/config/navigation.tsand the policy insrc/utils/accessControl.ts.staging only carries part of that. The nav entry here said
adminOnlyand the policy saidadminRoles, while production grantseditorRoles.That matters for the release merge. Git resolves the two files differently: production's nav line survives, because staging never edited that exact line, but staging's policy file merges in cleanly and wins. The merged result would show editors a nav link and then deny them at the permission check, with no conflict reported anywhere.
This restores
editorRoleson the policy andeditorAndAboveon the nav entry, so both agree, and adds the matching assertions toaccessControl.test.ts.Back-merge of production
Rather than resolve the same conflicts during the release merge, this branch merges production in first. staging then contains everything production has, and the staging into production merge is conflict-free. I verified that locally: zero conflicts.
It also stops the drift that caused this. Hotfixes have been landing on production and never coming back, which is what left staging two versions behind with a half-reverted permission fix.
Conflicts resolved in the back-merge:
package.json: keep 1.2.0..gitignore: keep staging's Claude Code entries; production has none.authentik-provider.ts: keep staging'sbuildAuthentikUrlhelper. It strips trailing slashes from the base URL (src/config/auth.ts:7), so the v1.1.1 fix survives.accessControl.test.ts: keep both sides.hydrograph-correctionis new on staging,asset-unassociatedcomes from the v1.1.1 hotfix, and editors should have both.Verification
npx tsc --noEmitcleanTwo things for a follow-up, not changed here
tmp/wellpy-samples/holds four sample data files, about 198 KB, added by the hydrograph correction work. They look like developer scratch files rather than anything the app serves, and this release would ship them to production. Worth deleting if I am reading them right.Running the test suite from a git worktree fails with
Failed to load url .../node_modules/@mui/icons-material/esm/index.js. The cause is vite'sserver.fs.allow, which defaults to the workspace root and denies the parent checkout'snode_modules. Wideningfs.allowfixes it. I kept the config untouched rather than fold an unrelated change into a release PR.🤖 Generated with Claude Code