easy fixes for Nick 08/29

Author: sagehen03

cypress/e2e/hermes/hermes-upload.cy.js

@@ -10,7 +10,7 @@ describe('Hermes Upload', {retries: 0}, () => {
     cy.visit('/hermes/new', { timeout: 10000 });
     cy.get('#dataSetName').type('Cypress dataset');
     // cy.get('#genomeBuild').type('GRCh38').type('{enter}');
-    cy.get('[data-cy="cohort"]').type('UKBio').type('{enter}');
+    cy.get('#cohort').type('UKBiobank');
     cy.get('#contactPerson').type('Point of Contact');
     cy.get('#dataCollectionStart').type('2006/01/01');
     cy.get('[data-cy="sex"]').type('Male').type('{enter}');

pages/hermes/new.vue

@@ -154,11 +154,7 @@ const genomeBuildOptions = ref([
     { name: "GRCh38/hg38", value: "GRCh38/hg38" },
     { name: "GRCh37/b37", value: "GRCh37/b37" },
 ]);
-const cohortOptions = ref([
-  { name: "UK Biobank", value: "UK Biobank" },
-  { name: "23andMe", value: "23andMe" },
-  { name: "AncestryDNA", value: "AncestryDNA" }
-]);
+
 const subjects = ref(0);
 const participants = ref(null);
 const sexProportion = ref(null);
@@ -414,24 +410,23 @@ async function uploadSubmit(){
                 <Fieldset legend="Study Metadata">
                   <div class="field">
                       <label for="dataSetName">Dataset Name</label>
-                      <InputText v-tooltip="'e.g. “UKBB Heart Failure (female)'"
+                      <div v-tooltip="'e.g. “UKBB Heart Failure (female)”'">
+                      <InputText
                           v-model="dataSetName"
                           id="dataSetName" :class="{ 'p-invalid': errors.dataSetName }"
                                  aria-describedby="dataSetName-help"
                           placeholder="Enter Dataset Name"
-                      />
+                        />
+                        </div>
                     <small id="dataSetName-help" class="p-error">
                       {{ errors.dataSetName }}
                     </small>
                   </div>
                   <div class="field">
                     <label for="cohort">Cohort</label>
                     <div v-tooltip="'e.g. “UKBiobank”'">
-                    <Dropdown placeholder="Select Cohort" v-model="cohort" :options="cohortOptions" id="cohort" optionLabel="name"
-                              optionValue="value" :class="{ 'p-invalid': errors.cohort }"
-                              aria-describedby="cohort-help" data-cy="cohort"
-
-                    />
+                    <InputText v-model="cohort"  id="cohort" :class="{ 'p-invalid': errors.cohort }"
+                              aria-describedby="cohort-help" />
                     </div>
                     <small id="cohort-help" class="p-error">
                       {{ errors.cohort }}
@@ -490,11 +485,12 @@ async function uploadSubmit(){
                 <Fieldset legend="Participants">
                   <div class="field">
                     <label for="phenotype">Phenotype</label>
-                    <InputText v-model="phenotype" id="phenotype" type="text"
-                               v-tooltip="'The phenotype description e.g. “all-cause heart failure'"
-                               aria-describedby="phenotype-help"
-                               :class="{ 'p-invalid': errors.phenotype }"
-                    />
+                    <div v-tooltip="'The phenotype description e.g. “all-cause heart failure”'">
+                      <InputText v-model="phenotype" id="phenotype" type="text"
+                      aria-describedby="phenotype-help"
+                      :class="{ 'p-invalid': errors.phenotype }"
+                      />
+                    </div>
                     <small id="phenotype-help" class="p-error">
                       {{ errors.phenotype }}
                     </small>