Skip to content

Commit

Permalink
Fixes #22051: Update elm dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@amousset
amousset committed Nov 6, 2022
1 parent 1bceca3 commit a43b70d
Show file tree
Hide file tree
Showing 9 changed files with 87 additions and 114 deletions.
8 changes: 4 additions & 4 deletions webapp/sources/rudder/rudder-web/src/main/elm/accounts/elm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"direct": {
"NoRedInk/elm-json-decode-pipeline": "1.0.1",
"TSFoster/elm-uuid": "4.1.0",
"TSFoster/elm-uuid": "4.2.0",
"elm/browser": "1.0.2",
"elm/core": "1.0.5",
"elm/html": "1.0.0",
Expand All @@ -17,8 +17,8 @@
"elm/time": "1.0.0",
"elm/url": "1.0.0",
"elm-community/dict-extra": "2.4.0",
"elm-community/list-extra": "8.5.2",
"justinmimbs/date": "4.0.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",
Expand All @@ -37,7 +37,7 @@
"elm/svg": "1.0.1",
"elm/virtual-dom": "1.0.3",
"elm-community/html-extra": "3.4.0",
"kuon/elm-string-normalize": "1.0.2",
"kuon/elm-string-normalize": "1.0.5",
"rtfeldman/elm-hex": "1.0.0"
}
},
Expand Down
33 changes: 9 additions & 24 deletions webapp/sources/rudder/rudder-web/src/main/elm/editor/elm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"elm-version": "0.19.1",
"dependencies": {
"direct": {
"NoRedInk/elm-json-decode-pipeline": "1.0.0",
"TSFoster/elm-uuid": "4.1.0",
"NoRedInk/elm-json-decode-pipeline": "1.0.1",
"TSFoster/elm-uuid": "4.2.0",
"ThinkAlexandria/elm-pretty-print-json": "1.0.1",
"arsduo/elm-dom-drag-drop": "1.0.0",
"elm/browser": "1.0.2",
Expand All @@ -23,45 +23,30 @@
"elm/virtual-dom": "1.0.3",
"elm-community/dict-extra": "2.4.0",
"elm-community/html-extra": "3.4.0",
"elm-community/list-extra": "8.2.4",
"elm-community/maybe-extra": "5.2.0",
"elm-community/list-extra": "8.7.0",
"elm-community/maybe-extra": "5.3.0",
"elm-community/string-extra": "4.0.1",
"pablohirafuji/elm-markdown": "2.0.5",
"jzxhuang/http-extras": "2.1.0",
"pablohirafuji/elm-markdown": "2.0.5",
"rtfeldman/elm-iso8601-date-strings": "1.1.4",
"toastal/either": "3.5.2",
"toastal/either": "3.6.3",
"visotype/elm-dom": "1.1.3"
},
"indirect": {
"Garados007/elm-svg-parser": "1.0.0",
"Janiczek/elm-bidict": "2.0.1",
"NoRedInk/elm-string-conversions": "1.0.1",
"Punie/elm-parser-extras": "1.0.0",
"TSFoster/elm-bytes-extra": "1.3.0",
"TSFoster/elm-md5": "2.0.0",
"TSFoster/elm-md5": "2.0.1",
"TSFoster/elm-sha1": "2.1.1",
"andre-dietrich/parser-combinators": "3.2.0",
"danfishgold/base64-bytes": "1.1.0",
"elm/bytes": "1.0.8",
"elm/svg": "1.0.1",
"elm/url": "1.0.0",
"elm-community/basics-extra": "4.1.0",
"erlandsona/assoc-set": "1.1.0",
"jxxcarlson/htree": "2.0.1",
"pablohirafuji/elm-syntax-highlight": "3.4.0",
"pilatch/flip": "1.0.0",
"pzp1997/assoc-list": "1.0.0",
"rtfeldman/elm-hex": "1.0.0",
"skyqrose/assoc-list-extra": "1.0.0",
"the-sett/elm-pretty-printer": "2.2.3",
"zwilias/elm-html-string": "2.0.2",
"zwilias/elm-rosetree": "1.5.0",
"zwilias/elm-utf-tools": "2.0.1"
"the-sett/elm-pretty-printer": "2.2.3"
}
},
"test-dependencies": {
"direct": {
"elm-explorations/test": "1.2.2"
"elm-explorations/test": "2.0.1"
},
"indirect": {}
}
Expand Down
14 changes: 8 additions & 6 deletions webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/elm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@
"elm-version": "0.19.1",
"dependencies": {
"direct": {
"NoRedInk/elm-json-decode-pipeline": "1.0.0",
"NoRedInk/elm-json-decode-pipeline": "1.0.1",
"ccapndave/elm-flat-map": "1.2.0",
"elm/browser": "1.0.1",
"elm/core": "1.0.0",
"elm/browser": "1.0.2",
"elm/core": "1.0.5",
"elm/html": "1.0.0",
"elm/http": "1.0.0",
"elm/http": "2.0.0",
"elm/json": "1.1.3",
"elm-community/list-extra": "8.1.0",
"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",
Expand All @@ -28,4 +30,4 @@
"direct": {},
"indirect": {}
}
}
}
24 changes: 10 additions & 14 deletions webapp/sources/rudder/rudder-web/src/main/elm/healthcheck/sources/ApiCalls.elm
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module ApiCalls exposing (..)

