diff --git a/docker-compose.dev.vector.yml b/docker-compose.dev.vector.yml index 9e7f7c8c2..f776976b7 100644 --- a/docker-compose.dev.vector.yml +++ b/docker-compose.dev.vector.yml @@ -91,14 +91,11 @@ services: OIDC_RP_CLIENT_SECRET: ${OIDC_RP_CLIENT_SECRET} OIDC_RP_CLIENT_ID: 'fragalysis-local' OIDC_RENEW_ID_TOKEN_EXPIRY_MINUTES: 210 - ISPYB_HOST: ispybdbproxy.diamond.ac.uk + # ISPYB_HOST: ispybdbproxy.diamond.ac.uk ISPYB_PORT: 4306 ISPYB_USER: ${ISPYB_USER} ISPYB_PASSWORD: ${ISPYB_PASSWORD} SECURITY_CONNECTOR: ssh_ispyb - SSH_HOST: ssh.diamond.ac.uk - SSH_USER: ${SSH_USER} - SSH_PASSWORD: ${SSH_PASSWORD} LOGGING_FRAMEWORK_ROOT_LEVEL: DEBUG AUTHENTICATE_UPLOAD: 'False' CELERY_TASK_ALWAYS_EAGER: 'True' diff --git a/js/components/datasets/customDatasetList.js b/js/components/datasets/customDatasetList.js index 3ddb6076f..8034d4ac5 100644 --- a/js/components/datasets/customDatasetList.js +++ b/js/components/datasets/customDatasetList.js @@ -18,9 +18,9 @@ export const CustomDatasetList = memo(({ dataset, hideProjects, isActive }) => { dispatch(clearDatasetSettings(dataset.id)); } } - return () => { - dispatch(clearDatasetSettings(dataset?.id)); - }; + // return () => { + // dispatch(clearDatasetSettings(dataset?.id)); + // }; }, [dataset, dispatch, isActive, isLoadingMoleculeList]); const title = dataset && `${dataset.title} v.${dataset.version}`; diff --git a/js/components/datasets/datasetMoleculeList.js b/js/components/datasets/datasetMoleculeList.js index 6a73f21ff..0b303ef13 100644 --- a/js/components/datasets/datasetMoleculeList.js +++ b/js/components/datasets/datasetMoleculeList.js @@ -397,8 +397,6 @@ const DatasetMoleculeList = ({ title, datasetID, url }) => { const searchString = useSelector(state => state.datasetsReducers.searchString); - const currentActionList = useSelector(state => state.trackingReducers.current_actions_list); - const isActiveFilter = !!(filterSettings || {}).active; const { getNglView } = useContext(NglContext); @@ -494,12 +492,12 @@ const DatasetMoleculeList = ({ title, datasetID, url }) => { const isSelectedTypeOn = (typeList, isLHSReference) => { if (typeList) { if (!isLHSReference) { - return typeList.some(molId => allMolecules.some(mol => mol.id === molId)); + return typeList.some(molId => allMolecules?.some(mol => mol.id === molId)); } else { - const molsWithLHSReference = allMolecules.filter(mol => mol.site_observation_code); + const molsWithLHSReference = allMolecules?.filter(mol => mol.site_observation_code); return typeList.some(molId => molsWithLHSReference.some( - mol => mol.site_observation_code === allMoleculesList.find(m => m.id === molId)?.code + mol => mol.site_observation_code === allMoleculesList?.find(m => m.id === molId)?.code ) ); } @@ -563,7 +561,7 @@ const DatasetMoleculeList = ({ title, datasetID, url }) => { ); } else { if (molecule.site_observation_code) { - const lhsMol = allMoleculesList.find(mol => mol.code === molecule.site_observation_code); + const lhsMol = allMoleculesList?.find(mol => mol.code === molecule.site_observation_code); if (lhsMol) { dispatch(removeLHSType[type](stage, lhsMol, colourList[molecule.id % colourList.length], skipTracking)); } @@ -597,7 +595,7 @@ const DatasetMoleculeList = ({ title, datasetID, url }) => { ); } else { if (molecule.site_observation_code) { - const lhsMol = allMoleculesList.find(mol => mol.code === molecule.site_observation_code); + const lhsMol = allMoleculesList?.find(mol => mol.code === molecule.site_observation_code); if (lhsMol) { if (type === 'protein') { promises.push( @@ -1479,7 +1477,7 @@ const DatasetMoleculeList = ({ title, datasetID, url }) => { // #1249 dataset molecules currently could use side observation molecule for some renders let idToFind = data.id; if (data.site_observation_code) { - const molecule = allMoleculesList.find(mol => mol.code === data.site_observation_code); + const molecule = allMoleculesList?.find(mol => mol.code === data.site_observation_code); if (molecule) { idToFind = molecule.id; } diff --git a/js/components/datasets/inspirationDialog.js b/js/components/datasets/inspirationDialog.js index 23aa4c7c4..0be5b19f2 100644 --- a/js/components/datasets/inspirationDialog.js +++ b/js/components/datasets/inspirationDialog.js @@ -156,7 +156,7 @@ export const InspirationDialog = memo( let rationale = ''; if (datasetID && inspirationLists.hasOwnProperty(datasetID) && inspirationLists[datasetID][0]) { const moleculeID = inspirationLists[datasetID][0]; - const molecule = moleculeLists[datasetID].find(molecule => molecule.id === moleculeID); + const molecule = moleculeLists[datasetID]?.find(molecule => molecule.id === moleculeID); if (molecule !== undefined) { rationale = molecule.text_scores.hasOwnProperty('rationale') ? molecule.text_scores.rationale : ''; } @@ -194,7 +194,7 @@ export const InspirationDialog = memo( }, [inspirationMoleculeDataList, searchString]); const allSelectedMolecules = inspirationMoleculeDataList.filter( - molecule => moleculesToEditIds.includes(molecule.id) /* || molForTagEditId.some(mid => molecule.id === mid)*/ + molecule => moleculesToEditIds.includes(molecule?.id) /* || molForTagEditId.some(mid => molecule.id === mid)*/ ); // TODO: refactor from this line (duplicity in datasetMoleculeList.js) @@ -451,6 +451,7 @@ export const InspirationDialog = memo(