Merge fix

.github/pull_request_template.md

@@ -32,6 +32,7 @@ This pull request fixes
 * [ ] Frontend
 * [ ] API
 * [ ] WITSML
+* [ ] Desktop
 * [ ] Other (please describe)
 
 ## Checklist:

.github/workflows/ci.yml

@@ -16,11 +16,11 @@ jobs:
     name: Build and Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - name: Setup .NET 7
-        uses: actions/setup-dotnet@a351d9ea84bc76ec7508debf02a39d88f8b6c0c0 # v2.1.1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: Setup .NET 8
+        uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
       - name: Build
         run: dotnet build /warnaserror --configuration Release
       - name: Install dotnet format

.github/workflows/ci_desktop.yml

@@ -0,0 +1,33 @@
+name: Desktop Package and Test
+on:
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'Src/WitsmlExplorer.Api/**'
+      - 'Src/WitsmlExplorer.Frontend/**'
+      - 'Src/WitsmlExplorer.Desktop/**'
+
+permissions: {}
+
+jobs:
+  desktop:
+    name: Package and Test
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        with:
+          node-version: '20'
+      - name: Install dependencies
+        run: yarn --network-timeout 100000
+        working-directory: ./Src/WitsmlExplorer.Desktop
+      - name: Linting
+        run: yarn lint
+        working-directory: ./Src/WitsmlExplorer.Desktop
+      - name: Package
+        run: yarn electron:pack
+        working-directory: ./Src/WitsmlExplorer.Desktop
+      - name: Test
+        run: yarn test:pack
+        working-directory: ./Src/WitsmlExplorer.Desktop

.github/workflows/ci_frontend.yml

@@ -13,10 +13,10 @@ jobs:
     name: Build and Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
-          node-version: '16'
+          node-version: '20'
       - name: Install dependencies
         run: yarn
         working-directory: ./Src/WitsmlExplorer.Frontend

.github/workflows/dispatch_merge.yml

@@ -13,7 +13,7 @@ jobs:
     if: github.repository_owner == 'akerbp'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Create repository dispatch event
         run: |
           curl -L \

.github/workflows/dispatch_tag.yml

@@ -24,7 +24,7 @@ jobs:
     needs: fetchtag
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Create repository dispatch event
         run: |
           curl -L \
@@ -34,5 +34,3 @@ jobs:
             -H "X-GitHub-Api-Version: 2022-11-28" \
             https://api.github.com/repos/akerbp/witsml-explorer-cicd/dispatches \
             -d '{"event_type":"tagdispatch ${{ github.ref_name }}","client_payload":{"tag": "${{ github.ref_name }}", "version":"${{ needs.fetchtag.outputs.tag-version }}"}}'
-
-

.github/workflows/dispatch_tag.yml.orig

@@ -0,0 +1,41 @@
+name: Dispatch tag updates to CICD repo
+
+on:
+  push:
+    tags:
+      - 'akerbp-wex*'
+
+permissions: {}
+
+jobs:
+  fetchtag:
+    runs-on: ubuntu-latest
+    if: github.ref_type == 'tag'
+    steps:
+      - id: get
+        run: |
+          VERSION_ONLY=$(echo "${{ github.ref_name }}" | cut -d '@' -f2)
+          echo "tag-version=$VERSION_ONLY" >> $GITHUB_OUTPUT
+    outputs:
+      tag-version: ${{ steps.get.outputs.tag-version }}
+
+  notify:
+    if: github.repository_owner == 'akerbp'
+    needs: fetchtag
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: Create repository dispatch event
+        run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.DISPATCH_TOKEN }}"\
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/akerbp/witsml-explorer-cicd/dispatches \
+            -d '{"event_type":"tagdispatch ${{ github.ref_name }}","client_payload":{"tag": "${{ github.ref_name }}", "version":"${{ needs.fetchtag.outputs.tag-version }}"}}'
+<<<<<<< HEAD
+
+
+=======
+>>>>>>> upstream/main

.github/workflows/release_desktop.yml

@@ -0,0 +1,43 @@
+name: Release Desktop Edition
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag to release'
+        required: true
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    name: Release WEx Desktop Installer
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-latest]
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          ref: ${{ github.event.inputs.tag }}
+          fetch-depth: 0
+      - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        with:
+          node-version: '20'
+      - name: Install Dependencies
+        run: yarn --network-timeout 100000
+        working-directory: ./Src/WitsmlExplorer.Desktop
+      - name: Build Installer
+        run: yarn electron:dist
+        working-directory: ./Src/WitsmlExplorer.Desktop
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Release Installer
+        uses: softprops/action-gh-release@v1
+        with:
+          draft: false
+          tag_name: ${{ github.event.inputs.tag }}
+          files: |
+            ./Src/WitsmlExplorer.Desktop/dist/WExDesktopInstaller.Windows.x64*.exe
+            ./Src/WitsmlExplorer.Desktop/dist/latest.yml

.gitignore

@@ -31,6 +31,9 @@ Tests/Witsml.Tests/config.json
 config.json
 **/mysettings.*
 
+# Database files
+*.db
+
 # Common node modules locations
 /node_modules
 /wwwroot/node_modules
