Skip to content

Commit f305254

Browse files
boriskovar-m2msboriskovar-m2ms
committed
- #1707 - clean up is done. If additional unnecessary code is found, during implementation of new snapshot navigation, it will be removed
1 parent 9ef288b commit f305254

34 files changed

Lines changed: 52 additions & 4280 deletions

‎js/components/common/ModalNewProject/AlertModal/index.js‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎js/components/common/ModalNewProject/index.js‎

Lines changed: 0 additions & 102 deletions
This file was deleted.

‎js/components/datasets/customDatasetList.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export const CustomDatasetList = memo(({ dataset, hideProjects, isActive }) => {
3030
style={{ paddingTop: '10px' }}
3131
title={title}
3232
url={dataset && dataset.url}
33-
hideProjects={hideProjects}
3433
datasetID={dataset && dataset.id}
3534
/>
3635
);

‎js/components/header/index.js‎

Lines changed: 9 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,9 @@ import {
6666
setSnapshotEditDialogOpen,
6767
setSnapshotToBeEdited
6868
} from '../snapshot/redux/actions';
69-
import { activateSnapshotDialog, createNewSnapshot } from '../snapshot/redux/dispatchActions';
70-
import { setAddButton, setCurrentSnapshot, setProjectModalIsLoading } from '../projects/redux/actions';
69+
import { createNewSnapshot } from '../snapshot/redux/dispatchActions';
70+
import { setCurrentSnapshot } from '../projects/redux/actions';
7171
import { getVersions } from '../../utils/version';
72-
import { AddProjectDetail } from '../projects/addProjectDetail';
7372
import { ServicesStatusWrapper } from '../services';
7473
import { COMPANIES, get_logo } from '../funders/constants';
7574
import { setEditTargetDialogOpen } from '../target/redux/actions';
@@ -146,9 +145,6 @@ export default memo(
146145
const currentProject = useSelector(state => state.projectReducers.currentProject);
147146
const targetName = useSelector(state => state.apiReducers.target_on_name);
148147

149-
const openNewProjectModal = useSelector(state => state.projectReducers.isProjectModalOpen);
150-
const isProjectModalLoading = useSelector(state => state.projectReducers.isProjectModalLoading);
151-
152148
const openSaveSnapshotModal = useSelector(state => state.snapshotReducers.openSavingDialog);
153149

154150
const openDiscourseError = useSelector(state => state.apiReducers.open_discourse_error_modal);
@@ -333,59 +329,14 @@ export default memo(
333329
>
334330
Menu
335331
</Button>
336-
<Button
337-
onClick={() => setOpenTargetSettings(true)}
338-
disabled={!targetName || !DJANGO_CONTEXT.pk}
339-
>
340-
<Typography
341-
variant="h5"
342-
color="textPrimary"
343-
>
332+
<Button onClick={() => setOpenTargetSettings(true)} disabled={!targetName || !DJANGO_CONTEXT.pk}>
333+
<Typography variant="h5" color="textPrimary">
344334
Fragalysis: <b id={'headerNavbarTitle'}>{headerNavbarTitle}</b>
345335
</Typography>
346336
</Button>
347337
{username !== null ? (
348338
targetName !== undefined ? (
349339
<>
350-
{currentProject.authorID === null ||
351-
currentProject.projectID === null ||
352-
currentProject.authorID === userId ? (
353-
<Button
354-
onClick={() => {
355-
if (!isProjectModalLoading) {
356-
dispatch(setProjectModalIsLoading(true));
357-
dispatch(setAddButton(false));
358-
} else {
359-
dispatch(setProjectModalIsLoading(false));
360-
}
361-
362-
openSaveSnapshotModal ?? dispatch(setOpenSnapshotSavingDialog(false));
363-
}}
364-
key="newProject"
365-
color="primary"
366-
startIcon={<CreateNewFolder />}
367-
>
368-
New project
369-
</Button>
370-
) : (
371-
<Button
372-
onClick={() => {
373-
if (!openNewProjectModal) {
374-
dispatch(setProjectModalIsLoading(true));
375-
dispatch(setAddButton(false));
376-
} else {
377-
dispatch(setProjectModalIsLoading(false));
378-
}
379-
380-
openSaveSnapshotModal ?? dispatch(setOpenSnapshotSavingDialog(false));
381-
}}
382-
key="newProject"
383-
color="primary"
384-
startIcon={<CreateNewFolder />}
385-
>
386-
New project from snapshot
387-
</Button>
388-
)}
389340
{currentProject.projectID !== null ? (
390341
<Button
391342
key="saveSnapshot"
@@ -443,7 +394,6 @@ export default memo(
443394
''
444395
)}
445396
{headerButtons && headerButtons.map(item => item)}
446-
<AddProjectDetail />
447397
</ButtonGroup>
448398
</Grid>
449399
<Grid item>
@@ -682,7 +632,7 @@ export default memo(
682632
</ListItemIcon>
683633
<ListItemText primary="Contributors" />
684634
</ListItem>
685-
{DJANGO_CONTEXT.pk && !!targetName &&
635+
{DJANGO_CONTEXT.pk && !!targetName && (
686636
<>
687637
<Divider />
688638
<ListItem button onClick={() => setOpenTargetSettings(true)}>
@@ -692,8 +642,8 @@ export default memo(
692642
<ListItemText primary="Target settings" />
693643
</ListItem>
694644
</>
695-
}
696-
{DJANGO_CONTEXT.pk &&
645+
)}
646+
{DJANGO_CONTEXT.pk && (
697647
<>
698648
<Divider />
699649
<ListItem button onClick={getToken}>
@@ -722,7 +672,7 @@ export default memo(
722672
<ListItemText primary="Metadata upload" />
723673
</ListItem>
724674
</>
725-
}
675+
)}
726676
<Divider />
727677
{authListItem}
728678
</Grid>
@@ -740,7 +690,7 @@ export default memo(
740690
</Grid>
741691
</Drawer>
742692
<Box paddingTop={`${headerHeight}px`} width="100%" />
743-
</ComputeSize >
693+
</ComputeSize>
744694
);
745695
})
746696
);

‎js/components/landing/Landing.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { connect, useDispatch, useSelector } from 'react-redux';
88
import * as apiActions from '../../reducers/api/actions';
99
import * as selectionActions from '../../reducers/selection/actions';
1010
import { DJANGO_CONTEXT } from '../../utils/djangoContext';
11-
import { Projects } from '../projects';
1211
import { resetCurrentCompoundsSettings } from '../preview/compounds/redux/actions';
1312
import { resetProjectsReducer } from '../projects/redux/actions';
1413
import { withLoadingProjects } from '../target/withLoadingProjects';
@@ -146,9 +145,7 @@ const Landing = memo(
146145
}}
147146
onMouseDown={handleMouseDownResizer}
148147
></div>
149-
<Grid item style={{ width: projectListWidth }}>
150-
<Projects />
151-
</Grid>
148+
<Grid item style={{ width: projectListWidth }}></Grid>
152149
</Grid>
153150
<TargetSettingsModal openModal={isEditTargetDialogOpen} onModalClose={onModalClose} isTargetOn={false} />
154151
</>

‎js/components/preview/Preview.js‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import { withLoadingProtein } from './withLoadingProtein';
1414
import { withLoadingJobSpecs } from './withLoadingJobSpecs';
1515
import { withSnapshotManagement } from '../snapshot/withSnapshotManagement';
1616
import { useDispatch, useSelector } from 'react-redux';
17-
import { ProjectHistoryPanel } from './projectHistoryPanel';
18-
import { ProjectDetailDrawer } from '../projects/projectDetailDrawer';
1917
import { NewSnapshotModal } from '../snapshot/modals/newSnapshotModal';
2018
import { SaveSnapshotBeforeExit } from '../snapshot/modals/saveSnapshotBeforeExit';
2119
import { ModalShareSnapshot } from '../snapshot/modals/modalShareSnapshot';
@@ -47,7 +45,6 @@ import {
4745
} from '../../reducers/api/actions';
4846
import { PickProjectModal } from './PickProjectModal';
4947
import { withLoadingProjects } from '../target/withLoadingProjects';
50-
import { setProjectModalOpen } from '../projects/redux/actions';
5148
import { setOpenSnapshotSavingDialog } from '../snapshot/redux/actions';
5249
import { setTagEditorOpen, setMoleculeForTagEdit, setToastMessages } from '../../reducers/selection/actions';
5350
import { LoadingContext } from '../loading';
@@ -116,7 +113,6 @@ const Preview = memo(({ isStateLoaded, hideProjects, isSnapshot = false }) => {
116113
const currentLayout = useSelector(state => state.layoutReducers.currentLayout);
117114
const layoutLocked = useSelector(state => state.layoutReducers.layoutLocked);
118115

119-
const openNewProjectModal = useSelector(state => state.projectReducers.isProjectModalOpen);
120116
const openSaveSnapshotModal = useSelector(state => state.snapshotReducers.openSavingDialog);
121117

122118
const target_id_list = useSelector(state => state.apiReducers.target_id_list);
@@ -266,7 +262,7 @@ const Preview = memo(({ isStateLoaded, hideProjects, isSnapshot = false }) => {
266262
case layoutItemNames.HIT_NAVIGATOR: {
267263
return (
268264
<div key="hitNavigator">
269-
<HitNavigator hideProjects={hideProjects} />
265+
<HitNavigator />
270266
</div>
271267
);
272268
}
@@ -281,7 +277,7 @@ const Preview = memo(({ isStateLoaded, hideProjects, isSnapshot = false }) => {
281277
case layoutItemNames.RHS: {
282278
return (
283279
<div key="RHS">
284-
<RHS hideProjects={hideProjects} />
280+
<RHS />
285281
</div>
286282
);
287283
}
@@ -293,11 +289,7 @@ const Preview = memo(({ isStateLoaded, hideProjects, isSnapshot = false }) => {
293289
);
294290
}
295291
case layoutItemNames.PROJECT_HISTORY: {
296-
return (
297-
<div key="projectHistory">
298-
<ProjectHistoryPanel showFullHistory={() => setShowHistory(!showHistory)} />
299-
</div>
300-
);
292+
return <div key="projectHistory"></div>;
301293
}
302294
case layoutItemNames.RESIZABLE: {
303295
return (
@@ -321,7 +313,6 @@ const Preview = memo(({ isStateLoaded, hideProjects, isSnapshot = false }) => {
321313
ref={ref}
322314
className={classes.root}
323315
onClick={() => {
324-
openNewProjectModal && dispatch(setProjectModalOpen(false));
325316
openSaveSnapshotModal && dispatch(setOpenSnapshotSavingDialog(false));
326317
}}
327318
>
@@ -352,7 +343,6 @@ const Preview = memo(({ isStateLoaded, hideProjects, isSnapshot = false }) => {
352343
<EditSnapshotDialog />
353344
<RenderingProgressDialog />
354345
<DataDownloadProgressDialog />
355-
{!hideProjects && <ProjectDetailDrawer showHistory={showHistory} setShowHistory={setShowHistory} />}
356346
</>
357347
);
358348
});

0 commit comments

Comments
 (0)