import DataTypes exposing (Model, Msg(..))
import Http exposing (emptyBody, expectJson, jsonBody, request, send)
import Http exposing (emptyBody, expectJson, jsonBody, request)
import JsonDecoder exposing (decodeGetRoleApiResult)

getUrl: DataTypes.Model -> String -> String
Expand All @@ -10,16 +10,12 @@ getUrl m url =

getHealthCheck : Model -> Cmd Msg
getHealthCheck model =
let
req =
request
{ method = "GET"
, headers = []
, url = getUrl model "/healthcheck"
, body = emptyBody
, expect = expectJson decodeGetRoleApiResult
, timeout = Nothing
, withCredentials = False
}
in
send GetHealthCheckResult req
request
{ method = "GET"
, headers = []
, url = getUrl model "/healthcheck"
, body = emptyBody
, expect = expectJson GetHealthCheckResult decodeGetRoleApiResult
, timeout = Nothing
, tracker = Nothing
}
8 changes: 4 additions & 4 deletions webapp/sources/rudder/rudder-web/src/main/elm/hooks/elm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"direct": {
"NoRedInk/elm-json-decode-pipeline": "1.0.1",
"TSFoster/elm-uuid": "4.1.0",
"TSFoster/elm-uuid": "4.2.0",
"elm/browser": "1.0.2",
"elm/core": "1.0.5",
"elm/html": "1.0.0",
Expand All @@ -17,9 +17,9 @@
"elm/time": "1.0.0",
"elm/url": "1.0.0",
"elm-community/dict-extra": "2.4.0",
"elm-community/list-extra": "8.5.2",
"elm-community/list-extra": "8.7.0",
"elm-community/string-extra": "4.0.1",
"justinmimbs/date": "4.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",
Expand All @@ -38,7 +38,7 @@
"elm/svg": "1.0.1",
"elm/virtual-dom": "1.0.3",
"elm-community/html-extra": "3.4.0",
"kuon/elm-string-normalize": "1.0.2",
"kuon/elm-string-normalize": "1.0.5",
"rtfeldman/elm-hex": "1.0.0"
}
},
Expand Down
14 changes: 8 additions & 6 deletions webapp/sources/rudder/rudder-web/src/main/elm/notifications/elm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@
"elm-version": "0.19.1",
"dependencies": {
"direct": {
"NoRedInk/elm-json-decode-pipeline": "1.0.0",
"NoRedInk/elm-json-decode-pipeline": "1.0.1",
"ccapndave/elm-flat-map": "1.2.0",
"elm/browser": "1.0.1",
"elm/core": "1.0.0",
"elm/browser": "1.0.2",
"elm/core": "1.0.5",
"elm/html": "1.0.0",
"elm/http": "1.0.0",
"elm/http": "2.0.0",
"elm/json": "1.1.3",
"elm-community/list-extra": "8.1.0",
"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",
Expand All @@ -28,4 +30,4 @@
"direct": {},
"indirect": {}
}
}
}
17 changes: 8 additions & 9 deletions webapp/sources/rudder/rudder-web/src/main/elm/onboarding/elm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,28 @@
"elm-version": "0.19.1",
"dependencies": {
"direct": {
"NoRedInk/elm-json-decode-pipeline": "1.0.0",
"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": "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.1.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.3"
"rtfeldman/elm-iso8601-date-strings": "1.1.4"
}
},
"test-dependencies": {
"direct": {},
"indirect": {
"elm/bytes": "1.0.8",
"elm/file": "1.0.5"
}
"indirect": {}
}
}
}
69 changes: 29 additions & 40 deletions webapp/sources/rudder/rudder-web/src/main/elm/onboarding/sources/ApiCalls.elm
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module ApiCalls exposing (..)

