Commit51cb6b9

committed

fix: prefer to useentitlement overfeatureVisibility

1 parent53ee00f commit51cb6b9Copy full SHA for 51cb6b9

File tree

+10

-8

lines changed

site/src/pages/DeploymentSettingsPage/ObservabilitySettingsPage
- ObservabilitySettingsPage.tsx
- ObservabilitySettingsPageView.tsx

+10

-8

lines changed

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,7 @@ import { ObservabilitySettingsPageView } from "./ObservabilitySettingsPageView";`
`8`	`8`	`constObservabilitySettingsPage:FC=()=>{`
`9`	`9`	`const{ deploymentConfig}=useDeploymentConfig();`
`10`	`10`	`const{ entitlements}=useDashboard();`
`11`		`-const{`
`12`		`-multiple_organizations:hasPremiumLicense,`
`13`		`-aibridge:hasAIBridgeEnabled,`
`14`		`-}=useFeatureVisibility();`
	`11`	`+const{multiple_organizations:hasPremiumLicense}=useFeatureVisibility();`
`15`	`12`
`16`	`13`	`return(`
`17`	`14`	`<>`
`@@ -20,8 +17,8 @@ const ObservabilitySettingsPage: FC = () => {`
`20`	`17`	`<ObservabilitySettingsPageView`
`21`	`18`	`options={deploymentConfig.options}`
`22`	`19`	`featureAuditLogEnabled={entitlements.features.audit_log.enabled}`
	`20`	`+featureAIBridgeEnabled={entitlements.features.aibridge.enabled}`
`23`	`21`	`isPremium={hasPremiumLicense}`
`24`		`-isAIBridgeEnabled={hasAIBridgeEnabled}`
`25`	`22`	`/>`
`26`	`23`	`</>`
`27`	`24`	`);`

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,18 @@ import OptionsTable from "../OptionsTable";`
`26`	`26`	`typeObservabilitySettingsPageViewProps={`
`27`	`27`	`options:SerpentOption[];`
`28`	`28`	`featureAuditLogEnabled:boolean;`
	`29`	`+featureAIBridgeEnabled:boolean;`
`29`	`30`	`isPremium:boolean;`
`30`		`-isAIBridgeEnabled:boolean;`
`31`	`31`	`};`
`32`	`32`
`33`	`33`	`exportconstObservabilitySettingsPageView:FC<`
`34`	`34`	`ObservabilitySettingsPageViewProps`
`35`		`->=({ options, featureAuditLogEnabled, isPremium, isAIBridgeEnabled})=>{`
	`35`	`+>=({`
	`36`	`+options,`
	`37`	`+featureAuditLogEnabled,`
	`38`	`+isPremium,`
	`39`	`+featureAIBridgeEnabled,`
	`40`	`+})=>{`
`36`	`41`	`return(`
`37`	`42`	`<Stackdirection="column"spacing={6}>`
`38`	`43`	`<div>`
`@@ -99,7 +104,7 @@ export const ObservabilitySettingsPageView: FC<`
`99`	`104`	`/>`
`100`	`105`	`</div>`
`101`	`106`
`102`		`-{isAIBridgeEnabled&&(`
	`107`	`+{featureAIBridgeEnabled&&(`
`103`	`108`	`<div>`
`104`	`109`	`<SettingsHeader`
`105`	`110`	`actions={`

Comments

(0)