Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mijn-9575-feature varen service + thema pagina #1736

Open
wants to merge 51 commits into
base: main
Choose a base branch
from

Conversation

TerryvanWalen
Copy link
Contributor

@TerryvanWalen TerryvanWalen commented Jan 29, 2025

Varen service en thema pagina eerste werkende versie

@TerryvanWalen TerryvanWalen changed the title Mijn 9575 varen service Mijn-9575-feature varen service Jan 30, 2025
@TerryvanWalen TerryvanWalen marked this pull request as ready for review January 30, 2025 08:48
@TerryvanWalen TerryvanWalen changed the title Mijn-9575-feature varen service Mijn-9575-feature varen service + thema pagina Jan 30, 2025
Copy link
Contributor

@timvanoostrom timvanoostrom left a comment

Choose a reason for hiding this comment

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

Check! Paar dingetjes.

src/client/pages/Varen/Varen.tsx Outdated Show resolved Hide resolved
src/client/pages/Varen/config.ts Outdated Show resolved Hide resolved
src/client/pages/Varen/config.ts Outdated Show resolved Hide resolved
src/server/services/varen/decos-zaken.ts Outdated Show resolved Hide resolved
src/server/services/varen/decos-zaken.ts Outdated Show resolved Hide resolved
src/server/services/varen/varen.ts Outdated Show resolved Hide resolved
@TerryvanWalen TerryvanWalen force-pushed the MIJN-9575-varen-service branch from 448b069 to e464673 Compare January 31, 2025 09:02
TerryvanWalen and others added 14 commits January 31, 2025 10:48
* Changed some texts, updated mockserver. No longer filter out on expiry date

* Mijn-9980-bug geblokkeerde passen worden eruit gefiltert wut tf (#1725)

* Fix test

* Reset mocks?!

* improve the test somewhat, making it less dependant on our filter

* made test specific to filtering out a pass

* Removed redundant snapshot

* Refactored functions to be more readable and flexible

* added types moved some stuff around

* Add warning that you cannot reverse a block

* Added expiry to filter, not yet working

* Changed condition to only filter out expired passes that are expired on the default expiry date

* Added deploy to test script

* Text change according to MIJN-9995

* MIJN-9980-Chore - Add feature toggle

* Replace isDateAfter with isAfter from imported library

---------

Co-authored-by: Tim van Oostrom <[email protected]>
* Changed some texts, updated mockserver. No longer filter out on expiry date

* Mijn-9980-bug geblokkeerde passen worden eruit gefiltert wut tf (#1725)

* Fix test

* Reset mocks?!

* improve the test somewhat, making it less dependant on our filter

* made test specific to filtering out a pass

* Removed redundant snapshot

* Refactored functions to be more readable and flexible

* added types moved some stuff around

* Add warning that you cannot reverse a block

* Added expiry to filter, not yet working

* Changed condition to only filter out expired passes that are expired on the default expiry date

* Added deploy to test script

* Text change according to MIJN-9995

* MIJN-9980-Chore - Add feature toggle

* Replace isDateAfter with isAfter from imported library

* Added featuretoggle to backedn

---------

Co-authored-by: Tim van Oostrom <[email protected]>
…theffingen-niet-onder-de-juiste-kopjes-getoond (#1740)

* Corrected condition

* Aligned table columns

* update snapshot

* Add safety railing to script, if checkout fails it hard resets your own branch :)
…1744)

* MIJN-10017-Feature - Better release flow

* MIJN-10018-Bug - additional check for contactmomenten

* MIJN-10017-Feature - better release pipeline (flow)

* Add branch
* MIJN-10018-Bug - Only run if the tag was created on main

* Specify real main

* Add message job

* Conditionally checkout repo

* Remove condition, not allowed in this context

* Change conditions

* Change message
* Output the SourceBranch

# Conflicts:
#	azure-release-pipeline.yaml

* Change syntax

* Different syntax
* Output the SourceBranch

# Conflicts:
#	azure-release-pipeline.yaml

# Conflicts:
#	azure-release-pipeline.yaml

* Change syntax

* Different syntax

* Specify a stricter tag match

* Remove conditions
Copy link
Contributor

@timvanoostrom timvanoostrom left a comment

Choose a reason for hiding this comment

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

Ziet er goed uit, nog een ronde polishing en we kunnen mergen.

src/client/pages/ThemaPagina/ThemaPagina.tsx Outdated Show resolved Hide resolved
src/client/pages/ThemaPagina/ThemaPagina.tsx Outdated Show resolved Hide resolved
src/client/pages/Varen/Varen-thema-config.ts Outdated Show resolved Hide resolved
src/client/pages/Varen/useVarenThemaData.hook.ts Outdated Show resolved Hide resolved
src/client/pages/Varen/useVarenThemaData.hook.ts Outdated Show resolved Hide resolved
src/server/services/varen/decos-zaken.ts Outdated Show resolved Hide resolved
src/server/services/decos/decos-service.ts Show resolved Hide resolved
Copy link
Contributor

@timvanoostrom timvanoostrom left a comment

Choose a reason for hiding this comment

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

Nog 2 puntjes, verder LGTM

Comment on lines +32 to +33
{!!buttonItems &&
buttonItems.map(({ to, title }) => (
Copy link
Contributor

Choose a reason for hiding this comment

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

Volgens mij kun je ook dit doen toch?

Suggested change
{!!buttonItems &&
buttonItems.map(({ to, title }) => (
{buttonItems?.map(({ to, title }) => (

title={title}
zaken={varenVergunningen.filter(filter).sort(sort)}
displayProps={displayProps}
textNoContent={`U heeft geen ${title.toLowerCase()}`}
Copy link
Contributor

Choose a reason for hiding this comment

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

Deze kun je weglaten. De standaard text is hetzelfde.

src/server/services/varen/decos-zaken.ts Outdated Show resolved Hide resolved
src/server/services/varen/decos-zaken.ts Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants