Job view crashes for jobs with many report items #2311

Src/WitsmlExplorer.Api/HttpHandlers/JobHandler.cs

@@ -3,6 +3,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 
+using Amazon.Runtime;
+
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
@@ -12,6 +14,7 @@
 using WitsmlExplorer.Api.Jobs;
 using WitsmlExplorer.Api.Middleware;
 using WitsmlExplorer.Api.Models;
+using WitsmlExplorer.Api.Models.Reports;
 using WitsmlExplorer.Api.Services;
 
 namespace WitsmlExplorer.Api.HttpHandlers
@@ -100,5 +103,23 @@ public static IResult CancelJob(string jobId, IJobCache jobCache)
             }
             return TypedResults.NotFound();
         }
+
+        [Produces(typeof(BaseReport))]
+        public static IResult GetReport(string jobId, IJobCache jobCache, HttpRequest httpRequest, IConfiguration configuration, ICredentialsService credentialsService)
+        {
+            EssentialHeaders eh = new(httpRequest);
+            bool useOAuth2 = StringHelpers.ToBoolean(configuration[ConfigConstants.OAuth2Enabled]);
+            string userName = useOAuth2 ? credentialsService.GetClaimFromToken(eh.GetBearerToken(), "upn") : eh.TargetUsername;
+            if (!useOAuth2)
+            {
+                credentialsService.VerifyUserIsLoggedIn(eh, ServerType.Target);
+            }
+            JobInfo job = jobCache.GetJobInfoById(jobId);
+            if (job.Username != userName && (!useOAuth2 || !IsAdminOrDeveloper(eh.GetBearerToken())))
+            {
+                return TypedResults.Forbid();
+            }
+            return TypedResults.Ok(jobCache.GetReportByJobId(jobId));
+        }
     }
 }

Src/WitsmlExplorer.Api/Jobs/JobInfo.cs

@@ -49,6 +49,7 @@ public JobInfo()
 
         public double Progress { get; set; }
 
+        [JsonIgnore]
         public BaseReport Report { get; set; }
 
         public bool IsCancelable { get; internal set; } = false;
@@ -73,6 +74,17 @@ public JobStatus Status
             }
         }
 
+        public string LinkType
+        {
+            get
+            {
+                if (Report?.DownloadImmediately == true)
+                {
+                    return "Donwload file";
+                }
+                return "Report";
+            }
+        }
     }
 
     public enum JobStatus

Src/WitsmlExplorer.Api/Models/Reports/BaseReport.cs

@@ -9,5 +9,6 @@ public class BaseReport
         public IEnumerable<object> ReportItems { get; init; }
         public string WarningMessage { get; init; }
         public bool DownloadImmediately { get; init; } = false;
+        public string ReportHeader { get; init; }
     }
 }

Src/WitsmlExplorer.Api/Routes.cs

