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

10837 Review changed files in Altinn Studio #13095

Merged
merged 5 commits into from
Jul 9, 2024

Conversation

standeren
Copy link
Contributor

@standeren standeren commented Jul 4, 2024

Description

  • Remove hardcoded 1 in notification for shareChanges button
  • Remove conditional Mergeconflict text in buttons for shareing and fetching changes
  • Add button to review changes in shareChangesPopup if there are local changes
  • Implement a modal to review fileNames and connected fileStatus
Skjermbilde 2024-07-04 kl  14 17 07 Skjermbilde 2024-07-04 kl  14 16 39
Skjermopptak.2024-07-04.kl.14.16.02.mov
  • Also added some padding to the LocalChangesModal
Skjermbilde 2024-07-04 kl  14 07 45

Out of scope in this PR: implement support to review actual diff for each file. Should be done in a different PR

Related Issue(s)

  • #{issue number}

Verification

  • Your code builds clean without any errors or warnings
  • Manual testing done (required)
  • Relevant automated test added (if you find this hard, leave it and we'll help out)

@standeren standeren linked an issue Jul 4, 2024 that may be closed by this pull request
@github-actions github-actions bot added area/process Area: Related to app process (e.g. signing, receipt, fill inn, payment, etc). solution/studio/designer Issues related to the Altinn Studio Designer solution. labels Jul 4, 2024
@standeren standeren force-pushed the 10837-see-pending-changes-in-altinn-studio-designer branch 7 times, most recently from e4b2a4a to 43dd61b Compare July 4, 2024 13:25
Copy link

codecov bot commented Jul 4, 2024

Codecov Report

Attention: Patch coverage is 92.68293% with 3 lines in your changes missing coverage. Please review.

Project coverage is 91.90%. Comparing base (ded5d91) to head (7f9510a).

Files Patch % Lines
...onents/ShareChangesPopover/ShareChangesPopover.tsx 81.81% 0 Missing and 2 partials ⚠️
...tent/FileChangesInfoModal/FileChangesInfoModal.tsx 94.73% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main   #13095   +/-   ##
=======================================
  Coverage   91.89%   91.90%           
=======================================
  Files        1426     1427    +1     
  Lines       19986    20014   +28     
  Branches     2396     2396           
=======================================
+ Hits        18367    18393   +26     
  Misses       1360     1360           
- Partials      259      261    +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@standeren standeren force-pushed the 10837-see-pending-changes-in-altinn-studio-designer branch from 43dd61b to 7e0b610 Compare July 4, 2024 13:44
Copy link
Contributor

@lassopicasso lassopicasso left a comment

Choose a reason for hiding this comment

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

Awesome job! The design looks great and the code is clean and neat. I just got a few comments. 🙂

@standeren standeren force-pushed the 10837-see-pending-changes-in-altinn-studio-designer branch from 7e0b610 to 26a6d0a Compare July 9, 2024 08:16
Copy link
Contributor

@lassopicasso lassopicasso left a comment

Choose a reason for hiding this comment

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

🚀

@standeren standeren merged commit 9eac591 into main Jul 9, 2024
11 checks passed
@standeren standeren deleted the 10837-see-pending-changes-in-altinn-studio-designer branch July 9, 2024 09:39
@lassopicasso
Copy link
Contributor

Tested in dev - works as expected :)

@lassopicasso lassopicasso removed their assignment Jul 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/process Area: Related to app process (e.g. signing, receipt, fill inn, payment, etc). solution/studio/designer Issues related to the Altinn Studio Designer solution.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

See pending changes in Altinn Studio Designer
2 participants