From: Adam Dullage <redacted>
Date: Tue, 17 Sep 2024 07:21:32 +0000 (+0100)
Subject: Remove quick access order config option
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=1f9787290dcf5c5ace1678d7f15832b2c77b62d4;p=flatnotes.git

Remove quick access order config option
---

diff --git a/client/views/Home.vue b/client/views/Home.vue
index 810ccb9..04d3796 100644
--- a/client/views/Home.vue
+++ b/client/views/Home.vue
@@ -64,7 +64,10 @@ function init() {
   getNotes(
     globalStore.config.quickAccessTerm,
     globalStore.config.quickAccessSort,
-    globalStore.config.quickAccessOrder,
+    // Order by ascending if sorting by title, descending otherwise.
+    globalStore.config.quickAccessSort === "title"
+      ? "asc"
+      : "desc",
     // Limit is increased by 1 to check if there are more notes than the limit.
     globalStore.config.quickAccessLimit + 1,
   )
diff --git a/server/global_config.py b/server/global_config.py
index df696c2..897a09a 100644
--- a/server/global_config.py
+++ b/server/global_config.py
@@ -13,7 +13,6 @@ class GlobalConfig:
         self.quick_access_title: str = self._quick_access_title()
         self.quick_access_term: str = self._quick_access_term()
         self.quick_access_sort: str = self._quick_access_sort()
-        self.quick_access_order: str = self._quick_access_order()
         self.quick_access_limit: int = self._quick_access_limit()
         self.path_prefix: str = self._load_path_prefix()
 
@@ -87,19 +86,6 @@ class GlobalConfig:
             sys.exit(1)
         return value
 
-    def _quick_access_order(self):
-        key = "FLATNOTES_QUICK_ACCESS_ORDER"
-        value = get_env(key, mandatory=False, default="desc")
-        valid_values = ["asc", "desc"]
-        if value not in valid_values:
-            logger.error(
-                f"Invalid value '{value}' for {key}. "
-                + "Must be one of: "
-                + ", ".join(valid_values)
-            )
-            sys.exit(1)
-        return value
-
     def _quick_access_limit(self):
         key = "FLATNOTES_QUICK_ACCESS_LIMIT"
         return get_env(key, mandatory=False, default=5, cast_int=True)
@@ -129,5 +115,4 @@ class GlobalConfigResponseModel(CustomBaseModel):
     quick_access_title: str
     quick_access_term: str
     quick_access_sort: str
-    quick_access_order: str
     quick_access_limit: int
diff --git a/server/main.py b/server/main.py
index 4ec52ff..1cc0701 100644
--- a/server/main.py
+++ b/server/main.py
@@ -182,7 +182,6 @@ def get_config():
         quick_access_title=global_config.quick_access_title,
         quick_access_term=global_config.quick_access_term,
         quick_access_sort=global_config.quick_access_sort,
-        quick_access_order=global_config.quick_access_order,
         quick_access_limit=global_config.quick_access_limit,
     )