Skip to content

Display read-only targets in auto update modal #47527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
spalmesano0 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Display read-only targets in auto update modal #47527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions changes/45408-read-only-target-in-schedule-auto-updates-modal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Added read-only display of software target in the "Schedule auto updates" modal
181 changes: 69 additions & 112 deletions ...ge/SoftwareTitleDetailsPage/EditAutoUpdateConfigModal/EditAutoUpdateConfigModal.tests.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ import {
createMockAppStoreApp,
} from "__mocks__/softwareMock";

import { act, screen, waitFor } from "@testing-library/react";
import { screen, waitFor } from "@testing-library/react";
import { http, HttpResponse } from "msw";
import mockServer from "test/mock-server";
import { createCustomRenderer } from "test/test-utils";
import { ILabelSummary } from "interfaces/label";

import createMockUser from "__mocks__/userMock";

Expand All @@ -21,32 +20,12 @@ const baseUrl = (path: string) => {
return `/api/latest/fleet${path}`;
};

const mockLabels: ILabelSummary[] = [
{
id: 1,
name: "Fun",
description: "Computers that like to have a good time",
label_type: "regular",
},
{
id: 2,
name: "Fresh",
description: "Laptops with dirty mouths",
label_type: "regular",
},
const mockLabels = [
{ id: 1, name: "Fun" },
{ id: 2, name: "Fresh" },
];

const labelSummariesHandler = http.get(baseUrl("/labels/summary"), () => {
return HttpResponse.json({
labels: mockLabels,
});
});

describe("Edit Auto Update Config Modal", () => {
beforeEach(() => {
mockServer.use(labelSummariesHandler);
});

const render = createCustomRenderer({
withBackendMock: true,
context: {
Expand Down Expand Up @@ -161,10 +140,12 @@ describe("Edit Auto Update Config Modal", () => {
await waitFor(() => {
expect(enableAutoUpdatesCheckbox).not.toBeChecked();
// Verify that the maintenance window fields are not shown.
const startTimeField = screen.queryByText("Earliest start time");
const endTimeField = screen.queryByText("Latest start time");
expect(startTimeField).not.toBeInTheDocument();
expect(endTimeField).not.toBeInTheDocument();
expect(
screen.queryByLabelText("Earliest start time")
).not.toBeInTheDocument();
expect(
screen.queryByLabelText("Latest start time")
).not.toBeInTheDocument();
});
});

Expand Down Expand Up @@ -366,8 +347,8 @@ describe("Edit Auto Update Config Modal", () => {
});
});

describe("Target options", () => {
it("Shows 'All hosts' if no labels are configured for the title", async () => {
describe("Target options (read-only)", () => {
it("Shows 'all hosts' text when no labels are configured", async () => {
render(
<EditAutoUpdateConfigModal
softwareTitle={createMockSoftwareTitleDetails()}
Expand All @@ -376,12 +357,15 @@ describe("Edit Auto Update Config Modal", () => {
onExit={jest.fn()}
/>
);
expect(screen.getByLabelText("All hosts")).toBeInTheDocument();
expect(screen.getByLabelText("Custom")).toBeInTheDocument();
expect(screen.getByLabelText("All hosts")).toBeChecked();
expect(screen.getByLabelText("Custom")).not.toBeChecked();
expect(
screen.getByText(/Update settings will apply to/i)
).toBeInTheDocument();
expect(
screen.getByText("all hosts", { exact: false })
).toBeInTheDocument();
});
it("Shows label options if labels are configured for the title", async () => {

it("Shows label names when labels are configured for the title", async () => {
render(
<EditAutoUpdateConfigModal
softwareTitle={createMockSoftwareTitleDetails({
Expand All @@ -396,31 +380,40 @@ describe("Edit Auto Update Config Modal", () => {
onExit={jest.fn()}
/>
);
expect(screen.getByText(mockLabels[1].name)).toBeInTheDocument();
expect(
screen.getByText(/Update settings will only apply to hosts that/i)
).toBeInTheDocument();
});

// Wait until target section has rendered and request has had a chance to resolve
await screen.findByLabelText("Custom");

// Now wait specifically for one label to appear
const freshLabel = await screen.findByRole("checkbox", {
name: mockLabels[1].name,
});
expect(freshLabel).toBeInTheDocument();
expect(freshLabel).toBeChecked();

const funLabel = screen.getByRole("checkbox", {
name: mockLabels[0].name,
});
expect(funLabel).toBeInTheDocument();
expect(funLabel).not.toBeChecked();
it("Shows label names with 'have all' text when labels_include_all is configured", async () => {
render(
<EditAutoUpdateConfigModal
softwareTitle={createMockSoftwareTitleDetails({
app_store_app: createMockAppStoreApp({
labels_include_all: [
{ name: mockLabels[0].name, id: mockLabels[0].id },
],
}),
})}
teamId={1}
refetchSoftwareTitle={jest.fn()}
onExit={jest.fn()}
/>
);
expect(screen.getByText(mockLabels[0].name)).toBeInTheDocument();
expect(
screen.getByText(/have all/i, { exact: false })
).toBeInTheDocument();
});

it("Requires at least one label to be selected if 'Custom' is selected", async () => {
const { user } = render(
it("Shows label names with 'don't have any' text when labels_exclude_any is configured", async () => {
render(
<EditAutoUpdateConfigModal
softwareTitle={createMockSoftwareTitleDetails({
app_store_app: createMockAppStoreApp({
labels_include_any: [
{ name: mockLabels[1].name, id: mockLabels[1].id },
labels_exclude_any: [
{ name: mockLabels[0].name, id: mockLabels[0].id },
],
}),
})}
Expand All @@ -429,20 +422,24 @@ describe("Edit Auto Update Config Modal", () => {
onExit={jest.fn()}
/>
);
// Wait for labels to load
await screen.findByRole("checkbox", { name: mockLabels[1].name });
const customOption = screen.getByLabelText("Custom");
expect(customOption).toBeChecked();
const labelOption = screen.getByRole("checkbox", {
name: mockLabels[1].name,
});
expect(labelOption).toBeChecked();
await user.click(labelOption);
expect(labelOption).not.toBeChecked();
const saveButton = screen.getByRole("button", {
name: "Save",
});
expect(saveButton).toBeDisabled();
expect(screen.getByText(mockLabels[0].name)).toBeInTheDocument();
expect(
screen.getByText(/don't have any/i, { exact: false })
).toBeInTheDocument();
});

it("Shows 'To edit the target' hint in both cases", async () => {
render(
<EditAutoUpdateConfigModal
softwareTitle={createMockSoftwareTitleDetails()}
teamId={1}
refetchSoftwareTitle={jest.fn()}
onExit={jest.fn()}
/>
);
expect(
screen.getByText(/To edit the target, close this modal/i)
).toBeInTheDocument();
});
});

Expand Down Expand Up @@ -498,9 +495,7 @@ describe("Edit Auto Update Config Modal", () => {
const enableAutoUpdatesCheckbox = screen.getByRole("checkbox", {
name: "Enable auto updates",
});
await act(() => {
enableAutoUpdatesCheckbox.click();
});
await user.click(enableAutoUpdatesCheckbox);
await waitFor(() => {
expect(enableAutoUpdatesCheckbox).toBeChecked();
});
Expand All @@ -512,9 +507,7 @@ describe("Edit Auto Update Config Modal", () => {
name: "Save",
});
expect(saveButton).toBeEnabled();
await act(() => {
saveButton.click();
});
await user.click(saveButton);
await waitFor(() => {
expect(requestSpy).toHaveBeenCalledWith({
auto_update_enabled: true,
Expand All @@ -528,7 +521,7 @@ describe("Edit Auto Update Config Modal", () => {
});
});

it("Sends the correct payload when 'All hosts' is selected as the target", async () => {
it("Preserves existing label target in payload when saving", async () => {
const { user } = render(
<EditAutoUpdateConfigModal
softwareTitle={createMockSoftwareTitleDetails({
Expand All @@ -543,47 +536,11 @@ describe("Edit Auto Update Config Modal", () => {
onExit={jest.fn()}
/>
);
const allHostsRadio = screen.getByLabelText("All hosts");
expect(allHostsRadio).toBeInTheDocument();
await user.click(allHostsRadio);
const saveButton = screen.getByRole("button", {
name: "Save",
});
expect(saveButton).toBeEnabled();
await user.click(saveButton);
await waitFor(() => {
expect(requestSpy).toHaveBeenCalledWith({
auto_update_enabled: false,
labels_include_any: [],
labels_exclude_any: [],
labels_include_all: [],
fleet_id: 1,
});
});
});

it("Sends the correct payload when specific labels are selected as the target", async () => {
const { user } = render(
<EditAutoUpdateConfigModal
softwareTitle={createMockSoftwareTitleDetails({
app_store_app: createMockAppStoreApp({
labels_include_any: [
{ name: mockLabels[1].name, id: mockLabels[1].id },
],
}),
})}
teamId={1}
refetchSoftwareTitle={jest.fn()}
onExit={jest.fn()}
/>
);
const saveButton = screen.getByRole("button", {
name: "Save",
});
expect(saveButton).toBeEnabled();
await act(() => {
user.click(saveButton);
});
await waitFor(() => {
expect(requestSpy).toHaveBeenCalledWith({
auto_update_enabled: false,
Expand Down
Loading
Loading