Skip to content

Commit

Permalink
Merge pull request #13 from ammont82/remove-feature-flags
Browse files Browse the repository at this point in the history
Remove feature flags and update Assisted UI Lib to 2.34 version
  • Loading branch information
ammont82 authored Aug 8, 2024
2 parents bfe6e88 + ed96de6 commit 9f9f602
Show file tree
Hide file tree
Showing 4 changed files with 9,361 additions and 23 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
14 changes: 9 additions & 5 deletions src/components/RootApp.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import React, { useEffect, useState } from 'react';
import { Api, Config, Routes } from '@openshift-assisted/ui-lib/ocm';
import type { FeatureListType } from '@openshift-assisted/ui-lib/common';
import {
Api,
Config,
UILibRoutes as Routes,
} from '@openshift-assisted/ui-lib/ocm';
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 @@ -34,10 +38,8 @@ export const buildAuthInterceptor = (
};

function RootApp({
allEnabledFeatures,
routeBasePath = '/assisted-installer-app',
}: {
allEnabledFeatures: FeatureListType;
routeBasePath?: string;
}) {
const [hasNotBeenSetted, setHasNotBeenSetted] = useState(true);
Expand All @@ -53,7 +55,9 @@ function RootApp({
return (
<React.StrictMode>
<BrowserRouter basename={'/openshift'}>
<Routes allEnabledFeatures={allEnabledFeatures} />
<CompatRouter>
<Routes allEnabledFeatures={{}} />
</CompatRouter>
</BrowserRouter>
</React.StrictMode>
);
Expand Down
Loading

0 comments on commit 9f9f602

Please sign in to comment.