Merge branch 'release_24.1' into dev

bgruening · Jul 31, 2024 · 297aeae · 297aeae
2 parents 46896a8 + fe6d2e3
commit 297aeae
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/client/src/components/Form/Elements/FormNumber.vue b/client/src/components/Form/Elements/FormNumber.vue
@@ -38,11 +38,13 @@ export default {
             type: [Number, String],
             required: false,
             default: undefined,
+            validator: (prop) => typeof prop == "number" || prop === null,
         },
         max: {
             type: [Number, String],
             required: false,
             default: undefined,
+            validator: (prop) => typeof prop == "number" || prop === null,
         },
         workflowBuildingMode: {
             type: Boolean,
@@ -74,7 +76,7 @@ export default {
             return this.workflowBuildingMode ? "text" : "number";
         },
         isRangeValid() {
-            return !isNaN(this.min) && !isNaN(this.max) && this.max > this.min;
+            return typeof this.min == "number" && typeof this.max == "number" && this.max > this.min;
         },
         isInteger() {
             return this.type.toLowerCase() === "integer";
@@ -124,10 +126,15 @@ export default {
             }
         },
         isOutOfRange(value) {
-            return this.isRangeValid && (value > this.max || value < this.min);
+            /* If value=null, then value is within range. */
+            return (
+                (typeof this.max == "number" && value > this.max) || (typeof this.min == "number" && value < this.min)
+            );
         },
         showOutOfRangeWarning(value) {
-            const warningMessage = `${value} is out of ${this.min} - ${this.max} range!`;
+            const rangeDetail =
+                typeof this.max == "number" && value > this.max ? `${value} > ${this.max}` : `${value} < ${this.min}`;
+            const warningMessage = `${value} is out of range! (${rangeDetail})`;
             this.showAlert(warningMessage);
         },
         resetAlert() {

diff --git a/client/src/onload/globalInits/initSentry.js b/client/src/onload/globalInits/initSentry.js
@@ -19,9 +19,7 @@ export const initSentry = (galaxy, config) => {
         Sentry.init({
             Vue,
             dsn: sentry_dsn_public,
-            integrations: [Sentry.browserTracingIntegration({ router }), Sentry.replayIntegration()],
-            replaysSessionSampleRate: 0,
-            replaysOnErrorSampleRate: 1.0,
+            integrations: [Sentry.browserTracingIntegration({ router })],
             release: release,
             beforeSend(event, hint) {
                 const error = hint.originalException;

diff --git a/lib/galaxy/config/sample/datatypes_conf.xml.sample b/lib/galaxy/config/sample/datatypes_conf.xml.sample
@@ -114,7 +114,11 @@
     <datatype extension="customtrack" type="galaxy.datatypes.interval:CustomTrack"/>
     <datatype extension="bowtie_color_index" type="galaxy.datatypes.ngsindex:BowtieColorIndex" mimetype="text/html" display_in_upload="false"/>
     <datatype extension="bowtie_base_index" type="galaxy.datatypes.ngsindex:BowtieBaseIndex" mimetype="text/html" display_in_upload="false"/>
-    <datatype extension="csfasta" type="galaxy.datatypes.sequence:csFasta" display_in_upload="true"/>
+    <datatype extension="csfasta" type="galaxy.datatypes.sequence:csFasta" display_in_upload="true">
+        <upload_warning>
+          SOLID Color-Space sequence data is a rare data type. Consider selecting fasta instead.
+        </upload_warning>
+    </datatype>
     <datatype extension="data" type="galaxy.datatypes.data:Data" mimetype="application/octet-stream" max_optional_metadata_filesize="1048576"/>
     <datatype extension="gz" type="galaxy.datatypes.binary:Binary" subclass="true"/>
     <datatype extension="binary" type="galaxy.datatypes.binary:Binary" mimetype="application/octet-stream" max_optional_metadata_filesize="1048576"/>
@@ -148,6 +152,9 @@
     </datatype>
     <datatype extension="fastqsolexa" auto_compressed_types="gz,bz2" type="galaxy.datatypes.sequence:FastqSolexa" display_in_upload="true" description="Solexa variant of the FASTQ format: solexa+64" description_url="https://wiki.galaxyproject.org/Learn/Datatypes#FastqSolexa">
       <converter file="fastq_to_fqtoc.xml" target_datatype="fqtoc"/>
+      <upload_warning>
+        Sequencing data produced since February 2011 is generally using Sanger encoding. Please consider selecting fastqsanger${auto_compressed_type} instead.
+      </upload_warning>
     </datatype>
     <datatype extension="fastqcssanger" auto_compressed_types="gz,bz2" type="galaxy.datatypes.sequence:FastqCSSanger" display_in_upload="true" description="sequence in in color space phred scored quality values 0:93 represented by ASCII 33:126">
       <upload_warning>
@@ -157,6 +164,9 @@
     </datatype>
     <datatype extension="fastqillumina" auto_compressed_types="gz,bz2" type="galaxy.datatypes.sequence:FastqIllumina" display_in_upload="true" description="Sanger variant of the FASTQ format: phred+64">
       <converter file="fastq_to_fqtoc.xml" target_datatype="fqtoc"/>
+      <upload_warning>
+        Sequencing data produced since February 2011 is generally using Sanger encoding. Please consider selecting fastqsanger${auto_compressed_type} instead.
+      </upload_warning>
     </datatype>
     <datatype extension="fqtoc" type="galaxy.datatypes.sequence:SequenceSplitLocations" display_in_upload="true"/>
     <datatype extension="eland" type="galaxy.datatypes.tabular:Eland" display_in_upload="true"/>