Skip to content
/ engine-frontend Public

Commit fe9b896

Browse files
janslifkajanslifka
committed
Add links to guide
1 parent ab9e896 commit fe9b896

File tree

64 files changed

+825
-493
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+825
-493
lines changed

‎engine-wizard/elm/Wizard/Common/Components/Questionnaire.elm‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4283,20 +4283,19 @@ viewRemoveItemModal appState model =
42834283
|> List.map viewLink
42844284
|> wrapItemLinks
42854285

4286+
modalContent =
4287+
[ text (gettext "Are you sure you want to remove this item?" appState.locale)
4288+
, items
4289+
]
4290+
42864291
cfg =
4287-
{ modalTitle = gettext "Remove Item" appState.locale
4288-
, modalContent =
4289-
[ text (gettext "Are you sure you want to remove this item?" appState.locale)
4290-
, items
4291-
]
4292-
, visible = Maybe.isJust model.removeItem
4293-
, actionResult = Unset
4294-
, actionName = gettext "Remove" appState.locale
4295-
, actionMsg = RemoveItemConfirm
4296-
, cancelMsg = Just RemoveItemCancel
4297-
, dangerous = True
4298-
, dataCy = "remove-item"
4299-
}
4292+
Modal.confirmConfig (gettext "Remove Item" appState.locale)
4293+
|> Modal.confirmConfigContent modalContent
4294+
|> Modal.confirmConfigVisible (Maybe.isJust model.removeItem)
4295+
|> Modal.confirmConfigAction (gettext "Remove" appState.locale) RemoveItemConfirm
4296+
|> Modal.confirmConfigCancelMsg RemoveItemCancel
4297+
|> Modal.confirmConfigDangerous True
4298+
|> Modal.confirmConfigDataCy "remove-item"
43004299
in
43014300
Modal.confirm appState cfg
43024301

@@ -4317,19 +4316,18 @@ viewFileDeleteModal appState model =
43174316
Nothing ->
43184317
""
43194318

4319+
modalContent =
4320+
String.formatHtml (gettext "Are you sure you want to delete %s?" appState.locale)
4321+
[ strong [ class "text-break" ] [ text fileName ] ]
4322+
43204323
cfg =
4321-
{ modalTitle = gettext "Delete File" appState.locale
4322-
, modalContent =
4323-
String.formatHtml (gettext "Are you sure you want to delete %s?" appState.locale)
4324-
[ strong [ class "text-break" ] [ text fileName ] ]
4325-
, visible = Maybe.isJust model.deleteFile
4326-
, actionResult = ActionResult.map (always "") model.deletingFile
4327-
, actionName = gettext "Delete" appState.locale
4328-
, actionMsg = DeleteFileConfirm
4329-
, cancelMsg = Just DeleteFileCancel
4330-
, dangerous = True
4331-
, dataCy = "delete-file"
4332-
}
4324+
Modal.confirmConfig (gettext "Delete File" appState.locale)
4325+
|> Modal.confirmConfigContent modalContent
4326+
|> Modal.confirmConfigVisible (Maybe.isJust model.deleteFile)
4327+
|> Modal.confirmConfigAction (gettext "Delete" appState.locale) DeleteFileConfirm
4328+
|> Modal.confirmConfigCancelMsg DeleteFileCancel
4329+
|> Modal.confirmConfigDangerous True
4330+
|> Modal.confirmConfigDataCy "delete-file"
43334331
in
43344332
Modal.confirm appState cfg
43354333

‎engine-wizard/elm/Wizard/Common/Components/Questionnaire/DeleteVersionModal.elm‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,15 @@ view appState model =
122122

123123
Nothing ->
124124
[]
125+
126+
cfg =
127+
Modal.confirmConfig (gettext "Delete version" appState.locale)
128+
|> Modal.confirmConfigContent content
129+
|> Modal.confirmConfigVisible (Maybe.isJust model.mbQuestionnaireVersion)
130+
|> Modal.confirmConfigActionResult (ActionResult.map (always "") model.deleteResult)
131+
|> Modal.confirmConfigAction (gettext "Delete" appState.locale) Delete
132+
|> Modal.confirmConfigCancelMsg Close
133+
|> Modal.confirmConfigDangerous True
134+
|> Modal.confirmConfigDataCy "project-delete-version"
125135
in
126-
Modal.confirm appState
127-
{ modalTitle = gettext "Delete version" appState.locale
128-
, modalContent = content
129-
, visible = Maybe.isJust model.mbQuestionnaireVersion
130-
, actionResult = ActionResult.map (always "") model.deleteResult
131-
, actionName = gettext "Delete" appState.locale
132-
, actionMsg = Delete
133-
, cancelMsg = Just Close
134-
, dangerous = True
135-
, dataCy = "project-delete-version"
136-
}
136+
Modal.confirm appState cfg

‎engine-wizard/elm/Wizard/Common/Components/Questionnaire/FeedbackModal.elm‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,19 +143,16 @@ view appState model =
143143
_ ->
144144
( gettext "Send" appState.locale, FeedbackFormMsg Form.Submit, Just <| CloseFeedback )
145145

