Skip to content

Commit

Permalink
Remove feature flags
Browse files Browse the repository at this point in the history
  • Loading branch information
ammont82 committed Aug 8, 2024
1 parent 6e0a70b commit 1509d6f
Show file tree
Hide file tree
Showing 4 changed files with 9,359 additions and 21 deletions.
82 changes: 67 additions & 15 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"prettier": "prettier --write src"
},
"dependencies": {
"@openshift-assisted/locales": "2.33.2",
"@openshift-assisted/types": "2.33.2",
"@openshift-assisted/ui-lib": "2.33.2",
"@openshift-assisted/locales": "2.34.0",
"@openshift-assisted/types": "2.34.0",
"@openshift-assisted/ui-lib": "2.34.0",
"@redhat-cloud-services/frontend-components": "^4.1.0",
"axios": ">=0.22.0 <1.0.0",
"i18next": "^20.4.0",
Expand Down
10 changes: 7 additions & 3 deletions src/components/RootApp.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React, { useEffect, useState } from 'react';
import { Api, Config, Routes } from '@openshift-assisted/ui-lib/ocm';
import { Api, Config, UILibRoutes as Routes } from '@openshift-assisted/ui-lib/ocm';

Check failure on line 2 in src/components/RootApp.tsx

View workflow job for this annotation

GitHub Actions / lint-and-test

Replace `·Api,·Config,·UILibRoutes·as·Routes·` with `⏎··Api,⏎··Config,⏎··UILibRoutes·as·Routes,⏎`
import { BrowserRouter } from 'react-router-dom';
import { AxiosInstance, AxiosRequestConfig } from 'axios';
import '../i18n';
import useChrome from '@redhat-cloud-services/frontend-components/useChrome';
import { CompatRouter } from 'react-router-dom-v5-compat';

const apiGatewayStage = 'https://api.stage.openshift.com';
const apiGatewayProd = 'https://api.openshift.com';
Expand Down Expand Up @@ -33,7 +34,7 @@ export const buildAuthInterceptor = (
};

function RootApp({
routeBasePath = '/assisted-installer',
routeBasePath = '/assisted-installer-app',
}: {
routeBasePath?: string;
}) {
Expand All @@ -50,9 +51,12 @@ function RootApp({
return (
<React.StrictMode>
<BrowserRouter basename={'/openshift'}>
<Routes />
<CompatRouter>
<Routes allEnabledFeatures={{}}/>

Check failure on line 55 in src/components/RootApp.tsx

View workflow job for this annotation

GitHub Actions / lint-and-test

Insert `·`
</CompatRouter>

Check failure on line 56 in src/components/RootApp.tsx

View workflow job for this annotation

GitHub Actions / lint-and-test

Delete `·····`
</BrowserRouter>
</React.StrictMode>

Check failure on line 58 in src/components/RootApp.tsx

View workflow job for this annotation

GitHub Actions / lint-and-test

Delete `⏎···`

);
}

Expand Down
Loading

0 comments on commit 1509d6f

Please sign in to comment.