import DataTypes exposing (Model, Msg(..), AccountSettings, MetricsState)
import Http exposing (emptyBody, expectJson, jsonBody, request, send)
import Http exposing (emptyBody, expectJson, jsonBody, request)
import Json.Encode
import JsonDecoder exposing (decodeGetAccountSettings, decodeGetMetricsSettings, decodeSetupDone)
import JsonEncoder exposing (encodeAccountSettings, encodeMetricsSettings)
Expand All @@ -12,19 +12,15 @@ getUrl m url =

getAccountSettings : Model -> Cmd Msg
getAccountSettings model =
let
req =
request
{ method = "GET"
, headers = []
, url = getUrl model "/plugins/settings"
, body = emptyBody
, expect = expectJson decodeGetAccountSettings
, timeout = Nothing
, withCredentials = False
}
in
send GetAccountSettings req
request
{ method = "GET"
, headers = []
, url = getUrl model "/plugins/settings"
, body = emptyBody
, expect = expectJson GetAccountSettings decodeGetAccountSettings
, timeout = Nothing
, tracker = Nothing
}

{-
getMetricsSettings : Model -> Cmd Msg
Expand All @@ -45,19 +41,16 @@ getMetricsSettings model =
-}
postAccountSettings : Model -> AccountSettings -> Cmd Msg
postAccountSettings model accountSettings =
let
req =
request
{ method = "POST"
, headers = []
, url = getUrl model "/plugins/settings"
, body = jsonBody (encodeAccountSettings accountSettings)
, expect = expectJson decodeGetAccountSettings
, timeout = Nothing
, withCredentials = False
}
in
send PostAccountSettings req
request
{ method = "POST"
, headers = []
, url = getUrl model "/plugins/settings"
, body = jsonBody (encodeAccountSettings accountSettings)
, expect = expectJson PostAccountSettings decodeGetAccountSettings
, timeout = Nothing
, tracker = Nothing
}

{-
postMetricsSettings : Model -> MetricsState -> Cmd Msg
postMetricsSettings model metrics =
Expand All @@ -78,16 +71,12 @@ postMetricsSettings model metrics =

setupDone : Model -> Bool -> Cmd Msg
setupDone model res =
let
req =
request
{ method = "POST"
, headers = []
, url = getUrl model "/settings/rudder_setup_done"
, body = jsonBody (Json.Encode.object [ ("value", Json.Encode.bool res)])
, expect = expectJson decodeSetupDone
, timeout = Nothing
, withCredentials = False
}
in
send SetupDone req
request
{ method = "POST"
, headers = []
, url = getUrl model "/settings/rudder_setup_done"
, body = jsonBody (Json.Encode.object [ ("value", Json.Encode.bool res)])
, expect = expectJson SetupDone decodeSetupDone
, timeout = Nothing
, tracker = Nothing
}
14 changes: 7 additions & 7 deletions webapp/sources/rudder/rudder-web/src/main/elm/rules/elm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"elm-version": "0.19.1",
"dependencies": {
"direct": {
"NoRedInk/elm-json-decode-pipeline": "1.0.0",
"NoRedInk/elm-json-decode-pipeline": "1.0.1",
"TSFoster/elm-tuple-extra": "2.0.0",
"TSFoster/elm-uuid": "4.1.0",
"TSFoster/elm-uuid": "4.2.0",
"elm/browser": "1.0.2",
"elm/core": "1.0.5",
"elm/html": "1.0.0",
Expand All @@ -17,13 +17,13 @@
"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",
"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",
"myrho/elm-round": "1.0.4"
"webbhuset/elm-json-decode": "1.1.0"
},
"indirect": {
"TSFoster/elm-bytes-extra": "1.3.0",
Expand All @@ -36,7 +36,7 @@
"elm/regex": "1.0.0",
"elm/time": "1.0.0",
"elm/virtual-dom": "1.0.3",
"kuon/elm-string-normalize": "1.0.2",
"kuon/elm-string-normalize": "1.0.5",
"rtfeldman/elm-hex": "1.0.0"
}
},
Expand Down

0 comments on commit a43b70d

Please sign in to comment.