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.

Sign up for GitHub

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

Jump to bottom

Improved usability of bulk operations in alarm widget table #9569

Merged
merged 2 commits into from
Nov 7, 2023
Merged

Improved usability of bulk operations in alarm widget table #9569

merged 2 commits into from
Nov 7, 2023

Conversation

rusikv
Copy link
Contributor

@rusikv rusikv commented Nov 6, 2023

Before this improve: if there are selected acknowledged and unacknowledged alarms - occurs error on acknowledge selected, same with clear.

BEFORE

Screencast.from.06.11.23.16.36.27.webm

AFTER

Screencast.from.06.11.23.16.39.30.webm

General checklist

  • You have reviewed the guidelines document.
  • Labels that classify your pull request have been added.
  • The milestone is specified and corresponds to fix version.
  • Description references specific issue.
  • Description contains human-readable scope of changes.
  • Description contains brief notes about what needs to be added to the documentation.
  • No merge conflicts, commented blocks of code, code formatting issues.
  • Changes are backward compatible or upgrade script is provided.
  • Similar PR is opened for PE version to simplify merge. Crosslinks between PRs added. Required for internal contributors only.

Front-End feature checklist

  • Screenshots with affected component(s) are added. The best option is to provide 2 screens: before and after changes;
  • If you change the widget or other API, ensure it is backward-compatible or upgrade script is present.
  • Ensure new API is documented here

vvlladd28
vvlladd28 reviewed Nov 7, 2023
View reviewed changes
ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts Outdated
Comment on lines 892 to 893
(alarm) => alarm.id.id !== NULL_UUID && (alarm.status === AlarmStatus.CLEARED_UNACK ||
alarm.status === AlarmStatus.ACTIVE_UNACK)
Copy link
Member

Choose a reason for hiding this comment

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

Maybe simplify this code by using acknowledged boolean property in alarm model

vvlladd28
vvlladd28 reviewed Nov 7, 2023
View reviewed changes
ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts Outdated
Comment on lines 955 to 957
const activeAlarms = this.alarmsDatasource.selection.selected.filter(
(alarm) => alarm.id.id !== NULL_UUID && (alarm.status === AlarmStatus.ACTIVE_ACK ||
alarm.status === AlarmStatus.ACTIVE_UNACK)
Copy link
Member

Choose a reason for hiding this comment

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

Maybe simplify this code by using cleared boolean property in alarm model

@vvlladd28 vvlladd28 added enhancement UI UI changes labels Nov 7, 2023
@vvlladd28 vvlladd28 added this to the 3.6.1 milestone Nov 7, 2023
@ikulikov ikulikov merged commit c7d9921 into thingsboard:master Nov 7, 2023
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vvlladd28 vvlladd28 vvlladd28 approved these changes

Assignees
No one assigned
Labels
enhancement UI UI changes
Projects
None yet
Milestone
3.6.1
Development

Successfully merging this pull request may close these issues.
3 participants
@rusikv @vvlladd28 @ikulikov