-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(credentials): nested match expressions table (#495)
* Add nested table * fixup! Add nested table * Start adding support for matching target counts * Use notifications to update counts * Finish using notifications to update count * Start fixing broken notification state updating * Continue troubleshooting * Continue troubleshooting * Fix notification-based state updating * Refactoring. Cleanup target notification handling in the AllTargetsArchivedRecordingsTable as well * fixup! Refactoring. Cleanup target notification handling in the AllTargetsArchivedRecordingsTable as well * Continue refactoring * Fix header check delete * Resolve issue where deleting multiple credentials at once doesn't properly update the view * Start updating tests * Finish updating tests * Refactoring * Start converting from useState to useReducer * Continue converting to useReducer * Finish converting to useReducer * Update tests * Ensure synchronous target notification handling in the AllTargetsArchivedRecordingsTable
- Loading branch information
Hareet Dhillon
authored
Aug 15, 2022
1 parent
756d9ea
commit e871759
Showing
8 changed files
with
800 additions
and
194 deletions.
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 was deleted.
Oops, something went wrong.
150 changes: 150 additions & 0 deletions
150
src/app/SecurityPanel/Credentials/MatchedTargetsTable.tsx
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,150 @@ | ||
| /* | ||
| * Copyright The Cryostat Authors | ||
| * | ||
| * The Universal Permissive License (UPL), Version 1.0 | ||
| * | ||
| * Subject to the condition set forth below, permission is hereby granted to any | ||
| * person obtaining a copy of this software, associated documentation and/or data | ||
| * (collectively the "Software"), free of charge and under any and all copyright | ||
| * rights in the Software, and any and all patent rights owned or freely | ||
| * licensable by each licensor hereunder covering either (i) the unmodified | ||
| * Software as contributed to or provided by such licensor, or (ii) the Larger | ||
| * Works (as defined below), to deal in both | ||
| * | ||
| * (a) the Software, and | ||
| * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if | ||
| * one is included with the Software (each a "Larger Work" to which the Software | ||
| * is contributed by such licensors), | ||
| * | ||
| * without restriction, including without limitation the rights to copy, create | ||
| * derivative works of, display, perform, and distribute the Software and make, | ||
| * use, sell, offer for sale, import, export, have made, and have sold the | ||
| * Software and the Larger Work(s), and to sublicense the foregoing rights on | ||
| * either these or other terms. | ||
| * | ||
| * This license is subject to the following condition: | ||
| * The above copyright notice and either this complete permission notice or at | ||
| * a minimum a reference to the UPL must be included in all copies or | ||
| * substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
| import * as React from 'react'; | ||
| import { ServiceContext } from '@app/Shared/Services/Services'; | ||
| import { useSubscriptions } from '@app/utils/useSubscriptions'; | ||
| import { Target } from '@app/Shared/Services/Target.service'; | ||
| import { EmptyState, EmptyStateIcon, Title } from '@patternfly/react-core'; | ||
| import { LoadingView } from '@app/LoadingView/LoadingView'; | ||
| import { SearchIcon } from '@patternfly/react-icons'; | ||
| import { InnerScrollContainer, TableComposable, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table'; | ||
| import { NotificationCategory } from '@app/Shared/Services/NotificationChannel.service'; | ||
| import { TargetDiscoveryEvent } from '@app/Shared/Services/Targets.service'; | ||
| import _ from 'lodash'; | ||
|
|
||
| export interface MatchedTargetsTableProps { | ||
| id: number, | ||
| matchExpression: string, | ||
| } | ||
|
|
||
| export const MatchedTargetsTable: React.FunctionComponent<MatchedTargetsTableProps> = (props) => { | ||
| const context = React.useContext(ServiceContext); | ||
|
|
||
| const [targets, setTargets] = React.useState([] as Target[]); | ||
| const [isLoading, setIsLoading] = React.useState(false); | ||
| const addSubscription = useSubscriptions(); | ||
|
|
||
| const tableColumns: string[] = [ | ||
| 'Target', | ||
| ]; | ||
|
|
||
| const refreshTargetsList = React.useCallback(() => { | ||
| setIsLoading(true); | ||
| addSubscription( | ||
| context.api.getCredential(props.id) | ||
| .subscribe( | ||
| v => { | ||
| setTargets(v.targets); | ||
| setIsLoading(false); | ||
| } | ||
| ) | ||
| ); | ||
| }, [setIsLoading, addSubscription, context, context.api, setTargets]); | ||
|
|
||
| React.useEffect(() => { | ||
| refreshTargetsList(); | ||
| }, []); | ||
|
|
||
| React.useEffect(() => { | ||
| addSubscription( | ||
| context.notificationChannel.messages(NotificationCategory.TargetJvmDiscovery) | ||
| .subscribe(v => { | ||
| const evt: TargetDiscoveryEvent = v.message.event; | ||
| const target: Target = evt.serviceRef; | ||
| if (evt.kind === 'FOUND') { | ||
| const match: boolean = eval(props.matchExpression); | ||
| if (match) { | ||
| setTargets(old => old.concat(target)); | ||
| } | ||
| } else if (evt.kind === 'LOST') { | ||
| setTargets(old => old.filter(o => !_.isEqual(o, target))); | ||
| } | ||
| }) | ||
| ); | ||
| }, [addSubscription, context, context.notificationChannel, setTargets]); | ||
|
|
||
| const targetRows = React.useMemo(() => { | ||
| return targets.map((target, idx) => { | ||
| return ( | ||
| <Tr key={`target-${idx}`}> | ||
| <Td key={`target-table-row-${idx}_0`}> | ||
| {(target.alias == target.connectUrl) || !target.alias ? | ||
| `${target.connectUrl}` | ||
| : | ||
| `${target.alias} (${target.connectUrl})`} | ||
| </Td> | ||
| </Tr> | ||
| ); | ||
| }); | ||
| }, [targets]); | ||
|
|
||
| let view: JSX.Element; | ||
| if (isLoading) { | ||
| view = (<LoadingView/>); | ||
| } else if (targets.length === 0) { | ||
| view =(<> | ||
| <EmptyState> | ||
| <EmptyStateIcon icon={SearchIcon}/> | ||
| <Title headingLevel="h4" size="lg"> | ||
| No Targets | ||
| </Title> | ||
| </EmptyState> | ||
| </>); | ||
| } else { | ||
| view = (<> | ||
| <InnerScrollContainer style={{height: '300px'}}> | ||
| <TableComposable aria-label="matched-targets-table" isStickyHeader={true} variant={'compact'}> | ||
| <Thead> | ||
| <Tr> | ||
| {tableColumns.map((key) => ( | ||
| <Th key={`table-header-${key}`}>{key}</Th> | ||
| ))} | ||
| </Tr> | ||
| </Thead> | ||
| <Tbody> | ||
| {targetRows} | ||
| </Tbody> | ||
| </TableComposable> | ||
| </InnerScrollContainer> | ||
| </>); | ||
| } | ||
|
|
||
| return (<> | ||
| {view} | ||
| </>); | ||
| }; |
Oops, something went wrong.