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

fix: add texts after template reset #6237

Merged
merged 7 commits into from
Aug 4, 2023

Conversation

eliobischof
Copy link
Member

After template resets, new text set events were not emitted anymore.

Definition of Ready

  • I am happy with the code
  • Short description of the feature/issue is added in the pr description
  • PR is linked to the corresponding user story
  • Acceptance criteria are met
  • All open todos and follow ups are defined in a new ticket and justified
  • Deviations from the acceptance criteria and design are agreed with the PO and documented.
  • No debug or dead code
  • My code has no repetitions
  • Critical parts are tested automatically
  • Where possible E2E tests are implemented
  • Documentation/examples are up-to-date
  • All non-functional requirements are met
  • Functionality of the acceptance criteria is checked manually on the dev system.

@vercel
Copy link

vercel bot commented Jul 19, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
docs ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 4, 2023 6:00pm

@codecov
Copy link

codecov bot commented Jul 19, 2023

Codecov Report

Merging #6237 (d1aa6ce) into main (cd5e176) will decrease coverage by 4.30%.
Report is 32 commits behind head on main.
The diff coverage is 47.03%.

@@            Coverage Diff             @@
##             main    #6237      +/-   ##
==========================================
- Coverage   49.95%   45.65%   -4.30%     
==========================================
  Files        1232      820     -412     
  Lines      110330    85821   -24509     
==========================================
- Hits        55110    39180   -15930     
+ Misses      52556    44818    -7738     
+ Partials     2664     1823     -841     
Flag Coverage Δ
core-integration-tests-postgres ?
core-unit-tests 45.65% <47.03%> (+0.12%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
internal/api/authz/user.go 0.00% <0.00%> (-80.00%) ⬇️
internal/api/grpc/admin/iam_settings_converter.go 0.00% <0.00%> (ø)
internal/api/grpc/admin/import.go 0.00% <0.00%> (ø)
internal/api/grpc/management/user.go 0.00% <0.00%> (ø)
internal/api/grpc/management/user_converter.go 0.00% <0.00%> (ø)
internal/api/grpc/user/v2/otp.go 0.00% <0.00%> (ø)
internal/api/grpc/user/v2/phone.go 0.00% <0.00%> (ø)
internal/api/idp/idp.go 18.18% <0.00%> (-12.84%) ⬇️
internal/api/oidc/auth_request_converter.go 0.00% <0.00%> (-22.34%) ⬇️
internal/api/oidc/client.go 0.00% <0.00%> (-22.31%) ⬇️
... and 47 more

... and 701 files with indirect coverage changes

muhlemmer
muhlemmer previously approved these changes Aug 1, 2023
@muhlemmer muhlemmer self-requested a review August 1, 2023 12:04
@muhlemmer muhlemmer dismissed their stale review August 1, 2023 12:05

didn't notice tests are borked

Copy link
Collaborator

@muhlemmer muhlemmer left a comment

Choose a reason for hiding this comment

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

It seems that the unit tests need to be adjusted to handle the new event handling:

https://github.com/zitadel/zitadel/actions/runs/5713243265/job/15478370546?pr=6237#step:7:287

@eliobischof
Copy link
Member Author

It seems that the unit tests need to be adjusted to handle the new event handling:

https://github.com/zitadel/zitadel/actions/runs/5713243265/job/15478370546?pr=6237#step:7:287

I fixed the unit test

@eliobischof eliobischof requested a review from muhlemmer August 3, 2023 10:44
@eliobischof eliobischof enabled auto-merge (squash) August 3, 2023 13:10
@eliobischof eliobischof merged commit d937ee3 into main Aug 4, 2023
@eliobischof eliobischof deleted the fix-add-texts-after-template-reset branch August 4, 2023 18:12
@github-actions
Copy link

github-actions bot commented Aug 7, 2023

🎉 This PR is included in version 2.30.0-eventstore-performance.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

livio-a pushed a commit that referenced this pull request Aug 8, 2023
* fix: add texts after template reset

* fix unit tests

(cherry picked from commit d937ee3)
@github-actions
Copy link

github-actions bot commented Aug 8, 2023

🎉 This PR is included in version 2.24.0-ignore-me.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions
Copy link

🎉 This PR is included in version 2.24.0-ignore-me2.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions
Copy link

🎉 This PR is included in version 2.24.0-ignore-me-ffo.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions
Copy link

🎉 This PR is included in version 2.33.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

muhlemmer added a commit that referenced this pull request Oct 27, 2023
muhlemmer added a commit that referenced this pull request Oct 27, 2023
* Revert "fix: add texts after template reset (#6237)"

This reverts commit d937ee3.

* fix: reset of custom text template

* add custom bulk limits from issue

#6766 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants