Skip to content

Commit b67bfb9

Browse files
Disable Tiers page (opendatahub-io#6555)
1 parent 702b14a commit b67bfb9

10 files changed

Lines changed: 201 additions & 645 deletions

File tree

packages/cypress/cypress/tests/e2e/settings/tiers/testTiersAdminCapabilities.cy.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ import { addUserToProject, deleteOpenShiftProject } from '../../../../utils/oc_c
3535
import { HTPASSWD_CLUSTER_ADMIN_USER, LDAP_CONTRIBUTOR_USER } from '../../../../utils/e2eUsers';
3636
import { MODEL_STATUS_TIMEOUT } from '../../../../support/timeouts';
3737

38-
describe('Verify Tiers Creation and Deploy Model with Tier and Delete Tier', () => {
38+
// Tiers UI disabled - API being removed in next release
39+
describe.skip('Verify Tiers Creation and Deploy Model with Tier and Delete Tier', () => {
3940
let testData: TiersTestData;
4041
let skipTest = false;
4142
let projectName: string;

packages/cypress/cypress/tests/mocked/modelsAsAService/maasTiers.cy.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ import {
3434
TemplateModel,
3535
} from '../../../utils/models';
3636

37-
describe('Tiers Page', () => {
37+
// Tiers UI disabled - API being removed in next release
38+
describe.skip('Tiers Page', () => {
3839
beforeEach(() => {
3940
asProductAdminUser();
4041
cy.interceptOdh(
@@ -312,7 +313,8 @@ describe('Tiers Page', () => {
312313
});
313314
});
314315

315-
describe('MaaS Deployment Wizard', () => {
316+
// Tiers UI disabled - API being removed in next release
317+
describe.skip('MaaS Deployment Wizard', () => {
316318
const initMaaSDeploymentIntercepts = () => {
317319
cy.interceptOdh(
318320
'GET /api/dsc/status',

packages/maas/bff/internal/api/tiers_handlers_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
//go:build disable_tiers
2+
// +build disable_tiers
3+
4+
// Tiers tests disabled - API being removed in next release
5+
// Remove the build constraints above to re-enable these tests
6+
17
package api
28

39
import (
Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,23 @@
11
import * as React from 'react';
2-
import { Route, Routes, useLocation } from 'react-router-dom';
2+
import { Route, Routes } from 'react-router-dom';
33
import NotFound from '@odh-dashboard/internal/pages/NotFound';
4-
import AllTiersPage from '~/app/pages/tiers/AllTiersPage';
5-
import ViewTierPage from '~/app/pages/tiers/ViewTierPage';
6-
import EditTierPage from '~/app/pages/tiers/EditTierPage';
7-
import CreateTierPage from '~/app/pages/tiers/CreateTierPage';
4+
// Tiers UI disabled - API being removed in next release
5+
// import AllTiersPage from '~/app/pages/tiers/AllTiersPage';
6+
// import ViewTierPage from '~/app/pages/tiers/ViewTierPage';
7+
// import EditTierPage from '~/app/pages/tiers/EditTierPage';
8+
// import CreateTierPage from '~/app/pages/tiers/CreateTierPage';
89
import AllApiKeysPage from '~/app/pages/api-keys/AllApiKeysPage';
910

10-
const AppRoutes: React.FC = () => {
11-
const location = useLocation();
12-
const isTokensRoute = location.pathname.startsWith('/maas/tokens');
13-
14-
return (
15-
<Routes>
16-
{isTokensRoute ? (
17-
<>
18-
<Route path="/" element={<AllApiKeysPage />} />
19-
</>
20-
) : (
21-
<>
22-
<Route path="/" element={<AllTiersPage />} />
23-
<Route path="/create" element={<CreateTierPage />} />
24-
<Route path="/view/:tierName" element={<ViewTierPage />} />
25-
<Route path="/edit/:tierName" element={<EditTierPage />} />
26-
</>
27-
)}
28-
<Route path="*" element={<NotFound />} />
29-
</Routes>
30-
);
31-
};
11+
const AppRoutes: React.FC = () => (
12+
<Routes>
13+
<Route path="/" element={<AllApiKeysPage />} />
14+
{/* Tiers UI disabled - API being removed in next release */}
15+
{/* <Route path="/" element={<AllTiersPage />} /> */}
16+
{/* <Route path="/create" element={<CreateTierPage />} /> */}
17+
{/* <Route path="/view/:tierName" element={<ViewTierPage />} /> */}
18+
{/* <Route path="/edit/:tierName" element={<EditTierPage />} /> */}
19+
<Route path="*" element={<NotFound />} />
20+
</Routes>
21+
);
3222

3323
export default AppRoutes;

0 commit comments

Comments
 (0)