File tree Expand file tree Collapse file tree 3 files changed +10
-22
lines changed
app/front-end/src/features/editor/components/toolbarView Expand file tree Collapse file tree 3 files changed +10
-22
lines changed Original file line number Diff line number Diff line change @@ -22,15 +22,9 @@ export const MergeGroupButtons: React.FC<MergeGroupButtonsProps> = () => {
22
22
const mergeLovdAndGnomadClick = useCallback ( async ( ) => {
23
23
clinvarErrorStateUpdate ( '' ) ;
24
24
25
- if ( ! lovdFile ) {
26
- lovdErrorStateUpdate ( 'Please select a LOVD file' ) ;
27
- return ;
28
- }
29
-
30
- if ( ! gnomadFile ) {
31
- gnomadErrorStateUpdate ( 'Please select a gnomAD file' ) ;
32
- return ;
33
- }
25
+ if ( ! lovdFile ) lovdErrorStateUpdate ( 'Please select a LOVD file' ) ;
26
+ if ( ! gnomadFile ) gnomadErrorStateUpdate ( 'Please select a gnomAD file' ) ;
27
+ if ( ! lovdFile || ! gnomadFile ) return ;
34
28
35
29
blockedStateUpdate ( true ) ;
36
30
@@ -57,15 +51,9 @@ export const MergeGroupButtons: React.FC<MergeGroupButtonsProps> = () => {
57
51
const mergeLovdAndClinvarClick = useCallback ( async ( ) => {
58
52
gnomadErrorStateUpdate ( '' ) ;
59
53
60
- if ( ! lovdFile ) {
61
- lovdErrorStateUpdate ( 'Please select a LOVD file' ) ;
62
- return ;
63
- }
64
-
65
- if ( ! clinvarFile ) {
66
- clinvarErrorStateUpdate ( 'Please select a ClinVar file' ) ;
67
- return ;
68
- }
54
+ if ( ! lovdFile ) lovdErrorStateUpdate ( 'Please select a LOVD file' ) ;
55
+ if ( ! clinvarFile ) clinvarErrorStateUpdate ( 'Please select a ClinVar file' ) ;
56
+ if ( ! lovdFile || ! clinvarFile ) return ;
69
57
70
58
blockedStateUpdate ( true ) ;
71
59
Original file line number Diff line number Diff line change @@ -80,7 +80,7 @@ export const ApplyGroupParams: React.FC<ApplyGroupParamsProps> = () => {
80
80
: Theme . palette . text . primary ,
81
81
} }
82
82
>
83
- { applyError ? applyError : 'Apply To' }
83
+ { 'Apply To' }
84
84
</ StyledGroupParamsInputLabel >
85
85
< StyledGroupParamsSelect
86
86
id = { 'lovd-file-select' }
Original file line number Diff line number Diff line change @@ -106,7 +106,7 @@ export const MergeGroupParams: React.FC<MergeGroupParamsProps> = () => {
106
106
: Theme . palette . text . primary ,
107
107
} }
108
108
>
109
- { lovdError ? lovdError : 'Lovd File' }
109
+ { 'Lovd File' }
110
110
</ StyledGroupParamsInputLabel >
111
111
< StyledGroupParamsSelect
112
112
id = { 'lovd-file-select' }
@@ -156,7 +156,7 @@ export const MergeGroupParams: React.FC<MergeGroupParamsProps> = () => {
156
156
: Theme . palette . text . primary ,
157
157
} }
158
158
>
159
- { clinvarError ? clinvarError : 'Clinvar File' }
159
+ { 'Clinvar File' }
160
160
</ StyledGroupParamsInputLabel >
161
161
< StyledGroupParamsSelect
162
162
id = { 'clinvar-file-select' }
@@ -206,7 +206,7 @@ export const MergeGroupParams: React.FC<MergeGroupParamsProps> = () => {
206
206
: Theme . palette . text . primary ,
207
207
} }
208
208
>
209
- { gnomadError ? gnomadError : 'Gnomad File' }
209
+ { 'Gnomad File' }
210
210
</ StyledGroupParamsInputLabel >
211
211
< StyledGroupParamsSelect
212
212
id = { 'gnomad-file-select' }
You can’t perform that action at this time.
0 commit comments