Merge pull request #6976 from savindi7/improve-branding-revert-message

Improve the revert Branding confirmation and default app-wise branding messages
wso2 · Oct 13, 2024 · 04dbfce · 04dbfce
2 parents 446a407 + bbe9190
commit 04dbfce
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/.changeset/lovely-weeks-wait.md b/.changeset/lovely-weeks-wait.md
@@ -0,0 +1,6 @@
+---
+"@wso2is/admin.branding.v1": patch
+"@wso2is/console": patch
+---
+
+Improve the revert Branding confirmation and default app-wise branding messages.
diff --git a/apps/console/src/extensions/i18n/models/extensions.ts b/apps/console/src/extensions/i18n/models/extensions.ts
@@ -1759,6 +1759,7 @@ export interface Extensions {
                 applicationBrandingtitle: string;
                 applicationBrandingDescription: string;
                 applicationListWarning: string;
+                defaultBrandingAppliedMessage: string;
                 backButtonText: string;
                 description: string;
                 organization: string;

diff --git a/apps/console/src/extensions/i18n/resources/en-US/extensions.ts b/apps/console/src/extensions/i18n/resources/en-US/extensions.ts
@@ -1353,9 +1353,7 @@ export const extensions: Extensions = {
                     assertionHint: "Please confirm your action.",
                     content: "This action is irreversible and will permanently revert your branding preferences.",
                     header: "Are you sure?",
-                    message:
-                        "If you revert the branding preferences, your users will start to see " +
-                        "{{ productName }} branding on the login flows. Please proceed with caution."
+                    message: "Reverting your branding preferences will apply the default branding from the next available level (such as your organization or parent organization)."
                 },
                 unpublishBranding: {
                     assertionHint: "Please confirm your action.",
@@ -1985,7 +1983,8 @@ export const extensions: Extensions = {
                 application: "Application",
                 applicationBrandingtitle: "Application Branding",
                 applicationBrandingDescription: "Customize consumer-facing user interfaces of applications.",
-                applicationListWarning: "Please select an application from the list above to customize the branding preferences.",
+                applicationListWarning: "Select an application from the list above to customize the branding preferences.",
+                defaultBrandingAppliedMessage: "Organization branding has been applied to this application because no app-specific branding is set.",
                 backButtonText: "Go back to Application Settings",
                 description: "Customize consumer-facing user interfaces of applications in your organization.",
                 organization: "Organization",

diff --git a/features/admin.branding.v1/components/branding-page-layout.tsx b/features/admin.branding.v1/components/branding-page-layout.tsx
@@ -29,6 +29,8 @@ import useAIBrandingPreference from "@wso2is/admin.branding.ai.v1/hooks/use-ai-b
 import { AppConstants, AppState, history } from "@wso2is/admin.core.v1";
 import { FeatureStatusLabel } from "@wso2is/admin.feature-gate.v1/models/feature-status";
 import { useGetCurrentOrganizationType } from "@wso2is/admin.organizations.v1/hooks/use-get-organization-type";
+import useGetBrandingPreferenceResolve from "@wso2is/common.branding.v1/api/use-get-branding-preference-resolve";
+import { BrandingPreferenceTypes } from "@wso2is/common.branding.v1/models";
 import { AlertLevels, IdentifiableComponentInterface } from "@wso2is/core/models";
 import { addAlert } from "@wso2is/core/store";
 import { DocumentationLink, PageLayout, useDocumentation } from "@wso2is/react-components";
@@ -77,6 +79,10 @@ const BrandingPageLayout: FunctionComponent<BrandingPageLayoutInterface> = (
         updateActiveTab
     } = useBrandingPreference();
 
+    const {
+        data: brandingData
+    } = useGetBrandingPreferenceResolve(selectedApplication, BrandingPreferenceTypes.APP);
+
     const {
         data: applicationList,
         isLoading: isApplicationListFetchRequestLoading,
@@ -418,6 +424,18 @@ const BrandingPageLayout: FunctionComponent<BrandingPageLayoutInterface> = (
                             </Alert>
                         )
                     }
+                    {
+                        brandingMode === BrandingModes.APPLICATION &&
+                        selectedApplication &&
+                        brandingData?.type === BrandingPreferenceTypes.ORG && (
+                            <Alert
+                                severity="info"
+                                sx={ { marginBottom: 2 } }
+                            >
+                                { t("extensions:develop.branding.pageHeader.defaultBrandingAppliedMessage") }
+                            </Alert>
+                        )
+                    }
                 </motion.div>
                 {
                     !brandingDisabledFeatures?.includes(AI_BRANDING_FEATURE_ID) &&