From 5c2d33c43d52a2fe27ed781c9a8134108a0cad84 Mon Sep 17 00:00:00 2001 From: nick-delirium Date: Fri, 31 May 2024 13:42:38 +0200 Subject: [PATCH] fix msaas conditional settings --- .../shared/SessionSettings/components/CaptureRate.tsx | 1 + frontend/app/mstore/types/filterItem.ts | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/app/components/shared/SessionSettings/components/CaptureRate.tsx b/frontend/app/components/shared/SessionSettings/components/CaptureRate.tsx index f96bbdcf4..a7f8b3363 100644 --- a/frontend/app/components/shared/SessionSettings/components/CaptureRate.tsx +++ b/frontend/app/components/shared/SessionSettings/components/CaptureRate.tsx @@ -149,6 +149,7 @@ export default connect((state: any) => ({ state.getIn(['user', 'account', 'admin']) || state.getIn(['user', 'account', 'superAdmin']), isEnterprise: !document.location.href.includes('app.openreplay.com') && ( state.getIn(['user', 'account', 'edition']) === 'ee' || + state.getIn(['user', 'account', 'edition']) === 'msaas' || state.getIn(['user', 'authDetails', 'edition']) === 'ee' ) }))(observer(CaptureRate)); diff --git a/frontend/app/mstore/types/filterItem.ts b/frontend/app/mstore/types/filterItem.ts index 34c2560cb..e60e2e692 100644 --- a/frontend/app/mstore/types/filterItem.ts +++ b/frontend/app/mstore/types/filterItem.ts @@ -58,10 +58,13 @@ export default class FilterItem { } fromJson(json: any, mainFilterKey = '') { - const isMetadata = json.type === FilterKey.METADATA; + const isMetadata = json.type === FilterKey.METADATA && json.source !== 'featureFlag'; let _filter: any = (isMetadata ? filtersMap['_' + json.source] : filtersMap[json.type]) || {}; if (this.isConditional) { - _filter = conditionalFiltersMap[json.type] || conditionalFiltersMap[json.source]; + _filter = isMetadata + ? conditionalFiltersMap['_' + json.source] + : conditionalFiltersMap[json.type] + || conditionalFiltersMap[json.source]; } if (mainFilterKey) { const mainFilter = filtersMap[mainFilterKey];