Save logo URL for dark and light backgrounds during setup (#41823)
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #39082 # Checklist for submitter - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files) for more information. ## Testing - [x] Added/updated automated tests - [x] QA'd all new/changed functionality manually https://github.com/user-attachments/assets/51ede24f-3317-455a-8995-fd50e9281a47 --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
co-authored by
Copilot Autofix powered by AI
parent
5c4445e1dc
commit
b0a3c8a90c
@@ -0,0 +1 @@
|
||||
* Fixed a bug where the organization logo URL entered during setup was only saved for dark backgrounds and not for light backgrounds.
|
||||
@@ -1,5 +1,6 @@
|
||||
import { getPastDate, getFutureDate } from "test/test-utils";
|
||||
import {
|
||||
import type { IRegistrationFormData } from "interfaces/registration_form_data";
|
||||
import helpers, {
|
||||
removeOSPrefix,
|
||||
compareVersions,
|
||||
willExpireWithinXDays,
|
||||
@@ -77,4 +78,48 @@ describe("helpers utilities", () => {
|
||||
expect(willExpireWithinXDays(fiftyDaysAgo, 30)).toEqual(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("setupData function", () => {
|
||||
it("sets org_logo_url_light_background to the same value as org_logo_url", () => {
|
||||
const formData: IRegistrationFormData = {
|
||||
email: "admin@example.com",
|
||||
name: "Admin",
|
||||
password: "password123",
|
||||
password_confirmation: "password123",
|
||||
org_name: "Fleet",
|
||||
org_web_url: "",
|
||||
org_logo_url: "https://example.com/logo.png",
|
||||
fleet_web_address: "",
|
||||
server_url: "https://fleet.example.com",
|
||||
};
|
||||
|
||||
const result = helpers.setupData(formData);
|
||||
|
||||
expect(result.org_info.org_logo_url).toEqual(
|
||||
"https://example.com/logo.png"
|
||||
);
|
||||
expect(result.org_info.org_logo_url_light_background).toEqual(
|
||||
"https://example.com/logo.png"
|
||||
);
|
||||
});
|
||||
|
||||
it("sets org_logo_url_light_background to empty string when org_logo_url is not provided", () => {
|
||||
const formData: IRegistrationFormData = {
|
||||
email: "admin@example.com",
|
||||
name: "Admin",
|
||||
password: "password123",
|
||||
password_confirmation: "password123",
|
||||
org_name: "Fleet",
|
||||
org_web_url: "",
|
||||
org_logo_url: "",
|
||||
fleet_web_address: "",
|
||||
server_url: "https://fleet.example.com",
|
||||
};
|
||||
|
||||
const result = helpers.setupData(formData);
|
||||
|
||||
expect(result.org_info.org_logo_url).toEqual("");
|
||||
expect(result.org_info.org_logo_url_light_background).toEqual("");
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -56,6 +56,7 @@ import {
|
||||
isPlatformLabelNameFromAPI,
|
||||
} from "utilities/constants";
|
||||
import { IDropdownOption } from "interfaces/dropdownOption";
|
||||
import type { IRegistrationFormData } from "interfaces/registration_form_data";
|
||||
import CustomLink from "components/CustomLink";
|
||||
|
||||
const ORG_INFO_ATTRS = ["org_name", "org_logo_url"];
|
||||
@@ -517,7 +518,7 @@ export const greyCell = (roleOrTeamText: string): boolean => {
|
||||
);
|
||||
};
|
||||
|
||||
const setupData = (formData: any) => {
|
||||
const setupData = (formData: IRegistrationFormData) => {
|
||||
const orgInfo = pick(formData, ORG_INFO_ATTRS);
|
||||
const adminInfo = pick(formData, ADMIN_ATTRS);
|
||||
|
||||
@@ -525,6 +526,7 @@ const setupData = (formData: any) => {
|
||||
server_url: formData.server_url,
|
||||
org_info: {
|
||||
...orgInfo,
|
||||
org_logo_url_light_background: orgInfo.org_logo_url || "",
|
||||
},
|
||||
admin: {
|
||||
admin: true,
|
||||
|
||||
Reference in New Issue
Block a user