Skip to content

Commit cc80625

Browse files
committed
Changes based on reviews on July 16th by Vincent. Mainly naming changes
1 parent 22141c6 commit cc80625

5 files changed

Lines changed: 16 additions & 7 deletions

File tree

Eplant/main.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const router = createBrowserRouter([
4545
element: <PlantEFPView></PlantEFPView>,
4646
},
4747
{
48-
path: 'tissue/:geneid?',
48+
path: 'experiment-efp/:geneid?',
4949
element: <ExperimentEFPView></ExperimentEFPView>,
5050
},
5151
{
@@ -61,7 +61,7 @@ const router = createBrowserRouter([
6161
element: <NavigatorViewObject></NavigatorViewObject>,
6262
},
6363
{
64-
path: 'interactions-viewer/:geneid?',
64+
path: 'interactions-view/:geneid?',
6565
element: <InteractionsViewObject></InteractionsViewObject>,
6666
},
6767
],

Eplant/views/ExperimentEFP/ExperimentEFP.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const ExperimentEFPView = () => {
2626
EFPViewerData,
2727
ViewDataError
2828
>({
29-
queryKey: [`tissue-${geneticElement?.id}`],
29+
queryKey: [`experiment-efp-${geneticElement?.id}`],
3030
queryFn: async () => {
3131
return EFPViewerLoader(
3232
geneticElement,

Eplant/views/ExperimentEFP/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ const views: EFPViewerData['views'] = [
261261
const efps: EFP[] = makeEfps(views)
262262

263263
export default new EFPViewer(
264-
'tissue',
264+
'experiment-efp',
265265
'Tissue & Experiment eFP',
266266
views,
267267
efps,

Eplant/views/InteractionsViewer/InteractionsView.tsx

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const InteractionsViewObject = () => {
3434
InteractionsViewData,
3535
ViewDataError
3636
>({
37-
queryKey: [`interactions-viewer-${geneticElement?.id}`],
37+
queryKey: [`interactions-view-${geneticElement?.id}`],
3838
queryFn: async () => {
3939
return await InteractionsViewLoader(geneticElement, setLoadAmount)
4040
},
@@ -155,7 +155,16 @@ export const InteractionsViewObject = () => {
155155
state?.transform?.offset.y,
156156
])
157157

158-
if (isError) {
158+
if (!geneticElement) {
159+
return (
160+
<LoadingPage
161+
loadingAmount={loadAmount}
162+
gene={geneticElement}
163+
view={InteractionsView}
164+
error={ViewDataError.UNSUPPORTED_GENE}
165+
></LoadingPage>
166+
)
167+
} else if (isError) {
159168
return (
160169
<LoadingPage
161170
loadingAmount={loadAmount}

Eplant/views/InteractionsViewer/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const InteractionsViewer: ViewMetadata<
7979
InteractionsViewState
8080
> = {
8181
name: 'Interactions Viewer',
82-
id: 'interactions-viewer',
82+
id: 'interactions-view',
8383

8484
icon: () => <InteractionsIcon />,
8585
description: 'Interactions Viewer.',

0 commit comments

Comments
 (0)