Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove new label from users menu option in suborganizations #6426

Merged
merged 3 commits into from
Jun 10, 2024
Merged

Remove new label from users menu option in suborganizations #6426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62fb475
Remove `new` label from users menu option in suborganizations
pavinduLakshan Jun 10, 2024
7b935a5
🦋 Add changeset
pavinduLakshan Jun 10, 2024
0bde816
Fix email discovery label showing condition
pavinduLakshan Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/lucky-pears-sneeze.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@wso2is/admin.core.v1": patch
---

Remove `new` label from users menu option in suborganizations
12 changes: 1 addition & 11 deletions features/admin.core.v1/configs/routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";

/**
Expand Down Expand Up @@ -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[] = [
{
Expand Down Expand Up @@ -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
},
Expand Down
4 changes: 1 addition & 3 deletions features/admin.server-configurations.v1/utils/governance-connector-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,6 @@ export class GovernanceConnectorUtils {
}

public static getPredefinedConnectorCategories(): Array<any> {
const showStatusLabelForNewAuthzRuntimeFeatures: boolean =
store.getState()?.ui?.showStatusLabelForNewAuthzRuntimeFeatures;

return [
{
Expand Down Expand Up @@ -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"
}
],
Expand Down
Loading