Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix sample/study counter in VS description #5028

Merged
merged 4 commits into from
Nov 18, 2024
Merged

Fix sample/study counter in VS description #5028

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6613c7
Fix sample/study counter in VS description
forus Oct 22, 2024
2a07adc
Merge branch 'master' into fix_virtual_study_creation_description_bug
forus Oct 29, 2024
fe9daed
Merge branch 'master' into fix_virtual_study_creation_description_bug
forus Nov 5, 2024
7332a14
Merge branch 'master' into fix_virtual_study_creation_description_bug
forus Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 40 additions & 28 deletions src/pages/studyView/virtualStudy/VirtualStudyModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import * as React from 'react';
import VirtualStudy from 'pages/studyView/virtualStudy/VirtualStudy';
import { AppStore } from 'AppStore';
import { StudyViewPageStore } from 'pages/studyView/StudyViewPageStore';
import { JsxElement } from 'typescript';
import { observer } from 'mobx-react';
import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';

export interface IVirtualStudyModalProps {
appStore: AppStore;
Expand All @@ -12,43 +13,54 @@ export interface IVirtualStudyModalProps {
onHide: () => void;
}

export const VirtualStudyModal: React.FunctionComponent<IVirtualStudyModalProps> = function({
export const VirtualStudyModal: React.FunctionComponent<IVirtualStudyModalProps> = observer(({
appStore,
pageStore,
message,
onHide,
}) {
}) => {
const isLoading = [
pageStore.filteredVirtualStudies,
pageStore.studyWithSamples,
pageStore.filteredVirtualStudies,
pageStore.molecularProfileNameSet,
pageStore.molecularProfileNameSet,
].some(result => result.isPending);
return (
<Modal onHide={onHide} show={true}>
<Modal.Header closeButton>
<Modal.Title>Create a Virtual Study</Modal.Title>
</Modal.Header>
<Modal.Body>
{message || null}
<VirtualStudy
user={appStore.userName}
name={
pageStore.isSingleVirtualStudyPageWithoutFilter
? pageStore.filteredVirtualStudies.result[0].data
.name
: undefined
}
description={
pageStore.isSingleVirtualStudyPageWithoutFilter
? pageStore.filteredVirtualStudies.result[0].data
.description
: undefined
}
studyWithSamples={pageStore.studyWithSamples.result}
selectedSamples={pageStore.selectedSamples.result}
filter={pageStore.userSelections}
attributesMetaSet={pageStore.chartMetaSet}
molecularProfileNameSet={
pageStore.molecularProfileNameSet.result || {}
}
caseListNameSet={pageStore.caseListNameSet.result || {}}
/>
{isLoading ?
<LoadingIndicator isLoading={true}/>
: <>
{message || null}
<VirtualStudy
Comment on lines +37 to +39
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alisman is {message || null } needed if we don't use it below?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@haynescd not sure what you mean don't use it below. it's being rendered here.

user={appStore.userName}
name={
pageStore.isSingleVirtualStudyPageWithoutFilter
? pageStore.filteredVirtualStudies.result[0].data
.name
: undefined
}
description={
pageStore.isSingleVirtualStudyPageWithoutFilter
? pageStore.filteredVirtualStudies.result[0].data
.description
: undefined
}
studyWithSamples={pageStore.studyWithSamples.result}
selectedSamples={pageStore.selectedSamples.result}
filter={pageStore.userSelections}
attributesMetaSet={pageStore.chartMetaSet}
molecularProfileNameSet={
pageStore.molecularProfileNameSet.result || {}
}
caseListNameSet={pageStore.caseListNameSet.result || {}}
/>
</>}
</Modal.Body>
</Modal>
);
};
});
Loading