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

chore: Merge chore_release-7.3.0 into edge #15117

Merged
merged 18 commits into from
May 7, 2024
Merged

chore: Merge chore_release-7.3.0 into edge #15117

merged 18 commits into from
May 7, 2024

Conversation

mjhuff
Copy link
Contributor

@mjhuff mjhuff commented May 7, 2024

Overview

This is an incremental merge of the in-progress chore_release-7.3.0 branch into edge.

This gets the ChangeNotifier interface changes into edge, needed for current notification work. Luckily, those changes were the only merge conflict.

Risk assessment

low - only 1 conflict, and it was my conflict, anyway

koji and others added 18 commits May 2, 2024 09:43
* fix(app): modify slideout restore value link layout
* fix(app): fix the arrow icon size in dropdown menu
* fix(app): remove unnecessary padding
* fix(app): remove input field box-shadow on ODD
* fix(app): modify the space between icon and banner outline
* fix(app): fix input field behavior on blur
* fix(app): fix list button styling
* fix(app): fix space in mini card
…after waiting (#15103)

Closes RQA-2677

ChangeNotifier is the interface for alerting robot-server of notification updates deriving from Protocol Engine. Protocol Engine notify()ies, and the PublisherNotifier wait()s. After the event flag is set() in notify(), the PublisherNotifier no longer waits (correctly). However, the event flag isn't cleared immediately on receiving a new event...it's cleared after PublisherNotifer fires all its registered callbacks. This causes some events to be dropped if Protocol Engine tries setting the flag before PublisherNotifier has gotten around to clearing it.
* fix(app): fix choose number input field behavior
@mjhuff mjhuff requested a review from y3rsh May 7, 2024 17:08
@mjhuff mjhuff requested review from a team as code owners May 7, 2024 17:08
@mjhuff mjhuff requested review from brenthagen, sfoster1 and a team and removed request for a team and brenthagen May 7, 2024 17:08
Copy link
Contributor

@koji koji left a comment

Choose a reason for hiding this comment

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

The frontend part looks good to me

@mjhuff mjhuff merged commit 1dede8b into edge May 7, 2024
74 checks passed
@mjhuff mjhuff deleted the mergeback branch May 7, 2024 20:21
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.

3 participants