Merge branch 'main' into keyboard-a11y-improvements

VEuPathDB · Nov 15, 2024 · b800dd2 · b800dd2
2 parents d2ecfbc + bf7a289
commit b800dd2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/packages/libs/multi-blast/src/lib/components/BlastWorkspace.tsx b/packages/libs/multi-blast/src/lib/components/BlastWorkspace.tsx
@@ -28,7 +28,7 @@ export function BlastWorkspace(props: Props) {
   const {
     helpPageUrl,
     workspaceUrl,
-    workspaceHeading = 'BLAST',
+    workspaceHeading = 'My BLAST Jobs',
     workspaceShortName = 'BLAST',
     submitButtonText = 'BLAST',
   } = props;
@@ -41,12 +41,12 @@ export function BlastWorkspace(props: Props) {
         routeBase={workspaceUrl}
         items={[
           {
-            display: 'New job',
-            route: '/new',
+            display: 'All',
+            route: '/all',
           },
           {
-            display: 'My jobs',
-            route: '/all',
+            display: 'New job',
+            route: '/new',
           },
           {
             display: 'Help',

diff --git a/packages/libs/user-datasets/src/lib/Components/UploadForm.scss b/packages/libs/user-datasets/src/lib/Components/UploadForm.scss
@@ -33,6 +33,7 @@
   .formInfo {
     width: 80%;
     text-align: justify;
+    font-size: 1.2em;
   }
   select {
     max-width: 450px;

diff --git a/packages/libs/user-datasets/src/lib/Components/UploadForm.tsx b/packages/libs/user-datasets/src/lib/Components/UploadForm.tsx
@@ -398,7 +398,7 @@ function UploadForm({
               <>
                 Before uploading your dataset, please ensure your data is
                 formatted according to the instructions listed in the{' '}
-                <Link to={{ pathname: '../datasets/help' }}>"Help" tab</Link>.
+                <Link to={{ pathname: `${baseUrl}/help` }}>"Help" tab</Link>.
               </>
             ),
           }}
@@ -628,7 +628,9 @@ function validateForm<T extends string = string>(
   ) {
     return {
       valid: false,
-      errors: ['The provided data URL does not seem valid'],
+      errors: [
+        'The provided data URL does not seem valid. A valid URL must start with "http://" or "https://".',
+      ],
     };
   }
 
@@ -655,12 +657,13 @@ function isCompleteDataUploadSelection(
 
 // https://stackoverflow.com/a/43467144
 function isValidUrl(string: string) {
+  let url: URL;
   try {
-    new URL(string);
+    url = new URL(string);
   } catch (_) {
     return false;
   }
-  return true;
+  return url.protocol === 'http' || url.protocol === 'https';
 }
 
 export default UploadForm;