From d1a9606c5ca642a6c737b17109c8a4f683800cb4 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel@bitbadger.solutions>
Date: Sat, 20 Jan 2024 17:58:24 -0500
Subject: [PATCH] Tweak admin theme changes

- Fix SQLite posts-by-tag query
- Fix "on disk" check for default theme
---
 src/MyWebLog.Data/SQLite/SQLitePostData.fs |  2 +-
 src/MyWebLog.Domain/ViewModels.fs          |  3 ++-
 src/MyWebLog.Tests/ViewModelsTests.fs      | 19 ++++++++++++++++---
 src/admin-theme/custom-feed-edit.liquid    |  8 ++++----
 src/admin-theme/settings.liquid            |  2 +-
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/MyWebLog.Data/SQLite/SQLitePostData.fs b/src/MyWebLog.Data/SQLite/SQLitePostData.fs
index e5ab713..d2d5f0d 100644
--- a/src/MyWebLog.Data/SQLite/SQLitePostData.fs
+++ b/src/MyWebLog.Data/SQLite/SQLitePostData.fs
@@ -145,7 +145,7 @@ type SQLitePostData(conn: SqliteConnection, log: ILogger) =
         let tagSql, tagParams = inJsonArray Table.Post (nameof Post.Empty.Tags) "tag" [ tag ]
         conn.customList
             $"{publishedPostByWebLog} AND {tagSql}
-               ORDER BY p.published_on DESC
+               ORDER BY {publishField} DESC
                LIMIT {postsPerPage + 1} OFFSET {(pageNbr - 1) * postsPerPage}"
             (webLogParam webLogId :: tagParams)
             fromData<Post>
diff --git a/src/MyWebLog.Domain/ViewModels.fs b/src/MyWebLog.Domain/ViewModels.fs
index b7620c9..f0036ee 100644
--- a/src/MyWebLog.Domain/ViewModels.fs
+++ b/src/MyWebLog.Domain/ViewModels.fs
@@ -205,12 +205,13 @@ type DisplayTheme = {
     
     /// Create a display theme from a theme
     static member FromTheme inUseFunc (theme: Theme) =
+        let fileName = if string theme.Id = "default" then "default-theme.zip" else $"./themes/{theme.Id}-theme.zip"
         { Id            = string theme.Id
           Name          = theme.Name
           Version       = theme.Version
           TemplateCount = List.length theme.Templates
           IsInUse       = inUseFunc theme.Id
-          IsOnDisk      = File.Exists $"{theme.Id}-theme.zip" }
+          IsOnDisk      = File.Exists fileName }
 
 
 /// Information about an uploaded file used for display
diff --git a/src/MyWebLog.Tests/ViewModelsTests.fs b/src/MyWebLog.Tests/ViewModelsTests.fs
index 44847e4..6bc7ecf 100644
--- a/src/MyWebLog.Tests/ViewModelsTests.fs
+++ b/src/MyWebLog.Tests/ViewModelsTests.fs
@@ -175,8 +175,9 @@ let displayThemeTests = testList "DisplayTheme.FromTheme" [
         Expect.isTrue model.IsInUse "IsInUse should have been set"
         Expect.isFalse model.IsOnDisk "IsOnDisk should not have been set"
     }
-    test "succeeds when the theme is not in use as is on disk" {
-        let file = File.Create "another-theme.zip"
+    test "succeeds when a non-default theme is not in use and is on disk" {
+        let dir  = Directory.CreateDirectory "themes"
+        let file = File.Create "./themes/another-theme.zip"
         try
             let model = DisplayTheme.FromTheme (fun _ -> false) { theme with Id = ThemeId "another" }
             Expect.isFalse model.IsInUse "IsInUse should not have been set"
@@ -184,7 +185,19 @@ let displayThemeTests = testList "DisplayTheme.FromTheme" [
         finally
            file.Close()
            file.Dispose()
-           File.Delete "another-theme.zip"
+           File.Delete "./themes/another-theme.zip"
+           dir.Delete()
+    }
+    test "succeeds when the default theme is on disk" {
+        let file = File.Create "./default-theme.zip"
+        try
+            Expect.isTrue
+                (DisplayTheme.FromTheme (fun _ -> false) { theme with Id = ThemeId "default" }).IsOnDisk
+                "IsOnDisk should have been set"
+        finally
+           file.Close()
+           file.Dispose()
+           File.Delete "./default-theme.zip"
     }
 ]
 
diff --git a/src/admin-theme/custom-feed-edit.liquid b/src/admin-theme/custom-feed-edit.liquid
index 507e8cf..20d4297 100644
--- a/src/admin-theme/custom-feed-edit.liquid
+++ b/src/admin-theme/custom-feed-edit.liquid
@@ -28,7 +28,7 @@
               <div class="col py-3 d-flex align-self-center justify-content-center">
                 <div class="form-check form-switch">
                   <input type=checkbox name=IsPodcast id=isPodcast class=form-check-input value=true
-                         {%- if model.is_podcast %} checked {% endif %}onclick="Admin.checkPodcast()">
+                         {%- if model.is_podcast %} checked{% endif %} onclick="Admin.checkPodcast()">
                   <label for=isPodcast class=form-check-label>This Is a Podcast Feed</label>
                 </div>
               </div>
@@ -42,7 +42,7 @@
               <div class="col-1 d-flex justify-content-end pb-3">
                 <div class="form-check form-check-inline me-0">
                   <input type=radio name=SourceType id=sourceTypeCat class=form-check-input value=category
-                         {%- unless typ == "tag" %} checked {% endunless -%}onclick="Admin.customFeedBy('category')">
+                         {%- unless typ == "tag" %} checked{% endunless %} onclick="Admin.customFeedBy('category')">
                   <label for=sourceTypeCat class="form-check-label d-none">Category</label>
                 </div>
               </div>
@@ -67,14 +67,14 @@
               <div class="col-1 d-flex justify-content-end pb-3">
                 <div class="form-check form-check-inline me-0">
                   <input type=radio name=SourceType id=sourceTypeTag class=form-check-input value=tag
-                         {%- if typ == "tag" %} checked {% endif %}onclick="Admin.customFeedBy('tag')">
+                         {%- if typ == "tag" %} checked{% endif %} onclick="Admin.customFeedBy('tag')">
                   <label for="sourceTypeTag" class="form-check-label d-none">Tag</label>
                 </div>
               </div>
               <div class="col-11 pb-3">
                 <div class=form-floating>
                   <input type=text name=SourceValue id=sourceValueTag class=form-control placeholder=Tag
-                         {%- unless typ == "tag" %} disabled {% endunless %}required
+                         {%- unless typ == "tag" %} disabled{% endunless %} required
                          {%- if typ == "tag" %} value="{{ model.source_value }}"{% endif %}>
                   <label for=sourceValueTag>Tag</label>
                 </div>
diff --git a/src/admin-theme/settings.liquid b/src/admin-theme/settings.liquid
index e9a03cc..ec70201 100644
--- a/src/admin-theme/settings.liquid
+++ b/src/admin-theme/settings.liquid
@@ -145,7 +145,7 @@
               </div>
               <div class="form-check form-switch pb-2">
                 <input type=checkbox name=IsTagEnabled id=tagEnabled class=form-check-input value=true
-                       {%- if rss_model.tag_enabled %} checked{% endif %}>
+                       {%- if rss_model.is_tag_enabled %} checked{% endif %}>
                 <label for=tagEnabled class=form-check-label>Posts by Tag</label>
               </div>
             </fieldset>