From fa4181ecb451028fe16c46e0fc46acf3bf3c32d1 Mon Sep 17 00:00:00 2001 From: janichla Date: Fri, 15 Nov 2024 12:19:08 +0100 Subject: [PATCH 01/13] Reordered header icons in web --- web/src/components/CityContentHeader.tsx | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/web/src/components/CityContentHeader.tsx b/web/src/components/CityContentHeader.tsx index 6f2903cd32..fe716e477f 100644 --- a/web/src/components/CityContentHeader.tsx +++ b/web/src/components/CityContentHeader.tsx @@ -100,6 +100,18 @@ const CityContentHeader = ({ />, ] + if (isPoisVisible) { + items.push( + , + ) + } + if (isNewsVisible) { items.push( , - ) - } - return items } From 00f5b9a87fc20026df867e279c1464e033d123f8 Mon Sep 17 00:00:00 2001 From: Laura Janich <167319888+janichla@users.noreply.github.com> Date: Tue, 19 Nov 2024 17:06:34 +0100 Subject: [PATCH 02/13] Added release node --- .../unreleased/2468-reorder-the-icons-in-header.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 release-notes/unreleased/2468-reorder-the-icons-in-header.yml diff --git a/release-notes/unreleased/2468-reorder-the-icons-in-header.yml b/release-notes/unreleased/2468-reorder-the-icons-in-header.yml new file mode 100644 index 0000000000..abdf67397a --- /dev/null +++ b/release-notes/unreleased/2468-reorder-the-icons-in-header.yml @@ -0,0 +1,6 @@ +issue_key: 2468 +show_in_stores: true +platforms: # relevant platforms, possible values: web, android and ios + - web +en: Reordered icons in the header +de: Geänderte Reihenfolge der Icons im Header From 02cfcb9c3c8ee481c19d9965c352d524145eb249 Mon Sep 17 00:00:00 2001 From: Steffen Kleinle Date: Wed, 20 Nov 2024 10:23:21 +0100 Subject: [PATCH 03/13] 2468: Reorder header icons native --- .../components/DashboardNavigationTiles.tsx | 32 +++++++++---------- .../2468-reorder-the-icons-in-header.yml | 4 ++- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/native/src/components/DashboardNavigationTiles.tsx b/native/src/components/DashboardNavigationTiles.tsx index 826a37cd92..5258a394b1 100644 --- a/native/src/components/DashboardNavigationTiles.tsx +++ b/native/src/components/DashboardNavigationTiles.tsx @@ -39,51 +39,51 @@ const DashboardNavigationTiles = ({ const isNewsEnabled = tunewsEnabled || localNewsEnabled const tiles = [] - if (featureFlags.newsStream && isNewsEnabled) { + if (cityModel.poisEnabled && featureFlags.pois) { tiles.push( new TileModel({ - title: t('news'), - path: 'news', - thumbnail: NewsIcon, + title: t('pois'), + path: 'pois', + thumbnail: POIsIcon, isExternalUrl: false, onTilePress: () => navigateTo({ - route: NEWS_ROUTE, + route: POIS_ROUTE, cityCode, languageCode, - newsType: localNewsEnabled ? LOCAL_NEWS_TYPE : TU_NEWS_TYPE, }), }), ) } - if (cityModel.eventsEnabled) { + if (featureFlags.newsStream && isNewsEnabled) { tiles.push( new TileModel({ - title: t('events'), - path: 'events', - thumbnail: CalendarIcon, + title: t('news'), + path: 'news', + thumbnail: NewsIcon, isExternalUrl: false, onTilePress: () => navigateTo({ - route: EVENTS_ROUTE, + route: NEWS_ROUTE, cityCode, languageCode, + newsType: localNewsEnabled ? LOCAL_NEWS_TYPE : TU_NEWS_TYPE, }), }), ) } - if (cityModel.poisEnabled && featureFlags.pois) { + if (cityModel.eventsEnabled) { tiles.push( new TileModel({ - title: t('pois'), - path: 'pois', - thumbnail: POIsIcon, + title: t('events'), + path: 'events', + thumbnail: CalendarIcon, isExternalUrl: false, onTilePress: () => navigateTo({ - route: POIS_ROUTE, + route: EVENTS_ROUTE, cityCode, languageCode, }), diff --git a/release-notes/unreleased/2468-reorder-the-icons-in-header.yml b/release-notes/unreleased/2468-reorder-the-icons-in-header.yml index abdf67397a..6bf867ecf8 100644 --- a/release-notes/unreleased/2468-reorder-the-icons-in-header.yml +++ b/release-notes/unreleased/2468-reorder-the-icons-in-header.yml @@ -1,6 +1,8 @@ issue_key: 2468 show_in_stores: true -platforms: # relevant platforms, possible values: web, android and ios +platforms: - web + - android + - ios en: Reordered icons in the header de: Geänderte Reihenfolge der Icons im Header From 31317a0594de839712174906dbcfc4dcdec27afd Mon Sep 17 00:00:00 2001 From: LeandraH Date: Sat, 23 Nov 2024 19:02:51 +0100 Subject: [PATCH 04/13] 2548: Add two smileys --- web/src/components/FeedbackContainer.tsx | 4 +++- web/src/components/FeedbackToolbarItem.tsx | 21 +++++++++++++++++-- web/src/components/SearchFeedback.tsx | 1 + .../__tests__/FeedbackContainer.spec.tsx | 1 + 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/web/src/components/FeedbackContainer.tsx b/web/src/components/FeedbackContainer.tsx index 3a91f95add..1cd2ca641e 100644 --- a/web/src/components/FeedbackContainer.tsx +++ b/web/src/components/FeedbackContainer.tsx @@ -15,6 +15,7 @@ type FeedbackContainerProps = { noResults?: boolean slug?: string onSubmit?: () => void + isPositive: boolean | null } export type SendingStatusType = 'idle' | 'sending' | 'failed' | 'successful' @@ -28,8 +29,9 @@ export const FeedbackContainer = ({ slug, onClose, onSubmit, + isPositive, }: FeedbackContainerProps): ReactElement => { - const [isPositiveRating, setIsPositiveRating] = useState(null) + const [isPositiveRating, setIsPositiveRating] = useState(isPositive) const [comment, setComment] = useState('') const [contactMail, setContactMail] = useState('') const [sendingStatus, setSendingStatus] = useState('idle') diff --git a/web/src/components/FeedbackToolbarItem.tsx b/web/src/components/FeedbackToolbarItem.tsx index 7c962a6372..3948ce60cb 100644 --- a/web/src/components/FeedbackToolbarItem.tsx +++ b/web/src/components/FeedbackToolbarItem.tsx @@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next' import { FeedbackRouteType } from 'shared/api' -import { FeedbackIcon } from '../assets' +import { HappySmileyIcon, SadSmileyIcon } from '../assets' import useCityContentParams from '../hooks/useCityContentParams' import { RouteType } from '../routes' import FeedbackContainer from './FeedbackContainer' @@ -20,6 +20,7 @@ const FeedbackToolbarItem = ({ route, slug, isInBottomActionSheet }: FeedbackToo const { cityCode, languageCode } = useCityContentParams() const [isFeedbackOpen, setIsFeedbackOpen] = useState(false) const [isSubmitted, setIsSubmitted] = useState(false) + const [isPositive, setIsPositive] = useState(null) const { t } = useTranslation('feedback') const title = isSubmitted ? t('thanksHeadline') : t('headline') @@ -34,10 +35,26 @@ const FeedbackToolbarItem = ({ route, slug, isInBottomActionSheet }: FeedbackToo cityCode={cityCode} language={languageCode} slug={slug} + isPositive={isPositive} /> )} - setIsFeedbackOpen(true)} /> + { + setIsFeedbackOpen(true) + setIsPositive(true) + }} + /> + { + setIsFeedbackOpen(true) + setIsPositive(false) + }} + /> ) } diff --git a/web/src/components/SearchFeedback.tsx b/web/src/components/SearchFeedback.tsx index 8ddd9f9651..56cc29f98e 100644 --- a/web/src/components/SearchFeedback.tsx +++ b/web/src/components/SearchFeedback.tsx @@ -35,6 +35,7 @@ const SearchFeedback = ({ cityCode, languageCode, query, noResults }: SearchFeed routeType={SEARCH_ROUTE} query={query} noResults={noResults} + isPositive={null} /> ) diff --git a/web/src/components/__tests__/FeedbackContainer.spec.tsx b/web/src/components/__tests__/FeedbackContainer.spec.tsx index fa69973f29..ba5e018991 100644 --- a/web/src/components/__tests__/FeedbackContainer.spec.tsx +++ b/web/src/components/__tests__/FeedbackContainer.spec.tsx @@ -34,6 +34,7 @@ describe('FeedbackContainer', () => { language, onClose: closeModal, query, + isPositive: null, }) it('should display thanks message for modal', async () => { From a303019aec869eed9cdf3fb4428119c6f8d9de49 Mon Sep 17 00:00:00 2001 From: LeandraH Date: Sat, 23 Nov 2024 20:11:36 +0100 Subject: [PATCH 05/13] 2548: Fix stacking layers --- web/src/components/Layout.tsx | 40 +++++++++-------------------------- web/src/styles/Aside.css | 18 ++++++++++++++++ 2 files changed, 28 insertions(+), 30 deletions(-) create mode 100644 web/src/styles/Aside.css diff --git a/web/src/components/Layout.tsx b/web/src/components/Layout.tsx index 37af04ecff..988a4fe823 100644 --- a/web/src/components/Layout.tsx +++ b/web/src/components/Layout.tsx @@ -1,11 +1,11 @@ -import React, { ReactNode, useLayoutEffect, useState } from 'react' +import React, { ReactNode } from 'react' import styled, { css } from 'styled-components' import dimensions from '../constants/dimensions' import useWindowDimensions from '../hooks/useWindowDimensions' +import '../styles/Aside.css' import { MobileBanner } from './MobileBanner' - -const additionalToolbarTopSpacing = 32 +import Portal from './Portal' export const RichLayout = styled.div` position: relative; @@ -49,6 +49,7 @@ const Body = styled.div<{ $fullWidth: boolean; $disableScrollingSafari: boolean background-color: ${props => props.theme.colors.backgroundColor}; word-wrap: break-word; min-height: 100%; + display: flex; /* Fix jumping iOS Safari Toolbar by prevent scrolling on body */ @@ -93,25 +94,6 @@ const Main = styled.main<{ $fullWidth: boolean }>` } ` -const Aside = styled.aside<{ $languageSelectorHeight: number }>` - top: ${props => props.$languageSelectorHeight + dimensions.headerHeightLarge + additionalToolbarTopSpacing}px; - margin-top: ${props => props.$languageSelectorHeight - dimensions.navigationMenuHeight}px; - display: inline-block; - position: sticky; - width: ${dimensions.toolbarWidth}px; - vertical-align: top; - z-index: 10; - - &:empty { - display: none; - } - - &:empty + * { - display: block; - max-width: 100%; - } -` - export const LAYOUT_ELEMENT_ID = 'layout' type LayoutProps = { @@ -133,20 +115,18 @@ const Layout = ({ fullWidth = false, disableScrollingSafari = false, }: LayoutProps): JSX.Element => { - const { width, viewportSmall } = useWindowDimensions() - const [languageSelectorHeight, setLanguageSelectorHeight] = useState(0) - - useLayoutEffect(() => { - const panelHeight = document.getElementById('languageSelector')?.clientHeight - setLanguageSelectorHeight(panelHeight ?? 0) - }, [width]) + const { viewportSmall } = useWindowDimensions() return ( {header} - {!viewportSmall && } + {!viewportSmall && ( + + {toolbar} + + )}
{children}
{viewportSmall && toolbar} diff --git a/web/src/styles/Aside.css b/web/src/styles/Aside.css new file mode 100644 index 0000000000..478c4f5bd2 --- /dev/null +++ b/web/src/styles/Aside.css @@ -0,0 +1,18 @@ +.aside { + position: fixed; + top: 35%; + width: 100px; + left: 3%; + + @media (min-width: 1100px) { + left: 10%; + } + + &:empty { + display: none; + } + + &:empty + * { + max-width: 100%; + } +} From 0a925c3d84208daee1d929ade44887cb2b994519 Mon Sep 17 00:00:00 2001 From: LeandraH Date: Sat, 23 Nov 2024 20:11:47 +0100 Subject: [PATCH 06/13] 2548: Fix test --- web/src/components/__tests__/FeedbackToolbarItem.spec.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/src/components/__tests__/FeedbackToolbarItem.spec.tsx b/web/src/components/__tests__/FeedbackToolbarItem.spec.tsx index 68db4cfee5..5441d687cc 100644 --- a/web/src/components/__tests__/FeedbackToolbarItem.spec.tsx +++ b/web/src/components/__tests__/FeedbackToolbarItem.spec.tsx @@ -24,12 +24,11 @@ describe('FeedbackToolbarItem', () => { expect(queryByText('feedback:headline')).toBeFalsy() expect(queryByText('feedback:thanksHeadline')).toBeFalsy() - fireEvent.click(getByText('feedback:feedback')) + fireEvent.click(getByText('feedback:useful')) expect(getByText('feedback:headline')).toBeTruthy() expect(queryByText('feedback:thanksHeadline')).toBeFalsy() - fireEvent.click(getByText('feedback:useful')) fireEvent.click(getByText('feedback:send')) expect(await findByText('feedback:thanksMessage')).toBeTruthy() From a6bfcebf17de7220d46969c29581e28adc0036e2 Mon Sep 17 00:00:00 2001 From: LeandraH Date: Mon, 25 Nov 2024 14:25:32 +0100 Subject: [PATCH 07/13] 2548: Fix feedback overlay hiding behind header --- web/src/components/CityContentToolbar.tsx | 4 +--- web/src/components/FeedbackToolbarItem.tsx | 5 ++--- web/src/components/__tests__/FeedbackToolbarItem.spec.tsx | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/web/src/components/CityContentToolbar.tsx b/web/src/components/CityContentToolbar.tsx index 7c9c4dc59e..1c34472296 100644 --- a/web/src/components/CityContentToolbar.tsx +++ b/web/src/components/CityContentToolbar.tsx @@ -73,9 +73,7 @@ const CityContentToolbar = (props: CityContentToolbarProps) => { id='copy-icon' /> - {hasFeedbackOption && ( - - )} + {hasFeedbackOption && } ) } diff --git a/web/src/components/FeedbackToolbarItem.tsx b/web/src/components/FeedbackToolbarItem.tsx index 3948ce60cb..a9064c9816 100644 --- a/web/src/components/FeedbackToolbarItem.tsx +++ b/web/src/components/FeedbackToolbarItem.tsx @@ -13,10 +13,9 @@ import ToolbarItem from './ToolbarItem' type FeedbackToolbarItemProps = { route: RouteType slug?: string - isInBottomActionSheet: boolean } -const FeedbackToolbarItem = ({ route, slug, isInBottomActionSheet }: FeedbackToolbarItemProps): ReactElement => { +const FeedbackToolbarItem = ({ route, slug }: FeedbackToolbarItemProps): ReactElement => { const { cityCode, languageCode } = useCityContentParams() const [isFeedbackOpen, setIsFeedbackOpen] = useState(false) const [isSubmitted, setIsSubmitted] = useState(false) @@ -27,7 +26,7 @@ const FeedbackToolbarItem = ({ route, slug, isInBottomActionSheet }: FeedbackToo return ( <> {isFeedbackOpen && ( - setIsFeedbackOpen(false)} wrapInPortal={isInBottomActionSheet}> + setIsFeedbackOpen(false)} wrapInPortal> setIsFeedbackOpen(false)} onSubmit={() => setIsSubmitted(true)} diff --git a/web/src/components/__tests__/FeedbackToolbarItem.spec.tsx b/web/src/components/__tests__/FeedbackToolbarItem.spec.tsx index 5441d687cc..7806782a44 100644 --- a/web/src/components/__tests__/FeedbackToolbarItem.spec.tsx +++ b/web/src/components/__tests__/FeedbackToolbarItem.spec.tsx @@ -18,7 +18,7 @@ jest.mock('focus-trap-react', () => ({ children }: { children: ReactElement }) = describe('FeedbackToolbarItem', () => { it('should open and update title on submit feedback', async () => { const { queryByText, findByText, getByText } = renderWithRouterAndTheme( - , + , ) expect(queryByText('feedback:headline')).toBeFalsy() From befd67f1b192fab929e45d264469c45afd243ba3 Mon Sep 17 00:00:00 2001 From: LeandraH Date: Mon, 25 Nov 2024 17:51:18 +0100 Subject: [PATCH 08/13] 2548: Improve styling --- web/src/styles/Aside.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/web/src/styles/Aside.css b/web/src/styles/Aside.css index 478c4f5bd2..bc083e933b 100644 --- a/web/src/styles/Aside.css +++ b/web/src/styles/Aside.css @@ -2,7 +2,7 @@ position: fixed; top: 35%; width: 100px; - left: 3%; + left: 1%; @media (min-width: 1100px) { left: 10%; @@ -11,8 +11,4 @@ &:empty { display: none; } - - &:empty + * { - max-width: 100%; - } } From 57427dd40a829192f545fc3bc0d5bbd11983cfeb Mon Sep 17 00:00:00 2001 From: LeandraH Date: Tue, 26 Nov 2024 13:39:38 +0100 Subject: [PATCH 09/13] 2548: Refactoring --- web/src/components/Feedback.tsx | 4 ++-- web/src/components/FeedbackContainer.tsx | 7 ++++--- web/src/components/FeedbackToolbarItem.tsx | 9 +++++---- web/src/components/SearchFeedback.tsx | 2 +- .../components/__tests__/FeedbackContainer.spec.tsx | 10 ++++------ 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/web/src/components/Feedback.tsx b/web/src/components/Feedback.tsx index 201dd5b670..78b1abc9f2 100644 --- a/web/src/components/Feedback.tsx +++ b/web/src/components/Feedback.tsx @@ -46,7 +46,7 @@ type FeedbackProps = { contactMail: string onCommentChanged: (comment: string) => void onContactMailChanged: (contactMail: string) => void - onFeedbackChanged: (isPositiveFeedback: boolean | null) => void + onFeedbackChanged?: (isPositiveFeedback: boolean | null) => void onSubmit: () => void sendingStatus: SendingStatusType noResults: boolean | undefined @@ -94,7 +94,7 @@ const Feedback = ({ ) : ( - + onFeedbackChanged && )} void - isPositive: boolean | null + isPositiveRating: boolean | null + setIsPositiveRating?: (isPositiveFeedback: boolean | null) => void } export type SendingStatusType = 'idle' | 'sending' | 'failed' | 'successful' @@ -29,9 +30,9 @@ export const FeedbackContainer = ({ slug, onClose, onSubmit, - isPositive, + isPositiveRating, + setIsPositiveRating, }: FeedbackContainerProps): ReactElement => { - const [isPositiveRating, setIsPositiveRating] = useState(isPositive) const [comment, setComment] = useState('') const [contactMail, setContactMail] = useState('') const [sendingStatus, setSendingStatus] = useState('idle') diff --git a/web/src/components/FeedbackToolbarItem.tsx b/web/src/components/FeedbackToolbarItem.tsx index a9064c9816..0bf40d9bf6 100644 --- a/web/src/components/FeedbackToolbarItem.tsx +++ b/web/src/components/FeedbackToolbarItem.tsx @@ -19,7 +19,7 @@ const FeedbackToolbarItem = ({ route, slug }: FeedbackToolbarItemProps): ReactEl const { cityCode, languageCode } = useCityContentParams() const [isFeedbackOpen, setIsFeedbackOpen] = useState(false) const [isSubmitted, setIsSubmitted] = useState(false) - const [isPositive, setIsPositive] = useState(null) + const [isPositiveRating, setIsPositiveRating] = useState(null) const { t } = useTranslation('feedback') const title = isSubmitted ? t('thanksHeadline') : t('headline') @@ -34,7 +34,8 @@ const FeedbackToolbarItem = ({ route, slug }: FeedbackToolbarItemProps): ReactEl cityCode={cityCode} language={languageCode} slug={slug} - isPositive={isPositive} + isPositiveRating={isPositiveRating} + setIsPositiveRating={setIsPositiveRating} /> )} @@ -43,7 +44,7 @@ const FeedbackToolbarItem = ({ route, slug }: FeedbackToolbarItemProps): ReactEl text={t('useful')} onClick={() => { setIsFeedbackOpen(true) - setIsPositive(true) + setIsPositiveRating(true) }} /> { setIsFeedbackOpen(true) - setIsPositive(false) + setIsPositiveRating(false) }} /> diff --git a/web/src/components/SearchFeedback.tsx b/web/src/components/SearchFeedback.tsx index 56cc29f98e..30cfb58d32 100644 --- a/web/src/components/SearchFeedback.tsx +++ b/web/src/components/SearchFeedback.tsx @@ -35,7 +35,7 @@ const SearchFeedback = ({ cityCode, languageCode, query, noResults }: SearchFeed routeType={SEARCH_ROUTE} query={query} noResults={noResults} - isPositive={null} + isPositiveRating={null} /> ) diff --git a/web/src/components/__tests__/FeedbackContainer.spec.tsx b/web/src/components/__tests__/FeedbackContainer.spec.tsx index ba5e018991..c09da48195 100644 --- a/web/src/components/__tests__/FeedbackContainer.spec.tsx +++ b/web/src/components/__tests__/FeedbackContainer.spec.tsx @@ -34,15 +34,13 @@ describe('FeedbackContainer', () => { language, onClose: closeModal, query, - isPositive: null, + isPositiveRating: null, }) it('should display thanks message for modal', async () => { - const { getByRole, findByText } = renderWithTheme() - const buttonRating = getByRole('button', { - name: 'feedback:useful', - }) - fireEvent.click(buttonRating) + const { getByRole, findByText } = renderWithTheme( + , + ) const button = getByRole('button', { name: 'feedback:send', }) From 6ba607e6aae5b77c4e2cc2d8db286c17752ea0f3 Mon Sep 17 00:00:00 2001 From: LeandraH Date: Tue, 3 Dec 2024 17:24:02 +0100 Subject: [PATCH 10/13] Fix map layout --- web/src/components/Layout.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/src/components/Layout.tsx b/web/src/components/Layout.tsx index 988a4fe823..ddb21665ae 100644 --- a/web/src/components/Layout.tsx +++ b/web/src/components/Layout.tsx @@ -74,8 +74,8 @@ const Body = styled.div<{ $fullWidth: boolean; $disableScrollingSafari: boolean const Main = styled.main<{ $fullWidth: boolean }>` display: inline-block; - width: ${props => (props.$fullWidth ? '100%' : dimensions.maxWidth - 2 * dimensions.toolbarWidth)}px; - max-width: calc(100% - ${dimensions.toolbarWidth}px); + width: ${props => (props.$fullWidth ? '100%' : `${dimensions.maxWidth - 2 * dimensions.toolbarWidth}px`)}; + max-width: ${props => (props.$fullWidth ? '100%' : `calc(100% - ${dimensions.toolbarWidth}px)`)}; box-sizing: border-box; margin: 0 auto; padding: ${props => (props.$fullWidth ? '0' : `0 ${dimensions.mainContainerHorizontalPadding}px 30px`)}; From ff86e0e9ad8b2de8b702350c621ac621f36400a9 Mon Sep 17 00:00:00 2001 From: Steffen Kleinle Date: Tue, 3 Dec 2024 21:18:39 +0100 Subject: [PATCH 11/13] 2818: Remove codeclimate --- .circleci/config.yml | 20 ------------------- .circleci/src/commands/unit_test.yml | 14 ------------- .circleci/src/workflows/commit.yml | 1 - .circleci/src/workflows/delivery.yml | 1 - .../src/workflows/native_beta_delivery.yml | 1 - .../workflows/native_production_delivery.yml | 1 - .circleci/src/workflows/web_beta_delivery.yml | 1 - .../src/workflows/web_production_delivery.yml | 1 - README.md | 2 -- 9 files changed, 42 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e9a73594b9..e220783d4a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -228,23 +228,9 @@ commands: unit_test: description: Runs the test task and stores coverage and junit data steps: - - run: - command: | - # download test reporter as a static binary - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - chmod +x ./cc-test-reporter - name: Setup Code Climate test-reporter - - run: - command: ./cc-test-reporter before-build - name: Code Climate before build - run: command: yarn test:ci --maxWorkers ${TOTAL_CPUS} name: Unit Tests with Coverage - - run: - command: | - ./cc-test-reporter format-coverage -t lcov -o reports/coverage/codeclimate.json reports/coverage/lcov.info - ./cc-test-reporter upload-coverage -i reports/coverage/codeclimate.json - name: Code Climate after build - store_test_results: path: reports/unit-test - store_artifacts: @@ -1095,7 +1081,6 @@ workflows: prepare_delivery: false - check: context: - - codeclimate-integreat-app - mattermost - build_web: build_config_name: integreat-test-cms @@ -1210,7 +1195,6 @@ workflows: prepare_delivery: true - check: context: - - codeclimate-integreat-app - mattermost - e2e_web: context: @@ -1543,7 +1527,6 @@ workflows: prepare_delivery: true - check: context: - - codeclimate-integreat-app - mattermost - build_android: build_config_name: integreat-e2e @@ -1751,7 +1734,6 @@ workflows: prepare_delivery: true - check: context: - - codeclimate-integreat-app - mattermost - build_android: build_config_name: integreat-e2e @@ -2009,7 +1991,6 @@ workflows: prepare_delivery: true - check: context: - - codeclimate-integreat-app - mattermost - e2e_web: context: @@ -2086,7 +2067,6 @@ workflows: prepare_delivery: true - check: context: - - codeclimate-integreat-app - mattermost - e2e_web: context: diff --git a/.circleci/src/commands/unit_test.yml b/.circleci/src/commands/unit_test.yml index 9feb6c2cd2..6c06355c4b 100644 --- a/.circleci/src/commands/unit_test.yml +++ b/.circleci/src/commands/unit_test.yml @@ -1,22 +1,8 @@ description: Runs the test task and stores coverage and junit data steps: - - run: - name: Setup Code Climate test-reporter - command: | - # download test reporter as a static binary - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - chmod +x ./cc-test-reporter - - run: - name: Code Climate before build - command: ./cc-test-reporter before-build - run: name: Unit Tests with Coverage command: yarn test:ci --maxWorkers ${TOTAL_CPUS} - - run: - name: Code Climate after build - command: | - ./cc-test-reporter format-coverage -t lcov -o reports/coverage/codeclimate.json reports/coverage/lcov.info - ./cc-test-reporter upload-coverage -i reports/coverage/codeclimate.json - store_test_results: path: reports/unit-test - store_artifacts: diff --git a/.circleci/src/workflows/commit.yml b/.circleci/src/workflows/commit.yml index f8a0808415..8cd4c1c02a 100644 --- a/.circleci/src/workflows/commit.yml +++ b/.circleci/src/workflows/commit.yml @@ -10,7 +10,6 @@ jobs: - check: context: - - codeclimate-integreat-app - mattermost - build_web: diff --git a/.circleci/src/workflows/delivery.yml b/.circleci/src/workflows/delivery.yml index 9548366bf4..48c106bc39 100644 --- a/.circleci/src/workflows/delivery.yml +++ b/.circleci/src/workflows/delivery.yml @@ -11,7 +11,6 @@ jobs: - check: context: - - codeclimate-integreat-app - mattermost - e2e_web: diff --git a/.circleci/src/workflows/native_beta_delivery.yml b/.circleci/src/workflows/native_beta_delivery.yml index d9f50835ca..412382ec68 100644 --- a/.circleci/src/workflows/native_beta_delivery.yml +++ b/.circleci/src/workflows/native_beta_delivery.yml @@ -10,7 +10,6 @@ jobs: prepare_delivery: true - check: context: - - codeclimate-integreat-app - mattermost - build_android: diff --git a/.circleci/src/workflows/native_production_delivery.yml b/.circleci/src/workflows/native_production_delivery.yml index 190c8d2772..aa68768806 100644 --- a/.circleci/src/workflows/native_production_delivery.yml +++ b/.circleci/src/workflows/native_production_delivery.yml @@ -11,7 +11,6 @@ jobs: - check: context: - - codeclimate-integreat-app - mattermost - build_android: diff --git a/.circleci/src/workflows/web_beta_delivery.yml b/.circleci/src/workflows/web_beta_delivery.yml index fd8a161e75..5063d94155 100644 --- a/.circleci/src/workflows/web_beta_delivery.yml +++ b/.circleci/src/workflows/web_beta_delivery.yml @@ -10,7 +10,6 @@ jobs: prepare_delivery: true - check: context: - - codeclimate-integreat-app - mattermost - e2e_web: context: diff --git a/.circleci/src/workflows/web_production_delivery.yml b/.circleci/src/workflows/web_production_delivery.yml index a721544c85..1c0ccdfcdb 100644 --- a/.circleci/src/workflows/web_production_delivery.yml +++ b/.circleci/src/workflows/web_production_delivery.yml @@ -10,7 +10,6 @@ jobs: prepare_delivery: true - check: context: - - codeclimate-integreat-app - mattermost - e2e_web: context: diff --git a/README.md b/README.md index 2097898bfd..b4b1d8e6da 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,6 @@ [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/facebook/react/blob/master/LICENSE) [![versioning](https://img.shields.io/badge/calver-YYYY.MM.PATCH-22bfda.svg)](version.json) [![CircleCI Status](https://circleci.com/gh/digitalfabrik/integreat-app.svg?style=shield)](https://circleci.com/gh/digitalfabrik/integreat-app) -[![Maintainability](https://api.codeclimate.com/v1/badges/5be95233a83e181d8a42/maintainability)](https://codeclimate.com/github/digitalfabrik/integreat-app/maintainability) -[![Test Coverage](https://api.codeclimate.com/v1/badges/5be95233a83e181d8a42/test_coverage)](https://codeclimate.com/github/digitalfabrik/integreat-app/test_coverage) [![CodeScene Code Health](https://codescene.io/projects/53058/status-badges/code-health)](https://codescene.io/projects/53058) # integreat-app From 0ed8fe18375da3c43758b708bcdcef434bd2cc98 Mon Sep 17 00:00:00 2001 From: Steffen Kleinle Date: Wed, 4 Dec 2024 12:44:54 +0100 Subject: [PATCH 12/13] 3017: Fix header title --- native/src/components/Header.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/native/src/components/Header.tsx b/native/src/components/Header.tsx index 567082ecec..3286288b13 100644 --- a/native/src/components/Header.tsx +++ b/native/src/components/Header.tsx @@ -214,7 +214,7 @@ const Header = ({ return { text: t('locations'), language: undefined } // system language } - const previousRouteTitle = (previousRoute.params as { path?: string } | undefined)?.path + const previousRouteTitle = (previousRoute.params as { title?: string } | undefined)?.title if (previousRouteTitle) { return { text: previousRouteTitle, language: languageCode } @@ -227,7 +227,7 @@ const Header = ({ } } - return { text: previousRoute.name, language: undefined } // system language + return { text: t(previousRoute.name), language: undefined } // system language } return ( From cbcc6f1d24194e770cfd6e58e3e41eea1f76a790 Mon Sep 17 00:00:00 2001 From: "deliverino[bot]" <62934656+deliverino[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 12:41:26 +0000 Subject: [PATCH 13/13] Bump version name to 2024.12.0 and version code to 100042407 [skip ci] --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index d14fc4a3c0..d0b2a97b7b 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"versionName":"2024.11.2","versionCode":100042406} \ No newline at end of file +{"versionName":"2024.12.0","versionCode":100042407} \ No newline at end of file