react-mutation-mapper 0.8.49 → 0.8.52

package/dist/index.js

@@ -488,6 +488,15 @@ function getTumorTypeName(tumorType) {
         return '';
     }
 }
+function getTumorTypeNameWithExclusionInfo(tumorType, excludedTumorTypes) {
+    var name = getTumorTypeName(tumorType);
+    if (!___default["default"].isEmpty(excludedTumorTypes)) {
+        name = name + " (excluding " + excludedTumorTypes
+            .map(function (ett) { return getTumorTypeName(ett); })
+            .join(', ') + ")";
+    }
+    return name;
+}
 function groupOncoKbIndicatorDataByMutations(mutationsByPosition, oncoKbData, getTumorType, getEntrezGeneId, filter) {
     var indicatorMap = {};
     ___default["default"].keys(mutationsByPosition).forEach(function (key) {
@@ -509,7 +518,16 @@ function getIndicatorData(mutation, oncoKbData, getTumorType, getEntrezGeneId) {
     if (oncoKbData.indicatorMap === null) {
         return undefined;
     }
-    var id = cbioportalUtils.generateQueryVariantId(getEntrezGeneId(mutation), getTumorType(mutation), mutation.proteinChange, mutation.mutationType);
+    var id = '';
+    // @ts-ignore
+    var sv = mutation.structuralVariant;
+    if (sv) {
+        var structuralVariantType = cbioportalUtils.deriveStructuralVariantType(sv);
+        id = cbioportalUtils.generateQueryStructuralVariantId(sv.site1EntrezGeneId, sv.site2EntrezGeneId, getTumorType(mutation), structuralVariantType);
+    }
+    else {
+        id = cbioportalUtils.generateQueryVariantId(getEntrezGeneId(mutation), getTumorType(mutation), mutation.proteinChange, mutation.mutationType);
+    }
     return oncoKbData.indicatorMap[id];
 }
 function defaultOncoKbIndicatorFilter(indicator) {
@@ -834,6 +852,14 @@ var OncoKBSuggestAnnotationLinkout = /** @class */ (function (_super) {
     return OncoKBSuggestAnnotationLinkout;
 }(React__namespace.Component));
 
+var levelTooltipContent = function (level) {
+    return (React__namespace.createElement("div", { style: { maxWidth: '200px' } }, OncoKbHelper.LEVEL_DESC[level]));
+};
+var LevelIcon = function (props) {
+    return (React__namespace.createElement(cbioportalFrontendCommons.DefaultTooltip, { overlay: levelTooltipContent(props.level), placement: "left", disabled: !props.showDescription, trigger: ['hover', 'focus'], destroyTooltipOnHide: true },
+        React__namespace.createElement("i", { className: levelIconClassNames(props.level) })));
+};
+
 var OncoKbHelper = /** @class */ (function () {
     function OncoKbHelper() {
     }
@@ -972,7 +998,6 @@ var OncoKbHelper = /** @class */ (function () {
         configurable: true,
         writable: true,
         value: function (columnKey) {
-            var _this = this;
             switch (columnKey) {
                 case 'level':
                     return {
@@ -985,8 +1010,7 @@ var OncoKbHelper = /** @class */ (function () {
                         },
                         Cell: function (props) {
                             var normalizedLevel = normalizeLevel(props.value) || '';
-                            return (React__namespace.createElement(cbioportalFrontendCommons.DefaultTooltip, { overlay: _this.levelTooltipContent(normalizedLevel), placement: "left", trigger: ['hover', 'focus'], destroyTooltipOnHide: true },
-                                React__namespace.createElement("i", { className: levelIconClassNames(normalizedLevel), style: { margin: 'auto' } })));
+                            return (React__namespace.createElement(LevelIcon, { level: normalizedLevel, showDescription: true }));
                         },
                     };
                 case 'alterations':
@@ -1002,14 +1026,6 @@ var OncoKbHelper = /** @class */ (function () {
             }
         }
     });
-    Object.defineProperty(OncoKbHelper, "levelTooltipContent", {
-        enumerable: true,
-        configurable: true,
-        writable: true,
-        value: function (level) {
-            return (React__namespace.createElement("div", { style: { maxWidth: '200px' } }, OncoKbHelper.LEVEL_DESC[level]));
-        }
-    });
     Object.defineProperty(OncoKbHelper, "getAlterationsColumnCell", {
         enumerable: true,
         configurable: true,
@@ -1312,7 +1328,7 @@ var OncoKbTreatmentTable = /** @class */ (function (_super) {
                         "cancer type(s)")),
                     accessor: 'levelAssociatedCancerType',
                     minWidth: 120,
-                    Cell: function (props) { return (React__namespace.createElement("div", { style: { whiteSpace: 'normal', lineHeight: '1rem' } }, getTumorTypeName(props.original.levelAssociatedCancerType))); },
+                    Cell: function (props) { return (React__namespace.createElement("div", { style: { whiteSpace: 'normal', lineHeight: '1rem' } }, getTumorTypeNameWithExclusionInfo(props.original.levelAssociatedCancerType, props.original.levelExcludedCancerTypes))); },
                 },
                 {
                     id: 'referenceList',
@@ -1375,6 +1391,11 @@ var ImplicationContent = function (props) {
 
 var tabsStyles = {"tabs-wrapper":"tabs-module_tabs-wrapper__XKjzo","tabs":"tabs-module_tabs__2I3mz","tab":"tabs-module_tab__3MoDA","tab-pane":"tabs-module_tab-pane__sGd85","tab-title-a":"tabs-module_tab-title-a__2WTNA","tab-title":"tabs-module_tab-title__2z9-D","tab-subtitle":"tabs-module_tab-subtitle__1P8B_"};
 
+var OncogenicIcon = function (props) {
+    return (React__namespace.createElement(cbioportalFrontendCommons.DefaultTooltip, { overlay: React__namespace.createElement("span", null, props.oncogenicity), placement: "left", trigger: ['hover', 'focus'], destroyTooltipOnHide: true },
+        React__namespace.createElement("i", { className: oncogenicityIconClassNames(props.oncogenicity) })));
+};
+
 var _a$3;
 var OncoKbMedicalDisclaimer = (React__default["default"].createElement("p", { className: mainStyles.disclaimer }, "The information above is intended for research purposes only and should not be used as a substitute for professional diagnosis and treatment."));
 var ONCOKB_DATA_ACCESS_PAGE_LINK = 'https://docs.cbioportal.org/2.4-integration-with-other-webservices/oncokb-data-access';
@@ -1396,8 +1417,9 @@ var TabContentWrapper = function (props) {
     return React__default["default"].createElement("div", { className: mainStyles['tab-content'] }, props.children);
 };
 var TabTitle = function (props) {
+    var _a;
     var title = DATA_TYPE_TO_TITLE[props.type];
-    var icon = props.displayHighestLevelInTabTitle ? (React__default["default"].createElement("i", { className: annotationIconClassNames(props.type, calcHighestIndicatorLevel(props.type, props.indicator), props.indicator) })) : null;
+    var icon = props.displayHighestLevelInTabTitle ? (props.type === cbioportalUtils.OncoKbCardDataType.BIOLOGICAL ? (React__default["default"].createElement(OncogenicIcon, { oncogenicity: ((_a = props.indicator) === null || _a === void 0 ? void 0 : _a.oncogenic) || '', showDescription: true })) : (React__default["default"].createElement(LevelIcon, { level: normalizeLevel(calcHighestIndicatorLevel(props.type, props.indicator)) || '', showDescription: true }))) : null;
     return icon ? (React__default["default"].createElement("span", { style: { display: 'flex' } },
         icon,
         " ",
@@ -2128,7 +2150,7 @@ function getDefaultEntrezGeneId(mutation) {
     return (mutation.gene && mutation.gene.entrezGeneId) || 0;
 }
 function getDefaultTumorType() {
-    return 'Unknown';
+    return '';
 }
 var memoized = new Map();
 function getAnnotationData(mutation, oncoKbCancerGenes, hotspotData, myCancerGenomeData, oncoKbData, usingPublicOncoKbInstance, civicGenes, civicVariants, resolveTumorType, resolveEntrezGeneId) {
@@ -8204,9 +8226,7 @@ var OncoKbSummaryTable = /** @class */ (function (_super) {
                             overflow: 'hidden',
                             textOverflow: 'ellipsis',
                         } },
-                        React__namespace.createElement("i", { className: levelIconClassNames(level.level), style: {
-                                verticalAlign: 'text-bottom',
-                            } }),
+                        React__namespace.createElement(LevelIcon, { level: level.level, showDescription: true }),
                         React__namespace.createElement("span", { style: {
                                 paddingRight: 3,
                             } }, ":"),
@@ -8326,7 +8346,7 @@ function generateLevelData(indicatorData) {
             var parts = treatment.level.split('_');
             var level = parts.length === 2 ? parts[1] : treatment.level;
             levels[level] = levels[level] || [];
-            levels[level].push(indicator.query.tumorType);
+            levels[level].push(getTumorTypeNameWithExclusionInfo(treatment.levelAssociatedCancerType, treatment.levelExcludedCancerTypes));
         });
     });
     return ___default["default"].keys(levels)
@@ -10634,7 +10654,7 @@ var DefaultMutationMapperDataFetcher = /** @class */ (function () {
         writable: true,
         value: function (mutations, fields, isoformOverrideSource, client) {
             if (fields === void 0) { fields = ['annotation_summary']; }
-            if (isoformOverrideSource === void 0) { isoformOverrideSource = 'uniprot'; }
+            if (isoformOverrideSource === void 0) { isoformOverrideSource = 'mskcc'; }
             if (client === void 0) { client = this.genomeNexusClient; }
             return tslib.__awaiter(this, void 0, void 0, function () {
                 return tslib.__generator(this, function (_a) {
@@ -10864,7 +10884,9 @@ var DefaultMutationMapperDataFetcher = /** @class */ (function () {
                                 return ((_a = mutation.mutationType) === null || _a === void 0 ? void 0 : _a.toUpperCase()) ===
                                     cbioportalUtils.StructuralVariantType.FUSION;
                             }), function (mutation) {
-                                return cbioportalUtils.generateAnnotateStructuralVariantQuery(getEntrezGeneId(mutation), getTumorType(mutation), mutation.proteinChange, mutation.mutationType, evidenceTypes);
+                                return cbioportalUtils.generateAnnotateStructuralVariantQuery(
+                                /* @ts-ignore */
+                                mutation.structuralVariant, getTumorType(mutation), evidenceTypes);
                             }), 'id');
                             if (!(mutationQueryVariants.length === 0)) return [3 /*break*/, 1];
                             _a = [];
@@ -12058,7 +12080,7 @@ var DefaultMutationMapperStore = /** @class */ (function () {
         value: function (mutation) {
             return this.config.getTumorType
                 ? this.config.getTumorType(mutation)
-                : 'Unknown';
+                : '';
         }
     });
     Object.defineProperty(DefaultMutationMapperStore.prototype, "getDefaultEntrezGeneId", {