Skip to content

Commit

Permalink
Merge branch 'user-cm-form-dest-input' of github.com:target/goalert i…
Browse files Browse the repository at this point in the history 
…nto user-cm-form-dest-input
  • Loading branch information
@tony-tvu
tony-tvu committed Feb 6, 2024
2 parents 5bc11e4 + 9466d6f commit d7f7207
Show file tree
Hide file tree
Showing 23 changed files with 74 additions and 35 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ require (
github.com/gordonklaus/ineffassign v0.1.0
github.com/hashicorp/yamux v0.1.1
github.com/jackc/pgtype v1.14.1
github.com/jackc/pgx/v5 v5.5.2
github.com/jackc/pgx/v5 v5.5.3
github.com/jmespath/go-jmespath v0.4.0
github.com/joho/godotenv v1.5.1
github.com/kffl/speedbump v1.1.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -969,8 +969,8 @@ github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQ
github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0=
github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE=
github.com/jackc/pgx/v5 v5.5.2 h1:iLlpgp4Cp/gC9Xuscl7lFL1PhhW+ZLtXZcrfCt4C3tA=
github.com/jackc/pgx/v5 v5.5.2/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A=
github.com/jackc/pgx/v5 v5.5.3 h1:Ces6/M3wbDXYpM8JyyPD57ivTtJACFZJd885pdIaV2s=
github.com/jackc/pgx/v5 v5.5.3/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A=
github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@mui/material": "5.15.5",
"@mui/styles": "5.15.5",
"@mui/system": "5.15.6",
"@mui/x-data-grid": "6.18.7",
"@mui/x-data-grid": "6.19.3",
"@playwright/test": "1.41.2",
"@storybook/addon-essentials": "7.6.7",
"@storybook/addon-interactions": "7.6.7",
Expand All @@ -65,7 +65,7 @@
"@types/glob": "8.1.0",
"@types/jest": "29.5.10",
"@types/lodash": "4.14.202",
"@types/luxon": "3.3.4",
"@types/luxon": "3.4.2",
"@types/node": "20.10.5",
"@types/prop-types": "15.7.11",
"@types/react": "18.2.48",
Expand All @@ -74,7 +74,7 @@
"@types/react-transition-group": "4.4.7",
"@types/react-virtualized-auto-sizer": "1.0.4",
"@typescript-eslint/eslint-plugin": "6.18.1",
"@typescript-eslint/parser": "6.18.1",
"@typescript-eslint/parser": "6.21.0",
"@urql/exchange-retry": "1.2.1",
"bowser": "2.11.0",
"chance": "1.1.11",
Expand Down Expand Up @@ -106,7 +106,7 @@
"http-server": "14.1.1",
"jest": "29.7.0",
"lodash": "4.17.21",
"luxon": "3.4.3",
"luxon": "3.4.4",
"mdast-util-find-and-replace": "3.0.1",
"mdi-material-ui": "7.7.0",
"msw": "2.0.11",
Expand Down
0 ...app/escalation-policies/PolicyStepForm.js → ...pp/escalation-policies/PolicyStepForm.jsx
View file
File renamed without changes.
0 ...pp/escalation-policies/PolicyStepsCard.js → ...p/escalation-policies/PolicyStepsCard.jsx
View file
File renamed without changes.
0 web/src/app/icons/components/Icons.js → web/src/app/icons/components/Icons.jsx
View file
File renamed without changes.
0 ...c/app/schedules/ScheduleOverrideDialog.js → .../app/schedules/ScheduleOverrideDialog.jsx
View file
File renamed without changes.
0 ...src/app/schedules/ScheduleOverrideList.js → ...rc/app/schedules/ScheduleOverrideList.jsx
View file
File renamed without changes.
0 web/src/app/schedules/ScheduleTZFilter.js → web/src/app/schedules/ScheduleTZFilter.jsx
View file
File renamed without changes.
0 ...ndar-subscribe/CalendarSubscribeButton.js → ...dar-subscribe/CalendarSubscribeButton.jsx
View file
File renamed without changes.
0 ...lendar-subscribe/CalendarSubscribeForm.js → ...endar-subscribe/CalendarSubscribeForm.jsx
View file
File renamed without changes.
0 ...calendar-subscribe/CalendarSuccessForm.js → ...alendar-subscribe/CalendarSuccessForm.jsx
View file
File renamed without changes.
0 web/src/app/selection/QuerySelect.js → web/src/app/selection/QuerySelect.jsx
View file
File renamed without changes.
0 web/src/app/services/ServiceLabelForm.js → web/src/app/services/ServiceLabelForm.jsx
View file
File renamed without changes.
0 web/src/app/util/AppBarSearchContainer.js → web/src/app/util/AppBarSearchContainer.jsx
View file
File renamed without changes.
0 web/src/app/util/FilterContainer.js → web/src/app/util/FilterContainer.jsx
View file
File renamed without changes.
0 web/src/app/util/Markdown.js → web/src/app/util/Markdown.jsx
View file
File renamed without changes.
0 web/src/app/util/PageActions.js → web/src/app/util/PageActions.jsx
View file
File renamed without changes.
0 web/src/app/util/Search.js → web/src/app/util/Search.jsx
View file
File renamed without changes.
0 web/src/app/wizard/WizardForm.js → web/src/app/wizard/WizardForm.jsx
View file
File renamed without changes.
0 web/src/app/wizard/WizardRouter.js → web/src/app/wizard/WizardRouter.jsx
View file
File renamed without changes.
0 web/src/app/wizard/WizardScheduleForm.js → web/src/app/wizard/WizardScheduleForm.jsx
View file
File renamed without changes.
95 changes: 67 additions & 28 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3355,9 +3355,9 @@ __metadata:
languageName: node
linkType: hard

"@mui/x-data-grid@npm:6.18.7":
version: 6.18.7
resolution: "@mui/x-data-grid@npm:6.18.7"
"@mui/x-data-grid@npm:6.19.3":
version: 6.19.3
resolution: "@mui/x-data-grid@npm:6.19.3"
dependencies:
"@babel/runtime": ^7.23.2
"@mui/utils": ^5.14.16
Expand All @@ -3369,7 +3369,7 @@ __metadata:
"@mui/system": ^5.4.1
react: ^17.0.0 || ^18.0.0
react-dom: ^17.0.0 || ^18.0.0
checksum: ac3e1e196a576ce3ebe5cb204dd8fc286604265107a3c3e0f6ec3ad333b7c115500017e2328c6c61dac3bd0620c3bc54ab8d7490a629e38cb93e71f91a5be60c
checksum: 3cf6a9b8957a9f7df24ac9f83a312b0c05c5a1556c86916b6c1f6c4a189f3cbb75db73ac35b28d11bf61f26fa7cd3875f612e2b3bb6498ecea4b57efdcbbc5f2
languageName: node
linkType: hard

Expand Down Expand Up @@ -6593,10 +6593,10 @@ __metadata:
languageName: node
linkType: hard

"@types/luxon@npm:3.3.4":
version: 3.3.4
resolution: "@types/luxon@npm:3.3.4"
checksum: aa4862bd62d748e7966f9a0ec76058e9d74397ee426c7d64f61c677d83de0303c303cc78515001833df3f4ad16c95f572b0e2ffaee6e55bc50b80857e8437f3a
"@types/luxon@npm:3.4.2":
version: 3.4.2
resolution: "@types/luxon@npm:3.4.2"
checksum: 6f92d5bd02e89f310395753506bcd9cef3a56f5940f7a50db2a2b9822bce753553ac767d143cb5b4f9ed5ddd4a84e64f89ff538082ceb4d18739af7781b56925
languageName: node
linkType: hard

Expand Down Expand Up @@ -6997,21 +6997,21 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/parser@npm:6.18.1":
version: 6.18.1
resolution: "@typescript-eslint/parser@npm:6.18.1"
"@typescript-eslint/parser@npm:6.21.0":
version: 6.21.0
resolution: "@typescript-eslint/parser@npm:6.21.0"
dependencies:
"@typescript-eslint/scope-manager": 6.18.1
"@typescript-eslint/types": 6.18.1
"@typescript-eslint/typescript-estree": 6.18.1
"@typescript-eslint/visitor-keys": 6.18.1
"@typescript-eslint/scope-manager": 6.21.0
"@typescript-eslint/types": 6.21.0
"@typescript-eslint/typescript-estree": 6.21.0
"@typescript-eslint/visitor-keys": 6.21.0
debug: ^4.3.4
peerDependencies:
eslint: ^7.0.0 || ^8.0.0
peerDependenciesMeta:
typescript:
optional: true
checksum: f123310976a73d9f08470dbad917c9e7b038e9e1362924a225a29d35fac1a2726d447952ca77b914d47f50791d235bb66f5171c7a4a0536e9c170fb20e73a2e4
checksum: 162fe3a867eeeffda7328bce32dae45b52283c68c8cb23258fb9f44971f761991af61f71b8c9fe1aa389e93dfe6386f8509c1273d870736c507d76dd40647b68
languageName: node
linkType: hard

Expand All @@ -7035,6 +7035,16 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/scope-manager@npm:6.21.0":
version: 6.21.0
resolution: "@typescript-eslint/scope-manager@npm:6.21.0"
dependencies:
"@typescript-eslint/types": 6.21.0
"@typescript-eslint/visitor-keys": 6.21.0
checksum: 71028b757da9694528c4c3294a96cc80bc7d396e383a405eab3bc224cda7341b88e0fc292120b35d3f31f47beac69f7083196c70616434072fbcd3d3e62d3376
languageName: node
linkType: hard

"@typescript-eslint/type-utils@npm:6.18.1":
version: 6.18.1
resolution: "@typescript-eslint/type-utils@npm:6.18.1"
Expand Down Expand Up @@ -7066,6 +7076,13 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/types@npm:6.21.0":
version: 6.21.0
resolution: "@typescript-eslint/types@npm:6.21.0"
checksum: 9501b47d7403417af95fc1fb72b2038c5ac46feac0e1598a46bcb43e56a606c387e9dcd8a2a0abe174c91b509f2d2a8078b093786219eb9a01ab2fbf9ee7b684
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:5.62.0":
version: 5.62.0
resolution: "@typescript-eslint/typescript-estree@npm:5.62.0"
Expand Down Expand Up @@ -7103,6 +7120,25 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:6.21.0":
version: 6.21.0
resolution: "@typescript-eslint/typescript-estree@npm:6.21.0"
dependencies:
"@typescript-eslint/types": 6.21.0
"@typescript-eslint/visitor-keys": 6.21.0
debug: ^4.3.4
globby: ^11.1.0
is-glob: ^4.0.3
minimatch: 9.0.3
semver: ^7.5.4
ts-api-utils: ^1.0.1
peerDependenciesMeta:
typescript:
optional: true
checksum: dec02dc107c4a541e14fb0c96148f3764b92117c3b635db3a577b5a56fc48df7a556fa853fb82b07c0663b4bf2c484c9f245c28ba3e17e5cb0918ea4cab2ea21
languageName: node
linkType: hard

"@typescript-eslint/utils@npm:6.18.1":
version: 6.18.1
resolution: "@typescript-eslint/utils@npm:6.18.1"
Expand Down Expand Up @@ -7158,6 +7194,16 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:6.21.0":
version: 6.21.0
resolution: "@typescript-eslint/visitor-keys@npm:6.21.0"
dependencies:
"@typescript-eslint/types": 6.21.0
eslint-visitor-keys: ^3.4.1
checksum: 67c7e6003d5af042d8703d11538fca9d76899f0119130b373402819ae43f0bc90d18656aa7add25a24427ccf1a0efd0804157ba83b0d4e145f06107d7d1b7433
languageName: node
linkType: hard

"@ungap/structured-clone@npm:^1.0.0, @ungap/structured-clone@npm:^1.2.0":
version: 1.2.0
resolution: "@ungap/structured-clone@npm:1.2.0"
Expand Down Expand Up @@ -14719,14 +14765,7 @@ __metadata:
languageName: node
linkType: hard

"luxon@npm:3.4.3":
version: 3.4.3
resolution: "luxon@npm:3.4.3"
checksum: 3eade81506224d038ed24035a0cd0dd4887848d7eba9361dce9ad8ef81380596a68153240be3988721f9690c624fb449fcf8fd8c3fc0681a6a8496faf48e92a3
languageName: node
linkType: hard

"luxon@npm:^3.2.1":
"luxon@npm:3.4.4, luxon@npm:^3.2.1":
version: 3.4.4
resolution: "luxon@npm:3.4.4"
checksum: 36c1f99c4796ee4bfddf7dc94fa87815add43ebc44c8934c924946260a58512f0fd2743a629302885df7f35ccbd2d13f178c15df046d0e3b6eb71db178f1c60c
Expand Down Expand Up @@ -18319,7 +18358,7 @@ __metadata:
"@mui/material": 5.15.5
"@mui/styles": 5.15.5
"@mui/system": 5.15.6
"@mui/x-data-grid": 6.18.7
"@mui/x-data-grid": 6.19.3
"@playwright/test": 1.41.2
"@storybook/addon-essentials": 7.6.7
"@storybook/addon-interactions": 7.6.7
Expand All @@ -18338,7 +18377,7 @@ __metadata:
"@types/glob": 8.1.0
"@types/jest": 29.5.10
"@types/lodash": 4.14.202
"@types/luxon": 3.3.4
"@types/luxon": 3.4.2
"@types/node": 20.10.5
"@types/prop-types": 15.7.11
"@types/react": 18.2.48
Expand All @@ -18347,7 +18386,7 @@ __metadata:
"@types/react-transition-group": 4.4.7
"@types/react-virtualized-auto-sizer": 1.0.4
"@typescript-eslint/eslint-plugin": 6.18.1
"@typescript-eslint/parser": 6.18.1
"@typescript-eslint/parser": 6.21.0
"@urql/exchange-retry": 1.2.1
bowser: 2.11.0
chance: 1.1.11
Expand Down Expand Up @@ -18379,7 +18418,7 @@ __metadata:
http-server: 14.1.1
jest: 29.7.0
lodash: 4.17.21
luxon: 3.4.3
luxon: 3.4.4
mdast-util-find-and-replace: 3.0.1
mdi-material-ui: 7.7.0
msw: 2.0.11
Expand Down

0 comments on commit d7f7207

Please sign in to comment.