Merge pull request #210 from tcezard/add_christmas_banner

EVA-3729 - Add Christmas banner
EBIvariation · Dec 19, 2024 · 0a1732c · 0a1732c
2 parents 7591264 + d40a85b
commit 0a1732c
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 8 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -39,6 +39,7 @@ jobs:
          $AGENT_TOOLSDIRECTORY/node/$NODE_VERSION/x64/bin/npm install --legacy-peer-deps
      - name: Run tests
        run: |
+         export OPENSSL_CONF=/dev/null
          $AGENT_TOOLSDIRECTORY/node/$NODE_VERSION/x64/bin/npm install -g grunt-cli
          sudo apt install xvfb -y && Xvfb :99 & export DISPLAY=:99
          grunt run-all-tests --env=prod
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -15,7 +15,7 @@ module.exports = function (grunt) {
         // Metadata.
         meta: {
             version: {
-                eva: '4.4.17'
+                eva: '4.4.18'
             },
             submissionTemplate: {
                 version: 'V1.1.5'

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "eva-web",
-  "version": "4.4.16",
+  "version": "4.4.18",
   "homepage": "https://github.com/EBIvariation/eva-web",
   "authors": [
     "EVA development team <[email protected]>"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "commons",
-  "version": "4.4.16",
+  "version": "4.4.18",
   "description": "javascript commons",
   "repository": {
     "type": "git",

diff --git a/src/index.html b/src/index.html
@@ -152,6 +152,13 @@ <h1><img src="img/eva_logo.png" style="margin-left:-10px;"/><a href="?Home" titl
 <div id="content" role="main" class="row">
     <section>
         <div id="main-content-area" class="columns">
+            <div class="callout alert">
+                <p>Due to staff annual leave, an increase in the response time for helpdesk tickets is expected between
+                    the 21st December to 5th January. Please refrain from creating duplicate tickets during this time;
+                    we will action them as soon as possible.</p>
+                <p>We apologise for any inconvenience caused during this time, and thank you for your patience and
+                    understanding.</p>
+            </div>
             <div id="home-page" class="hide-div">
                 <nav aria-label="You are here:" role="navigation">
                     <ul class="breadcrumbs">

diff --git a/tests/acceptance/variant_browser.js b/tests/acceptance/variant_browser.js
@@ -746,7 +746,7 @@ function safeClick(driver, element) {
             })
         },
         config.wait()
-    ).then(function () {driver.executeScript("arguments[0].click();", element)})
+    ).then(function () { element.click(); })
 }
 
 function clickSubmit(driver) {

diff --git a/tests/acceptance/variant_browser_bottom_panel_tests.js b/tests/acceptance/variant_browser_bottom_panel_tests.js
@@ -167,7 +167,6 @@ module.exports = {
     populationTab:function(driver){
         var populationTabXPath = "//div[contains(@id,'VariantPopulationPanel')]//div//span[text()]";
         var elementToFind = driver.findElement(By.xpath(populationTabXPath));
-        driver.executeScript("arguments[0].scrollIntoView(true);", elementToFind);
         elementToFind.then(function(webElement) {
             driver.wait(until.elementLocated(By.xpath(populationTabXPath)), config.wait()).then(function(text) {
                 driver.findElements(By.xpath("//div[contains(@id,'VariantPopulationPanel')]//div[contains(@class,'x-accordion-item')]")).then(function(rows){

diff --git a/tests/acceptance/variant_view.js b/tests/acceptance/variant_view.js
@@ -239,7 +239,7 @@ test.describe('Variant View - Human RS exclusive to accessioning', function() {
                 "table", "submitted-variant-summary", expectedResults, variantView.checkSection);
 });
 
-test.describe('Variant View - RS with multiple entires', function() {
+test.describe('Variant View - RS with multiple entries', function() {
     var driver;
     test.before(function() {
         driver = config.initDriver(config.browser());
@@ -250,7 +250,10 @@ test.describe('Variant View - RS with multiple entires', function() {
         config.shutdownDriver(driver);
     });
 
-    var expectedResults = [{"Organism": "rat", "Assembly": "GCA_015227675.2 (mRatBN7.2)",
+    var expectedResults = [{"Organism": "rat", "Assembly": "GCA_036323735.1 (GRCr8)",
+                            "Chromosome/Contig accession": "CM070391.1", "Chromosome": "1", "Start": "160105635",
+                            "ID": "rs105032341", "Type": "SNV", "Created Date": "5 December 2024"},
+                            {"Organism": "rat", "Assembly": "GCA_015227675.2 (mRatBN7.2)",
                             "Chromosome/Contig accession": "CM026974.1", "Chromosome": "1", "Start": "150694351",
                             "ID": "rs105032341", "Type": "SNV", "Created Date": "1 December 2021"},
                             {"Organism": "rat", "Assembly": "GCA_000001895.4 (Rnor_6.0)",
@@ -274,7 +277,19 @@ test.describe('Variant View - RS with multiple entires', function() {
                         "End": "161315554", "Reference": "G", "Alternate": "C", "Created Date": "3 January 2010"},
                         {"ID": "ss93228403", "Study": "ENSEMBL_RAT_COMPUTATIONAL_CELERA", "Assembly": "GCA_000002265.1 (Rn_Celera)",
                         "Chromosome/Contig accession": "CM000231.2", "Chromosome": "1", "Start": "148800140",
-                        "End": "148800140", "Reference": "G", "Alternate": "C", "Created Date": "3 January 2010"}
+                        "End": "148800140", "Reference": "G", "Alternate": "C", "Created Date": "3 January 2010"},
+                        {"ID": "ss93228403", "Study": "ENSEMBL_RAT_COMPUTATIONAL_CELERA", "Assembly": "GCA_036323735.1 (GRCr8)",
+                        "Chromosome/Contig accession": "CM070391.1", "Chromosome": "1", "Start": "160105635",
+                        "End": "160105635", "Reference": "G", "Alternate": "C", "Created Date": "3 January 2010"},
+                        {"ID": "ss7306907838", "Study": "PRJEB42012", "Assembly": "GCA_036323735.1 (GRCr8)",
+                        "Chromosome/Contig accession": "CM070391.1", "Chromosome": "1", "Start": "160105635",
+                        "End": "160105635", "Reference": "G", "Alternate": "C", "Created Date": "8 February 2021"},
+                        {"ID": "ss11827767621", "Study": "PRJEB79361", "Assembly": "GCA_036323735.1 (GRCr8)",
+                        "Chromosome/Contig accession": "CM070391.1", "Chromosome": "1", "Start": "160105635",
+                        "End": "160105635", "Reference": "G", "Alternate": "C", "Created Date": "29 August 2024"},
+                        {"ID": "ss11827767621", "Study": "PRJEB79361", "Assembly": "GCA_015227675.2 (mRatBN7.2)",
+                        "Chromosome/Contig accession": "CM026974.1", "Chromosome": "1", "Start": "150694351",
+                        "End": "150694351", "Reference": "G", "Alternate": "C", "Created Date": "29 August 2024"}
                       ];
     variantView.runTableTestNew("Submitted Variant Section", "Submitted Variant Section has the correct values for attributes",
                 "table", "submitted-variant-summary", expectedResults);