@@ -95,6 +95,7 @@ public static void ConfigureApi(this WebApplication app, IConfiguration configur
             app.MapGet("/jobs/userjobinfo/{jobId}", JobHandler.GetUserJobInfo, useOAuth2);
             app.MapGet("/jobs/alljobinfos", JobHandler.GetAllJobInfos, useOAuth2, AuthorizationPolicyRoles.ADMINORDEVELOPER);
             app.MapPost("/jobs/cancel/{jobId}", JobHandler.CancelJob, useOAuth2);
+            app.MapGet("/jobs/getreport/{jobId}", JobHandler.GetReport, useOAuth2);
 
             app.MapGet("/credentials/authorize", AuthorizeHandler.Authorize, useOAuth2);
             app.MapGet("/credentials/deauthorize", AuthorizeHandler.Deauthorize, useOAuth2);

Src/WitsmlExplorer.Api/Services/JobCache.cs

@@ -9,6 +9,7 @@
 using Microsoft.Extensions.Logging;
 
 using WitsmlExplorer.Api.Jobs;
+using WitsmlExplorer.Api.Models.Reports;
 
 namespace WitsmlExplorer.Api.Services
 {
@@ -18,6 +19,7 @@ public interface IJobCache
         ICollection<JobInfo> GetJobInfosByUser(string username);
         JobInfo GetJobInfoById(string jobId);
         ICollection<JobInfo> GetAllJobInfos();
+        BaseReport GetReportByJobId(string jobId);
     }
 
     public class JobCache : IJobCache
@@ -61,7 +63,17 @@ public JobInfo GetJobInfoById(string jobId)
 
         public ICollection<JobInfo> GetAllJobInfos()
         {
-            return _jobs.Values;
+            return _jobs.Values.ToList();
+        }
+
+        public BaseReport GetReportByJobId(string jobId)
+        {
+            var job = _jobs[jobId];
+            if (job != null)
+            {
+                return job.Report;
+            }
+            return null;
         }
 
         private void Cleanup()

Src/WitsmlExplorer.Api/Workers/DownloadAllLogDataWorker.cs

@@ -43,26 +43,37 @@ public DownloadAllLogDataWorker(
             if (job.JobInfo != null) job.JobInfo.Progress = progress;
         });
         var logData = await _logObjectService.ReadLogData(job.LogReference.WellUid, job.LogReference.WellboreUid, job.LogReference.Uid, job.Mnemonics.ToList(), job.StartIndexIsInclusive, job.LogReference.StartIndex, job.LogReference.EndIndex, true, cancellationToken, progressReporter);
-        return DownloadAllLogDataResult(job, logData.Data, job.LogReference.Uid);
+        return DownloadAllLogDataResult(job, logData.Data, logData.CurveSpecifications);
     }
 
-    private (WorkerResult, RefreshAction) DownloadAllLogDataResult(DownloadAllLogDataJob job, ICollection<Dictionary<string, LogDataValue>> reportItems, string logUid)
+    private (WorkerResult, RefreshAction) DownloadAllLogDataResult(DownloadAllLogDataJob job, ICollection<Dictionary<string, LogDataValue>> reportItems, ICollection<CurveSpecification> curveSpecifications)
     {
         Logger.LogInformation("Download of all data is done. {jobDescription}", job.Description());
-        job.JobInfo.Report = DownloadAllLogDataReport(reportItems, job.LogReference);
+        job.JobInfo.Report = DownloadAllLogDataReport(reportItems, job.LogReference, GetReportHeader(curveSpecifications));
         WorkerResult workerResult = new(GetTargetWitsmlClientOrThrow().GetServerHostname(), true, $"Download of all data is ready, jobId: ", jobId: job.JobInfo.Id);
         return (workerResult, null);
     }
 
-    private DownloadAllLogDataReport DownloadAllLogDataReport(ICollection<Dictionary<string, LogDataValue>> reportItems, LogObject logReference)
+    private DownloadAllLogDataReport DownloadAllLogDataReport(ICollection<Dictionary<string, LogDataValue>> reportItems, LogObject logReference, string reportHeader)
     {
         return new DownloadAllLogDataReport
         {
             Title = $"{logReference.WellboreName} - {logReference.Name}",
             Summary = "You can download the report as csv file",
             LogReference = logReference,
             ReportItems = reportItems,
-            DownloadImmediately = true
+            DownloadImmediately = true,
+            ReportHeader = reportHeader
         };
     }
+
+    private string GetReportHeader(ICollection<CurveSpecification> curveSpecifications)
+    {
+        var listOfHeaders = new List<string>();
+        foreach (CurveSpecification curveSpec in curveSpecifications)
+        {
+            listOfHeaders.Add($"{curveSpec.Mnemonic}[{curveSpec.Unit}]");
+        }
+        return string.Join(',', listOfHeaders);
+    }
 }

Src/WitsmlExplorer.Frontend/__testUtils__/testUtils.tsx

@@ -34,6 +34,7 @@ import ObjectOnWellbore from "models/objectOnWellbore";
 import ObjectSearchResult from "models/objectSearchResult";
 import { ObjectType, ObjectTypeToModel } from "models/objectType";
 import RefNameString from "models/refNameString";
