fix: 936 embedding cell count #942
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
tihuan
force-pushed
the
thuang-936-embedding-bug-1-from-main
branch
2 times, most recently
from
442d257 to
5411c52
Compare
tihuan
commented
May 22, 2024
Comment on lines
+246
to
+254
| dispatch({ | ||
| type: "initial data load complete", | ||
| isCellGuideCxg, | ||
| layoutChoice: finalLayout, | ||
| }); |
There was a problem hiding this comment.
when we dispatch this action, we send both isCellGuideCxg and layoutChoice
client/src/actions/index.ts
Outdated
| * count when the page is first loaded. | ||
| * BUG: https://app.zenhub.com/workspaces/single-cell-5e2a191dad828d52cc78b028/issues/gh/chanzuckerberg/single-cell-explorer/936 | ||
| */ | ||
| dispatch(embActions.layoutChoiceAction(finalLayout)); |
There was a problem hiding this comment.
we still dispatch this action in order to get the correct crossFilter, etc.
| // eslint-disable-next-line @typescript-eslint/ban-types --- FIXME: disabled temporarily on migrate to TS. | ||
| class Embedding extends React.PureComponent<{}, EmbeddingState> { | ||
| // eslint-disable-next-line @typescript-eslint/ban-types --- FIXME: disabled temporarily on migrate to TS. | ||
| constructor(props: {}) { |
There was a problem hiding this comment.
remove unnecessary ctor per linter
| this.state = {}; | ||
| } | ||
|
|
||
| class Embedding extends React.PureComponent<Props> { |
There was a problem hiding this comment.
just type cleanup in this file
| return layouts[0]; | ||
| } | ||
|
|
||
| function setToDefaultLayout(schema: Schema): LayoutChoiceState { |
There was a problem hiding this comment.
this function is now split out into selectAvailableLayouts and getCurrentLayout for reusability
|
|
||
| // eslint-disable-next-line @typescript-eslint/no-explicit-any --- update typings once annoMatrix reducer state is typed. | ||
| export const selectAnnoMatrix = (state: RootState): any => state.annoMatrix; |
| @@ -20,3 +20,8 @@ export const selectIsUserStateDirty = (state: any): boolean => { | |||
| ) | |||
| ); | |||
| }; | |||
|
|
|||
| export function selectSchema(state: RootState) { | |||
There was a problem hiding this comment.
new selector to get annoMatrix.schema
seve
approved these changes
May 23, 2024
client/src/actions/index.ts
Outdated
| /** | ||
| * (thuang): This dispatch is necessary to ensure that we get the right cell | ||
| * count when the page is first loaded. | ||
| * BUG: https://app.zenhub.com/workspaces/single-cell-5e2a191dad828d52cc78b028/issues/gh/chanzuckerberg/single-cell-explorer/936 |
There was a problem hiding this comment.
Suggested change
| * BUG: https://app.zenhub.com/workspaces/single-cell-5e2a191dad828d52cc78b028/issues/gh/chanzuckerberg/single-cell-explorer/936 | |
| * BUG: https://github.coms/chanzuckerberg/single-cell-explorer/936 |
There was a problem hiding this comment.
Oh thank you! I'll use #936
tihuan
force-pushed
the
thuang-936-embedding-bug-1-from-main
branch
from
5411c52 to
ace0a64
Compare
tihuan
force-pushed
the
thuang-936-embedding-bug-1-from-main
branch
from
ace0a64 to
b6a7b39
Compare
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.
Fix #936
doInitialDataLoadaction now choose the initial layout by checking if the dataset's preferreddefault_embeddingis available or not and fall back to picking the best layout given the available layoutsselectAvailableLayoutsto reuseScreen.Recording.2024-05-22.at.9.08.36.AM.mov