Skip to content

Commit

Permalink
Work in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
@RaphaelGauthier
RaphaelGauthier committed Sep 7, 2021
1 parent 59d0cdc commit 4825652
Show file tree
Hide file tree
Showing 9 changed files with 308 additions and 158 deletions.
1 change: 1 addition & 0 deletions webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/DataTypes.elm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ type alias Model =
, rulesCompliance : List RuleCompliance
, directives : List Directive
, modal : Maybe ModalState
, hasWriteRights : Bool
}

type Msg
Expand Down
4 changes: 2 additions & 2 deletions webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/Init.elm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ subscriptions : Model -> Sub Msg
subscriptions model =
Sub.none

init : { contextPath : String } -> ( Model, Cmd Msg )
init : { contextPath : String, hasWriteRights : Bool } -> ( Model, Cmd Msg )
init flags =
let

initCategory = Category "" "" "" (SubCategories []) []
initModel = Model flags.contextPath Loading "" initCategory initCategory initCategory [] [] Nothing
initModel = Model flags.contextPath Loading "" initCategory initCategory initCategory [] [] Nothing flags.hasWriteRights

listInitActions =
[ getPolicyMode initModel
Expand Down
215 changes: 127 additions & 88 deletions webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/Rules.elm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,26 @@ update msg model =
_ -> (model, Cmd.none)

EditDirectives flag ->
case model.mode of
EditRule details ->
({model | mode = EditRule {details | editDirectives = flag, tab = Directives}}, Cmd.none)
CreateRule details ->
({model | mode = CreateRule {details | editDirectives = flag, tab = Directives}}, Cmd.none)
_ -> (model, Cmd.none)
if model.hasWriteRights then
case model.mode of
EditRule details ->
({model | mode = EditRule {details | editDirectives = flag, tab = Directives}}, Cmd.none)
CreateRule details ->
({model | mode = CreateRule {details | editDirectives = flag, tab = Directives}}, Cmd.none)
_ -> (model, Cmd.none)
else
(model, Cmd.none)

EditGroups flag ->
case model.mode of
EditRule details ->
({model | mode = EditRule {details | editGroups = flag, tab = Groups}}, Cmd.none)
CreateRule details ->
({model | mode = CreateRule {details | editGroups = flag, tab = Groups}}, Cmd.none)
_ -> (model, Cmd.none)
if model.hasWriteRights then
case model.mode of
EditRule details ->
({model | mode = EditRule {details | editGroups = flag, tab = Groups}}, Cmd.none)
CreateRule details ->
({model | mode = CreateRule {details | editGroups = flag, tab = Groups}}, Cmd.none)
_ -> (model, Cmd.none)
else
(model, Cmd.none)

GetRuleDetailsResult res ->
case res of
Expand All @@ -129,79 +135,100 @@ update msg model =
(model, Cmd.none)

UpdateCategory category ->
case model.mode of
EditCategory details ->
({model | mode = EditCategory {details | category = category}}, Cmd.none)
CreateCategory details ->
({model | mode = CreateCategory {details | category = category}}, Cmd.none)
_ -> (model, Cmd.none)
if model.hasWriteRights then
case model.mode of
EditCategory details ->
({model | mode = EditCategory {details | category = category}}, Cmd.none)
CreateCategory details ->
({model | mode = CreateCategory {details | category = category}}, Cmd.none)
_ -> (model, Cmd.none)
else
(model, Cmd.none)

SelectGroup groupId includeBool->
let
updateTargets : Rule -> Rule
updateTargets r =
let
(include, exclude) = case r.targets of
[Composition (Or i) (Or e)] -> (i,e)
targets -> (targets,[])
isIncluded = List.member groupId include
isExcluded = List.member groupId exclude
(newInclude, newExclude) = case (includeBool, isIncluded, isExcluded) of
if model.hasWriteRights then
let
updateTargets : Rule -> Rule
updateTargets r =
let
(include, exclude) = case r.targets of
[Composition (Or i) (Or e)] -> (i,e)
targets -> (targets,[])
isIncluded = List.member groupId include
isExcluded = List.member groupId exclude
(newInclude, newExclude) = case (includeBool, isIncluded, isExcluded) of
(True, True, _) -> (remove groupId include,exclude)
(True, _, True) -> (groupId :: include, remove groupId exclude)
(False, True, _) -> (remove groupId include, groupId :: exclude)
(False, _, True) -> (include, remove groupId exclude)
(True, False, False) -> ( groupId :: include, exclude)
(False, False, False) -> (include, groupId :: exclude)
in
{r | targets = [Composition (Or newInclude) (Or newExclude)]}
in
in
{r | targets = [Composition (Or newInclude) (Or newExclude)]}
in
case model.mode of
EditRule details ->
({model | mode = EditRule {details | rule = (updateTargets details.rule)}}, Cmd.none)
CreateRule details ->
({model | mode = CreateRule {details | rule = (updateTargets details.rule)}}, Cmd.none)
_ -> (model, Cmd.none)
else
(model, Cmd.none)

UpdateRule rule ->
if model.hasWriteRights then
case model.mode of
EditRule details ->
({model | mode = EditRule {details | rule = (updateTargets details.rule)}}, Cmd.none)
({model | mode = EditRule {details | rule = rule}}, Cmd.none)
CreateRule details ->
({model | mode = CreateRule {details | rule = (updateTargets details.rule)}}, Cmd.none)
({model | mode = CreateRule {details | rule = rule}}, Cmd.none)
_ -> (model, Cmd.none)

UpdateRule rule ->
case model.mode of
EditRule details ->
({model | mode = EditRule {details | rule = rule}}, Cmd.none)
CreateRule details ->
({model | mode = CreateRule {details | rule = rule}}, Cmd.none)
_ -> (model, Cmd.none)
else
(model, Cmd.none)

DisableRule ->
case model.mode of
EditRule details ->
let
rule = details.originRule
newRule = {rule | enabled = not rule.enabled}
in
(model, saveDisableAction newRule model)
_ -> (model, Cmd.none)
if model.hasWriteRights then
case model.mode of
EditRule details ->
let
rule = details.originRule
newRule = {rule | enabled = not rule.enabled}
in
(model, saveDisableAction newRule model)
_ -> (model, Cmd.none)
else
(model, Cmd.none)

NewRule id ->
let
rule = Rule id "" "rootRuleCategory" "" "" True False [] [] []
ruleDetails = EditRuleDetails rule rule Information False False (Tag "" "")
in
({model | mode = CreateRule ruleDetails}, Cmd.none)
if model.hasWriteRights then
let
rule = Rule id "" "rootRuleCategory" "" "" True False [] [] []
ruleDetails = EditRuleDetails rule rule Information False False (Tag "" "")
in
({model | mode = CreateRule ruleDetails}, Cmd.none)
else
(model, Cmd.none)

NewCategory id ->
let
category = Category id "" "" (SubCategories []) []
categoryDetails = EditCategoryDetails category category Information
in
({model | mode = CreateCategory categoryDetails}, Cmd.none)
if model.hasWriteRights then
let
category = Category id "" "" (SubCategories []) []
categoryDetails = EditCategoryDetails category category Information
in
({model | mode = CreateCategory categoryDetails}, Cmd.none)
else
(model, Cmd.none)

UpdateNewTag tag ->
case model.mode of
EditRule details ->
({model | mode = EditRule {details | newTag = tag}}, Cmd.none)
CreateRule details ->
({model | mode = CreateRule {details | newTag = tag}}, Cmd.none)
_ -> (model, Cmd.none)
if model.hasWriteRights then
case model.mode of
EditRule details ->
({model | mode = EditRule {details | newTag = tag}}, Cmd.none)
CreateRule details ->
({model | mode = CreateRule {details | newTag = tag}}, Cmd.none)
_ -> (model, Cmd.none)
else
(model, Cmd.none)

SaveRuleDetails (Ok ruleDetails) ->
case model.mode of
Expand Down Expand Up @@ -281,35 +308,47 @@ update msg model =
processApiError "Deleting category" err model

CloneRule rule rulelId ->
let
newModel = case model.mode of
EditRule _ ->
let
newRule = {rule | name = ("Clone of "++rule.name), id = rulelId}
newRuleDetails = EditRuleDetails newRule newRule Information False False (Tag "" "")
in
{ model | mode = CreateRule newRuleDetails }
_ -> model
in
(newModel, Cmd.none)
if model.hasWriteRights then
let
newModel = case model.mode of
EditRule _ ->
let
newRule = {rule | name = ("Clone of "++rule.name), id = rulelId}
newRuleDetails = EditRuleDetails newRule newRule Information False False (Tag "" "")
in
{ model | mode = CreateRule newRuleDetails }
_ -> model
in
(newModel, Cmd.none)
else
(model, Cmd.none)

OpenDeletionPopup rule ->
case model.mode of
EditRule _ ->
( { model | modal = Just (DeletionValidation rule)} , Cmd.none )
_ -> (model, Cmd.none)
if model.hasWriteRights then
case model.mode of
EditRule _ ->
( { model | modal = Just (DeletionValidation rule)} , Cmd.none )
_ -> (model, Cmd.none)
else
(model, Cmd.none)

OpenDeletionPopupCat category ->
case model.mode of
EditCategory _ ->
( { model | modal = Just (DeletionValidationCat category)} , Cmd.none )
_ -> (model, Cmd.none)
if model.hasWriteRights then
case model.mode of
EditCategory _ ->
( { model | modal = Just (DeletionValidationCat category)} , Cmd.none )
_ -> (model, Cmd.none)
else
(model, Cmd.none)

OpenDeactivationPopup rule ->
case model.mode of
EditRule _ ->
( { model | modal = Just (DeactivationValidation rule)} , Cmd.none )
_ -> (model, Cmd.none)
if model.hasWriteRights then
case model.mode of
EditRule _ ->
( { model | modal = Just (DeactivationValidation rule)} , Cmd.none )
_ -> (model, Cmd.none)
else
(model, Cmd.none)

ClosePopup callback ->
let
Expand Down
12 changes: 8 additions & 4 deletions webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/View.elm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,14 @@ view model =
[ h1[]
[ span[][text "Rules"]
]
, div [class "header-buttons"]
[ button [class "btn btn-default", type_ "button", onClick (GenerateId (\s -> NewCategory s ))][text "Add Category"]
, button [class "btn btn-success", type_ "button", onClick (GenerateId (\s -> NewRule (RuleId s) ))][text "Create"]
]
, ( if model.hasWriteRights == True then
div [class "header-buttons"]
[ button [class "btn btn-default", type_ "button", onClick (GenerateId (\s -> NewCategory s ))][text "Add Category"]
, button [class "btn btn-success", type_ "button", onClick (GenerateId (\s -> NewRule (RuleId s) ))][text "Create"]
]
else
text ""
)
]
, div [class "header-filter"]
[ div [class "input-group"]
Expand Down
Loading

0 comments on commit 4825652

Please sign in to comment.