Fix load-more button state

eikek · Jun 3, 2022 · cfc9034 · cfc9034
1 parent b50f57f
commit cfc9034
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/modules/webapp/src/main/elm/Data/Items.elm b/modules/webapp/src/main/elm/Data/Items.elm
@@ -10,7 +10,9 @@ module Data.Items exposing
     , first
     , flatten
     , idSet
+    , isEmpty
     , length
+    , nonEmpty
     , replaceIn
     , unwrapGroups
     )
@@ -23,6 +25,16 @@ import Set exposing (Set)
 import Util.List
 
 
+isEmpty : ItemLightList -> Bool
+isEmpty list =
+    List.all (.items >> List.isEmpty) list.groups
+
+
+nonEmpty : ItemLightList -> Bool
+nonEmpty list =
+    not (isEmpty list)
+
+
 flatten : ItemLightList -> List ItemLight
 flatten list =
     List.concatMap .items list.groups

diff --git a/modules/webapp/src/main/elm/Page/Search/Update.elm b/modules/webapp/src/main/elm/Page/Search/Update.elm
@@ -209,7 +209,7 @@ update texts bookmarkId lastViewedItemId env msg model =
                     { model
                         | searchInProgress = False
                         , searchOffset = noff
-                        , moreAvailable = list.groups /= []
+                        , moreAvailable = Data.Items.nonEmpty list
                     }
             in
             makeResult env.selectedItems <|
@@ -233,7 +233,7 @@ update texts bookmarkId lastViewedItemId env msg model =
                         | searchInProgress = False
                         , moreInProgress = False
                         , searchOffset = noff
-                        , moreAvailable = list.groups /= []
+                        , moreAvailable = Data.Items.nonEmpty list
                     }
             in
             update texts bookmarkId lastViewedItemId env (ItemCardListMsg (Comp.ItemCardList.AddResults list)) m