Fixes #22853: Agent schedule and policy mode apps are not initialized…

… anymore
Normation · Jun 6, 2023 · 79800a1 · 79800a1
1 parent 52e81d5
commit 79800a1
Show file tree

Hide file tree

Showing 15 changed files with 49 additions and 128 deletions.
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/agentpolicymode/elm.json b/webapp/sources/rudder/rudder-web/src/main/elm/agentpolicymode/elm.json
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/agentschedule/elm.json b/webapp/sources/rudder/rudder-web/src/main/elm/agentschedule/elm.json
diff --git a/...entpolicymode/sources/Agentpolicymode.elm → .../src/main/elm/sources/Agentpolicymode.elm b/...entpolicymode/sources/Agentpolicymode.elm → .../src/main/elm/sources/Agentpolicymode.elm
@@ -1,12 +1,13 @@
 port module Agentpolicymode exposing (..)
 
 import Browser
-import DataTypes exposing (..)
 import Http exposing (..)
 import Result
-import Init exposing (init)
-import View exposing (view)
-import ApiCalls exposing (saveChanges)
+
+import Agentpolicymode.DataTypes exposing (..)
+import Agentpolicymode.Init exposing (init)
+import Agentpolicymode.View exposing (view)
+import Agentpolicymode.ApiCalls exposing (saveChanges)
 
 -- PORTS / SUBSCRIPTIONS
 port errorNotification   : String -> Cmd msg

diff --git a/.../elm/agentpolicymode/sources/ApiCalls.elm → .../elm/sources/Agentpolicymode/ApiCalls.elm b/.../elm/agentpolicymode/sources/ApiCalls.elm → .../elm/sources/Agentpolicymode/ApiCalls.elm
@@ -1,17 +1,18 @@
-module ApiCalls exposing (..)
+module Agentpolicymode.ApiCalls exposing (..)
 
-import DataTypes exposing (..)
 import Http exposing (..)
-import JsonDecoder exposing (..)
-import JsonEncoder exposing (..)
 import Url.Builder exposing (QueryParameter)
 
+import Agentpolicymode.DataTypes exposing (..)
+import Agentpolicymode.JsonDecoder exposing (..)
+import Agentpolicymode.JsonEncoder exposing (..)
+
 
 --
 -- This files contains all API calls for the Directive compliance UI
 --
 
-getUrl: DataTypes.Model -> List String -> List QueryParameter -> String
+getUrl: Model -> List String -> List QueryParameter -> String
 getUrl m url p=
   Url.Builder.relative (m.contextPath :: "secure" :: "api"  :: url) p
 

diff --git a/...elm/agentpolicymode/sources/DataTypes.elm → ...elm/sources/Agentpolicymode/DataTypes.elm b/...elm/agentpolicymode/sources/DataTypes.elm → ...elm/sources/Agentpolicymode/DataTypes.elm
@@ -1,4 +1,4 @@
-module DataTypes exposing (..)
+module Agentpolicymode.DataTypes exposing (..)
 
 import Http exposing (Error)
 

diff --git a/...main/elm/agentpolicymode/sources/Init.elm → ...main/elm/sources/Agentpolicymode/Init.elm b/...main/elm/agentpolicymode/sources/Init.elm → ...main/elm/sources/Agentpolicymode/Init.elm
@@ -1,7 +1,7 @@
-module Init exposing (..)
+module Agentpolicymode.Init exposing (..)
 
-import ApiCalls exposing (..)
-import DataTypes exposing (..)
+import Agentpolicymode.ApiCalls exposing (..)
+import Agentpolicymode.DataTypes exposing (..)
 
 init : { contextPath : String, hasWriteRights : Bool, nodeId : String } -> ( Model, Cmd Msg )
 init flags =

diff --git a/...m/agentpolicymode/sources/JsonDecoder.elm → ...m/sources/Agentpolicymode/JsonDecoder.elm b/...m/agentpolicymode/sources/JsonDecoder.elm → ...m/sources/Agentpolicymode/JsonDecoder.elm
@@ -1,10 +1,11 @@
-module JsonDecoder exposing (..)
+module Agentpolicymode.JsonDecoder exposing (..)
 
-import DataTypes exposing (..)
 import Json.Decode exposing (..)
 import Json.Decode.Pipeline exposing (..)
 import Json.Decode.Field exposing (..)
 
+import Agentpolicymode.DataTypes exposing (..)
+
 
 toPolicyMode : String -> Decoder PolicyMode
 toPolicyMode str =

diff --git a/...m/agentpolicymode/sources/JsonEncoder.elm → ...m/sources/Agentpolicymode/JsonEncoder.elm b/...m/agentpolicymode/sources/JsonEncoder.elm → ...m/sources/Agentpolicymode/JsonEncoder.elm
@@ -1,8 +1,10 @@
-module  JsonEncoder exposing (..)
+module Agentpolicymode.JsonEncoder exposing (..)
 
-import DataTypes exposing (..)
 import Json.Encode exposing (..)
 
+import Agentpolicymode.DataTypes exposing (..)
+
+
 policyModeToString : PolicyMode -> String
 policyModeToString policyMode =
   case policyMode of

