diff --git a/apps/console/src/extensions/i18n/models/extensions.ts b/apps/console/src/extensions/i18n/models/extensions.ts index aaddd74433f..74ff6b34257 100755 --- 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 index a0d1ed8e204..de4dae4de29 100755 --- a/apps/console/src/extensions/i18n/resources/en-US/extensions.ts +++ b/apps/console/src/extensions/i18n/resources/en-US/extensions.ts @@ -1983,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 index e9ff266277e..59ecb0a3a69 100644 --- 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 = ( updateActiveTab } = useBrandingPreference(); + const { + data: brandingData + } = useGetBrandingPreferenceResolve(selectedApplication, BrandingPreferenceTypes.APP); + const { data: applicationList, isLoading: isApplicationListFetchRequestLoading, @@ -418,6 +424,18 @@ const BrandingPageLayout: FunctionComponent = ( ) } + { + brandingMode === BrandingModes.APPLICATION && + selectedApplication && + brandingData?.type === BrandingPreferenceTypes.ORG && ( + + { t("extensions:develop.branding.pageHeader.defaultBrandingAppliedMessage") } + + ) + } { !brandingDisabledFeatures?.includes(AI_BRANDING_FEATURE_ID) &&