From 62fb4755650cb44c5868c2797e934665e10dbe79 Mon Sep 17 00:00:00 2001 From: Pavindu Lakshan Date: Mon, 10 Jun 2024 10:17:33 +0530 Subject: [PATCH 1/3] Remove `new` label from users menu option in suborganizations --- features/admin.core.v1/configs/routes.tsx | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/features/admin.core.v1/configs/routes.tsx b/features/admin.core.v1/configs/routes.tsx index 9aee51b216e..5c9a08125ed 100644 --- a/features/admin.core.v1/configs/routes.tsx +++ b/features/admin.core.v1/configs/routes.tsx @@ -33,7 +33,6 @@ import { import { APIResourcesConstants } from "@wso2is/admin.api-resources.v1/constants"; import { commonConfig, identityProviderConfig } from "@wso2is/admin.extensions.v1"; import { FeatureGateConstants } from "@wso2is/admin.extensions.v1/components/feature-gate/constants/feature-gate"; -import FeatureStatusLabel from "@wso2is/admin.extensions.v1/components/feature-gate/models/feature-gate"; import { AppLayout, AuthLayout, DefaultLayout, ErrorLayout } from "@wso2is/admin.layouts.v1"; import { ServerConfigurationsConstants } from "@wso2is/admin.server-configurations.v1"; import { AppView, FullScreenView } from "@wso2is/admin.views.v1"; @@ -44,7 +43,7 @@ import merge from "lodash-es/merge"; import values from "lodash-es/values"; import React, { FunctionComponent, lazy } from "react"; import { getSidePanelIcons } from "./ui"; -import { AppConstants, OrganizationType } from "../constants"; +import { AppConstants } from "../constants"; import { store } from "../store"; /** @@ -73,7 +72,6 @@ export const getAppViewRoutes = (): RouteInterface[] => { = store.getState()?.config?.ui?.features?.applicationRoles; const showStatusLabelForNewAuthzRuntimeFeatures: boolean = window["AppUtils"]?.getConfig()?.ui?.showStatusLabelForNewAuthzRuntimeFeatures; - const orgType: OrganizationType = store.getState().organization.organizationType; const defaultRoutes: RouteInterface[] = [ { @@ -277,14 +275,6 @@ export const getAppViewRoutes = (): RouteInterface[] => { ], component: lazy(() => import("@wso2is/admin.users.v1/pages/users")), exact: true, - featureStatus: - showStatusLabelForNewAuthzRuntimeFeatures && orgType === OrganizationType.SUBORGANIZATION - ? "NEW" - : "", - featureStatusLabel: - showStatusLabelForNewAuthzRuntimeFeatures && orgType === OrganizationType.SUBORGANIZATION - ? FeatureStatusLabel.NEW - : null, icon: { icon: getSidePanelIcons().users }, From 7b935a53556b71947711536e95f548b28aa69eaf Mon Sep 17 00:00:00 2001 From: Pavindu Lakshan Date: Mon, 10 Jun 2024 10:18:05 +0530 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A6=8B=20Add=20changeset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/lucky-pears-sneeze.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/lucky-pears-sneeze.md diff --git a/.changeset/lucky-pears-sneeze.md b/.changeset/lucky-pears-sneeze.md new file mode 100644 index 00000000000..4fffb16b7b9 --- /dev/null +++ b/.changeset/lucky-pears-sneeze.md @@ -0,0 +1,5 @@ +--- +"@wso2is/admin.core.v1": patch +--- + +Remove `new` label from users menu option in suborganizations From 0bde816894ec7261a01feb7f750e6987df9bd815 Mon Sep 17 00:00:00 2001 From: Pavindu Lakshan Date: Mon, 10 Jun 2024 10:20:00 +0530 Subject: [PATCH 3/3] Fix email discovery label showing condition --- .../utils/governance-connector-utils.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/features/admin.server-configurations.v1/utils/governance-connector-utils.ts b/features/admin.server-configurations.v1/utils/governance-connector-utils.ts index d0e2a8d27a6..f9871f75461 100644 --- a/features/admin.server-configurations.v1/utils/governance-connector-utils.ts +++ b/features/admin.server-configurations.v1/utils/governance-connector-utils.ts @@ -176,8 +176,6 @@ export class GovernanceConnectorUtils { } public static getPredefinedConnectorCategories(): Array { - const showStatusLabelForNewAuthzRuntimeFeatures: boolean = - store.getState()?.ui?.showStatusLabelForNewAuthzRuntimeFeatures; return [ { @@ -379,7 +377,7 @@ export class GovernanceConnectorUtils { header: I18n.instance.t("pages:emailDomainDiscovery.title"), id: ServerConfigurationsConstants.EMAIL_DOMAIN_DISCOVERY, route: AppConstants.getPaths().get("ORGANIZATION_DISCOVERY_DOMAINS"), - status: showStatusLabelForNewAuthzRuntimeFeatures ? FeatureStatusLabel.NEW : null, + status: FeatureStatusLabel.NEW, testId: "email-domain-discovery-card" } ],