Merge branch 'IPAD-480_async-linkouts' into dev

abbvie-external · Feb 23, 2024 · da685c5 · da685c5
2 parents b9af50d + a1f2714
commit da685c5
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 74 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "omicnavigatorwebapp",
-  "version": "1.9.1",
+  "version": "1.9.3",
   "private": true,
   "dependencies": {
     "@observablehq/stdlib": "^5.6.1",

diff --git a/public/manifest.json b/public/manifest.json
@@ -1,7 +1,7 @@
 {
   "short_name": "OmicNavigator",
   "name": "OmicNavigator",
-  "version": "1.9.1",
+  "version": "1.9.3",
   "icons": [
     {
       "src": "favicon.ico",

diff --git a/src/components/Differential/Differential.jsx b/src/components/Differential/Differential.jsx
@@ -383,6 +383,16 @@ class Differential extends Component {
       visible: false,
       multisetButttonActiveDifferential: false,
     });
+    if (
+      changes.differentialModel !== '' &&
+      changes.differentialModel !== this.props.differentialModel
+    ) {
+      // get favicons before anything else
+      this.getResultsLinkouts(
+        changes.differentialStudy,
+        changes.differentialModel,
+      );
+    }
     if (scChange) {
       this.resetOverlay();
       if (resetSelectedFeatures) {
@@ -406,10 +416,6 @@ class Differential extends Component {
         changes.differentialStudy,
         changes.differentialModel,
       );
-      this.getResultsLinkouts(
-        changes.differentialStudy,
-        changes.differentialModel,
-      );
       this.getMultisetColsDifferential(
         changes.differentialStudy,
         changes.differentialModel,

diff --git a/src/components/Differential/DifferentialSearch.jsx b/src/components/Differential/DifferentialSearch.jsx
@@ -160,7 +160,7 @@ class DifferentialSearch extends Component {
     window.removeEventListener('resize');
   }
 
-  populateDropdowns = () => {
+  populateDropdowns = async () => {
     const {
       allStudiesMetadata,
       differentialStudy,
@@ -220,7 +220,10 @@ class DifferentialSearch extends Component {
         this.getReportLink(differentialStudy, 'default');
       } else {
         this.props.onDoMetaFeaturesExist(differentialStudy, differentialModel);
-        this.props.onGetResultsLinkouts(differentialStudy, differentialModel);
+        await this.props.onGetResultsLinkouts(
+          differentialStudy,
+          differentialModel,
+        );
         this.props.onGetMultisetColsDifferential(
           differentialStudy,
           differentialModel,

diff --git a/src/components/Enrichment/Enrichment.jsx b/src/components/Enrichment/Enrichment.jsx
@@ -618,6 +618,7 @@ class Enrichment extends Component {
       changes.enrichmentAnnotation !== '' &&
       changes.enrichmentAnnotation !== this.props.enrichmentAnnotation
     ) {
+      // get favicons before anything else
       this.getEnrichmentsLinkouts(
         changes.enrichmentStudy,
         changes.enrichmentAnnotation,
@@ -676,34 +677,10 @@ class Enrichment extends Component {
               {
                 enrichmentsFavicons: favicons,
               },
-              function () {
-                let columns = this.state.enrichmentColumnsUnfiltered || [];
-                if (
-                  this.state.enrichmentResults?.length
-                  // && !this.enrichmentColumnsConfigured
-                ) {
-                  columns = this.getConfigCols(this.state.enrichmentResults);
-                  this.setState({
-                    enrichmentColumnsUnfiltered: columns,
-                  });
-                  this.enrichmentColumnsConfigured = true;
-                }
-                if (this.state.multisetTestsFilteredOut.length > 0) {
-                  const self = this;
-                  columns = columns.filter(function (col) {
-                    return !self.state.MultisetTestsFilteredOut.includes(
-                      col?.title,
-                    );
-                  });
-                }
-                this.setState({
-                  enrichmentColumns: columns,
-                });
-                sessionStorage.setItem(
-                  `EnrichmentsFavicons-${enrichmentStudy}_${enrichmentAnnotation}`,
-                  JSON.stringify(favicons),
-                );
-              },
+              sessionStorage.setItem(
+                `EnrichmentsFavicons-${enrichmentStudy}_${enrichmentAnnotation}`,
+                JSON.stringify(favicons),
+              ),
             );
           });
       }
@@ -723,42 +700,16 @@ class Enrichment extends Component {
             `EnrichmentsLinkouts-${enrichmentStudy}_${enrichmentAnnotation}`,
             JSON.stringify(linkouts),
           );
-          const self = this;
           omicNavigatorService
             .getFavicons(getEnrichmentsLinkoutsResponseData)
             .then((getFaviconsResponseData) => {
               const favicons = getFaviconsResponseData || [];
-              this.setState(
-                {
-                  enrichmentsFavicons: favicons,
-                },
-                function () {
-                  let columns = this.state.enrichmentColumnsUnfiltered || [];
-                  if (
-                    this.state.enrichmentResults?.length
-                    // && !this.enrichmentColumnsConfigured
-                  ) {
-                    columns = this.getConfigCols(this.state.enrichmentResults);
-                    this.setState({
-                      enrichmentColumnsUnfiltered: columns,
-                    });
-                    this.enrichmentColumnsConfigured = true;
-                  }
-                  if (self.state.multisetTestsFilteredOut.length > 0) {
-                    columns = columns.filter(function (col) {
-                      return !self.state.MultisetTestsFilteredOut.includes(
-                        col.title,
-                      );
-                    });
-                  }
-                  self.setState({
-                    enrichmentColumns: columns,
-                  });
-                  sessionStorage.setItem(
-                    `EnrichmentsFavicons-${enrichmentStudy}_${enrichmentAnnotation}`,
-                    JSON.stringify(favicons),
-                  );
-                },
+              this.setState({
+                enrichmentsFavicons: favicons,
+              });
+              sessionStorage.setItem(
+                `EnrichmentsFavicons-${enrichmentStudy}_${enrichmentAnnotation}`,
+                JSON.stringify(favicons),
               );
             });
         });
@@ -1026,7 +977,7 @@ class Enrichment extends Component {
                 }
                 style={TableValuePopupStyle}
                 className="TablePopupValue"
-                content={value}
+                content={'View Interactive Barcode Plot'}
                 inverted
                 basic
               />

diff --git a/src/components/Enrichment/EnrichmentSearch.jsx b/src/components/Enrichment/EnrichmentSearch.jsx
@@ -149,7 +149,7 @@ class EnrichmentSearch extends Component {
     window.removeEventListener('resize');
   }
 
-  populateDropdowns = () => {
+  populateDropdowns = async () => {
     const {
       allStudiesMetadata,
       enrichmentStudy,
@@ -243,8 +243,8 @@ class EnrichmentSearch extends Component {
         this.props.onSetAnnotationsMetadata(enrichmentAnnotationsMetadataVar);
         this.getReportLink(enrichmentStudy, enrichmentModel);
         if (enrichmentAnnotation !== '') {
-          onGetEnrichmentsLinkouts(enrichmentStudy, enrichmentAnnotation);
           onSearchTransitionEnrichment(true);
+          await onGetEnrichmentsLinkouts(enrichmentStudy, enrichmentAnnotation);
           const obj = {
             study: enrichmentStudy,
             modelID: enrichmentModel,

diff --git a/src/components/Tabs.jsx b/src/components/Tabs.jsx
@@ -64,7 +64,7 @@ class Tabs extends Component {
       differentialFeatureIdKey: '',
       filteredDifferentialFeatureIdKey: '',
       // when updating the app version, change one line in 3 files: package.json, manifest.json and Tabs.jsx
-      appVersion: '1.9.1',
+      appVersion: '1.9.3',
       packageVersion: '',
       infoOpenFirst: false,
       infoOpenSecond: false,