Skip to content

2537: Merge news - #4260

Open
steffenkleinle wants to merge 8 commits into
mainfrom
2537-merge-news
Open

2537: Merge news#4260
steffenkleinle wants to merge 8 commits into
mainfrom
2537-merge-news

Conversation

@steffenkleinle

@steffenkleinle steffenkleinle commented Jul 15, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Short Description

Merge local and tünews into one view (with support for amal news).

Proposed Changes

  • Merge local and tünews using the new paginated news endpoint
  • Use offline available news as fallback (native) Always use offline news but try to refetch on opening
  • Add support for amal news
  • Left align titles (web)
  • Add a toggle button filter group to filter between all, local and national news
  • Remove the tünews detail header and show the corresponding logos instead (with an link to the external news)
  • Remove manual height for images in news content to fix whitespace on small screens
  • Show last update for all events and left align it (native)

Side Effects

The ids/sources include uppercase letters which break navigating on web. This will be fixed in the CMS in digitalfabrik/integreat-cms#4412 (digitalfabrik/integreat-cms#4435). Fixed.

Checklist

Testing

Test the whole new news feature with #4262.

Resolved Issues

Partly fixes: #2537

@steffenkleinle steffenkleinle mentioned this pull request Jul 15, 2026
Open
5 tasks
@steffenkleinle
steffenkleinle force-pushed the 2537-merge-news branch 2 times, most recently from d313542 to 7641d08 Compare July 20, 2026 08:31
@steffenkleinle
steffenkleinle marked this pull request as ready for review July 20, 2026 08:32
@lunars97

lunars97 commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

Thank you a lot for your effort! 😻 One thing: I see only local news there, no tünews are shown... am I missing something? 👀

@steffenkleinle

steffenkleinle commented Jul 21, 2026

Copy link
Copy Markdown
Member Author

Thank you a lot for your effort! 😻 One thing: I see only local news there, no tünews are shown... am I missing something? 👀

Should now work again, apparently something is still broken in the CMS and the tünews disappear every now and then.

lunars97
lunars97 reviewed Jul 21, 2026
View reviewed changes

@lunars97 lunars97 left a comment •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested on web and it looks really good 👍 , in native there are just a couple of tunews news are shown 👀 It is not going further with the scroll (more news are not loading...). You can check out Testumgebung in native.

Also, in news detail in native there is no logo for tunews... -> Never mind, it will be implemented there I guess #4261 👍

Comment thread shared/src/api/constants/index.ts
Comment thread native/src/components/NewsListItem.tsx
@lunars97

lunars97 commented Jul 21, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

There is localNews and tunews in translations/src/__mocks__/loadTranslations.ts , in native Chat.spec.tsx and PlacesContainer.spec.tsx

@steffenkleinle
steffenkleinle force-pushed the 2537-merge-news branch 3 times, most recently from 3a7c951 to 9a358c7 Compare July 24, 2026 10:04
@steffenkleinle steffenkleinle mentioned this pull request Jul 24, 2026
Closed
5 tasks
@steffenkleinle
2537: Left align title
164ae31
@steffenkleinle
2537: Merge local news and tünews
6aa514e
@steffenkleinle
2537: Fix pagination error
04cbe32
@steffenkleinle
2537: Remove pagination
1ab44f7 
squash! squash! 2537: Remove pagination
@steffenkleinle
2537: Add news source filter
af72554 
# Conflicts:
#	native/src/components/News.tsx
#	native/src/components/__tests__/News.spec.tsx
#	native/src/routes/NewsContainer.tsx
#	translations/src/translations.json
#	web/src/routes/NewsPage.tsx
@steffenkleinle
2537: Add news source logo and link
39b2e92
@steffenkleinle
2537: Remove manual height for images in news content
9d3b9a8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lunars97 lunars97 lunars97 left review comments
@f1sh1918 f1sh1918 Awaiting requested review from f1sh1918 f1sh1918 is a code owner
@bahaaTuffaha bahaaTuffaha Awaiting requested review from bahaaTuffaha bahaaTuffaha is a code owner

At least 2 approving reviews are required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Merge local news and tu news

2 participants

@steffenkleinle @lunars97