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

chore: NBJ watermark support for new licenses #30469

Merged
merged 14 commits into from
Oct 25, 2023
Merged

Conversation

aleksandernsilva
Copy link
Contributor

@aleksandernsilva aleksandernsilva commented Sep 22, 2023

Proposed changes (including videos or screenshots)

Issue(s)

NBJ-377

Steps to test or reproduce

Further comments

@changeset-bot
Copy link

changeset-bot bot commented Sep 22, 2023

⚠️ No Changeset found

Latest commit: 6332ecb

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@aleksandernsilva aleksandernsilva changed the title feat: adapted watermark to support new licenses feat: NBJ watermark support for new licenses Sep 22, 2023
@codecov
Copy link

codecov bot commented Sep 22, 2023

Codecov Report

Merging #30469 (6332ecb) into develop (ef12ac5) will decrease coverage by 0.24%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #30469      +/-   ##
===========================================
- Coverage    51.22%   50.98%   -0.24%     
===========================================
  Files          811      809       -2     
  Lines        15113    15218     +105     
  Branches      2759     2827      +68     
===========================================
+ Hits          7741     7759      +18     
- Misses        6961     7016      +55     
- Partials       411      443      +32     
Flag Coverage Δ
e2e 48.26% <ø> (-0.22%) ⬇️
unit 63.91% <ø> (ø)

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

@aleksandernsilva aleksandernsilva force-pushed the feat/watermark-nbj-licenses branch from 6ad0bc8 to 7e02442 Compare September 29, 2023 15:58
Copy link
Contributor

@hugocostadev hugocostadev left a comment

Choose a reason for hiding this comment

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

Hey @aleksandernsilva you can rebase your PR to develop branch and implement the correct behavior with the License...

I also suggest to use a more generic name for water mark module, like "watermark"

@aleksandernsilva aleksandernsilva force-pushed the feat/watermark-nbj-licenses branch from 007045b to ec0893e Compare October 3, 2023 14:36
@aleksandernsilva aleksandernsilva added this to the 6.5.0 milestone Oct 3, 2023
@aleksandernsilva aleksandernsilva force-pushed the feat/watermark-nbj-licenses branch 3 times, most recently from c09e6d6 to 50bac2f Compare October 5, 2023 18:49
hugocostadev
hugocostadev previously approved these changes Oct 9, 2023
@aleksandernsilva aleksandernsilva force-pushed the feat/watermark-nbj-licenses branch from d453da4 to 0021b05 Compare October 18, 2023 21:30
@aleksandernsilva aleksandernsilva marked this pull request as ready for review October 19, 2023 17:00
@aleksandernsilva aleksandernsilva requested a review from a team as a code owner October 19, 2023 17:00
@hugocostadev hugocostadev self-requested a review October 19, 2023 19:12
@hugocostadev hugocostadev self-requested a review October 20, 2023 18:56
Copy link
Contributor

@hugocostadev hugocostadev left a comment

Choose a reason for hiding this comment

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

the useLicense() hooks has changed, update with your branch and make the necessary changes

@rodrigok
Copy link
Member

@aleksandernsilva can you fix the conflicts?

@aleksandernsilva aleksandernsilva force-pushed the feat/watermark-nbj-licenses branch 2 times, most recently from 076f1f3 to 4262540 Compare October 24, 2023 01:19
@ggazzo ggazzo force-pushed the feat/watermark-nbj-licenses branch from b92bd7a to 5ca32d5 Compare October 25, 2023 03:27
@ggazzo ggazzo changed the title feat: NBJ watermark support for new licenses chore: NBJ watermark support for new licenses Oct 25, 2023
@ggazzo ggazzo force-pushed the feat/watermark-nbj-licenses branch 2 times, most recently from f4b2b7c to ed3edb5 Compare October 25, 2023 03:48
ggazzo
ggazzo previously approved these changes Oct 25, 2023
@ggazzo ggazzo force-pushed the feat/watermark-nbj-licenses branch from ed3edb5 to c171de3 Compare October 25, 2023 04:17
ggazzo
ggazzo previously approved these changes Oct 25, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: needs QA labels Oct 25, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels Oct 25, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels Oct 25, 2023
@ggazzo ggazzo merged commit fd23913 into develop Oct 25, 2023
42 of 43 checks passed
@ggazzo ggazzo deleted the feat/watermark-nbj-licenses branch October 25, 2023 14:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA skipped stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants