Merge remote-tracking branch 'remotes/origin/#444' into allfunctionality

m2ms · Nov 10, 2020 · a647db8 · a647db8
2 parents 057a6f5 + 165a485
commit a647db8
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/js/components/datasets/crossReferenceDialog.js b/js/components/datasets/crossReferenceDialog.js
@@ -60,7 +60,8 @@ const useStyles = makeStyles(theme => ({
   },
   content: {
     overflowY: 'auto',
-    height: 214
+    height: 214,
+    width: 'fit-content'
   },
   search: {
     margin: theme.spacing(1),

diff --git a/js/components/datasets/datasetMoleculeView.js b/js/components/datasets/datasetMoleculeView.js
@@ -161,6 +161,10 @@ const useStyles = makeStyles(theme => ({
   inheritWidth: {
     width: 'inherit'
   },
+  widthOverflow: {
+    maxWidth: '180px',
+    overflow: 'hidden'
+  },
   rank: {
     fontStyle: 'italic',
     fontSize: 7
@@ -553,7 +557,13 @@ export const DatasetMoleculeView = memo(
           </Grid>
           <Grid item container className={classes.detailsCol} justify="space-between" direction="row">
             {/* Title label */}
-            <Grid item xs={!showCrossReferenceModal && hideFButton ? 8 : 7} container direction="column">
+            <Grid
+              item
+              xs={!showCrossReferenceModal && hideFButton ? 8 : 7}
+              container
+              direction="column"
+              className={!showCrossReferenceModal && hideFButton ? classes.widthOverflow : ''}
+            >
               <Grid item className={classes.inheritWidth}>
                 <Tooltip title={moleculeTitle} placement="bottom-start">
                   <div className={classNames(classes.moleculeTitleLabel, isCheckedToBuy && classes.selectedMolecule)}>

diff --git a/js/components/datasets/inspirationDialog.js b/js/components/datasets/inspirationDialog.js
@@ -218,6 +218,8 @@ export const InspirationDialog = memo(
       surface: removeSurface
     };
 
+    const selectMoleculeSite = moleculeGroupSite => {};
+
     const removeOfAllSelectedTypes = () => {
       proteinList?.forEach(moleculeID => {
         let foundedMolecule = moleculeList?.find(mol => mol.id === moleculeID);
@@ -409,6 +411,7 @@ export const InspirationDialog = memo(
                         previousItemData={previousData}
                         nextItemData={nextData}
                         removeOfAllSelectedTypes={removeOfAllSelectedTypes}
+                        selectMoleculeSite={selectMoleculeSite}
                       />
                     );
                   })}

diff --git a/js/components/preview/molecule/moleculeView.js b/js/components/preview/molecule/moleculeView.js
@@ -345,7 +345,9 @@ const MoleculeView = memo(
       isLigandOn || isProteinOn || isComplexOn || isSurfaceOn || isVectorOn ? selected_style : not_selected_style;
 
     const addNewLigand = () => {
-      selectMoleculeSite(data.site);
+      if (selectMoleculeSite) {
+        selectMoleculeSite(data.site);
+      }
       dispatch(addLigand(stage, data, colourToggle));
     };
 
@@ -376,7 +378,9 @@ const MoleculeView = memo(
     };
 
     const addNewProtein = () => {
-      selectMoleculeSite(data.site);
+      if (selectMoleculeSite) {
+        selectMoleculeSite(data.site);
+      }
       dispatch(addHitProtein(stage, data, colourToggle));
     };
 
@@ -402,7 +406,9 @@ const MoleculeView = memo(
     };
 
     const addNewComplex = () => {
-      selectMoleculeSite(data.site);
+      if (selectMoleculeSite) {
+        selectMoleculeSite(data.site);
+      }
       dispatch(addComplex(stage, data, colourToggle));
     };
 
@@ -427,7 +433,9 @@ const MoleculeView = memo(
     };
 
     const addNewSurface = () => {
-      selectMoleculeSite(data.site);
+      if (selectMoleculeSite) {
+        selectMoleculeSite(data.site);
+      }
       dispatch(addSurface(stage, data, colourToggle));
     };
 
@@ -444,7 +452,9 @@ const MoleculeView = memo(
     };
 
     const addNewDensity = () => {
-      selectMoleculeSite(data.site);
+      if (selectMoleculeSite) {
+        selectMoleculeSite(data.site);
+      }
       dispatch(addDensity(stage, data, colourToggle));
     };
 
@@ -461,7 +471,9 @@ const MoleculeView = memo(
     };
 
     const addNewVector = () => {
-      selectMoleculeSite(data.site);
+      if (selectMoleculeSite) {
+        selectMoleculeSite(data.site);
+      }
       dispatch(addVector(stage, data)).catch(error => {
         throw new Error(error);
       });