Merge branch 'main' into features/2534_wellbore_uid_mapping

# Conflicts: # Src/WitsmlExplorer.Frontend/components/ContextMenus/FluidContextMenu.tsx # Src/WitsmlExplorer.Frontend/components/ContextMenus/LogCurveInfoContextMenu.tsx # Src/WitsmlExplorer.Frontend/components/ContextMenus/LogsContextMenu.tsx # Src/WitsmlExplorer.Frontend/components/ContextMenus/ObjectMenuItems.tsx # Src/WitsmlExplorer.Frontend/components/ContextMenus/ObjectsSidebarContextMenu.tsx # Src/WitsmlExplorer.Frontend/components/ContextMenus/TrajectoryStationContextMenu.tsx # Src/WitsmlExplorer.Frontend/components/ContextMenus/TubularComponentContextMenu.tsx # Src/WitsmlExplorer.Frontend/components/ContextMenus/WbGeometrySectionContextMenu.tsx # Src/WitsmlExplorer.Frontend/components/ContextMenus/WellContextMenu.tsx # Src/WitsmlExplorer.Frontend/components/ContextMenus/WellboreContextMenu.tsx
equinor · Nov 19, 2024 · c9f5f9a · c9f5f9a
2 parents 5fb7d74 + 340b341
commit c9f5f9a
Show file tree

Hide file tree

Showing 61 changed files with 919 additions and 533 deletions.
diff --git a/Src/WitsmlExplorer.Api/HttpHandlers/JobHandler.cs b/Src/WitsmlExplorer.Api/HttpHandlers/JobHandler.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -120,5 +121,27 @@ public static IResult GetReport(string jobId, IJobCache jobCache, HttpRequest ht
             }
             return TypedResults.Ok(job.Report);
         }
+
+        [Produces("application/octet-stream")]
+        public static IResult DownloadFile(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();
+            }
+            BaseReport report = job.Report;
+            byte[] byteArray = System.Text.Encoding.UTF8.GetBytes(report.FileData.FileContent);
+            var stream = new MemoryStream(byteArray);
+            httpRequest.HttpContext.Response.Headers["Access-Control-Expose-Headers"] = "Content-Disposition";
+            return TypedResults.File(stream, "application/octet-stream", report.FileData.FileName);
+        }
     }
 }
diff --git a/Src/WitsmlExplorer.Api/Jobs/JobInfo.cs b/Src/WitsmlExplorer.Api/Jobs/JobInfo.cs
@@ -83,7 +83,7 @@ public ReportType ReportType
                 {
                     return ReportType.None;
                 }
-                if (Report?.DownloadImmediately == true)
+                if (Report?.HasFile == true)
                 {
                     return ReportType.File;
                 }

diff --git a/Src/WitsmlExplorer.Api/Models/Connection.cs b/Src/WitsmlExplorer.Api/Models/Connection.cs
@@ -14,6 +14,7 @@ public Connection(Server server)
             CredentialIds = server.CredentialIds;
             Id = server.Id;
             DepthLogDecimals = server.DepthLogDecimals;
+            IsPriority = server.IsPriority;
         }
 
         [JsonPropertyName("usernames")]

diff --git a/Src/WitsmlExplorer.Api/Models/Reports/BaseReport.cs b/Src/WitsmlExplorer.Api/Models/Reports/BaseReport.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace WitsmlExplorer.Api.Models.Reports
 {
@@ -8,9 +9,15 @@ public class BaseReport
         public string Summary { get; init; }
         public IEnumerable<object> ReportItems { get; init; }
         public string WarningMessage { get; init; }
-        public bool DownloadImmediately { get; init; } = false;
-        public string ReportHeader { get; init; }
+        public bool HasFile { get; init; } = false;
         public string JobDetails { get; init; }
-        public string ReportBody { get; init; }
+        [JsonIgnore]
+        public ReportFileData FileData { get; init; }
+    }
+
+    public class ReportFileData
+    {
+        public string FileName { get; init; }
+        public string FileContent { get; init; }
     }
 }
diff --git a/Src/WitsmlExplorer.Api/Models/Server.cs b/Src/WitsmlExplorer.Api/Models/Server.cs
@@ -25,6 +25,8 @@ public Server() : base(Guid.NewGuid())
         public IList<string> CredentialIds { get; init; }
         [JsonPropertyName("depthLogDecimals")]
         public int DepthLogDecimals { get; init; }
