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

Merging input files (App) #2799

Merged
merged 27 commits into from
Feb 25, 2025
Merged

Merging input files (App) #2799

merged 27 commits into from
Feb 25, 2025

Conversation

PhilippMa
Copy link
Contributor

Summary of changes

Fully integrate merging of input files into OpossumUI.

  • add menu entry for merge
  • show dialog for selecting input file when clicking the menu item
    • show NotSavedPopup first if there are unsaved changes
  • when user clicks "Merge" in the dialog, the merge functionality implemented in Merging of input files (Backend logic) #2797 is invoked

Context and reason for change

We want users to be able to merge more information from external files into their currently open .opossum file directly from OpossumUI.

How can the changes be tested

Open a file in OpossumUI, then merge a second file into it using the new workflow, check that data from both files made it into the merged file.

closes #2730

@PhilippMa PhilippMa linked an issue Feb 18, 2025 that may be closed by this pull request
@PhilippMa PhilippMa marked this pull request as ready for review February 18, 2025 16:37
@Hellgartner Hellgartner self-assigned this Feb 19, 2025
@Hellgartner
Copy link
Contributor

This should have probably been two stacked PRs:

  • The Menu refactor at the beginning
  • Then the real merge functionality

Copy link
Member

@mstykow mstykow left a comment

Choose a reason for hiding this comment

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

Could you please move the "..." to Import/Merge rather than after the options?
image

Copy link
Member

@mstykow mstykow left a comment

Choose a reason for hiding this comment

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

I selected "merge scancode json" but then used a non-scancode json. Expectedly, I got an error. But shouldn't we give a better message what exactly is wrong than just saying that there is some failure?
image

@mstykow
Copy link
Member

mstykow commented Feb 19, 2025

This is not vertically aligned, i.e., the icon is too high or the text is too low, depending on how you look at it.
image

@mstykow
Copy link
Member

mstykow commented Feb 19, 2025

"ScanCode File" is not a proper noun, only "ScanCode" is. I would lower-case "file".
image

@mstykow
Copy link
Member

mstykow commented Feb 19, 2025

"Opossum", however, is a proper noun. Please capitalize. Comment also applies to the "import" dialog, not just the "merge".
image

@mstykow
Copy link
Member

mstykow commented Feb 19, 2025

Let's not capitalize an entire word/sentence. But what you can do here is to suggest to the user to make a backup of their Opossum file before merging.
image

@PhilippMa
Copy link
Contributor Author

Could you please move the "..." to Import/Merge rather than after the options? image

Are you sure that is the standard? While implementing this I had a look at the menu in JetBrains IDEs as reference, and at least there it seems that menu items containing submenus never have a "..." suffix, and the dots are rather only used on "leaf" menu items which open a popup/dialog instead of immediately executing an action.

@PhilippMa
Copy link
Contributor Author

I selected "merge scancode json" but then used a non-scancode json. Expectedly, I got an error. But shouldn't we give a better message what exactly is wrong than just saying that there is some failure? image

I feel like this would need some further planning as to which kinds of errors we could reasonably distinguish, so I would suggest implementing this as part of a new issue. Or do you see any improvements that would make sense to already include in this PR?

@mstykow
Copy link
Member

mstykow commented Feb 19, 2025

Could you please move the "..." to Import/Merge rather than after the options? image

Are you sure that is the standard? While implementing this I had a look at the menu in JetBrains IDEs as reference, and at least there it seems that menu items containing submenus never have a "..." suffix, and the dots are rather only used on "leaf" menu items which open a popup/dialog instead of immediately executing an action.

You're right. Ignore my suggestion and keep as is.

Copy link
Member

@mstykow mstykow left a comment

Choose a reason for hiding this comment

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

General comment: please think about how you can keep your PRs smaller.

@PhilippMa PhilippMa merged commit dafca7b into main Feb 25, 2025
5 checks passed
@PhilippMa PhilippMa deleted the feat/merge-app branch February 25, 2025 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merging of input files (App)
3 participants