rusackas commented on PR #37880:
URL: https://github.com/apache/superset/pull/37880#issuecomment-4526836748
Rebased on master and resolved the 4 semantic conflicts flagged in my prior
note. Pushed as `a8c11d1b22`.
**Files touched during rebase:**
| File | Conflict | Resolution |
|---|---|---|
| `DndSelectLabel.tsx` | import path | Kept dnd-kit imports + adopted
master's `@apache-superset/core/translation` path |
| `OptionControls/index.tsx` | import paths | Kept dnd-kit imports + adopted
master's `/translation` and `/theme` paths (was `/ui`) |
| `ExploreContainer/index.tsx` | imports + body | Kept the dnd-kit
`ExploreDndContextProvider` wrapper, updated import path `/ui → /theme`, and
fixed the `FC<{}>` → `FC<{ children?: ReactNode }>` (React 18 dropped implicit
children) |
| `DatasourcePanelDragOption/index.tsx` | 3 regions | **Real migration
work**: master added a Redux-backed compatibility filter
(`compatibleMetrics`/`compatibleDimensions` from `state.explore`) that disables
drag on incompatible items + dims them. Ported into the dnd-kit version —
`useSelector` + `isCompatible` memo stayed, react-dnd's `canDrag: isCompatible`
became dnd-kit's `disabled: !isCompatible`, and the inline `style` props use
`undefined` instead of literal values so they don't override the
styled-component's existing `isDragging` styles for the compatible case. |
**Test files also rebased** (mechanical):
- `DndMetricSelect.test.tsx` (12 small regions): master added `useRedux:
true` everywhere; the branch had switched `useDnd: true` → `useDndKit: true`.
Combined into `{ useDndKit: true, useRedux: true }`. Plus one bigger region
where master kept skipped HTML5-drag tests and the branch removed them entirely
— took the branch's deletion (consistent with the rest of the dnd-kit
migration's stance on HTML5-drag test rewrites being a separate follow-up).
- `DatasourcePanelDragOption.test.tsx` (2 regions): same `useRedux: true`
merge + added `initialState: { explore: {} }` so the new `useSelector` doesn't
NPE on an empty store. Dropped the now-obsolete `'should have attribute
draggable:true'` test — dnd-kit doesn't set the HTML5 `draggable` attribute.
**Verification:**
- All 6 hand-resolved files parse cleanly (TS syntax check)
- `DndMetricSelect`, `DndSelectLabel`, `DndColumnSelect`,
`DndColumnMetricSelect`, `DndFilterSelect`, `DatasourcePanelDragOption`,
`OptionControls` test suites all pass locally (58/58 tests)
- Pre-commit: prettier ✓, custom-rules ✓; the type-check and oxlint failures
locally are the pre-existing branch-level TS6305 artifacts and oxlint
config-parse issues that have been hitting everyone this week — both unrelated
to the rebase.
Should be ready for another review pass once CI confirms.
--
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]
