diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/elm.json b/webapp/sources/rudder/rudder-web/src/main/elm/accounts/elm.json deleted file mode 100644 index 0c00170cf62..00000000000 --- a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/elm.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "application", - "source-directories": [ - "sources" - ], - "elm-version": "0.19.1", - "dependencies": { - "direct": { - "NoRedInk/elm-json-decode-pipeline": "1.0.1", - "TSFoster/elm-uuid": "4.2.0", - "elm/browser": "1.0.2", - "elm/core": "1.0.5", - "elm/html": "1.0.0", - "elm/http": "2.0.0", - "elm/json": "1.1.3", - "elm/random": "1.0.0", - "elm/time": "1.0.0", - "elm/url": "1.0.0", - "elm-community/dict-extra": "2.4.0", - "elm-community/list-extra": "8.7.0", - "justinmimbs/date": "4.0.1", - "justinmimbs/time-extra": "1.1.1", - "jzxhuang/http-extras": "2.1.0", - "mcordova47/elm-natural-ordering": "1.0.5", - "mercurymedia/elm-datetime-picker": "5.0.1", - "webbhuset/elm-json-decode": "1.1.0" - }, - "indirect": { - "TSFoster/elm-bytes-extra": "1.3.0", - "TSFoster/elm-md5": "2.0.1", - "TSFoster/elm-sha1": "2.1.1", - "danfishgold/base64-bytes": "1.1.0", - "elm/bytes": "1.0.8", - "elm/file": "1.0.5", - "elm/parser": "1.1.0", - "elm/regex": "1.0.0", - "elm/svg": "1.0.1", - "elm/virtual-dom": "1.0.3", - "elm-community/html-extra": "3.4.0", - "kuon/elm-string-normalize": "1.0.5", - "rtfeldman/elm-hex": "1.0.0" - } - }, - "test-dependencies": { - "direct": {}, - "indirect": {} - } -} diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/elm.json b/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/elm.json deleted file mode 100644 index 43718f1f6e2..00000000000 --- a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/elm.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "type": "application", - "source-directories": [ - "sources" - ], - "elm-version": "0.19.1", - "dependencies": { - "direct": { - "NoRedInk/elm-json-decode-pipeline": "1.0.0", - "TSFoster/elm-tuple-extra": "2.0.0", - "TSFoster/elm-uuid": "4.1.0", - "elm/browser": "1.0.2", - "elm/core": "1.0.5", - "elm/file": "1.0.5", - "elm/html": "1.0.0", - "elm/http": "2.0.0", - "elm/json": "1.1.3", - "elm/random": "1.0.0", - "elm/url": "1.0.0", - "elm-community/dict-extra": "2.4.0", - "elm-community/list-extra": "8.5.1", - "elm-community/maybe-extra": "5.2.1", - "isaacseymour/deprecated-time": "1.0.0", - "mcordova47/elm-natural-ordering": "1.0.5", - "myrho/elm-round": "1.0.4", - "toastal/either": "3.6.3", - "webbhuset/elm-json-decode": "1.1.0" - }, - "indirect": { - "TSFoster/elm-bytes-extra": "1.3.0", - "TSFoster/elm-md5": "2.0.1", - "TSFoster/elm-sha1": "2.1.1", - "danfishgold/base64-bytes": "1.1.0", - "elm/bytes": "1.0.8", - "elm/parser": "1.1.0", - "elm/regex": "1.0.0", - "elm/time": "1.0.0", - "elm/virtual-dom": "1.0.3", - "kuon/elm-string-normalize": "1.0.2", - "rtfeldman/elm-hex": "1.0.0" - } - }, - "test-dependencies": { - "direct": {}, - "indirect": {} - } -} diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/elm.json b/webapp/sources/rudder/rudder-web/src/main/elm/elm.json similarity index 67% rename from webapp/sources/rudder/rudder-web/src/main/elm/hooks/elm.json rename to webapp/sources/rudder/rudder-web/src/main/elm/elm.json index 4a91b0e9a4c..ff10a8583cb 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/elm.json +++ b/webapp/sources/rudder/rudder-web/src/main/elm/elm.json @@ -7,23 +7,41 @@ "dependencies": { "direct": { "NoRedInk/elm-json-decode-pipeline": "1.0.1", + "TSFoster/elm-tuple-extra": "2.0.0", "TSFoster/elm-uuid": "4.2.0", + "ThinkAlexandria/elm-pretty-print-json": "1.0.1", + "arsduo/elm-dom-drag-drop": "1.0.0", + "ccapndave/elm-flat-map": "1.2.0", "elm/browser": "1.0.2", "elm/core": "1.0.5", + "elm/file": "1.0.5", "elm/html": "1.0.0", "elm/http": "2.0.0", "elm/json": "1.1.3", + "elm/parser": "1.1.0", "elm/random": "1.0.0", + "elm/regex": "1.0.0", "elm/time": "1.0.0", "elm/url": "1.0.0", + "elm/virtual-dom": "1.0.3", "elm-community/dict-extra": "2.4.0", + "elm-community/html-extra": "3.4.0", + "elm-community/json-extra": "4.3.0", "elm-community/list-extra": "8.7.0", + "elm-community/maybe-extra": "5.3.0", "elm-community/string-extra": "4.0.1", + "isaacseymour/deprecated-time": "1.0.0", "justinmimbs/date": "4.0.1", "justinmimbs/time-extra": "1.1.1", "jzxhuang/http-extras": "2.1.0", "mcordova47/elm-natural-ordering": "1.0.5", "mercurymedia/elm-datetime-picker": "5.0.1", + "myrho/elm-round": "1.0.4", + "pablen/toasty": "1.2.0", + "pablohirafuji/elm-markdown": "2.0.5", + "rtfeldman/elm-iso8601-date-strings": "1.1.4", + "toastal/either": "3.6.3", + "visotype/elm-dom": "1.1.3", "webbhuset/elm-json-decode": "1.1.0" }, "indirect": { @@ -32,14 +50,11 @@ "TSFoster/elm-sha1": "2.1.1", "danfishgold/base64-bytes": "1.1.0", "elm/bytes": "1.0.8", - "elm/file": "1.0.5", - "elm/parser": "1.1.0", - "elm/regex": "1.0.0", "elm/svg": "1.0.1", - "elm/virtual-dom": "1.0.3", - "elm-community/html-extra": "3.4.0", + "elm-community/basics-extra": "4.1.0", "kuon/elm-string-normalize": "1.0.5", - "rtfeldman/elm-hex": "1.0.0" + "rtfeldman/elm-hex": "1.0.0", + "the-sett/elm-pretty-printer": "2.2.3" } }, "test-dependencies": { diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/elm.json b/webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/elm.json deleted file mode 100755 index a6c0e1d976a..00000000000 --- a/webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/elm.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "application", - "source-directories": [ - "sources" - ], - "elm-version": "0.19.1", - "dependencies": { - "direct": { - "NoRedInk/elm-json-decode-pipeline": "1.0.1", - "ccapndave/elm-flat-map": "1.2.0", - "elm/browser": "1.0.2", - "elm/core": "1.0.5", - "elm/html": "1.0.0", - "elm/http": "2.0.0", - "elm/json": "1.1.3", - "elm-community/list-extra": "8.7.0", - "pablen/toasty": "1.2.0" - }, - "indirect": { - "elm/bytes": "1.0.8", - "elm/file": "1.0.5", - "elm/random": "1.0.0", - "elm/regex": "1.0.0", - "elm/time": "1.0.0", - "elm/url": "1.0.0", - "elm/virtual-dom": "1.0.3" - } - }, - "test-dependencies": { - "direct": {}, - "indirect": {} - } -} diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/notifications/elm.json b/webapp/sources/rudder/rudder-web/src/main/elm/notifications/elm.json deleted file mode 100755 index a6c0e1d976a..00000000000 --- a/webapp/sources/rudder/rudder-web/src/main/elm/notifications/elm.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "application", - "source-directories": [ - "sources" - ], - "elm-version": "0.19.1", - "dependencies": { - "direct": { - "NoRedInk/elm-json-decode-pipeline": "1.0.1", - "ccapndave/elm-flat-map": "1.2.0", - "elm/browser": "1.0.2", - "elm/core": "1.0.5", - "elm/html": "1.0.0", - "elm/http": "2.0.0", - "elm/json": "1.1.3", - "elm-community/list-extra": "8.7.0", - "pablen/toasty": "1.2.0" - }, - "indirect": { - "elm/bytes": "1.0.8", - "elm/file": "1.0.5", - "elm/random": "1.0.0", - "elm/regex": "1.0.0", - "elm/time": "1.0.0", - "elm/url": "1.0.0", - "elm/virtual-dom": "1.0.3" - } - }, - "test-dependencies": { - "direct": {}, - "indirect": {} - } -} diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/elm.json b/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/elm.json deleted file mode 100644 index f3f010f197a..00000000000 --- a/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/elm.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "application", - "source-directories": [ - "sources" - ], - "elm-version": "0.19.1", - "dependencies": { - "direct": { - "NoRedInk/elm-json-decode-pipeline": "1.0.1", - "elm/browser": "1.0.2", - "elm/core": "1.0.5", - "elm/html": "1.0.0", - "elm/http": "2.0.0", - "elm/json": "1.1.3", - "elm/time": "1.0.0", - "elm-community/html-extra": "3.4.0", - "elm-community/json-extra": "4.3.0", - "elm-community/list-extra": "8.7.0" - }, - "indirect": { - "elm/bytes": "1.0.8", - "elm/file": "1.0.5", - "elm/parser": "1.1.0", - "elm/url": "1.0.0", - "elm/virtual-dom": "1.0.3", - "rtfeldman/elm-iso8601-date-strings": "1.1.4" - } - }, - "test-dependencies": { - "direct": {}, - "indirect": {} - } -} diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/rules/elm.json b/webapp/sources/rudder/rudder-web/src/main/elm/rules/elm.json deleted file mode 100644 index 9338796ecdd..00000000000 --- a/webapp/sources/rudder/rudder-web/src/main/elm/rules/elm.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "type": "application", - "source-directories": [ - "sources" - ], - "elm-version": "0.19.1", - "dependencies": { - "direct": { - "NoRedInk/elm-json-decode-pipeline": "1.0.1", - "TSFoster/elm-tuple-extra": "2.0.0", - "TSFoster/elm-uuid": "4.2.0", - "elm/browser": "1.0.2", - "elm/core": "1.0.5", - "elm/html": "1.0.0", - "elm/http": "2.0.0", - "elm/json": "1.1.3", - "elm/random": "1.0.0", - "elm/url": "1.0.0", - "elm-community/dict-extra": "2.4.0", - "elm-community/list-extra": "8.7.0", - "elm-community/maybe-extra": "5.3.0", - "isaacseymour/deprecated-time": "1.0.0", - "mcordova47/elm-natural-ordering": "1.0.5", - "myrho/elm-round": "1.0.4", - "toastal/either": "3.6.3", - "webbhuset/elm-json-decode": "1.1.0" - }, - "indirect": { - "TSFoster/elm-bytes-extra": "1.3.0", - "TSFoster/elm-md5": "2.0.1", - "TSFoster/elm-sha1": "2.1.1", - "danfishgold/base64-bytes": "1.1.0", - "elm/bytes": "1.0.8", - "elm/file": "1.0.5", - "elm/parser": "1.1.0", - "elm/regex": "1.0.0", - "elm/time": "1.0.0", - "elm/virtual-dom": "1.0.3", - "kuon/elm-string-normalize": "1.0.5", - "rtfeldman/elm-hex": "1.0.0" - } - }, - "test-dependencies": { - "direct": {}, - "indirect": {} - } -} diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/Accounts.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts.elm similarity index 94% rename from webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/Accounts.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts.elm index cc68e28f2d7..9083dc643f9 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/Accounts.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts.elm @@ -3,26 +3,26 @@ module Accounts exposing (..) import Browser import Dict import Dict.Extra -import DataTypes exposing (..) import Http exposing (..) import Http.Detailed as Detailed -import Init exposing (..) -import View exposing (view) import Result -import ApiCalls exposing (..) -import ViewUtils exposing (..) import List.Extra import Random import UUID -import JsonEncoder exposing (encodeTokenAcl) import Json.Encode exposing (..) -import JsonDecoder exposing (decodeErrorDetails) - import SingleDatePicker exposing (Settings, TimePickerVisibility(..), defaultSettings, defaultTimePickerSettings) import Task import Time exposing (Month(..), Posix, Zone) import Time.Extra as Time exposing (Interval(..), add) -import DatePickerUtils exposing (..) + +import Accounts.ApiCalls exposing (..) +import Accounts.DataTypes exposing (..) +import Accounts.DatePickerUtils exposing (..) +import Accounts.Init exposing (..) +import Accounts.JsonEncoder exposing (encodeTokenAcl) +import Accounts.JsonDecoder exposing (decodeErrorDetails) +import Accounts.View exposing (view) +import Accounts.ViewUtils exposing (..) main = Browser.element { init = init diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/ApiCalls.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ApiCalls.elm similarity index 90% rename from webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/ApiCalls.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ApiCalls.elm index 0bef0691285..8af80078096 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/ApiCalls.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ApiCalls.elm @@ -1,19 +1,19 @@ -module ApiCalls exposing (..) +module Accounts.ApiCalls exposing (..) -import DataTypes exposing (..) import Http exposing (..) -import JsonDecoder exposing (..) -import JsonEncoder exposing (..) import Url.Builder exposing (QueryParameter) import Http.Detailed as Detailed +import Accounts.DataTypes exposing (..) +import Accounts.JsonDecoder exposing (..) +import Accounts.JsonEncoder exposing (..) -- -- This files contains all API calls for the Rules UI -- Summary: -- GET /apiaccounts: get the api accounts list -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" :: url) p diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/DataTypes.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/DataTypes.elm similarity index 98% rename from webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/DataTypes.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/DataTypes.elm index 9f960dc3a70..6e979f715f9 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/DataTypes.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/DataTypes.elm @@ -1,9 +1,8 @@ -module DataTypes exposing (..) +module Accounts.DataTypes exposing (..) import Http exposing (Error) import Http.Detailed import Json.Decode as D exposing (..) - import SingleDatePicker exposing (Settings, TimePickerVisibility(..), defaultSettings, defaultTimePickerSettings, DatePicker) import Time exposing (Posix, Zone) diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/DatePickerUtils.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/DatePickerUtils.elm similarity index 98% rename from webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/DatePickerUtils.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/DatePickerUtils.elm index 1371d342578..3f372d4f942 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/DatePickerUtils.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/DatePickerUtils.elm @@ -1,6 +1,4 @@ -module DatePickerUtils exposing (..) - -import DataTypes exposing (..) +module Accounts.DatePickerUtils exposing (..) import SingleDatePicker exposing (Settings, TimePickerVisibility(..), defaultSettings, defaultTimePickerSettings) import Task @@ -8,6 +6,10 @@ import Time exposing (Month(..), Posix, Zone) import Time.Extra as Time exposing (Interval(..), Parts, partsToPosix) import List.Extra exposing (getAt) import Date exposing (fromIsoString) + +import Accounts.DataTypes exposing (..) + + isDateBeforeToday : Posix -> Posix -> Bool isDateBeforeToday today datetime = Time.posixToMillis today > Time.posixToMillis datetime diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/Init.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/Init.elm similarity index 88% rename from webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/Init.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/Init.elm index 7cdc54e11dc..46c5ecccaeb 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/Init.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/Init.elm @@ -1,17 +1,17 @@ -port module Init exposing (..) - -import ApiCalls exposing (..) -import DataTypes exposing (..) +port module Accounts.Init exposing (..) import Http exposing (Error) import SingleDatePicker exposing (Settings, TimePickerVisibility(..), defaultSettings) import Task import Time exposing (Month(..), Posix, Zone) import Time.Extra as Time exposing (Interval(..)) -import DatePickerUtils exposing (..) import Json.Decode exposing (..) import Json.Decode.Pipeline as D exposing (..) -import JsonDecoder exposing (decodeAcl) + +import Accounts.ApiCalls exposing (..) +import Accounts.DataTypes exposing (..) +import Accounts.DatePickerUtils exposing (..) +import Accounts.JsonDecoder exposing (decodeAcl) -- PORTS / SUBSCRIPTIONS diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/JsonDecoder.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/JsonDecoder.elm similarity index 93% rename from webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/JsonDecoder.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/JsonDecoder.elm index 6fd89c99719..247d3b76e95 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/JsonDecoder.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/JsonDecoder.elm @@ -1,6 +1,5 @@ -module JsonDecoder exposing (..) +module Accounts.JsonDecoder exposing (..) -import DataTypes exposing (..) import Dict exposing (Dict) import Json.Decode exposing (..) import Json.Decode.Pipeline exposing (..) @@ -8,7 +7,10 @@ import Json.Decode.Field exposing (..) import String exposing (join, split) import List exposing (drop, head) import Tuple -import DatePickerUtils exposing (stringToPosix) + +import Accounts.DataTypes exposing (..) +import Accounts.DatePickerUtils exposing (stringToPosix) + -- GENERAL decodeGetAccounts datePickerInfo= diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/JsonEncoder.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/JsonEncoder.elm similarity index 91% rename from webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/JsonEncoder.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/JsonEncoder.elm index bd5346edcab..a220af44716 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/JsonEncoder.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/JsonEncoder.elm @@ -1,9 +1,11 @@ -module JsonEncoder exposing (..) +module Accounts.JsonEncoder exposing (..) -import DataTypes exposing (..) import Json.Encode exposing (..) import Date -import DatePickerUtils exposing (posixToString) + +import Accounts.DataTypes exposing (..) +import Accounts.DatePickerUtils exposing (posixToString) + encodeAccount : DatePickerInfo -> Account -> Value encodeAccount datePickerInfo account = diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/View.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/View.elm similarity index 94% rename from webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/View.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/View.elm index 344e72d1bb3..3352c21566c 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/View.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/View.elm @@ -1,14 +1,15 @@ -module View exposing (..) +module Accounts.View exposing (..) -import DataTypes exposing (..) import Html exposing (..) import Html.Attributes exposing (class, type_, placeholder, value, colspan, rowspan, style, selected, id, disabled) import Html.Events exposing (onClick, onInput) import List import String -import ApiCalls exposing (..) -import ViewUtils exposing (..) -import ViewModals exposing (..) + +import Accounts.ApiCalls exposing (..) +import Accounts.DataTypes exposing (..) +import Accounts.ViewModals exposing (..) +import Accounts.ViewUtils exposing (..) view : Model -> Html Msg diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/ViewModals.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewModals.elm similarity index 97% rename from webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/ViewModals.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewModals.elm index 283538c5294..c09380215d3 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/ViewModals.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewModals.elm @@ -1,16 +1,17 @@ -module ViewModals exposing (..) +module Accounts.ViewModals exposing (..) -import DataTypes exposing (..) import Html exposing (..) import Html.Attributes exposing (id, class, type_, for, attribute, name, value, checked, style, placeholder, disabled, selected) import Html.Events exposing (onClick, onInput, custom, onCheck) -import ApiCalls exposing (..) - import SingleDatePicker exposing (Settings, TimePickerVisibility(..), defaultSettings, defaultTimePickerSettings) import Task import Time exposing (Month(..), Posix, Zone) import Time.Extra as Time exposing (Interval(..), add) -import DatePickerUtils exposing (..) + +import Accounts.ApiCalls exposing (..) +import Accounts.DataTypes exposing (..) +import Accounts.DatePickerUtils exposing (..) + displayModals : Model -> Html Msg displayModals model = diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/ViewUtils.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewUtils.elm similarity index 97% rename from webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/ViewUtils.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewUtils.elm index 8f26a584ddf..6536bf6cf5f 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/accounts/sources/ViewUtils.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewUtils.elm @@ -1,14 +1,17 @@ -module ViewUtils exposing (..) +module Accounts.ViewUtils exposing (..) -import DataTypes exposing (..) import Html exposing (..) import Html.Attributes exposing (..) import Html.Events exposing (onClick, onInput, custom, onCheck) import List import Json.Decode as Decode import NaturalOrdering as N exposing (compare) -import ApiCalls exposing (..) -import DatePickerUtils exposing (posixToString, checkIfExpired) + +import Accounts.ApiCalls exposing (..) +import Accounts.DataTypes exposing (..) +import Accounts.DatePickerUtils exposing (posixToString, checkIfExpired) + + -- -- DATATABLE -- diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/ApiCalls.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/ApiCalls.elm similarity index 87% rename from webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/ApiCalls.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/ApiCalls.elm index d874a074a45..6d628247cea 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/ApiCalls.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/ApiCalls.elm @@ -1,16 +1,17 @@ -module ApiCalls exposing (..) +module DirectiveCompliance.ApiCalls exposing (..) -import DataTypes exposing (..) import Http exposing (..) -import JsonDecoder exposing (..) import Url.Builder exposing (QueryParameter) +import DirectiveCompliance.DataTypes exposing (..) +import DirectiveCompliance.JsonDecoder 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/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/ComplianceUtils.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/ComplianceUtils.elm similarity index 98% rename from webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/ComplianceUtils.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/ComplianceUtils.elm index c303b9d433d..446cd9a5159 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/ComplianceUtils.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/ComplianceUtils.elm @@ -1,6 +1,5 @@ -module ComplianceUtils exposing (..) +module DirectiveCompliance.ComplianceUtils exposing (..) -import DataTypes exposing (..) import Dict import Dict.Extra import Html exposing (Html, button, div, i, span, text, h1, h4, ul, li, input, a, p, form, label, textarea, select, option, table, thead, tbody, tr, th, td, small) @@ -10,7 +9,10 @@ import List.Extra import List import String exposing (fromFloat) import Tuple exposing (first, second) -import ApiCalls exposing (..) + +import DirectiveCompliance.ApiCalls exposing (..) +import DirectiveCompliance.DataTypes exposing (..) + getValueCompliance : Maybe Float -> Float getValueCompliance f = diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/DataTypes.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/DataTypes.elm similarity index 98% rename from webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/DataTypes.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/DataTypes.elm index 3e3396467cc..b84f854fa6c 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/DataTypes.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/DataTypes.elm @@ -1,4 +1,4 @@ -module DataTypes exposing (..) +module DirectiveCompliance.DataTypes exposing (..) import Dict exposing (Dict) import Http exposing (Error) diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/Init.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/Init.elm similarity index 75% rename from webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/Init.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/Init.elm index a2e8367cad5..68911225df7 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/Init.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/Init.elm @@ -1,9 +1,11 @@ -module Init exposing (..) +module DirectiveCompliance.Init exposing (..) -import ApiCalls exposing (..) -import DataTypes exposing (..) import Dict exposing (Dict) +import DirectiveCompliance.ApiCalls exposing (..) +import DirectiveCompliance.DataTypes exposing (..) + + init : { directiveId : String, contextPath : String } -> ( Model, Cmd Msg ) init flags = let diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/JsonDecoder.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/JsonDecoder.elm similarity index 97% rename from webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/JsonDecoder.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/JsonDecoder.elm index 910df43613c..19563496f3e 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/JsonDecoder.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/JsonDecoder.elm @@ -1,11 +1,12 @@ -module JsonDecoder exposing (..) +module DirectiveCompliance.JsonDecoder exposing (..) -import DataTypes exposing (..) import Dict exposing (Dict) import Json.Decode exposing (..) import Json.Decode.Pipeline exposing (..) import Json.Decode.Field exposing (..) +import DirectiveCompliance.DataTypes exposing (..) + decodeGetPolicyMode : Decoder String decodeGetPolicyMode = diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/View.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/View.elm similarity index 75% rename from webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/View.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/View.elm index b2c6d8c3f36..f379af8f066 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/View.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/View.elm @@ -1,15 +1,16 @@ -module View exposing (..) +module DirectiveCompliance.View exposing (..) -import DataTypes exposing (..) import Html exposing (..) import Html.Attributes exposing (..) import Html.Events exposing (onClick) import List -import ViewUtils exposing (..) -import ViewRulesCompliance exposing (..) -import ViewNodesCompliance exposing (..) import Html.Lazy +import DirectiveCompliance.DataTypes exposing (..) +import DirectiveCompliance.ViewUtils exposing (..) +import DirectiveCompliance.ViewRulesCompliance exposing (..) +import DirectiveCompliance.ViewNodesCompliance exposing (..) + view : Model -> Html Msg view model = diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/ViewNodesCompliance.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/ViewNodesCompliance.elm similarity index 91% rename from webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/ViewNodesCompliance.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/ViewNodesCompliance.elm index 2a0f6a0f74a..47fee3006cf 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/ViewNodesCompliance.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/ViewNodesCompliance.elm @@ -1,6 +1,5 @@ -module ViewNodesCompliance exposing (..) +module DirectiveCompliance.ViewNodesCompliance exposing (..) -import DataTypes exposing (..) import Html exposing (..) import Html.Attributes exposing (..) import Html.Events exposing (onClick, onInput) @@ -9,8 +8,11 @@ import List.Extra import String import Tuple3 import Dict -import ApiCalls exposing (..) -import ViewUtils exposing (..) + +import DirectiveCompliance.ApiCalls exposing (..) +import DirectiveCompliance.DataTypes exposing (..) +import DirectiveCompliance.ViewUtils exposing (..) + displayNodesComplianceTable : Model -> Html Msg displayNodesComplianceTable model = diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/ViewRulesCompliance.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/ViewRulesCompliance.elm similarity index 92% rename from webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/ViewRulesCompliance.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/ViewRulesCompliance.elm index 0386cc91217..02ae82bcbff 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/ViewRulesCompliance.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/ViewRulesCompliance.elm @@ -1,6 +1,5 @@ -module ViewRulesCompliance exposing (..) +module DirectiveCompliance.ViewRulesCompliance exposing (..) -import DataTypes exposing (..) import Html exposing (..) import Html.Attributes exposing (..) import Html.Events exposing (onClick, onInput) @@ -9,8 +8,11 @@ import List.Extra import String import Tuple3 import Dict -import ApiCalls exposing (..) -import ViewUtils exposing (..) + +import DirectiveCompliance.ApiCalls exposing (..) +import DirectiveCompliance.DataTypes exposing (..) +import DirectiveCompliance.ViewUtils exposing (..) + displayRulesComplianceTable : Model -> Html Msg displayRulesComplianceTable model = diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/ViewUtils.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/ViewUtils.elm similarity index 98% rename from webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/ViewUtils.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/ViewUtils.elm index 23b62f2c681..b89a3a2b486 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/ViewUtils.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/DirectiveCompliance/ViewUtils.elm @@ -1,6 +1,5 @@ -module ViewUtils exposing (..) +module DirectiveCompliance.ViewUtils exposing (..) -import DataTypes exposing (..) import Dict exposing (Dict) import Either exposing (Either(..)) import Html exposing (..) @@ -10,11 +9,14 @@ import List.Extra import List import Maybe.Extra import String exposing (fromFloat) -import ApiCalls exposing (..) -import ComplianceUtils exposing (..) import Json.Decode as Decode import Tuple3 +import DirectiveCompliance.ApiCalls exposing (..) +import DirectiveCompliance.ComplianceUtils exposing (..) +import DirectiveCompliance.DataTypes exposing (..) + + onCustomClick : msg -> Html.Attribute msg onCustomClick msg = custom "click" diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/Directivecompliance.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Directivecompliance.elm similarity index 95% rename from webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/Directivecompliance.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Directivecompliance.elm index 1e53c6fd28f..d1d04658f8a 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/directivecompliance/sources/Directivecompliance.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Directivecompliance.elm @@ -4,17 +4,19 @@ import Browser import Browser.Navigation as Nav import Dict import Dict.Extra -import DataTypes exposing (..) -import Init exposing (init) -import ApiCalls exposing (..) import Http exposing (..) import Result import String exposing (replace) -import View exposing (view) import File import File.Download import File.Select +import DirectiveCompliance.ApiCalls exposing (..) +import DirectiveCompliance.DataTypes exposing (..) +import DirectiveCompliance.Init exposing (init) +import DirectiveCompliance.View exposing (view) + + -- PORTS / SUBSCRIPTIONS port errorNotification : String -> Cmd msg port initTooltips : String -> Cmd msg diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/Editor.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor.elm similarity index 98% rename from webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/Editor.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor.elm index aa485f43f83..a24039adc3d 100755 --- a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/Editor.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor.elm @@ -1,8 +1,6 @@ port module Editor exposing (..) -import ApiCalls exposing (..) import Browser -import DataTypes exposing (..) import Dict exposing ( Dict ) import Dict.Extra import Dom.DragDrop as DragDrop @@ -13,20 +11,24 @@ import File.Select import Http.Detailed as Detailed import Json.Decode exposing ( Value ) import Json.Encode -import JsonEncoder exposing (encodeDraft, encodeExportTechnique) -import JsonDecoder exposing (decodeDraft, decodeErrorDetails, decodeTechnique) import List.Extra import Maybe.Extra -import MethodConditions exposing (..) import Random import Task import Time import UUID -import ViewTechnique exposing ( view, checkTechniqueName, checkTechniqueId ) -import ViewMethod exposing ( accumulateErrorConstraint ) -import ViewTechniqueList exposing (allMethodCalls) -import MethodElemUtils exposing (..) -import AgentValueParser exposing (..) + +import Editor.ApiCalls exposing (..) +import Editor.AgentValueParser exposing (..) +import Editor.DataTypes exposing (..) +import Editor.JsonEncoder exposing (encodeDraft, encodeExportTechnique) +import Editor.JsonDecoder exposing (decodeDraft, decodeErrorDetails, decodeTechnique) +import Editor.MethodConditions exposing (..) +import Editor.MethodElemUtils exposing (..) +import Editor.ViewMethod exposing ( accumulateErrorConstraint ) +import Editor.ViewTechnique exposing ( view, checkTechniqueName, checkTechniqueId ) +import Editor.ViewTechniqueList exposing (allMethodCalls) + -- -- Port for interacting with external JS diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/AgentValueParser.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/AgentValueParser.elm similarity index 97% rename from webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/AgentValueParser.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/AgentValueParser.elm index 0a7c8b8d123..38ded9c18da 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/AgentValueParser.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/AgentValueParser.elm @@ -1,10 +1,12 @@ -module AgentValueParser exposing (..) +module Editor.AgentValueParser exposing (..) import Parser exposing (..) -import DataTypes exposing (..) import Regex import Set +import Editor.DataTypes exposing (..) + + displayValue : List AgentValue -> String displayValue value = String.join "" (List.map displayValueHelper value) diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ApiCalls.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ApiCalls.elm similarity index 96% rename from webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ApiCalls.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ApiCalls.elm index 34224fda10c..7e292e4a2b1 100755 --- a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ApiCalls.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ApiCalls.elm @@ -1,14 +1,15 @@ -module ApiCalls exposing (..) +module Editor.ApiCalls exposing (..) -import DataTypes exposing (..) import Dict import Http exposing (..) import Http.Detailed as Detailed -import JsonDecoder exposing (..) -import JsonEncoder exposing (..) import Json.Decode import Maybe.Extra +import Editor.DataTypes exposing (..) +import Editor.JsonDecoder exposing (..) +import Editor.JsonEncoder exposing (..) + -- -- This files contains all API calls for the technique editor diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/DataTypes.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/DataTypes.elm similarity index 98% rename from webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/DataTypes.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/DataTypes.elm index e56aed3b940..240fdfd985d 100755 --- a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/DataTypes.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/DataTypes.elm @@ -1,14 +1,14 @@ -module DataTypes exposing (..) +module Editor.DataTypes exposing (..) import Dict exposing (Dict) import Either exposing (Either) import File exposing (File) import Http exposing (Error) import Http.Detailed -import MethodConditions exposing (..) import Dom.DragDrop as DragDrop import Time exposing (Posix) +import Editor.MethodConditions exposing (..) -- -- All our data types -- diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/JsonDecoder.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/JsonDecoder.elm similarity index 97% rename from webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/JsonDecoder.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/JsonDecoder.elm index 7f507517b45..00bf8be77d1 100755 --- a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/JsonDecoder.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/JsonDecoder.elm @@ -1,15 +1,16 @@ -module JsonDecoder exposing (..) +module Editor.JsonDecoder exposing (..) - -import DataTypes exposing (..) import Iso8601 import Json.Decode exposing (..) import Json.Decode.Pipeline exposing (..) import List exposing (drop, head) -import MethodConditions exposing (..) -import AgentValueParser exposing (..) import String exposing (join, split) +import Editor.AgentValueParser exposing (..) +import Editor.DataTypes exposing (..) +import Editor.MethodConditions exposing (..) + + decodeTechniqueParameter : Decoder TechniqueParameter decodeTechniqueParameter = succeed TechniqueParameter diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/JsonEncoder.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/JsonEncoder.elm similarity index 95% rename from webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/JsonEncoder.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/JsonEncoder.elm index 4004b5fe832..ff8c5624181 100755 --- a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/JsonEncoder.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/JsonEncoder.elm @@ -1,10 +1,12 @@ -module JsonEncoder exposing (..) +module Editor.JsonEncoder exposing (..) -import DataTypes exposing (..) import Iso8601 import Json.Encode exposing (..) -import MethodConditions exposing (..) -import AgentValueParser exposing (..) + +import Editor.DataTypes exposing (..) +import Editor.MethodConditions exposing (..) +import Editor.AgentValueParser exposing (..) + encodeDraft: Draft -> Value encodeDraft draft = diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/MethodConditions.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/MethodConditions.elm similarity index 99% rename from webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/MethodConditions.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/MethodConditions.elm index f97da40472e..44cde0aac96 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/MethodConditions.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/MethodConditions.elm @@ -1,4 +1,4 @@ -module MethodConditions exposing (..) +module Editor.MethodConditions exposing (..) -- diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/MethodElemUtils.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/MethodElemUtils.elm similarity index 97% rename from webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/MethodElemUtils.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/MethodElemUtils.elm index db866ce7a29..632d2de0a41 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/MethodElemUtils.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/MethodElemUtils.elm @@ -1,8 +1,10 @@ -module MethodElemUtils exposing (..) +module Editor.MethodElemUtils exposing (..) -import DataTypes exposing (..) import List.Extra +import Editor.DataTypes exposing (..) + + getAllCalls: MethodElem -> List MethodCall getAllCalls call = case call of diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewBlock.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewBlock.elm similarity index 99% rename from webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewBlock.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewBlock.elm index b49ca55044e..296917155de 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewBlock.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewBlock.elm @@ -1,16 +1,18 @@ -module ViewBlock exposing (..) +module Editor.ViewBlock exposing (..) -import DataTypes exposing (..) import Dict import Html exposing (..) import Html.Attributes exposing (..) import Html.Events exposing (..) import Json.Decode -import MethodConditions exposing (..) import Dom.DragDrop as DragDrop import Dom exposing (..) -import ViewMethod exposing (showMethodCall) -import MethodElemUtils exposing (..) + +import Editor.DataTypes exposing (..) +import Editor.MethodConditions exposing (..) +import Editor.ViewMethod exposing (showMethodCall) +import Editor.MethodElemUtils exposing (..) + appendNodeConditional : Html msg -> Bool -> Element msg -> Element msg appendNodeConditional e test = diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewMethod.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewMethod.elm similarity index 99% rename from webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewMethod.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewMethod.elm index f13efafdebc..c842b05505f 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewMethod.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewMethod.elm @@ -1,6 +1,5 @@ -module ViewMethod exposing (..) +module Editor.ViewMethod exposing (..) -import DataTypes exposing (..) import Dict import Html exposing (..) import Html.Attributes exposing (..) @@ -8,17 +7,20 @@ import Html.Events exposing (..) import Json.Encode import List.Extra import Maybe.Extra -import MethodConditions exposing (..) import Regex import String.Extra -import MethodElemUtils exposing (..) import Dom.DragDrop as DragDrop exposing (State) import Dom exposing (..) import Json.Decode -import AgentValueParser exposing (..) -import ViewMethodsList exposing (getTooltipContent) import VirtualDom +import Editor.DataTypes exposing (..) +import Editor.MethodConditions exposing (..) +import Editor.MethodElemUtils exposing (..) +import Editor.AgentValueParser exposing (..) +import Editor.ViewMethodsList exposing (getTooltipContent) + + -- -- This file deals with one method container (condition, parameters, etc) -- diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewMethodsList.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewMethodsList.elm similarity index 99% rename from webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewMethodsList.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewMethodsList.elm index 13f9bedec2b..0bfe96ccfcc 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewMethodsList.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewMethodsList.elm @@ -1,6 +1,5 @@ -module ViewMethodsList exposing (..) +module Editor.ViewMethodsList exposing (..) -import DataTypes exposing (..) import Dict import Dict.Extra import Json.Decode @@ -13,6 +12,9 @@ import String.Extra import Dom exposing (..) import Dom.DragDrop as DragDrop +import Editor.DataTypes exposing (..) + + -- -- Display the method list/category UI -- diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewTechnique.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechnique.elm similarity index 97% rename from webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewTechnique.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechnique.elm index ac75d00c1cf..c0c05ec8166 100755 --- a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewTechnique.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechnique.elm @@ -1,20 +1,22 @@ -module ViewTechnique exposing (..) +module Editor.ViewTechnique exposing (..) -import ApiCalls exposing (..) -import DataTypes exposing (..) import Dict exposing (Dict) import Http exposing (Metadata) import Html exposing (..) import Html.Attributes exposing (..) import Html.Events exposing (..) -import ViewMethod exposing (..) -import ViewBlock exposing (..) -import ViewMethodsList exposing (..) -import ViewTechniqueTabs exposing (..) -import ViewTechniqueList exposing (..) import Dom exposing (..) import Dom.DragDrop as DragDrop -import MethodElemUtils exposing (..) + +import Editor.ApiCalls exposing (..) +import Editor.DataTypes exposing (..) +import Editor.MethodElemUtils exposing (..) +import Editor.ViewBlock exposing (..) +import Editor.ViewMethod exposing (..) +import Editor.ViewMethodsList exposing (..) +import Editor.ViewTechniqueTabs exposing (..) +import Editor.ViewTechniqueList exposing (..) + -- -- This file deals with the UI of one technique diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewTechniqueList.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechniqueList.elm similarity index 99% rename from webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewTechniqueList.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechniqueList.elm index 0c5cfbcefe0..c412eb7e500 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewTechniqueList.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechniqueList.elm @@ -1,6 +1,5 @@ -module ViewTechniqueList exposing (..) +module Editor.ViewTechniqueList exposing (..) -import DataTypes exposing (..) import Dict import Either exposing (Either(..)) import Html exposing (..) @@ -9,6 +8,9 @@ import Html.Events exposing (..) import List.Extra import Maybe.Extra +import Editor.DataTypes exposing (..) + + -- -- This file deals with the technique list UI -- (ie the part in the left of the UI) diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewTechniqueTabs.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechniqueTabs.elm similarity index 99% rename from webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewTechniqueTabs.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechniqueTabs.elm index f3729e28a23..3fd81de15db 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/editor/sources/ViewTechniqueTabs.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechniqueTabs.elm @@ -1,11 +1,13 @@ -module ViewTechniqueTabs exposing (..) +module Editor.ViewTechniqueTabs exposing (..) -import DataTypes exposing (..) -import AgentValueParser exposing (..) import Html exposing (..) import Html.Attributes exposing (..) import Html.Events exposing (..) +import Editor.AgentValueParser exposing (..) +import Editor.DataTypes exposing (..) + + -- -- This deals with the technique tabs UI (general info/parameters/resources) -- diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/editor/elm.json b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/elm.json similarity index 100% rename from webapp/sources/rudder/rudder-web/src/main/elm/editor/elm.json rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/elm.json diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/editor/tests/AgentValueParserTest.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/tests/AgentValueParserTest.elm similarity index 100% rename from webapp/sources/rudder/rudder-web/src/main/elm/editor/tests/AgentValueParserTest.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/tests/AgentValueParserTest.elm diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/Healthcheck.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck.elm similarity index 87% rename from webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/Healthcheck.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck.elm index 140516f5a8d..de95bd90692 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/Healthcheck.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck.elm @@ -1,12 +1,14 @@ module Healthcheck exposing (processApiError, update) import Browser -import DataTypes exposing (Model, Msg(..), SeverityLevel(..)) import Http exposing (Error) -import Init exposing (init, subscriptions) -import View exposing (chooseHigherSecurityLevel, view) import Result +import Healthcheck.DataTypes exposing (..) +import Healthcheck.Init exposing (init, subscriptions) +import Healthcheck.View exposing (chooseHigherSecurityLevel, view) + + main = Browser.element { init = init @@ -24,8 +26,8 @@ update msg model = case res of Ok h -> let - isWarningOrCritical = (chooseHigherSecurityLevel h == DataTypes.Warning) - || (chooseHigherSecurityLevel h == DataTypes.Critical) + isWarningOrCritical = (chooseHigherSecurityLevel h == Warning) + || (chooseHigherSecurityLevel h == Critical) in ( { model | healthcheck = h diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/ApiCalls.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck/ApiCalls.elm similarity index 72% rename from webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/ApiCalls.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck/ApiCalls.elm index 318b6134873..a3c4f16fca3 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/ApiCalls.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck/ApiCalls.elm @@ -1,10 +1,12 @@ -module ApiCalls exposing (..) +module Healthcheck.ApiCalls exposing (..) -import DataTypes exposing (Model, Msg(..)) import Http exposing (emptyBody, expectJson, jsonBody, request) -import JsonDecoder exposing (decodeGetRoleApiResult) -getUrl: DataTypes.Model -> String -> String +import Healthcheck.DataTypes exposing (Model, Msg(..)) +import Healthcheck.JsonDecoder exposing (decodeGetRoleApiResult) + + +getUrl: Model -> String -> String getUrl m url = m.contextPath ++ "/secure/api/system" ++ url diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/DataTypes.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck/DataTypes.elm similarity index 92% rename from webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/DataTypes.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck/DataTypes.elm index f55308ba82b..6273601a309 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/DataTypes.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck/DataTypes.elm @@ -1,7 +1,8 @@ -module DataTypes exposing (..) +module Healthcheck.DataTypes exposing (..) import Http exposing (Error) + type TabMenu = General | Details diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/Init.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck/Init.elm similarity index 60% rename from webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/Init.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck/Init.elm index c2da4568f52..b2fd5495735 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/Init.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck/Init.elm @@ -1,7 +1,7 @@ -module Init exposing (..) +module Healthcheck.Init exposing (..) -import ApiCalls exposing (getHealthCheck) -import DataTypes exposing (Model, Msg, SeverityLevel(..), TabMenu(..)) +import Healthcheck.ApiCalls exposing (getHealthCheck) +import Healthcheck.DataTypes exposing (Model, Msg, SeverityLevel(..), TabMenu(..)) subscriptions : Model -> Sub Msg diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/JsonDecoder.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck/JsonDecoder.elm similarity index 88% rename from webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/JsonDecoder.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck/JsonDecoder.elm index a96eb39cb7e..f030b9c6750 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/JsonDecoder.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck/JsonDecoder.elm @@ -1,10 +1,12 @@ -module JsonDecoder exposing (..) +module Healthcheck.JsonDecoder exposing (..) -import DataTypes exposing (Check, SeverityLevel(..)) import Json.Decode as D exposing (Decoder, andThen, fail, string, succeed) import Json.Decode.Pipeline exposing (required) import String exposing (toLower) +import Healthcheck.DataTypes exposing (Check, SeverityLevel(..)) + + decodeGetRoleApiResult : Decoder (List Check) decodeGetRoleApiResult = D.at [ "data" ] (D.list <| decodeCheck) diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/View.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck/View.elm similarity index 96% rename from webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/View.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck/View.elm index ec8a980c45e..1502b015fe4 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/View.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Healthcheck/View.elm @@ -1,6 +1,5 @@ -module View exposing (..) +module Healthcheck.View exposing (..) -import DataTypes exposing (Check, Model, Msg(..), SeverityLevel(..)) import Html exposing (Html, br, button, div, i, span, text) import Html.Attributes exposing (class) import Html.Events exposing (onClick) @@ -8,6 +7,9 @@ import List exposing (any, intersperse, map, sortWith) import List.Extra exposing (minimumWith) import String exposing (lines) +import Healthcheck.DataTypes exposing (Check, Model, Msg(..), SeverityLevel(..)) + + compareSeverityLevel: SeverityLevel -> SeverityLevel -> Order compareSeverityLevel a b = case (a, b) of diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/Hooks.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks.elm similarity index 92% rename from webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/Hooks.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks.elm index be689c66afc..82e3bd67d50 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/Hooks.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks.elm @@ -1,13 +1,15 @@ port module Hooks exposing (..) import Browser -import DataTypes exposing (..) import Http exposing (..) import Http.Detailed as Detailed -import Init exposing (..) -import View exposing (view) -import ApiCalls exposing (..) -import JsonDecoder exposing (decodeErrorDetails) + +import Hooks.ApiCalls exposing (..) +import Hooks.DataTypes exposing (..) +import Hooks.Init exposing (..) +import Hooks.JsonDecoder exposing (decodeErrorDetails) +import Hooks.View exposing (view) + main = Browser.element { init = init diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/ApiCalls.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/ApiCalls.elm similarity index 78% rename from webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/ApiCalls.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/ApiCalls.elm index 70ee581d0fd..a09a0a38fa1 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/ApiCalls.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/ApiCalls.elm @@ -1,18 +1,19 @@ -module ApiCalls exposing (..) +module Hooks.ApiCalls exposing (..) -import DataTypes exposing (..) import Http exposing (..) -import JsonDecoder exposing (..) import Url.Builder exposing (QueryParameter) import Http.Detailed as Detailed +import Hooks.DataTypes exposing (..) +import Hooks.JsonDecoder exposing (..) + -- -- This files contains all API calls for the Rules UI -- Summary: -- GET /hooks: get the hooks list -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" :: "hooks" :: url) p diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/DataTypes.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/DataTypes.elm similarity index 96% rename from webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/DataTypes.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/DataTypes.elm index ecae9519308..b38bf374a91 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/DataTypes.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/DataTypes.elm @@ -1,4 +1,4 @@ -module DataTypes exposing (..) +module Hooks.DataTypes exposing (..) import Http exposing (Error) import Http.Detailed diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/Init.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/Init.elm similarity index 85% rename from webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/Init.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/Init.elm index f252b232249..9079a76497c 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/Init.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/Init.elm @@ -1,7 +1,7 @@ -port module Init exposing (..) +port module Hooks.Init exposing (..) -import ApiCalls exposing (..) -import DataTypes exposing (..) +import Hooks.ApiCalls exposing (..) +import Hooks.DataTypes exposing (..) -- PORTS / SUBSCRIPTIONS diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/JsonDecoder.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/JsonDecoder.elm similarity index 95% rename from webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/JsonDecoder.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/JsonDecoder.elm index ddb06254335..0400edf65fb 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/JsonDecoder.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/JsonDecoder.elm @@ -1,11 +1,12 @@ -module JsonDecoder exposing (..) +module Hooks.JsonDecoder exposing (..) -import DataTypes exposing (..) import Json.Decode exposing (..) import Json.Decode.Pipeline exposing (..) import String exposing (join, split) import List exposing (drop, head, reverse) +import Hooks.DataTypes exposing (..) + -- GENERAL decodeGetHooks = diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/JsonEncoder.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/JsonEncoder.elm similarity index 63% rename from webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/JsonEncoder.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/JsonEncoder.elm index a6e62fae78e..3a367bbcf96 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/JsonEncoder.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/JsonEncoder.elm @@ -1,8 +1,10 @@ -module JsonEncoder exposing (..) +module Hooks.JsonEncoder exposing (..) -import DataTypes exposing (..) import Json.Encode exposing (..) +import Hooks.DataTypes exposing (..) + + encodeHook : Hook -> Value encodeHook hook = object ( diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/View.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/View.elm similarity index 92% rename from webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/View.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/View.elm index d52235cbe81..11d3f9128e3 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/View.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/View.elm @@ -1,10 +1,11 @@ -module View exposing (..) +module Hooks.View exposing (..) -import DataTypes exposing (..) import Html exposing (..) import Html.Attributes exposing (attribute, class, href, id) import Html.Events exposing (onClick) -import ViewUtils exposing (..) + +import Hooks.DataTypes exposing (..) +import Hooks.ViewUtils exposing (..) view : Model -> Html Msg diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/ViewUtils.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/ViewUtils.elm similarity index 95% rename from webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/ViewUtils.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/ViewUtils.elm index aa1b3e04e9c..7314da271d6 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/hooks/sources/ViewUtils.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Hooks/ViewUtils.elm @@ -1,15 +1,16 @@ -module ViewUtils exposing (..) +module Hooks.ViewUtils exposing (..) -import DataTypes exposing (..) import Html exposing (..) import Html.Attributes exposing (..) import Html.Events exposing (onClick) import List import Json.Decode as Decode import NaturalOrdering as N exposing (compare) -import ApiCalls exposing (..) import String.Extra exposing (humanize) +import Hooks.ApiCalls exposing (..) +import Hooks.DataTypes exposing (..) + kindList = [Node, Policy, Other] diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/notifications/sources/Notifications.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Notifications.elm similarity index 100% rename from webapp/sources/rudder/rudder-web/src/main/elm/notifications/sources/Notifications.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Notifications.elm diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/Onboarding.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding.elm similarity index 96% rename from webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/Onboarding.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding.elm index edc0ff9ea32..17b423b38c8 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/Onboarding.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding.elm @@ -2,16 +2,18 @@ port module Onboarding exposing (update) import Browser import Browser.Navigation -import DataTypes exposing (..) -import ApiCalls exposing (..) -import Init exposing (init, subscriptions) -import View exposing (view) import Result import Process import Task import List import List.Extra +import Onboarding.DataTypes exposing (..) +import Onboarding.ApiCalls exposing (..) +import Onboarding.Init exposing (init, subscriptions) +import Onboarding.View exposing (view) + + -- -- Port for interacting with external JS -- diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/ApiCalls.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/ApiCalls.elm similarity index 88% rename from webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/ApiCalls.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/ApiCalls.elm index 2869462b989..042ee3f9872 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/ApiCalls.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/ApiCalls.elm @@ -1,10 +1,12 @@ -module ApiCalls exposing (..) +module Onboarding.ApiCalls exposing (..) -import DataTypes exposing (Model, Msg(..), AccountSettings, MetricsState) import Http exposing (emptyBody, expectJson, jsonBody, request) import Json.Encode -import JsonDecoder exposing (decodeGetAccountSettings, decodeGetMetricsSettings, decodeSetupDone) -import JsonEncoder exposing (encodeAccountSettings, encodeMetricsSettings) + +import Onboarding.DataTypes exposing (Model, Msg(..), AccountSettings, MetricsState) +import Onboarding.JsonEncoder exposing (encodeAccountSettings, encodeMetricsSettings) +import Onboarding.JsonDecoder exposing (decodeGetAccountSettings, decodeGetMetricsSettings, decodeSetupDone) + getUrl: Model -> String -> String getUrl m url = diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/DataTypes.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/DataTypes.elm similarity index 96% rename from webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/DataTypes.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/DataTypes.elm index 30d24dee2a0..d7ebe543094 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/DataTypes.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/DataTypes.elm @@ -1,4 +1,4 @@ -module DataTypes exposing (..) +module Onboarding.DataTypes exposing (..) import Http exposing (Error) import List exposing (..) diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/Init.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/Init.elm similarity index 82% rename from webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/Init.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/Init.elm index 25d4e364873..9b6cdf4dae4 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/Init.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/Init.elm @@ -1,9 +1,10 @@ -module Init exposing (..) +module Onboarding.Init exposing (..) -import ApiCalls exposing (getAccountSettings) -import DataTypes exposing (..) import List exposing (..) +import Onboarding.ApiCalls exposing (getAccountSettings) +import Onboarding.DataTypes exposing (..) + subscriptions : Model -> Sub Msg subscriptions model = diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/JsonDecoder.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/JsonDecoder.elm similarity index 94% rename from webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/JsonDecoder.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/JsonDecoder.elm index d5e5d454b5d..7c012ec4320 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/JsonDecoder.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/JsonDecoder.elm @@ -1,10 +1,12 @@ -module JsonDecoder exposing (..) +module Onboarding.JsonDecoder exposing (..) -import DataTypes exposing (..) import Json.Decode as D exposing (Decoder, andThen, fail, string, succeed, at) import Json.Decode.Pipeline exposing (required, optional) import String exposing (toLower) +import Onboarding.DataTypes exposing (..) + + decodeGetAccountSettings : Decoder AccountSettings decodeGetAccountSettings = at [ "data", "pluginSettings" ] decodeAccountSettings diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/JsonEncoder.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/JsonEncoder.elm similarity index 88% rename from webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/JsonEncoder.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/JsonEncoder.elm index 66fe6b2cb0f..a1433b03966 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/JsonEncoder.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/JsonEncoder.elm @@ -1,9 +1,11 @@ -module JsonEncoder exposing (..) +module Onboarding.JsonEncoder exposing (..) -import DataTypes exposing (AccountSettings, MetricsState(..)) import Json.Encode exposing (Value, object, string) import Json.Encode.Extra exposing (maybe) +import Onboarding.DataTypes exposing (AccountSettings, MetricsState(..)) + + encodeAccountSettings : AccountSettings -> Value encodeAccountSettings accountSettings = let diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/View.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/View.elm similarity index 99% rename from webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/View.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/View.elm index d5d977cc02e..6ee612377fa 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/View.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Onboarding/View.elm @@ -1,6 +1,5 @@ -module View exposing (..) +module Onboarding.View exposing (..) -import DataTypes exposing (..) import Html exposing (Html, button, div, i, span, text, h1, h3, ul, li, b, label, input, form, a) import Html.Attributes exposing (class, type_, name, id, href, for, checked, value) import Html.Attributes.Autocomplete as Autocomplete @@ -11,6 +10,9 @@ import List.Extra exposing (minimumWith) import String exposing (lines) import Dict exposing (..) +import Onboarding.DataTypes exposing (..) + + view : Model -> Html Msg view model = let diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/Rules.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules.elm similarity index 99% rename from webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/Rules.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules.elm index acc66f41eef..1f3e6153a5f 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/Rules.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules.elm @@ -4,17 +4,19 @@ import Browser import Browser.Navigation as Nav import Dict import Dict.Extra -import DataTypes exposing (..) import Http exposing (..) -import Init exposing (init) -import View exposing (view) import Result -import ApiCalls exposing (..) -import ViewUtils exposing (..) import List.Extra import Random import UUID +import Rules.ApiCalls exposing (..) +import Rules.DataTypes exposing (..) +import Rules.Init exposing (init) +import Rules.View exposing (view) +import Rules.ViewUtils exposing (..) + + -- PORTS / SUBSCRIPTIONS port successNotification : String -> Cmd msg port errorNotification : String -> Cmd msg diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ApiCalls.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ApiCalls.elm similarity index 97% rename from webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ApiCalls.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ApiCalls.elm index a48da75fe51..f291a706ec1 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ApiCalls.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ApiCalls.elm @@ -1,14 +1,15 @@ -module ApiCalls exposing (..) +module Rules.ApiCalls exposing (..) -import DataTypes exposing (..) import Http exposing (..) -import JsonDecoder exposing (..) -import JsonEncoder exposing (..) import Time.Iso8601 import Time.ZonedDateTime exposing (ZonedDateTime) import Url import Url.Builder exposing (QueryParameter, int, string) +import Rules.DataTypes exposing (..) +import Rules.JsonDecoder exposing (..) +import Rules.JsonEncoder exposing (..) + -- -- This files contains all API calls for the Rules UI @@ -23,7 +24,7 @@ import Url.Builder exposing (QueryParameter, int, string) -- POST /rules/${id} : Update an existing rule (error if it doesn't exist yet) -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/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ComplianceUtils.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ComplianceUtils.elm similarity index 98% rename from webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ComplianceUtils.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ComplianceUtils.elm index 9e07cba71bd..5f4513c45bd 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ComplianceUtils.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ComplianceUtils.elm @@ -1,6 +1,5 @@ -module ComplianceUtils exposing (..) +module Rules.ComplianceUtils exposing (..) -import DataTypes exposing (..) import Dict import Dict.Extra import Html exposing (Html, button, div, i, span, text, h1, h4, ul, li, input, a, p, form, label, textarea, select, option, table, thead, tbody, tr, th, td, small) @@ -10,7 +9,9 @@ import List.Extra import List import String exposing (fromFloat) import Tuple exposing (first, second) -import ApiCalls exposing (..) + +import Rules.ApiCalls exposing (..) +import Rules.DataTypes exposing (..) getCompliance : Float -> String -> Html msg diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/DataTypes.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/DataTypes.elm similarity index 99% rename from webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/DataTypes.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/DataTypes.elm index 585c3766b6e..0248fdf5282 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/DataTypes.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/DataTypes.elm @@ -1,4 +1,4 @@ -module DataTypes exposing (..) +module Rules.DataTypes exposing (..) import Dict exposing (Dict) import Http exposing (Error) diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/Init.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/Init.elm similarity index 89% rename from webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/Init.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/Init.elm index 0e22232da2b..2e5468feb8b 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/Init.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/Init.elm @@ -1,9 +1,11 @@ -module Init exposing (..) +module Rules.Init exposing (..) -import ApiCalls exposing (..) -import DataTypes exposing (..) import Dict +import Rules.ApiCalls exposing (..) +import Rules.DataTypes exposing (..) + + -- PORTS init : { contextPath : String, hasWriteRights : Bool } -> ( Model, Cmd Msg ) init flags = diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/JsonDecoder.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/JsonDecoder.elm similarity index 99% rename from webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/JsonDecoder.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/JsonDecoder.elm index 298baba9f92..00187ed648a 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/JsonDecoder.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/JsonDecoder.elm @@ -1,6 +1,5 @@ -module JsonDecoder exposing (..) +module Rules.JsonDecoder exposing (..) -import DataTypes exposing (..) import Dict exposing (Dict) import Json.Decode exposing (..) import Json.Decode.Pipeline exposing (..) @@ -11,6 +10,8 @@ import Time.TimeZones exposing (utc) import Time.ZonedDateTime exposing (ZonedDateTime) import Tuple +import Rules.DataTypes exposing (..) + -- GENERAL decodeGetPolicyMode : Decoder String diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/JsonEncoder.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/JsonEncoder.elm similarity index 96% rename from webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/JsonEncoder.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/JsonEncoder.elm index 2927cabe6fa..6a5435b7697 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/JsonEncoder.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/JsonEncoder.elm @@ -1,8 +1,9 @@ -module JsonEncoder exposing (..) +module Rules.JsonEncoder exposing (..) -import DataTypes exposing (..) import Json.Encode exposing (..) +import Rules.DataTypes exposing (..) + encodeRuleDetails: Rule -> Value encodeRuleDetails ruleDetails = diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/View.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/View.elm similarity index 97% rename from webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/View.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/View.elm index e98b76c9901..58cd4069b2b 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/View.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/View.elm @@ -1,17 +1,18 @@ -module View exposing (..) +module Rules.View exposing (..) -import DataTypes exposing (..) import Html exposing (Html, button, div, i, span, text, h1, h3, ul, li, input, a, table, thead, tbody, label) import Html.Attributes exposing (checked, class, disabled, for, href, id, placeholder, style, tabindex, type_, value) import Html.Events exposing (onClick, onInput) import List import List.Extra import String -import ApiCalls exposing (..) -import ViewRulesTable exposing (..) -import ViewRuleDetails exposing (..) -import ViewCategoryDetails exposing (..) -import ViewUtils exposing (..) + +import Rules.ApiCalls exposing (..) +import Rules.DataTypes exposing (..) +import Rules.ViewCategoryDetails exposing (..) +import Rules.ViewRulesTable exposing (..) +import Rules.ViewRuleDetails exposing (..) +import Rules.ViewUtils exposing (..) view : Model -> Html Msg diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewCategoryDetails.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewCategoryDetails.elm similarity index 94% rename from webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewCategoryDetails.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewCategoryDetails.elm index 1b3087b907f..199bae2082e 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewCategoryDetails.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewCategoryDetails.elm @@ -1,16 +1,17 @@ -module ViewCategoryDetails exposing (..) +module Rules.ViewCategoryDetails exposing (..) -import DataTypes exposing (..) import Html exposing (Html, button, div, i, span, text, h1, ul, li, input, a, p, form, label, textarea, select, table, thead, tbody) import Html.Attributes exposing (id, class, type_, placeholder, value, for, style) import Html.Events exposing (onClick, onInput, onSubmit) import List import Maybe.Extra import String -import ApiCalls exposing (..) -import ViewRulesTable exposing (buildRulesTable) -import ViewTabContent exposing (buildListCategories) -import ViewUtils exposing (btnSave, getListRules, rulesTableHeader) + +import Rules.ApiCalls exposing (..) +import Rules.DataTypes exposing (..) +import Rules.ViewRulesTable exposing (buildRulesTable) +import Rules.ViewTabContent exposing (buildListCategories) +import Rules.ViewUtils exposing (btnSave, getListRules, rulesTableHeader) -- diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewRepairedReports.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewRepairedReports.elm similarity index 96% rename from webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewRepairedReports.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewRepairedReports.elm index db366421309..22855ade964 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewRepairedReports.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewRepairedReports.elm @@ -1,12 +1,13 @@ -module ViewRepairedReports exposing (..) +module Rules.ViewRepairedReports exposing (..) -import DataTypes exposing (..) import Dict import Html exposing (..) import Html.Attributes exposing (..) import Html.Events exposing (..) import Time.Iso8601 +import Rules.DataTypes exposing (..) + type alias TableColumn = { id : String diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewRuleDetails.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewRuleDetails.elm similarity index 96% rename from webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewRuleDetails.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewRuleDetails.elm index 5841a9fc017..d9e07884d3a 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewRuleDetails.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewRuleDetails.elm @@ -1,16 +1,18 @@ -module ViewRuleDetails exposing (..) +module Rules.ViewRuleDetails exposing (..) -import DataTypes exposing (..) import Html exposing (Html, button, div, i, span, text, h1, ul, li, a, p) import Html.Attributes exposing (id, class, type_, style, attribute, disabled, title) import Html.Events exposing (onClick) import List.Extra import List exposing (filter, length, member) import String -import ApiCalls exposing (..) -import ViewTabContent exposing (tabContent) import Maybe.Extra -import ViewUtils exposing (badgePolicyMode, countRecentChanges, getRuleNbGroups, getRuleNbNodes, getNbResourcesBadge, getGroupsNbResourcesBadge, btnSave) + +import Rules.ApiCalls exposing (..) +import Rules.DataTypes exposing (..) +import Rules.ViewTabContent exposing (tabContent) +import Rules.ViewUtils exposing (badgePolicyMode, countRecentChanges, getRuleNbGroups, getRuleNbNodes, getNbResourcesBadge, getGroupsNbResourcesBadge, btnSave) + -- -- This file contains all methods to display the details of the selected rule. diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewRulesTable.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewRulesTable.elm similarity index 95% rename from webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewRulesTable.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewRulesTable.elm index 7cb73f3c040..f4ece8275fc 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewRulesTable.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewRulesTable.elm @@ -1,6 +1,5 @@ -module ViewRulesTable exposing (..) +module Rules.ViewRulesTable exposing (..) -import DataTypes exposing (..) import Dict import Html exposing (Html, text, tr, td, i, span) import Html.Attributes exposing (class, colspan, attribute) @@ -9,8 +8,11 @@ import List.Extra import List import String import NaturalOrdering exposing (compareOn) -import ViewUtils exposing (..) -import ComplianceUtils exposing (getAllComplianceValues, getRuleCompliance) + +import Rules.ComplianceUtils exposing (getAllComplianceValues, getRuleCompliance) +import Rules.DataTypes exposing (..) +import Rules.ViewUtils exposing (..) + -- -- This file contains all methods to display the Rules table diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewTabContent.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewTabContent.elm similarity index 99% rename from webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewTabContent.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewTabContent.elm index f661b7b7117..1afdf080ff3 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewTabContent.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewTabContent.elm @@ -1,6 +1,5 @@ -module ViewTabContent exposing (..) +module Rules.ViewTabContent exposing (..) -import DataTypes exposing (..) import Dict import Dict.Extra import Html exposing (..) @@ -11,10 +10,13 @@ import List import Maybe.Extra import Set import NaturalOrdering exposing (compareOn) -import ComplianceUtils exposing (..) import Tuple3 -import ViewRepairedReports -import ViewUtils exposing (..) + +import Rules.ComplianceUtils exposing (..) +import Rules.DataTypes exposing (..) +import Rules.ViewRepairedReports +import Rules.ViewUtils exposing (..) + -- -- This file contains all methods to display the details of the selected rule. @@ -224,7 +226,7 @@ tabContent model details = Directives -> directivesTab model details Nodes -> nodesTab model details Groups -> groupsTab model details - TechnicalLogs -> ViewRepairedReports.showTab model details + TechnicalLogs -> Rules.ViewRepairedReports.showTab model details Rules -> div [] [] directivesTab: Model -> RuleDetails -> Html Msg diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewUtils.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewUtils.elm similarity index 99% rename from webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewUtils.elm rename to webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewUtils.elm index 70c53cce0e4..5094dd7cfd1 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/rules/sources/ViewUtils.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewUtils.elm @@ -1,6 +1,5 @@ -module ViewUtils exposing (..) +module Rules.ViewUtils exposing (..) -import DataTypes exposing (..) import Dict exposing (Dict) import Either exposing (Either(..)) import Html exposing (..) @@ -10,10 +9,13 @@ import List.Extra import List import Maybe.Extra import String exposing (fromFloat) -import ComplianceUtils exposing (..) import Json.Decode as Decode import Tuple3 +import Rules.ComplianceUtils exposing (..) +import Rules.DataTypes exposing (..) + + onCustomClick : msg -> Html.Attribute msg onCustomClick msg = custom "click" diff --git a/webapp/sources/rudder/rudder-web/src/main/gulpfile.js b/webapp/sources/rudder/rudder-web/src/main/gulpfile.js index 3270baac988..419d15afe3c 100644 --- a/webapp/sources/rudder/rudder-web/src/main/gulpfile.js +++ b/webapp/sources/rudder/rudder-web/src/main/gulpfile.js @@ -8,6 +8,7 @@ const terser = require('gulp-terser'); const elm_p = require('gulp-elm'); const merge = require('merge-stream'); const del = require('del'); +const through = require('through2'); const paths = { 'css': { @@ -37,11 +38,25 @@ const paths = { }, 'elm': { 'src': 'elm', - 'watch': 'elm/**/*.elm', + 'watch': 'elm/sources/*.elm', 'dest': 'webapp/javascript/rudder/elm', }, }; +// Derived from https://github.com/mixmaxhq/gulp-grep-contents (under MIT License) +var grep = function(regex) { + var restoreStream = through.obj(); + return through.obj(function(file, encoding, callback) { + var match = regex.test(String(file.contents)) + if (match) { + callback(null, file); + return; + } + restoreStream.write(file); + callback(); + }); +} + function clean(cb) { del.sync([paths.js.dest, paths.css.dest]); cb(); @@ -56,34 +71,37 @@ function getElmApps(dir) { } function elm(cb) { - var apps = getElmApps(paths.elm.src); - var tasks = apps.map(function(app) { - // Filename - file = app[0].toUpperCase() + app.substring(1) + '.elm' - return src(path.join(paths.elm.src, app, 'sources', file)) - .pipe(elm_p({ - optimize: profile.production(), - cwd: path.join(paths.elm.src, app), - })) - .pipe(rename('rudder-' + app + '.js')) - // elm minification options from https://guide.elm-lang.org/optimization/asset_size.html#instructions - .pipe(profile.production(terser({ - compress: { - pure_funcs: ['F2', 'F3', 'F4', 'F5', 'F6', 'F7', 'F8', 'F9', 'A2', 'A3', 'A4', - 'A5', 'A6', 'A7', 'A8', 'A9' - ], - pure_getters: true, - keep_fargs: false, - unsafe_comps: true, - unsafe: true, - }, - }))) - .pipe(profile.production(terser({ - mangle: true, - }))) - .pipe(dest(paths.elm.dest)); - }); - return merge(tasks); + src(paths.elm.watch) + // Detect entry points + .pipe(grep(/Browser.element/)) + .pipe(elm_p({ + optimize: profile.production(), + cwd: path.join(paths.elm.src), + })) + .pipe(rename(function (path) { + return { + dirname: '', + basename: 'rudder-' + path.basename.toLowerCase(), + extname: '.js' + }; + })) + // elm minification options from https://guide.elm-lang.org/optimization/asset_size.html#instructions + .pipe(profile.production(terser({ + compress: { + pure_funcs: ['F2', 'F3', 'F4', 'F5', 'F6', 'F7', 'F8', 'F9', 'A2', 'A3', 'A4', + 'A5', 'A6', 'A7', 'A8', 'A9' + ], + pure_getters: true, + keep_fargs: false, + unsafe_comps: true, + unsafe: true, + }, + }))) + .pipe(profile.production(terser({ + mangle: true, + }))) + .pipe(dest(paths.elm.dest)); + cb(); }; function js(cb) {