-
Notifications
You must be signed in to change notification settings - Fork 163
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use connection type display name if available and type path changes
- Loading branch information
Showing
11 changed files
with
145 additions
and
98 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| import { Connection } from '~/concepts/connectionTypes/types'; | ||
|
|
||
| type MockConnection = { | ||
| name?: string; | ||
| namespace?: string; | ||
| connectionType?: string; | ||
| displayName?: string; | ||
| description?: string; | ||
| data?: { [key: string]: string }; | ||
| }; | ||
|
|
||
| export const mockConnection = ({ | ||
| name = 's3-connection', | ||
| namespace = 'ds-project-1', | ||
| connectionType = 's3', | ||
| displayName, | ||
| description, | ||
| data = {}, | ||
| }: MockConnection): Connection => ({ | ||
| kind: 'Secret', | ||
| apiVersion: 'v1', | ||
| metadata: { | ||
| name, | ||
| namespace, | ||
| labels: { 'opendatahub.io/dashboard': 'true', 'opendatahub.io/managed': 'true' }, | ||
| annotations: { | ||
| 'opendatahub.io/connection-type': connectionType, | ||
| ...(displayName && { 'openshift.io/display-name': displayName }), | ||
| ...(description && { 'openshift.io/description': description }), | ||
| }, | ||
| }, | ||
| data, | ||
| }); |
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
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
77 changes: 45 additions & 32 deletions
77
frontend/src/pages/projects/screens/detail/connections/ConnectionsTableRow.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 |
|---|---|---|
| @@ -1,50 +1,63 @@ | ||
| import * as React from 'react'; | ||
| import { ActionsColumn, Td, Tr } from '@patternfly/react-table'; | ||
| import { Connection, ConnectionTypeConfigMapObj } from '~/concepts/connectionTypes/types'; | ||
| import { TableRowTitleDescription } from '~/components/table'; | ||
| import { Connection } from './types'; | ||
|
|
||
| type ConnectionsTableRowProps = { | ||
| obj: Connection; | ||
| connectionTypes?: ConnectionTypeConfigMapObj[]; | ||
| onEditConnection: (pvc: Connection) => void; | ||
| onDeleteConnection: (dataConnection: Connection) => void; | ||
| }; | ||
|
|
||
| const ConnectionsTableRow: React.FC<ConnectionsTableRowProps> = ({ | ||
| obj, | ||
| connectionTypes, | ||
| onEditConnection, | ||
| onDeleteConnection, | ||
| }) => ( | ||
| <Tr> | ||
| <Td dataLabel="Name"> | ||
| <TableRowTitleDescription | ||
| title={obj.metadata.annotations['openshift.io/display-name']} | ||
| boldTitle={false} | ||
| resource={obj} | ||
| description={obj.metadata.annotations['openshift.io/description']} | ||
| /> | ||
| </Td> | ||
| <Td dataLabel="Type">{obj.metadata.annotations['opendatahub.io/connection-type']}</Td> | ||
| <Td dataLabel="Compatibility">-</Td> | ||
| <Td dataLabel="Connected resources">-</Td> | ||
| <Td isActionCell> | ||
| <ActionsColumn | ||
| items={[ | ||
| { | ||
| title: 'Edit', | ||
| onClick: () => { | ||
| onEditConnection(obj); | ||
| }) => { | ||
| const connectionTypeDisplayName = React.useMemo(() => { | ||
| const matchingType = connectionTypes?.find( | ||
| (type) => type.metadata.name === obj.metadata.annotations['opendatahub.io/connection-type'], | ||
| ); | ||
| return ( | ||
| matchingType?.metadata.annotations?.['openshift.io/display-name'] || | ||
| obj.metadata.annotations['opendatahub.io/connection-type'] | ||
| ); | ||
| }, [obj, connectionTypes]); | ||
|
|
||
| return ( | ||
| <Tr> | ||
| <Td dataLabel="Name"> | ||
| <TableRowTitleDescription | ||
| title={obj.metadata.annotations['openshift.io/display-name'] || obj.metadata.name} | ||
| boldTitle={false} | ||
| resource={obj} | ||
| description={obj.metadata.annotations['openshift.io/description']} | ||
| /> | ||
| </Td> | ||
| <Td dataLabel="Type">{connectionTypeDisplayName}</Td> | ||
| <Td dataLabel="Connected resources">-</Td> | ||
| <Td isActionCell> | ||
| <ActionsColumn | ||
| items={[ | ||
| { | ||
| title: 'Edit', | ||
| onClick: () => { | ||
| onEditConnection(obj); | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| title: 'Delete', | ||
| onClick: () => { | ||
| onDeleteConnection(obj); | ||
| { | ||
| title: 'Delete', | ||
| onClick: () => { | ||
| onDeleteConnection(obj); | ||
| }, | ||
| }, | ||
| }, | ||
| ]} | ||
| /> | ||
| </Td> | ||
| </Tr> | ||
| ); | ||
| ]} | ||
| /> | ||
| </Td> | ||
| </Tr> | ||
| ); | ||
| }; | ||
|
|
||
| export default ConnectionsTableRow; |
45 changes: 25 additions & 20 deletions
45
frontend/src/pages/projects/screens/detail/connections/__tests__/ConnectionsTable.spec.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 |
|---|---|---|
| @@ -1,32 +1,37 @@ | ||
| import React from 'react'; | ||
| import { render, screen } from '@testing-library/react'; | ||
| import ConnectionsTable from '~/pages/projects/screens/detail/connections/ConnectionsTable'; | ||
| import { Connection } from '~/pages/projects/screens/detail/connections/types'; | ||
|
|
||
| const connections: Connection[] = [ | ||
| { | ||
| kind: 'Secret', | ||
| apiVersion: 'v1', | ||
| metadata: { | ||
| name: 'connection1', | ||
| namespace: 'ds-project', | ||
| labels: { 'opendatahub.io/dashboard': 'true', 'opendatahub.io/managed': 'true' }, | ||
| annotations: { | ||
| 'opendatahub.io/connection-type': 's3', | ||
| 'openshift.io/display-name': 'connection1', | ||
| 'openshift.io/description': 'desc1', | ||
| }, | ||
| }, | ||
| data: {}, | ||
| }, | ||
| ]; | ||
| import { mockConnectionTypeConfigMapObj } from '~/__mocks__/mockConnectionType'; | ||
| import { mockConnection } from '~/__mocks__/mockConnection'; | ||
|
|
||
| describe('ConnectionsTable', () => { | ||
| it('should render table', () => { | ||
| render(<ConnectionsTable connections={connections} />); | ||
| render( | ||
| <ConnectionsTable | ||
| connections={[mockConnection({ displayName: 'connection1', description: 'desc1' })]} | ||
| />, | ||
| ); | ||
|
|
||
| expect(screen.getByTestId('connection-table')).toBeTruthy(); | ||
| expect(screen.getByText('connection1')).toBeTruthy(); | ||
| expect(screen.getByText('desc1')).toBeTruthy(); | ||
| expect(screen.getByText('s3')).toBeTruthy(); | ||
| }); | ||
|
|
||
| it('should show display name of connection type if available', () => { | ||
| render( | ||
| <ConnectionsTable | ||
| connections={[mockConnection({ displayName: 'connection1', description: 'desc1' })]} | ||
| connectionTypes={[ | ||
| mockConnectionTypeConfigMapObj({ name: 's3', displayName: 'S3 Buckets' }), | ||
| ]} | ||
| />, | ||
| ); | ||
|
|
||
| expect(screen.getByTestId('connection-table')).toBeTruthy(); | ||
| expect(screen.getByText('connection1')).toBeTruthy(); | ||
| expect(screen.getByText('desc1')).toBeTruthy(); | ||
| expect(screen.queryByText('s3')).toBeFalsy(); | ||
| expect(screen.getByText('S3 Buckets')).toBeTruthy(); | ||
| }); | ||
| }); |
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
21 changes: 0 additions & 21 deletions
21
frontend/src/pages/projects/screens/detail/connections/types.ts
This file was deleted.
Oops, something went wrong.
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