Skip to content
Snippets Groups Projects

fix(overlays): displaying users overlays (MIN-280)

Merged mateusz-winiarczyk requested to merge MIN-280-displaying-users-overlays into development
1 unresolved thread
  1. Fixed displaying user overlays and showing them in the correct order after general overlays.
  2. Fixed displaying user overlay legend.
  3. Added the ability to create a user overlay without description and added refetch of user overlays after creation, so that the user always has an up-to-date list of user overlays.

user-overlays-order

image

overlay-desc

Closes: MIN-286 MIN-280

Merge request reports

Merge request pipeline #86831 passed

Merge request pipeline passed for 140fad01

Test coverage 90.93% (0.08%) from 1 job

Merged by mateusz-winiarczykmateusz-winiarczyk 1 year ago (Mar 5, 2024 9:04am UTC)

Loading

Pipeline #86870 passed

Pipeline passed for e4fd45c4 on development

Test coverage 90.93% (0.08%) from 1 job

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
143 145 return parsedOverlayBioEntities.success ? parsedOverlayBioEntities.data : undefined;
144 146 };
147
148 type GetActiveOverlaysIdsAndOrderReturnType = {
149 maxOrderValue: number;
150 activeOverlaysIdsAndOrder: OverlaysIdsAndOrder;
151 };
152
153 export const getActiveOverlaysIdsAndOrder = (
154 overlaysIdsAndOrder: OverlaysIdsAndOrder,
155 activeOverlaysIds: number[],
156 ): GetActiveOverlaysIdsAndOrderReturnType => {
157 let maxOrderValue = -Infinity;
158 const activeOverlaysIdsAndOrder = overlaysIdsAndOrder.filter(({ idObject, order }) => {
159 const isActive = activeOverlaysIds.includes(idObject);
160 if (isActive && order > maxOrderValue) maxOrderValue = order;
  • LGTM

    Please resolve RFC

  • Adrian Orłów approved this merge request

    approved this merge request

  • mateusz-winiarczyk added 14 commits

    added 14 commits

    • a216e512...b39c805a - 12 commits from branch development
    • 630093bb - Merge remote-tracking branch 'origin/development' into MIN-280-displaying-users-overlays
    • 140fad01 - refactor(useroverlays): remove side effect from filter method and extract it to separate loop

    Compare with previous version

  • mentioned in commit e4fd45c4

  • Please register or sign in to reply
    Loading