Fix row id mapping in object detail modal displaying #40874
Merged
Conversation
This file contains 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
|
Codenotify: Notifying subscribers in CODENOTIFY files for diff 2cf9432...25cc3e8.
|
|
uladzimirdev
changed the title
uladzimirdev
changed the title
uladzimirdev
changed the title
uladzimirdev
added
the
backport
kamilmielnik
reviewed
Apr 3, 2024
Comment on lines
489
to
502
| let objectId; | ||
|
|
||
| if (this.state.IDColumn) { | ||
| objectId = this.props.data.rows[rowIndex][this.state.IDColumnIndex]; | ||
| } else { | ||
| const map = this.props.PKRowIndexMap; | ||
|
|
||
| objectId = | ||
| Object.keys(map).find(key => map[key] === rowIndex) ?? rowIndex; | ||
| } | ||
|
|
||
| return () => { | ||
| this.props.onZoomRow(objectId); | ||
| }; |
There was a problem hiding this comment.
I don't know if there's a problem, but I'd feel safer if all this.props and this.state references happened inside the returned callback (to avoid referencing stale props when callback is executed).
Suggested change
| let objectId; | |
| if (this.state.IDColumn) { | |
| objectId = this.props.data.rows[rowIndex][this.state.IDColumnIndex]; | |
| } else { | |
| const map = this.props.PKRowIndexMap; | |
| objectId = | |
| Object.keys(map).find(key => map[key] === rowIndex) ?? rowIndex; | |
| } | |
| return () => { | |
| this.props.onZoomRow(objectId); | |
| }; | |
| return () => { | |
| let objectId; | |
| if (this.state.IDColumn) { | |
| objectId = this.props.data.rows[rowIndex][this.state.IDColumnIndex]; | |
| } else { | |
| const map = this.props.PKRowIndexMap; | |
| objectId = | |
| Object.keys(map).find(key => map[key] === rowIndex) ?? rowIndex; | |
| } | |
| this.props.onZoomRow(objectId); | |
| }; |
There was a problem hiding this comment.
well, this function is re-calculated every time you hover over a row
hoverDetailEl.onclick = this.pkClick(rowIndex)
or press "Enter" - this.pkClick(hoveredRowIndex)(event);
I'd not worry about stale props
There was a problem hiding this comment.
changed it in fa0289f
| @@ -77,6 +80,7 @@ function pickRowsToMeasure(rows, columnIndex, count = 10) { | |||
|
|
|||
| const mapStateToProps = state => ({ | |||
| queryBuilderMode: getQueryBuilderMode(state), | |||
| PKRowIndexMap: getPKRowIndexMap(state), | |||
kamilmielnik
approved these changes
Apr 3, 2024
ranquild
approved these changes
Apr 3, 2024
| // and we'll not know which object to show | ||
| export const getRowIndexToPKMap = createSelector( | ||
| [getFirstQueryResult, getPKColumnIndex], | ||
| (result, PKColumnIndex) => { |
There was a problem hiding this comment.
nit: lowercase pkColumnIndex?
There was a problem hiding this comment.
actually it's an abbreviation and it's used in other places, so I'd not change it (I came up to the same naming in the component in the initial version of the PR)
github-actions bot
pushed a commit
that referenced
this pull request
Apr 3, 2024
* Map row id on object detail id * Add a fallback * Add e2e test * Add a limit * Provide a fix for #34070 * Simplify test
rafpaf
pushed a commit
that referenced
this pull request
Apr 3, 2024
* Map row id on object detail id * Add a fallback * Add e2e test * Add a limit * Provide a fix for #34070 * Simplify test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #39477
Closes #34070
Description
we have a not straightforward logic on detecting what the data should be shown after clicking on a table row to show object detail modal. This PR reuses logic of mapping row id to the entity id
How to verify
Demo
Before
Screen.Recording.2024-04-02.at.20.32.08.mov
After
Screen.Recording.2024-04-02.at.20.31.16.mov
Checklist