jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix msaas conditional settings

Browse source
This commit is contained in:
nick-delirium 2024-05-31 13:42:38 +02:00 • committed by rjshrjndrn
parent fcf4ab841d
commit 5c2d33c43d
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frontend/app/components/shared/SessionSettings/components/CaptureRate.tsx
View file

@ -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));

7
frontend/app/mstore/types/filterItem.ts
View file

@ -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];