Merge pull request #6849 from DonOmalVindula/fix/26140

Add beta label for application branding
wso2 · Sep 2, 2024 · 3cd66be · 3cd66be
2 parents f5b6df6 + bc295dd
commit 3cd66be
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/.changeset/tender-otters-type.md b/.changeset/tender-otters-type.md
@@ -0,0 +1,6 @@
+---
+"@wso2is/admin.applications.v1": patch
+"@wso2is/admin.branding.v1": patch
+---
+
+Add beta label for application branding
diff --git a/features/admin.applications.v1/components/forms/general-details-form.tsx b/features/admin.applications.v1/components/forms/general-details-form.tsx
@@ -16,12 +16,14 @@
  * under the License.
  */
 
+import Chip from "@oxygen-ui/react/Chip";
 import Link from "@oxygen-ui/react/Link";
 import { PaletteIcon } from "@oxygen-ui/react-icons";
 import { ApplicationTabComponentsFilter } from
     "@wso2is/admin.application-templates.v1/components/application-tab-components-filter";
 import { AppConstants, AppState, UIConfigInterface, history } from "@wso2is/admin.core.v1";
 import { ApplicationTabIDs, applicationConfig } from "@wso2is/admin.extensions.v1";
+import { FeatureStatusLabel } from "@wso2is/admin.feature-gate.v1/models/feature-status";
 import { OrganizationType } from "@wso2is/admin.organizations.v1/constants";
 import { TestableComponentInterface } from "@wso2is/core/models";
 import { URLUtils } from "@wso2is/core/utils";
@@ -586,6 +588,11 @@ export const GeneralDetailsForm: FunctionComponent<GeneralDetailsFormPopsInterfa
                                     <>
                                         <Heading as="h4">
                                             { t("applications:forms.generalDetails.sections.branding.title") }
+                                            <Chip
+                                                size="small"
+                                                label={ t(FeatureStatusLabel.BETA) }
+                                                className="oxygen-chip-beta mb-1 ml-2"
+                                            />
                                         </Heading>
                                         <PaletteIcon fill="#ff7300" /> &nbsp;
                                         <Link

diff --git a/features/admin.branding.v1/components/branding-page-layout.tsx b/features/admin.branding.v1/components/branding-page-layout.tsx
@@ -20,12 +20,14 @@ import ToggleButton from "@mui/material/ToggleButton";
 import ToggleButtonGroup from "@mui/material/ToggleButtonGroup";
 import Alert from "@oxygen-ui/react/Alert";
 import Autocomplete, { AutocompleteRenderInputParams } from "@oxygen-ui/react/Autocomplete";
+import Chip from "@oxygen-ui/react/Chip";
 import Paper from "@oxygen-ui/react/Paper";
 import TextField from "@oxygen-ui/react/TextField";
 import { BuildingIcon, TilesIcon } from "@oxygen-ui/react-icons";
 import BrandingAIBanner from "@wso2is/admin.branding.ai.v1/components/branding-ai-banner";
 import useAIBrandingPreference from "@wso2is/admin.branding.ai.v1/hooks/use-ai-branding-preference";
 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 { AlertLevels, IdentifiableComponentInterface } from "@wso2is/core/models";
 import { addAlert } from "@wso2is/core/store";
@@ -233,7 +235,18 @@ const BrandingPageLayout: FunctionComponent<BrandingPageLayoutInterface> = (
                                     type: "spring"
                                 } }
                                 variants={ animationVariants }>
-                                <h1>{ resolveBrandingTitle() }</h1>
+                                <h1>
+                                    { resolveBrandingTitle() }
+                                    {
+                                        brandingMode === BrandingModes.APPLICATION && (
+                                            <Chip
+                                                size="small"
+                                                label={ t(FeatureStatusLabel.BETA) }
+                                                className="oxygen-chip-beta mb-1 ml-2"
+                                            />
+                                        )
+                                    }
+                                </h1>
                             </motion.div>
                         </AnimatePresence>
                     </div>