Update recurrence before status (#25); version bump

Also updated API and app deps

.gitignore

@@ -252,6 +252,9 @@ paket-files/
 .idea/
 *.sln.iml
 
+# Ionide VSCode extension
+.ionide
+
 # Compiled files / application
 src/api/build
 src/api/MyPrayerJournal.Api/wwwroot/favicon.ico

docs/CNAME

@@ -0,0 +1 @@
+docs.prayerjournal.me

src/api/MyPrayerJournal.Api/Data.fs

@@ -1,15 +1,8 @@
 namespace MyPrayerJournal
 
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks.V2.ContextInsensitive
 open Microsoft.EntityFrameworkCore
-
+open Microsoft.FSharpLu
-/// Helpers for this file
-[<AutoOpen>]
-module private Helpers =
-  
-  /// Convert any item to an option (Option.ofObj does not work for non-nullable types)
-  let toOption<'T> (x : 'T) = match box x with null -> None | _ -> Some x
-
 
 /// Entities for use in the data model for myPrayerJournal
 [<AutoOpen>]
@@ -183,7 +176,6 @@ module Entities =
 
 
 open System.Linq
-open System.Threading.Tasks
 
 /// Data context
 type AppDbContext (opts : DbContextOptions<AppDbContext>) =
@@ -248,7 +240,7 @@ type AppDbContext (opts : DbContextOptions<AppDbContext>) =
   member this.TryRequestById reqId userId =
     task {
       let! req = this.Requests.AsNoTracking().FirstOrDefaultAsync(fun r -> r.requestId = reqId && r.userId = userId)
-      return toOption req
+      return Option.fromObject req
       }
 
   /// Retrieve notes for a request by its ID and user ID
@@ -263,7 +255,7 @@ type AppDbContext (opts : DbContextOptions<AppDbContext>) =
   member this.TryJournalById reqId userId =
     task {
       let! req = this.Journal.FirstOrDefaultAsync(fun r -> r.requestId = reqId && r.userId = userId)
-      return toOption req
+      return Option.fromObject req
       }
   
   /// Retrieve a request, including its history and notes, by its ID and user ID
@@ -276,7 +268,7 @@ type AppDbContext (opts : DbContextOptions<AppDbContext>) =
               .Include(fun r -> r.history)
               .Include(fun r -> r.notes)
               .FirstOrDefaultAsync(fun r -> r.requestId = requestId && r.userId = userId)
-          match toOption fullReq with
+          match Option.fromObject fullReq with
           | Some _ -> return Some { req with history = List.ofSeq fullReq.history; notes = List.ofSeq fullReq.notes }
           | None -> return None
       | None -> return None

src/api/MyPrayerJournal.Api/Handlers.fs

@@ -2,6 +2,7 @@
 [<RequireQualifiedAccess>]
 module MyPrayerJournal.Api.Handlers
 
+open FSharp.Control.Tasks.V2.ContextInsensitive
 open Giraffe
 open MyPrayerJournal
 open System

src/api/MyPrayerJournal.Api/MyPrayerJournal.Api.fsproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <Version>1.2.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,15 +13,18 @@
 
   <ItemGroup>
     <PackageReference Include="FSharp.EFCore.OptionConverter" Version="1.0.0" />
-    <PackageReference Include="Giraffe" Version="1.1.0" />
+    <PackageReference Include="Giraffe" Version="3.6.0" />
-    <PackageReference Include="Giraffe.TokenRouter" Version="0.1.0-beta-110" />
+    <PackageReference Include="Giraffe.TokenRouter" Version="1.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.FSharpLu" Version="0.10.29" />
+    <PackageReference Include="Microsoft.FSharpLu.Json" Version="0.10.29" />
     <PackageReference Include="NCuid.NetCore" Version="1.0.1" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.1.1" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.2.0" />
+    <PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="4.5.2" />
+    <PackageReference Update="FSharp.Core" Version="4.6.2" />
   </ItemGroup>
 
   <ItemGroup>

src/api/MyPrayerJournal.Api/Program.fs

@@ -4,11 +4,11 @@ open Microsoft.AspNetCore.Builder
 open Microsoft.AspNetCore.Hosting
 open System
 
-
 /// Configuration functions for the application
 module Configure =
   
   open Giraffe
+  open Giraffe.Serialization
   open Giraffe.TokenRouter
   open Microsoft.AspNetCore.Authentication.JwtBearer
   open Microsoft.AspNetCore.Server.Kestrel.Core
@@ -16,7 +16,9 @@ module Configure =
   open Microsoft.Extensions.Configuration
   open Microsoft.Extensions.DependencyInjection
   open Microsoft.Extensions.Logging
+  open Microsoft.FSharpLu.Json
   open MyPrayerJournal
+  open Newtonsoft.Json
 
   /// Set up the configuration for the app
   let configuration (ctx : WebHostBuilderContext) (cfg : IConfigurationBuilder) =
@@ -30,6 +32,15 @@ module Configure =
   let kestrel (ctx : WebHostBuilderContext) (opts : KestrelServerOptions) =
     (ctx.Configuration.GetSection >> opts.Configure >> ignore) "Kestrel"
 
