fix(settings): drop obsolete label arg from RMM delete_lookup calls #234

Closed
David wants to merge 0 commits from fix/mapps-227-ci-check into main
Owner

PR #198 (ConfirmDialog) reduced delete_lookup to (id, base) by removing the native confirm_delete(kind) step, while PR #211 (RMM admin UI) was branched off older main and still passes a third label argument ("connection", "device mapping", "alert rule"). Both landed on main, producing a semantic merge conflict: three RMM call sites in src/pages/settings.rs invoke the 2-arg delete_lookup with 3 arguments, so the lib fails to compile (E0061) and breaks cargo clippy/cargo test in check.yml. This branch inherited the breakage when it merged main.

The label was only ever consumed by the now-deleted confirm_delete; confirmation is handled by the ConfirmDialog component, so the argument is dead. Remove it from the three RMM call sites to match the other ten 2-arg callers. fmt, clippy (-D warnings), wasm32 check, and the 133 lib tests all pass.

#MAPPS-227

PR #198 (ConfirmDialog) reduced `delete_lookup` to `(id, base)` by removing the native `confirm_delete(kind)` step, while PR #211 (RMM admin UI) was branched off older main and still passes a third label argument ("connection", "device mapping", "alert rule"). Both landed on main, producing a semantic merge conflict: three RMM call sites in src/pages/settings.rs invoke the 2-arg `delete_lookup` with 3 arguments, so the lib fails to compile (E0061) and breaks `cargo clippy`/`cargo test` in check.yml. This branch inherited the breakage when it merged main. The label was only ever consumed by the now-deleted `confirm_delete`; confirmation is handled by the ConfirmDialog component, so the argument is dead. Remove it from the three RMM call sites to match the other ten 2-arg callers. fmt, clippy (-D warnings), wasm32 check, and the 133 lib tests all pass. #MAPPS-227
feat(contracts): manage line items from the contract detail page
All checks were successful
Check / clippy + fmt + tests (pull_request) Successful in 1m1s
7d55c7572b
Contract line items had full backend CRUD (POST /contracts/{id}/items, PUT/DELETE /contract-items/{id}) but the detail page's Line Items card was read-only: no Add, Edit, or Delete affordance. Combined with the edit form intentionally hiding its own item editor, there was no way to add, correct, or remove a contract's line items after creation, and the derived contract Value could not be adjusted.

Add an "Add Item" action to the Line Items card header and make each row clickable, both opening a shared ContractItemFormModal that mirrors the create form's fields (name, type, quantity, unit price). New items POST to /contracts/{id}/items; editing an existing row PUTs to /contract-items/{id}; the modal retains the unexposed fields of the original row (description, included hours, rollover settings, sort_order) so a full-replace PUT does not wipe them. Delete uses the in-app ConfirmDialog (MAPPS-189), not window.confirm. On save or delete both the items table and the contract resource refresh so per-row totals and the Summary Value reflect the change.

item_type options now come from a shared contract_item_type_options() helper used by both the create form and the detail modal so they stay in sync with the server's item_type CHECK set (MAPPS-190). The stale "edit flow manages items from the detail page" comment on ContractFormValues.items is corrected to describe the now-real detail-page management.

#MAPPS-196
Merge main into feat/mapps-196-contract-line-item-management
Some checks failed
Check / clippy + fmt + tests (pull_request) Failing after 59s
31b1188a0e
Resolve src/pages/contracts.rs: keep both signal decls - editing_item (MAPPS-196 line-item edit state) and confirming_delete (MAPPS-189 styled ConfirmDialog for the contract delete) that landed on main via #198.

#MAPPS-196

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
fix(settings): drop obsolete label arg from RMM delete_lookup calls
All checks were successful
Check / clippy + fmt + tests (pull_request) Successful in 2m25s
Create release / Create release from merged PR (pull_request) Has been skipped
282138d5eb
PR #198 (ConfirmDialog) reduced `delete_lookup` to `(id, base)` by removing the native `confirm_delete(kind)` step, while PR #211 (RMM admin UI) was branched off older main and still passes a third label argument ("connection", "device mapping", "alert rule"). Both landed on main, producing a semantic merge conflict: three RMM call sites in src/pages/settings.rs invoke the 2-arg `delete_lookup` with 3 arguments, so the lib fails to compile (E0061) and breaks `cargo clippy`/`cargo test` in check.yml. This branch inherited the breakage when it merged main.

The label was only ever consumed by the now-deleted `confirm_delete`; confirmation is handled by the ConfirmDialog component, so the argument is dead. Remove it from the three RMM call sites to match the other ten 2-arg callers. fmt, clippy (-D warnings), wasm32 check, and the 133 lib tests all pass.

#MAPPS-227
Owner

Superseded: this PR bundles two things that are both already handled elsewhere - the RMM delete_lookup arity fix landed on main via #237, and the contracts line-items work here is byte-identical to the dedicated PR #209 (MAPPS-196). Closing in favour of #209 for the feature.

Superseded: this PR bundles two things that are both already handled elsewhere - the RMM delete_lookup arity fix landed on main via #237, and the contracts line-items work here is byte-identical to the dedicated PR #209 (MAPPS-196). Closing in favour of #209 for the feature.
vas2000-work closed this pull request 2026-06-17 02:14:45 +02:00
David deleted branch fix/mapps-227-ci-check 2026-06-17 12:25:26 +02:00
All checks were successful
Check / clippy + fmt + tests (pull_request) Successful in 2m25s
Required
Details
Create release / Create release from merged PR (pull_request) Has been skipped

Pull request closed

Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
psa-systems/mokosh-apps!234
No description provided.