Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix never upload AddSubmenu RPC (menu cell w/ subcells) primary image on RPC connections v5.0 - v7.0 #2056

Merged

Conversation

joeljfischer
Copy link
Contributor

Fixes #2047

Risk

This PR makes no API changes.

Testing Plan

  • I have verified that I have not introduced new warnings in this PR (or explain why below)
  • I have run the unit tests with this PR
  • I have tested this PR against Core and verified behavior (if applicable, if not applicable, explain why below).

Unit Tests

Unit tests added to check file upload and RPC creation on those RPC versions without the image field

Core Tests

Tested creating a menu cell w/ subcells with an image. Note, Manticore is v7.1.0 but does not support the AddSubmenu image field, so submenu images will currently not show up.

Core version / branch / commit hash / module tested against: Core v8.0.0-RC
HMI name / version / branch / commit hash / module tested against: Generic HMI v0.11.0-RC

Summary

This PR makes two changes:

  1. It will now add the AddSubmenu (menu cell w/ subcells) primary image on RPC connections >= 5.0 and < 7.0 because we don't have an image field name that corresponds to that image support.
  2. It will now only upload menu cell images that are supported by the current window capability, which should be the same at all times.

Changelog

Bug Fixes
  • Fixes uploading unnecessary menu cell images
  • Fixes connections >= 5.0 and < 7.0 never sending AddSubmenu primary images

Tasks Remaining:

n/a

CLA

…ility

* Fix never upload AddSubmenu RPC (menu cell w/ subcells) primary image on RPC connections v5.0 - v7.0
@joeljfischer joeljfischer added bug A defect in the library manager-screen Relating to the manager layer - screen managers labels Oct 22, 2021
@joeljfischer joeljfischer self-assigned this Oct 22, 2021
@codecov
Copy link

codecov bot commented Oct 22, 2021

Codecov Report

Merging #2056 (db417c5) into develop (bc3054b) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop    #2056      +/-   ##
===========================================
+ Coverage    85.82%   85.84%   +0.01%     
===========================================
  Files          447      447              
  Lines        23299    23366      +67     
===========================================
+ Hits         19997    20059      +62     
- Misses        3302     3307       +5     

@joeljfischer joeljfischer changed the title Fix never upload AddSubmenu RPC (menu cell w/ subcells) primary image on RPC connections v5.0 - v7.0 Fix never upload AddSubmenu RPC (menu cell w/ subcells) primary image on RPC connections v5.0 - v7.1 Oct 25, 2021
Copy link
Contributor

@FrankElias77 FrankElias77 left a comment

Choose a reason for hiding this comment

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

Just these few comments:

  • Add subMenu missing image field in sdl_allImageFieldNames property in SDLImageField+ScreenManagerExtensions.h
  • If condition update to include the subMenu icon L347

As for the tests mentioned in standup, they passed!

* Fix missing text field / image field names from "all text fields" and "all image fields"
* Put text field names / image field names in alpha order
* Fix menu utilities version check to be 7.0 and add command icon check
@joeljfischer joeljfischer changed the title Fix never upload AddSubmenu RPC (menu cell w/ subcells) primary image on RPC connections v5.0 - v7.1 Fix never upload AddSubmenu RPC (menu cell w/ subcells) primary image on RPC connections v5.0 - v7.0 Nov 5, 2021
FrankElias77
FrankElias77 previously approved these changes Nov 8, 2021
@joeljfischer joeljfischer merged commit 312c588 into develop Nov 19, 2021
@joeljfischer joeljfischer deleted the bugfix/issue-2047-menu-manager-cell-image-rpc-5.0-to-7.0 branch November 19, 2021 16:46
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
bug A defect in the library manager-screen Relating to the manager layer - screen managers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants