mirror of
https://github.com/google-gemini/gemini-cli.git
synced 2026-05-12 12:54:07 -07:00
fix(admin): rename advanced features admin setting (#17786)
This commit is contained in:
@@ -2302,18 +2302,18 @@ describe('Settings Loading and Merging', () => {
|
|||||||
expect(loadedSettings.merged.admin?.extensions?.enabled).toBe(false);
|
expect(loadedSettings.merged.admin?.extensions?.enabled).toBe(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should set skills based on advancedFeaturesEnabled', () => {
|
it('should set skills based on unmanagedCapabilitiesEnabled', () => {
|
||||||
const loadedSettings = loadSettings();
|
const loadedSettings = loadSettings();
|
||||||
loadedSettings.setRemoteAdminSettings({
|
loadedSettings.setRemoteAdminSettings({
|
||||||
cliFeatureSetting: {
|
cliFeatureSetting: {
|
||||||
advancedFeaturesEnabled: true,
|
unmanagedCapabilitiesEnabled: true,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
expect(loadedSettings.merged.admin.skills?.enabled).toBe(true);
|
expect(loadedSettings.merged.admin.skills?.enabled).toBe(true);
|
||||||
|
|
||||||
loadedSettings.setRemoteAdminSettings({
|
loadedSettings.setRemoteAdminSettings({
|
||||||
cliFeatureSetting: {
|
cliFeatureSetting: {
|
||||||
advancedFeaturesEnabled: false,
|
unmanagedCapabilitiesEnabled: false,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
expect(loadedSettings.merged.admin.skills?.enabled).toBe(false);
|
expect(loadedSettings.merged.admin.skills?.enabled).toBe(false);
|
||||||
|
|||||||
@@ -361,10 +361,9 @@ export class LoadedSettings {
|
|||||||
admin.extensions = {
|
admin.extensions = {
|
||||||
enabled: cliFeatureSetting?.extensionsSetting?.extensionsEnabled ?? false,
|
enabled: cliFeatureSetting?.extensionsSetting?.extensionsEnabled ?? false,
|
||||||
};
|
};
|
||||||
|
admin.skills = {
|
||||||
if (cliFeatureSetting?.advancedFeaturesEnabled !== undefined) {
|
enabled: cliFeatureSetting?.unmanagedCapabilitiesEnabled ?? false,
|
||||||
admin.skills = { enabled: cliFeatureSetting.advancedFeaturesEnabled };
|
};
|
||||||
}
|
|
||||||
|
|
||||||
this._remoteAdminSettings = { admin };
|
this._remoteAdminSettings = { admin };
|
||||||
this._merged = this.computeMergedSettings();
|
this._merged = this.computeMergedSettings();
|
||||||
|
|||||||
@@ -308,7 +308,7 @@ const ExtensionsSettingSchema = z.object({
|
|||||||
|
|
||||||
const CliFeatureSettingSchema = z.object({
|
const CliFeatureSettingSchema = z.object({
|
||||||
extensionsSetting: ExtensionsSettingSchema.optional(),
|
extensionsSetting: ExtensionsSettingSchema.optional(),
|
||||||
advancedFeaturesEnabled: z.boolean().optional(),
|
unmanagedCapabilitiesEnabled: z.boolean().optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
const McpSettingSchema = z.object({
|
const McpSettingSchema = z.object({
|
||||||
|
|||||||
Reference in New Issue
Block a user