Skip to content

Commit

Permalink
Apply warning to advanced setting functions.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Freymaurer
Freymaurer committed Mar 8, 2021
1 parent d97399e commit 44a75d1
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 24 deletions.
5 changes: 4 additions & 1 deletion src/Client/CustomComponents/WarningModal.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ let warningModal (model:Model) dispatch =
Button.a [
Button.Color IsWarning
Button.Props [Style [Float FloatOptions.Right]]
Button.OnClick msg
Button.OnClick (fun e ->
UpdateWarningModal None |> dispatch
model.WarningModal.Value.NextMsg |> dispatch
)
][
str "Continue"
]
Expand Down
6 changes: 3 additions & 3 deletions src/Client/Views/SettingsDataStewardView.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ let createPointerJsonEle (model:Model) dispatch =
createPointerJsonButton model dispatch
]

Field.div [][
if model.SettingsDataStewardState.PointerJson.IsSome then
if model.SettingsDataStewardState.PointerJson.IsSome then
Field.div [][
textFieldEle model dispatch
]
]
]

let settingsDataStewardViewComponent (model:Model) dispatch =
Expand Down
79 changes: 59 additions & 20 deletions src/Client/Views/SettingsXmlView.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,10 @@ let textAreaEle (model:Model) dispatch =
let xmlEle = model.SettingsXmlState.NextRawXml |> Fable.SimpleXml.SimpleXml.parseElementNonStrict
xmlEle
|> OfficeInterop.HelperFunctions.xmlElementToXmlString
printfn "%A" rmvWhiteSpace
ExcelInteropMsg.UpdateSwateCustomXml rmvWhiteSpace |> ExcelInterop |> dispatch
let msg = ExcelInteropMsg.UpdateSwateCustomXml rmvWhiteSpace |> ExcelInterop
let modalBody = "Changes in this field could potentially invalidate your checklist and protocol xml. Please safe a copy before clicking 'Continue'."
let nM = {|ModalMessage = modalBody; NextMsg = msg|} |> Some
UpdateWarningModal nM |> dispatch
)
][
Fa.i [
Expand All @@ -147,25 +149,34 @@ let showRawCustomXmlEle (model:Model) dispatch =
MarginBottom "1rem"
]
][
Columns.columns [Columns.IsMobile][
Column.column [][
showRawCustomXmlButton model dispatch
Field.div [][
Help.help [Help.Modifiers [Modifier.TextAlignment (Screen.All,TextAlignment.Justified)]][
str "Here you can display all custom xml of your Swate table. This can help debug your Swate table and/or fix any problems occuring."
]
if model.SettingsXmlState.RawXml <> "" then
Column.column [Column.Width (Screen.All,Column.IsNarrow)][
Button.a [
Button.OnClick (fun e -> UpdateRawCustomXml "" |> SettingsXmlMsg |> dispatch)
Button.Color IsDanger
Button.Props [Title "Remove custom xml from the text area"]
][
Fa.i [Fa.Solid.Times][]
]
]
]

Field.div [][
Columns.columns [Columns.IsMobile][
Column.column [][
showRawCustomXmlButton model dispatch
]
if model.SettingsXmlState.RawXml <> "" then
Column.column [Column.Width (Screen.All,Column.IsNarrow)][
Button.a [
Button.OnClick (fun e -> UpdateRawCustomXml "" |> SettingsXmlMsg |> dispatch)
Button.Color IsDanger
Button.Props [Title "Remove custom xml from the text area"]
][
Fa.i [Fa.Solid.Times][]
]
]
]
]

if model.SettingsXmlState.RawXml <> "" then
textAreaEle model dispatch
Field.div [][
textAreaEle model dispatch
]
]


Expand Down Expand Up @@ -231,7 +242,10 @@ let removeTableValidationButton (model:Model) dispatch (tableValidation:Validati
Button.a [
Button.OnClick (fun e ->
let xmlType = XmlTypes.ValidationType tableValidation
RemoveCustomXmlRequest xmlType |> SettingsXmlMsg |> dispatch
let msg = RemoveCustomXmlRequest xmlType |> SettingsXmlMsg
let modalBody = "This function will remove the related checklist xml without chance of recovery. Please safe a copy before clicking 'Continue'."
let nM = {|ModalMessage = modalBody; NextMsg = msg|} |> Some
UpdateWarningModal nM |> dispatch
)
Button.Color IsDanger
][
Expand Down Expand Up @@ -372,6 +386,14 @@ let showValidationXmlEle (model:Model) dispatch =
MarginBottom "1rem"
]
][
Field.div [][
Help.help [Help.Modifiers [Modifier.TextAlignment (Screen.All,TextAlignment.Justified)]][
str "This block will display all checklist xml for this workbook. You can then remove single elements or assign
them to a new table-sheet combination. Should Swate find any information not related to an existing table-sheet
combination these will be marked in red."
]
]

Field.div [][
Columns.columns [Columns.IsMobile][
Column.column [][
Expand Down Expand Up @@ -444,7 +466,10 @@ let removeProtocolGroupButton (model:Model) dispatch (protGroup:GroupTypes.Proto
Button.a [
Button.OnClick (fun e ->
let xmlType = XmlTypes.GroupType protGroup
RemoveCustomXmlRequest xmlType |> SettingsXmlMsg |> dispatch
let msg = RemoveCustomXmlRequest xmlType |> SettingsXmlMsg
let modalBody = "This function will remove the related protocol xml without chance of recovery. Please safe a copy before clicking 'Continue'."
let nM = {|ModalMessage = modalBody; NextMsg = msg|} |> Some
UpdateWarningModal nM |> dispatch
)
Button.Color IsDanger
][
Expand Down Expand Up @@ -475,7 +500,10 @@ let protocolChildList (protocol:GroupTypes.Protocol) isActive model dispatch =
Button.Color IsDanger
Button.OnClick (fun e ->
let xml = XmlTypes.ProtocolType protocol
RemoveCustomXmlRequest xml |> SettingsXmlMsg |> dispatch
let msg = RemoveCustomXmlRequest xml |> SettingsXmlMsg
let modalBody = "This function will remove the related protocol xml without chance of recovery. Please safe a copy before clicking 'Continue'."
let nM = {|ModalMessage = modalBody; NextMsg = msg|} |> Some
UpdateWarningModal nM |> dispatch
)
][
str "Remove"
Expand Down Expand Up @@ -596,10 +624,11 @@ let displaySingleProtocolGroupEle model dispatch (protocolGroup:GroupTypes.Proto
UpdateActiveProtocol nextProtocol |> SettingsXmlMsg |> dispatch
)
Button.IsOutlined
Button.IsFullWidth
Button.Props [Style [BorderRadius "0"]]
][
Fa.i [
Fa.Props [Style [Transition "transform 0.25s"]]
Fa.Props [Style [Transition "transform 0.4s"]]
if isActiveProt then Fa.Rotate180
Fa.Solid.AngleDown
][]
Expand Down Expand Up @@ -639,6 +668,14 @@ let showProtocolGroupXmlEle (model:Model) dispatch =
MarginBottom "1rem"
]
][
Field.div [][
Help.help [Help.Modifiers [Modifier.TextAlignment (Screen.All,TextAlignment.Justified)]][
str "This block will display all protocol xml for this workbook. You can then remove single elements or assign
them to a new table-sheet combination. Should Swate find any information not related to an existing table-sheet
combination these will be marked in red."
]
]

Field.div [][
Columns.columns [Columns.IsMobile][
Column.column [][
Expand Down Expand Up @@ -667,6 +704,8 @@ let settingsXmlViewComponent (model:Model) dispatch =
] [
breadcrumbEle dispatch

Help.help [][str "The functions on this page allow more or less direct manipulation of the Xml used to save additional information about your Swate table. Please use them with care."]

Label.label [Label.Props [Style [Color model.SiteStyleState.ColorMode.Accent]]] [str "Display raw custom xml."]
showRawCustomXmlEle model dispatch

Expand Down

0 comments on commit 44a75d1

Please sign in to comment.