From 97fc3c41ffe81167fb035ead03a3533b2bc0d38a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2020 12:11:17 +0530 Subject: [PATCH 01/25] chore(deps-dev): bump object-to-formdata from 3.0.3 to 3.0.4 (#3989) Bumps [object-to-formdata](https://github.com/therealparmesh/object-to-formdata) from 3.0.3 to 3.0.4. - [Release notes](https://github.com/therealparmesh/object-to-formdata/releases) - [Commits](https://github.com/therealparmesh/object-to-formdata/commits) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a8afefbc129..53d664870ee 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "http-status": "^1.4.2", "loader.js": "^4.7.0", "lodash-es": "^4.17.15", - "object-to-formdata": "^3.0.3", + "object-to-formdata": "^3.0.4", "paypal-checkout": "^4.0.311", "query-string": "^6.10.1", "qunit-dom": "^1.0.0", diff --git a/yarn.lock b/yarn.lock index c2f653c124e..80f7fe92a2b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12217,10 +12217,10 @@ object-keys@^1.0.12: version "1.1.0" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032" -object-to-formdata@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/object-to-formdata/-/object-to-formdata-3.0.3.tgz#f53085434fee91e230a8ac5a8ca18a4eaab50019" - integrity sha512-WRlMCPr08H32igU/frBoOuIQFeN1P/z/Um0tHXHdcmUjap9W3fHF0mnaRtG4oFtB575DJr/kLGYJr0hkVVRldQ== +object-to-formdata@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/object-to-formdata/-/object-to-formdata-3.0.4.tgz#639190ee7c858bb185a5f74d0d320ca457ea546f" + integrity sha512-7EmA1otOpyeyT/L6l6CrzFk9AlTWSCYgtzG9jKrWt8dGyQ2iJSoIO1YmpyvNVfKrO3mGzXeJjKGRxCjExogidQ== object-visit@^1.0.0: version "1.0.1" From de32eb3930acdc840147ff452124db816444e5b5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 07:55:12 +0530 Subject: [PATCH 02/25] chore(deps-dev): bump ember-l10n from 3.2.1 to 4.2.0 (#3992) Bumps [ember-l10n](https://github.com/Cropster/ember-l10n) from 3.2.1 to 4.2.0. - [Release notes](https://github.com/Cropster/ember-l10n/releases) - [Commits](https://github.com/Cropster/ember-l10n/commits) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 106 +++++++++++++++++++++++---------------------------- 2 files changed, 49 insertions(+), 59 deletions(-) diff --git a/package.json b/package.json index 53d664870ee..9aac880c7f3 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "ember-g-map": "0.0.25", "ember-href-to": "3.1.0", "ember-infinity": "^2.1.0", - "ember-l10n": "^3.2.1", + "ember-l10n": "^4.2.0", "ember-link-action": "1.0.0", "ember-load-initializers": "^2.1.1", "ember-math-helpers": "^2.12.1", diff --git a/yarn.lock b/yarn.lock index 80f7fe92a2b..78084ca96d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1120,14 +1120,6 @@ version "0.1.7" resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07" -"@glimmer/interfaces@^0.38.4": - version "0.38.4" - resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.38.4.tgz#437663eb07b97a22c8348a47b25191b5c5198bf3" - integrity sha512-Kuc2BNOZMnwmdZh3jOLUktVu9V0BASCRAslPmVfhzgPjD3j9VzqNOifD7eBz/ZvWqpS1e7CgBEc42CBlCBUfnQ== - dependencies: - "@glimmer/wire-format" "^0.38.4" - "@simple-dom/interface" "1.4.0" - "@glimmer/interfaces@^0.45.3": version "0.45.3" resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.45.3.tgz#9a54b6cc3f9d5887fc26c39750fd180d9dc650c0" @@ -1135,15 +1127,12 @@ dependencies: "@simple-dom/interface" "^1.4.0" -"@glimmer/syntax@^0.38.0": - version "0.38.4" - resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.38.4.tgz#eac34167cfa80daabb5db25fece1982c17a063f1" - integrity sha512-aB5vNC4ADCFXQWORFnx1kG8DtaWqS9E2zkynnj8/GqfYjO4yBtM0HFqBHAEIfcD8Zm+zK4osghs2YGrKvIsEdg== +"@glimmer/interfaces@^0.47.4": + version "0.47.4" + resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.47.4.tgz#17772fae66571b606f9fa26d733d7211960a2560" + integrity sha512-Wbv6954fIOy1aWHh2IdneBmIGrGysyu+ZWrmAiuMQC92uf57a9AXFJW0DFY+X6gd8Biaw/Nx8EHE0bNeMYCp9Q== dependencies: - "@glimmer/interfaces" "^0.38.4" - "@glimmer/util" "^0.38.4" - handlebars "^4.0.6" - simple-html-tokenizer "^0.5.6" + "@simple-dom/interface" "^1.4.0" "@glimmer/syntax@^0.45.3": version "0.45.3" @@ -1155,6 +1144,16 @@ handlebars "^4.5.1" simple-html-tokenizer "^0.5.8" +"@glimmer/syntax@^0.47.4": + version "0.47.4" + resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.47.4.tgz#827f63a9c5f14a8329ff26c1e1f6ad211683690d" + integrity sha512-GCqoKyU11+cD9jL1J6AlSgKn1/rFUt/Wc3pgf/AE7uxza00OOYDEbqfpzOdv9sF727aqKdy9qp3a9O54IcevuA== + dependencies: + "@glimmer/interfaces" "^0.47.4" + "@glimmer/util" "^0.47.4" + handlebars "^4.5.1" + simple-html-tokenizer "^0.5.9" + "@glimmer/tracking@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@glimmer/tracking/-/tracking-1.0.0.tgz#aba9feeb47c48d5aadc1226b7e8d19e34031a6bc" @@ -1163,11 +1162,6 @@ "@glimmer/env" "^0.1.7" "@glimmer/validator" "^0.44.0" -"@glimmer/util@^0.38.4": - version "0.38.4" - resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.38.4.tgz#43b4fbdf98c8c244ac7d1bfd95fef9c8f7761ad5" - integrity sha512-qFU96hAcDjK3ZD8lVJMB+FOJjCm+qZydiUICDj/CYTx82bSOfkzpHLNQ5OivJpsVl1+jFqJolQwrjqFC1bQJHA== - "@glimmer/util@^0.44.0": version "0.44.0" resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.44.0.tgz#45df98d73812440206ae7bda87cfe04aaae21ed9" @@ -1180,18 +1174,18 @@ dependencies: "@simple-dom/interface" "^1.4.0" +"@glimmer/util@^0.47.4": + version "0.47.4" + resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.47.4.tgz#de6061d30f03ca09950208f6de7b529efc8fb539" + integrity sha512-uGcUjDtcy/CTSKMYuIpmvZfv4busDcPbx6X+AnWkaTIonvp0z8HKpZ5QYrulR9Gcbbtb+noCTmMr2qa7AEyA4Q== + dependencies: + "@simple-dom/interface" "^1.4.0" + "@glimmer/validator@^0.44.0": version "0.44.0" resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.44.0.tgz#03d127097dc9cb23052cdb7fcae59d0a9dca53e1" integrity sha512-i01plR0EgFVz69GDrEuFgq1NheIjZcyTy3c7q+w7d096ddPVeVcRzU3LKaqCfovvLJ+6lJx40j45ecycASUUyw== -"@glimmer/wire-format@^0.38.4": - version "0.38.4" - resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.38.4.tgz#efbfe757b05e32344855b01804cc19dcca0d0828" - integrity sha512-1K8N+mbUtqJ1/MR+E/kDekC53HJNecU1i0TUAz5Vh24cvBcPCWP63YtwyCOxfnn7MLFdl8/QvHuo3+8Uxw+oVg== - dependencies: - "@glimmer/util" "^0.38.4" - "@html-next/vertical-collection@^1.0.0-beta.14": version "1.0.0" resolved "https://registry.yarnpkg.com/@html-next/vertical-collection/-/vertical-collection-1.0.0.tgz#2845bce90a72bb212ec307b184c98e4d78d023fc" @@ -1240,7 +1234,7 @@ dependencies: "@simple-dom/interface" "^1.4.0" -"@simple-dom/interface@1.4.0", "@simple-dom/interface@^1.4.0": +"@simple-dom/interface@^1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f" integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA== @@ -4823,7 +4817,7 @@ content-disposition@0.5.3: dependencies: safe-buffer "5.1.2" -content-type@~1.0.4: +content-type@^1.0.4, content-type@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" @@ -6700,20 +6694,20 @@ ember-invoke-action@^1.4.0, ember-invoke-action@^1.5.1: dependencies: ember-cli-babel "^6.6.0" -ember-l10n@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ember-l10n/-/ember-l10n-3.2.1.tgz#0cec02ed96a3e143a889d44a55ec86ba8f6398e9" - integrity sha512-heQZj7UXuA70QsZ04Tq7uGotZ5NhQH/ZYko1xHmIO4nW2Pi+sqpMWGWGAwtmU3uJq/EMWps12m+08G0zCS9OEg== +ember-l10n@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/ember-l10n/-/ember-l10n-4.2.0.tgz#2141469761378b47be1603d3a721f556acd236f3" + integrity sha512-OgF+TG9N5zFHw0P/1w6cdnggOr2yHNkwyV8TcwsHqbDNGmPEyz6tO+L9g6XO8FCSspcXkl7pjIj0F2pHKLqLtQ== dependencies: "@babel/parser" "^7.5.5" - "@glimmer/syntax" "^0.38.0" + "@glimmer/syntax" "^0.47.4" ast-types "^0.13.2" - chalk "^2.4.1" + chalk "^3.0.0" ember-cli-babel "^7.7.3" - ember-cli-htmlbars "^3.0.1" + ember-cli-htmlbars "^4.2.2" ember-get-config "^0.2.4" - gettext-parser "^3.0.0" - inquirer "^6.2.1" + gettext-parser "^4.0.2" + inquirer "^7.0.4" shelljs "^0.8.2" ember-link-action@1.0.0: @@ -8638,14 +8632,15 @@ gettext-parser@^2.0.0: readable-stream "^2.0.0" safe-buffer "^5.1.2" -gettext-parser@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/gettext-parser/-/gettext-parser-3.1.1.tgz#f2455f7cc402087a0ee5289fcca204702b7fe240" - integrity sha512-vNhWcqXEtZPs5Ft1ReA34g7ByWotpcOIeJvXVy2jF3/G2U9v6W0wG4Z4hXzcU8R//jArqkgHcVCGgGqa4vxVlQ== +gettext-parser@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/gettext-parser/-/gettext-parser-4.0.2.tgz#1325b50320dccb0afeff305590603f4a88c0d7a6" + integrity sha512-JPCBpGzm01te+nTenJwWqKDzixYPY4pInedixpcMl4GPEJeia/cH2TJCh32IggDrrLYrzqA8OitXZLpBdrx4Gg== dependencies: + content-type "^1.0.4" encoding "^0.1.12" - readable-stream "^3.2.0" - safe-buffer "^5.1.2" + readable-stream "^3.4.0" + safe-buffer "^5.2.0" gettext-swig@^0.3.0: version "0.3.0" @@ -8940,7 +8935,7 @@ handlebars@4.0.6: optionalDependencies: uglify-js "^2.6" -handlebars@^4.0.11, handlebars@^4.0.4, handlebars@^4.0.6, handlebars@^4.3.1, handlebars@^4.5.1: +handlebars@^4.0.11, handlebars@^4.0.4, handlebars@^4.3.1, handlebars@^4.5.1: version "4.7.2" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.2.tgz#01127b3840156a0927058779482031afe0e730d7" integrity sha512-4PwqDL2laXtTWZghzzCtunQUTLbo31pcCJrd/B/9JP8XbhVzpS5ZXuKqlOzsd1rtcaLo4KqAn8nl8mkknS4MHw== @@ -9514,7 +9509,7 @@ inquirer@^6, inquirer@^6.1.0, inquirer@^6.2.1: strip-ansi "^5.0.0" through "^2.3.6" -inquirer@^7.0.1: +inquirer@^7.0.1, inquirer@^7.0.4: version "7.0.4" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz#99af5bde47153abca23f5c7fc30db247f39da703" integrity sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ== @@ -13358,10 +13353,10 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable string_decoder "~1.0.3" util-deprecate "~1.0.1" -readable-stream@^3.2.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc" - integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ== +readable-stream@^3.4.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.5.0.tgz#465d70e6d1087f6162d079cd0b5db7fbebfd1606" + integrity sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA== dependencies: inherits "^2.0.3" string_decoder "^1.1.1" @@ -14060,7 +14055,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: +safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== @@ -14396,12 +14391,7 @@ simple-git@^1.57.0: dependencies: debug "^3.1.0" -simple-html-tokenizer@^0.5.6: - version "0.5.7" - resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.7.tgz#8eca336ecfbe2b3c6166cbb31b2682088de79f40" - integrity sha512-APW9iYbkJ5cijjX4Ljhf3VG8SwYPUJT5gZrwci/wieMabQxWFiV5VwsrP5c6GMRvXKEQMGkAB1d9dvW66dTqpg== - -simple-html-tokenizer@^0.5.8: +simple-html-tokenizer@^0.5.8, simple-html-tokenizer@^0.5.9: version "0.5.9" resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.9.tgz#1a83fe97f5a3e39b335fddf71cfe9b0263b581c2" integrity sha512-w/3FEDN94r4JQ9WoYrIr8RqDIPZdyNkdpbK9glFady1CAEyD97XWCv8HFetQO21w81e7h7Nh59iYTyG1mUJftg== From a26f49a2272226f3577b4b748181ee26557f32b0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 08:10:54 +0530 Subject: [PATCH 03/25] chore(deps-dev): bump ember-source from 3.16.0 to 3.16.1 (#3993) Bumps [ember-source](https://github.com/emberjs/ember.js) from 3.16.0 to 3.16.1. - [Release notes](https://github.com/emberjs/ember.js/releases) - [Changelog](https://github.com/emberjs/ember.js/blob/v3.16.1/CHANGELOG.md) - [Commits](https://github.com/emberjs/ember.js/compare/v3.16.0...v3.16.1) Signed-off-by: dependabot-preview[bot] Co-authored-by: Kush Trivedi <44091822+kushthedude@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9aac880c7f3..00f9042f441 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "ember-scroll-to": "^0.6.5", "ember-simple-auth": "^2.1.1", "ember-simple-auth-token": "^4.0.7", - "ember-source": "~3.16.0", + "ember-source": "~3.16.1", "ember-table": "^2.2.3", "ember-truth-helpers": "^2.1.0", "ember-uuid": "^2.1.0", diff --git a/yarn.lock b/yarn.lock index 78084ca96d7..885a8799deb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6980,15 +6980,15 @@ ember-source-channel-url@^2.0.1: dependencies: got "^8.0.1" -ember-source@~3.16.0: - version "3.16.0" - resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.16.0.tgz#c899ccac6783e218f12774139b1e6c3d2fc4c16b" - integrity sha512-zotw+jrvlV/Fdq0fwL04jdFsxtHBo+0YtMKVvaNbSWeV97DrULSdnBQ91Sq1KZ+9ueBbClngHF4wXJmlIwqb8g== +ember-source@~3.16.1: + version "3.16.1" + resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.16.1.tgz#997f51c2b74620906d2a8111089b6e894b6165e6" + integrity sha512-4cYfQ+DsqeSTqG0RztuTsh8d8p0XdeIaPWe9Ol229GhQjM1JgpjQNTXGJDTIB8FfbAxycPlCwIk2qXygA+pFsA== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/plugin-transform-block-scoping" "^7.6.2" "@babel/plugin-transform-object-assign" "^7.2.0" - "@ember/edition-utils" "^1.1.1" + "@ember/edition-utils" "^1.2.0" babel-plugin-debug-macros "^0.3.3" babel-plugin-filter-imports "^3.0.0" broccoli-concat "^3.7.4" From 457e8776f0f6c9acdee3b6bbbc7ede7095d8aa24 Mon Sep 17 00:00:00 2001 From: Nitin Kumar <46647141+snitin315@users.noreply.github.com> Date: Thu, 6 Feb 2020 03:51:51 +0530 Subject: [PATCH 04/25] fix: center aligned infinity loader spinner on public speaker page (#3995) --- app/templates/public/speakers.hbs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/templates/public/speakers.hbs b/app/templates/public/speakers.hbs index f30317a9068..41ec0e95a89 100644 --- a/app/templates/public/speakers.hbs +++ b/app/templates/public/speakers.hbs @@ -4,11 +4,11 @@ {{public/speaker-item speaker=speaker}} {{/each}} - {{#infinity-loader infinityModel=model}} -
+
+ {{#infinity-loader infinityModel=model}}
-
- {{infintyModel.reachedInfinity}} - {{/infinity-loader}} + {{infintyModel.reachedInfinity}} + {{/infinity-loader}} +
From 0c4fa2e0e1dd3bac9ac9fc2f070adcb08cfe2941 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2020 13:32:07 +0530 Subject: [PATCH 05/25] chore(deps-dev): bump ember-cli-babel from 7.14.1 to 7.17.1 (#4012) Bumps [ember-cli-babel](https://github.com/babel/ember-cli-babel) from 7.14.1 to 7.17.1. - [Release notes](https://github.com/babel/ember-cli-babel/releases) - [Changelog](https://github.com/babel/ember-cli-babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/ember-cli-babel/compare/v7.14.1...v7.17.1) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 105 ++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 85 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 00f9042f441..755b8baa379 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "ember-cli-accounting": "^2.0.2", "ember-cli-app-version": "^3.2.0", "ember-cli-autoprefixer": "0.8.1", - "ember-cli-babel": "^7.14.1", + "ember-cli-babel": "^7.17.1", "ember-cli-cjs-transform": "^2.0.0", "ember-cli-clipboard": "^0.14.0", "ember-cli-code-coverage": "^1.0.0-beta.8", diff --git a/yarn.lock b/yarn.lock index 885a8799deb..dc4bc69e1f0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -670,6 +670,15 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" +"@babel/plugin-transform-typescript@^7.8.3", "@babel/plugin-transform-typescript@~7.8.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.3.tgz#be6f01a7ef423be68e65ace1f04fc407e6d88917" + integrity sha512-Ebj230AxcrKGZPKIp4g4TdQLrqX95TobLUWKd/CwG7X1XHUH1ZpkpFvXuXqWbtGRWb7uuEWNlrl681wsOArAdQ== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.8.3" + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-syntax-typescript" "^7.8.3" + "@babel/plugin-transform-typescript@~7.4.0": version "7.4.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.4.5.tgz#ab3351ba35307b79981993536c93ff8be050ba28" @@ -687,15 +696,6 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-typescript" "^7.2.0" -"@babel/plugin-transform-typescript@~7.8.0": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.3.tgz#be6f01a7ef423be68e65ace1f04fc407e6d88917" - integrity sha512-Ebj230AxcrKGZPKIp4g4TdQLrqX95TobLUWKd/CwG7X1XHUH1ZpkpFvXuXqWbtGRWb7uuEWNlrl681wsOArAdQ== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.8.3" - "@babel/helper-plugin-utils" "^7.8.3" - "@babel/plugin-syntax-typescript" "^7.8.3" - "@babel/plugin-transform-unicode-regex@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad" @@ -712,7 +712,7 @@ core-js "^2.6.5" regenerator-runtime "^0.13.2" -"@babel/preset-env@^7.0.0", "@babel/preset-env@^7.8.3": +"@babel/preset-env@^7.0.0", "@babel/preset-env@^7.8.4": version "7.8.4" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.4.tgz#9dac6df5f423015d3d49b6e9e5fa3413e4a72c4e" integrity sha512-HihCgpr45AnSOHRbS5cWNTINs0TwaR8BS8xIIH+QwiW8cKL0llV91njQMpeMReEPVs+1Ao0x3RLEBLtt1hOq4w== @@ -775,7 +775,7 @@ levenary "^1.1.1" semver "^5.5.0" -"@babel/runtime@^7.2.0", "@babel/runtime@^7.8.3": +"@babel/runtime@^7.2.0", "@babel/runtime@^7.8.4": version "7.8.4" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308" integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ== @@ -1426,7 +1426,14 @@ resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g== -"@types/glob@^7.1.1": +"@types/fs-extra@^5.0.5": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.1.0.tgz#2a325ef97901504a3828718c390d34b8426a10a1" + integrity sha512-AInn5+UBFIK9FK5xc9yP5e3TQSPNNgjHByqYcj9g5elVBnDQcQL7PlO1CIRy2gWlbwK7UPYqi7vRvFA44dCmYQ== + dependencies: + "@types/node" "*" + +"@types/glob@*", "@types/glob@^7.1.1": version "7.1.1" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575" integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w== @@ -1469,6 +1476,14 @@ dependencies: "@types/node" "*" +"@types/rimraf@^2.0.2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.3.tgz#0199a46af106729ba14213fda7b981278d8c84f2" + integrity sha512-dZfyfL/u9l/oi984hEXdmAjX3JHry7TLWw43u1HQ8HhPv6KtfxnrZ3T/bleJ0GEvnk9t5sM7eePkgMqz3yBcGg== + dependencies: + "@types/glob" "*" + "@types/node" "*" + "@types/rsvp@*", "@types/rsvp@^4.0.2", "@types/rsvp@^4.0.3": version "4.0.3" resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.3.tgz#4a1223158453257bce09d42b9eef7cfa6d257482" @@ -2465,6 +2480,13 @@ babel-plugin-dynamic-import-node@^2.3.0: dependencies: object.assign "^4.1.0" +babel-plugin-ember-data-packages-polyfill@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-ember-data-packages-polyfill/-/babel-plugin-ember-data-packages-polyfill-0.1.1.tgz#428217228bedb95215bcaac6da83f59488b40edd" + integrity sha512-WQlevWS8RNNVCm4SNI6PogUMhH4Eu2ectRd/SVcKVnLnzaOHJjN9W1eaoQ9dwBidDgHhtXUbvkBSdLExaW+MYA== + dependencies: + "@ember-data/rfc395-data" "^0.0.4" + babel-plugin-ember-modules-api-polyfill@^2.12.0, babel-plugin-ember-modules-api-polyfill@^2.6.0: version "2.12.0" resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.12.0.tgz#a5e703205ba4e625a7fab9bb1aea64ef3222cf75" @@ -5667,21 +5689,24 @@ ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.10.0, ember-cli-version-checker "^2.1.2" semver "^5.5.0" -ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.14.1, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3: - version "7.14.1" - resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.14.1.tgz#b34045449c4e7a22072757f394c89d585c1322e3" - integrity sha512-d8d3IQIvFlTfwWI+t4Ou5mbHMEhdqbpyw93dabV9X3MOxRXcKfo88YfIq6QWQRB0EG3kwuLxt3Jo0wCy4rrylA== +ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.17.1, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3: + version "7.17.1" + resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.17.1.tgz#96a4a527409b9555e329adea846f1f40eb4131c2" + integrity sha512-GC7EOgmJE27JTljGL00fHOt3eg+kCXOfzHE7qCjndtmvZ26DR1WiHXjQdni5fZpz/l2zz83ymQCpVIpZHdglpA== dependencies: - "@babel/core" "^7.8.3" + "@babel/core" "^7.8.4" + "@babel/helper-compilation-targets" "^7.8.4" "@babel/plugin-proposal-class-properties" "^7.8.3" "@babel/plugin-proposal-decorators" "^7.8.3" "@babel/plugin-transform-modules-amd" "^7.8.3" "@babel/plugin-transform-runtime" "^7.8.3" + "@babel/plugin-transform-typescript" "^7.8.3" "@babel/polyfill" "^7.8.3" - "@babel/preset-env" "^7.8.3" - "@babel/runtime" "^7.8.3" + "@babel/preset-env" "^7.8.4" + "@babel/runtime" "^7.8.4" amd-name-resolver "^1.2.1" babel-plugin-debug-macros "^0.3.0" + babel-plugin-ember-data-packages-polyfill "^0.1.1" babel-plugin-ember-modules-api-polyfill "^2.12.0" babel-plugin-module-resolver "^3.1.1" broccoli-babel-transpiler "^7.4.0" @@ -5690,8 +5715,10 @@ ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cl broccoli-source "^1.1.0" clone "^2.1.2" ember-cli-babel-plugin-helpers "^1.1.0" - ember-cli-version-checker "^2.1.2" + ember-cli-version-checker "^4.1.0" ensure-posix-path "^1.0.2" + fixturify-project "^1.10.0" + rimraf "^3.0.1" semver "^5.5.0" ember-cli-babel@~7.11.0: @@ -6349,6 +6376,15 @@ ember-cli-version-checker@^3.0.0, ember-cli-version-checker@^3.0.1, ember-cli-ve resolve-package-path "^1.2.6" semver "^5.6.0" +ember-cli-version-checker@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-4.1.0.tgz#7fc9836bdbc87451d286ba6a9a89b23591d8bbb7" + integrity sha512-yLf2YqotTSsjiXwx9Dt6H7AU0QcldFn5SLk/pG3Zqb0aHNeanBOPlx4/Ysa46ILGWYIh0fDH34AEVRueXTrQBQ== + dependencies: + resolve-package-path "^2.0.0" + semver "^6.3.0" + silent-error "^1.1.1" + ember-cli@~3.15.2: version "3.15.2" resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.15.2.tgz#c2a5871850da7537e0cb3cd0e7d59fd76cd3184e" @@ -8174,6 +8210,14 @@ fireworm@^0.7.0: lodash.flatten "^3.0.2" minimatch "^3.0.2" +fixturify-project@^1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-1.10.0.tgz#091c452a9bb15f09b6b9cc7cf5c0ad559f1d9aad" + integrity sha512-L1k9uiBQuN0Yr8tA9Noy2VSQ0dfg0B8qMdvT7Wb5WQKc7f3dn3bzCbSrqlb+etLW+KDV4cBC7R1OvcMg3kcxmA== + dependencies: + fixturify "^1.2.0" + tmp "^0.0.33" + fixturify@^0.3.4: version "0.3.4" resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-0.3.4.tgz#c676de404a7f8ee8e64d0b76118e62ec95ab7b25" @@ -8181,6 +8225,17 @@ fixturify@^0.3.4: fs-extra "^0.30.0" matcher-collection "^1.0.4" +fixturify@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-1.2.0.tgz#abe8c52dd27dbbfdb874a02893781c93425663ea" + integrity sha512-b5CMQmBZKsGR6HGqdSrLOGYGHIqrR0CUrcGU/lDL0mYy+DtGm5cnb61Z0UiIUqMVZIoV0CbN+u9/Gwjj+ICg0A== + dependencies: + "@types/fs-extra" "^5.0.5" + "@types/minimatch" "^3.0.3" + "@types/rimraf" "^2.0.2" + fs-extra "^7.0.1" + matcher-collection "^2.0.0" + flat-cache@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481" @@ -13795,6 +13850,14 @@ resolve-package-path@^1.0.11, resolve-package-path@^1.2.2, resolve-package-path@ path-root "^0.1.1" resolve "^1.10.0" +resolve-package-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-2.0.0.tgz#7f258ab86ff074fff4ff8027a28f94d17d6fb1df" + integrity sha512-/CLuzodHO2wyyHTzls5Qr+EFeG6RcW4u6//gjYvUfcfyuplIX1SSccU+A5A9A78Gmezkl3NBkFAMxLbzTY9TJA== + dependencies: + path-root "^0.1.1" + resolve "^1.13.1" + resolve-path@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7" @@ -13891,7 +13954,7 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2. dependencies: glob "^7.1.3" -rimraf@^3.0.0: +rimraf@^3.0.0, rimraf@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.1.tgz#48d3d4cb46c80d388ab26cd61b1b466ae9ae225a" integrity sha512-IQ4ikL8SjBiEDZfk+DFVwqRK8md24RWMEJkdSlgNLkyyAImcjf8SWvU1qFMDOb4igBClbTQ/ugPqXcRwdFTxZw== From 0bbaa13652bc99a29d18feec2199f074add1bbe6 Mon Sep 17 00:00:00 2001 From: Nitin Kumar <46647141+snitin315@users.noreply.github.com> Date: Thu, 6 Feb 2020 13:35:15 +0530 Subject: [PATCH 06/25] fix: minOrder-maxOrder & minPrice-maxPrice validation in basic-details-step (#3849) --- .../forms/wizard/basic-details-step.js | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/app/components/forms/wizard/basic-details-step.js b/app/components/forms/wizard/basic-details-step.js index dd0a5e0d7a3..dda2574aa03 100644 --- a/app/components/forms/wizard/basic-details-step.js +++ b/app/components/forms/wizard/basic-details-step.js @@ -12,6 +12,7 @@ import { inject as service } from '@ember/service'; import EventWizardMixin from 'open-event-frontend/mixins/event-wizard'; import { protocolLessValidUrlPattern } from 'open-event-frontend/utils/validators'; import ENV from 'open-event-frontend/config/environment'; +import $ from 'jquery'; export default Component.extend(FormMixin, EventWizardMixin, { @@ -128,6 +129,12 @@ export default Component.extend(FormMixin, EventWizardMixin, { // TODO: Removing the Event Time Validations due to the weird and buggy behaviour. Will be restored once a perfect solution is found. Please check issue: https://github.com/fossasia/open-event-frontend/issues/3667 getValidationRules() { + $.fn.form.settings.rules.checkMaxMinPrice = () => { + return $('.ui.form').form('get value', 'min_price') <= $('.ui.form').form('get value', 'max_price'); + }; + $.fn.form.settings.rules.checkMaxMinOrder = () => { + return $('.ui.form').form('get value', 'ticket_min_order') <= $('.ui.form').form('get value', 'ticket_max_order'); + }; let validationRules = { inline : true, @@ -257,6 +264,10 @@ export default Component.extend(FormMixin, EventWizardMixin, { { type : 'number', prompt : this.l10n.t('Invalid number') + }, + { + type : 'checkMaxMinOrder', + prompt : this.l10n.t('Minimum order should not be greater than maximum') } ] }, @@ -274,6 +285,10 @@ export default Component.extend(FormMixin, EventWizardMixin, { { type : 'integer[1..]', prompt : this.l10n.t('Maximum tickets per order should be greater than 0') + }, + { + type : 'checkMaxMinOrder', + prompt : this.l10n.t('Maximum order should not be less than minimum') } ] }, @@ -287,6 +302,10 @@ export default Component.extend(FormMixin, EventWizardMixin, { { type : 'integer[1..]', prompt : this.l10n.t('Minimum price needs to be greater than zero') + }, + { + type : 'checkMaxMinPrice', + prompt : this.l10n.t('Minimum price should not be greater than maximum') } ] }, @@ -300,6 +319,10 @@ export default Component.extend(FormMixin, EventWizardMixin, { { type : 'integer[1..]', prompt : this.l10n.t('Maximum price needs to be greater than zero') + }, + { + type : 'checkMaxMinPrice', + prompt : this.l10n.t('Maximum price should not be less than minimum') } ] }, From 531a8faa9e0f944964a9b1d6b7a82e41b0e8bc0f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2020 20:20:12 +0530 Subject: [PATCH 07/25] chore(deps-dev): bump ember-cli-babel from 7.17.1 to 7.17.2 (#4016) Bumps [ember-cli-babel](https://github.com/babel/ember-cli-babel) from 7.17.1 to 7.17.2. - [Release notes](https://github.com/babel/ember-cli-babel/releases) - [Changelog](https://github.com/babel/ember-cli-babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/ember-cli-babel/compare/v7.17.1...v7.17.2) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 755b8baa379..6e3c61d3d81 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "ember-cli-accounting": "^2.0.2", "ember-cli-app-version": "^3.2.0", "ember-cli-autoprefixer": "0.8.1", - "ember-cli-babel": "^7.17.1", + "ember-cli-babel": "^7.17.2", "ember-cli-cjs-transform": "^2.0.0", "ember-cli-clipboard": "^0.14.0", "ember-cli-code-coverage": "^1.0.0-beta.8", diff --git a/yarn.lock b/yarn.lock index dc4bc69e1f0..65930971ca1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5689,10 +5689,10 @@ ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.10.0, ember-cli-version-checker "^2.1.2" semver "^5.5.0" -ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.17.1, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3: - version "7.17.1" - resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.17.1.tgz#96a4a527409b9555e329adea846f1f40eb4131c2" - integrity sha512-GC7EOgmJE27JTljGL00fHOt3eg+kCXOfzHE7qCjndtmvZ26DR1WiHXjQdni5fZpz/l2zz83ymQCpVIpZHdglpA== +ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.17.2, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3: + version "7.17.2" + resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.17.2.tgz#2c7717c6864425be3cd11913c722115fbf1448d2" + integrity sha512-64jRwtRVtEp4ghhew/sHeMsPyUOg3t1TB2dary5mCbKkRasb3L7FwF7xnuzPihaz+AW/v2LqYLALXGCml5XNLA== dependencies: "@babel/core" "^7.8.4" "@babel/helper-compilation-targets" "^7.8.4" From 498bc7b08a30e58830b5e79561e9402c583853dc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2020 23:18:17 +0530 Subject: [PATCH 08/25] chore(deps-dev): bump ember-l10n from 4.2.0 to 4.3.0 (#4014) Bumps [ember-l10n](https://github.com/Cropster/ember-l10n) from 4.2.0 to 4.3.0. - [Release notes](https://github.com/Cropster/ember-l10n/releases) - [Commits](https://github.com/Cropster/ember-l10n/commits/v4.3.0) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f8d9e2702d3..a8a22270828 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "ember-g-map": "0.0.25", "ember-href-to": "3.1.0", "ember-infinity": "^2.1.0", - "ember-l10n": "^4.2.0", + "ember-l10n": "^4.3.0", "ember-link-action": "1.0.0", "ember-load-initializers": "^2.1.1", "ember-math-helpers": "^2.12.1", diff --git a/yarn.lock b/yarn.lock index 65930971ca1..bb509a58ed7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6730,14 +6730,15 @@ ember-invoke-action@^1.4.0, ember-invoke-action@^1.5.1: dependencies: ember-cli-babel "^6.6.0" -ember-l10n@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/ember-l10n/-/ember-l10n-4.2.0.tgz#2141469761378b47be1603d3a721f556acd236f3" - integrity sha512-OgF+TG9N5zFHw0P/1w6cdnggOr2yHNkwyV8TcwsHqbDNGmPEyz6tO+L9g6XO8FCSspcXkl7pjIj0F2pHKLqLtQ== +ember-l10n@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ember-l10n/-/ember-l10n-4.3.0.tgz#2c5157914921367f8573a206cc95d15700470489" + integrity sha512-bcJhD7PeS0PNuJoRo1iQxYT4Ef/3bZIhAXJPg0xWlQhafgV5UlXdBA7lTwTpiqF0q+DFU5PNK1JTnLr0T92YKQ== dependencies: "@babel/parser" "^7.5.5" "@glimmer/syntax" "^0.47.4" ast-types "^0.13.2" + broccoli-plugin "^3.1.0" chalk "^3.0.0" ember-cli-babel "^7.7.3" ember-cli-htmlbars "^4.2.2" From 3a8d1698589a68b14ac31acc9ce5e19d79471d28 Mon Sep 17 00:00:00 2001 From: Nitin Kumar <46647141+snitin315@users.noreply.github.com> Date: Fri, 7 Feb 2020 06:20:56 +0530 Subject: [PATCH 09/25] fix: Removing ember-scroll-to addon (#3852) * add custom scroll action for side-menu * remove ember-scroll-to * remove jQuery Co-authored-by: Kush Trivedi <44091822+kushthedude@users.noreply.github.com> --- app/components/public/side-menu.js | 17 +++++++++++++++++ app/templates/components/public/side-menu.hbs | 16 ++++++++-------- package.json | 1 - yarn.lock | 7 ------- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/app/components/public/side-menu.js b/app/components/public/side-menu.js index 051884dedf1..be2bbbd66db 100644 --- a/app/components/public/side-menu.js +++ b/app/components/public/side-menu.js @@ -9,6 +9,23 @@ export default Component.extend({ this.set('shouldShowCallforSpeakers', speakersCall && speakersCall.announcement && (speakersCall.privacy === 'public')); }, + actions: { + scrollToTarget() { + document.querySelectorAll('.scroll').forEach(anchor => { + anchor.addEventListener('click', function(e) { + e.preventDefault(); + document.querySelector(this.getAttribute('href')).scrollIntoView({ + behavior: 'smooth' + }); + + document.querySelectorAll('.scroll').forEach(node => { + node.classList.remove('active'); + }); + e.target.classList.add('active'); + }); + }); + } + }, isSchedulePublished: computed('event.schedulePublishedOn', function() { return this.get('event.schedulePublishedOn') && this.get('event.schedulePublishedOn').toISOString() !== moment(0).toISOString(); }) diff --git a/app/templates/components/public/side-menu.hbs b/app/templates/components/public/side-menu.hbs index d162f87cd3e..c8300301991 100644 --- a/app/templates/components/public/side-menu.hbs +++ b/app/templates/components/public/side-menu.hbs @@ -1,13 +1,13 @@ {{#if (and (not-eq session.currentRouteName 'public.cfs.new-session') (not-eq session.currentRouteName 'public.cfs.new-speaker') (not-eq session.currentRouteName 'public.cfs.edit-speaker') (not-eq session.currentRouteName 'public.cfs.edit-session'))}}
{{#if (eq session.currentRouteName 'public.index')}} - {{#scroll-to href='#info' class='item active'}} + {{t 'Info'}} - {{/scroll-to}} + {{#if event.tickets.length}} - {{#scroll-to href='#tickets' class='item'}} + {{t 'Tickets'}} - {{/scroll-to}} + {{/if}} {{#if event.speakers.length}} {{#link-to 'public.speakers' class='item'}} @@ -46,9 +46,9 @@ {{/if}} {{#if event.hasOwnerInfo}} {{#if (eq session.currentRouteName 'public.index')}} - {{#scroll-to href='#owner' class='item'}} + {{t 'Owner'}} - {{/scroll-to}} + {{else}} {{t 'Owner'}} @@ -56,9 +56,9 @@ {{/if}} {{/if}} {{#if (eq session.currentRouteName 'public.index')}} - {{#scroll-to href='#getting-here' class='item'}} + {{t 'Getting here'}} - {{/scroll-to}} + {{else}} {{t 'Getting here'}} diff --git a/package.json b/package.json index a8a22270828..b24906d9ca5 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,6 @@ "ember-resolver": "^7.0.0", "ember-route-action-helper": "^2.0.8", "ember-router-scroll": "^2.0.0", - "ember-scroll-to": "^0.6.5", "ember-simple-auth": "^2.1.1", "ember-simple-auth-token": "^4.0.7", "ember-source": "~3.16.1", diff --git a/yarn.lock b/yarn.lock index bb509a58ed7..084c8c561c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6961,13 +6961,6 @@ ember-runtime-enumerable-includes-polyfill@^2.0.0: ember-cli-babel "^6.9.0" ember-cli-version-checker "^2.1.0" -ember-scroll-to@^0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/ember-scroll-to/-/ember-scroll-to-0.6.5.tgz#d9a7658eed6b8ae0e3c71b93b03f59a8550b8a10" - dependencies: - ember-cli-babel "^6.3.0" - ember-cli-htmlbars "^2.0.1" - ember-simple-auth-token@^4.0.7: version "4.0.7" resolved "https://registry.yarnpkg.com/ember-simple-auth-token/-/ember-simple-auth-token-4.0.7.tgz#df4177d118b9f7a75a3879ceec04ab2c55e1cad2" From 6af54b2a18a07a9fe2fd092c5f13b3d721d4ab00 Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Fri, 7 Feb 2020 06:39:47 +0530 Subject: [PATCH 10/25] fix: Choosing Ticket holder same as ticket buyer not makes the text light gray (#4008) * Update order-form.hbs * updating message to 15 minutes * Update index.js * Update index.js Co-authored-by: Kush Trivedi <44091822+kushthedude@users.noreply.github.com> --- app/controllers/public/index.js | 2 +- .../components/forms/orders/order-form.hbs | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/controllers/public/index.js b/app/controllers/public/index.js index 4f7708a04b6..4aab82679c8 100644 --- a/app/controllers/public/index.js +++ b/app/controllers/public/index.js @@ -131,7 +131,7 @@ export default Controller.extend({ order.set('attendees', attendees); await order.save() .then(order => { - this.notify.success(this.l10n.t('Order details saved. Please fill further details within 10 minutes.')); + this.notify.success(this.l10n.t(`Order details saved. Please fill further details within ${this.settings.orderExpiryTime} minutes.`)); this.transitionToRoute('orders.new', order.identifier); }) .catch(async e => { diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs index 6fbb20859b0..4ca3e835100 100644 --- a/app/templates/components/forms/orders/order-form.hbs +++ b/app/templates/components/forms/orders/order-form.hbs @@ -49,9 +49,7 @@
{{#each allFields.attendee as |field|}} {{#if field.isIncluded}} -
+
{{#if (is-input-field field.type) }} {{#if field.isLongText}} @@ -59,9 +57,13 @@ name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}} {{else}} - {{input type=field.type value=(mut (get holder field.fieldIdentifier)) - name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}} - + {{#if (and sameAsBuyer (eq index 0) (or (eq field.fieldIdentifier 'firstname') (eq field.fieldIdentifier 'lastname') (eq field.fieldIdentifier 'email')))}} + {{input type=field.type value=(mut (get holder field.fieldIdentifier)) + name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index)) readonly=""}} + {{else}} + {{input type=field.type value=(mut (get holder field.fieldIdentifier)) + name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}} + {{/if}} {{/if}} {{else if (eq field.fieldIdentifier 'gender')}} {{#ui-dropdown class='search selection' value=(mut (get holder field.fieldIdentifier)) onChange=(action (mut holder.gender)) as |execute mapper|}} From 7d86eac9eb40fa529fc0d3749e540999206ff80f Mon Sep 17 00:00:00 2001 From: Kush Trivedi <44091822+kushthedude@users.noreply.github.com> Date: Fri, 7 Feb 2020 19:29:06 +0530 Subject: [PATCH 11/25] test: Addition of paymentIcon Helpers Test (#4025) --- .../integration/helpers/payment-icon-test.js | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 tests/integration/helpers/payment-icon-test.js diff --git a/tests/integration/helpers/payment-icon-test.js b/tests/integration/helpers/payment-icon-test.js new file mode 100644 index 00000000000..14c5ecedc1d --- /dev/null +++ b/tests/integration/helpers/payment-icon-test.js @@ -0,0 +1,23 @@ +import { module, test } from 'qunit'; +import { setupIntegrationTest } from 'open-event-frontend/tests/helpers/setup-integration-test'; +import hbs from 'htmlbars-inline-precompile'; +import { render } from '@ember/test-helpers'; + +module('Integration | Helper | payment-icon', function(hooks) { + setupIntegrationTest(hooks); + + test('it renders', async function(assert) { + this.set('inputIcon', 'Visa'); + await render(hbs`{{payment-icon inputIcon}}`); + assert.equal(this.element.textContent.trim(), 'big visa icon'); + + this.set('inputIcon', 'MasterCard'); + await render(hbs`{{payment-icon inputIcon}}`); + assert.equal(this.element.textContent.trim(), 'big mastercard icon'); + + this.set('inputIcon', 'American Express'); + await render(hbs`{{payment-icon inputIcon}}`); + assert.equal(this.element.textContent.trim(), 'big amex icon'); + + }); +}); From a8aac003f5d476e9914830aeb5f93601dd9504e9 Mon Sep 17 00:00:00 2001 From: Kush Trivedi <44091822+kushthedude@users.noreply.github.com> Date: Fri, 7 Feb 2020 19:53:59 +0530 Subject: [PATCH 12/25] feat: Implementing infinityModel at public session route (#4022) --- app/routes/public/sessions/list.js | 187 ++++++------------------- app/templates/public/sessions/list.hbs | 6 + 2 files changed, 47 insertions(+), 146 deletions(-) diff --git a/app/routes/public/sessions/list.js b/app/routes/public/sessions/list.js index 78e5612d6e3..4a309ccaf8c 100644 --- a/app/routes/public/sessions/list.js +++ b/app/routes/public/sessions/list.js @@ -16,169 +16,64 @@ export default Route.extend({ }, async model(params) { const eventDetails = this.modelFor('public'); - let sessions = null; - if (params.session_status === 'today') { - sessions = await this.store.query('session', { - filter: [ + const filterOptions = [ + { + and: [ { - and: [ - { - name : 'event', - op : 'has', - val : { - name : 'identifier', - op : 'eq', - val : eventDetails.id - } - }, - { - name : 'starts-at', - op : 'ge', - val : moment().startOf('day').toISOString() - }, - { - name : 'starts-at', - op : 'lt', - val : moment().endOf('day').toISOString() - }, - { - or: [ - { - name : 'state', - op : 'eq', - val : 'confirmed' - }, - { - name : 'state', - op : 'eq', - val : 'accepted' - } - ] - } - ] - } - ] - }); - } else if (params.session_status === 'week') { - sessions = await this.store.query('session', { - filter: [ + name : 'event', + op : 'has', + val : { + name : 'identifier', + op : 'eq', + val : eventDetails.id + } + }, { - and: [ + or: [ { - name : 'event', - op : 'has', - val : { - name : 'identifier', - op : 'eq', - val : eventDetails.id - } + name : 'state', + op : 'eq', + val : 'confirmed' }, { - name : 'starts-at', - op : 'ge', - val : moment().startOf('week').toISOString() - }, - { - name : 'starts-at', - op : 'lt', - val : moment().endOf('week').toISOString() - }, - { - or: [ - { - name : 'state', - op : 'eq', - val : 'confirmed' - }, - { - name : 'state', - op : 'eq', - val : 'accepted' - } - ] + name : 'state', + op : 'eq', + val : 'accepted' } ] } ] - }); - } else if (params.session_status === 'month') { - sessions = await this.store.query('session', { - filter: [ + } + ]; + + if (params.session_status !== 'all') { + + const period = params.session_status === 'today' ? 'day' : params.session_status; + filterOptions.push({ + and: [ { - and: [ - { - name : 'event', - op : 'has', - val : { - name : 'identifier', - op : 'eq', - val : eventDetails.id - } - }, - { - name : 'starts-at', - op : 'ge', - val : moment().startOf('month').toISOString() - }, - { - name : 'starts-at', - op : 'lt', - val : moment().add('month').toISOString() - }, - { - or: [ - { - name : 'state', - op : 'eq', - val : 'confirmed' - }, - { - name : 'state', - op : 'eq', - val : 'accepted' - } - ] - } - ] - } - ] - }); - } else { - sessions = await this.store.query('session', { - filter: [ + name : 'starts-at', + op : 'ge', + val : moment().startOf(period).toISOString() + }, { - and: [ - { - name : 'event', - op : 'has', - val : { - name : 'identifier', - op : 'eq', - val : eventDetails.id - } - }, - { - or: [ - { - name : 'state', - op : 'eq', - val : 'confirmed' - }, - { - name : 'state', - op : 'eq', - val : 'accepted' - } - ] - } - ] + name : 'starts-at', + op : 'lt', + val : moment().endOf(period).toISOString() } ] }); + } return { event : eventDetails, - session : sessions + session : await this.infinity.model('session', { + filter : filterOptions, + perPage : 6, + startingPage : 1, + perPageParam : 'page[size]', + pageParam : 'page[number]' + }) }; } }); diff --git a/app/templates/public/sessions/list.hbs b/app/templates/public/sessions/list.hbs index 8d7da621bd6..e158c138dab 100644 --- a/app/templates/public/sessions/list.hbs +++ b/app/templates/public/sessions/list.hbs @@ -10,4 +10,10 @@ {{else}}
{{t 'No Sessions exist for this time period'}}
{{/each}} + {{#infinity-loader infinityModel=model.session triggerOffset=300 eventDebounce=50}} +
+
+
+
+ {{/infinity-loader}}
\ No newline at end of file From e42a66514615f8a1972b89a3a9efe28a870b4195 Mon Sep 17 00:00:00 2001 From: Nitin Kumar <46647141+snitin315@users.noreply.github.com> Date: Sun, 9 Feb 2020 10:29:34 +0530 Subject: [PATCH 13/25] enh: move Delete button to settings page (#4029) --- app/controllers/events/view.js | 28 ------------------------- app/controllers/events/view/settings.js | 28 +++++++++++++++++++++++++ app/templates/events/view.hbs | 9 -------- app/templates/events/view/settings.hbs | 14 ++++++++++++- 4 files changed, 41 insertions(+), 38 deletions(-) diff --git a/app/controllers/events/view.js b/app/controllers/events/view.js index c3b0a04cd9a..4fb4e4d6da6 100644 --- a/app/controllers/events/view.js +++ b/app/controllers/events/view.js @@ -3,11 +3,6 @@ import { isEmpty } from '@ember/utils'; import { action } from '@ember/object'; export default class extends Controller { - @action - openDeleteEventModal() { - this.set('isEventDeleteModalOpen', true); - } - @action togglePublishState() { if (isEmpty(this.model.locationName)) { @@ -46,29 +41,6 @@ export default class extends Controller { }); } - @action - deleteEvent() { - this.set('isLoading', true); - this.model.destroyRecord() - .then(() => { - this.transitionToRoute('events'); - this.notify.success(this.l10n.t('Event has been deleted successfully.'), - { - id: 'event_deleted_succ' - }); - }) - .catch(() => { - this.notify.error(this.l10n.t('An unexpected error has occurred.'), - { - id: 'event_deleted_error' - }); - }) - .finally(() => { - this.set('isLoading', false); - }); - this.set('isEventDeleteModalOpen', false); - } - @action copyEvent() { this.set('isCopying', true); diff --git a/app/controllers/events/view/settings.js b/app/controllers/events/view/settings.js index 01fd00a7652..6c82259be97 100644 --- a/app/controllers/events/view/settings.js +++ b/app/controllers/events/view/settings.js @@ -3,6 +3,34 @@ import { action } from '@ember/object'; export default class extends Controller { + @action + openDeleteEventModal() { + this.set('isEventDeleteModalOpen', true); + } + + @action + deleteEvent() { + this.set('isLoading', true); + this.model.event.destroyRecord() + .then(() => { + this.transitionToRoute('events'); + this.notify.success(this.l10n.t('Event has been deleted successfully.'), + { + id: 'event_deleted_succ' + }); + }) + .catch(() => { + this.notify.error(this.l10n.t('An unexpected error has occurred.'), + { + id: 'event_deleted_error' + }); + }) + .finally(() => { + this.set('isLoading', false); + }); + this.set('isEventDeleteModalOpen', false); + } + @action openEventTransferModal(id, name) { this.setProperties({ diff --git a/app/templates/events/view.hbs b/app/templates/events/view.hbs index 7a861ced31b..87800ac730a 100644 --- a/app/templates/events/view.hbs +++ b/app/templates/events/view.hbs @@ -29,7 +29,6 @@ -
{{else}} @@ -51,10 +50,6 @@ {{t 'Copy'}} - {{/if}} @@ -90,10 +85,6 @@ - {{modals/event-delete-modal isLoading=isLoading - isOpen=isEventDeleteModalOpen - eventName=model.name - deleteEvent=(action 'deleteEvent')}}
{{outlet}}
diff --git a/app/templates/events/view/settings.hbs b/app/templates/events/view/settings.hbs index 4579cd8f934..1e1ec8c705a 100644 --- a/app/templates/events/view/settings.hbs +++ b/app/templates/events/view/settings.hbs @@ -2,9 +2,21 @@

{{t 'Transfer ownership of this event to another user. You\'ll lose all the owner rights once they accept the ownership.'}}

- +
+

+ {{t 'Once you delete an event, there is no going back. Please be certain'}} +

+ {{modals/event-transfer-modal isLoading=isLoading isOpen=isEventTransferModalOpen confirmEventName=confirmEventName eventName=eventName openConfirmEventTransferModal=(action 'openConfirmEventTransferModal') transferEvent=(action 'transferEvent' model)}} {{modals/confirm-event-transfer-modal currentInvite=currentInvite isLoading=isLoading isOpen=isConfirmEventTransferModalOpen checked=checked transferEvent=(action 'transferEvent')}} +{{modals/event-delete-modal isLoading=isLoading + isOpen=isEventDeleteModalOpen + eventName=model.event.name + deleteEvent=(action 'deleteEvent')}} \ No newline at end of file From 28dcc7a81a0e359e5b6fbad72193f538928c0a26 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 9 Feb 2020 12:58:22 +0530 Subject: [PATCH 14/25] chore(deps-dev): bump ember-math-helpers from 2.12.1 to 2.13.0 (#4031) Bumps [ember-math-helpers](https://github.com/shipshapecode/ember-math-helpers) from 2.12.1 to 2.13.0. - [Release notes](https://github.com/shipshapecode/ember-math-helpers/releases) - [Changelog](https://github.com/shipshapecode/ember-math-helpers/blob/master/CHANGELOG.md) - [Commits](https://github.com/shipshapecode/ember-math-helpers/compare/v2.12.1...v2.13.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: Kush Trivedi <44091822+kushthedude@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b24906d9ca5..b7b995ad0b1 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "ember-l10n": "^4.3.0", "ember-link-action": "1.0.0", "ember-load-initializers": "^2.1.1", - "ember-math-helpers": "^2.12.1", + "ember-math-helpers": "^2.13.0", "ember-maybe-import-regenerator": "^0.1.6", "ember-metrics": "^0.14.0", "ember-models-table": "^2.10.1", diff --git a/yarn.lock b/yarn.lock index 084c8c561c6..71e54643abf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6771,12 +6771,12 @@ ember-macro-helpers@^4.2.2: ember-cli-string-utils "^1.1.0" ember-cli-test-info "^1.0.0" -ember-math-helpers@^2.12.1: - version "2.12.1" - resolved "https://registry.yarnpkg.com/ember-math-helpers/-/ember-math-helpers-2.12.1.tgz#a08faee5563f42dd315ff9db613221dc818654a9" - integrity sha512-vnL3+ndIea5c7sUmkVFFsCiYNfdyylx7irlpYqoYJ/jakO0eHzmF+9vYU2LtO0pLo8/PjgyZSEO00LPAff7b/g== +ember-math-helpers@^2.13.0: + version "2.13.0" + resolved "https://registry.yarnpkg.com/ember-math-helpers/-/ember-math-helpers-2.13.0.tgz#eb304b6f75f217e7c1c62fceada396365faf63eb" + integrity sha512-UW4MKjpTp5TXcO/mIAvuZtKBx1uuL3W/uDJsFp5fDHA3Thdl5R+NQsQcnJZURbsKeaW3oPGPyM9tG806yopRbA== dependencies: - broccoli-funnel "^2.0.2" + broccoli-funnel "^3.0.1" ember-cli-babel "^7.13.0" ember-cli-htmlbars "^4.2.0" From d19fb4b66e820f4ecfbf7062d752cc4ec93a2550 Mon Sep 17 00:00:00 2001 From: Kush Trivedi <44091822+kushthedude@users.noreply.github.com> Date: Sun, 9 Feb 2020 17:19:29 +0530 Subject: [PATCH 15/25] feat: Improving layout of Event Settings Page (#4033) --- app/templates/events/view/settings.hbs | 53 ++++++++++++++------- app/templates/events/view/tickets/index.hbs | 1 - 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/app/templates/events/view/settings.hbs b/app/templates/events/view/settings.hbs index 1e1ec8c705a..f8bca805c08 100644 --- a/app/templates/events/view/settings.hbs +++ b/app/templates/events/view/settings.hbs @@ -1,22 +1,41 @@
-

- {{t 'Transfer ownership of this event to another user. You\'ll lose all the owner rights once they accept the ownership.'}} -

- -
-

- {{t 'Once you delete an event, there is no going back. Please be certain'}} -

- +
+
+
+

+ {{t 'Transfer Ownership'}} +

+

+ {{t 'You\'ll lose all the owner rights once the other user accepts the invitation for ownership.'}} +

+
+
+ +
+ +
+

+ {{t 'Delete this event'}} +

+
+ {{t 'Once you delete an event, you will lose all the data related to this event.'}} +
+
+
+ +
+
+
{{modals/event-transfer-modal isLoading=isLoading isOpen=isEventTransferModalOpen confirmEventName=confirmEventName eventName=eventName openConfirmEventTransferModal=(action 'openConfirmEventTransferModal') transferEvent=(action 'transferEvent' model)}} {{modals/confirm-event-transfer-modal currentInvite=currentInvite isLoading=isLoading isOpen=isConfirmEventTransferModalOpen checked=checked transferEvent=(action 'transferEvent')}} {{modals/event-delete-modal isLoading=isLoading - isOpen=isEventDeleteModalOpen - eventName=model.event.name - deleteEvent=(action 'deleteEvent')}} \ No newline at end of file + isOpen=isEventDeleteModalOpen + eventName=model.event.name + deleteEvent=(action 'deleteEvent')}} diff --git a/app/templates/events/view/tickets/index.hbs b/app/templates/events/view/tickets/index.hbs index 36bdc1401ad..47b154dda6a 100644 --- a/app/templates/events/view/tickets/index.hbs +++ b/app/templates/events/view/tickets/index.hbs @@ -1,4 +1,3 @@ -{{meh}}
{{t 'Total Sold Orders'}} From 5679da2a0345b8fe16b7f65b24a9e910f2225042 Mon Sep 17 00:00:00 2001 From: Kush Trivedi <44091822+kushthedude@users.noreply.github.com> Date: Sun, 9 Feb 2020 17:48:27 +0530 Subject: [PATCH 16/25] fix: Event Identifier getting shown in Admin/User/Event (#4036) --- app/controllers/admin/users/view/events/list.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/users/view/events/list.js b/app/controllers/admin/users/view/events/list.js index 4cc6e52be77..57b5e2e9d15 100644 --- a/app/controllers/admin/users/view/events/list.js +++ b/app/controllers/admin/users/view/events/list.js @@ -12,8 +12,8 @@ export default class extends Controller.extend(EmberTableControllerMixin) { return [ { name : 'Name', - valuePath : 'id', - extraValuePaths : ['logoUrl', 'name', 'identifier', 'deletedAt'], + valuePath : 'name', + extraValuePaths : ['logoUrl', 'identifier', 'deletedAt'], isSortable : true, headerComponent : 'tables/headers/sort', cellComponent : 'ui-table/cell/cell-event', From 46ad4ce77f6f9d0865b5be5e37acb5e746d3baf6 Mon Sep 17 00:00:00 2001 From: Areeb Jamal Date: Mon, 10 Feb 2020 01:23:37 +0530 Subject: [PATCH 17/25] fix: Disable role invite processing in fastboot mode (#4038) --- app/routes/public/role-invites.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/routes/public/role-invites.js b/app/routes/public/role-invites.js index 9f6539bb82b..b264399e23f 100644 --- a/app/routes/public/role-invites.js +++ b/app/routes/public/role-invites.js @@ -1,8 +1,13 @@ import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; export default Route.extend({ - redirectionParams: null, + fastboot : service(), + redirectionParams : null, async beforeModel(transition) { + // We don't want to process or transition in fastboot mode + // Since this is only an intermediate page + if (this.fastboot.isFastBoot) {return} const { token } = transition.to.queryParams; const originalEventId = transition.resolvedModels.public.originalId; const payload = { @@ -31,6 +36,7 @@ export default Route.extend({ }, afterModel() { + if (this.fastboot.isFastBoot) {return} this.transitionTo('register', this.redirectionParams); } }); From 63302fb4f27c909de1d304fbc83ac4126becab96 Mon Sep 17 00:00:00 2001 From: Nitin Kumar <46647141+snitin315@users.noreply.github.com> Date: Mon, 10 Feb 2020 18:14:22 +0530 Subject: [PATCH 18/25] enh: Improve danger-zone layout (#4039) --- .../components/account/danger-zone.hbs | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/app/templates/components/account/danger-zone.hbs b/app/templates/components/account/danger-zone.hbs index aa5046009cc..371f1baf8f3 100644 --- a/app/templates/components/account/danger-zone.hbs +++ b/app/templates/components/account/danger-zone.hbs @@ -1,23 +1,28 @@
- {{#if isUserDeletable}} -

- {{t 'All user data will be deleted. Your user data will be entirely erased and any data that will stay - in the system for accounting purposes will be anonymised and there will be no link to any of your personal information. - Once you delete this account, you will have no longer access to the system.'}} -

- +
+
+

+ {{t 'Delete Your Account'}} +

+

+ {{#if isUserDeletable}} + {{t 'All user data will be deleted. Your user data will be entirely erased and any data that will stay + in the system for accounting purposes will be anonymised and there will be no link to any of your personal information. + Once you delete this account, you will have no longer access to the system.'}} + {{else}} + {{t 'Your account currently cannot be deleted as active events and/or orders are associated with it. + Before you can delete your account you must transfer the ownership of your event(s) to another organizer or cancel your event(s). + If you have ticket orders stored in the system, please cancel your orders first too.'}} + {{/if}} +

+
+
+ +
{{modals/user-delete-modal isLoading=isLoading isOpen=isUserDeleteModalOpen openConfirmDeleteUserModal=(action 'openConfirmDeleteUserModal') confirmEmail=confirmEmail userEmail=userEmail deleteUser=(action 'deleteUser' data.user)}} {{modals/confirm-user-delete-modal isLoading=isLoading isOpen=isConfirmUserDeleteModalOpen checked=checked deleteUser=(action 'deleteUser' data.user)}} - {{else}} -

- {{t 'Your account currently cannot be deleted as active events and/or orders are associated with it. - Before you can delete your account you must transfer the ownership of your event(s) to another organizer or cancel your event(s). - If you have ticket orders stored in the system, please cancel your orders first too.'}} -

- - {{/if}} +
\ No newline at end of file From b54c16638f29d63eec819b6d5cab33b14f36f4c4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2020 21:55:08 +0530 Subject: [PATCH 19/25] chore(deps-dev): bump ember-simple-auth from 2.1.1 to 3.0.0 (#4047) Bumps [ember-simple-auth](https://github.com/simplabs/ember-simple-auth) from 2.1.1 to 3.0.0. - [Release notes](https://github.com/simplabs/ember-simple-auth/releases) - [Changelog](https://github.com/simplabs/ember-simple-auth/blob/master/CHANGELOG.md) - [Commits](https://github.com/simplabs/ember-simple-auth/compare/2.1.1...3.0.0) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index b7b995ad0b1..702c0b006a2 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "ember-resolver": "^7.0.0", "ember-route-action-helper": "^2.0.8", "ember-router-scroll": "^2.0.0", - "ember-simple-auth": "^2.1.1", + "ember-simple-auth": "^3.0.0", "ember-simple-auth-token": "^4.0.7", "ember-source": "~3.16.1", "ember-table": "^2.2.3", diff --git a/yarn.lock b/yarn.lock index 71e54643abf..03a6f532906 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6521,7 +6521,7 @@ ember-config-service@^1.0.0: ember-cli-babel "^7.1.0" ember-getowner-polyfill "^1.1.0 || ^2.0.0" -ember-cookies@^0.5.2: +ember-cookies@^0.5.0, ember-cookies@^0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/ember-cookies/-/ember-cookies-0.5.2.tgz#06e33463f2f83254fefaf224cc944dec3fb9d3ba" integrity sha512-nZ7oG97kBcO9UHjO95ryABpnVx62Bhxo7lIsBJNmWvFXleILm9DGueiAynzXxuYWWPuKIeeSbYakrS1869tNTw== @@ -6987,20 +6987,18 @@ ember-simple-auth@^1.6.0: ember-getowner-polyfill "^1.1.0 || ^2.0.0" silent-error "^1.0.0" -ember-simple-auth@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ember-simple-auth/-/ember-simple-auth-2.1.1.tgz#c9624485193304f7767ce9a0c9353eae9a4f7325" - integrity sha512-VrX09hZGGk/PuDmaVDEfRf46tNBJF8FJR6nszvY3rmmB1+tGrzeyHOZTyY7+mcAQfsyZAS71gs6twjxYKCquGQ== +ember-simple-auth@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ember-simple-auth/-/ember-simple-auth-3.0.0.tgz#d994f512cda1a8a5a6ef5a853fac60c0c0d6acd6" + integrity sha512-JaEw5W/Z9+HIH9I2BmE/JD4KofH4rp79Y51zJpt3UQI1OwWFOzFa+ulN0rK/DVLpGOz7uL7hBIE/rtEcEN1eqA== dependencies: base-64 "^0.1.0" broccoli-file-creator "^2.0.0" broccoli-funnel "^1.2.0 || ^2.0.0" broccoli-merge-trees "^2.0.0 || ^3.0.0" - ember-cli-babel "^6.8.2" + ember-cli-babel "^7.12.0" ember-cli-is-package-missing "^1.0.0" - ember-cookies "^0.3.0 || ^0.4.0" - ember-fetch "^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0" - ember-getowner-polyfill "^1.1.0 || ^2.0.0" + ember-cookies "^0.5.0" silent-error "^1.0.0" ember-source-channel-url@^2.0.1: From 1ffae850d7516d06bbc1c54785d9c60c0bd77d22 Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Mon, 10 Feb 2020 23:23:20 +0530 Subject: [PATCH 20/25] fix: Rename tickets-type field to ticket-name in table (#4044) * adding tickets-type field in table * Update index.hbs Co-authored-by: Kush Trivedi <44091822+kushthedude@users.noreply.github.com> --- app/templates/events/view/tickets/index.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/events/view/tickets/index.hbs b/app/templates/events/view/tickets/index.hbs index 47b154dda6a..b29903bc5e7 100644 --- a/app/templates/events/view/tickets/index.hbs +++ b/app/templates/events/view/tickets/index.hbs @@ -124,7 +124,7 @@ - + From fd66acbd14a3d652fe7fc5d2a182b548198169d1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2020 23:49:05 +0530 Subject: [PATCH 21/25] chore(deps-dev): bump ember-source from 3.16.1 to 3.16.2 (#4049) Bumps [ember-source](https://github.com/emberjs/ember.js) from 3.16.1 to 3.16.2. - [Release notes](https://github.com/emberjs/ember.js/releases) - [Changelog](https://github.com/emberjs/ember.js/blob/v3.16.2/CHANGELOG.md) - [Commits](https://github.com/emberjs/ember.js/compare/v3.16.1...v3.16.2) Signed-off-by: dependabot-preview[bot] Co-authored-by: Kush Trivedi <44091822+kushthedude@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 702c0b006a2..399b8206c41 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "ember-router-scroll": "^2.0.0", "ember-simple-auth": "^3.0.0", "ember-simple-auth-token": "^4.0.7", - "ember-source": "~3.16.1", + "ember-source": "~3.16.2", "ember-table": "^2.2.3", "ember-truth-helpers": "^2.1.0", "ember-uuid": "^2.1.0", diff --git a/yarn.lock b/yarn.lock index 03a6f532906..2bdd68811c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7008,10 +7008,10 @@ ember-source-channel-url@^2.0.1: dependencies: got "^8.0.1" -ember-source@~3.16.1: - version "3.16.1" - resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.16.1.tgz#997f51c2b74620906d2a8111089b6e894b6165e6" - integrity sha512-4cYfQ+DsqeSTqG0RztuTsh8d8p0XdeIaPWe9Ol229GhQjM1JgpjQNTXGJDTIB8FfbAxycPlCwIk2qXygA+pFsA== +ember-source@~3.16.2: + version "3.16.2" + resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.16.2.tgz#bdb342445804d20b46796b98919a924e5a8eb61e" + integrity sha512-aRF90V88rJ6h47ootUw8oGcV7O4ulwLYNVqnokTr9RTeWjEimwMtzLLazUfDR1LZMkdMTLVLGcQkJCJVvUAg5A== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/plugin-transform-block-scoping" "^7.6.2" From 484981b360b790110bc360340d0bd9e8e05549c9 Mon Sep 17 00:00:00 2001 From: Nitin Kumar <46647141+snitin315@users.noreply.github.com> Date: Tue, 11 Feb 2020 00:12:58 +0530 Subject: [PATCH 22/25] enh : improve event settings page (#4041) Co-authored-by: Kush Trivedi <44091822+kushthedude@users.noreply.github.com> --- app/templates/events/view/settings.hbs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/templates/events/view/settings.hbs b/app/templates/events/view/settings.hbs index f8bca805c08..b8524153721 100644 --- a/app/templates/events/view/settings.hbs +++ b/app/templates/events/view/settings.hbs @@ -1,7 +1,7 @@
-
+

{{t 'Transfer Ownership'}}

@@ -9,14 +9,14 @@ {{t 'You\'ll lose all the owner rights once the other user accepts the invitation for ownership.'}}

-
-
-
+

{{t 'Delete this event'}}

@@ -24,8 +24,8 @@ {{t 'Once you delete an event, you will lose all the data related to this event.'}}
-
- From 957934c9e0b3229c05320ffea85592f79e74c894 Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Tue, 11 Feb 2020 10:00:21 +0530 Subject: [PATCH 23/25] fix: create discount & access code page (#4051) * changing to success event listener * fixing broken access code section too --- .../components/forms/events/view/create-access-code.hbs | 2 +- .../components/forms/events/view/create-discount-code.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/components/forms/events/view/create-access-code.hbs b/app/templates/components/forms/events/view/create-access-code.hbs index 5e44c14e9e1..56b371bf75b 100644 --- a/app/templates/components/forms/events/view/create-access-code.hbs +++ b/app/templates/components/forms/events/view/create-access-code.hbs @@ -76,7 +76,7 @@ {{#copy-button class='ui black right labeled icon copy button' clipboardText=accessLink - click=(action 'copiedText') + success=(action 'copiedText') }} {{t 'Copy'}} diff --git a/app/templates/components/forms/events/view/create-discount-code.hbs b/app/templates/components/forms/events/view/create-discount-code.hbs index 3d70ab58681..084f9f02090 100644 --- a/app/templates/components/forms/events/view/create-discount-code.hbs +++ b/app/templates/components/forms/events/view/create-discount-code.hbs @@ -88,7 +88,7 @@ {{#copy-button class='ui black right labeled icon copy button' clipboardText=discountLink - click=(action 'copiedText') + success=(action 'copiedText') }} {{t 'Copy'}} From 9ec1799b8cb9901b961b443d707827fef5559a4f Mon Sep 17 00:00:00 2001 From: Kush Trivedi <44091822+kushthedude@users.noreply.github.com> Date: Tue, 11 Feb 2020 20:27:07 +0530 Subject: [PATCH 24/25] fix: Wrap read only relationships deletion in try catch (#4056) * fix: Event creation/deletion error * try-catch * fix final * Adding comments Co-Authored-By: Areeb Jamal * Trailing space fix Co-authored-by: Areeb Jamal --- app/serializers/event.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/serializers/event.js b/app/serializers/event.js index 4797a235063..c8fb69beb3d 100644 --- a/app/serializers/event.js +++ b/app/serializers/event.js @@ -13,10 +13,20 @@ export default ApplicationSerializer.extend(CustomPrimaryKeyMixin, { serialize() { const json = this._super(...arguments); - delete json.data.relationships['general-statistics']; - delete json.data.relationships['order-statistics']; + + const { relationships } = json.data; + // We are deleting read only relationships so that they don't + // break the server. Since these relationships are not always + // present, we catch and ignore the error + try { + delete relationships['general-statistics']; + } catch {} // eslint-disable-line no-empty + try { + delete relationships['order-statistics']; + } catch {} // eslint-disable-line no-empty return json; + } }); From 747f7aa0ef021d9d33e0be8d12d173ce36e7ea35 Mon Sep 17 00:00:00 2001 From: Nitin Kumar <46647141+snitin315@users.noreply.github.com> Date: Tue, 11 Feb 2020 23:03:03 +0530 Subject: [PATCH 25/25] fix: remove location check from event-wizard mixin (#4059) --- app/mixins/event-wizard.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/mixins/event-wizard.js b/app/mixins/event-wizard.js index ae641d3eee8..2b00ca96394 100644 --- a/app/mixins/event-wizard.js +++ b/app/mixins/event-wizard.js @@ -117,9 +117,6 @@ export default Mixin.create(MutableArray, CustomFormMixin, { if (event.name === undefined || event.name === '') { errorObject.errors.push({ 'detail': 'Event name has not been provided' }); } - if (event.locationName === undefined || event.locationName === '') { - errorObject.errors.push({ 'detail': 'Location has not been provided' }); - } if (event.startsAtDate === undefined || event.endsAtDate === undefined) { errorObject.errors.push({ 'detail': 'Dates have not been provided' }); }
{{t 'Ticket Type'}}{{t 'Ticket Name'}} {{t 'Tickets Capacity Set'}} {{if device.isMobile 'Sales ' ''}}{{t 'Completed Orders '}} {{if device.isMobile 'Sales ' ''}}{{t 'Placed Orders'}}