From 5d8c2aeeaefaf962c99999fe1dd0eada03eebc89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:03:05 -0700 Subject: [PATCH 1/4] Bump @tailwindcss/forms from 0.5.7 to 0.5.9 (#12830) Bumps [@tailwindcss/forms](https://github.com/tailwindlabs/tailwindcss-forms) from 0.5.7 to 0.5.9. - [Release notes](https://github.com/tailwindlabs/tailwindcss-forms/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss-forms/blob/main/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss-forms/compare/v0.5.7...v0.5.9) --- updated-dependencies: - dependency-name: "@tailwindcss/forms" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4af3b254616..ab1f1cf7055 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "license": "MPL-2.0", "dependencies": { "@sentry/browser": "^7.113.0", - "@tailwindcss/forms": "^0.5.7", + "@tailwindcss/forms": "^0.5.9", "autoprefixer": "^10.4.20", "axe-core": "^4.10.0", "bootstrap": "^4.6.0", @@ -1233,14 +1233,14 @@ "dev": true }, "node_modules/@tailwindcss/forms": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.7.tgz", - "integrity": "sha512-QE7X69iQI+ZXwldE+rzasvbJiyV/ju1FGHH0Qn2W3FKbuYtqp8LKcy6iSw79fVUT5/Vvf+0XgLCeYVG+UV6hOw==", + "version": "0.5.9", + "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.9.tgz", + "integrity": "sha512-tM4XVr2+UVTxXJzey9Twx48c1gcxFStqn1pQz0tRsX8o3DvxhN5oY5pvyAbUx7VTaZxpej4Zzvc6h+1RJBzpIg==", "dependencies": { "mini-svg-data-uri": "^1.2.3" }, "peerDependencies": { - "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1" + "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1 || >= 4.0.0-alpha.20" } }, "node_modules/@trysound/sax": { @@ -11433,9 +11433,9 @@ "dev": true }, "@tailwindcss/forms": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.7.tgz", - "integrity": "sha512-QE7X69iQI+ZXwldE+rzasvbJiyV/ju1FGHH0Qn2W3FKbuYtqp8LKcy6iSw79fVUT5/Vvf+0XgLCeYVG+UV6hOw==", + "version": "0.5.9", + "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.9.tgz", + "integrity": "sha512-tM4XVr2+UVTxXJzey9Twx48c1gcxFStqn1pQz0tRsX8o3DvxhN5oY5pvyAbUx7VTaZxpej4Zzvc6h+1RJBzpIg==", "requires": { "mini-svg-data-uri": "^1.2.3" } diff --git a/package.json b/package.json index bb1b318e131..dd7bfd3412e 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "license": "MPL-2.0", "dependencies": { "@sentry/browser": "^7.113.0", - "@tailwindcss/forms": "^0.5.7", + "@tailwindcss/forms": "^0.5.9", "autoprefixer": "^10.4.20", "axe-core": "^4.10.0", "bootstrap": "^4.6.0", From 9eff52de67f1280c73975f7558841681e12cebca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:15:13 -0700 Subject: [PATCH 2/4] Bump eslint-plugin-jsx-a11y from 6.9.0 to 6.10.0 (#12831) Bumps [eslint-plugin-jsx-a11y](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y) from 6.9.0 to 6.10.0. - [Release notes](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/releases) - [Changelog](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/main/CHANGELOG.md) - [Commits](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/compare/v6.9.0...v6.10.0) --- updated-dependencies: - dependency-name: eslint-plugin-jsx-a11y dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 45 +++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index ab1f1cf7055..788af332b16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,7 +46,7 @@ "browserslist": "^4.23.3", "chokidar-cli": "^3.0.0", "eslint": "^8.57.0", - "eslint-plugin-jsx-a11y": "^6.9.0", + "eslint-plugin-jsx-a11y": "^6.10.0", "eslint-plugin-prettier": "^5.2.1", "eslint-plugin-react": "^7.35.0", "optipng-bin": "^9.0.0", @@ -1681,12 +1681,12 @@ } }, "node_modules/axobject-query": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz", - "integrity": "sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz", + "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==", "dev": true, - "dependencies": { - "deep-equal": "^2.0.5" + "engines": { + "node": ">= 0.4" } }, "node_modules/balanced-match": { @@ -4150,17 +4150,17 @@ } }, "node_modules/eslint-plugin-jsx-a11y": { - "version": "6.9.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.9.0.tgz", - "integrity": "sha512-nOFOCaJG2pYqORjK19lqPqxMO/JpvdCZdPtNdxY3kvom3jTvkAbOvQvD8wuD0G8BYR0IGAGYDlzqWJOh/ybn2g==", + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.0.tgz", + "integrity": "sha512-ySOHvXX8eSN6zz8Bywacm7CvGNhUtdjvqfQDVe6020TUK34Cywkw7m0KsCCk1Qtm9G1FayfTN1/7mMYnYO2Bhg==", "dev": true, "dependencies": { "aria-query": "~5.1.3", "array-includes": "^3.1.8", "array.prototype.flatmap": "^1.3.2", "ast-types-flow": "^0.0.8", - "axe-core": "^4.9.1", - "axobject-query": "~3.1.1", + "axe-core": "^4.10.0", + "axobject-query": "^4.1.0", "damerau-levenshtein": "^1.0.8", "emoji-regex": "^9.2.2", "es-iterator-helpers": "^1.0.19", @@ -4176,7 +4176,7 @@ "node": ">=4.0" }, "peerDependencies": { - "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9" } }, "node_modules/eslint-plugin-jsx-a11y/node_modules/emoji-regex": { @@ -11753,13 +11753,10 @@ } }, "axobject-query": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz", - "integrity": "sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==", - "dev": true, - "requires": { - "deep-equal": "^2.0.5" - } + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz", + "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==", + "dev": true }, "balanced-match": { "version": "1.0.0", @@ -13775,17 +13772,17 @@ } }, "eslint-plugin-jsx-a11y": { - "version": "6.9.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.9.0.tgz", - "integrity": "sha512-nOFOCaJG2pYqORjK19lqPqxMO/JpvdCZdPtNdxY3kvom3jTvkAbOvQvD8wuD0G8BYR0IGAGYDlzqWJOh/ybn2g==", + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.0.tgz", + "integrity": "sha512-ySOHvXX8eSN6zz8Bywacm7CvGNhUtdjvqfQDVe6020TUK34Cywkw7m0KsCCk1Qtm9G1FayfTN1/7mMYnYO2Bhg==", "dev": true, "requires": { "aria-query": "~5.1.3", "array-includes": "^3.1.8", "array.prototype.flatmap": "^1.3.2", "ast-types-flow": "^0.0.8", - "axe-core": "^4.9.1", - "axobject-query": "~3.1.1", + "axe-core": "^4.10.0", + "axobject-query": "^4.1.0", "damerau-levenshtein": "^1.0.8", "emoji-regex": "^9.2.2", "es-iterator-helpers": "^1.0.19", diff --git a/package.json b/package.json index dd7bfd3412e..ba66dba1549 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "browserslist": "^4.23.3", "chokidar-cli": "^3.0.0", "eslint": "^8.57.0", - "eslint-plugin-jsx-a11y": "^6.9.0", + "eslint-plugin-jsx-a11y": "^6.10.0", "eslint-plugin-prettier": "^5.2.1", "eslint-plugin-react": "^7.35.0", "optipng-bin": "^9.0.0", From f71d5a9729f1c75816e15350888e555576c06ffa Mon Sep 17 00:00:00 2001 From: Mavis Ou Date: Tue, 10 Sep 2024 09:56:27 -0700 Subject: [PATCH 3/4] Updated CMS edit interface to include missing fields of Signup, Petition, and Callpower Snippets (#12826) --- .../wagtailpages/pagemodels/campaigns.py | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/network-api/networkapi/wagtailpages/pagemodels/campaigns.py b/network-api/networkapi/wagtailpages/pagemodels/campaigns.py index af1b92c185b..659c95a763f 100644 --- a/network-api/networkapi/wagtailpages/pagemodels/campaigns.py +++ b/network-api/networkapi/wagtailpages/pagemodels/campaigns.py @@ -74,6 +74,8 @@ class Meta: class CTA(CTABase): + panels = CTABase.panels + class Meta: ordering = ["-id"] verbose_name_plural = "CTA" @@ -136,6 +138,16 @@ class Callpower(TranslatableMixin, CTA): index.FilterField("locale_id"), ] + panels = CTA.panels + [ + FieldPanel("campaign_id"), + FieldPanel("call_button_label"), + FieldPanel("success_heading"), + FieldPanel("success_text"), + FieldPanel("share_twitter"), + FieldPanel("share_facebook"), + FieldPanel("share_email"), + ] + class Meta(TranslatableMixin.Meta): ordering = ["name"] verbose_name = "Callpower" @@ -166,6 +178,11 @@ class Signup(TranslatableMixin, CTA): index.FilterField("ask_name"), ] + panels = CTA.panels + [ + FieldPanel("campaign_id"), + FieldPanel("ask_name"), + ] + class Meta(TranslatableMixin.Meta): ordering = ["name"] verbose_name = "Signup" @@ -312,6 +329,17 @@ class Petition(TranslatableMixin, CTA): index.FilterField("show_comment_field"), ] + panels = CTA.panels + [ + FieldPanel("campaign_id"), + FieldPanel("show_country_field"), + FieldPanel("show_postal_code_field"), + FieldPanel("show_comment_field"), + FieldPanel("share_twitter"), + FieldPanel("share_facebook"), + FieldPanel("share_email"), + FieldPanel("thank_you"), + ] + class Meta(TranslatableMixin.Meta): ordering = ["-id"] verbose_name = "Petition" From 4875003e162773da06b98ea3ae9e8f7502b5fcbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20L=C3=B3pez?= <81331806+dlopezvsr@users.noreply.github.com> Date: Tue, 10 Sep 2024 11:57:32 -0600 Subject: [PATCH 4/4] Tp1 1033 migrate ga to gtm (#12744) * Replace GTM ID * Comment regarding container id added | GTM ID updated in mozfest base * Linting corrections: indentation * Update initial GTM setup - replace first ReactGA event: footer donate button * Files updated from ReactGA.event to dataLayer.push: primary nav, submission form, layout signup * Analytics events updated from ReactGA.event to dataLayer.push * Share vote tap events updated from ReactGA to GTM dataLayer.push * ReactGA module removal and events update for cta-button, header-donate, and social share * Footer social button event updated * home-banner, primary-button, and homepage events updated * homepage linting fix | participate donate, pulse profile, pulse profile list, and share button events updated * CTA download event updated | ReactGA module removed from not used files * Linting fixtures and integration tests * Conflicts fixed in merge with main * GTM ID correction after merged * Duplicated angle bracket corrected * csp_nonce template added to new inline script --- .../templates/mozfest/mozfest-base.html | 2 +- .../networkapi/templates/pages/base.html | 2 +- source/js/buyers-guide/analytics-events.js | 29 +++++++++++++++---- .../components/social-share/social-share.jsx | 8 +++-- .../footer-donate-button.js | 11 +++---- .../header-donate-button.js | 5 ++-- .../organisms/default-layout-signup.jsx | 4 +-- .../organisms/with-submission-logic.jsx | 17 ++++------- .../petition/petition-thank-you.jsx | 1 - .../template-js-handler/cta-button.js | 5 ++-- .../footer-social-button.js | 5 ++-- .../template-js-handler/home-banner.js | 5 ++-- .../template-js-handler/primary-button.js | 5 ++-- .../template-js-handler/cta-button.js | 5 ++-- .../template-js-handler/homepage.js | 8 ++--- .../participate-page-donate.js | 5 ++-- .../template-js-handler/pulse-profile-card.js | 13 ++++----- .../pulse-profile-list-filter.js | 6 ++-- .../template-js-handler/share-button-group.js | 4 +-- source/js/primary-nav.js | 8 ++--- 20 files changed, 80 insertions(+), 68 deletions(-) diff --git a/network-api/networkapi/mozfest/templates/mozfest/mozfest-base.html b/network-api/networkapi/mozfest/templates/mozfest/mozfest-base.html index e9f714204df..fc550b6e1f4 100644 --- a/network-api/networkapi/mozfest/templates/mozfest/mozfest-base.html +++ b/network-api/networkapi/mozfest/templates/mozfest/mozfest-base.html @@ -9,9 +9,9 @@ {% block ga_identifier %} - +