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 51659f823fac..29ec205188c2 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) 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": Званичне поруке diff --git a/front/app/components/FilterBoxes/TopicsFilter.tsx b/front/app/components/FilterBoxes/TopicsFilter.tsx index 4a6127cf5394..e5787f135203 100644 --- a/front/app/components/FilterBoxes/TopicsFilter.tsx +++ b/front/app/components/FilterBoxes/TopicsFilter.tsx @@ -141,7 +141,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) => { diff --git a/front/app/containers/ProjectsShowPage/ProjectCTABar/index.tsx b/front/app/containers/ProjectsShowPage/ProjectCTABar/index.tsx index bb8d99868420..5aed571ec762 100644 --- a/front/app/containers/ProjectsShowPage/ProjectCTABar/index.tsx +++ b/front/app/containers/ProjectsShowPage/ProjectCTABar/index.tsx @@ -17,13 +17,12 @@ import { isNilOrError } from 'utils/helperUtils'; type ProjectCTABarProps = { projectId: string; }; + 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); 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 && ( + + + + + )} + + + )}
); diff --git a/front/cypress/e2e/idea_cards.cy.ts b/front/cypress/e2e/idea_cards.cy.ts index 2981ec5bdb07..ecafd01988bc 100644 --- a/front/cypress/e2e/idea_cards.cy.ts +++ b/front/cypress/e2e/idea_cards.cy.ts @@ -70,7 +70,10 @@ describe('Idea cards without filter sidebar sorting and filtering', () => { }); it('lets you filter the ideas by topic', () => { - cy.contains('waste').click(); + cy.get('#e2e-topics-filters').within(() => { + cy.contains('waste').click(); + }); + cy.get('#e2e-ideas-container') .find('.e2e-idea-card') .should('have.length', 1)