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(regulations-admin): Format amending and cancel, styles, signature #15344

Merged
merged 3 commits into from
Jun 26, 2024

Conversation

thordurhhh
Copy link
Member

@thordurhhh thordurhhh commented Jun 25, 2024

What

  • Remove minister role in signature
  • Update styling in dialog for upload icon
  • Update amending regulation formatter with minor additions

Why

Stakeholder requirements.

Checklist:

  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • Formatting passes locally with my changes
  • I have rebased against main before asking for a review

Summary by CodeRabbit

  • Bug Fixes

    • Removed placeholder text from the signature component for cleaner display.
  • Style

    • Introduced new global style to enhance the visual appearance of toolbar icons.
  • Refactor

    • Improved formatting of regulation titles and text for better readability.
    • Updated logic in text modification to handle specific content patterns more effectively.

@thordurhhh thordurhhh added the deprecated:automerge (Disabled) Merge this PR as soon as all checks pass label Jun 25, 2024
Copy link
Contributor

coderabbitai bot commented Jun 25, 2024

Walkthrough

The recent changes focus on improving UI elements and formatting functions within the regulations administration portal. This includes removing a placeholder from a signature field, enhancing global style rules for editor icons, refining title formatting in regulation texts, and updating the logic for identifying deletions or additions in regulatory content. These adjustments enhance the user interface and improve text presentation and handling within the portal.

Changes

Files Change Summary
.../components/EditSignature.tsx Removed placeholder text {minister}. from a <p> element with class Undirritun.
.../components/EditorInput.css.ts Introduced globalStyle import and defined global style for .tox-icon.tox-tbtn__icon-wrap, setting color to #217bb7.
.../utils/formatAmendingRegulation.ts Enhanced title formatting by removing unnecessary whitespaces, adjusted text handling for regulatory titles, and improved string manipulation in formatAmendingRegTitle and formatAmendingRegBody.
.../utils/getDeletionOrAddition.ts Updated logic for getDeletionOrAddition function to better handle modifiedTextContent based on specific patterns.

Sequence Diagram(s)

No sequence diagrams are generated as the changes primarily involve UI improvements and text handling enhancements without significantly altering control flow.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@thordurhhh thordurhhh marked this pull request as ready for review June 25, 2024 14:47
@thordurhhh thordurhhh requested a review from a team as a code owner June 25, 2024 14:47
@datadog-island-is
Copy link

datadog-island-is bot commented Jun 25, 2024

Datadog Report

Branch report: regulations-admin/format-amending-and-cancel-reg
Commit report: 5b94fa2
Test service: portals-admin-regulations-admin

✅ 0 Failed, 24 Passed, 0 Skipped, 14.52s Total Time
➡️ Test Sessions change in coverage: 1 no change

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between b7942bd and 9abcbc4.

Files selected for processing (4)
  • libs/portals/admin/regulations-admin/src/components/EditSignature.tsx (1 hunks)
  • libs/portals/admin/regulations-admin/src/components/EditorInput.css.ts (2 hunks)
  • libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts (4 hunks)
  • libs/portals/admin/regulations-admin/src/utils/getDeletionOrAddition.ts (1 hunks)
Files skipped from review due to trivial changes (1)
  • libs/portals/admin/regulations-admin/src/components/EditSignature.tsx
Additional context used
Path-based instructions (3)
libs/portals/admin/regulations-admin/src/components/EditorInput.css.ts (1)

Pattern libs/**/*: "Confirm that the code adheres to the following:

  • Reusability of components and hooks across different NextJS apps.
  • TypeScript usage for defining props and exporting types.
  • Effective tree-shaking and bundling practices."
libs/portals/admin/regulations-admin/src/utils/getDeletionOrAddition.ts (1)

Pattern libs/**/*: "Confirm that the code adheres to the following:

  • Reusability of components and hooks across different NextJS apps.
  • TypeScript usage for defining props and exporting types.
  • Effective tree-shaking and bundling practices."
libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts (1)

Pattern libs/**/*: "Confirm that the code adheres to the following:

  • Reusability of components and hooks across different NextJS apps.
  • TypeScript usage for defining props and exporting types.
  • Effective tree-shaking and bundling practices."
Additional comments not posted (4)
libs/portals/admin/regulations-admin/src/components/EditorInput.css.ts (1)

55-57: Enhanced Styling for Upload Icon

The global style targeting .tox-icon.tox-tbtn__icon-wrap with a new color #217bb7 is correctly implemented and will improve the visual consistency of the upload icon across the platform. This change aligns with the PR's objectives to update styling elements.

libs/portals/admin/regulations-admin/src/utils/getDeletionOrAddition.ts (1)

155-166: Refined Text Extraction Logic in getDeletionOrAddition

The updated logic for handling modifiedTextContent improves the specificity and accuracy of text extraction. The use of regular expressions to match and split text based on the pattern ^\d+\.\s*gr\.$ is well-implemented. This change ensures that only relevant parts of the text are modified or extracted, which is crucial for maintaining the integrity of the content in regulatory texts.

libs/portals/admin/regulations-admin/src/utils/formatAmendingRegulation.ts (2)

49-52: Optimization in formatAmendingRegTitle Function

The addition of .replace(/ +(?= )/g, '') to remove extra spaces in concatenated titles is a small but effective optimization. It ensures the output is cleaner and more professional, which is particularly important in a regulatory context where clarity and precision are paramount.


68-72: Improved Title Formatting in formatAmendingRegBody

The modifications to the formatAmendingRegBody function enhance the handling of regulation titles by stripping the prefix "reglugerð" and ensuring no trailing periods. These changes result in a more polished and readable HTML output, aligning with the PR's goal to improve the formatting of amending regulations.

Copy link

codecov bot commented Jun 25, 2024

Codecov Report

Attention: Patch coverage is 0% with 10 lines in your changes missing coverage. Please review.

Project coverage is 37.07%. Comparing base (b7942bd) to head (9abcbc4).
Report is 4 commits behind head on main.

Current head 9abcbc4 differs from pull request most recent head 1224161

Please upload reports for the commit 1224161 to get more accurate results.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #15344      +/-   ##
==========================================
+ Coverage   37.04%   37.07%   +0.02%     
==========================================
  Files        6538     6538              
  Lines      133118   132979     -139     
  Branches    38127    38044      -83     
==========================================
- Hits        49310    49298      -12     
+ Misses      83808    83681     -127     
Flag Coverage Δ
portals-admin-regulations-admin 2.03% <0.00%> (-0.01%) ⬇️

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

Files Coverage Δ
...regulations-admin/src/components/EditSignature.tsx 0.00% <ø> (ø)
...ations-admin/src/utils/formatAmendingRegulation.ts 0.00% <0.00%> (ø)
...gulations-admin/src/utils/getDeletionOrAddition.ts 0.00% <0.00%> (ø)

... and 74 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c53cbe0...1224161. Read the comment docs.

Copy link
Member

@thorkellmani thorkellmani left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

@kodiakhq kodiakhq bot merged commit c83efb5 into main Jun 26, 2024
23 checks passed
@kodiakhq kodiakhq bot deleted the regulations-admin/format-amending-and-cancel-reg branch June 26, 2024 09:43
sigruntg pushed a commit that referenced this pull request Jun 27, 2024
…#15344)

* format amending and cancel, styles, signature

* Remove console log

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
snaerseljan pushed a commit that referenced this pull request Jul 2, 2024
…#15344)

* format amending and cancel, styles, signature

* Remove console log

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deprecated:automerge (Disabled) Merge this PR as soon as all checks pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants