Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Navigate to aws status dash from integrations list #49847

Merged
merged 1 commit into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions web/packages/teleport/src/Integrations/IntegrationList.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/**
* Teleport
* Copyright (C) 2023 Gravitational, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

import { fireEvent, render, screen, userEvent } from 'design/utils/testing';

import { Router } from 'react-router';

import { createMemoryHistory } from 'history';

import { IntegrationList } from 'teleport/Integrations/IntegrationList';
import {
IntegrationKind,
IntegrationStatusCode,
} from 'teleport/services/integrations';

test('integration list shows edit and view action menu for aws-oidc, row click navigates', async () => {
const history = createMemoryHistory();
history.push = jest.fn();

render(
<Router history={history}>
<IntegrationList
list={[
{
resourceType: 'integration',
name: 'aws-integration',
kind: IntegrationKind.AwsOidc,
statusCode: IntegrationStatusCode.Running,
spec: { roleArn: '', issuerS3Prefix: '', issuerS3Bucket: '' },
},
]}
/>
</Router>
);

fireEvent.click(screen.getByRole('button', { name: 'Options' }));
expect(screen.getByText('View Status')).toBeInTheDocument();
expect(screen.getByText('View Status')).toHaveAttribute(
'href',
'/web/integrations/status/aws-oidc/aws-integration'
);
expect(screen.getByText('Edit...')).toBeInTheDocument();
expect(screen.getByText('Delete...')).toBeInTheDocument();

await userEvent.click(screen.getAllByRole('row')[1]);
expect(history.push).toHaveBeenCalledWith(
'/web/integrations/status/aws-oidc/aws-integration'
);
});
29 changes: 20 additions & 9 deletions web/packages/teleport/src/Integrations/IntegrationList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export function IntegrationList(props: Props<IntegrationLike>) {
const history = useHistory();

function handleRowClick(row: IntegrationLike) {
if (row.kind !== 'okta') return;
if (row.kind !== 'okta' && row.kind !== IntegrationKind.AwsOidc) return;
history.push(cfg.getIntegrationStatusRoute(row.kind, row.name));
}

Expand Down Expand Up @@ -154,15 +154,26 @@ export function IntegrationList(props: Props<IntegrationLike>) {
return (
<Cell align="right">
<MenuButton>
{/* Currently, only AWSOIDC supports editing. */}
{/* Currently, only AWS OIDC supports editing & status dash */}
{item.kind === IntegrationKind.AwsOidc && (
<MenuItem
onClick={() =>
props.integrationOps.onEditIntegration(item)
}
>
Edit...
</MenuItem>
<>
<MenuItem
as={InternalRouteLink}
to={cfg.getIntegrationStatusRoute(
item.kind,
item.name
)}
>
View Status
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"View Status" seems weird to me. there is a status column right next to it, isn't that viewing the status? If this takes you to the dashboard, would it be better for something like "Go to Dashboard" or "View Dashboard"?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

@michellescripts michellescripts Dec 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screenshot 2024-12-12 at 10 50 09 AM

Ok keeping "View Status" for now, as this should match the okta UX. I have a note to return to this language at the end and see if it makes sense for the integrations.

What I was missing is that in matching the Okta UX this row should navigate on click. Re-requesting reviews with update 069179c.

</MenuItem>
<MenuItem
onClick={() =>
props.integrationOps.onEditIntegration(item)
}
>
Edit...
</MenuItem>
</>
)}
<MenuItem
onClick={() =>
Expand Down
14 changes: 8 additions & 6 deletions web/packages/teleport/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ import generateResourcePath from './generateResourcePath';

import { defaultEntitlements } from './entitlement';

import {
AwsOidcPolicyPreset,
IntegrationKind,
PluginKind,
Regions,
} from './services/integrations';

import type {
Auth2faType,
AuthProvider,
Expand All @@ -35,11 +42,6 @@ import type {
import type { SortType } from 'teleport/services/agents';
import type { RecordingType } from 'teleport/services/recordings';
import type { WebauthnAssertionResponse } from './services/mfa';
import type {
PluginKind,
Regions,
AwsOidcPolicyPreset,
} from './services/integrations';
import type { ParticipantMode } from 'teleport/services/session';
import type { YamlSupportedResourceKind } from './services/yaml/types';
import type { KubeResourceKind } from './services/kube/types';
Expand Down Expand Up @@ -534,7 +536,7 @@ const cfg = {
return generatePath(cfg.routes.integrationEnroll, { type });
},

getIntegrationStatusRoute(type: PluginKind, name: string) {
getIntegrationStatusRoute(type: PluginKind | IntegrationKind, name: string) {
return generatePath(cfg.routes.integrationStatus, { type, name });
},

Expand Down
Loading