view loading when model isn't set

Author: michaelglass

component-catalog/src/Examples/SortableTable.elm

@@ -135,7 +135,7 @@ example =
                 ( columnsCode, columns ) =
                     List.unzip (columnsWithCode settings)
 
-                toExampleCode viewName finalArgs =
+                toExampleCode viewName =
                     { sectionName = viewName
                     , code =
                         [ moduleName ++ "." ++ viewName
@@ -185,7 +185,6 @@ example =
                             )
                             1
                         , Code.listMultiline columnsCode 1
-                        , finalArgs
                         ]
                             |> String.join ""
                     }
@@ -202,17 +201,13 @@ example =
                     , "type Msg = SortableTableWrapper (SortableTable.Msg ColumnId)"
                     ]
                 , renderExample = Code.unstyledView
-                , toExampleCode = \_ -> [ toExampleCode "view" (Code.list dataCode), toExampleCode "viewLoading" "" ]
+                , toExampleCode = \_ -> [ toExampleCode "view" ]
                 }
             , Heading.h2
                 [ Heading.plaintext "Customizable Example"
                 , Heading.css [ Css.marginTop Spacing.verticalSpacerPx ]
                 ]
-            , if settings.loading then
-                SortableTable.viewLoading attrs columns
-
-              else
-                SortableTable.view attrs columns
+            , SortableTable.view attrs columns
             ]
     }
 

src/Nri/Ui/SortableTable/V6.elm

@@ -5,7 +5,7 @@ module Nri.Ui.SortableTable.V6 exposing
     , encode, decoder
     , Column, custom, string, placeholderColumn
     , Sorter, invariantSort, simpleSort, combineSorters
-    , view, viewLoading
+    , view
     , Attribute, model, msgWrapper, stickyHeader, stickyHeaderCustom, StickyConfig, tableAttribute
     )
 
@@ -37,7 +37,7 @@ module Nri.Ui.SortableTable.V6 exposing
 
 ## Rendering
 
-@docs view, viewLoading
+@docs view
 
 
 ### Attributes
@@ -437,28 +437,17 @@ view attributes columns =
         tableColumns =
             List.map (buildTableColumn config.msgWrapper config.model) columns
     in
-    Table.view
-        (buildTableAttributes config)
-        tableColumns
-        (config.model
-            |> Maybe.map (\model_ -> currentEntries model_)
-            |> Maybe.withDefault []
-        )
-
+    case config.model of
+        Just model_ ->
+            Table.view
+                (buildTableAttributes config)
+                tableColumns
+                (currentEntries model_)
 
-{-| -}
-viewLoading : List (Attribute id entry msg) -> List (Column id entry msg) -> Html msg
-viewLoading attributes columns =
-    let
-        config =
-            List.foldl (\(Attribute fn) soFar -> fn soFar) defaultConfig attributes
-
-        tableColumns =
-            List.map (buildTableColumn config.msgWrapper config.model) columns
-    in
-    Table.viewLoading
-        (buildTableAttributes config)
-        tableColumns
+        Nothing ->
+            Table.viewLoading
+                (buildTableAttributes config)
+                tableColumns
 
 
 buildTableAttributes : Config id entry msg -> List Table.Attribute