Merge branch 'main' into add-differential-expression

VEuPathDB · Dec 3, 2024 · dbe4862 · dbe4862
2 parents 4273536 + 561608e
commit dbe4862
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 37 deletions.
diff --git a/packages/libs/multi-blast/src/lib/components/BlastJobError.tsx b/packages/libs/multi-blast/src/lib/components/BlastJobError.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+
+import {
+  Error as ErrorPage,
+  Link,
+  Loading,
+} from '@veupathdb/wdk-client/lib/Components';
+import { LongJobResponse } from '../utils/ServiceTypes';
+import { useBlastApi } from '../hooks/api';
+import { usePromise } from '@veupathdb/wdk-client/lib/Hooks/PromiseHook';
+import Banner from '@veupathdb/coreui/lib/components/banners/Banner';
+
+interface Props {
+  job: LongJobResponse;
+}
+
+export function BlastJobError(props: Props) {
+  const { job } = props;
+  const blastApi = useBlastApi();
+  const jobErrorResult = usePromise(() => {
+    return blastApi.fetchJobError(job.id);
+  }, [blastApi, job]);
+
+  if (jobErrorResult.loading) {
+    return <Loading />;
+  }
+
+  return (
+    <ErrorPage>
+      <div style={{ fontSize: 'larger' }}>
+        {jobErrorResult.value && (
+          <Banner
+            banner={{
+              type: 'error',
+              message: jobErrorResult.value,
+            }}
+          />
+        )}
+        <p>
+          Your job did not run successfully. Please{' '}
+          <Link
+            target="_blank"
+            to={{
+              pathname: '/contact-us',
+              search: new URLSearchParams({
+                ctx: 'multi-blast job ' + job.id,
+              }).toString(),
+            }}
+          >
+            contact us
+          </Link>{' '}
+          for support.
+        </p>
+      </div>
+    </ErrorPage>
+  );
+}
diff --git a/packages/libs/multi-blast/src/lib/components/BlastWorkspaceResult.tsx b/packages/libs/multi-blast/src/lib/components/BlastWorkspaceResult.tsx
@@ -42,6 +42,7 @@ import { ResultContainer } from './ResultContainer';
 
 import './BlastWorkspaceResult.scss';
 import { DiamondResultContainer } from './DiamondResultContainer';
+import { BlastJobError } from './BlastJobError';
 
 interface Props {
   jobId: string;
@@ -82,23 +83,7 @@ export function BlastWorkspaceResult(props: Props) {
   ) : jobResult.value?.status === 'error' ? (
     <BlastRerunError {...props} />
   ) : jobResult.value?.status === 'queueing-error' ? (
-    <ErrorPage>
-      <div style={{ fontSize: 'larger' }}>
-        Your job did not run successfully. Please{' '}
-        <Link
-          target="_blank"
-          to={{
-            pathname: '/contact-us',
-            search: new URLSearchParams({
-              ctx: 'multi-blast job ' + jobResult.value.job.id,
-            }).toString(),
-          }}
-        >
-          contact us
-        </Link>{' '}
-        for support.
-      </div>
-    </ErrorPage>
+    <BlastJobError job={jobResult.value.job} />
   ) : queryResult.value?.status === 'error' ? (
     <BlastRequestError errorDetails={queryResult.value.details} />
   ) : jobResult.value.job.config.tool.startsWith('diamond-') ? (

diff --git a/packages/libs/multi-blast/src/lib/utils/api.ts b/packages/libs/multi-blast/src/lib/utils/api.ts
@@ -175,6 +175,14 @@ export class BlastApi extends FetchClientWithCredentials {
     });
   }
 
+  fetchJobError(jobId: string) {
+    return this.fetch({
+      path: `${JOBS_PATH}/${jobId}/error`,
+      method: 'GET',
+      transformResponse: ioTransformer(string),
+    });
+  }
+
   rerunJob(jobId: string) {
     return this.taggedFetch({
       path: `${JOBS_PATH}/${jobId}`,

diff --git a/packages/libs/web-common/src/App/UserMenu/UserMenu.scss b/packages/libs/web-common/src/App/UserMenu/UserMenu.scss
@@ -27,16 +27,17 @@ $white: #e0e0e0;
     .UserMenu-Pane {
       opacity: 1;
       transition: none;
+      top: 100%;
     }
   }
 }
 
 .UserMenu-Pane {
-  transition: opacity 500ms 1s;
+  transition: opacity 500ms 1s, top 0s 1s;
   opacity: 0;
 
   right: 0;
-  top: 100%;
+  top: -100000px;
   color: black;
   display: flex;
   flex-direction: column;

diff --git a/...genomics-site/webapp/wdkCustomization/js/client/components/homepage/VEuPathDBHomePage.tsx b/...genomics-site/webapp/wdkCustomization/js/client/components/homepage/VEuPathDBHomePage.tsx
@@ -951,18 +951,6 @@ const useHeaderMenuItems = (
               type: 'reactRoute',
               url: makeStaticPageRoute('/infrastructure.html'),
             },
-            {
-              key: 'usage-metrics',
-              display: 'Monthly Usage Metrics',
-              type: 'externalLink',
-              url: '/reports/VEuPathDB_BRC4_usage_metrics_report.pdf',
-            },
-            {
-              key: 'perf-metrics',
-              display: 'Monthly Performance Metrics',
-              type: 'externalLink',
-              url: '/reports/VEuPathDB_BRC4_performance_metrics_report.pdf',
-            },
             {
               key: 'usage-statistics',
               display: 'Website usage statistics',
@@ -1054,12 +1042,6 @@ const useHeaderMenuItems = (
           type: 'reactRoute',
           url: '/reset-session',
         },
-        {
-          key: 'user-doc',
-          display: 'Downloadable User documentation',
-          type: 'externalLink',
-          url: '/reports/VEuPathDB_User_Documentation.pdf',
-        },
       ],
     },
     {