Skip to content

[Custom Branding] Adds Custom Branding settings to Global settings#150080

Merged
majagrubic merged 42 commits intoelastic:mainfrom
majagrubic:global-settings-ui-4
Feb 16, 2023
Merged

[Custom Branding] Adds Custom Branding settings to Global settings#150080
majagrubic merged 42 commits intoelastic:mainfrom
majagrubic:global-settings-ui-4

Conversation

@majagrubic
Copy link
Copy Markdown
Contributor

@majagrubic majagrubic commented Feb 1, 2023

Summary

This PR registers custom branding settings from the custom_branding plugin. Once registered, these settings can be viewed under "Global settings".

UI changes:
Screenshot 2023-02-06 at 19 59 19

I also removed the client-side version of the custom_branding plugin, as it's not needed.

With this change, it became easier to test custom branding, so I made a few changes where logo was not showing properly or image size was wrong or test subjects were missing.

I am working with @gchaps on the exact wording, so that might change.

Checklist

Delete any items that are not applicable to this PR.

For maintainers

@KOTungseth KOTungseth added the ui-copy Review of UI copy with docs team is recommended label Feb 1, 2023
@majagrubic majagrubic added v8.8.0 release_note:feature Makes this part of the condensed release notes labels Feb 13, 2023
@majagrubic majagrubic marked this pull request as ready for review February 13, 2023 07:00
@majagrubic majagrubic requested review from a team as code owners February 13, 2023 07:00
@majagrubic
Copy link
Copy Markdown
Contributor Author

@elasticmachine merge upstream

@majagrubic majagrubic added the ci:cloud-deploy Create or update a Cloud deployment label Feb 13, 2023
Copy link
Copy Markdown
Contributor

@azasypkin azasypkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

const settingName = 'xpackCustomBranding:logo';
await PageObjects.settings.setAdvancedSettingsImage(
settingName,
require.resolve('./mcdonalds_logo.png')
Copy link
Copy Markdown
Contributor

@azasypkin azasypkin Feb 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: I'm far from being a legal expert and likely exaggerating, but just curious, is it fine (no DMCA Takedown risk and such) to store copyrighted logo of the 3rd-party in our repository? 🙂

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably come up with a mock logo/name to use in the repo. I see ACME used in mockups regularly, we can come up some creative commons image to use for a logo or something.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++ I'd avoid using anything copyrighted here

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've seen some UIs re: custom branding use this wording:

By uploading a custom company logo, I confirm I have the rights to use this image.

Should we consider using copy like that here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, updated this with acme logo.

) : (
<EuiIcon type="logoElastic" size="xxl" />
);
const logoStyle = customLogo ? { padding: 0 } : {};
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: would you mind adding a clarifying comment in the code why this is needed for custom logos and not default one (for future readers)?

@majagrubic
Copy link
Copy Markdown
Contributor Author

@elasticmachine merge upstream

@kibana-ci
Copy link
Copy Markdown

kibana-ci commented Feb 15, 2023

💚 Build Succeeded

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id before after diff
customBranding 4 - -4

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
security 557.3KB 557.3KB +27.0B

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id before after diff
core 349.9KB 350.0KB +103.0B
customBranding 1.5KB - -1.5KB
total -1.4KB

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@majagrubic majagrubic merged commit a7293f6 into elastic:main Feb 16, 2023
@kibanamachine kibanamachine added the backport:skip This PR does not require backporting label Feb 16, 2023
@majagrubic majagrubic deleted the global-settings-ui-4 branch February 16, 2023 07:13
@petrklapka petrklapka changed the title [Custom Branding] Add custom branding settings to Global settings [Custom Branding] Adds Custom Branding settings to Global settings May 9, 2023
@kibanamachine
Copy link
Copy Markdown
Contributor

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport:skip This PR does not require backporting ci:cloud-deploy Create or update a Cloud deployment release_note:feature Makes this part of the condensed release notes ui-copy Review of UI copy with docs team is recommended v8.8.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.