Skip to content

Commit 49771dd

Browse files
authored
Remove Okta monitor beta flag (#7360)
1 parent cc8c5b3 commit 49771dd

File tree

6 files changed

+14
-31
lines changed

6 files changed

+14
-31
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Copy this file and rename it (e.g., pr-number.yaml or feature-name.yaml)
2+
# Fill in the required fields and delete this comment block
3+
4+
type: Changed # One of: Added, Changed, Developer Experience, Deprecated, Docs, Fixed, Removed, Security
5+
description: Removed beta flag for Okta monitor features
6+
pr: 7360 # PR number
7+
labels: [] # Optional: ["high-risk", "db-migration"]

clients/admin-ui/cypress/e2e/config-wizard.cy.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ describe("Config Wizard", () => {
9999
beforeEach(() => {
100100
stubSystemCrud();
101101
stubTaxonomyEntities();
102-
cy.overrideFeatureFlag("oktaMonitor", false);
103102

104103
cy.visit(ADD_SYSTEMS_ROUTE);
105104
// Select Okta to move to form step.

clients/admin-ui/src/features/data-discovery-and-detection/action-center/MonitorList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ import { SearchFormQueryState } from "./MonitorList.const";
2626
const MonitorList = () => {
2727
const toast = useToast();
2828
const {
29-
flags: { webMonitor: webMonitorEnabled, oktaMonitor: oktaMonitorEnabled },
29+
flags: { webMonitor: webMonitorEnabled },
3030
} = useFeatures();
3131
const { paginationProps, pageIndex, pageSize, resetPagination } =
3232
useAntPagination();
3333

3434
const availableMonitorTypes = [
3535
...(webMonitorEnabled ? [MONITOR_TYPES.WEBSITE] : []),
3636
MONITOR_TYPES.DATASTORE,
37-
...(oktaMonitorEnabled ? [MONITOR_TYPES.INFRASTRUCTURE] : []),
37+
MONITOR_TYPES.INFRASTRUCTURE,
3838
] as const;
3939

4040
const currentUser = useAppSelector(selectUser);

clients/admin-ui/src/features/integrations/add-integration/SelectIntegrationType.tsx

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const SelectIntegrationType = ({
3232
const [isFiltering, setIsFiltering] = useState(false);
3333

3434
const {
35-
flags: { oktaMonitor, newIntegrationManagement },
35+
flags: { newIntegrationManagement },
3636
} = useFlags();
3737

3838
// Fetch connection types for SAAS integration generation
@@ -86,10 +86,7 @@ const SelectIntegrationType = ({
8686
const availableCategories = useMemo(() => {
8787
const allCategories: IntegrationCategoryFilter[] = [
8888
"ALL",
89-
...Object.values(ConnectionCategory).filter(
90-
(category) =>
91-
category !== ConnectionCategory.IDENTITY_PROVIDER || oktaMonitor,
92-
),
89+
...Object.values(ConnectionCategory),
9390
];
9491

9592
// If new integration management is disabled, filter out categories that have no integrations
@@ -108,7 +105,7 @@ const SelectIntegrationType = ({
108105
}
109106

110107
return allCategories;
111-
}, [oktaMonitor, newIntegrationManagement, allIntegrationTypes]);
108+
}, [newIntegrationManagement, allIntegrationTypes]);
112109

113110
// Filter integrations based on search and category
114111
const filteredTypes = useMemo(() => {
@@ -127,21 +124,13 @@ const SelectIntegrationType = ({
127124
);
128125
}
129126

130-
// Apply flag-based filtering
131-
filtered = filtered.filter((i) => {
132-
if (!oktaMonitor && i.placeholder.connection_type === "okta") {
133-
return false;
134-
}
135-
return true;
136-
});
137-
138127
// Sort integrations alphabetically by display name
139128
return filtered.sort((a, b) => {
140129
const nameA = a.placeholder.name || "";
141130
const nameB = b.placeholder.name || "";
142131
return nameA.localeCompare(nameB);
143132
});
144-
}, [searchTerm, selectedCategory, oktaMonitor, allIntegrationTypes]);
133+
}, [searchTerm, selectedCategory, allIntegrationTypes]);
145134

146135
const handleCategoryChange = (value: IntegrationCategoryFilter) => {
147136
setIsFiltering(true);

clients/admin-ui/src/features/integrations/useIntegrationFilterTabs.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { useState } from "react";
22

3-
import { useFlags } from "~/features/common/features/features.slice";
43
import { IntegrationTypeInfo } from "~/features/integrations/add-integration/allIntegrationTypes";
54

65
export enum IntegrationFilterTabs {
@@ -15,11 +14,7 @@ export enum IntegrationFilterTabs {
1514
}
1615

1716
const useIntegrationFilterTabs = (integrationTypes?: IntegrationTypeInfo[]) => {
18-
const { flags } = useFlags();
19-
const tabs = Object.values(IntegrationFilterTabs).filter(
20-
(tab) =>
21-
tab !== IntegrationFilterTabs.IDENTITY_PROVIDER || flags.oktaMonitor,
22-
);
17+
const tabs = Object.values(IntegrationFilterTabs);
2318

2419
const [tabIndex, setTabIndex] = useState(0);
2520
const currentTab = tabs[tabIndex];

clients/admin-ui/src/flags.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,6 @@
3535
"test": true,
3636
"production": false
3737
},
38-
"oktaMonitor": {
39-
"label": "Okta monitor",
40-
"description": "Monitor Okta for activity using OAuth2 authentication and Identity Provider Monitor endpoints",
41-
"development": true,
42-
"test": true,
43-
"production": false
44-
},
4538
"downloadAccessRequestResults": {
4639
"label": "Download access request results",
4740
"description": "Download access data from completed requests",

0 commit comments

Comments
 (0)