From f8d5cce7896e5166585eef76b5e43d898ec53876 Mon Sep 17 00:00:00 2001 From: danoswaltCL <97542869+danoswaltCL@users.noreply.github.com> Date: Tue, 27 Feb 2024 18:02:55 -0500 Subject: [PATCH 1/4] fix remove unneccessary permissions use and check correct enum for disabled state --- .../pages/view-segment/view-segment.component.html | 8 ++++---- .../segments/pages/view-segment/view-segment.component.ts | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.html b/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.html index 4b6dfbd6dc..a33e3668e2 100644 --- a/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.html +++ b/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.html @@ -29,8 +29,8 @@ mat-flat-button class="ft-14-600 button" (click)="deleteSegment()" - [ngClass]="{ 'button--disabled': (permissions && !permissions.segments.delete) || segmentUsed }" - [disabled]="(permissions && !permissions.segments.delete) || segmentUsed" + [ngClass]="{ 'button--disabled': (segment.type === SegmentType.GLOBAL_EXCLUDE) || segmentUsed }" + [disabled]="(segment.type === SegmentStatus.GLOBAL_EXCLUDE) || segmentUsed" > {{ 'global.delete.text' | translate }} @@ -40,8 +40,8 @@ mat-flat-button class="ft-14-600 button-long" (click)="duplicateSegmentDialog()" - [ngClass]="{ 'button-long--disabled': segment?.type == 'global_exclude' }" - [disabled]="segment?.type == 'global_exclude'" + [ngClass]="{ 'button-long--disabled': segment.type == SegmentType.GLOBAL_EXCLUDE }" + [disabled]="segment.type == SegmentType.GLOBAL_EXCLUDE" > {{ 'global.duplicate.text' | translate }} diff --git a/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.ts b/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.ts index 61a31c24b1..2c78fa52e1 100644 --- a/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.ts +++ b/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.ts @@ -3,7 +3,7 @@ import { UserPermission } from '../../../../../core/auth/store/auth.models'; import { Subscription } from 'rxjs'; import { MatDialog } from '@angular/material/dialog'; import { AuthService } from '../../../../../core/auth/auth.service'; -import { filter } from 'rxjs/operators'; +import { filter, withLatestFrom } from 'rxjs/operators'; import { SegmentsService } from '../../../../../core/segments/segments.service'; import { NewSegmentComponent } from '../../components/modal/new-segment/new-segment.component'; import * as clonedeep from 'lodash.clonedeep'; @@ -43,6 +43,10 @@ export class ViewSegmentComponent implements OnInit, OnDestroy { return SEGMENT_STATUS; } + get SegmentType() { + return SEGMENT_TYPE; + } + get SegmentStatusPipeTypes() { return SegmentStatusPipeType; } @@ -62,7 +66,6 @@ export class ViewSegmentComponent implements OnInit, OnDestroy { .subscribe((segment) => { this.segment = { ...segment, status: segment.status || SEGMENT_STATUS.UNUSED }; - this.permissions.segments.delete = this.segment.type !== SEGMENT_TYPE.GLOBAL_EXCLUDE; this.members = []; this.segment.individualForSegment.forEach((user) => { this.members.push({ type: MemberTypes.INDIVIDUAL, id: user.userId }); From 44b2c7067075345d35ff507e1a6a6a80f70b625c Mon Sep 17 00:00:00 2001 From: danoswaltCL <97542869+danoswaltCL@users.noreply.github.com> Date: Tue, 27 Feb 2024 18:03:25 -0500 Subject: [PATCH 2/4] linting update --- .../segments/pages/view-segment/view-segment.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.html b/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.html index a33e3668e2..310d219548 100644 --- a/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.html +++ b/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.html @@ -29,8 +29,8 @@ mat-flat-button class="ft-14-600 button" (click)="deleteSegment()" - [ngClass]="{ 'button--disabled': (segment.type === SegmentType.GLOBAL_EXCLUDE) || segmentUsed }" - [disabled]="(segment.type === SegmentStatus.GLOBAL_EXCLUDE) || segmentUsed" + [ngClass]="{ 'button--disabled': segment.type === SegmentType.GLOBAL_EXCLUDE || segmentUsed }" + [disabled]="segment.type === SegmentStatus.GLOBAL_EXCLUDE || segmentUsed" > {{ 'global.delete.text' | translate }} From be1eb4c60785c5d4a6f97430ef2ae54afdc83362 Mon Sep 17 00:00:00 2001 From: danoswaltCL <97542869+danoswaltCL@users.noreply.github.com> Date: Tue, 27 Feb 2024 18:05:22 -0500 Subject: [PATCH 3/4] remove unused import --- .../segments/pages/view-segment/view-segment.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.ts b/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.ts index 2c78fa52e1..0c523b3380 100644 --- a/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.ts +++ b/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.ts @@ -3,7 +3,7 @@ import { UserPermission } from '../../../../../core/auth/store/auth.models'; import { Subscription } from 'rxjs'; import { MatDialog } from '@angular/material/dialog'; import { AuthService } from '../../../../../core/auth/auth.service'; -import { filter, withLatestFrom } from 'rxjs/operators'; +import { filter } from 'rxjs/operators'; import { SegmentsService } from '../../../../../core/segments/segments.service'; import { NewSegmentComponent } from '../../components/modal/new-segment/new-segment.component'; import * as clonedeep from 'lodash.clonedeep'; From 8a834cec9ae5910632569ccc1d1081e4b55a6f1e Mon Sep 17 00:00:00 2001 From: danoswaltCL <97542869+danoswaltCL@users.noreply.github.com> Date: Wed, 28 Feb 2024 11:35:21 -0500 Subject: [PATCH 4/4] permissions should still be a part of the condition in html --- .../segments/pages/view-segment/view-segment.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.html b/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.html index 310d219548..4e068d075f 100644 --- a/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.html +++ b/frontend/projects/upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.html @@ -29,8 +29,8 @@ mat-flat-button class="ft-14-600 button" (click)="deleteSegment()" - [ngClass]="{ 'button--disabled': segment.type === SegmentType.GLOBAL_EXCLUDE || segmentUsed }" - [disabled]="segment.type === SegmentStatus.GLOBAL_EXCLUDE || segmentUsed" + [ngClass]="{ 'button--disabled': segment.type === SegmentType.GLOBAL_EXCLUDE || segmentUsed || !permissions?.segments.delete }" + [disabled]="segment.type === SegmentStatus.GLOBAL_EXCLUDE || segmentUsed || !permissions?.segments.delete" > {{ 'global.delete.text' | translate }}