Work in progress

webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ApiCalls.elm

@@ -9,7 +9,7 @@ import Time.ZonedDateTime exposing (ZonedDateTime)
 import Url
 import Url.Builder exposing (QueryParameter, int, string)
 
-import ChangeRequest exposing (changeRequestParameters, decodeGetChangeRequestSettings)
+import ChangeRequest exposing (changeRequestParameters, decodeGetChangeRequestSettings, decodePendingChangeRequests)
 
 --
 -- This files contains all API calls for the Rules UI
@@ -111,6 +111,21 @@ getCrSettings model =
   in
     req
 
+getPendingChangeRequests : Model -> RuleId -> Cmd Msg
+getPendingChangeRequests model ruleId =
+  let
+    req =
+      request
+        { method  = "GET"
+        , headers = []
+        , url     = getUrl model [ "changeRequests" ] [string "status" "open"] -- string "ruleId" ruleId
+        , body    = emptyBody
+        , expect  = expectJson GetPendingChangeRequests decodePendingChangeRequests
+        , timeout = Nothing
+        , tracker = Nothing
+        }
+  in
+    req
 
 getGroupsTree : Model -> Cmd Msg
 getGroupsTree model =

webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ChangeRequest.elm

@@ -7,6 +7,14 @@ import Url.Builder
 --
 -- Module to handle change request settings
 --
+type Status = Unknown | Cancelled | Open | PendingValidation | PendingDeployment | Deployed
+
+type alias ChangeRequest =
+  { id          : Int
+  , name        : String
+  , description : String
+  , status      : Status
+  }
 
 type alias ChangeRequestSettings =
   { enableChangeMessage    : Bool
@@ -16,6 +24,7 @@ type alias ChangeRequestSettings =
   , changeRequestName      : String
   , message                : String
   , displayMessagePrompt   : Bool
+  , pendingChangeRequests  : List ChangeRequest
   }
 
 decodeGetChangeRequestSettings : Decoder ChangeRequestSettings
@@ -32,6 +41,30 @@ decodeChangeRequestSettings =
     |> hardcoded ""
     |> hardcoded ""
     |> hardcoded False
+    |> hardcoded []
+
+decodePendingChangeRequests : Decoder (List ChangeRequest)
+decodePendingChangeRequests =
+  at [ "data" ] (list decodeChangeRequest)
+
+decodeChangeRequest : Decoder ChangeRequest
+decodeChangeRequest =
+  succeed ChangeRequest
+    |> required "id"          int
+    |> required "displayName" string
+    |> required "description" string
+    |> required "status"       ( string |> andThen (\s -> toStatus s) )
+
+toStatus : String -> Decoder Status
+toStatus str =
+  succeed ( case str of
+    "Deployed"           -> Deployed
+    "Pending deployment" -> PendingDeployment
+    "Cancelled"          -> Cancelled
+    "Pending validation" -> PendingValidation
+    "Open"               -> Open
+    _                    -> Unknown
+  )
 
 changeRequestParameters: Maybe ChangeRequestSettings -> List Url.Builder.QueryParameter
 changeRequestParameters changeRequestSettings =

webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/DataTypes.elm

@@ -4,7 +4,7 @@ import Dict exposing (Dict)
 import Http exposing (Error)
 import Time.ZonedDateTime exposing (ZonedDateTime)
 
-import ChangeRequest exposing (ChangeRequestSettings)
+import ChangeRequest exposing (ChangeRequestSettings, ChangeRequest)
 --
 -- All our data types
 --
@@ -320,6 +320,7 @@ type Msg
   | GetRuleDetailsResult     (Result Error Rule)
   | GetPolicyModeResult      (Result Error String)
   | GetChangeRequestSettings (Result Error ChangeRequestSettings)
+  | GetPendingChangeRequests (Result Error (List ChangeRequest))
   | GetCategoryDetailsResult (Result Error (Category Rule))
   | GetRulesComplianceResult (Result Error (List RuleComplianceGlobal))
   | GetRuleNodesDirectivesResult RuleId (Result Error RuleNodesDirectives)

webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/Rules.elm

@@ -104,6 +104,19 @@ update msg model =
         Err err ->
           processApiError "Getting change request settings" err model
 
+    GetPendingChangeRequests res ->
+      case res of
+        Ok cr ->
+          let
+            ui = model.ui
+            newUi = case ui.crSettings of
+              Just settings -> { ui | crSettings = Just { settings | pendingChangeRequests = cr } }
+              Nothing -> ui
+          in
+            ( { model | ui = newUi } , Cmd.none )
+        Err err ->
+          processApiError "Getting pending change requests" err model
+
     GetGroupsTreeResult res ->
       case res of
         Ok t ->
@@ -130,14 +143,17 @@ update msg model =
         Ok r ->
           let
             newModel = {model | mode = RuleForm (RuleDetails (Just r) r Information defaultRulesUI Nothing Nothing Nothing []) }
+            getPendingCR = case model.ui.crSettings of
+              Nothing -> Cmd.none
+              Just settings -> if settings.enableChangeRequest then (getPendingChangeRequests newModel r.id) else Cmd.none
             getChanges = case Dict.get r.id.value model.changes of
                            Nothing -> []
                            Just changes ->
                              case List.Extra.last changes of
                                Nothing -> []
                                Just lastChanges -> [ getRepairedReports newModel r.id lastChanges.start lastChanges.end ]
           in
-            (newModel, Cmd.batch (getRulesComplianceDetails r.id newModel :: getRuleNodesDirectives r.id newModel :: getChanges) )
+            (newModel, Cmd.batch (getRulesComplianceDetails r.id newModel :: getRuleNodesDirectives r.id newModel :: getPendingCR :: getChanges ) )
         Err err ->
           processApiError "Getting Rule details" err model
 

webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewTabContent.elm

@@ -68,7 +68,6 @@ buildTagsContainer rule editMode details =
 
 informationTab: Model -> RuleDetails  -> Html Msg
 informationTab model details =
-
   let
     isNewRule = Maybe.Extra.isNothing details.originRule
     rule       = details.rule