agama-project / agama / 15190028511

73%

Build Type

push

github

Committed by web-flow

Commit Message

feat: allow software conflicts resolution (#2348)

## Problem

There is missing conflict resolution in Agama web UI.


## Solution

Implement it with having it in backend, dbus, http API and also in web
UI.


## Testing

- Added a new unit test at front-end side
- Tested manually by @jreidinger 

## Screenshots

<details>
<summary>Click to show/hide a few screenshots</summary>

---

<em>Bear in mind that these screenshots might be outdated because
changes requested by reviewers after uploading them. They will be
replaced only if these changes are highly noticeable</em>

### Warning with link at Software page

![localhost_8080_
(65)](https://github.com/user-attachments/assets/d763fc0c-0655-4f3f-951f-4b91c275eb72)

### Software conflicts resolution page when there is only one conflict

![localhost_8080_
(66)](https://github.com/user-attachments/assets/af9be2d1-861d-449d-8ea9-50975df51a62)

### Software conflicts resolution page when there are multiple conflicts
![localhost_8080_
(64)](https://github.com/user-attachments/assets/45b3234f-5e6b-4312-9e16-4d887f37c85d)


### Software conflicts resolution page when there are no conflicts
![localhost_8080_
(67)](https://github.com/user-attachments/assets/2f283185-6e4b-4b21-b168-9ec2e18eab24)

</details>

Run Details

92 of 132 branches covered (69.7%)

Branch coverage included in aggregate %.

23 of 51 new or added lines in 4 files covered. (45.1%)

10 existing lines in 1 file now uncovered.

10965 of 17484 relevant lines covered (62.71%)

42.78 hits per line