Merge pull request #7043 from DonOmalVindula/master

Remove revert branding option when branding is not configured
wso2 · Oct 25, 2024 · c756b12 · c756b12
2 parents 60bc510 + 9ab3d23
commit c756b12
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 38 deletions.
diff --git a/.changeset/silent-donkeys-sniff.md b/.changeset/silent-donkeys-sniff.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/admin.branding.v1": patch
+---
+
+Remove revert branding option when branding is not configured
diff --git a/features/admin.branding.v1/components/branding-core.tsx b/features/admin.branding.v1/components/branding-core.tsx
@@ -791,44 +791,49 @@ const BrandingCore: FunctionComponent<BrandingCoreInterface> = (
             <Show
                 when={ featureConfig?.branding?.scopes?.delete }
             >
-                <DangerZoneGroup sectionHeader={ t("extensions:develop.branding.dangerZoneGroup.header") }>
-                    { brandingPreference.configs?.isBrandingEnabled && (
-                        <DangerZone
-                            actionTitle={
-                                t("extensions:develop.branding.dangerZoneGroup.unpublishBranding.actionTitle")
-                            }
-                            header={
-                                t("extensions:develop.branding.dangerZoneGroup.unpublishBranding.header")
-                            }
-                            subheader={
-                                t("extensions:develop.branding.dangerZoneGroup.unpublishBranding.subheader",
-                                    { productName: productName })
-                            }
-                            onActionClick={ (): void => handleBrandingUnpublish() }
-                            data-componentid={ `${ componentId }-danger-zone-unpublish` }
-                            isButtonDisabled={ brandingMode === BrandingModes.APPLICATION && !selectedApplication }
-                            buttonDisableHint={
-                                t("extensions:develop.branding.dangerZoneGroup.unpublishBranding.disableHint") }
-                        />
-                    ) }
-                    <DangerZone
-                        actionTitle={
-                            t("extensions:develop.branding.dangerZoneGroup.revertBranding.actionTitle")
-                        }
-                        header={
-                            t("extensions:develop.branding.dangerZoneGroup.revertBranding.header")
-                        }
-                        subheader={
-                            t("extensions:develop.branding.dangerZoneGroup.revertBranding.subheader",
-                                { productName: productName })
-                        }
-                        onActionClick={ (): void => setShowRevertConfirmationModal(true) }
-                        data-componentid={ `${ componentId }-danger-zone` }
-                        isButtonDisabled={ brandingMode === BrandingModes.APPLICATION && !selectedApplication }
-                        buttonDisableHint={
-                            t("extensions:develop.branding.dangerZoneGroup.revertBranding.disableHint") }
-                    />
-                </DangerZoneGroup>
+                {
+                    isBrandingConfigured && (
+                        <DangerZoneGroup sectionHeader={ t("extensions:develop.branding.dangerZoneGroup.header") }>
+                            { brandingPreference.configs?.isBrandingEnabled && (
+                                <DangerZone
+                                    actionTitle={
+                                        t("extensions:develop.branding.dangerZoneGroup.unpublishBranding.actionTitle")
+                                    }
+                                    header={
+                                        t("extensions:develop.branding.dangerZoneGroup.unpublishBranding.header")
+                                    }
+                                    subheader={
+                                        t("extensions:develop.branding.dangerZoneGroup.unpublishBranding.subheader",
+                                            { productName: productName })
+                                    }
+                                    onActionClick={ (): void => handleBrandingUnpublish() }
+                                    data-componentid={ `${ componentId }-danger-zone-unpublish` }
+                                    isButtonDisabled={
+                                        brandingMode === BrandingModes.APPLICATION && !selectedApplication }
+                                    buttonDisableHint={
+                                        t("extensions:develop.branding.dangerZoneGroup.unpublishBranding.disableHint") }
+                                />
+                            ) }
+                            <DangerZone
+                                actionTitle={
+                                    t("extensions:develop.branding.dangerZoneGroup.revertBranding.actionTitle")
+                                }
+                                header={
+                                    t("extensions:develop.branding.dangerZoneGroup.revertBranding.header")
+                                }
+                                subheader={
+                                    t("extensions:develop.branding.dangerZoneGroup.revertBranding.subheader",
+                                        { productName: productName })
+                                }
+                                onActionClick={ (): void => setShowRevertConfirmationModal(true) }
+                                data-componentid={ `${ componentId }-danger-zone` }
+                                isButtonDisabled={ brandingMode === BrandingModes.APPLICATION && !selectedApplication }
+                                buttonDisableHint={
+                                    t("extensions:develop.branding.dangerZoneGroup.revertBranding.disableHint") }
+                            />
+                        </DangerZoneGroup>
+                    )
+                }
             </Show>
             <ConfirmationModal
                 onClose={ (): void => setShowRevertConfirmationModal(false) }