+        [JsonPropertyName("isPriority")]
+        public bool IsPriority { get; init; }
 
         public override string ToString()
         {

diff --git a/Src/WitsmlExplorer.Api/Routes.cs b/Src/WitsmlExplorer.Api/Routes.cs
@@ -106,6 +106,7 @@ public static void ConfigureApi(this WebApplication app, IConfiguration configur
             app.MapGet("/jobs/alljobinfos", JobHandler.GetAllJobInfos, useOAuth2, AuthorizationPolicyRoles.ADMINORDEVELOPER);
             app.MapPost("/jobs/cancel/{jobId}", JobHandler.CancelJob, useOAuth2);
             app.MapGet("/jobs/report/{jobId}", JobHandler.GetReport, useOAuth2);
+            app.MapGet("/jobs/download/{jobId}", JobHandler.DownloadFile, useOAuth2);
 
             app.MapGet("/credentials/authorize", AuthorizeHandler.Authorize, useOAuth2);
             app.MapGet("/credentials/deauthorize", AuthorizeHandler.Deauthorize, useOAuth2);

diff --git a/Src/WitsmlExplorer.Api/Workers/DownloadLogDataWorker.cs b/Src/WitsmlExplorer.Api/Workers/DownloadLogDataWorker.cs
@@ -63,27 +63,33 @@ public DownloadLogDataWorker(
     private (WorkerResult, RefreshAction) DownloadLogDataResult(DownloadLogDataJob job, ICollection<Dictionary<string, LogDataValue>> reportItems, ICollection<CurveSpecification> curveSpecifications)
     {
         Logger.LogInformation("Download of all data is done. {jobDescription}", job.Description());
-        var reportHeader = GetReportHeader(curveSpecifications);
-        var reportBody = GetReportBody(reportItems, curveSpecifications);
-        job.JobInfo.Report = DownloadLogDataReport(reportItems, job.LogReference, reportHeader, reportBody);
+        string content = GetCsvFileContent(reportItems, curveSpecifications);
+        job.JobInfo.Report = DownloadLogDataReport(job.LogReference, content, "csv");
         WorkerResult workerResult = new(GetTargetWitsmlClientOrThrow().GetServerHostname(), true, $"Download of all data is ready, jobId: ", jobId: job.JobInfo.Id);
         return (workerResult, null);
     }
 
-    private DownloadLogDataReport DownloadLogDataReport(ICollection<Dictionary<string, LogDataValue>> reportItems, LogObject logReference, string reportHeader, string reportBody)
+    private DownloadLogDataReport DownloadLogDataReport(LogObject logReference, string fileContent, string fileExtension)
     {
         return new DownloadLogDataReport
         {
             Title = $"{logReference.WellboreName} - {logReference.Name}",
-            Summary = "You can download the report as csv file",
+            Summary = "The download will start automatically. You can also access the download link in the Jobs view.",
             LogReference = logReference,
-            ReportItems = reportItems,
-            DownloadImmediately = true,
-            ReportHeader = reportHeader,
-            ReportBody = reportBody
+            HasFile = true,
+            FileData = new ReportFileData
+            {
+                FileName = $"{logReference.WellboreName}-{logReference.Name}.{fileExtension}",
+                FileContent = fileContent
+            }
         };
     }
 
+    private string GetCsvFileContent(ICollection<Dictionary<string, LogDataValue>> reportItems, ICollection<CurveSpecification> curveSpecifications)
+    {
+        return $"{GetReportHeader(curveSpecifications)}\n{GetReportBody(reportItems, curveSpecifications)}";
+    }
+
     private string GetReportHeader(ICollection<CurveSpecification> curveSpecifications)
     {
         var listOfHeaders = new List<string>();

diff --git a/Src/WitsmlExplorer.Desktop/package.json b/Src/WitsmlExplorer.Desktop/package.json
@@ -38,7 +38,7 @@
     "electron-builder": "^24.13.3",
     "electron-playwright-helpers": "^1.7.1",
     "electron-vite": "^2.1.0",
-    "lint-staged": "^13.0.3",
+    "lint-staged": "^15.2.4",
     "vite-tsconfig-paths": "^4.3.2"
   },
   "dependencies": {

diff --git a/Src/WitsmlExplorer.Frontend/__testUtils__/testUtils.tsx b/Src/WitsmlExplorer.Frontend/__testUtils__/testUtils.tsx
@@ -157,6 +157,7 @@ export function getServer(overrides?: Partial<Server>): Server {
     roles: [],
     credentialIds: [],
     depthLogDecimals: 0,
+    isPriority: false,
     ...overrides
   };
 }
@@ -209,8 +210,7 @@ export function getReport(overrides?: Partial<BaseReport>): BaseReport {
     summary: "testSummary",
     reportItems: [],
     warningMessage: "",
-    downloadImmediately: false,
-    reportHeader: "",
+    hasFile: false,
     ...overrides
   };
 }

diff --git a/Src/WitsmlExplorer.Frontend/components/Alerts.tsx b/Src/WitsmlExplorer.Frontend/components/Alerts.tsx
@@ -48,10 +48,13 @@ const Alerts = (): React.ReactElement => {
             ?.toString()
             .toLowerCase();
           const shouldNotify =
-            connectedServerUrl &&
-            (notificationServerUrl === null ||
-              connectedServerUrl === notificationServerUrl ||
-              connectedServerUrl === notificationSourceServerUrl);
+            (!connectedServerUrl &&
+              !notificationServerUrl &&
+              !notificationSourceServerUrl) ||
+            (connectedServerUrl &&
+              (notificationServerUrl === null ||
+                connectedServerUrl === notificationServerUrl ||
+                connectedServerUrl === notificationSourceServerUrl));
           if (!shouldNotify) {
             return;
           }

diff --git a/Src/WitsmlExplorer.Frontend/components/Breadcrumbs.tsx b/Src/WitsmlExplorer.Frontend/components/Breadcrumbs.tsx
@@ -155,7 +155,7 @@ export function Breadcrumbs() {
         color="inherit"
         aria-label="breadcrumb"
         wrap={false}
-        isCompact={theme === UserTheme.Compact}
+        $isCompact={theme === UserTheme.Compact}
       >
         {breadcrumbContent.map((breadCrumb, index: number) => (
           <EdsBreadcrumbs.Breadcrumb
@@ -400,13 +400,20 @@ const StyledNavLink = styled(NavLink)`
   text-decoration: none;
 `;
 
-const StyledBreadcrumbs = styled(EdsBreadcrumbs)<{ isCompact: boolean }>`
-  padding-top: 0.2em;
-  height: 1.5rem;
+const StyledBreadcrumbs = styled(EdsBreadcrumbs)<{ $isCompact: boolean }>`
   overflow: clip;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  height: fit-content;
+
+  li > span {
+    display: inline-flex;
+    line-height: 16px;
+  }
 
-  ${({ isCompact }) =>
-    !isCompact
+  ${({ $isCompact }) =>
+    !$isCompact
       ? ""
       : css`
           li > span {

diff --git a/Src/WitsmlExplorer.Frontend/components/ContentViews/JobsView.tsx b/Src/WitsmlExplorer.Frontend/components/ContentViews/JobsView.tsx
@@ -17,7 +17,6 @@ import OperationType from "contexts/operationType";
 import { refreshJobInfoQuery } from "hooks/query/queryRefreshHelpers";
 import { useGetJobInfo } from "hooks/query/useGetJobInfo";
 import { useGetServers } from "hooks/query/useGetServers";
-import useExport from "hooks/useExport";
 import { useOperationState } from "hooks/useOperationState";
 import JobStatus from "models/jobStatus";
 import JobInfo from "models/jobs/jobInfo";
@@ -49,8 +48,6 @@ export const JobsView = (): React.ReactElement => {
     ? new Date(dataUpdatedAt).toLocaleTimeString()
     : "";
 
-  const { exportData } = useExport();
-
   const [cancellingJobs, setCancellingJobs] = useState<string[]>([]);
 
   const onContextMenu = (
@@ -94,8 +91,8 @@ export const JobsView = (): React.ReactElement => {
   };
   const onClickReport = async (jobId: string) => {
     const report = await JobService.getReport(jobId);
-    if (report.downloadImmediately === true) {
-      exportData(report.title, report.reportHeader, report.reportBody);
+    if (report.hasFile === true) {
+      await JobService.downloadFile(jobId);
     } else {
       const reportModalProps = { report };
       dispatchOperation({

diff --git a/Src/WitsmlExplorer.Frontend/components/ContentViews/QueryDataGrid.tsx b/Src/WitsmlExplorer.Frontend/components/ContentViews/QueryDataGrid.tsx
@@ -362,9 +362,11 @@ const getExpandedRowsFromQuery = (
 const StyledTextField = styled(TextField)`
   display: flex;
   align-items: center;
+
   div {
     background-color: transparent;
   }
+
   width: 100%;
   height: 100%;
 `;
diff --git a/Src/WitsmlExplorer.Frontend/components/ContentViews/QueryView/QueryView.tsx b/Src/WitsmlExplorer.Frontend/components/ContentViews/QueryView/QueryView.tsx
@@ -11,6 +11,7 @@ import Icon from "styles/Icons";
 import { Box } from "@mui/material";
 import QueryDataGrid from "components/ContentViews/QueryDataGrid";
 import { QueryEditorTypes } from "components/ContentViews/QueryView/components/QueryOptions/QueryOptions";
+import ResultMeta from "components/ContentViews/QueryView/components/ResultMeta";
 import QueryOptions from "./components/QueryOptions";
 
 const QueryView = (): React.ReactElement => {
@@ -56,7 +57,7 @@ const QueryView = (): React.ReactElement => {
         activeTab={tabIndex}
         onChange={onTabChange}
         scrollable
-        style={{ overflowX: "auto", whiteSpace: "nowrap" }}
+        style={{ whiteSpace: "nowrap" }}
       >
         <Tabs.List>
           {queries.map((query) => (
@@ -85,13 +86,14 @@ const QueryView = (): React.ReactElement => {
         <Box
           display="grid"
           gridTemplateRows="auto 1fr auto"
-          gap="1rem"
+          gap="0.5rem"
           height="100%"
           pr="2px"
         >
           <QueryOptions
             onQueryChange={onQueryChange}
             onChangeEditorType={setEditorType}
+            editorType={editorType}
           />
           {editorType === QueryEditorTypes.DataGrid ? (
             <QueryDataGrid />
@@ -103,9 +105,16 @@ const QueryView = (): React.ReactElement => {
             />
           )}
         </Box>
-        <div>
+        <Box
+          display="grid"
+          gridTemplateRows="auto 1fr"
+          gap="1rem"
+          height="100%"
+          pr="2px"
+        >
+          <ResultMeta />
           <QueryEditor value={result} readonly />
-        </div>
+        </Box>
       </div>
     </Layout>
   );

diff --git a/...mponents/ContentViews/QueryView/components/QueryOptions/DataGridSwitch/DataGridSwitch.tsx b/...mponents/ContentViews/QueryView/components/QueryOptions/DataGridSwitch/DataGridSwitch.tsx
@@ -0,0 +1,40 @@
+import React, { ChangeEventHandler, FC } from "react";
+import { Stack } from "@mui/material";
+import { Switch } from "@equinor/eds-core-react";
+import { useOperationState } from "../../../../../../hooks/useOperationState.tsx";
+import { UserTheme } from "../../../../../../contexts/operationStateReducer.tsx";
+import styled from "styled-components";
+import { Colors } from "../../../../../../styles/Colors.tsx";
+
+type DataGridSwitchProps = {
+  onClick: ChangeEventHandler<HTMLInputElement>;
+  dataGridActive: boolean;
+};
+
+const DataGridSwitch: FC<DataGridSwitchProps> = ({
+  onClick,
+  dataGridActive
+}) => {
+  const { theme, colors } = useOperationState().operationState;
+  const isCompact = theme === UserTheme.Compact;
+
+  return (
+    <Stack direction="row" alignItems="center" justifyContent="flex-start">
+      <StyledSwitch
+        checked={dataGridActive}
+        onChange={onClick}
+        size={isCompact ? "small" : "default"}
+        label="Use data grid view"
+        colors={colors}
+      />
+    </Stack>
+  );
+};
+
+const StyledSwitch = styled(Switch)<{ colors: Colors }>`
+  & > span:nth-child(2) {
+    color: ${({ colors }) => colors.interactive.primaryResting};
+  }
+`;
+
+export default DataGridSwitch;
diff --git a/...rontend/components/ContentViews/QueryView/components/QueryOptions/DataGridSwitch/index.ts b/...rontend/components/ContentViews/QueryView/components/QueryOptions/DataGridSwitch/index.ts
@@ -0,0 +1 @@
+export { default } from "./DataGridSwitch.tsx";