Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions client/src/protoFleet/api/clients.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { FleetManagementService } from "@/protoFleet/api/generated/fleetmanageme
import { FleetNodeAdminService } from "@/protoFleet/api/generated/fleetnodeadmin/v1/fleetnodeadmin_pb";
import { ForemanImportService } from "@/protoFleet/api/generated/foremanimport/v1/foremanimport_pb";
import { InfrastructureService } from "@/protoFleet/api/generated/infrastructure/v1/infrastructure_pb";
import { InstanceUpdateService } from "@/protoFleet/api/generated/instance/v1/updates_pb";
import { MinerCommandService } from "@/protoFleet/api/generated/minercommand/v1/command_pb";
import { NetworkInfoService } from "@/protoFleet/api/generated/networkinfo/v1/networkinfo_pb";
import { OnboardingService } from "@/protoFleet/api/generated/onboarding/v1/onboarding_pb";
Expand Down Expand Up @@ -55,6 +56,7 @@ const alertChannelClient = createClient(AlertChannelService, transport);
const alertRuleClient = createClient(AlertRuleService, transport);
const alertMaintenanceWindowClient = createClient(AlertMaintenanceWindowService, transport);
const alertHistoryClient = createClient(AlertHistoryService, transport);
const instanceUpdateClient = createClient(InstanceUpdateService, transport);

export {
alertChannelClient,
Expand Down Expand Up @@ -82,5 +84,6 @@ export {
siteMapClient,
sitesClient,
telemetryClient,
instanceUpdateClient,
foremanImportClient,
};
12 changes: 12 additions & 0 deletions client/src/protoFleet/config/navItems.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,18 @@ describe("secondaryNavItems", () => {
);
});

it("gates the Updates settings page on instance:update", () => {
expect(secondaryNavItems).toContainEqual(
expect.objectContaining({
path: "/settings/updates",
label: "Updates",
parent: "/settings",
section: "Admin",
requiredPermission: "instance:update",
}),
);
});

it("folds role management into the Team destination", () => {
expect(secondaryNavItems).toContainEqual(
expect.objectContaining({
Expand Down
9 changes: 9 additions & 0 deletions client/src/protoFleet/config/navItems.ts
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,15 @@ export const secondaryNavItems: SecondaryNavItem[] = [
section: "Admin",
requiredPermission: "serverlog:read",
},
{
path: "/settings/updates",
label: "Updates",
parent: "/settings",
section: "Admin",
// The page's backing RPCs (GetUpdateStatus, SetReleaseChannel) are
// server-gated on instance:update, so gate the nav entry to match.
requiredPermission: "instance:update",
},
{
path: "/settings/preferences",
label: "Preferences",
Expand Down
Loading
Loading