mikebridge commented on PR #41551:
URL: https://github.com/apache/superset/pull/41551#issuecomment-5171050587

   *Generated by Claude (AI) on behalf of @mikebridge.*
   
   **Rebased onto master — head is now `66b5c09e4d`, MERGEABLE again** (it had 
gone CONFLICTING after today's merges). Flagging for @kgabryje ahead of round 3 
so the SHA pins land on the rebased history.
   
   73 commits replayed over 79 of master's. What it absorbed:
   
   - **#42708 merged**, so this branch's duplicate `extra_editors` commit 
collapsed to just the `canOverwriteSlice` reuse — the two `permissionUtils` 
files now come from master's version, which is the better one (it carries the 
union-semantics test the standalone PR gained in review). This is the split 
working exactly as intended.
   - **#42711 merged**, so `VersionChangedBy` — which existed only to add 
`username` to `ActivityChangedBy`, and had no other consumer — is deleted; 
`VersionMeta` uses `ActivityChangedBy` directly, which is what the server-side 
schema-parity test now enforces.
   - **#42434 migrated the repo from Prettier to Oxfmt.** Only three files here 
needed reformatting (the rest are new files Oxfmt had never seen), and the 
changes are wrapping-only.
   - **#41550 (soft-delete Recently Archived) merged** and added `SOFT_DELETE` 
beside `VERSION_HISTORY` in `featureFlags.ts` — merged cleanly.
   
   Verification after the rebase: 168/168 in the feature suite, 267/267 across 
the affected areas, oxfmt/oxlint/stylelint/custom-rules all clean.
   
   One note for anyone type-checking locally: `tsc` reports 14 errors in 
`ArchivedList`/`ChartList`/`DashboardList`/`DatasetList`/`softDeleteCopy` — all 
from a stale local `packages/superset-ui-core/lib/*.d.ts` build that predates 
#41550 (`FeatureFlag.SoftDelete`, the `recoverable` prop, `RollbackOutlined` 
are all present in source). **Clean master reproduces all 14**, and this branch 
touches none of those files. CI resolves `@superset-ui/core` → `src` via 
tsconfig paths, so it doesn't see them.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to