diff --git a/ui/package-lock.json b/ui/package-lock.json index 8b6d7d9bd..bd0eabb65 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -3261,6 +3261,19 @@ "node-int64": "^0.4.0" } }, + "buble": { + "version": "0.19.6", + "resolved": "https://registry.npmjs.org/buble/-/buble-0.19.6.tgz", + "integrity": "sha512-9kViM6nJA1Q548Jrd06x0geh+BG2ru2+RMDkIHHgJY/8AcyCs34lTHwra9BX7YdPrZXd5aarkpr/SY8bmPgPdg==", + "requires": { + "chalk": "^2.4.1", + "magic-string": "^0.25.1", + "minimist": "^1.2.0", + "os-homedir": "^1.0.1", + "regexpu-core": "^4.2.0", + "vlq": "^1.0.0" + } + }, "buffer": { "version": "4.9.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", @@ -4265,6 +4278,16 @@ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" }, + "component-props": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/component-props/-/component-props-1.1.1.tgz", + "integrity": "sha1-+bffm5kntubZfJvScqqGdnDzSUQ=" + }, + "component-xor": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/component-xor/-/component-xor-0.0.4.tgz", + "integrity": "sha1-xV2DzMG5TNUImk6T+niRxyY+Wao=" + }, "compose-function": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz", @@ -5003,9 +5026,9 @@ } }, "date-fns": { - "version": "2.0.0-beta.5", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.0.0-beta.5.tgz", - "integrity": "sha512-GS5yi964NDFNoja9yOdWFj9T97T67yLrUeJZgddHaVfc/6tHWtX7RXocuubmZkNzrZUZ9BqBOW7jTR5OoWjJ1w==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.0.1.tgz", + "integrity": "sha512-C14oTzTZy8DH1Eq8N78owrCWvf3+cnJw88BTK/N3DYWVxDJuJzPaNdplzYxDYuuXXGvqBcO4Vy5SOrwAooXSWw==" }, "date-now": { "version": "0.1.4", @@ -5291,6 +5314,15 @@ "@babel/runtime": "^7.1.2" } }, + "dom-iterator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/dom-iterator/-/dom-iterator-1.0.0.tgz", + "integrity": "sha512-7dsMOQI07EMU98gQM8NSB3GsAiIeBYIPKpnxR3c9xOvdvBjChAcOM0iJ222I3p5xyiZO9e5oggkNaCusuTdYig==", + "requires": { + "component-props": "1.1.1", + "component-xor": "0.0.4" + } + }, "dom-serializer": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz", @@ -9599,6 +9631,14 @@ "yallist": "^3.0.2" } }, + "magic-string": { + "version": "0.25.3", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.3.tgz", + "integrity": "sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==", + "requires": { + "sourcemap-codec": "^1.4.4" + } + }, "make-dir": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", @@ -10998,8 +11038,7 @@ "os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", - "dev": true + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" }, "os-locale": { "version": "3.1.0", @@ -12248,6 +12287,11 @@ "react-is": "^16.8.4" } }, + "prism-react-renderer": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-0.1.7.tgz", + "integrity": "sha512-EhnM0sYfLK103ASK0ViSv0rta//ZGB0dBA9TiFyOvA+zOj5peLmGEG01sLEDwl9sMe+gSqncInafBe1VFTCMvA==" + }, "private": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", @@ -12490,6 +12534,26 @@ } } }, + "raw-loader": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-3.1.0.tgz", + "integrity": "sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA==", + "requires": { + "loader-utils": "^1.1.0", + "schema-utils": "^2.0.1" + }, + "dependencies": { + "schema-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.1.0.tgz", + "integrity": "sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==", + "requires": { + "ajv": "^6.1.0", + "ajv-keywords": "^3.1.0" + } + } + } + }, "rc": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", @@ -12560,15 +12624,17 @@ } }, "react-datepicker": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-2.8.0.tgz", - "integrity": "sha512-TL9YemykqK77hq1LRGIWbLFpHvNfSb8yZr3q1zk5XTGdSLsVtZ6mlXby3zuGwi8sL0+h9SEnNaqK8IeOl0R2iQ==", + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-2.9.3.tgz", + "integrity": "sha512-aDWF/4z5P3WvADfiNiBxYVghDc/eA62RIWP//T54FzadNSBwnM8z2RJwR3wv6d5pxO2AH+sE7vcpPvzW7fKjVA==", "requires": { - "classnames": "^2.2.5", - "date-fns": "^v2.0.0-beta.1", - "prop-types": "^15.6.0", - "react-onclickoutside": "^6.7.1", - "react-popper": "^1.0.2" + "classnames": "^2.2.6", + "date-fns": "^2.0.1", + "prop-types": "^15.7.2", + "raw-loader": "^3.1.0", + "react-live": "^2.2.0", + "react-onclickoutside": "^6.9.0", + "react-popper": "^1.3.4" } }, "react-dev-utils": { @@ -12806,6 +12872,37 @@ "tlds": "^1.57.0" } }, + "react-live": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/react-live/-/react-live-2.2.0.tgz", + "integrity": "sha512-Ebbqz2hJGdC0OisXk1XbJ5gb3M3xn7ZdaheisVVFCbivM901Pixy12k1tqBTLoMYjlY2wGAGwgDBTE63Lqaweg==", + "requires": { + "buble": "0.19.6", + "core-js": "^2.4.1", + "create-react-context": "0.2.2", + "dom-iterator": "^1.0.0", + "prism-react-renderer": "^0.1.0", + "prop-types": "^15.5.8", + "react-simple-code-editor": "^0.9.0", + "unescape": "^0.2.0" + }, + "dependencies": { + "core-js": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz", + "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==" + }, + "create-react-context": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.2.tgz", + "integrity": "sha512-KkpaLARMhsTsgp0d2NA/R94F/eDLbhXERdIq3LvX2biCAXcDvHYoOqHfWCHf1+OLj+HKBotLG3KqaOOf+C1C+A==", + "requires": { + "fbjs": "^0.8.0", + "gud": "^1.0.0" + } + } + } + }, "react-masonry-infinite": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/react-masonry-infinite/-/react-masonry-infinite-1.2.2.tgz", @@ -12950,6 +13047,11 @@ } } }, + "react-simple-code-editor": { + "version": "0.9.14", + "resolved": "https://registry.npmjs.org/react-simple-code-editor/-/react-simple-code-editor-0.9.14.tgz", + "integrity": "sha512-doNaIIt4w7QIiB6ysWHMtYL4M3xOGPvZJH8vGq3W/hGk43pn25RDA27IS8GkbfhA1eLX72CWDhuC7KmDKax13g==" + }, "react-test-renderer": { "version": "16.9.0", "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.9.0.tgz", @@ -14342,6 +14444,11 @@ "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=" }, + "sourcemap-codec": { + "version": "1.4.6", + "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz", + "integrity": "sha512-1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg==" + }, "spdx-correct": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", @@ -15211,6 +15318,11 @@ } } }, + "unescape": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/unescape/-/unescape-0.2.0.tgz", + "integrity": "sha1-t4ubYMhvFinfGBv1Pu47yNY2fd8=" + }, "unicode-canonical-property-names-ecmascript": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", @@ -15475,6 +15587,11 @@ "extsprintf": "^1.2.0" } }, + "vlq": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/vlq/-/vlq-1.0.1.tgz", + "integrity": "sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w==" + }, "vm-browserify": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz", diff --git a/ui/package.json b/ui/package.json index 65fd63b44..9b0790494 100644 --- a/ui/package.json +++ b/ui/package.json @@ -31,7 +31,7 @@ "react": "16.9.0", "react-app-polyfill": "1.0.2", "react-autosuggest": "9.4.3", - "react-datepicker": "2.8.0", + "react-datepicker": "2.9.3", "react-dom": "16.9.0", "react-highlighter": "0.4.3", "react-hotkeys": "2.0.0", diff --git a/ui/src/Components/SilenceModal/DateTimeSelect/__snapshots__/index.test.js.snap b/ui/src/Components/SilenceModal/DateTimeSelect/__snapshots__/index.test.js.snap index 21e2131be..8d85e8145 100644 --- a/ui/src/Components/SilenceModal/DateTimeSelect/__snapshots__/index.test.js.snap +++ b/ui/src/Components/SilenceModal/DateTimeSelect/__snapshots__/index.test.js.snap @@ -274,7 +274,7 @@ exports[` 'Ends' tab matches snapshot 1`] = `
@@ -315,42 +315,49 @@ exports[` 'Ends' tab matches snapshot 1`] = `
30
31
1
2
3
4
5
@@ -359,42 +366,49 @@ exports[` 'Ends' tab matches snapshot 1`] = `
6
7
8
9
10
11
12
@@ -403,42 +417,49 @@ exports[` 'Ends' tab matches snapshot 1`] = `
13
14
15
16
17
18
19
@@ -447,42 +468,49 @@ exports[` 'Ends' tab matches snapshot 1`] = `
20
21
22
23
24
25
26
@@ -491,42 +519,49 @@ exports[` 'Ends' tab matches snapshot 1`] = `
27
28
1
2
3
4
5
@@ -685,7 +720,7 @@ exports[` 'Starts' tab matches snapshot 1`] = `
@@ -726,42 +761,49 @@ exports[` 'Starts' tab matches snapshot 1`] = `
1
2
3
4
5
6
7
@@ -770,42 +812,49 @@ exports[` 'Starts' tab matches snapshot 1`] = `
8
9
10
11
12
13
14
@@ -814,42 +863,49 @@ exports[` 'Starts' tab matches snapshot 1`] = `
15
16
17
18
19
20
21
@@ -858,42 +914,49 @@ exports[` 'Starts' tab matches snapshot 1`] = `
22
23
24
25
26
27
28
@@ -902,42 +965,49 @@ exports[` 'Starts' tab matches snapshot 1`] = `
29
1
2
3
4
5
6
diff --git a/ui/src/Components/SilenceModal/DateTimeSelect/index.test.js b/ui/src/Components/SilenceModal/DateTimeSelect/index.test.js index 7111aa412..3f0b8b5f3 100644 --- a/ui/src/Components/SilenceModal/DateTimeSelect/index.test.js +++ b/ui/src/Components/SilenceModal/DateTimeSelect/index.test.js @@ -162,22 +162,19 @@ const ValidateTimeButton = ( expect(diffMS).toBe(expectedDiff); }; -const ShallowTabContentStart = () => { - return shallow(); -}; - const MountedTabContentStart = () => { return mount(); }; describe("", () => { it("selecting date on DatePicker updates startsAt", () => { - const tree = ShallowTabContentStart(); - const picker = tree.find("DatePicker"); - const startsAt = moment([2063, 10, 10, 0, 1, 2]); - picker.simulate("change", startsAt); + const tree = MountedTabContentStart(); expect(silenceFormStore.data.startsAt.toISOString()).toBe( - startsAt.toISOString() + moment([2060, 1, 1, 0, 0, 0]).toISOString() + ); + tree.find("div.react-datepicker__day--018").simulate("click"); + expect(silenceFormStore.data.startsAt.toISOString()).toBe( + moment([2060, 1, 18, 0, 0, 0]).toISOString() ); }); @@ -202,22 +199,19 @@ describe("", () => { }); }); -const ShallowTabContentEnd = () => { - return shallow(); -}; - const MountedTabContentEnd = () => { return mount(); }; describe("", () => { it("Selecting date on DatePicker updates endsAt", () => { - const tree = ShallowTabContentEnd(); - const picker = tree.find("DatePicker"); - const endsAt = moment([2063, 11, 5, 1, 3, 2]); - picker.simulate("change", endsAt); + const tree = MountedTabContentEnd(); expect(silenceFormStore.data.endsAt.toISOString()).toBe( - endsAt.toISOString() + moment([2061, 1, 1, 0, 0, 0]).toISOString() + ); + tree.find("div.react-datepicker__day--024").simulate("click"); + expect(silenceFormStore.data.endsAt.toISOString()).toBe( + moment([2061, 1, 24, 0, 0, 0]).toISOString() ); });