+  /// Custom settings for the JSON serializer (uses compact representation for options and DUs)
+  let jsonSettings =
+    let x = NewtonsoftJsonSerializer.DefaultSettings
+    x.Converters.Add (CompactUnionJsonConverter (true))
+    x.NullValueHandling     <- NullValueHandling.Ignore
+    x.MissingMemberHandling <- MissingMemberHandling.Error
+    x.Formatting            <- Formatting.Indented
+    x
+
   /// Configure dependency injection
   let services (sc : IServiceCollection) =
     use sp  = sc.BuildServiceProvider()
@@ -48,6 +59,7 @@ module Configure =
           opts.Audience  <- jwtCfg.["Id"])
     |> ignore
     sc.AddDbContext<AppDbContext>(fun opts -> opts.UseNpgsql(cfg.GetConnectionString "mpj") |> ignore)
+      .AddSingleton<IJsonSerializer>(NewtonsoftJsonSerializer jsonSettings)
     |> ignore
   
   /// Routes for the available URLs within myPrayerJournal

src/app/package.json

@@ -1,19 +1,20 @@
 {
   "name": "my-prayer-journal",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "myPrayerJournal - Front End",
   "author": "Daniel J. Summers <daniel@bitbadger.solutions>",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
+    "build": "vue-cli-service build --modern",
     "lint": "vue-cli-service lint",
     "apistart": "cd ../api/MyPrayerJournal.Api && dotnet run",
-    "vue": "vue-cli-service build --modern && cd ../api/MyPrayerJournal.Api && dotnet run"
+    "vue": "vue-cli-service build --modern && cd ../api/MyPrayerJournal.Api && dotnet run",
+    "publish": "vue-cli-service build --modern && cd ../api/MyPrayerJournal.Api && dotnet publish -c Release"
   },
   "dependencies": {
     "auth0-js": "^9.7.3",
-    "axios": "^0.18.0",
+    "axios": "^0.19.0",
     "moment": "^2.18.1",
     "vue": "^2.5.15",
     "vue-progressbar": "^0.7.3",
@@ -25,7 +26,7 @@
     "@vue/cli-plugin-babel": "^3.0.0",
     "@vue/cli-plugin-eslint": "^3.0.0",
     "@vue/cli-service": "^3.0.0",
-    "@vue/eslint-config-standard": "^3.0.0",
+    "@vue/eslint-config-standard": "^4.0.0",
     "pug": "^2.0.1",
     "pug-plain-loader": "^1.0.0",
     "vue-template-compiler": "^2.5.17"

src/app/src/components/common/Navigation.vue

@@ -25,7 +25,7 @@ nav.mpj-top-nav.mpj-bg(role='menubar')
     href='#'
     role='menuitem'
     @click.stop='logOn()') Log On
-  a(href='https://bit-badger.github.io/myPrayerJournal/'
+  a(href='https://docs.prayerjournal.me'
     target='_blank'
     role='menuitem'
     @click.stop='') Docs

src/app/src/components/request/FullRequest.vue

@@ -15,7 +15,7 @@ article.mpj-main-content(role='main')
       tbody
         tr(v-for='item in log' :key='item.asOf')
           td {{ item.status }} on #[span.mpj-text-nowrap {{ formatDate(item.asOf) }}]
-          td(v-if='item.text').mpj-request-text {{ item.text.fields[0] }}
+          td(v-if='item.text').mpj-request-text {{ item.text }}
           td(v-else)  
   p(v-else) Loading request...
 </template>
@@ -52,11 +52,11 @@ export default {
     lastText () {
       return this.request.history
         .filter(hist => hist.text)
-        .sort(asOfDesc)[0].text.fields[0]
+        .sort(asOfDesc)[0].text
     },
     log () {
       const allHistory = (this.request.notes || [])
-        .map(note => ({ asOf: note.asOf, text: { case: 'Some', fields: [ note.notes ] }, status: 'Notes' }))
+        .map(note => ({ asOf: note.asOf, text: note.notes, status: 'Notes' }))
         .concat(this.request.history)
         .sort(asOfDesc)
       // Skip the first entry for answered requests; that info is already displayed

src/app/src/store/index.js

@@ -104,12 +104,12 @@ export default new Vuex.Store({
       progress.start()
       try {
         let oldReq = (state.journal.filter(req => req.requestId === requestId) || [])[0] || {}
-        if (status !== 'Updated' || oldReq.text !== updateText) {
+        if (status !== 'Answered' && (oldReq.recurType !== recurType || oldReq.recurCount !== recurCount)) {
-          await api.updateRequest(requestId, status, updateText)
-        }
-        if (status === 'Updated' && (oldReq.recurType !== recurType || oldReq.recurCount !== recurCount)) {
           await api.updateRecurrence(requestId, recurType, recurCount)
         }
+        if (status !== 'Updated' || oldReq.text !== updateText) {
+          await api.updateRequest(requestId, status, oldReq.text !== updateText ? updateText : '')
+        }
         const request = await api.getRequest(requestId)
         commit(mutations.REQUEST_UPDATED, request.data)
         progress.finish()