Skip to content
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.

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

Include the page layout in the branding page #5871

Merged
merged 4 commits into from
Apr 1, 2024

Conversation

chamathns
Copy link
Contributor

@chamathns chamathns commented Apr 1, 2024

Purpose

Improvement for #5868

Related Issues

Related PRs

  • Related PR #1 or (None)

Checklist

  • e2e cypress tests locally verified.
  • Manual test round performed and verified.
  • UX/UI review done on the final implementation.
  • Documentation provided. (Add links if there are any)
  • Unit tests provided. (Add links if there are any)
  • Integration tests provided. (Add links if there are any)

Security checks

<BrandingCore />
<BrandingPreferenceProvider>
<PageLayout
pageTitle="Branding"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
pageTitle="Branding"
pageTitle={ t("extensions:develop.branding.pageHeader.title") }

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Addressed with 3ee321b

Comment on lines 606 to 610
content={
(
<>
{ t("extensions:develop.branding.publishToggle.hint") }
</>
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
content={
(
<>
{ t("extensions:develop.branding.publishToggle.hint") }
</>
content={ t("extensions:develop.branding.publishToggle.hint") }

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added with 3ee321b

Comment on lines 618 to 624
showSubOrgBrandingUpdateAlert
? (
<Alert onClose={ () => setShowSubOrgBrandingUpdateAlert(false) } severity="warning">
{ t("extensions:develop.branding.notifications.update.successWaitingAlert.description",
{ tenant: tenantDomain }) }
</Alert>
) : null
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
showSubOrgBrandingUpdateAlert
? (
<Alert onClose={ () => setShowSubOrgBrandingUpdateAlert(false) } severity="warning">
{ t("extensions:develop.branding.notifications.update.successWaitingAlert.description",
{ tenant: tenantDomain }) }
</Alert>
) : null
showSubOrgBrandingUpdateAlert
&& (
<Alert onClose={ () => setShowSubOrgBrandingUpdateAlert(false) } severity="warning">
{ t("extensions:develop.branding.notifications.update.successWaitingAlert.description",
{ tenant: tenantDomain }) }
</Alert>
)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added with 3ee321b

Comment on lines 627 to 633
showSubOrgBrandingDeleteAlert
? (
<Alert onClose={ () => setShowSubOrgBrandingDeleteAlert(false) } severity="warning">
{ t("extensions:develop.branding.notifications.delete.successWaitingAlert.description",
{ tenant: tenantDomain }) }
</Alert>
) : null
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
showSubOrgBrandingDeleteAlert
? (
<Alert onClose={ () => setShowSubOrgBrandingDeleteAlert(false) } severity="warning">
{ t("extensions:develop.branding.notifications.delete.successWaitingAlert.description",
{ tenant: tenantDomain }) }
</Alert>
) : null
showSubOrgBrandingDeleteAlert
&& (
<Alert onClose={ () => setShowSubOrgBrandingDeleteAlert(false) } severity="warning">
{ t("extensions:develop.branding.notifications.delete.successWaitingAlert.description",
{ tenant: tenantDomain }) }
</Alert>
)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added with 3ee321b

brionmario
brionmario previously approved these changes Apr 1, 2024
@wso2-jenkins-bot
Copy link
Contributor

🦋 Changeset detected

The changes in this PR will be included in the next version bump.

Not sure what this means? Click here to learn what changesets are.

@chamathns chamathns merged commit cf1e622 into wso2:master Apr 1, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants