git.iko.soy/typeable/octopod
on master help sign in
fix front
commit75ce5a8107f015ba46d36814030333aa4a6cf2bd authorAnisimov Nikita <anisimoff.nikita@gmail.com> dateMon 6 Jul 2020, 16:05 (6 years ago) parent23e7299
3 files changed+7−7
compare with master
unifiedsplit
dm-frontend/src/Frontend/API.hs+1−1 dm-frontend/src/Page/Deployments.hs+4−4 dm-frontend/src/Page/Utils.hs+2−2
dm-frontend/src/Frontend/API.hs+1−1
@@ -80,7 +80,7 @@ statusEndpoint
8080 :: MonadWidget t m
8181 => Dynamic t (Either Text DeploymentName)
8282 -> Event t ()
83− -> m (Event t (ReqResult () DeploymentStatus))
83+ -> m (Event t (ReqResult () CurrentDeploymentStatus))
8484cleanupEndpoint
8585 :: MonadWidget t m
8686 => Dynamic t (Either Text DeploymentName)
dm-frontend/src/Page/Deployments.hs+4−4
@@ -146,7 +146,7 @@ activeDeploymentsWidget
146146 => Event t ClickedElement
147147 -> Dynamic t
148148 (Map DeploymentName
149− (DeploymentFullInfo, Dynamic t (Maybe DeploymentStatus)))
149+ (DeploymentFullInfo, Dynamic t (Maybe CurrentDeploymentStatus)))
150150 -> m ()
151151activeDeploymentsWidget clickedEv dsDyn =
152152 divClass "data__primary" $
@@ -164,7 +164,7 @@ activeDeploymentWidget
164164 , SetRoute t (R Routes) m )
165165 => Event t ClickedElement
166166 -> DeploymentName
167− -> Dynamic t (DeploymentFullInfo, Dynamic t (Maybe DeploymentStatus))
167+ -> Dynamic t (DeploymentFullInfo, Dynamic t (Maybe CurrentDeploymentStatus))
168168 -> m ()
169169activeDeploymentWidget clickedEv dname dDyn' = do
170170 dDyn <- holdUniqDyn $ fst <$> dDyn'
@@ -216,7 +216,7 @@ archivedDeploymentsWidget
216216 => Event t ClickedElement
217217 -> Dynamic t
218218 (Map DeploymentName
219− (DeploymentFullInfo, Dynamic t (Maybe DeploymentStatus)))
219+ (DeploymentFullInfo, Dynamic t (Maybe CurrentDeploymentStatus)))
220220 -> m ()
221221archivedDeploymentsWidget clickedEv dsDyn = do
222222 showDyn <- toggleButton
@@ -252,7 +252,7 @@ tableHeader = do
252252archivedDeploymentWidget
253253 :: MonadWidget t m
254254 => Event t ClickedElement
255− -> Dynamic t (DeploymentFullInfo, Dynamic t (Maybe DeploymentStatus))
255+ -> Dynamic t (DeploymentFullInfo, Dynamic t (Maybe CurrentDeploymentStatus))
256256 -> m ()
257257archivedDeploymentWidget clickedEv dDyn' = do
258258 dDyn <- holdUniqDyn $ fst <$> dDyn'
dm-frontend/src/Page/Utils.hs+2−2
@@ -171,12 +171,12 @@ formatPosixToDateTime = pack
171171 . formatTime defaultTimeLocale (iso8601DateFormat (Just "%H:%M:%S"))
172172 . intToUTCTime
173173
174−statusWidget :: MonadWidget t m => Dynamic t (Maybe DeploymentStatus) -> m ()
174+statusWidget :: MonadWidget t m => Dynamic t (Maybe CurrentDeploymentStatus) -> m ()
175175statusWidget stDyn = do
176176 stDyn' <- holdUniqDyn stDyn
177177 dyn_ $ stDyn' <&> \case
178178 Nothing -> divClass "loading loading--status-alike" $ text "Loading"
179− Just st -> case status st of
179+ Just (CurrentDeploymentStatus st) -> case st of
180180 CT.Ok -> divClass "status status--success" $ text "Success"
181181 CT.Error -> divClass "status status--failure" $ text "Failure"
182182