Skip to content

Commit

Permalink
- performance optimization - broken right side
Browse files Browse the repository at this point in the history
  • Loading branch information
@boriskovar-m2ms
boriskovar-m2ms committed Oct 28, 2020
1 parent 4dd7613 commit 2f22205
Show file tree
Hide file tree
Showing 11 changed files with 93 additions and 93 deletions.
10 changes: 5 additions & 5 deletions js/components/datasets/crossReferenceDialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
} from './redux/dispatchActions';
import { Button } from '../common/Inputs/Button';
import classNames from 'classnames';
import { useDisableUserInteraction } from '../helpers/useEnableUserInteracion';
// import { useDisableUserInteraction } from '../helpers/useEnableUserInteracion';
import { colourList, DatasetMoleculeView } from './datasetMoleculeView';
import { NglContext } from '../nglView/nglProvider';
import { VIEWS } from '../../constants/constants';
Expand Down Expand Up @@ -131,7 +131,7 @@ export const CrossReferenceDialog = memo(

const { getNglView } = useContext(NglContext);
const stage = getNglView(VIEWS.MAJOR_VIEW) && getNglView(VIEWS.MAJOR_VIEW).stage;
const disableUserInteraction = useDisableUserInteraction();
// const disableUserInteraction = useDisableUserInteraction();

const moleculeList = useSelector(state => getCrossReferenceCompoundListByCompoundName(state));
const isLoadingCrossReferenceScores = useSelector(state => state.datasetsReducers.isLoadingCrossReferenceScores);
Expand Down Expand Up @@ -271,7 +271,7 @@ export const CrossReferenceDialog = memo(
onClick={() =>
dispatch(handleAllLigandsOfCrossReferenceDialog(isLigandOn, moleculeList, stage))
}
disabled={disableUserInteraction}
disabled={false}
>
L
</Button>
Expand All @@ -288,7 +288,7 @@ export const CrossReferenceDialog = memo(
onClick={() =>
dispatch(removeOrAddAllHitProteinsOfList(isProteinOn, moleculeList, stage))
}
disabled={disableUserInteraction}
disabled={false}
>
P
</Button>
Expand All @@ -304,7 +304,7 @@ export const CrossReferenceDialog = memo(
[classes.contColButtonHalfSelected]: isComplexOn === null
})}
onClick={() => dispatch(removeOrAddAllComplexesOfList(isComplexOn, moleculeList, stage))}
disabled={disableUserInteraction}
disabled={false}
>
C
</Button>
Expand Down
10 changes: 5 additions & 5 deletions js/components/datasets/datasetMoleculeList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { Panel } from '../common/Surfaces/Panel';
import { ComputeSize } from '../../utils/computeSize';
import { VIEWS } from '../../constants/constants';
import { NglContext } from '../nglView/nglProvider';
import { useDisableUserInteraction } from '../helpers/useEnableUserInteracion';
// import { useDisableUserInteraction } from '../helpers/useEnableUserInteracion';
import classNames from 'classnames';
import {
addDatasetLigand,
Expand Down Expand Up @@ -232,7 +232,7 @@ export const DatasetMoleculeList = memo(
const getJoinedMoleculeList = useSelector(state => getMoleculeList(state));
const inspirationMoleculeDataList = useSelector(state => state.datasetsReducers.allInspirationMoleculeDataList);

const disableUserInteraction = useDisableUserInteraction();
// const disableUserInteraction = useDisableUserInteraction();

// TODO Reset Infinity scroll

Expand Down Expand Up @@ -529,7 +529,7 @@ export const DatasetMoleculeList = memo(
[classes.contColButtonSelected]: isLigandOn
})}
onClick={() => onButtonToggle('ligand')}
disabled={disableUserInteraction}
disabled={false}
>
L
</Button>
Expand All @@ -543,7 +543,7 @@ export const DatasetMoleculeList = memo(
[classes.contColButtonSelected]: isProteinOn
})}
onClick={() => onButtonToggle('protein')}
disabled={disableUserInteraction}
disabled={false}
>
P
</Button>
Expand All @@ -558,7 +558,7 @@ export const DatasetMoleculeList = memo(
[classes.contColButtonSelected]: isComplexOn
})}
onClick={() => onButtonToggle('complex')}
disabled={disableUserInteraction}
disabled={false}
>
C
</Button>
Expand Down
24 changes: 12 additions & 12 deletions js/components/datasets/datasetMoleculeView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import SVGInline from 'react-svg-inline';
import classNames from 'classnames';
import { VIEWS } from '../../constants/constants';
import { NglContext } from '../nglView/nglProvider';
import { useDisableUserInteraction } from '../helpers/useEnableUserInteracion';
// import { useDisableUserInteraction } from '../helpers/useEnableUserInteracion';
import {
addDatasetLigand,
removeDatasetLigand,
Expand Down Expand Up @@ -292,7 +292,7 @@ export const DatasetMoleculeView = memo(

const areArrowsVisible = isLigandOn || isProteinOn || isComplexOn || isSurfaceOn;

const disableUserInteraction = useDisableUserInteraction();
// const disableUserInteraction = useDisableUserInteraction();

const refOnCancelImage = useRef();
const getRandomColor = () => colourList[currentID % colourList.length];
Expand Down Expand Up @@ -642,7 +642,7 @@ export const DatasetMoleculeView = memo(
onClick={() => {
dispatch(centerOnLigandByMoleculeID(stage, getDatasetMoleculeID(datasetID, currentID)));
}}
disabled={disableUserInteraction || !isLigandOn}
disabled={false || !isLigandOn}
>
<MyLocation className={classes.myLocation} />
</Button>
Expand All @@ -669,7 +669,7 @@ export const DatasetMoleculeView = memo(
onProtein(true);
onComplex(true);
}}
disabled={disableUserInteraction}
disabled={false}
>
A
</Button>
Expand All @@ -683,7 +683,7 @@ export const DatasetMoleculeView = memo(
[classes.contColButtonSelected]: isLigandOn
})}
onClick={() => onLigand()}
disabled={disableUserInteraction}
disabled={false}
>
L
</Button>
Expand All @@ -697,7 +697,7 @@ export const DatasetMoleculeView = memo(
[classes.contColButtonSelected]: isProteinOn
})}
onClick={() => onProtein()}
disabled={disableUserInteraction}
disabled={false}
>
P
</Button>
Expand All @@ -712,7 +712,7 @@ export const DatasetMoleculeView = memo(
[classes.contColButtonSelected]: isComplexOn
})}
onClick={() => onComplex()}
disabled={disableUserInteraction}
disabled={false}
>
C
</Button>
Expand All @@ -726,7 +726,7 @@ export const DatasetMoleculeView = memo(
[classes.contColButtonSelected]: isSurfaceOn
})}
onClick={() => onSurface()}
disabled={disableUserInteraction}
disabled={false}
>
S
</Button>
Expand All @@ -752,7 +752,7 @@ export const DatasetMoleculeView = memo(
setRef(ref.current);
}
}}
disabled={disableUserInteraction}
disabled={false}
>
F
</Button>
Expand All @@ -774,7 +774,7 @@ export const DatasetMoleculeView = memo(
setRef(ref.current);
}
}}
disabled={true || disableUserInteraction}
disabled={true || false}
>
X
</Button>
Expand Down Expand Up @@ -835,7 +835,7 @@ export const DatasetMoleculeView = memo(
<IconButton
color="primary"
size="small"
disabled={disableUserInteraction || !previousItemData || !areArrowsVisible}
disabled={false || !previousItemData || !areArrowsVisible}
onClick={handleClickOnUpArrow}
>
<ArrowUpward className={areArrowsVisible ? classes.arrow : classes.invisArrow} />
Expand All @@ -845,7 +845,7 @@ export const DatasetMoleculeView = memo(
<IconButton
color="primary"
size="small"
disabled={disableUserInteraction || !nextItemData || !areArrowsVisible}
disabled={false || !nextItemData || !areArrowsVisible}
onClick={handleClickOnDownArrow}
>
<ArrowDownward className={areArrowsVisible ? classes.arrow : classes.invisArrow} />
Expand Down
10 changes: 5 additions & 5 deletions js/components/datasets/inspirationDialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import { debounce } from 'lodash';
import { setInspirationMoleculeDataList, setIsOpenInspirationDialog } from './redux/actions';
import { Button } from '../common/Inputs/Button';
import classNames from 'classnames';
import { useDisableUserInteraction } from '../helpers/useEnableUserInteracion';
// import { useDisableUserInteraction } from '../helpers/useEnableUserInteracion';
import { colourList } from './datasetMoleculeView';
import { NglContext } from '../nglView/nglProvider';
import { VIEWS } from '../../constants/constants';
Expand Down Expand Up @@ -160,7 +160,7 @@ export const InspirationDialog = memo(
const vectorOnList = useSelector(state => state.selectionReducers.vectorOnList);

const dispatch = useDispatch();
const disableUserInteraction = useDisableUserInteraction();
// const disableUserInteraction = useDisableUserInteraction();

useEffect(() => {
if (inspirationFragmentList && inspirationFragmentList.length > 0) {
Expand Down Expand Up @@ -347,7 +347,7 @@ export const InspirationDialog = memo(
[classes.contColButtonHalfSelected]: isLigandOn === null
})}
onClick={() => onButtonToggle('ligand')}
disabled={disableUserInteraction}
disabled={false}
>
L
</Button>
Expand All @@ -362,7 +362,7 @@ export const InspirationDialog = memo(
[classes.contColButtonHalfSelected]: isProteinOn === null
})}
onClick={() => onButtonToggle('protein')}
disabled={disableUserInteraction}
disabled={false}
>
P
</Button>
Expand All @@ -378,7 +378,7 @@ export const InspirationDialog = memo(
[classes.contColButtonHalfSelected]: isComplexOn === null
})}
onClick={() => onButtonToggle('complex')}
disabled={disableUserInteraction}
disabled={false}
>
C
</Button>
Expand Down
7 changes: 4 additions & 3 deletions js/components/header/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { URLS } from '../routes/constants';
import { useCombinedRefs } from '../../utils/refHelpers';
import { ComputeSize } from '../../utils/computeSize';
import { DJANGO_CONTEXT } from '../../utils/djangoContext';
import { useDisableUserInteraction } from '../helpers/useEnableUserInteracion';
// import { useDisableUserInteraction } from '../helpers/useEnableUserInteracion';
import { useHistory } from 'react-router-dom';
import { IssueReport } from '../userFeedback/issueReport';
import { IdeaReport } from '../userFeedback/ideaReport';
Expand Down Expand Up @@ -90,7 +90,7 @@ export default memo(
let history = useHistory();
const classes = useStyles();
const { isLoading, headerNavbarTitle, setHeaderNavbarTitle, headerButtons } = useContext(HeaderContext);
const disableUserInteraction = useDisableUserInteraction();
// const disableUserInteraction = useDisableUserInteraction();

const [openMenu, setOpenMenu] = useState(false);
const [openFunders, setOpenFunders] = useState(false);
Expand Down Expand Up @@ -270,7 +270,8 @@ export default memo(
</Grid>
</Grid>
</Grid>
{(isLoading === true || disableUserInteraction === true) && (
{//TODO this needs to be reworked if the optimizations help
(isLoading === true || false === true) && (
<LinearProgress color="secondary" className={classes.loadingProgress} variant="query" />
)}
</AppBar>
Expand Down
17 changes: 11 additions & 6 deletions js/components/preview/molecule/moleculeList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { ComputeSize } from '../../../utils/computeSize';
import { moleculeProperty } from './helperConstants';
import { VIEWS } from '../../../constants/constants';
import { NglContext } from '../../nglView/nglProvider';
import { useDisableUserInteraction } from '../../helpers/useEnableUserInteracion';
// import { useDisableUserInteraction } from '../../helpers/useEnableUserInteracion';
import classNames from 'classnames';
import {
addVector,
Expand Down Expand Up @@ -261,7 +261,7 @@ export const MoleculeList = memo(({ height, setFilterItemsHeight, filterItemsHei

const filterRef = useRef();

const disableUserInteraction = useDisableUserInteraction();
// const disableUserInteraction = useDisableUserInteraction();

// TODO Reset Infinity scroll
/*useEffect(() => {
Expand Down Expand Up @@ -536,7 +536,7 @@ export const MoleculeList = memo(({ height, setFilterItemsHeight, filterItemsHei
)
}}
onChange={handleSearch}
disabled={disableUserInteraction || (getJoinedMoleculeList && getJoinedMoleculeList.length === 0)}
disabled={false || (getJoinedMoleculeList && getJoinedMoleculeList.length === 0)}
/>,

<IconButton
Expand Down Expand Up @@ -670,7 +670,7 @@ export const MoleculeList = memo(({ height, setFilterItemsHeight, filterItemsHei
[classes.contColButtonHalfSelected]: isLigandOn === null
})}
onClick={() => onButtonToggle('ligand')}
disabled={disableUserInteraction}
disabled={false}
>
L
</Button>
Expand All @@ -685,7 +685,7 @@ export const MoleculeList = memo(({ height, setFilterItemsHeight, filterItemsHei
[classes.contColButtonHalfSelected]: isProteinOn === null
})}
onClick={() => onButtonToggle('protein')}
disabled={disableUserInteraction}
disabled={false}
>
P
</Button>
Expand All @@ -701,7 +701,7 @@ export const MoleculeList = memo(({ height, setFilterItemsHeight, filterItemsHei
[classes.contColButtonHalfSelected]: isComplexOn === null
})}
onClick={() => onButtonToggle('complex')}
disabled={disableUserInteraction}
disabled={false}
>
C
</Button>
Expand Down Expand Up @@ -745,6 +745,11 @@ export const MoleculeList = memo(({ height, setFilterItemsHeight, filterItemsHei
previousItemData={index > 0 && array[index - 1]}
nextItemData={index < array?.length && array[index + 1]}
removeOfAllSelectedTypes={removeOfAllSelectedTypes}
L={fragmentDisplayList.includes(data.id)}
P={proteinList.includes(data.id)}
C={complexList.includes(data.id)}
S={surfaceList.includes(data.id)}
V={vectorOnList.includes(data.id)}
/>
))}
</InfiniteScroll>
Expand Down
Loading

0 comments on commit 2f22205

Please sign in to comment.