+import BaseReport from "models/reports/BaseReport";
 import Rig from "models/rig";
 import RiskObject from "models/riskObject";
 import { Server } from "models/server";
@@ -194,10 +195,22 @@ export function getJobInfo(overrides?: Partial<JobInfo>): JobInfo {
     report: null,
     progress: 0,
     isCancelable: false,
+    linkType: "",
     ...overrides
   };
 }
 
+export function getReport(): BaseReport {
+  return {
+    title: "testTitle",
+    summary: "testSummary",
+    reportItems: [],
+    warningMessage: "",
+    downloadImmediately: false,
+    reportHeader: ""
+  };
+}
+
 export function getNotification(
   overrides?: Partial<Notification>
 ): Notification {

Src/WitsmlExplorer.Frontend/components/ContentViews/JobsView.tsx

@@ -11,13 +11,14 @@ import JobInfoContextMenu, {
 } from "components/ContextMenus/JobInfoContextMenu";
 import formatDateString from "components/DateFormatter";
 import { ReportModal } from "components/Modals/ReportModal";
+import { generateReport } from "components/ReportCreationHelper";
 import { Button } from "components/StyledComponents/Button";
 import OperationContext from "contexts/operationContext";
 import OperationType from "contexts/operationType";
 import { refreshJobInfoQuery } from "hooks/query/queryRefreshHelpers";
 import { useGetJobInfo } from "hooks/query/useGetJobInfo";
 import { useGetServers } from "hooks/query/useGetServers";
-import BaseReport from "models/reports/BaseReport";
+import useExport from "hooks/useExport";
 import { Server } from "models/server";
 import {
   adminRole,
@@ -26,6 +27,7 @@ import {
   msalEnabled
 } from "msal/MsalAuthProvider";
 import React, { ChangeEvent, useContext, useMemo, useState } from "react";
+import JobService from "services/jobService";
 import styled from "styled-components";
 import { Colors } from "styles/Colors";
 
@@ -44,6 +46,8 @@ export const JobsView = (): React.ReactElement => {
     ? new Date(dataUpdatedAt).toLocaleTimeString()
     : "";
 
+  const { exportData } = useExport();
+
   const onContextMenu = (
     event: React.MouseEvent<HTMLLIElement>,
     selectedItem: any
@@ -62,12 +66,25 @@ export const JobsView = (): React.ReactElement => {
     });
   };
 
-  const onClickReport = (report: BaseReport) => {
-    const reportModalProps = { report };
-    dispatchOperation({
-      type: OperationType.DisplayModal,
-      payload: <ReportModal {...reportModalProps} />
-    });
+  const onClickReport = async (jobId: string) => {
+    const report = await JobService.getReport(jobId);
+    if (report.downloadImmediately === true) {
+      const reportProperties = generateReport(
+        report.reportItems,
+        report.reportHeader
+      );
+      exportData(
+        report.title,
+        reportProperties.exportColumns,
+        reportProperties.data
+      );
+    } else {
+      const reportModalProps = { report };
+      dispatchOperation({
+        type: OperationType.DisplayModal,
+        payload: <ReportModal {...reportModalProps} />
+      });
+    }
   };
 
   const columns: ContentTableColumn[] = [
@@ -115,10 +132,6 @@ export const JobsView = (): React.ReactElement => {
             wellName: jobInfo.wellName,
             wellboreName: jobInfo.wellboreName,
             objectName: jobInfo.objectName,
-            status:
-              jobInfo.progress && jobInfo.status === "Started"
-                ? `${Math.round(jobInfo.progress * 100)}%`
-                : jobInfo.status,
             startTime: formatDateString(
               jobInfo.startTime,
               timeZone,
@@ -131,11 +144,12 @@ export const JobsView = (): React.ReactElement => {
             ),
             targetServer: serverUrlToName(servers, jobInfo.targetServer),
             sourceServer: serverUrlToName(servers, jobInfo.sourceServer),
-            report: jobInfo.report ? (
-              <ReportButton onClick={() => onClickReport(jobInfo.report)}>
-                Report
-              </ReportButton>
-            ) : null,
+            report:
+              jobInfo.status === "Finished" ? (
+                <ReportButton onClick={() => onClickReport(jobInfo.id)}>
+                  {jobInfo.linkType}
+                </ReportButton>
+              ) : null,
             jobInfo: jobInfo
           };
         })

Src/WitsmlExplorer.Frontend/components/Modals/ReportModal.tsx

@@ -11,6 +11,7 @@ import {
 } from "components/ContentViews/table";
 import { StyledAccordionHeader } from "components/Modals/LogComparisonModal";
 import ModalDialog, { ModalWidth } from "components/Modals/ModalDialog";
+import { generateReport } from "components/ReportCreationHelper";
 import { Banner } from "components/StyledComponents/Banner";
 import { useConnectedServer } from "contexts/connectedServerContext";
 import OperationContext from "contexts/operationContext";
@@ -161,39 +162,10 @@ export const ReportModal = (props: ReportModal): React.ReactElement => {
 export const useGetReportOnJobFinished = (jobId: string): BaseReport => {
   const { connectedServer } = useConnectedServer();
   const [report, setReport] = useState<BaseReport>(null);
-  const { exportData, exportOptions } = useExport();
+  const { exportData } = useExport();
 
   if (!jobId) return null;
 
-  const downloadData = (reportItems: any[], reportTitle: string) => {
-    if (reportItems === null) {
-      return;
-    }
-
-    const columns: ContentTableColumn[] =
-      reportItems.length > 0
-        ? Object.keys(reportItems[0]).map((key) => ({
-            property: key,
-            label: key,
-            type: ContentType.String
-          }))
-        : [];
-
-    const exportColumns = columns
-      .map((column) => `${column.property}]`)
-      .join(exportOptions.separator);
-
-    const data = reportItems
-      .map((row) =>
-        columns
-          .map((col) => row[col.property] as string)
-          .join(exportOptions.separator)
-      )
-      .join(exportOptions.newLineCharacter);
-
-    exportData(reportTitle, exportColumns, data);
-  };
-
   useEffect(() => {
     const unsubscribeOnJobFinished =
       NotificationService.Instance.snackbarDispatcherAsEvent.subscribe(
@@ -207,9 +179,18 @@ export const useGetReportOnJobFinished = (jobId: string): BaseReport => {
                 )
               );
             } else {
-              setReport(jobInfo.report);
-              if (jobInfo.report.downloadImmediately === true) {
-                downloadData(jobInfo.report.reportItems, jobInfo.report.title);
+              const report = await JobService.getReport(jobId);
+              setReport(report);
+              if (report.downloadImmediately === true) {
+                const reportProperties = generateReport(
+                  report.reportItems,
+                  report.reportHeader
+                );
+                exportData(
+                  report.title,
+                  reportProperties.exportColumns,
+                  reportProperties.data
+                );
               }
             }
           }

Src/WitsmlExplorer.Frontend/components/Modals/__tests__/ReportModal.test.tsx

@@ -6,6 +6,7 @@ import {
   deferred,
   getJobInfo,
   getNotification,
+  getReport,
   renderWithContexts
 } from "__testUtils__/testUtils";
 import { ReportModal } from "components/Modals/ReportModal";
@@ -20,7 +21,8 @@ jest.mock("@equinor/eds-core-react", () => mockEdsCoreReact());
 
 jest.mock("services/jobService", () => {
   return {
-    getUserJobInfo: () => MOCK_JOB_INFO
+    getUserJobInfo: () => MOCK_JOB_INFO,
+    getReport: () => MOCK_REPORT
   };
 });
 
@@ -130,3 +132,4 @@ const REPORT = createReport("testTitle", "testSummary", REPORT_ITEMS);
 const EMPTY_REPORT = createReport("emptyReportTitle", "emptyReportSummary");
 const MOCK_JOB_INFO = getJobInfo({ report: REPORT, id: "testJobId" });
 const NOTIFICATION = getNotification({ jobId: "testJobId" });
+const MOCK_REPORT = getReport();