diff --git a/...main/elm/agentpolicymode/sources/View.elm → ...main/elm/sources/Agentpolicymode/View.elm b/...main/elm/agentpolicymode/sources/View.elm → ...main/elm/sources/Agentpolicymode/View.elm
@@ -1,10 +1,11 @@
-module View exposing (..)
+module Agentpolicymode.View exposing (..)
 
-import DataTypes exposing (..)
 import Html exposing (..)
 import Html.Attributes exposing (id, class, href, type_, attribute, disabled)
 import Html.Events exposing (onClick)
 
+import Agentpolicymode.DataTypes exposing (..)
+
 
 view : Model -> Html Msg
 view model =

diff --git a/...m/agentschedule/sources/Agentschedule.elm → ...eb/src/main/elm/sources/Agentschedule.elm b/...m/agentschedule/sources/Agentschedule.elm → ...eb/src/main/elm/sources/Agentschedule.elm
@@ -1,14 +1,16 @@
 port module Agentschedule exposing (..)
 
 import Browser
-import DataTypes exposing (..)
 import Http exposing (..)
 import Result
-import Init exposing (init)
-import View exposing (view)
-import JsonEncoder exposing (encodeSchedule)
 import Json.Decode exposing (Value)
-import ViewUtils exposing (hours, minutes)
+
+import Agentschedule.DataTypes exposing (..)
+import Agentschedule.Init exposing (init)
+import Agentschedule.JsonEncoder exposing (encodeSchedule)
+import Agentschedule.View exposing (view)
+import Agentschedule.ViewUtils exposing (hours, minutes)
+
 
 -- PORTS / SUBSCRIPTIONS
 port saveSchedule : Value  -> Cmd msg

diff --git a/...n/elm/agentschedule/sources/DataTypes.elm → ...n/elm/sources/Agentschedule/DataTypes.elm b/...n/elm/agentschedule/sources/DataTypes.elm → ...n/elm/sources/Agentschedule/DataTypes.elm
@@ -1,4 +1,4 @@
-module DataTypes exposing (..)
+module Agentschedule.DataTypes exposing (..)
 
 import Http exposing (Error)
 

diff --git a/...c/main/elm/agentschedule/sources/Init.elm → ...c/main/elm/sources/Agentschedule/Init.elm b/...c/main/elm/agentschedule/sources/Init.elm → ...c/main/elm/sources/Agentschedule/Init.elm
@@ -1,6 +1,7 @@
-module Init exposing (..)
+module Agentschedule.Init exposing (..)
+
+import Agentschedule.DataTypes exposing (..)
 
-import DataTypes exposing (..)
 
 init : { contextPath : String, hasWriteRights : Bool, schedule : Maybe Schedule, globalRun : Maybe Schedule } -> ( Model, Cmd Msg )
 init flags =

diff --git a/...elm/agentschedule/sources/JsonEncoder.elm → ...elm/sources/Agentschedule/JsonEncoder.elm b/...elm/agentschedule/sources/JsonEncoder.elm → ...elm/sources/Agentschedule/JsonEncoder.elm
@@ -1,8 +1,10 @@
-module  JsonEncoder exposing (..)
+module Agentschedule.JsonEncoder exposing (..)
 
-import DataTypes exposing (..)
 import Json.Encode exposing (..)
 
+import Agentschedule.DataTypes exposing (..)
+
+
 encodeSchedule : Schedule -> Value
 encodeSchedule schedule =
   let

diff --git a/...c/main/elm/agentschedule/sources/View.elm → ...c/main/elm/sources/Agentschedule/View.elm b/...c/main/elm/agentschedule/sources/View.elm → ...c/main/elm/sources/Agentschedule/View.elm
@@ -1,12 +1,14 @@
-module View exposing (..)
+module Agentschedule.View exposing (..)
 
-import DataTypes exposing (..)
 import Html exposing (..)
 import Html.Attributes exposing (id, class, href, type_, disabled, for, checked, selected, value)
 import Html.Events exposing (onClick, onInput)
 import Maybe.Extra exposing (isJust)
 import Dict
-import ViewUtils exposing (..)
+
+import Agentschedule.DataTypes exposing (..)
+import Agentschedule.ViewUtils exposing (..)
+
 
 view : Model -> Html Msg
 view model =

diff --git a/...n/elm/agentschedule/sources/ViewUtils.elm → ...n/elm/sources/Agentschedule/ViewUtils.elm b/...n/elm/agentschedule/sources/ViewUtils.elm → ...n/elm/sources/Agentschedule/ViewUtils.elm
@@ -1,12 +1,14 @@
-module ViewUtils exposing (..)
+module Agentschedule.ViewUtils exposing (..)
 
-import DataTypes exposing (..)
 import Html exposing (..)
 import Html.Attributes exposing (id, class, href, type_, attribute, disabled, for, checked, selected, value)
 import Html.Events exposing (onClick, onInput)
 import Maybe.Extra exposing (isJust)
 import Dict exposing (Dict)
 
+import Agentschedule.DataTypes exposing (..)
+
+
 intervals : Dict Int String
 intervals = Dict.fromList
   [ (5  , "5 minutes" )