TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-28 11:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix updating queue page

Browse Source
This commit is contained in:
eikek
2022-01-30 17:38:23 +01:00
parent 14a413e787
commit d67b063735
3 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/webapp/src/main/elm/Page/Queue/Data.elm
View File

@ -31,7 +31,6 @@ type alias Model =
, formState : FormState
, pollingInterval : Float
, init : Bool
, stopRefresh : Bool
, currentMillis : Int
, showLog : Maybe JobDetail
, deleteConfirm : Comp.YesNoDimmer.Model
@ -60,7 +59,6 @@ emptyModel =
, formState = InitialForm
, pollingInterval = 1200
, init = False
, stopRefresh = False
, currentMillis = 0
, showLog = Nothing
, deleteConfirm = Comp.YesNoDimmer.emptyModel
@ -72,7 +70,6 @@ emptyModel =
type Msg
= Init
| StateResp (Result Http.Error JobQueueState)
| StopRefresh
| NewTime Time.Posix
| ShowLog JobDetail
| QuitShowLog

18
modules/webapp/src/main/elm/Page/Queue/Update.elm
View File

@ -15,8 +15,8 @@ import Task
import Time
update : Flags -> Msg -> Model -> ( Model, Cmd Msg )
update flags msg model =
update : Flags -> Bool -> Msg -> Model -> ( Model, Cmd Msg )
update flags stopRefresh msg model =
case msg of
Init ->
let
@ -30,12 +30,15 @@ update flags msg model =
, getNewTime
]
in
( { model | init = True, stopRefresh = False }, start )
( { model | init = True }, start )
StateResp (Ok s) ->
let
stop =
model.pollingInterval <= 0 || stopRefresh
refresh =
if model.pollingInterval <= 0 || model.stopRefresh then
if stop then
Cmd.none
else
@ -44,14 +47,11 @@ update flags msg model =
, getNewTime
]
in
( { model | state = s, stopRefresh = False }, refresh )
( { model | state = s, init = False }, refresh )
StateResp (Err err) ->
( { model | formState = HttpError err }, Cmd.none )
StopRefresh ->
( { model | stopRefresh = True, init = False }, Cmd.none )
NewTime t ->
( { model | currentMillis = Time.posixToMillis t }, Cmd.none )
@ -66,7 +66,7 @@ update flags msg model =
newModel =
{ model | cancelJobRequest = Just job.id }
in
update flags (DimmerMsg job Comp.YesNoDimmer.Activate) newModel
update flags stopRefresh (DimmerMsg job Comp.YesNoDimmer.Activate) newModel
DimmerMsg job m ->
let