More test updates

Author: labkey-jeckels

resources/web/PanoramaPremium/window/AddNewMetricWindow.js

@@ -190,9 +190,7 @@ Ext4.define('Panorama.Window.AddCustomMetricWindow', {
             };
             this.metricTypeCombo = Ext4.create('Ext.form.field.ComboBox', config);
 
-            if(this.operation === this.insert) {
-                this.metricTypeCombo.setValue(true);
-            }
+            this.metricTypeCombo.setValue(this.operation === this.insert ? true : this.metric.PrecursorScoped);
         }
         return this.metricTypeCombo;
     },

test/src/org/labkey/test/tests/targetedms/TargetedMSPeptideSummaryHeatmapTest.java

@@ -160,7 +160,7 @@ public void testMetricUsagePeptideSummaryHeatmap()
         peptideSummaryHeatMap = new PeptideSummaryWebPart(getDriver());
         Assert.assertEquals("Metric type " + QCPlotsWebPart.MetricType.TOTAL_PEAK + " should not be present",
                 Arrays.asList("", "Full Width at Base (FWB)", "Full Width at Half Maximum (FWHM)", "Isotope dotp", "Precursor Area",
-                        "Precursor Mass Error", "Retention Time", "TIC Area", "Transition & Precursor Areas", "Transition Area",
+                        "Precursor Mass Error", "Retention Time", "TIC Area", "Transition Area",
                         "Transition Mass Error", "Transition/Precursor Area Ratio", "Total"),
                 peptideSummaryHeatMap.getHeatmapTable().getTableHeaderTexts());
         Assert.assertEquals("Outlier value should not be calculated for " + QCPlotsWebPart.MetricType.TRANSITION_MASS_ERROR,

webapp/TargetedMS/js/QCTrendPlotPanel.js

@@ -606,7 +606,7 @@ Ext4.define('LABKEY.targetedms.QCTrendPlotPanel', {
         if (paramValue !== undefined) {
             metric = this.validateMetricId(paramValue);
             if(metric == null) {
-                alertMessage += "Invalid Metric, reverting to default metric.";
+                alertMessage += "Invalid metric, reverting to default metric.";
                 sep = ' ';
             }
             else {
@@ -669,7 +669,9 @@ Ext4.define('LABKEY.targetedms.QCTrendPlotPanel', {
     },
 
     validateMetricId : function(id) {
-        for (var i = 0; i < this.metricPropArr.length; i++) {
+        // convert id to an integer, handling a parsing failure gracefully
+        id = parseInt(id);
+        for (let i = 0; i < this.metricPropArr.length; i++) {
             if (this.metricPropArr[i].id === id) {
                 return this.metricPropArr[i].id;
             }