Merge branch 'dev' into featureflag/import-validation-api

CarnegieLearningWeb · Aug 21, 2024 · 41f4031 · 41f4031
2 parents 3828069 + 1af167c
commit 41f4031
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/frontend/projects/upgrade/src/app/core/feature-flags/store/feature-flags.reducer.ts b/frontend/projects/upgrade/src/app/core/feature-flags/store/feature-flags.reducer.ts
@@ -155,9 +155,10 @@ const reducer = createReducer(
     const existingFlag = state.entities[featureFlag?.id];
 
     if (existingFlag) {
-      const updatedInclusions = existingFlag.featureFlagSegmentInclusion.map((inclusion) =>
-        inclusion.segment.id === listResponse.segment.id ? listResponse : inclusion
-      );
+      const updatedInclusions =
+        existingFlag.featureFlagSegmentInclusion?.map((inclusion) =>
+          inclusion.segment.id === listResponse.segment.id ? listResponse : inclusion
+        ) ?? [];
 
       return adapter.updateOne(
         {
@@ -179,14 +180,13 @@ const reducer = createReducer(
   on(FeatureFlagsActions.actionDeleteFeatureFlagInclusionListSuccess, (state, { segmentId }) => {
     const updatedState = { ...state, isLoadingUpsertPrivateSegmentList: false };
     const flagId = Object.keys(state.entities).find((id) =>
-      state.entities[id].featureFlagSegmentInclusion.some((inclusion) => inclusion.segment.id === segmentId)
+      state.entities[id].featureFlagSegmentInclusion?.some((inclusion) => inclusion.segment.id === segmentId)
     );
 
     if (flagId) {
       const flag = state.entities[flagId];
-      const updatedInclusions = flag.featureFlagSegmentInclusion.filter(
-        (inclusion) => inclusion.segment.id !== segmentId
-      );
+      const updatedInclusions =
+        flag.featureFlagSegmentInclusion?.filter((inclusion) => inclusion.segment.id !== segmentId) ?? [];
 
       return adapter.updateOne(
         {
@@ -231,9 +231,10 @@ const reducer = createReducer(
     const existingFlag = state.entities[featureFlag?.id];
 
     if (existingFlag) {
-      const updatedExclusions = existingFlag.featureFlagSegmentExclusion.map((exclusion) =>
-        exclusion.segment.id === listResponse.segment.id ? listResponse : exclusion
-      );
+      const updatedExclusions =
+        existingFlag.featureFlagSegmentExclusion?.map((exclusion) =>
+          exclusion.segment.id === listResponse.segment.id ? listResponse : exclusion
+        ) ?? [];
 
       return adapter.updateOne(
         {
@@ -255,14 +256,13 @@ const reducer = createReducer(
   on(FeatureFlagsActions.actionDeleteFeatureFlagExclusionListSuccess, (state, { segmentId }) => {
     const updatedState = { ...state, isLoadingUpsertPrivateSegmentList: false };
     const flagId = Object.keys(state.entities).find((id) =>
-      state.entities[id].featureFlagSegmentExclusion.some((exclusion) => exclusion.segment.id === segmentId)
+      state.entities[id].featureFlagSegmentExclusion?.some((exclusion) => exclusion.segment.id === segmentId)
     );
 
     if (flagId) {
       const flag = state.entities[flagId];
-      const updatedExclusions = flag.featureFlagSegmentExclusion.filter(
-        (exclusion) => exclusion.segment.id !== segmentId
-      );
+      const updatedExclusions =
+        flag.featureFlagSegmentExclusion?.filter((exclusion) => exclusion.segment.id !== segmentId) ?? [];
 
       return adapter.updateOne(
         {

diff --git a/...ents/common-section-card-action-buttons/common-section-card-action-buttons.component.html b/...ents/common-section-card-action-buttons/common-section-card-action-buttons.component.html
@@ -30,14 +30,15 @@
       <mat-icon>more_vert</mat-icon>
     </button>
     <mat-menu #menu="matMenu">
-      <button
-        *ngFor="let item of menuButtonItems"
-        mat-menu-item
-        [disabled]="item.disabled"
-        (click)="onMenuButtonItemClick(item.name)"
-      >
-        <span class="ft-14-400">{{ item.name }}</span>
-      </button>
+      <ng-container *ngFor="let item of menuButtonItems">
+        <button
+          *ngIf="!item.disabled"
+          mat-menu-item
+          (click)="onMenuButtonItemClick(item.name)"
+        >
+          <span class="ft-14-400">{{ item.name }}</span>
+        </button>
+      </ng-container>
     </mat-menu>
 
     <button