components/common/Browsers/EntityBrowser.vue

@@ -28,10 +28,6 @@
       <v-row no-gutters>
         <v-col cols="12">
           <DatasetActions
-            :index-name="datasetState.indexName"
-            :query="datasetState.query"
-            :initial-load="datasetState.initialLoad"
-            :download-formats="datasetState.downloadFormats"
             :dataset-state="datasetState"
             :store-module-name="storeModuleName"
           />

components/common/Browsers/actions/DatasetActions.vue

@@ -52,14 +52,6 @@ export default {
     Share,
   },
   props: {
-    downloadFormats: {
-      type: Object,
-      default: () => {},
-    },
-    initialLoad: {
-      type: Boolean,
-      default: () => false,
-    },
     storeModuleName: {
       type: String,
       default: () => `dataset_browser`,
@@ -68,26 +60,15 @@ export default {
       type: Object,
       default: () => {},
     },
-    indexName: {
-      type: String,
-      default: () => 'some_index',
-    },
     hideTitle: {
       type: Boolean,
       default: () => false,
     },
-    query: {
-      type: Object,
-      default: () => {
-        return {
-          query: {
-            match_all: {},
-          },
-        }
-      },
-    },
   },
   computed: {
+    initialLoad() {
+      return this.datasetState.initialLoad
+    },
     showToolbarTitle() {
       if (this.hideTitle) {
         return false

components/common/Browsers/actions/Downloads/DatasetDownloadButtons.vue

@@ -132,13 +132,13 @@ export default {
           return 5
       }
     },
-    datasetQuery(state) {
+    datasetQuery() {
       return this.datasetState.query
     },
-    indexName(state) {
+    indexName() {
       return this.datasetState.indexName
     },
-    downloadFormats(state) {
+    downloadFormats() {
       return this.datasetState.downloadFormats
     },
   },

components/common/Masthead/Autocomplete/Suggestion.vue

@@ -65,6 +65,13 @@ export default {
       default: () => false,
     },
   },
+  data() {
+    return {
+      imgChemblID: null,
+      showError: false,
+      errorMsg: '',
+    }
+  },
   computed: {
     eubopenCompoundEntityID() {
       return EntityNames.EubopenCompound.entityID

components/common/ReportCards/Shared/MoleculeImage.vue

@@ -138,7 +138,9 @@ export default {
       return this.generatedImageFilePath == null
     },
     showOptionsMenu() {
-      return this.showOptions && !this.loadingStructureDetails
+      return (
+        this.showOptions && !this.loadingStructureDetails && !this.showError
+      )
     },
     captionText() {
       if (this.hasStructureImg) {
@@ -186,7 +188,6 @@ export default {
     ESProxyService.getESDocument(indexName, this.moleculeChemblId, docSource)
       .then((response) => {
         const sourceObtained = response.data._source
-        console.log('sourceObtained: ', sourceObtained)
         const generatedImageFilePath = ObjectPropertyAccess.getPropertyPalue(
           sourceObtained,
           '_metadata.compound_generated.image_file',

components/common/ReportCards/Shared/SimpleMoleculeImage.vue

@@ -17,7 +17,6 @@
 </template>
 
 <script>
-import RequestNotifications from '@/web-components-submodule/utils/RequestNotifications.js'
 import ESProxyService from '~/web-components-submodule/services/ESProxyService.js'
 import EntityNames from '~/web-components-submodule/standardisation/EntityNames.js'
 import IndexNames from '~/web-components-submodule/standardisation/IndexNames.js'
@@ -55,6 +54,7 @@ export default {
     return {
       generatedImageFilePath: undefined,
       imgURL: undefined,
+      showError: false,
     }
   },
   computed: {
@@ -94,38 +94,57 @@ export default {
       }
     },
   },
-  mounted() {
+  async mounted() {
+    const structureImgID = await this.getstructureImgID()
     const entityID = EntityNames.Compound.entityID
     const indexName = IndexNames.getIndexNameFromEntityID(entityID)
     const docSource = ['_metadata.compound_generated.image_file']
 
-    ESProxyService.getESDocument(indexName, this.moleculeChemblId, docSource)
-      .then((response) => {
-        const sourceObtained = response.data._source
-        const generatedImageFilePath = ObjectPropertyAccess.getPropertyPalue(
-          sourceObtained,
-          '_metadata.compound_generated.image_file',
-          undefined,
-          true
-        )
+    const response = await ESProxyService.getESDocument(
+      indexName,
+      structureImgID,
+      docSource
+    )
 
-        this.generatedImageFilePath = generatedImageFilePath
-        this.forcedHeight = undefined
-        if (generatedImageFilePath == null) {
-          this.imgURL = `${process.env.chemblWSBaseUrl}/image/${this.moleculeChemblId}.svg`
-        } else {
-          this.imgURL = `${process.env.fallbackIMGsBaseUrl}/compound_placeholders/${this.generatedImageFilePath}`
-        }
-      })
-      .catch((error) => {
-        ErrorTracking.trackError(error, this)
+    try {
+      const sourceObtained = response.data._source
+      const generatedImageFilePath = ObjectPropertyAccess.getPropertyPalue(
+        sourceObtained,
+        '_metadata.compound_generated.image_file',
+        undefined,
+        true
+      )
 
-        RequestNotifications.dispatchRequestErrorNotification(
-          error,
-          this.$store.dispatch,
-          `There was an error while loading the image for ${this.moleculeChemblId}`
+      this.generatedImageFilePath = generatedImageFilePath
+      this.forcedHeight = undefined
+      if (generatedImageFilePath == null) {
+        this.imgURL = `${process.env.chemblWSBaseUrl}/image/${structureImgID}.svg`
+      } else {
+        this.imgURL = `${process.env.fallbackIMGsBaseUrl}/compound_placeholders/${this.generatedImageFilePath}`
+      }
+    } catch (error) {
+      ErrorTracking.trackError(error, this)
+      this.showError = true
+    }
+  },
+  methods: {
+    async getstructureImgID() {
+      const receivedChemblId = this.moleculeChemblId
+      const isChemblID = /^CHEMBL\d+$/.test(receivedChemblId)
+
+      if (isChemblID) {
+        return Promise.resolve(receivedChemblId)
+      } else {
+        const response = await ESProxyService.getESDocument(
+          IndexNames.getIndexNameFromEntityID(
+            EntityNames.EubopenCompound.entityID
+          ),
+          receivedChemblId,
+          ['molecule_chembl_id']
         )
-      })
+        return response.data._source.molecule_chembl_id
+      }
+    },
   },
 }
 </script>

components/common/SearchResults/FreeText/ResultsItemsTable/ResultsItemsTable.vue

 <template>
   <div>
     <DatasetActions
-      :index-name="datasetState.indexName"
-      :query="datasetState.query"
-      :initial-load="datasetState.initialLoad"
-      :download-formats="datasetState.downloadFormats"
       :dataset-state="datasetState"
       :store-module-name="storeModuleName"
-      hide-title
     />
-    <ActionsProgress :dataset-jobs="datasetState.datasetJobs" />
+    <ActionsProgress :dataset-state="datasetState" />
 
     <div></div>
     <ItemsIterator

components/common/SearchResults/ResultsItemsContainer.vue

@@ -52,7 +52,7 @@ export default {
   },
   data() {
     return {
-      currentView: 0,
+      currentView: 1,
     }
   },
   computed: {

components/common/dataSets/slots/Eubopen/SearchResults/EubopenCompoundSearchResultsItem.vue

@@ -4,7 +4,7 @@
       <v-col cols="12" sm="4" :lg="imageColsLg">
         <div class="d-flex justify-center">
           <div :class="imageContainerClasses">
-            <MoleculeImage :molecule-chembl-id="item.id" />
+            <MoleculeImage :molecule-chembl-id="item.data.molecule_chembl_id" />
           </div>
         </div>
       </v-col>