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

Fixed menu manager sending secondary image with menuCells when menuCommandSecondaryImage is not supported #2014

Conversation

FrankElias77
Copy link
Contributor

Fixes #2006

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

N/A

Core Tests

Tested if the secondaryImage is still being sent in a menu command or a menu submenu cell after the menuCommandSecondaryImage and menuSubMenuSecondaryImage are removed from displayCapabilities in generic hmi.

Core version / branch / commit hash / module tested against: 7.1.0
HMI name / version / branch / commit hash / module tested against: Generic / 0.10.0

Summary

Check if the if the image is supported in our windowCapability before sending the Command/SubMenu cell

Changelog

Breaking Changes
  • N/A
Enhancements
  • N/A
Bug Fixes
  • Check if the if the image is supported in our windowCapability before sending the Command/SubMenu cell

Tasks Remaining:

N/A

CLA

@FrankElias77 FrankElias77 changed the title SDLMenuManager update Fixed menu manager sending secondary image with menuCells when menuCommandSecondaryImage is not supported Jun 25, 2021
@FrankElias77 FrankElias77 self-assigned this Jun 25, 2021
@FrankElias77 FrankElias77 added bug A defect in the library manager-screen Relating to the manager layer - screen managers labels Jun 25, 2021
Copy link
Contributor

@joeljfischer joeljfischer left a comment

Choose a reason for hiding this comment

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

Can we add updated tests to the spec files for this change?

@codecov
Copy link

codecov bot commented Jun 28, 2021

Codecov Report

Merging #2014 (4c06cb3) into develop (c3af93d) will not change coverage.
The diff coverage is 100.00%.

❗ Current head 4c06cb3 differs from pull request most recent head 6f7c0fa. Consider uploading reports for the commit 6f7c0fa to get more accurate results

@@           Coverage Diff            @@
##           develop    #2014   +/-   ##
========================================
  Coverage    86.34%   86.34%           
========================================
  Files          441      441           
  Lines        22792    22792           
========================================
  Hits         19679    19679           
  Misses        3113     3113           

@joeljfischer joeljfischer merged commit c8214e0 into develop Jun 28, 2021
@joeljfischer joeljfischer deleted the bugfix/issue-2006-menu-manager-sending-secondary-image-with-menuCells-when-menuCommandSecondaryImage-is-not-supported branch June 28, 2021 17:49
# 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