-
Notifications
You must be signed in to change notification settings - Fork 364
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
upcoming: [M3-7697] - Add scrolling for S3 hostnames in the Access Ke…
…ys modal (#10218) * Upcoming: [M3-7697] - Add scrolling for S3 hostnames in the Access Keys modal * Added changeset: Add scrolling for S3 hostnames in the Access Keys modal. * fix - border color according to the theme. * PR - feedback: @abailly-akamai - Add box shadow for host names list * unit test for HostNamesList
- Loading branch information
Showing
5 changed files
with
139 additions
and
26 deletions.
There are no files selected for viewing
5 changes: 5 additions & 0 deletions
5
packages/manager/.changeset/pr-10218-upcoming-features-1708616641655.md
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,5 @@ | ||
| --- | ||
| "@linode/manager": Upcoming Features | ||
| --- | ||
|
|
||
| Add scrolling for S3 hostnames in the Access Keys modal. ([#10218](https://github.com/linode/manager/pull/10218)) |
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
40 changes: 40 additions & 0 deletions
40
packages/manager/src/features/ObjectStorage/AccessKeyLanding/HostNamesList.test.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,40 @@ | ||
| import { screen } from '@testing-library/react'; | ||
| import React from 'react'; | ||
|
|
||
| import { regionFactory } from 'src/factories'; | ||
| import { makeResourcePage } from 'src/mocks/serverHandlers'; | ||
| import { rest, server } from 'src/mocks/testServer'; | ||
| import { renderWithTheme } from 'src/utilities/testHelpers'; | ||
|
|
||
| import { HostNamesList } from './HostNamesList'; | ||
|
|
||
| const mockObjectStorageKey = { | ||
| access_key: 'test', | ||
| bucket_access: null, | ||
| id: 0, | ||
| label: 'test-label', | ||
| limited: false, | ||
| regions: [{ id: 'us-central', s3_endpoint: 'http://example.com' }], | ||
| secret_key: 'testKey', | ||
| }; | ||
|
|
||
| describe('HostNamesList', () => { | ||
| it('renders without crashing', async () => { | ||
| server.use( | ||
| rest.get('*/regions', (req, res, ctx) => { | ||
| const regions = regionFactory.buildList(1, { | ||
| id: 'us-central', | ||
| label: 'Fake Region, NC', | ||
| }); | ||
| return res(ctx.json(makeResourcePage(regions))); | ||
| }) | ||
| ); | ||
|
|
||
| renderWithTheme(<HostNamesList objectStorageKey={mockObjectStorageKey} />); | ||
|
|
||
| const copyButton = await screen.findByLabelText( | ||
| 'Copy Fake Region, NC: http://example.com to clipboard' | ||
| ); | ||
| expect(copyButton).toBeInTheDocument(); | ||
| }); | ||
| }); |
84 changes: 84 additions & 0 deletions
84
packages/manager/src/features/ObjectStorage/AccessKeyLanding/HostNamesList.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,84 @@ | ||
| import { styled } from '@mui/material/styles'; | ||
| import React, { useRef } from 'react'; | ||
|
|
||
| import { Box } from 'src/components/Box'; | ||
| import { CopyableTextField } from 'src/components/CopyableTextField/CopyableTextField'; | ||
| import { List } from 'src/components/List'; | ||
| import { useRegionsQuery } from 'src/queries/regions'; | ||
| import { omittedProps } from 'src/utilities/omittedProps'; | ||
| import { getRegionsByRegionId } from 'src/utilities/regions'; | ||
|
|
||
| import type { ObjectStorageKey } from '@linode/api-v4/lib/object-storage'; | ||
|
|
||
| const maxHeight = 200; | ||
|
|
||
| interface Props { | ||
| objectStorageKey: ObjectStorageKey; | ||
| } | ||
|
|
||
| export const HostNamesList = ({ objectStorageKey }: Props) => { | ||
| const { data: regionsData } = useRegionsQuery(); | ||
| const regionsLookup = regionsData && getRegionsByRegionId(regionsData); | ||
|
|
||
| const listRef = useRef<HTMLUListElement>(null); | ||
| const currentListHeight = listRef?.current?.clientHeight || 0; | ||
|
|
||
| return ( | ||
| <Box> | ||
| <StyledBoxShadowWrapper | ||
| sx={(theme) => ({ | ||
| backgroundColor: theme.bg.main, | ||
| border: `1px solid ${theme.name === 'light' ? '#ccc' : '#222'}`, | ||
| minHeight: '34px', | ||
| })} | ||
| displayShadow={currentListHeight > maxHeight} | ||
| > | ||
| <StyledScrollBox maxHeight={`${maxHeight}px`}> | ||
| <StyledHostNamesList ref={listRef}> | ||
| {objectStorageKey?.regions.map((region, index) => ( | ||
| <CopyableTextField | ||
| value={`${regionsLookup?.[region.id]?.label}: ${ | ||
| region.s3_endpoint | ||
| }`} | ||
| hideLabel | ||
| key={index} | ||
| label="Create a Filesystem" | ||
| sx={{ border: 'none', maxWidth: '100%' }} | ||
| /> | ||
| ))} | ||
| </StyledHostNamesList> | ||
| </StyledScrollBox> | ||
| </StyledBoxShadowWrapper> | ||
| </Box> | ||
| ); | ||
| }; | ||
|
|
||
| export const StyledScrollBox = styled(Box, { | ||
| label: 'StyledScrollBox', | ||
| })<{ maxHeight: string }>(({ maxHeight }) => ({ | ||
| maxHeight: `${maxHeight}px`, | ||
| overflow: 'auto', | ||
| })); | ||
|
|
||
| export const StyledBoxShadowWrapper = styled(Box, { | ||
| label: 'StyledBoxShadowWrapper', | ||
| shouldForwardProp: omittedProps(['displayShadow']), | ||
| })<{ displayShadow: boolean }>(({ displayShadow, theme }) => ({ | ||
| '&:after': { | ||
| bottom: 0, | ||
| content: '""', | ||
| height: '15px', | ||
| position: 'absolute', | ||
| width: '100%', | ||
| ...(displayShadow && { | ||
| boxShadow: `${theme.color.boxShadow} 0px -15px 10px -10px inset`, | ||
| }), | ||
| }, | ||
| position: 'relative', | ||
| })); | ||
|
|
||
| export const StyledHostNamesList = styled(List, { | ||
| label: 'RegionsList', | ||
| })(({ theme }) => ({ | ||
| background: theme.name === 'light' ? theme.bg.main : theme.bg.app, | ||
| })); |
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