From 57e604794c8a5246db425c3cb1bbcfb955d539eb Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Tue, 21 Jan 2025 11:24:36 +0100 Subject: [PATCH] fix(ui): conditional capture metadata --- frontend/app/mstore/types/FeatureFlag.ts | 5 +++-- frontend/app/mstore/types/filterItem.ts | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/frontend/app/mstore/types/FeatureFlag.ts b/frontend/app/mstore/types/FeatureFlag.ts index 7e4d9c327..de6b59310 100644 --- a/frontend/app/mstore/types/FeatureFlag.ts +++ b/frontend/app/mstore/types/FeatureFlag.ts @@ -9,10 +9,11 @@ export class Conditions { constructor(data?: Record, isConditional?: boolean, isMobile?: boolean) { makeAutoObservable(this); + console.log('data', data) this.name = data?.name; if (data && (data.rolloutPercentage || data.captureRate)) { this.rolloutPercentage = data.rolloutPercentage ?? data.captureRate; - this.filter = new Filter(isConditional, isMobile).fromJson(data); + this.filter = new Filter([], isConditional, isMobile).fromJson(data); } } @@ -213,4 +214,4 @@ export default class FeatureFlag { this.isActive = isEnabled; this.setHasChanged(true) } -} \ No newline at end of file +} diff --git a/frontend/app/mstore/types/filterItem.ts b/frontend/app/mstore/types/filterItem.ts index 8809aa16c..6082aae4b 100644 --- a/frontend/app/mstore/types/filterItem.ts +++ b/frontend/app/mstore/types/filterItem.ts @@ -85,12 +85,12 @@ export default class FilterItem { if (this.isConditional) { if (this.isMobile) { _filter = - mobileConditionalFiltersMap[json.type] || - mobileConditionalFiltersMap[json.source]; + mobileConditionalFiltersMap[_filter.key] || + mobileConditionalFiltersMap[_filter.source]; } else { _filter = - conditionalFiltersMap[json.type] || - conditionalFiltersMap[json.source]; + conditionalFiltersMap[_filter.key] || + conditionalFiltersMap[_filter.source]; } } if (mainFilterKey) {