diff --git a/web/src/components/CreateTestPlugins/Rest/steps/RequestDetails/BodyField/BodyFieldContainer.tsx b/web/src/components/CreateTestPlugins/Rest/steps/RequestDetails/BodyField/BodyFieldContainer.tsx index 066c8c83b7..7adedc0513 100644 --- a/web/src/components/CreateTestPlugins/Rest/steps/RequestDetails/BodyField/BodyFieldContainer.tsx +++ b/web/src/components/CreateTestPlugins/Rest/steps/RequestDetails/BodyField/BodyFieldContainer.tsx @@ -11,14 +11,14 @@ export const BodyFieldContainer = styled.div<{$isDisplaying: boolean}>` border-radius: 2px; font-size: ${({theme}) => theme.size.md}; outline: 1px solid grey; - font-family: SFPro, serif; + font-family: SFPro, Inter, serif; } .cm-line { padding: 0; span { - font-family: SFPro, serif; + font-family: SFPro, Inter, serif; } } } diff --git a/web/src/components/CustomizationWrapper/CustomizationWrapper.tsx b/web/src/components/CustomizationWrapper/CustomizationWrapper.tsx index 4d921cc517..1809013ec6 100644 --- a/web/src/components/CustomizationWrapper/CustomizationWrapper.tsx +++ b/web/src/components/CustomizationWrapper/CustomizationWrapper.tsx @@ -6,10 +6,11 @@ interface IProps { } const getComponent = (id: string, fallback: React.ComponentType) => fallback; +const getFlag = () => true; const getIsAllowed = () => true; const CustomizationWrapper = ({children}: IProps) => { - const customizationProviderValue = useMemo(() => ({getComponent, getIsAllowed}), []); + const customizationProviderValue = useMemo(() => ({getComponent, getFlag, getIsAllowed}), []); return {children}; }; diff --git a/web/src/constants/Theme.constants.ts b/web/src/constants/Theme.constants.ts index ed1f40322c..0d67fc8eaf 100644 --- a/web/src/constants/Theme.constants.ts +++ b/web/src/constants/Theme.constants.ts @@ -29,7 +29,7 @@ export const theme: DefaultTheme = { xxxl: '24px', }, font: { - family: 'SFPro', + family: 'SFPro, Inter', }, notification: { success: { diff --git a/web/src/pages/Settings/Content.tsx b/web/src/pages/Settings/Content.tsx index b36a3b155f..c0dfa184cb 100644 --- a/web/src/pages/Settings/Content.tsx +++ b/web/src/pages/Settings/Content.tsx @@ -7,6 +7,7 @@ import Linter from 'components/Settings/Linter'; import Polling from 'components/Settings/Polling'; import TestRunner from 'components/Settings/TestRunner'; import BetaBadge from 'components/BetaBadge/BetaBadge'; +import {Flag, useCustomization} from 'providers/Customization'; import * as S from './Settings.styled'; const TabsKeys = { @@ -19,6 +20,7 @@ const TabsKeys = { }; const Content = () => { + const {getFlag} = useCustomization(); const [query, setQuery] = useSearchParams(); return ( @@ -38,9 +40,11 @@ const Content = () => { - - - + {getFlag(Flag.IsAnalyticsPageEnabled) && ( + + + + )} diff --git a/web/src/providers/Customization/Customization.provider.tsx b/web/src/providers/Customization/Customization.provider.tsx index 1453e0c0b4..a83cd95f57 100644 --- a/web/src/providers/Customization/Customization.provider.tsx +++ b/web/src/providers/Customization/Customization.provider.tsx @@ -6,13 +6,19 @@ export enum Operation { View = 'view', } +export enum Flag { + IsAnalyticsPageEnabled = 'isAnalyticsPageEnabled', +} + interface IContext { getComponent(name: string, fallback: React.ComponentType): React.ComponentType; + getFlag(flag: Flag): boolean; getIsAllowed(operation: Operation): boolean; } export const Context = createContext({ getComponent: (name, fallback) => fallback, + getFlag: () => true, getIsAllowed: () => true, }); diff --git a/web/src/providers/Customization/index.ts b/web/src/providers/Customization/index.ts index 5e2ae6b66e..268b88ffe9 100644 --- a/web/src/providers/Customization/index.ts +++ b/web/src/providers/Customization/index.ts @@ -1,3 +1,3 @@ // eslint-disable-next-line no-restricted-exports -export {default, useCustomization, Operation} from './Customization.provider'; +export {default, useCustomization, Flag, Operation} from './Customization.provider'; export {default as withCustomization} from './WithCustomization';