Skip to content

Commit 25cf9b6

Browse files
Samiya CaurDevtools-frontend LUCI CQ
authored andcommitted
Remove check for freestyler for drjones entrypoints
Bug: 374900925 Change-Id: I46c9c0767c57f4f1b53bbcf2acf4ddfd124d904a Fixed: 374900925 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/5953523 Commit-Queue: Samiya Caur <[email protected]> Auto-Submit: Samiya Caur <[email protected]> Reviewed-by: Alex Rudenko <[email protected]>
1 parent 205ebbd commit 25cf9b6

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

front_end/panels/freestyler/freestyler-meta.ts

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,25 @@ async function loadFreestylerModule(): Promise<typeof Freestyler> {
7777
return loadedFreestylerModule;
7878
}
7979

80-
function isFeatureAvailable(config?: Root.Runtime.HostConfig): boolean {
80+
function isFreestylerFeatureAvailable(config?: Root.Runtime.HostConfig): boolean {
8181
return (config?.aidaAvailability?.enabled && config?.devToolsFreestyler?.enabled) === true;
8282
}
8383

8484
function isDrJonesNetworkFeatureAvailable(config?: Root.Runtime.HostConfig): boolean {
85-
return (config?.aidaAvailability?.enabled && config?.devToolsFreestyler?.enabled &&
86-
config?.devToolsExplainThisResourceDogfood?.enabled) === true;
85+
return (config?.aidaAvailability?.enabled && config?.devToolsExplainThisResourceDogfood?.enabled) === true;
8786
}
8887

8988
function isDrJonesPerformanceFeatureAvailable(config?: Root.Runtime.HostConfig): boolean {
90-
return (config?.aidaAvailability?.enabled && config?.devToolsFreestyler?.enabled &&
91-
config?.devToolsAiAssistancePerformanceAgentDogfood?.enabled) === true;
89+
return (config?.aidaAvailability?.enabled && config?.devToolsAiAssistancePerformanceAgentDogfood?.enabled) === true;
9290
}
9391

9492
function isDrJonesFileFeatureAvailable(config?: Root.Runtime.HostConfig): boolean {
95-
return (config?.aidaAvailability?.enabled && config?.devToolsFreestyler?.enabled &&
96-
config?.devToolsAiAssistanceFileAgentDogfood?.enabled) === true;
93+
return (config?.aidaAvailability?.enabled && config?.devToolsAiAssistanceFileAgentDogfood?.enabled) === true;
94+
}
95+
96+
function isAnyFeatureAvailable(config?: Root.Runtime.HostConfig): boolean {
97+
return isFreestylerFeatureAvailable(config) || isDrJonesNetworkFeatureAvailable(config) ||
98+
isDrJonesPerformanceFeatureAvailable(config) || isDrJonesFileFeatureAvailable(config);
9799
}
98100

99101
UI.ViewManager.registerViewExtension({
@@ -105,7 +107,7 @@ UI.ViewManager.registerViewExtension({
105107
isPreviewFeature: true,
106108
persistence: UI.ViewManager.ViewPersistence.CLOSEABLE,
107109
hasToolbar: false,
108-
condition: config => isFeatureAvailable(config) && !isPolicyRestricted(config),
110+
condition: config => isAnyFeatureAvailable(config) && !isPolicyRestricted(config),
109111
async loadView() {
110112
const Freestyler = await loadFreestylerModule();
111113
return Freestyler.FreestylerPanel.instance();
@@ -119,7 +121,7 @@ Common.Settings.registerSettingExtension({
119121
title: i18nLazyString(UIStrings.enableAiAssistance),
120122
defaultValue: false,
121123
reloadRequired: false,
122-
condition: isFeatureAvailable,
124+
condition: isAnyFeatureAvailable,
123125
disabledCondition: config => {
124126
if (isLocaleRestricted()) {
125127
return {disabled: true, reason: i18nString(UIStrings.wrongLocale)};
@@ -147,7 +149,7 @@ UI.ActionRegistration.registerActionExtension({
147149
const Freestyler = await loadFreestylerModule();
148150
return new Freestyler.ActionDelegate();
149151
},
150-
condition: config => isFeatureAvailable(config) && !isPolicyRestricted(config),
152+
condition: config => isFreestylerFeatureAvailable(config) && !isPolicyRestricted(config),
151153
});
152154

153155
UI.ActionRegistration.registerActionExtension({
@@ -161,7 +163,7 @@ UI.ActionRegistration.registerActionExtension({
161163
const Freestyler = await loadFreestylerModule();
162164
return new Freestyler.ActionDelegate();
163165
},
164-
condition: config => isFeatureAvailable(config) && !isPolicyRestricted(config),
166+
condition: config => isFreestylerFeatureAvailable(config) && !isPolicyRestricted(config),
165167
});
166168

167169
UI.ActionRegistration.registerActionExtension({

0 commit comments

Comments
 (0)