Add ip address whitelist UI to manage satellites page for itless #2836
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,259 @@ | ||
| import React, { useEffect, useState } from 'react'; | ||
| import { debounce } from 'lodash'; | ||
| import { | ||
| ActionGroup, | ||
| Bullseye, | ||
| Button, | ||
| EmptyState, | ||
| EmptyStateBody, | ||
| EmptyStateHeader, | ||
| EmptyStateVariant, | ||
| Form, | ||
| FormGroup, | ||
| FormHelperText, | ||
| HelperText, | ||
| HelperTextItem, | ||
| Modal, | ||
| ModalVariant, | ||
| Text, | ||
| TextContent, | ||
| TextInput, | ||
| ValidatedOptions, | ||
| } from '@patternfly/react-core'; | ||
| import { InnerScrollContainer, OuterScrollContainer, Table, TableText, TableVariant, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table'; | ||
| import { ExclamationCircleIcon } from '@patternfly/react-icons'; | ||
| import axios from 'axios'; | ||
| import SkeletonTable from '@redhat-cloud-services/frontend-components/SkeletonTable'; | ||
|
|
||
| type IPBlock = { | ||
| ip_block: string; | ||
| org_id: string; | ||
| created_at: string; | ||
| }; | ||
|
|
||
| const IPWhitelistTable: React.FC = () => { | ||
| const [allAddresses, setAllAddresses] = useState<IPBlock[]>([]); | ||
| const [loaded, setLoaded] = useState(false); | ||
| const [actionPending, setActionPending] = useState(false); | ||
| const [inputAddresses, setInputAddresses] = useState(''); | ||
| const [inputAddressesValidated, setInputAddressesesValidated] = useState(false); | ||
| const [removeAddresses, setRemoveAddresses] = useState(''); | ||
| const [isIPModalOpen, setIsIPModalOpen] = useState(false); | ||
| const [isIPRemoveModalOpen, setIsIPRemoveModalOpen] = useState(false); | ||
|
|
||
| const getIPAddresses = () => { | ||
| return axios.get('/api/mbop/v1/allowlist'); | ||
| }; | ||
|
|
||
| const removeIPAddresses = (ipBlock: string) => { | ||
| return axios.delete(`/api/mbop/v1/allowlist?block=${ipBlock}`); | ||
| }; | ||
|
|
||
| const addIPAddresses = (ipBlock: string) => { | ||
| return axios.post('/api/mbop/v1/allowlist', { ip_block: ipBlock }); | ||
| }; | ||
|
|
||
| useEffect(() => { | ||
| if (!loaded && !actionPending) { | ||
| getIPAddresses() | ||
| .then((res) => { | ||
| setAllAddresses(res.data); | ||
| setLoaded(true); | ||
| }) | ||
| .catch((err) => console.error(err)); | ||
| } | ||
| }, [loaded, actionPending]); | ||
|
|
||
| const onChangedAddresses = (value: string) => { | ||
| setInputAddresses(value); | ||
| setInputAddressesesValidated(validateIPAddress(value)); | ||
| }; | ||
|
|
||
| const onSubmitAddresses = () => { | ||
| setActionPending(true); | ||
| addIPAddresses(inputAddresses) | ||
| .then(() => { | ||
| setInputAddresses(''); | ||
| setIsIPModalOpen(false); | ||
| setLoaded(false); | ||
| return getIPAddresses(); | ||
| }) | ||
| .then((res) => { | ||
| setAllAddresses(res.data); | ||
| setLoaded(true); | ||
| }) | ||
| .catch((err) => console.error(err)) | ||
| .finally(() => setActionPending(false)); | ||
| }; | ||
|
|
||
| const onRemoveAddresses = () => { | ||
| setActionPending(true); | ||
| removeIPAddresses(removeAddresses) | ||
| .then(() => { | ||
| setRemoveAddresses(''); | ||
| setIsIPRemoveModalOpen(false); | ||
| setLoaded(false); | ||
| return getIPAddresses(); | ||
| }) | ||
| .then((res) => { | ||
| setAllAddresses(res.data); | ||
| setLoaded(true); | ||
| }) | ||
| .catch((err) => console.error(err)) | ||
| .finally(() => setActionPending(false)); | ||
| }; | ||
|
|
||
| const onChangedAddressesDebounced = debounce(onChangedAddresses, 500); | ||
|
|
||
| const validateIPAddress = (address: string) => { | ||
| return /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\/([1-9]|[12][0-9]|3[0-2]))?$/.test( | ||
| address | ||
| ); | ||
| }; | ||
|
|
||
| const validationError = inputAddresses.length > 0 && !inputAddressesValidated; | ||
|
|
||
| const addIPModal = ( | ||
| <Modal | ||
| isOpen={isIPModalOpen} | ||
| onClose={() => { | ||
| setInputAddresses(''); | ||
| setIsIPModalOpen(false); | ||
| }} | ||
| title={'Add IP Addresses to Allow List'} | ||
| variant={ModalVariant.medium} | ||
| > | ||
| <Form onSubmit={(event: React.FormEvent<HTMLFormElement>) => event.preventDefault()}> | ||
| <FormGroup> | ||
| <TextContent> | ||
| <Text>Before connecting to your satellite servers, Red Hat needs to add your IP address or range of IP addresses to an allow-list.</Text> | ||
| </TextContent> | ||
| <TextInput | ||
| validated={validationError ? ValidatedOptions.error : ValidatedOptions.default} | ||
| placeholder="127.0.0.1/32" | ||
| onChange={(_event, value) => onChangedAddressesDebounced(value)} | ||
| ></TextInput> | ||
| {validationError && ( | ||
| <FormHelperText> | ||
| <HelperText> | ||
| <HelperTextItem icon={<ExclamationCircleIcon />} variant={ValidatedOptions.error}> | ||
| Enter a valid IP address or CIDR notation IP range | ||
| </HelperTextItem> | ||
| </HelperText> | ||
| </FormHelperText> | ||
| )} | ||
| </FormGroup> | ||
| <ActionGroup> | ||
| <Button isDisabled={inputAddresses.length <= 0 || validationError || actionPending} onClick={onSubmitAddresses}> | ||
| Submit | ||
| </Button> | ||
| </ActionGroup> | ||
| </Form> | ||
| </Modal> | ||
| ); | ||
|
|
||
| const removeIPModal = ( | ||
| <Modal | ||
| isOpen={isIPRemoveModalOpen} | ||
| onClose={() => { | ||
| setRemoveAddresses(''); | ||
| setIsIPRemoveModalOpen(false); | ||
| }} | ||
| title={'Remove IP Addresses from Allow List'} | ||
| variant={ModalVariant.medium} | ||
| > | ||
| <Form onSubmit={(event: React.FormEvent<HTMLFormElement>) => event.preventDefault()}> | ||
| <FormGroup> | ||
| <TextContent> | ||
| <Text>The following IP addresses will be removed from the allow list</Text> | ||
| </TextContent> | ||
| <TextInput isDisabled value={removeAddresses}></TextInput> | ||
| </FormGroup> | ||
| <ActionGroup> | ||
| <Button onClick={onRemoveAddresses} isDisabled={actionPending} variant="danger"> | ||
| Remove | ||
| </Button> | ||
| </ActionGroup> | ||
| </Form> | ||
| </Modal> | ||
| ); | ||
|
|
||
| const columnNames = { | ||
| ip_block: 'IP Block', | ||
| org_id: 'Org ID', | ||
| created_at: 'Created At', | ||
| remove: '', | ||
| }; | ||
|
|
||
| const skeletonTable = <SkeletonTable variant={TableVariant.compact} rows={9} columns={Object.values(columnNames)} />; | ||
|
|
||
| const emptyTable = ( | ||
| <Tr style={{ border: 'none' }}> | ||
| <Td colSpan={8}> | ||
| <Bullseye> | ||
| <EmptyState variant={EmptyStateVariant.sm}> | ||
| <EmptyStateHeader titleText="No IP Addresses Allowed" headingLevel="h2" /> | ||
| <EmptyStateBody> | ||
| Before connecting to your satellite servers, Red Hat needs to add your IP address or range of IP addresses to an allow-list. | ||
| </EmptyStateBody> | ||
| </EmptyState> | ||
| </Bullseye> | ||
| </Td> | ||
| </Tr> | ||
| ); | ||
|
|
||
| const ipTable = ( | ||
| <OuterScrollContainer style={{ maxHeight: '25rem' }}> | ||
| <InnerScrollContainer> | ||
| <Table aria-label="IP Address Allow List" variant={TableVariant.compact} isStickyHeader> | ||
| <Thead> | ||
| <Tr> | ||
| <Th>{columnNames.ip_block}</Th> | ||
| <Th>{columnNames.org_id}</Th> | ||
| <Th>{columnNames.created_at}</Th> | ||
| <Th>{columnNames.remove}</Th> | ||
| </Tr> | ||
| </Thead> | ||
| <Tbody> | ||
| {allAddresses.length <= 0 && emptyTable} | ||
| {allAddresses.map((ipBlock) => ( | ||
| <Tr key={ipBlock.ip_block}> | ||
| <Td dataLabel={columnNames.ip_block}>{ipBlock.ip_block}</Td> | ||
| <Td dataLabel={columnNames.org_id}>{ipBlock.org_id}</Td> | ||
| <Td dataLabel={columnNames.created_at}>{ipBlock.created_at}</Td> | ||
| <Td dataLabel={columnNames.remove} modifier="fitContent"> | ||
| <TableText> | ||
| <Button | ||
| variant="secondary" | ||
| onClick={() => { | ||
| setRemoveAddresses(ipBlock.ip_block); | ||
| setIsIPRemoveModalOpen(true); | ||
| }} | ||
| > | ||
| Remove | ||
| </Button> | ||
| </TableText> | ||
| </Td> | ||
| </Tr> | ||
| ))} | ||
| </Tbody> | ||
| </Table> | ||
| </InnerScrollContainer> | ||
| </OuterScrollContainer> | ||
| ); | ||
|
|
||
| return ( | ||
| <> | ||
| {addIPModal} | ||
| {removeIPModal} | ||
| <> | ||
| {loaded ? ipTable : skeletonTable} | ||
| <div> | ||
| <Button onClick={() => setIsIPModalOpen(true)}>Add IP Addresses</Button> | ||
| </div> | ||
| </> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export default IPWhitelistTable; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,26 @@ | ||
| import React, { useContext, useEffect, useState } from 'react'; | ||
| import axios from 'axios'; | ||
| import { useFlag } from '@unleash/proxy-client-react'; | ||
| import { Button } from '@patternfly/react-core/dist/dynamic/components/Button'; | ||
| import { Card, CardBody, CardTitle } from '@patternfly/react-core/dist/dynamic/components/Card'; | ||
| import { ClipboardCopy } from '@patternfly/react-core/dist/dynamic/components/ClipboardCopy'; | ||
| import { List, ListComponent, ListItem, OrderType } from '@patternfly/react-core/dist/dynamic/components/List'; | ||
| import { Page, PageSection } from '@patternfly/react-core/dist/dynamic/components/Page'; | ||
| 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 | ||
|
|
@@ -38,11 +46,6 @@ const SatelliteToken: React.FC = () => { | |
| <Page | ||
| className="chr-c-all-services" | ||
| onPageResize={null} // required to disable PF resize observer that causes re-rendring issue | ||
|
There was a problem hiding this comment. @Hyperkid123 since we are now exposing this as a module from chrome at There was a problem hiding this comment. Does this page require some unique layout? There was a problem hiding this comment. No - the content is just a bit odd/out of the ordinary as it is 3 utilities. |
||
| > | ||
| <PageSection padding={{ default: 'noPadding', md: 'padding', lg: 'padding' }}> | ||
| <Card> | ||
|
|
@@ -87,6 +90,16 @@ const SatelliteToken: React.FC = () => { | |
| </CardBody> | ||
| </Card> | ||
| </PageSection> | ||
| {user.identity.user?.is_org_admin ? ( | ||
| <PageSection> | ||
| <Card> | ||
| <CardTitle>IP Address Allow List</CardTitle> | ||
| <CardBody> | ||
| <IPWhitelistTable /> | ||
| </CardBody> | ||
| </Card> | ||
| </PageSection> | ||
| ) : null} | ||
| </Page> | ||
| </div> | ||
| ); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed the react router route in ScalprumRoot in favor of the exposed module approach.