Skip to content

Commit

Permalink
Code review comments - convert satellite token to module
Browse files Browse the repository at this point in the history
  • Loading branch information
florkbr committed Sep 9, 2024
1 parent 80a7b5c commit 8f7bab3
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 7 deletions.
1 change: 1 addition & 0 deletions config/webpack.plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const plugins = (dev = false, beta = false, restricted = false) => {
'./DownloadButton': resolve(__dirname, '../src/pdf/DownloadButton.tsx'),
'./LandingNavFavorites': resolve(__dirname, '../src/components/FavoriteServices/LandingNavFavorites.tsx'),
'./DashboardFavorites': resolve(__dirname, '../src/components/FavoriteServices/DashboardFavorites.tsx'),
'./SatelliteToken': resolve(__dirname, '../src/layouts/SatelliteToken.tsx'),
},
shared: [
{ react: { singleton: true, eager: true, requiredVersion: deps.react } },
Expand Down
5 changes: 5 additions & 0 deletions frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ objects:
manifestLocation: "/apps/chrome/js/fed-mods.json"
config:
ssoUrl: ${SSO_URL}
modules:
- id: 'satellite-token'
module: './SatelliteToken'
routes:
- pathname: /insights/satellite
frontend:
paths:
- /
Expand Down
10 changes: 5 additions & 5 deletions src/components/Header/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { Fragment, Suspense, useContext, useState } from 'react';
import ReactDOM from 'react-dom';
import { useFlag } from '@unleash/proxy-client-react';
import Tools from './Tools';
import UnAuthtedHeader from './UnAuthtedHeader';
import { MastheadBrand, MastheadContent, MastheadMain } from '@patternfly/react-core/dist/dynamic/components/Masthead';
Expand All @@ -15,7 +16,6 @@ import { DeepRequired } from 'utility-types';

import './Header.scss';
import { activationRequestURLs } from '../../utils/consts';
import { ITLess } from '../../utils/common';
import SearchInput from '../Search/SearchInput';
import AllServicesDropdown from '../AllServicesDropdown/AllServicesDropdown';
import Breadcrumbs, { Breadcrumbsprops } from '../Breadcrumbs/Breadcrumbs';
Expand All @@ -40,14 +40,14 @@ export const Header = ({ breadcrumbsProps }: { breadcrumbsProps?: Breadcrumbspro
const { user } = useContext(ChromeAuthContext) as DeepRequired<ChromeAuthContextValue>;
const search = new URLSearchParams(window.location.search).keys().next().value;
const isActivationPath = activationRequestURLs.includes(search);
const isITLessEnv = ITLess();
const { pathname } = useLocation();
const noBreadcrumb = !['/', '/allservices', '/favoritedservices'].includes(pathname);
const { md, lg } = useWindowWidth();
const [searchOpen, setSearchOpen] = useState(false);
const hideAllServices = (isOpen: boolean) => {
setSearchOpen(isOpen);
};
const isITLess = useFlag('platform.chrome.itless');

return (
<Fragment>
Expand All @@ -64,18 +64,18 @@ export const Header = ({ breadcrumbsProps }: { breadcrumbsProps?: Breadcrumbspro
</Toolbar>
</MastheadMain>
<MastheadContent className="pf-v5-u-mx-md pf-v5-u-mx-0-on-2xl">
{user?.identity?.org_id && !isITLessEnv && ReactDOM.createPortal(<FeedbackRoute />, document.body)}
{user?.identity?.org_id && !isITLess && ReactDOM.createPortal(<FeedbackRoute />, document.body)}
{user && isActivationPath && <Activation user={user} request={search} />}
<Toolbar isFullHeight>
<ToolbarContent>
<ToolbarGroup variant="filter-group">
{user && (
<ToolbarItem>
{!(!md && searchOpen) && <AllServicesDropdown />}
{isITLessEnv && user?.identity?.user?.is_org_admin && <SatelliteLink />}
{isITLess && user?.identity?.user?.is_org_admin && <SatelliteLink />}
</ToolbarItem>
)}
{user && !isITLessEnv && (
{user && !isITLess && (
<ToolbarItem className="pf-v5-m-hidden pf-v5-m-visible-on-xl">
<ContextSwitcher user={user} className="data-hj-suppress sentry-mask" />
</ToolbarItem>
Expand Down
2 changes: 0 additions & 2 deletions src/components/RootApp/ScalprumRoot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import chromeHistory from '../../utils/chromeHistory';
import DefaultLayout from '../../layouts/DefaultLayout';
import AllServices from '../../layouts/AllServices';
import FavoritedServices from '../../layouts/FavoritedServices';
import SatelliteToken from '../../layouts/SatelliteToken';
import historyListener from '../../utils/historyListener';
import SegmentContext from '../../analytics/SegmentContext';
import LoadingFallback from '../../utils/loading-fallback';
Expand Down Expand Up @@ -259,7 +258,6 @@ const ScalprumRoot = memo(
}
/>
)}
{ITLess() && <Route path="/insights/satellite" element={<SatelliteToken />} />}
<Route path="/security" element={<DefaultLayout {...props} />} />
<Route path="*" element={<DefaultLayout Sidebar={Navigation} {...props} />} />
</Routes>
Expand Down
7 changes: 7 additions & 0 deletions src/layouts/SatelliteToken.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { useContext, useEffect, useState } from 'react';
import axios from 'axios';
import { useFlag } from '@unleash/proxy-client-react';
import { Header } from '../components/Header/Header';
import { Button } from '@patternfly/react-core/dist/dynamic/components/Button';
import { Card, CardBody, CardTitle } from '@patternfly/react-core/dist/dynamic/components/Card';
Expand All @@ -11,11 +12,17 @@ import SatelliteTable from '../components/Satellite/SatelliteTable';
import IPWhitelistTable from '../components/Satellite/IPWhitelistTable';
import { getEnv } from '../utils/common';
import ChromeAuthContext from '../auth/ChromeAuthContext';
import NotFoundRoute from '../components/NotFoundRoute';

const SatelliteToken: React.FC = () => {
const [token, setToken] = useState('');
const [error, setError] = useState(null);
const { user } = useContext(ChromeAuthContext);
const isITLess = useFlag('platform.chrome.itless');

if (!isITLess) {
return <NotFoundRoute />;
}

const generateToken = () => {
axios
Expand Down

0 comments on commit 8f7bab3

Please sign in to comment.