Merge branch 'dev' into feature/version-bump-all-packages-script

CarnegieLearningWeb · Oct 13, 2023 · aa6b342 · aa6b342
2 parents dfd14d8 + 832d4b7
commit aa6b342
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/backend/packages/Upgrade/src/api/services/ExperimentAssignmentService.ts b/backend/packages/Upgrade/src/api/services/ExperimentAssignmentService.ts
@@ -615,6 +615,11 @@ export class ExperimentAssignmentService {
 
       filteredExperiments = alreadyAssignedExperiment.flat().concat(filteredExperiments);
 
+      // return if no experiment
+      if (filteredExperiments.length === 0) {
+        return [];
+      }
+
       // assign remaining experiment
       const experimentAssignment = await Promise.all(
         filteredExperiments.map((experiment) => {

diff --git a/...pgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.html b/...pgrade/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 }"
-            [disabled]="permissions && !permissions.segments.delete"
+            [ngClass]="{ 'button--disabled': permissions && !permissions.segments.delete || segmentUsed }"
+            [disabled]="permissions && !permissions.segments.delete || segmentUsed"
           >
             {{ 'global.delete.text' | translate }}
           </button>

diff --git a/.../upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.ts b/.../upgrade/src/app/features/dashboard/segments/pages/view-segment/view-segment.component.ts
@@ -25,6 +25,7 @@ export class ViewSegmentComponent implements OnInit, OnDestroy {
   segment: Segment;
   segmentSub: Subscription;
   members: { type: string; id: string }[] = [];
+  segmentUsed: boolean;
 
   displayedVariationColumns: string[] = ['value', 'name'];
 
@@ -60,6 +61,8 @@ export class ViewSegmentComponent implements OnInit, OnDestroy {
           this.members.push({ type: MemberTypes.SEGMENT, id: subSegment.name });
         });
       });
+
+    this.segmentUsed = this.segment?.status === SEGMENT_STATUS.USED;
   }
 
   openEditSegmentDialog() {