146-
modalConfig =
147-
{ modalTitle = gettext "Feedback" appState.locale
148-
, modalContent = modalContent
149-
, visible = visible
150-
, actionResult = ActionResult.map (\_ -> gettext "Your feedback has been sent." appState.locale) model.feedbackResult
151-
, actionName = actionName
152-
, actionMsg = actionMsg
153-
, cancelMsg = cancelMsg
154-
, dangerous = False
155-
, dataCy = "questionnaire-feedback"
156-
}
146+
cfg =
147+
Modal.confirmConfig (gettext "Feedback" appState.locale)
148+
|> Modal.confirmConfigContent modalContent
149+
|> Modal.confirmConfigVisible visible
150+
|> Modal.confirmConfigActionResult (ActionResult.map (\_ -> gettext "Your feedback has been sent." appState.locale) model.feedbackResult)
151+
|> Modal.confirmConfigAction actionName actionMsg
152+
|> Modal.confirmConfigMbCancelMsg cancelMsg
153+
|> Modal.confirmConfigDataCy "questionnaire-feedback"
157154
in
158-
Modal.confirm appState modalConfig
155+
Modal.confirm appState cfg
159156

160157

161158
feedbackModalContent : AppState -> Model -> List (Html Msg)

‎engine-wizard/elm/Wizard/Common/Components/Questionnaire/VersionModal.elm‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,14 @@ view appState model =
164164

165165
Nothing ->
166166
gettext "New version" appState.locale
167+
168+
cfg =
169+
Modal.confirmConfig modalTitle
170+
|> Modal.confirmConfigContent form
171+
|> Modal.confirmConfigVisible (Maybe.isJust model.mbEventUuid)
172+
|> Modal.confirmConfigActionResult (ActionResult.map (always "") model.versionResult)
173+
|> Modal.confirmConfigAction (gettext "Save" appState.locale) (FormMsg Form.Submit)
174+
|> Modal.confirmConfigCancelMsg Close
175+
|> Modal.confirmConfigDataCy "project-version"
167176
in
168-
Modal.confirm appState
169-
{ modalTitle = modalTitle
170-
, modalContent = form
171-
, visible = Maybe.isJust model.mbEventUuid
172-
, actionResult = ActionResult.map (always "") model.versionResult
173-
, actionName = gettext "Save" appState.locale
174-
, actionMsg = FormMsg Form.Submit
175-
, cancelMsg = Just Close
176-
, dangerous = False
177-
, dataCy = "project-version"
178-
}
177+
Modal.confirm appState cfg

‎engine-wizard/elm/Wizard/Common/Components/SessionModal.elm‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module Wizard.Common.Components.SessionModal exposing
33
, expiresSoonModal
44
)
55

6-
import ActionResult
76
import Gettext exposing (gettext)
87
import Html exposing (Html, text)
98
import Shared.Auth.Session as Session
@@ -24,24 +23,29 @@ expiresSoonModal appState =
2423
|> Routes.publicLogin
2524
|> Wizard.Auth.Msgs.LogoutTo
2625
|> Wizard.Msgs.AuthMsg
27-
in
28-
Modal.confirm appState
29-
{ modalTitle = gettext "Session Expires Soon" appState.locale
30-
, modalContent =
26+
27+
modalContent =
3128
[ text
3229
(String.format
3330
(gettext "Your session expires in less than %s minutes. Log in again to refresh it." appState.locale)
3431
[ String.fromInt Session.expirationWarningMins ]
3532
)
3633
]
37-
, visible = AppState.sessionExpiresSoon appState && not (AppState.sessionExpired appState) && not appState.sessionExpiresSoonModalHidden
38-
, actionResult = ActionResult.Unset
39-
, actionName = gettext "Log in again" appState.locale
40-
, actionMsg = logoutMsg
41-
, cancelMsg = Just Wizard.Msgs.HideSessionExpiresSoonModal
42-
, dangerous = False
43-
, dataCy = "session-modal_expires-soon"
44-
}
34+
35+
visible =
36+
AppState.sessionExpiresSoon appState
37+
&& not (AppState.sessionExpired appState)
38+
&& not appState.sessionExpiresSoonModalHidden
39+
40+
cfg =
41+
Modal.confirmConfig (gettext "Session Expires Soon" appState.locale)
42+
|> Modal.confirmConfigContent modalContent
43+
|> Modal.confirmConfigVisible visible
44+
|> Modal.confirmConfigAction (gettext "Log in again" appState.locale) logoutMsg
45+
|> Modal.confirmConfigCancelMsg Wizard.Msgs.HideSessionExpiresSoonModal
46+
|> Modal.confirmConfigDataCy "session-modal_expires-soon"
47+
in
48+
Modal.confirm appState cfg
4549

4650

4751
expiredModal : AppState -> Html Wizard.Msgs.Msg
@@ -52,17 +56,15 @@ expiredModal appState =
5256
|> Routes.publicLogin
5357
|> Wizard.Auth.Msgs.LogoutTo
5458
|> Wizard.Msgs.AuthMsg
59+
60+
modalContent =
61+
[ text (gettext "Your session has expired. You need to log in again." appState.locale) ]
62+
63+
cfg =
64+
Modal.confirmConfig (gettext "Session Expired" appState.locale)
65+
|> Modal.confirmConfigContent modalContent
66+
|> Modal.confirmConfigVisible (AppState.sessionExpired appState)
67+
|> Modal.confirmConfigAction (gettext "Log in again" appState.locale) logoutMsg
68+
|> Modal.confirmConfigDataCy "session-modal_expired"
5569
in
56-
Modal.confirm appState
57-
{ modalTitle = gettext "Session Expired" appState.locale
58-
, modalContent =
59-
[ text (gettext "Your session has expired. You need to log in again." appState.locale)
60-
]
61-
, visible = AppState.sessionExpired appState
62-
, actionResult = ActionResult.Unset
63-
, actionName = gettext "Log in again" appState.locale
64-
, actionMsg = logoutMsg
65-
, cancelMsg = Nothing
66-
, dangerous = False
67-
, dataCy = "session-modal_expired"
68-
}
70+
Modal.confirm appState cfg

0 commit comments

Comments
 (0)