diff --git a/.travis.yml b/.travis.yml index 5c8062180..37c942f36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ __defaults_go: &DEFAULTS_GO language: go - go: "1.14" + go: "1.14.1" cache: directories: # https://restic.net/blog/2018-09-02/travis-build-cache diff --git a/Dockerfile b/Dockerfile index 1fbff04fd..b28af0cff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ COPY Makefile /src/Makefile COPY ui /src/ui RUN make -C /src ui -FROM golang:1.14.0-alpine3.11 as go-builder +FROM golang:1.14.1-alpine3.11 as go-builder RUN apk add make git COPY Makefile /src/Makefile COPY go.mod /src/go.mod diff --git a/demo/Dockerfile b/demo/Dockerfile index 567e97986..bb184f43e 100644 --- a/demo/Dockerfile +++ b/demo/Dockerfile @@ -7,7 +7,7 @@ COPY Makefile /src/Makefile COPY ui /src/ui RUN make -C /src ui -FROM golang:1.14.0-alpine3.11 as go-builder +FROM golang:1.14.1-alpine3.11 as go-builder RUN apk add make git COPY Makefile /src/Makefile COPY go.mod /src/go.mod diff --git a/go.mod b/go.mod index 2c1aab3c2..9778039e7 100644 --- a/go.mod +++ b/go.mod @@ -13,10 +13,10 @@ require ( github.com/gin-contrib/gzip v0.0.1 github.com/gin-contrib/static v0.0.0-20191128031702-f81c604d8ac2 github.com/gin-gonic/contrib v0.0.0-20191209060500-d6e26eeaa607 - github.com/gin-gonic/gin v1.5.0 + github.com/gin-gonic/gin v1.6.1 github.com/go-bindata/go-bindata/v3 v3.1.3 github.com/go-openapi/errors v0.19.4 - github.com/go-openapi/runtime v0.19.12 + github.com/go-openapi/runtime v0.19.14 github.com/go-openapi/strfmt v0.19.5 github.com/go-openapi/swag v0.19.8 github.com/go-openapi/validate v0.19.7 @@ -24,14 +24,14 @@ require ( github.com/google/go-cmp v0.4.0 github.com/hansrodtang/randomcolor v0.0.0-20160512071917-d27108b3d7a5 github.com/jarcoal/httpmock v1.0.5 - github.com/knadh/koanf v0.8.1 - github.com/mitchellh/mapstructure v1.1.2 + github.com/knadh/koanf v0.8.2 + github.com/mitchellh/mapstructure v1.2.2 github.com/patrickmn/go-cache v2.1.1-0.20180815053127-5633e0862627+incompatible github.com/pmezard/go-difflib v1.0.0 github.com/prometheus/client_golang v1.5.1 github.com/prometheus/common v0.9.1 github.com/rogpeppe/go-internal v1.5.2 - github.com/sirupsen/logrus v1.4.2 + github.com/sirupsen/logrus v1.5.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.6.2 // indirect github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect diff --git a/go.sum b/go.sum index fed5b5b3f..02d38d7aa 100644 --- a/go.sum +++ b/go.sum @@ -81,6 +81,8 @@ github.com/gin-gonic/contrib v0.0.0-20191209060500-d6e26eeaa607/go.mod h1:iqneQ2 github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y= github.com/gin-gonic/gin v1.5.0 h1:fi+bqFAx/oLK54somfCtEZs9HeH1LHVoEPUgARpTqyc= github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do= +github.com/gin-gonic/gin v1.6.1 h1:o2JrfzL6NvnLVI/h1x4E+E9nocCp66GEKqPfhoCjlTs= +github.com/gin-gonic/gin v1.6.1/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/go-bindata/go-bindata/v3 v3.1.3 h1:F0nVttLC3ws0ojc7p60veTurcOm//D4QBODNM7EGrCI= @@ -129,8 +131,8 @@ github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCs github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= -github.com/go-openapi/runtime v0.19.12 h1:5lQlCr1HL0ZVRPL+0PHKhRpMCSPMV2qF842rhQx8CYY= -github.com/go-openapi/runtime v0.19.12/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo= +github.com/go-openapi/runtime v0.19.14 h1:/k1/W4Cgs73kOdlPCaZCu77jC1FHhNY6sUOnVvtOX94= +github.com/go-openapi/runtime v0.19.14/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo= github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= @@ -157,10 +159,18 @@ github.com/go-openapi/validate v0.19.3 h1:PAH/2DylwWcIU1s0Y7k3yNmeAgWOcKrNE2Q7Ww github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo= github.com/go-openapi/validate v0.19.7 h1:fR4tP2xc+25pdo5Qvv4v6g+5QKFgNg8nrifTE7V8ibA= github.com/go-openapi/validate v0.19.7/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= +github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.12.1 h1:2FITxuFt/xuCNP1Acdhv62OzaCiviiE4kotfhkmOqEc= github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM= +github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/universal-translator v0.16.0 h1:X++omBR/4cE2MNg91AoC3rmGrCjJ8eAeUP/K/EKx4DM= github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY= +github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY= +github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= @@ -200,6 +210,8 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM= @@ -284,8 +296,8 @@ github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/knadh/koanf v0.8.1 h1:4VLACWqrkWRQIup3ooq6lOnaSbOJSNO+YVXnJn/NPZ8= -github.com/knadh/koanf v0.8.1/go.mod h1:kVvmDbXnBtW49Czi4c1M+nnOWF0YSNZ8BaKvE/bCO1w= +github.com/knadh/koanf v0.8.2 h1:/r/OHqjeAK/E7G5feF7NsXGONlBm3uGPYsl7X74eMD4= +github.com/knadh/koanf v0.8.2/go.mod h1:kVvmDbXnBtW49Czi4c1M+nnOWF0YSNZ8BaKvE/bCO1w= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -298,6 +310,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/leodido/go-urn v1.1.0 h1:Sm1gr51B1kKyfD2BlRcLSiEkffoG96g6TPv6eRoEiB8= github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw= +github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= @@ -320,6 +334,8 @@ github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= @@ -329,6 +345,8 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.2.2 h1:dxe5oCinTXiTIcfgmZecdCzPmAJKd46KsCWc35r0TV4= +github.com/mitchellh/mapstructure v1.2.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -397,6 +415,8 @@ github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOms github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q= +github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= @@ -522,6 +542,7 @@ golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82 h1:ywK/j/KkyTHcdyYSZNXGjMwgmDSfjglYZ3vStQ/gSCU= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/internal/mapper/v017/Dockerfile b/internal/mapper/v017/Dockerfile index 1cdede900..8e5492d1b 100644 --- a/internal/mapper/v017/Dockerfile +++ b/internal/mapper/v017/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/goswagger/swagger:v0.22.0 +FROM quay.io/goswagger/swagger:v0.23.0 RUN apk add curl diff --git a/internal/mapper/v017/client/alert/get_alerts_parameters.go b/internal/mapper/v017/client/alert/get_alerts_parameters.go index ae188480d..078067a5c 100644 --- a/internal/mapper/v017/client/alert/get_alerts_parameters.go +++ b/internal/mapper/v017/client/alert/get_alerts_parameters.go @@ -13,9 +13,8 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/runtime" cr "github.com/go-openapi/runtime/client" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" - - strfmt "github.com/go-openapi/strfmt" ) // NewGetAlertsParams creates a new GetAlertsParams object diff --git a/internal/mapper/v017/client/alert/get_alerts_responses.go b/internal/mapper/v017/client/alert/get_alerts_responses.go index 021e74e23..ef8278be0 100644 --- a/internal/mapper/v017/client/alert/get_alerts_responses.go +++ b/internal/mapper/v017/client/alert/get_alerts_responses.go @@ -10,8 +10,7 @@ import ( "io" "github.com/go-openapi/runtime" - - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/prymitive/karma/internal/mapper/v017/models" ) diff --git a/internal/mapper/v017/client/alert/post_alerts_parameters.go b/internal/mapper/v017/client/alert/post_alerts_parameters.go index ea563bffc..ed72e82d3 100644 --- a/internal/mapper/v017/client/alert/post_alerts_parameters.go +++ b/internal/mapper/v017/client/alert/post_alerts_parameters.go @@ -13,8 +13,7 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/runtime" cr "github.com/go-openapi/runtime/client" - - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/prymitive/karma/internal/mapper/v017/models" ) diff --git a/internal/mapper/v017/client/alert/post_alerts_responses.go b/internal/mapper/v017/client/alert/post_alerts_responses.go index 7628a2860..f490efd95 100644 --- a/internal/mapper/v017/client/alert/post_alerts_responses.go +++ b/internal/mapper/v017/client/alert/post_alerts_responses.go @@ -10,8 +10,7 @@ import ( "io" "github.com/go-openapi/runtime" - - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" ) // PostAlertsReader is a Reader for the PostAlerts structure. diff --git a/internal/mapper/v017/client/alertgroup/get_alert_groups_parameters.go b/internal/mapper/v017/client/alertgroup/get_alert_groups_parameters.go index 7e54c1379..49d810ed6 100644 --- a/internal/mapper/v017/client/alertgroup/get_alert_groups_parameters.go +++ b/internal/mapper/v017/client/alertgroup/get_alert_groups_parameters.go @@ -13,9 +13,8 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/runtime" cr "github.com/go-openapi/runtime/client" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" - - strfmt "github.com/go-openapi/strfmt" ) // NewGetAlertGroupsParams creates a new GetAlertGroupsParams object diff --git a/internal/mapper/v017/client/alertgroup/get_alert_groups_responses.go b/internal/mapper/v017/client/alertgroup/get_alert_groups_responses.go index 07fc321c7..db2861345 100644 --- a/internal/mapper/v017/client/alertgroup/get_alert_groups_responses.go +++ b/internal/mapper/v017/client/alertgroup/get_alert_groups_responses.go @@ -10,8 +10,7 @@ import ( "io" "github.com/go-openapi/runtime" - - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/prymitive/karma/internal/mapper/v017/models" ) diff --git a/internal/mapper/v017/client/alertmanager_client.go b/internal/mapper/v017/client/alertmanager_client.go index 7a338aa2c..ef3bff423 100644 --- a/internal/mapper/v017/client/alertmanager_client.go +++ b/internal/mapper/v017/client/alertmanager_client.go @@ -6,9 +6,8 @@ package client // Editing this file might prove futile when you re-run the swagger generate command import ( - httptransport "github.com/go-openapi/runtime/client" - "github.com/go-openapi/runtime" + httptransport "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" "github.com/prymitive/karma/internal/mapper/v017/client/alert" diff --git a/internal/mapper/v017/client/general/get_status_parameters.go b/internal/mapper/v017/client/general/get_status_parameters.go index 2fae2aee3..3b3408bd5 100644 --- a/internal/mapper/v017/client/general/get_status_parameters.go +++ b/internal/mapper/v017/client/general/get_status_parameters.go @@ -13,8 +13,7 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/runtime" cr "github.com/go-openapi/runtime/client" - - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" ) // NewGetStatusParams creates a new GetStatusParams object diff --git a/internal/mapper/v017/client/general/get_status_responses.go b/internal/mapper/v017/client/general/get_status_responses.go index 5bd1f067d..73d706dbc 100644 --- a/internal/mapper/v017/client/general/get_status_responses.go +++ b/internal/mapper/v017/client/general/get_status_responses.go @@ -10,8 +10,7 @@ import ( "io" "github.com/go-openapi/runtime" - - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/prymitive/karma/internal/mapper/v017/models" ) diff --git a/internal/mapper/v017/client/receiver/get_receivers_parameters.go b/internal/mapper/v017/client/receiver/get_receivers_parameters.go index fd2b08b0d..0a01ce866 100644 --- a/internal/mapper/v017/client/receiver/get_receivers_parameters.go +++ b/internal/mapper/v017/client/receiver/get_receivers_parameters.go @@ -13,8 +13,7 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/runtime" cr "github.com/go-openapi/runtime/client" - - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" ) // NewGetReceiversParams creates a new GetReceiversParams object diff --git a/internal/mapper/v017/client/receiver/get_receivers_responses.go b/internal/mapper/v017/client/receiver/get_receivers_responses.go index d1c19bfb3..46262d406 100644 --- a/internal/mapper/v017/client/receiver/get_receivers_responses.go +++ b/internal/mapper/v017/client/receiver/get_receivers_responses.go @@ -10,8 +10,7 @@ import ( "io" "github.com/go-openapi/runtime" - - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/prymitive/karma/internal/mapper/v017/models" ) diff --git a/internal/mapper/v017/client/silence/delete_silence_parameters.go b/internal/mapper/v017/client/silence/delete_silence_parameters.go index 6b49b3028..fda98d716 100644 --- a/internal/mapper/v017/client/silence/delete_silence_parameters.go +++ b/internal/mapper/v017/client/silence/delete_silence_parameters.go @@ -13,8 +13,7 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/runtime" cr "github.com/go-openapi/runtime/client" - - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" ) // NewDeleteSilenceParams creates a new DeleteSilenceParams object diff --git a/internal/mapper/v017/client/silence/delete_silence_responses.go b/internal/mapper/v017/client/silence/delete_silence_responses.go index 9ff340ed8..f6a00ab20 100644 --- a/internal/mapper/v017/client/silence/delete_silence_responses.go +++ b/internal/mapper/v017/client/silence/delete_silence_responses.go @@ -10,8 +10,7 @@ import ( "io" "github.com/go-openapi/runtime" - - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" ) // DeleteSilenceReader is a Reader for the DeleteSilence structure. diff --git a/internal/mapper/v017/client/silence/get_silence_parameters.go b/internal/mapper/v017/client/silence/get_silence_parameters.go index bd6f34504..249ec156a 100644 --- a/internal/mapper/v017/client/silence/get_silence_parameters.go +++ b/internal/mapper/v017/client/silence/get_silence_parameters.go @@ -13,8 +13,7 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/runtime" cr "github.com/go-openapi/runtime/client" - - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" ) // NewGetSilenceParams creates a new GetSilenceParams object diff --git a/internal/mapper/v017/client/silence/get_silence_responses.go b/internal/mapper/v017/client/silence/get_silence_responses.go index 7dfdf7b1a..8f24ee9df 100644 --- a/internal/mapper/v017/client/silence/get_silence_responses.go +++ b/internal/mapper/v017/client/silence/get_silence_responses.go @@ -10,8 +10,7 @@ import ( "io" "github.com/go-openapi/runtime" - - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/prymitive/karma/internal/mapper/v017/models" ) diff --git a/internal/mapper/v017/client/silence/get_silences_parameters.go b/internal/mapper/v017/client/silence/get_silences_parameters.go index 687d1fb28..c1d50ff4c 100644 --- a/internal/mapper/v017/client/silence/get_silences_parameters.go +++ b/internal/mapper/v017/client/silence/get_silences_parameters.go @@ -13,9 +13,8 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/runtime" cr "github.com/go-openapi/runtime/client" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" - - strfmt "github.com/go-openapi/strfmt" ) // NewGetSilencesParams creates a new GetSilencesParams object diff --git a/internal/mapper/v017/client/silence/get_silences_responses.go b/internal/mapper/v017/client/silence/get_silences_responses.go index a320ef285..718c1fa4f 100644 --- a/internal/mapper/v017/client/silence/get_silences_responses.go +++ b/internal/mapper/v017/client/silence/get_silences_responses.go @@ -10,8 +10,7 @@ import ( "io" "github.com/go-openapi/runtime" - - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/prymitive/karma/internal/mapper/v017/models" ) diff --git a/internal/mapper/v017/client/silence/post_silences_parameters.go b/internal/mapper/v017/client/silence/post_silences_parameters.go index e3e0bab0f..9545b4b0f 100644 --- a/internal/mapper/v017/client/silence/post_silences_parameters.go +++ b/internal/mapper/v017/client/silence/post_silences_parameters.go @@ -13,8 +13,7 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/runtime" cr "github.com/go-openapi/runtime/client" - - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/prymitive/karma/internal/mapper/v017/models" ) diff --git a/internal/mapper/v017/client/silence/post_silences_responses.go b/internal/mapper/v017/client/silence/post_silences_responses.go index 26942c527..a5d2a7e42 100644 --- a/internal/mapper/v017/client/silence/post_silences_responses.go +++ b/internal/mapper/v017/client/silence/post_silences_responses.go @@ -10,9 +10,8 @@ import ( "io" "github.com/go-openapi/runtime" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" - - strfmt "github.com/go-openapi/strfmt" ) // PostSilencesReader is a Reader for the PostSilences structure. diff --git a/internal/mapper/v017/models/alert.go b/internal/mapper/v017/models/alert.go index 79b05d65b..50bd77585 100644 --- a/internal/mapper/v017/models/alert.go +++ b/internal/mapper/v017/models/alert.go @@ -7,12 +7,13 @@ package models import ( "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) // Alert alert +// // swagger:model alert type Alert struct { diff --git a/internal/mapper/v017/models/alert_group.go b/internal/mapper/v017/models/alert_group.go index 086ae8bc2..4f20e2b1a 100644 --- a/internal/mapper/v017/models/alert_group.go +++ b/internal/mapper/v017/models/alert_group.go @@ -9,12 +9,13 @@ import ( "strconv" "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) // AlertGroup alert group +// // swagger:model alertGroup type AlertGroup struct { diff --git a/internal/mapper/v017/models/alert_groups.go b/internal/mapper/v017/models/alert_groups.go index f01413d33..f342542a1 100644 --- a/internal/mapper/v017/models/alert_groups.go +++ b/internal/mapper/v017/models/alert_groups.go @@ -9,11 +9,12 @@ import ( "strconv" "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" ) // AlertGroups alert groups +// // swagger:model alertGroups type AlertGroups []*AlertGroup diff --git a/internal/mapper/v017/models/alert_status.go b/internal/mapper/v017/models/alert_status.go index adb414691..85ab28191 100644 --- a/internal/mapper/v017/models/alert_status.go +++ b/internal/mapper/v017/models/alert_status.go @@ -9,12 +9,13 @@ import ( "encoding/json" "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) // AlertStatus alert status +// // swagger:model alertStatus type AlertStatus struct { diff --git a/internal/mapper/v017/models/alertmanager_config.go b/internal/mapper/v017/models/alertmanager_config.go index c2f702cd4..c185cf380 100644 --- a/internal/mapper/v017/models/alertmanager_config.go +++ b/internal/mapper/v017/models/alertmanager_config.go @@ -7,12 +7,13 @@ package models import ( "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) // AlertmanagerConfig alertmanager config +// // swagger:model alertmanagerConfig type AlertmanagerConfig struct { diff --git a/internal/mapper/v017/models/alertmanager_status.go b/internal/mapper/v017/models/alertmanager_status.go index f85112e5b..3b16faf4d 100644 --- a/internal/mapper/v017/models/alertmanager_status.go +++ b/internal/mapper/v017/models/alertmanager_status.go @@ -7,12 +7,13 @@ package models import ( "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) // AlertmanagerStatus alertmanager status +// // swagger:model alertmanagerStatus type AlertmanagerStatus struct { diff --git a/internal/mapper/v017/models/cluster_status.go b/internal/mapper/v017/models/cluster_status.go index 77a1be8ac..bc1ba28e2 100644 --- a/internal/mapper/v017/models/cluster_status.go +++ b/internal/mapper/v017/models/cluster_status.go @@ -10,12 +10,13 @@ import ( "strconv" "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) // ClusterStatus cluster status +// // swagger:model clusterStatus type ClusterStatus struct { diff --git a/internal/mapper/v017/models/gettable_alert.go b/internal/mapper/v017/models/gettable_alert.go index 153ecac8c..caadae736 100644 --- a/internal/mapper/v017/models/gettable_alert.go +++ b/internal/mapper/v017/models/gettable_alert.go @@ -9,12 +9,13 @@ import ( "strconv" "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) // GettableAlert gettable alert +// // swagger:model gettableAlert type GettableAlert struct { @@ -143,7 +144,6 @@ func (m GettableAlert) MarshalJSON() ([]byte, error) { return nil, err } _parts = append(_parts, aO1) - return swag.ConcatJSON(_parts...), nil } diff --git a/internal/mapper/v017/models/gettable_alerts.go b/internal/mapper/v017/models/gettable_alerts.go index 5b5e85006..b40f9b3e2 100644 --- a/internal/mapper/v017/models/gettable_alerts.go +++ b/internal/mapper/v017/models/gettable_alerts.go @@ -9,11 +9,12 @@ import ( "strconv" "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" ) // GettableAlerts gettable alerts +// // swagger:model gettableAlerts type GettableAlerts []*GettableAlert diff --git a/internal/mapper/v017/models/gettable_silence.go b/internal/mapper/v017/models/gettable_silence.go index f644c488c..b9d01bba0 100644 --- a/internal/mapper/v017/models/gettable_silence.go +++ b/internal/mapper/v017/models/gettable_silence.go @@ -7,12 +7,13 @@ package models import ( "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) // GettableSilence gettable silence +// // swagger:model gettableSilence type GettableSilence struct { @@ -91,7 +92,6 @@ func (m GettableSilence) MarshalJSON() ([]byte, error) { return nil, err } _parts = append(_parts, aO1) - return swag.ConcatJSON(_parts...), nil } diff --git a/internal/mapper/v017/models/gettable_silences.go b/internal/mapper/v017/models/gettable_silences.go index 0726299a9..7c4cb59ef 100644 --- a/internal/mapper/v017/models/gettable_silences.go +++ b/internal/mapper/v017/models/gettable_silences.go @@ -9,11 +9,12 @@ import ( "strconv" "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" ) // GettableSilences gettable silences +// // swagger:model gettableSilences type GettableSilences []*GettableSilence diff --git a/internal/mapper/v017/models/label_set.go b/internal/mapper/v017/models/label_set.go index cc6ff758f..b8bf22cb5 100644 --- a/internal/mapper/v017/models/label_set.go +++ b/internal/mapper/v017/models/label_set.go @@ -6,10 +6,11 @@ package models // Editing this file might prove futile when you re-run the swagger generate command import ( - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" ) // LabelSet label set +// // swagger:model labelSet type LabelSet map[string]string diff --git a/internal/mapper/v017/models/matcher.go b/internal/mapper/v017/models/matcher.go index c416d60c1..fdf47561e 100644 --- a/internal/mapper/v017/models/matcher.go +++ b/internal/mapper/v017/models/matcher.go @@ -7,12 +7,13 @@ package models import ( "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) // Matcher matcher +// // swagger:model matcher type Matcher struct { diff --git a/internal/mapper/v017/models/matchers.go b/internal/mapper/v017/models/matchers.go index c0f80bbdf..7c90ac6b3 100644 --- a/internal/mapper/v017/models/matchers.go +++ b/internal/mapper/v017/models/matchers.go @@ -9,12 +9,13 @@ import ( "strconv" "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) // Matchers matchers +// // swagger:model matchers type Matchers []*Matcher diff --git a/internal/mapper/v017/models/peer_status.go b/internal/mapper/v017/models/peer_status.go index f5383075b..f6e8a8c34 100644 --- a/internal/mapper/v017/models/peer_status.go +++ b/internal/mapper/v017/models/peer_status.go @@ -7,12 +7,13 @@ package models import ( "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) // PeerStatus peer status +// // swagger:model peerStatus type PeerStatus struct { diff --git a/internal/mapper/v017/models/postable_alert.go b/internal/mapper/v017/models/postable_alert.go index 99e1a3bc7..4ef77b25b 100644 --- a/internal/mapper/v017/models/postable_alert.go +++ b/internal/mapper/v017/models/postable_alert.go @@ -7,12 +7,13 @@ package models import ( "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) // PostableAlert postable alert +// // swagger:model postableAlert type PostableAlert struct { @@ -89,7 +90,6 @@ func (m PostableAlert) MarshalJSON() ([]byte, error) { return nil, err } _parts = append(_parts, aO1) - return swag.ConcatJSON(_parts...), nil } diff --git a/internal/mapper/v017/models/postable_alerts.go b/internal/mapper/v017/models/postable_alerts.go index fccd5d612..0418516e7 100644 --- a/internal/mapper/v017/models/postable_alerts.go +++ b/internal/mapper/v017/models/postable_alerts.go @@ -9,11 +9,12 @@ import ( "strconv" "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" ) // PostableAlerts postable alerts +// // swagger:model postableAlerts type PostableAlerts []*PostableAlert diff --git a/internal/mapper/v017/models/postable_silence.go b/internal/mapper/v017/models/postable_silence.go index 0411b0d25..0f1ab5538 100644 --- a/internal/mapper/v017/models/postable_silence.go +++ b/internal/mapper/v017/models/postable_silence.go @@ -7,11 +7,12 @@ package models import ( "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" ) // PostableSilence postable silence +// // swagger:model postableSilence type PostableSilence struct { @@ -64,7 +65,6 @@ func (m PostableSilence) MarshalJSON() ([]byte, error) { return nil, err } _parts = append(_parts, aO1) - return swag.ConcatJSON(_parts...), nil } diff --git a/internal/mapper/v017/models/receiver.go b/internal/mapper/v017/models/receiver.go index cadc52406..5fd71b081 100644 --- a/internal/mapper/v017/models/receiver.go +++ b/internal/mapper/v017/models/receiver.go @@ -7,12 +7,13 @@ package models import ( "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) // Receiver receiver +// // swagger:model receiver type Receiver struct { diff --git a/internal/mapper/v017/models/silence.go b/internal/mapper/v017/models/silence.go index b96ef98a3..0c86021e5 100644 --- a/internal/mapper/v017/models/silence.go +++ b/internal/mapper/v017/models/silence.go @@ -7,12 +7,13 @@ package models import ( "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) // Silence silence +// // swagger:model silence type Silence struct { diff --git a/internal/mapper/v017/models/silence_status.go b/internal/mapper/v017/models/silence_status.go index 637cc5078..bc2d28cd2 100644 --- a/internal/mapper/v017/models/silence_status.go +++ b/internal/mapper/v017/models/silence_status.go @@ -9,12 +9,13 @@ import ( "encoding/json" "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) // SilenceStatus silence status +// // swagger:model silenceStatus type SilenceStatus struct { diff --git a/internal/mapper/v017/models/version_info.go b/internal/mapper/v017/models/version_info.go index 4d541b721..41235bfb8 100644 --- a/internal/mapper/v017/models/version_info.go +++ b/internal/mapper/v017/models/version_info.go @@ -7,12 +7,13 @@ package models import ( "github.com/go-openapi/errors" - strfmt "github.com/go-openapi/strfmt" + "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" "github.com/go-openapi/validate" ) // VersionInfo version info +// // swagger:model versionInfo type VersionInfo struct { diff --git a/ui/package-lock.json b/ui/package-lock.json index bf78a4300..be6e41ec8 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -1669,32 +1669,32 @@ "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, "@fortawesome/fontawesome-common-types": { - "version": "0.2.27", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.27.tgz", - "integrity": "sha512-97GaByGaXDGMkzcJX7VmR/jRJd8h1mfhtA7RsxDBN61GnWE/PPCZhOdwG/8OZYktiRUF0CvFOr+VgRkJrt6TWg==" + "version": "0.2.28", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.28.tgz", + "integrity": "sha512-gtis2/5yLdfI6n0ia0jH7NJs5i/Z/8M/ZbQL6jXQhCthEOe5Cr5NcQPhgTvFxNOtURE03/ZqUcEskdn2M+QaBg==" }, "@fortawesome/fontawesome-svg-core": { - "version": "1.2.27", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.27.tgz", - "integrity": "sha512-sOD3DKynocnHYpuw2sLPnTunDj7rLk91LYhi2axUYwuGe9cPCw7Bsu9EWtVdNJP+IYgTCZIbyARKXuy5K/nv+Q==", + "version": "1.2.28", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.28.tgz", + "integrity": "sha512-4LeaNHWvrneoU0i8b5RTOJHKx7E+y7jYejplR7uSVB34+mp3Veg7cbKk7NBCLiI4TyoWS1wh9ZdoyLJR8wSAdg==", "requires": { - "@fortawesome/fontawesome-common-types": "^0.2.27" + "@fortawesome/fontawesome-common-types": "^0.2.28" } }, "@fortawesome/free-regular-svg-icons": { - "version": "5.12.1", - "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.12.1.tgz", - "integrity": "sha512-bGda18seHXb+24K6DPUFzqn4kG7B+JViP/BscMcNUXvT00M86xNhdgP2TXSdflQXn53QWqymKjx/8rhaDOJyhA==", + "version": "5.13.0", + "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.13.0.tgz", + "integrity": "sha512-70FAyiS5j+ANYD4dh9NGowTorNDnyvQHHpCM7FpnF7GxtDjBUCKdrFqCPzesEIpNDFNd+La3vex+jDk4nnUfpA==", "requires": { - "@fortawesome/fontawesome-common-types": "^0.2.27" + "@fortawesome/fontawesome-common-types": "^0.2.28" } }, "@fortawesome/free-solid-svg-icons": { - "version": "5.12.1", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.12.1.tgz", - "integrity": "sha512-k3MwRFFUhyL4cuCJSaHDA0YNYMELDXX0h8JKtWYxO5XD3Dn+maXOMrVAAiNGooUyM2v/wz/TOaM0jxYVKeXX7g==", + "version": "5.13.0", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.13.0.tgz", + "integrity": "sha512-IHUgDJdomv6YtG4p3zl1B5wWf9ffinHIvebqQOmV3U+3SLw4fC+LUCCgwfETkbTtjy5/Qws2VoVf6z/ETQpFpg==", "requires": { - "@fortawesome/fontawesome-common-types": "^0.2.27" + "@fortawesome/fontawesome-common-types": "^0.2.28" } }, "@fortawesome/react-fontawesome": { @@ -2536,59 +2536,59 @@ } }, "@sentry/browser": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.14.2.tgz", - "integrity": "sha512-Vuuy2E5mt2VQKeHpFqtowZdKUe1Ui7J2KmgZQCduVilM7dFmprdXfv/mQ3Uv+73VIiCd22PpxojR3peDksb/Gg==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.15.0.tgz", + "integrity": "sha512-9sgqWGaoT5jb3vk8sgQ1bz1LzhUf3oKoDMp/c6vX0reuA6Vz+/jwOC7a/FPWtQir2PwRJfbak2QOxw8W6Mwa3g==", "requires": { - "@sentry/core": "5.14.2", - "@sentry/types": "5.14.2", - "@sentry/utils": "5.14.2", + "@sentry/core": "5.15.0", + "@sentry/types": "5.15.0", + "@sentry/utils": "5.15.0", "tslib": "^1.9.3" } }, "@sentry/core": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.14.2.tgz", - "integrity": "sha512-B2XjUMCmVu4H3s5hapgynhb28MSc+irt9wRI9j0Lbjx2cxsCUr/YFGL8GuEuYwf4zXNKnh2ke6t+I37OlSaGOg==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.15.0.tgz", + "integrity": "sha512-ujwHMwinPwuADoIBFjh1BiC6Li7RpEG3Mmo0MxOqKm7xKngkRUk5uH5e36roORnx+ngr/3NCe80QuvSqK7gQsw==", "requires": { - "@sentry/hub": "5.14.2", - "@sentry/minimal": "5.14.2", - "@sentry/types": "5.14.2", - "@sentry/utils": "5.14.2", + "@sentry/hub": "5.15.0", + "@sentry/minimal": "5.15.0", + "@sentry/types": "5.15.0", + "@sentry/utils": "5.15.0", "tslib": "^1.9.3" } }, "@sentry/hub": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.14.2.tgz", - "integrity": "sha512-0ckTDnhCANkuY+VepMPz5vl/dkFQnWmzlJiCIxgM5fCgAF8dfNd9VhGn0qVQXnzKPGoW9zxs/uAmH3/XFqqmNA==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.15.0.tgz", + "integrity": "sha512-wIDcaIuaYpg+Ma01NfFQTOnZLDCKSx2D06TTBqlo93WfMFNgyEgdMbU5Fk1PFZzjj2AMtzlc9DJzAfvt1hZx3w==", "requires": { - "@sentry/types": "5.14.2", - "@sentry/utils": "5.14.2", + "@sentry/types": "5.15.0", + "@sentry/utils": "5.15.0", "tslib": "^1.9.3" } }, "@sentry/minimal": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.14.2.tgz", - "integrity": "sha512-uih9a8KwFCQrWaGb3UxkrSntxMRT4EIlud158ZKlrsLaCOE6i08unOR4xWqlrXlKPySq16H4wjbBFQ56ogOWdQ==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.15.0.tgz", + "integrity": "sha512-VBkMfR6ahmuJrx4V51BNYd6XzGZ7GB8sfnBufMzqK6MsKe+g5oSyXeqHFd4oFC0co0YlFIw7IphF2JZLwVs0zA==", "requires": { - "@sentry/hub": "5.14.2", - "@sentry/types": "5.14.2", + "@sentry/hub": "5.15.0", + "@sentry/types": "5.15.0", "tslib": "^1.9.3" } }, "@sentry/types": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.14.2.tgz", - "integrity": "sha512-NtB/o+/whR/mJJf67Nvdab7E2+/THgAUY114FWFqDLHMaoiIVWy9J/yLKtQWymwuQslh7zpPxjA1AhqTJerVCg==" + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.15.0.tgz", + "integrity": "sha512-MC96wUAHhzRuH3xo4Qd+EXTOap8+d+SWbAdLBukScxuwhOSY/HNRh1TW17CuAu7s1oXa7xxO2ZCdyamSZinIiQ==" }, "@sentry/utils": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.14.2.tgz", - "integrity": "sha512-DV9/kw/O8o5xqvQYwITm0lBaBqS4RKicjguWYJQ/+F94P/SKxuXor7EE0iMDYvUGslvPz8TlgB7r+nb/YRl+Fg==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.15.0.tgz", + "integrity": "sha512-td+wSBdVUPO3mEPcEHZwJiVEQ0+wplJCHBvM1PHqwQd+miB2mQAaiSkzdAAHzUpTeqPBI3rzjWPn59WkCcVF5Q==", "requires": { - "@sentry/types": "5.14.2", + "@sentry/types": "5.15.0", "tslib": "^1.9.3" } }, @@ -4373,9 +4373,9 @@ } }, "@storybook/node-logger": { - "version": "5.3.14", - "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-5.3.14.tgz", - "integrity": "sha512-/phRS49/hMZ5SU4EKUxX2kFepm9iw1cJBzggOz0GA1Yj4r9g1TA1H+OD7QvZvVTC3AESf/ZUJyaqnXEh/l+hpg==", + "version": "5.3.17", + "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-5.3.17.tgz", + "integrity": "sha512-onfcxl37BYZI1HGuPI9MelkyUWjn7NpfN8RUYdqG9P6WKiIY5xbpG0V6qod5jvIKIypK0NmfJTtneOu46L/oDg==", "dev": true, "requires": { "@types/npmlog": "^4.1.2", @@ -4387,21 +4387,38 @@ } }, "@storybook/preset-create-react-app": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@storybook/preset-create-react-app/-/preset-create-react-app-2.0.0.tgz", - "integrity": "sha512-EvYvQWtJRiLrO3aL6fnawDyujMXQOSD1KO74k60cE8XLASm9slGtzeyrz/Awpb9eZHFS8dUx9cyMv1dm53CxJw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@storybook/preset-create-react-app/-/preset-create-react-app-2.1.1.tgz", + "integrity": "sha512-ywnpCr7gHuIv/fv8yiQHLY8RikQRqn401CPTKh5nsWwkUbIOQ47Cyewjo2QuVTpivOLLuyJiIpq1jAAS1iW2Ow==", "dev": true, "requires": { - "@storybook/node-logger": "^5.3.14", + "@storybook/node-logger": "^5.3.17", + "@types/babel__core": "^7.1.6", "@types/webpack": "^4.41.7", + "pnp-webpack-plugin": "^1.6.4", "semver": "^7.1.3" }, "dependencies": { + "pnp-webpack-plugin": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz", + "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==", + "dev": true, + "requires": { + "ts-pnp": "^1.1.6" + } + }, "semver": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz", "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==", "dev": true + }, + "ts-pnp": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.6.tgz", + "integrity": "sha512-CrG5GqAAzMT7144Cl+UIFP7mz/iIhiy+xQ6GGcnjTezhALT02uPMRw7tgDSESgB5MsfKt55+GPWw4ir1kVtMIQ==", + "dev": true } } }, @@ -5823,9 +5840,9 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" }, "@types/node": { - "version": "12.12.21", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.21.tgz", - "integrity": "sha512-8sRGhbpU+ck1n0PGAUgVrWrWdjSW2aqNeyC15W88GRsMpSwzv6RJGlLhE7s2RhVSOdyDmxbqlWSeThq4/7xqlA==" + "version": "12.12.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.31.tgz", + "integrity": "sha512-T+wnJno8uh27G9c+1T+a1/WYCHzLeDqtsGJkoEdSp2X8RTh3oOCZQcUnjAx90CS8cmmADX51O0FI/tu9s0yssg==" }, "@types/npmlog": { "version": "4.1.2", @@ -5859,9 +5876,9 @@ } }, "@types/react": { - "version": "16.9.23", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.23.tgz", - "integrity": "sha512-SsGVT4E7L2wLN3tPYLiF20hmZTPGuzaayVunfgXzUn1x4uHVsKH6QDJQ/TdpHqwsTLd4CwrmQ2vOgxN7gE24gw==", + "version": "16.9.25", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.25.tgz", + "integrity": "sha512-Dlj2V72cfYLPNscIG3/SMUOzhzj7GK3bpSrfefwt2YT9GLynvLCCZjbhyF6VsT0q0+aRACRX03TDJGb7cA0cqg==", "requires": { "@types/prop-types": "*", "csstype": "^2.2.0" @@ -5928,9 +5945,9 @@ } }, "@types/webpack": { - "version": "4.41.7", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.7.tgz", - "integrity": "sha512-OQG9viYwO0V1NaNV7d0n79V+n6mjOV30CwgFPIfTzwmk8DHbt+C4f2aBGdCYbo3yFyYD6sjXfqqOjwkl1j+ulA==", + "version": "4.41.8", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.8.tgz", + "integrity": "sha512-mh4litLHTlDG84TGCFv1pZldndI34vkrW9Mks++Zx4KET7DRMoCXUvLbTISiuF4++fMgNnhV9cc1nCXJQyBYbQ==", "dev": true, "requires": { "@types/anymatch": "*", @@ -5956,9 +5973,9 @@ "dev": true }, "@types/webpack-sources": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.6.tgz", - "integrity": "sha512-FtAWR7wR5ocJ9+nP137DV81tveD/ZgB1sadnJ/axUGM3BUVfRPx8oQNMtv3JNfTeHx3VP7cXiyfR/jmtEsVHsQ==", + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.7.tgz", + "integrity": "sha512-XyaHrJILjK1VHVC4aVlKsdNN5KBTwufMb43cQs+flGxtPAf/1Qwl8+Q0tp5BwEGaI8D6XT1L+9bSWXckgkjTLw==", "dev": true, "requires": { "@types/node": "*", @@ -9362,9 +9379,9 @@ } }, "date-fns": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.10.0.tgz", - "integrity": "sha512-EhfEKevYGWhWlZbNeplfhIU/+N+x0iCIx7VzKlXma2EdQyznVlZhCptXUY+BegNpPW2kjdx15Rvq503YcXXrcA==" + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.11.0.tgz", + "integrity": "sha512-8P1cDi8ebZyDxUyUprBXwidoEtiQAawYPGvpfb+Dg0G6JrQ+VozwOmm91xYC0vAv1+0VmLehEPb+isg4BGUFfA==" }, "debug": { "version": "2.6.9", @@ -9679,14 +9696,6 @@ "utila": "~0.4" } }, - "dom-helpers": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz", - "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==", - "requires": { - "@babel/runtime": "^7.1.2" - } - }, "dom-serializer": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", @@ -11165,9 +11174,9 @@ } }, "fetch-mock": { - "version": "9.2.1", - "resolved": "https://registry.npmjs.org/fetch-mock/-/fetch-mock-9.2.1.tgz", - "integrity": "sha512-VgnqSA7KUI9uJceekpzrVyJvy3U6qZo2BmzVz8RuWvF4Wc5EV7TbFFZwQM7OGV4CKmsMPYarOyxqd74aM3xO3w==", + "version": "9.3.1", + "resolved": "https://registry.npmjs.org/fetch-mock/-/fetch-mock-9.3.1.tgz", + "integrity": "sha512-zt2QUNYuR1kVCG8vGV+awxe/dtH/ufjpu2EA08v04eAVu3Rnt1P8Df8//VJrtxIx6tAdH+NHuCkb/Z69HUOT9A==", "dev": true, "requires": { "babel-runtime": "^6.26.0", @@ -19104,9 +19113,9 @@ "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" }, "qs": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz", - "integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==" + "version": "6.9.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz", + "integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==" }, "query-string": { "version": "4.3.4", @@ -19256,9 +19265,9 @@ } }, "react": { - "version": "16.13.0", - "resolved": "https://registry.npmjs.org/react/-/react-16.13.0.tgz", - "integrity": "sha512-TSavZz2iSLkq5/oiE7gnFzmURKZMltmi193rm5HEoUDAXpzT9Kzw6oNZnGoai/4+fUnm7FqS5dwgUL34TujcWQ==", + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz", + "integrity": "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", @@ -19313,9 +19322,9 @@ "integrity": "sha512-uS6cFyJ2WR0F0xfCjmJ3TGwH+no/JOs8cDKNTPMWKWSJdosmHPCk8io4ZrDyz5dKJmSI5X2T5eJqnasawe6wew==" }, "react-datepicker": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-2.14.0.tgz", - "integrity": "sha512-9TUDNj0zoeQT3ey6i7Dv4NLcqONyYqXNEOLA3++HwQKR5NK4eRoG4QaohM/5XmWw2tDpJWpl3ByCWP4kWQtqgQ==", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-2.14.1.tgz", + "integrity": "sha512-8eWHvrjXfKVkt5rERXC6/c/eEdcE2stIsl+QmTO5Efgpacf8MOCyVpBisJLVLDYjVlENczhOcRlIzvraODHKxA==", "requires": { "classnames": "^2.2.6", "date-fns": "^2.0.1", @@ -19595,14 +19604,25 @@ } }, "react-dom": { - "version": "16.13.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.0.tgz", - "integrity": "sha512-y09d2c4cG220DzdlFkPTnVvGTszVvNpC73v+AaLGLHbkpy3SSgvYq8x0rNwPJ/Rk/CicTNgk0hbHNw1gMEZAXg==", + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz", + "integrity": "sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "scheduler": "^0.19.0" + "scheduler": "^0.19.1" + }, + "dependencies": { + "scheduler": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", + "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + } + } } }, "react-draggable": { @@ -19731,7 +19751,8 @@ "react-lifecycles-compat": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", - "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" + "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==", + "dev": true }, "react-linkify": { "version": "0.2.2", @@ -19879,9 +19900,9 @@ } }, "react-select": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/react-select/-/react-select-3.0.8.tgz", - "integrity": "sha512-v9LpOhckLlRmXN5A6/mGGEft4FMrfaBFTGAnuPHcUgVId7Je42kTq9y0Z+Ye5z8/j0XDT3zUqza8gaRaI1PZIg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/react-select/-/react-select-3.1.0.tgz", + "integrity": "sha512-wBFVblBH1iuCBprtpyGtd1dGMadsG36W5/t2Aj8OE6WbByDg5jIFyT7X5gT+l0qmT5TqWhxX+VsKJvCEl2uL9g==", "requires": { "@babel/runtime": "^7.4.4", "@emotion/cache": "^10.0.9", @@ -19890,20 +19911,7 @@ "memoize-one": "^5.0.0", "prop-types": "^15.6.0", "react-input-autosize": "^2.2.2", - "react-transition-group": "^2.2.1" - }, - "dependencies": { - "react-transition-group": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz", - "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==", - "requires": { - "dom-helpers": "^3.4.0", - "loose-envify": "^1.4.0", - "prop-types": "^15.6.2", - "react-lifecycles-compat": "^3.0.4" - } - } + "react-transition-group": "^4.3.0" } }, "react-sizeme": { @@ -20984,6 +20992,7 @@ "version": "0.19.0", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.0.tgz", "integrity": "sha512-xowbVaTPe9r7y7RUejcK73/j8tt2jfiyTednOvHbA8JoClvMYCp+r8QegLwK/n8zWQAtZb1fFnER4XLBZXrCxA==", + "dev": true, "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -21549,9 +21558,9 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" }, "source-map-explorer": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/source-map-explorer/-/source-map-explorer-2.4.0.tgz", - "integrity": "sha512-gXTmqqMlX1yF9uVZB2p9AvIhgArWvy7V+3NQ2lVgQvyux1eMAgnm3mC+k5mqV+2q7B/uWaFY+RG+fm+1opVkjA==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/source-map-explorer/-/source-map-explorer-2.4.1.tgz", + "integrity": "sha512-aj4C9RzwFUFxmLn27RN4xWgaqRfaTiDjpyg6tOKPsj2muf6gwV7z202M/S/yDNhh7H4t5iYT38BwmM/+2/AoNw==", "dev": true, "requires": { "btoa": "^1.2.1", @@ -21565,7 +21574,7 @@ "open": "^7.0.3", "source-map": "^0.7.3", "temp": "^0.9.1", - "yargs": "^15.3.0" + "yargs": "^15.3.1" }, "dependencies": { "cliui": { @@ -21646,9 +21655,9 @@ } }, "yargs": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz", - "integrity": "sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==", + "version": "15.3.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", + "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==", "dev": true, "requires": { "cliui": "^6.0.0", @@ -21661,13 +21670,13 @@ "string-width": "^4.2.0", "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^18.1.0" + "yargs-parser": "^18.1.1" } }, "yargs-parser": { - "version": "18.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.0.tgz", - "integrity": "sha512-o/Jr6JBOv6Yx3pL+5naWSoIA2jJ+ZkMYQG/ie9qFbukBe4uzmBatlXFOiu/tNKRWEtyf+n5w7jc/O16ufqOTdQ==", + "version": "18.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.1.tgz", + "integrity": "sha512-KRHEsOM16IX7XuLnMOqImcPNbLVXMNHYAoFc3BKR8Ortl5gzDbtXvvEoGx9imk5E+X1VeNKNlcHr8B8vi+7ipA==", "dev": true, "requires": { "camelcase": "^5.0.0", diff --git a/ui/package.json b/ui/package.json index 10a06cdaf..f642e9706 100644 --- a/ui/package.json +++ b/ui/package.json @@ -5,15 +5,15 @@ "private": true, "dependencies": { "@attently/riek": "2.0.1", - "@fortawesome/fontawesome-common-types": "0.2.27", - "@fortawesome/fontawesome-svg-core": "1.2.27", - "@fortawesome/free-regular-svg-icons": "5.12.1", - "@fortawesome/free-solid-svg-icons": "5.12.1", + "@fortawesome/fontawesome-common-types": "0.2.28", + "@fortawesome/fontawesome-svg-core": "1.2.28", + "@fortawesome/free-regular-svg-icons": "5.13.0", + "@fortawesome/free-solid-svg-icons": "5.13.0", "@fortawesome/react-fontawesome": "0.1.9", - "@sentry/browser": "5.14.2", + "@sentry/browser": "5.15.0", "@types/jest": "25.1.4", - "@types/node": "12.12.21", - "@types/react": "16.9.23", + "@types/node": "12.12.31", + "@types/react": "16.9.25", "@types/react-dom": "16.9.5", "body-scroll-lock": "3.0.1", "bootstrap": "4.4.1", @@ -31,13 +31,13 @@ "object-hash": "2.0.3", "promise-retry": "1.1.1", "prop-types": "15.7.2", - "qs": "6.9.1", - "react": "16.13.0", + "qs": "6.9.3", + "react": "16.13.1", "react-app-polyfill": "1.0.6", "react-autosuggest": "9.4.3", "react-collapsible": "2.7.0", - "react-datepicker": "2.14.0", - "react-dom": "16.13.0", + "react-datepicker": "2.14.1", + "react-dom": "16.13.1", "react-highlighter": "0.4.3", "react-hotkeys": "2.0.0", "react-idle-timer": "4.2.12", @@ -53,7 +53,7 @@ "react-resize-detector": "4.2.1", "react-reveal": "1.2.2", "react-scripts": "3.4.0", - "react-select": "3.0.8", + "react-select": "3.1.0", "react-tippy": "1.3.4", "react-transition-group": "4.3.0", "typeface-open-sans": "0.0.75", @@ -76,20 +76,20 @@ "devDependencies": { "@commitlint/travis-cli": "8.3.5", "@percy-io/percy-storybook": "2.1.0", - "@storybook/preset-create-react-app": "2.0.0", + "@storybook/preset-create-react-app": "2.1.1", "@storybook/react": "5.3.17", "diffable-html": "4.0.0", "enzyme": "3.11.0", "enzyme-adapter-react-16": "1.15.2", "eslint-plugin-prettier": "3.1.2", - "fetch-mock": "9.2.1", + "fetch-mock": "9.3.1", "jest-canvas-mock": "2.2.0", "jest-date-mock": "1.0.8", "jest-fetch-mock": "3.0.3", "markdownlint-cli": "0.22.0", "node-sass": "4.13.1", "prettier": "1.19.1", - "source-map-explorer": "2.4.0" + "source-map-explorer": "2.4.1" }, "browserslist": [ ">= 1%", diff --git a/ui/src/Components/MainModal/Configuration/__snapshots__/AlertGroupCollapseConfiguration.test.js.snap b/ui/src/Components/MainModal/Configuration/__snapshots__/AlertGroupCollapseConfiguration.test.js.snap index e22c3e65e..d9dbd1bf6 100644 --- a/ui/src/Components/MainModal/Configuration/__snapshots__/AlertGroupCollapseConfiguration.test.js.snap +++ b/ui/src/Components/MainModal/Configuration/__snapshots__/AlertGroupCollapseConfiguration.test.js.snap @@ -5,7 +5,7 @@ exports[` matches snapshot with default value
-
+
Collapse on mobile
diff --git a/ui/src/Components/MainModal/Configuration/__snapshots__/AlertGroupSortConfiguration.test.js.snap b/ui/src/Components/MainModal/Configuration/__snapshots__/AlertGroupSortConfiguration.test.js.snap index b3d920f18..d65422c5a 100644 --- a/ui/src/Components/MainModal/Configuration/__snapshots__/AlertGroupSortConfiguration.test.js.snap +++ b/ui/src/Components/MainModal/Configuration/__snapshots__/AlertGroupSortConfiguration.test.js.snap @@ -7,7 +7,7 @@ exports[` matches snapshot with default values 1`
-
+
Use defaults from karma config file
diff --git a/ui/src/Components/MainModal/Configuration/__snapshots__/ThemeConfiguration.test.js.snap b/ui/src/Components/MainModal/Configuration/__snapshots__/ThemeConfiguration.test.js.snap index e4ed73342..f279bc988 100644 --- a/ui/src/Components/MainModal/Configuration/__snapshots__/ThemeConfiguration.test.js.snap +++ b/ui/src/Components/MainModal/Configuration/__snapshots__/ThemeConfiguration.test.js.snap @@ -5,7 +5,7 @@ exports[` matches snapshot with default values 1`] = `
-
+
Automatic theme, follow browser preference
diff --git a/ui/src/Components/MainModal/Configuration/__snapshots__/index.test.js.snap b/ui/src/Components/MainModal/Configuration/__snapshots__/index.test.js.snap index eb468e8dd..795c6b915 100644 --- a/ui/src/Components/MainModal/Configuration/__snapshots__/index.test.js.snap +++ b/ui/src/Components/MainModal/Configuration/__snapshots__/index.test.js.snap @@ -153,7 +153,7 @@ exports[` matches snapshot 1`] = `
-
+
Automatic theme, follow browser preference
@@ -390,7 +390,7 @@ exports[` matches snapshot 1`] = `
-
+
Collapse on mobile
@@ -471,7 +471,7 @@ exports[` matches snapshot 1`] = `
-
+
Use defaults from karma config file
diff --git a/ui/src/Components/MainModal/__snapshots__/MainModalContent.test.js.snap b/ui/src/Components/MainModal/__snapshots__/MainModalContent.test.js.snap index fd8b74437..6ed928c0e 100644 --- a/ui/src/Components/MainModal/__snapshots__/MainModalContent.test.js.snap +++ b/ui/src/Components/MainModal/__snapshots__/MainModalContent.test.js.snap @@ -172,7 +172,7 @@ exports[` matches snapshot 1`] = `
-
+
Automatic theme, follow browser preference
@@ -409,7 +409,7 @@ exports[` matches snapshot 1`] = `
-
+
Collapse on mobile
@@ -490,7 +490,7 @@ exports[` matches snapshot 1`] = `
-
+
Use defaults from karma config file
diff --git a/ui/src/Components/MultiSelect/__snapshots__/index.test.js.snap b/ui/src/Components/MultiSelect/__snapshots__/index.test.js.snap index 1bea08bdb..47b6d2992 100644 --- a/ui/src/Components/MultiSelect/__snapshots__/index.test.js.snap +++ b/ui/src/Components/MultiSelect/__snapshots__/index.test.js.snap @@ -4,7 +4,7 @@ exports[` matches snapshot without any extra props 1`] = ` "
-
+
Select...
@@ -65,7 +65,7 @@ exports[` matches snapshot when focused 1`] = `

-
+
Select...
@@ -116,7 +116,7 @@ exports[` matches snapshot with a value 1`] = ` "
-
+
foo
@@ -167,7 +167,7 @@ exports[` matches snapshot with defaults 1`] = ` "
-
+
Select...
@@ -218,7 +218,7 @@ exports[` matches snapshot with isDisabled=true 1`] "
-
+
foo
@@ -270,7 +270,7 @@ exports[` matches snapshot with isMulti=true 1`] = ` "
-
+
Select...
@@ -321,7 +321,7 @@ exports[` matches snapshot with isMulti=true and a v "
-
+
foo diff --git a/ui/src/Components/SilenceModal/AlertManagerInput/__snapshots__/index.test.js.snap b/ui/src/Components/SilenceModal/AlertManagerInput/__snapshots__/index.test.js.snap index 3fb7ef3f3..bcf0b9690 100644 --- a/ui/src/Components/SilenceModal/AlertManagerInput/__snapshots__/index.test.js.snap +++ b/ui/src/Components/SilenceModal/AlertManagerInput/__snapshots__/index.test.js.snap @@ -4,7 +4,7 @@ exports[` matches snapshot 1`] = ` "
-
+
am1 | am2 diff --git a/ui/src/Components/SilenceModal/SilenceMatch/__snapshots__/LabelNameInput.test.js.snap b/ui/src/Components/SilenceModal/SilenceMatch/__snapshots__/LabelNameInput.test.js.snap index b5b9cbef1..1ab442ad3 100644 --- a/ui/src/Components/SilenceModal/SilenceMatch/__snapshots__/LabelNameInput.test.js.snap +++ b/ui/src/Components/SilenceModal/SilenceMatch/__snapshots__/LabelNameInput.test.js.snap @@ -4,7 +4,7 @@ exports[` matches snapshot 1`] = ` "
-
+
name
diff --git a/ui/src/Components/SilenceModal/SilenceMatch/__snapshots__/LabelValueInput.test.js.snap b/ui/src/Components/SilenceModal/SilenceMatch/__snapshots__/LabelValueInput.test.js.snap index 840cb94b5..cc305c27e 100644 --- a/ui/src/Components/SilenceModal/SilenceMatch/__snapshots__/LabelValueInput.test.js.snap +++ b/ui/src/Components/SilenceModal/SilenceMatch/__snapshots__/LabelValueInput.test.js.snap @@ -4,7 +4,7 @@ exports[` matches snapshot 1`] = ` "
-
+