From ee51460dcd473f24d46f9ed17e20e18ff11f29cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 16:24:47 +0000 Subject: [PATCH 1/9] Bump mailgun-ruby from 1.2.14 to 1.2.16 in /back Bumps [mailgun-ruby](https://github.com/mailgun/mailgun-ruby) from 1.2.14 to 1.2.16. - [Release notes](https://github.com/mailgun/mailgun-ruby/releases) - [Changelog](https://github.com/mailgun/mailgun-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/mailgun/mailgun-ruby/compare/v1.2.14...v1.2.16) --- updated-dependencies: - dependency-name: mailgun-ruby dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- back/Gemfile | 2 +- back/Gemfile.lock | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/back/Gemfile b/back/Gemfile index 90a092f0dff9..d4e304dc71a0 100644 --- a/back/Gemfile +++ b/back/Gemfile @@ -139,7 +139,7 @@ gem 'aws-sdk-s3', '~> 1' gem 'aws-sdk-bedrockruntime', '~> 1' gem 'bootsnap', '~> 1', require: false gem 'dalli', '~> 3.2.8' -gem 'mailgun-ruby', '~>1.2.14' +gem 'mailgun-ruby', '~>1.2.16' gem 'rails_semantic_logger' gem 'rinku', '~> 2' gem 'jsonapi-serializer' diff --git a/back/Gemfile.lock b/back/Gemfile.lock index 60d302d268fd..b577b3e6ab98 100644 --- a/back/Gemfile.lock +++ b/back/Gemfile.lock @@ -730,7 +730,7 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) httparty (0.22.0) @@ -804,6 +804,7 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.2) loofah (2.23.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -812,14 +813,15 @@ GEM net-imap net-pop net-smtp - mailgun-ruby (1.2.14) + mailgun-ruby (1.2.16) rest-client (>= 2.0.2) marcel (1.0.4) matrix (0.4.2) method_source (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.1105) mimemagic (0.4.3) nokogiri (~> 1) rake @@ -1327,7 +1329,7 @@ DEPENDENCIES liquid (~> 5.5) listen (>= 3.0.5, < 4.0) machine_translations! - mailgun-ruby (~> 1.2.14) + mailgun-ruby (~> 1.2.16) matomo! mini_magick (~> 4.13) mjml-rails (~> 4.11) From 73f0d96da0e46add70c968d1afd8080e27193e08 Mon Sep 17 00:00:00 2001 From: Amanda Anderson Date: Wed, 4 Dec 2024 16:35:34 +0100 Subject: [PATCH 2/9] Fix failing e2e --- front/cypress/e2e/idea_cards.cy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/cypress/e2e/idea_cards.cy.ts b/front/cypress/e2e/idea_cards.cy.ts index 2981ec5bdb07..25641152404a 100644 --- a/front/cypress/e2e/idea_cards.cy.ts +++ b/front/cypress/e2e/idea_cards.cy.ts @@ -70,7 +70,7 @@ describe('Idea cards without filter sidebar sorting and filtering', () => { }); it('lets you filter the ideas by topic', () => { - cy.contains('waste').click(); + cy.contains('waste').last().click(); cy.get('#e2e-ideas-container') .find('.e2e-idea-card') .should('have.length', 1) From 67570863715a7c73c2af47920f0589063ca1b583 Mon Sep 17 00:00:00 2001 From: Amanda Anderson Date: Wed, 4 Dec 2024 17:21:42 +0100 Subject: [PATCH 3/9] Fix test --- front/cypress/e2e/idea_cards.cy.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/front/cypress/e2e/idea_cards.cy.ts b/front/cypress/e2e/idea_cards.cy.ts index 25641152404a..e1ac731f9f1f 100644 --- a/front/cypress/e2e/idea_cards.cy.ts +++ b/front/cypress/e2e/idea_cards.cy.ts @@ -70,6 +70,7 @@ describe('Idea cards without filter sidebar sorting and filtering', () => { }); it('lets you filter the ideas by topic', () => { + cy.contains('Show all').click(); cy.contains('waste').last().click(); cy.get('#e2e-ideas-container') .find('.e2e-idea-card') From c50ce23d46eabf06f7df4f1b19914c490d407e4e Mon Sep 17 00:00:00 2001 From: Amanda Anderson Date: Wed, 4 Dec 2024 18:03:36 +0100 Subject: [PATCH 4/9] Fix e2e --- front/app/components/FilterBoxes/TopicsFilter.tsx | 7 ++++++- front/cypress/e2e/idea_cards.cy.ts | 9 +++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/front/app/components/FilterBoxes/TopicsFilter.tsx b/front/app/components/FilterBoxes/TopicsFilter.tsx index 6a3b0bc7b14b..52ed2017fcd9 100644 --- a/front/app/components/FilterBoxes/TopicsFilter.tsx +++ b/front/app/components/FilterBoxes/TopicsFilter.tsx @@ -134,7 +134,11 @@ const TopicsFilter = memo( ) : ( - + {topicsWithIdeas .slice(0, showFullList ? undefined : 5) // We show only 5 topics by default with a "Show all" button. .map((topic: ITopicData) => { @@ -176,6 +180,7 @@ const TopicsFilter = memo( p="0px" mt="12px" fontSize="s" + id="e2e-show-all-tags-button" > {formatMessage( showFullList diff --git a/front/cypress/e2e/idea_cards.cy.ts b/front/cypress/e2e/idea_cards.cy.ts index e1ac731f9f1f..fa419fe9b41a 100644 --- a/front/cypress/e2e/idea_cards.cy.ts +++ b/front/cypress/e2e/idea_cards.cy.ts @@ -70,8 +70,13 @@ describe('Idea cards without filter sidebar sorting and filtering', () => { }); it('lets you filter the ideas by topic', () => { - cy.contains('Show all').click(); - cy.contains('waste').last().click(); + cy.get('#e2e-show-all-tags-button').scrollIntoView(); + cy.get('#e2e-show-all-tags-button').click(); + + cy.get('#e2e-topics-filters').within(() => { + cy.contains('waste').click(); + }); + cy.get('#e2e-ideas-container') .find('.e2e-idea-card') .should('have.length', 1) From dacaea454163d2b03b585eaf21ecc0f6db0bc155 Mon Sep 17 00:00:00 2001 From: brentguf Date: Thu, 5 Dec 2024 11:48:29 +0100 Subject: [PATCH 5/9] Remove unneeded check --- front/app/containers/ProjectsShowPage/ProjectCTABar/index.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/front/app/containers/ProjectsShowPage/ProjectCTABar/index.tsx b/front/app/containers/ProjectsShowPage/ProjectCTABar/index.tsx index bb8d99868420..ead2d8faa896 100644 --- a/front/app/containers/ProjectsShowPage/ProjectCTABar/index.tsx +++ b/front/app/containers/ProjectsShowPage/ProjectCTABar/index.tsx @@ -21,9 +21,7 @@ const ProjectCTABar = ({ projectId }: ProjectCTABarProps) => { const isSmallerThanTablet = useBreakpoint('tablet'); const isSmallerThanPhone = useBreakpoint('phone'); const [isVisible, setIsVisible] = useState(false); - // TODO: Fix this the next time the file is edited. - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - const portalElement = document?.getElementById('topbar-portal'); + const portalElement = document.getElementById('topbar-portal'); const { data: phases } = usePhases(projectId); const { data: project } = useProjectById(projectId); From 5b47dd14a0f61597c0abeb03fc537e86c9ab024b Mon Sep 17 00:00:00 2001 From: brentguf Date: Thu, 5 Dec 2024 12:08:33 +0100 Subject: [PATCH 6/9] Clarify what is rendered by removing unnecessary variable --- .../ProjectsShowPage/ProjectCTABar/index.tsx | 1 + .../app/containers/ProjectsShowPage/index.tsx | 100 +++++++++--------- 2 files changed, 52 insertions(+), 49 deletions(-) diff --git a/front/app/containers/ProjectsShowPage/ProjectCTABar/index.tsx b/front/app/containers/ProjectsShowPage/ProjectCTABar/index.tsx index ead2d8faa896..5aed571ec762 100644 --- a/front/app/containers/ProjectsShowPage/ProjectCTABar/index.tsx +++ b/front/app/containers/ProjectsShowPage/ProjectCTABar/index.tsx @@ -17,6 +17,7 @@ import { isNilOrError } from 'utils/helperUtils'; type ProjectCTABarProps = { projectId: string; }; + const ProjectCTABar = ({ projectId }: ProjectCTABarProps) => { const isSmallerThanTablet = useBreakpoint('tablet'); const isSmallerThanPhone = useBreakpoint('phone'); diff --git a/front/app/containers/ProjectsShowPage/index.tsx b/front/app/containers/ProjectsShowPage/index.tsx index f2bd1be0e042..4d1407bc7cab 100644 --- a/front/app/containers/ProjectsShowPage/index.tsx +++ b/front/app/containers/ProjectsShowPage/index.tsx @@ -118,54 +118,6 @@ const ProjectsShowPage = ({ project }: Props) => { } }, [mounted, loading, scrollToStatusModule, scrollToIdeas]); - let content: JSX.Element | null = null; - - if (loading) { - content = ; - } else { - content = ( - - - - -
- -
- {!!events?.data.length && ( - - - - - )} - - - ); - } - return (
{ events && events?.data.length > 0 ? colors.white : colors.background } > - {content} + {loading ? ( + + ) : ( + + + + +
+ +
+ {!!events?.data.length && ( + + + + + )} + + + )}
); From 28de38b73f52d4d221faa60ed0f7ce8b705a0bdb Mon Sep 17 00:00:00 2001 From: Amanda Anderson Date: Fri, 6 Dec 2024 10:08:12 +0100 Subject: [PATCH 7/9] Try to fix failing test --- front/cypress/e2e/idea_cards.cy.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/front/cypress/e2e/idea_cards.cy.ts b/front/cypress/e2e/idea_cards.cy.ts index fa419fe9b41a..ecafd01988bc 100644 --- a/front/cypress/e2e/idea_cards.cy.ts +++ b/front/cypress/e2e/idea_cards.cy.ts @@ -70,9 +70,6 @@ describe('Idea cards without filter sidebar sorting and filtering', () => { }); it('lets you filter the ideas by topic', () => { - cy.get('#e2e-show-all-tags-button').scrollIntoView(); - cy.get('#e2e-show-all-tags-button').click(); - cy.get('#e2e-topics-filters').within(() => { cy.contains('waste').click(); }); From aea0a0226e12e7437bb327b2da360761ebc6cb5c Mon Sep 17 00:00:00 2001 From: Amanda Anderson Date: Fri, 6 Dec 2024 10:37:50 +0100 Subject: [PATCH 8/9] Remove unnecessary code --- front/app/components/FilterBoxes/TopicsFilter.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/front/app/components/FilterBoxes/TopicsFilter.tsx b/front/app/components/FilterBoxes/TopicsFilter.tsx index 52ed2017fcd9..4117b762fe99 100644 --- a/front/app/components/FilterBoxes/TopicsFilter.tsx +++ b/front/app/components/FilterBoxes/TopicsFilter.tsx @@ -180,7 +180,6 @@ const TopicsFilter = memo( p="0px" mt="12px" fontSize="s" - id="e2e-show-all-tags-button" > {formatMessage( showFullList From b1046f0318ca0c60d74d4c53b456b7bcb2a92dee Mon Sep 17 00:00:00 2001 From: jamesspeake Date: Fri, 6 Dec 2024 10:15:42 +0000 Subject: [PATCH 9/9] Fix locale for sr-SP --- back/config/locales/sr-SP.yml | 2 +- back/engines/commercial/analysis/config/locales/sr-SP.yml | 2 +- .../flag_inappropriate_content/config/locales/sr-SP.yml | 2 +- .../engines/commercial/idea_assignment/config/locales/sr-SP.yml | 2 +- back/engines/commercial/multi_tenancy/config/locales/sr-SP.yml | 2 +- back/engines/free/email_campaigns/config/locales/sr-SP.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/back/config/locales/sr-SP.yml b/back/config/locales/sr-SP.yml index 999190938de4..ca973b2bf514 100644 --- a/back/config/locales/sr-SP.yml +++ b/back/config/locales/sr-SP.yml @@ -1,4 +1,4 @@ -sr-Cyrl: +sr-SP: locales: en: English ar-MA: Arabic (Morocco) diff --git a/back/engines/commercial/analysis/config/locales/sr-SP.yml b/back/engines/commercial/analysis/config/locales/sr-SP.yml index 8dfc062e5c8e..a74c50de8692 100644 --- a/back/engines/commercial/analysis/config/locales/sr-SP.yml +++ b/back/engines/commercial/analysis/config/locales/sr-SP.yml @@ -1,3 +1,3 @@ -sr-Cyrl: +sr-SP: analysis: example_tag_n: Пример ознаке %{n} diff --git a/back/engines/commercial/flag_inappropriate_content/config/locales/sr-SP.yml b/back/engines/commercial/flag_inappropriate_content/config/locales/sr-SP.yml index 77032155351f..d44bfea54389 100644 --- a/back/engines/commercial/flag_inappropriate_content/config/locales/sr-SP.yml +++ b/back/engines/commercial/flag_inappropriate_content/config/locales/sr-SP.yml @@ -1,4 +1,4 @@ -sr-Cyrl: +sr-SP: email_campaigns: campaign_type_description: "inappropriate_content_flagged": Неприкладан садржај је означен diff --git a/back/engines/commercial/idea_assignment/config/locales/sr-SP.yml b/back/engines/commercial/idea_assignment/config/locales/sr-SP.yml index 5bec555aa5d8..fdc1436b86af 100644 --- a/back/engines/commercial/idea_assignment/config/locales/sr-SP.yml +++ b/back/engines/commercial/idea_assignment/config/locales/sr-SP.yml @@ -1,4 +1,4 @@ -sr-Cyrl: +sr-SP: email_campaigns: campaign_type_description: "idea_assigned_to_you": Додељивање идеје мени diff --git a/back/engines/commercial/multi_tenancy/config/locales/sr-SP.yml b/back/engines/commercial/multi_tenancy/config/locales/sr-SP.yml index 4791cda6c728..e91bb31e1f92 100644 --- a/back/engines/commercial/multi_tenancy/config/locales/sr-SP.yml +++ b/back/engines/commercial/multi_tenancy/config/locales/sr-SP.yml @@ -1,5 +1,5 @@ #Translations for continuous to timeline migration -sr-Cyrl: +sr-SP: phase_title_default: ideation: Прикупите унос voting: Гласање diff --git a/back/engines/free/email_campaigns/config/locales/sr-SP.yml b/back/engines/free/email_campaigns/config/locales/sr-SP.yml index 34b72220f20b..83440a81a138 100644 --- a/back/engines/free/email_campaigns/config/locales/sr-SP.yml +++ b/back/engines/free/email_campaigns/config/locales/sr-SP.yml @@ -1,4 +1,4 @@ -sr-Cyrl: +sr-SP: email_campaigns: campaign_type_description: "manual": Званичне поруке