@@ -123,3 +126,6 @@ coverage*[.json, .xml, .info]
 /Tests/WitsmlExplorer.IntegrationTests/Properties/launchSettings.json
 
 .fake
+
+# TGZ files
+*.tgz

.prettierignore

@@ -6,11 +6,12 @@ Src/WitsmlExplorer.Console
 Src/WitsmlExplorer.Frontend/build
 Src/WitsmlExplorer.Frontend/obj
 Src/WitsmlExplorer.Frontend/bin
+Src/WitsmlExplorer.Frontend/dist
 
 .vscode/*
 
 *.md
 *.yml
 .prettierignore
 .github
-.eslintrc.json
+eslint.config.js

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: 

Directory.Packages.props

@@ -0,0 +1,43 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.38.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Identity.Web" Version="2.17.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageVersion Include="MongoDB.Driver" Version="2.24.0" />
+    <PackageVersion Include="Moq" Version="4.20.70" />
+    <PackageVersion Include="NetCore.AutoRegisterDi" Version="2.2.1" />
+    <PackageVersion Include="Serilog" Version="3.1.1" />
+    <PackageVersion Include="Serilog.AspNetCore" Version="8.0.1" />
+    <PackageVersion Include="Serilog.Expressions" Version="4.0.0" />
+    <PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageVersion Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="5.0.1" />
+    <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageVersion Include="Spectre.Console" Version="0.48.0" />
+    <PackageVersion Include="Spectre.Console.Cli" Version="0.48.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageVersion Include="System.Runtime.Caching" Version="8.0.1" />
+    <PackageVersion Include="System.ServiceModel.Http" Version="8.0.0" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
+    <PackageVersion Include="LiteDB" Version="5.0.19" />
+    <PackageVersion Include="xunit" Version="2.7.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+  </ItemGroup>
+</Project>

Docker/README.md

@@ -10,7 +10,7 @@ See [setting up a database in Azure](../Scripts/Azure)
 
 Build dockerfiles for frontend and backend (see [build_docker_images.sh](../build_docker_images.sh), [Dockerfile-api](../Dockerfile-api) and [Dockerfile-frontend](../Dockerfile-frontend)).
 
-### **Build api and backend images**
+### **Build api and frontend images**
 ```sh
 ❯ docker build -t witsmlexplorer-api:latest -f Dockerfile-api .
 Building witsmlexplorer-api...

Docker/Server/README.md

@@ -1,19 +1,41 @@
 # Deploy on server
 
+## Configure application
+
+Configure your application according to [this guide](../README.md#deploy-and-run-witsml-explorer)
+
+## OAUTH
+
+If you are planning on using OAUTH with Azure, see [OAUTH.md](../../Docs/OAUTH.md)
+
+## Configure docker-compose.yml
+
+You will find a [docker-compose-yml](./docker-compose.yml) that is similar to the one used for running docker-compose locally. The difference is that `web` and `api` containers do not expose their ports outside of docker, and that an nginx instance is running in front forwarding the requests.
+
+In `docker-compose.yml` ensure that the volumes that are mapped into the containers for nginx from the host OS have the correct host path.
+
+## Configure nginx
 
 Running on a server requires running an nginx in front of the api and the web containers. This is needed for configuring SSL.
 
-You will find a [docker-compose-yml](./docker-compose-yml) that is similar to the one used for running docker-compose locally. 
+The volume `/etc/nginx` requires both an [`nginx.conf`](nginx.conf) file, and a `certs` directory. Here you need to place the certificate and key files. Ensure that the naming corresponds to what you configure in the `nginx.conf` file.
+
+## Build docker images
 
-The difference is that `web` and `api` containers do not expose their ports outside of docker, and that an nginx instance is running in front forwarding the requests.
+Follow [Run locally with docker](../README.md#build-api-and-frontend-images) to build the docker images. You can either clone the application and build the images locally on the server, or create a workflow to build the images and then push them to a container registry. Make sure you use the same name in the building process and in docker-compose.yml.
 
-## docker-compose.yml and nginx.conf
-You might need to do some changes to make this run on a server.
-* In `docker-compose.yml` ensure that the volumes that are mapped into the containers for nginx from the host OS have the correct host path.
-* The volume `/etc/nginx` requires both an `nginx.conf` file which you can find next to the `docker-compose.yml` file, and also a `certs` directory. Here you need to place the certificate and key files. Ensure that the naming corresponds to what you configure in the `nginx.conf` file.
+## Start docker containers
 
 When the configuration is in place, run the following to pull fresh images and run them:
-* `docker-compose pull`
-* `docker-compose up`. Add `-d` if you want to run the application in the background
+* `docker-compose pull`.
+* `docker-compose up -d`. `-d` makes the application run in the background.
 * Go to `https://yourserver` to open the application
 * Use `docker-compose down` to stop the application
+
+## Update your application
+
+Before you update your application, make sure that no jobs are running.
+
+To update your application, build and pull your new containers, and re-run `docker-compose up -d`.
+
+Run `docker image prune --force --filter dangling=true` to remove dangling images.