Merge pull request #2551 from equinor/main

Update desktop edition with latest changes

CONTRIBUTING.md

@@ -11,14 +11,13 @@ There are two levels of issues - userstory and issue
 
 ### Userstory
 A userstory is describing a functional (high level) enhancement of the WitsmlExplorer. 
-Here is the project board of [proposed and ongoing userstories](https://github.com/equinor/witsml-explorer/projects/2), and here is an [overview of the main contributors](https://github.com/equinor/witsml-explorer/wiki) participating on each userstory.
-Proposals for new user stories are submitted as new issue - [use the Userstory template](https://github.com/equinor/witsml-explorer/issues/new/choose) .
+Proposals for new user stories are submitted as new issue - [use the Userstory template](https://github.com/equinor/witsml-explorer/issues/new/choose).
 
 ### Issues
-Issues are the feature (code level) enhancement of WitsmlExplorer. Here is the project board for [proposed and ongoing issues](https://github.com/equinor/witsml-explorer/projects/1).  
+Issues are the feature (code level) enhancement of WitsmlExplorer. Here is the [issue list](https://github.com/equinor/witsml-explorer/issues) and project board for [proposed and ongoing issues](https://github.com/orgs/equinor/projects/789).  
 Feel free to file new issues for bugs, suggest feature requests or improvements and so on. Please relate the issue to an UserStory if possible.
 
-If you wish to contribute with coding please have a look at our [Issues board](https://github.com/equinor/witsml-explorer/projects/1).
+If you wish to contribute with coding please have a look at our [Issues board](https://github.com/orgs/equinor/projects/789).
 Issues that are in the TODO column should be ready to go, assign it to yourself and start working on it :computer:
 Especially the ones labeled as a `good first issue` might be a good start. 
 Other issues might need some discussion or clarification before it can be started on, give us your thoughts or suggestions on something you would like to work on, and we can take it from there :smiley: 

Media/README.md

@@ -0,0 +1,90 @@
+# Witsml Explorer Demo & Tutorial Videos
+
+- [Overview](#overview)
+- [Manage Servers](#manage-servers)
+- [Desktop Installation](#desktop-installation)
+- [Azure Integration](#azure-integration)
+- [Settings](#settings)
+- [Search and Filter](#search-and-filter)
+- [Table Overview](#table-overview)
+- [Missing Data Agent](#missing-data-agent)
+- [Query View](#query-view)
+- [Deeplinking](#deeplinking)
+- [Object Overview](#object-overview)
+- [Log Overview](#log-overview)
+  - [Multi-log functionality](#multi-log-functionality)
+  - [Log Agents](#log-agents)
+  - [Export and Import](#export-and-import)
+  - [Splice](#splice)
+  - [Curve Offset](#curve-offset)
+- [Copy and Paste](#copy-and-paste)
+  - [Copy Mnemonics](#copy-mnemonics)
+  - [Copy Other Objects](#copy-other-objects)
+  - [Copy With Range](#copy-with-range)
+  - [Copy Within Server](#copy-within-server)
+
+## Overview
+https://github.com/user-attachments/assets/dc0d1668-03c8-47c8-8601-98daab5bb915
+
+## Manage Servers
+https://github.com/user-attachments/assets/4e8bfb7c-b2c1-4989-a3dd-ef70357abd7f
+
+## Desktop Installation
+https://github.com/user-attachments/assets/527260ca-76e7-4267-bbc9-5e35c2b0c257
+
+## Azure Integration
+https://github.com/user-attachments/assets/55b5e5b8-6603-4156-8d4c-f8dfdfde4d5e
+
+## Settings
+https://github.com/user-attachments/assets/33947d09-577a-45b2-887b-01e04eebc17b
+
+## Search and Filter
+https://github.com/user-attachments/assets/bbeff67f-bef9-4919-8efc-86d4ce3070f5
+
+## Table Overview
+https://github.com/user-attachments/assets/4055d50d-9996-4fee-83ae-1aeceb939274
+
+## Missing Data Agent
+https://github.com/user-attachments/assets/2de1f0f5-d805-4b03-a41b-985701b402bf
+
+## Query View
+https://github.com/user-attachments/assets/3b3608ff-9587-4c34-90f2-432661350269
+
+## Deeplinking
+https://github.com/user-attachments/assets/b4ceb129-dd6e-4a3f-8878-15b1a6abade6
+
+## Object Overview
+https://github.com/user-attachments/assets/e86798ad-c8f9-4213-8f4f-b0e11bf30c57
+
+## Log Overview
+https://github.com/user-attachments/assets/28f4417c-45ed-4c16-acaf-99d2a103ddf6
+
+### Multi-log functionality
+https://github.com/user-attachments/assets/651f3040-e82d-4107-8713-62b0ad29bcef
+
+### Log Agents
+https://github.com/user-attachments/assets/6848c50d-3995-4bf7-a875-9a9be512413a
+
+### Export and Import
+https://github.com/user-attachments/assets/e0a64ec7-4254-4976-902f-9088dc5d61b5
+
+### Splice
+https://github.com/user-attachments/assets/bd340c2f-56c1-4d37-a017-878a17f047ce
+
+### Curve Offset
+https://github.com/user-attachments/assets/9a403460-8178-4b75-9eaf-72302f3a2b71
+
+## Copy and Paste
+https://github.com/user-attachments/assets/ab54c690-3fb0-45e5-a467-ce884935c65e
+
+### Copy Mnemonics
+https://github.com/user-attachments/assets/3f7b9154-001c-49a7-8244-c22e1bb3e278
+
+### Copy Other Objects
+https://github.com/user-attachments/assets/32cedf8c-8811-436e-949a-9fc63f93ded2
+
+### Copy With Range
+https://github.com/user-attachments/assets/3dce1b20-8504-4df6-8e28-13761c17380e
+
+### Copy Within Server
+https://github.com/user-attachments/assets/5aa1332c-3524-45dd-babe-18ae82078eba

README.md

@@ -6,16 +6,21 @@
 
 Witsml Explorer is a data management tool used for browsing and editing data directly on [WITSML](https://en.wikipedia.org/wiki/Wellsite_information_transfer_standard_markup_language) servers.
 
-<img src="./we-demo.png" alt="witsml-explorer interface">
+https://github.com/user-attachments/assets/dc0d1668-03c8-47c8-8601-98daab5bb915
+
+## Demo Videos
+Please see [Demo Videos](/Media/README.md)
 
 ## Key features
 * Runs directly in your browser, no need to install additional software.
+* Local desktop version with a simple installer also available.
 * An intuitive and easy to use interface.
 * Connect to any WITSML server running version 1.4.1.1.
-* Supported WITSML objects includes: wells, wellbores, bharuns, log objects, curves, messages, rigs, risks, trajectories, trajectory stations, tubulars, tubularcomponents, and wbgeometries.
-* Trim log objects and individual curves.
+* Supported WITSML objects: wells, wellbores, bharuns, changelogs, fluidsreports, fluids, formation markers, log objects, curves, messages, mudlogs, geology intervals, rigs, risks, trajectories, trajectory stations, tubulars, tubularcomponents, wbgeometries and wbgeometry sections.
 * Copy objects and sub objects (also between different servers!).
-* URL deep linking directly to objects
+* URL deep linking directly to objects.
+* WITSML query editor.
+* Perform QA/QC jobs on logs and curves: edit, splice, compare, analyze gaps, trim, offset and more.
 
 ## Witsml as a Nuget package
 Please see [nuget_witsml.md](/Docs/nuget_witsml.md)

Src/Witsml/CommonConstants.cs

@@ -40,4 +40,14 @@ public static class Unit
         public const string Feet = "ft";
         public const string Second = "s";
     }
+
+    public static class WitsmlQueryTypeName
+    {
+        public const string Log = "log";
+    }
+
+    public static class WitsmlFunctionType
+    {
+        public const string WMLSUpdateInStore = "WMLS_UpdateInStore";
+    };
 }

Src/WitsmlExplorer.Api/HttpHandlers/LogCurvePriorityHandler.cs

@@ -10,17 +10,31 @@ namespace WitsmlExplorer.Api.HttpHandlers
 {
     public static class LogCurvePriorityHandler
     {
-        [Produces(typeof(List<string>))]
-        public static async Task<IResult> GetPrioritizedCurves(string wellUid, string wellboreUid, ILogCurvePriorityService logCurvePriorityService)
+        [Produces(typeof(string[]))]
+        public static async Task<IResult> GetPrioritizedLocalCurves(string wellUid, string wellboreUid, ILogCurvePriorityService logCurvePriorityService)
+        {
+            var prioritizedCurves = await logCurvePriorityService.GetPrioritizedLocalCurves(wellUid, wellboreUid) ?? new List<string>();
+            return TypedResults.Ok(prioritizedCurves);
+        }
+
+        [Produces(typeof(string[]))]
+        public static async Task<IResult> GetPrioritizedUniversalCurves(ILogCurvePriorityService logCurvePriorityService)
         {
-            var prioritizedCurves = await logCurvePriorityService.GetPrioritizedCurves(wellUid, wellboreUid) ?? new List<string>();
+            var prioritizedCurves = await logCurvePriorityService.GetPrioritizedUniversalCurves() ?? new List<string>();
             return TypedResults.Ok(prioritizedCurves);
         }
 
-        [Produces(typeof(IList<string>))]
-        public static async Task<IResult> SetPrioritizedCurves(string wellUid, string wellboreUid, IList<string> prioritizedCurves, ILogCurvePriorityService logCurvePriorityService)
+        [Produces(typeof(List<string>))]
+        public static async Task<IResult> SetPrioritizedLocalCurves(string wellUid, string wellboreUid, IList<string> prioritizedCurves, ILogCurvePriorityService logCurvePriorityService)
+        {
+            var createdPrioritizedCurves = await logCurvePriorityService.SetPrioritizedLocalCurves(wellUid, wellboreUid, prioritizedCurves) ?? new List<string>();
+            return TypedResults.Ok(createdPrioritizedCurves);
+        }
+
+        [Produces(typeof(List<string>))]
+        public static async Task<IResult> SetPrioritizedUniversalCurves(List<string> prioritizedCurves, ILogCurvePriorityService logCurvePriorityService)
         {
-            var createdPrioritizedCurves = await logCurvePriorityService.SetPrioritizedCurves(wellUid, wellboreUid, prioritizedCurves) ?? new List<string>();
+            var createdPrioritizedCurves = await logCurvePriorityService.SetPrioritizedUniversalCurves(prioritizedCurves) ?? new List<string>();
             return TypedResults.Ok(createdPrioritizedCurves);
         }
     }

Src/WitsmlExplorer.Api/Jobs/CreateObjectOnWellboreJob.cs

@@ -0,0 +1,33 @@
+using System.Text.Json.Serialization;
+
+using WitsmlExplorer.Api.Models;
+
+namespace WitsmlExplorer.Api.Jobs
+{
+    public record CreateObjectOnWellboreJob : Job
+    {
+        [JsonConverter(typeof(ObjectOnWellboreConverter))]
+        public ObjectOnWellbore Object { get; init; }
+        public EntityType ObjectType { get; init; }
+
+        public override string Description()
+        {
+            return $"To Create - Type: {ObjectType}, Uid: {Object.Uid}.";
+        }
+
+        public override string GetObjectName()
+        {
+            return Object.Name;
+        }
+
+        public override string GetWellboreName()
+        {
+            return Object.WellboreName;
+        }
+
+        public override string GetWellName()
+        {
+            return Object.WellName;
+        }
+    }
+}