Skip to content

Commit b5db1bf

Browse files
jacobloganlawmichaJordan-NelsonjosefaidtHuiSF
authored
Merge main into next-release/main (#7901)
* Update versions.ts Android Amplify V2.19.1 (#7767) * chore(flutter): update android section of Amplify Flutter getting started guide (#7760) * chore: update android section of Flutter getting started guide * chore: update gen 2 flutter platform setup * chore: add info to enable network permissions on android * chore: update H3 headers to H2 * chore: update min Xcode version to 15 * chore: update xcode verison to 15.0 for macOS * chore: update ios and macos setup to be consistent with Android, add callout for missing podfile * update mobile quickstarts with link to fullstack branch deployment guide #7741 (#7746) * chore: add serverComponentsExternalPackages callout for Next.js (#7757) * chore: add serverComponentsExternalPackages callout for Next.js * Apply suggestions from code review Co-authored-by: Jim Blanchard <[email protected]> * Apply suggestions from code review * Update src/pages/gen1/[platform]/build-a-backend/server-side-rendering/nextjs/index.mdx Co-authored-by: Jim Blanchard <[email protected]> * Update src/pages/gen1/[platform]/build-a-backend/server-side-rendering/nextjs/index.mdx Co-authored-by: josef <[email protected]> * Update src/pages/[platform]/build-a-backend/server-side-rendering/index.mdx Co-authored-by: josef <[email protected]> --------- Co-authored-by: Jim Blanchard <[email protected]> Co-authored-by: josef <[email protected]> * add warning callout to gen1 backend-config (#7773) * Revert "chore: add region to scrollable table (#7744)" (#7784) This reverts commit 67496c5. * chore: change outputs to amplifyConfig in flutter gen 2 docs (#7764) * chore: change outputs to amplifyConfig in flutter gen 2 docs * chore: change amplifyconfiguration.dart import to amplify_outputs.dart * chore: remove --outputs-version 0 and downgrade config file callout * chore: remove --outputs-version 0 from snippets * chore: remove gen 2 config conversion callout * chore: remove amplifyconfiguration.dart references from gen 2 * fix: heading order on gen1/prev subscribe-data page (#7790) * add warning regarding subscription and mutation redaction of relational fields (#7768) * add warning regarding subscription and mutation redaction of relational fields * replace authn with authz in warning * chore(api): Callout for field redaction on Swift Android relational models * Update src/pages/gen1/[platform]/build-a-backend/graphqlapi/relational-models/index.mdx * add feature flag to warning for gen 1 * Fix heading order in fragments affecting this page * add protected redaction message components * Add tests for redaction message Gen 1 and Gen 2 components * add snapshots for redaction Gen 1 and Gen 2 component tests * Adds ProtectedRedactionMessage components for Gen 1 and Gen2 * Render ProtectedRedactionGen1Message component on Gen 1 realtime page * Render ProtectedRedactionGen1Message component on Gen 2 data modeling page * Render ProtectedRedactionGen2Message component on Gen 2 realtime page * Render ProtectedRedactionGen1Message component on Gen 1 data modeling page * Render ProtectedRedactionGen1Message component on Gen 1 V5 realtime page * add subscriptionsInheritPrimaryAuth as a feature flag * correct version for subscriptionsInheritPrimaryAuth * remove commented code * fix heading order --------- Co-authored-by: Michael Law <[email protected]> Co-authored-by: Heather <[email protected]> Co-authored-by: katiegoines <[email protected]> * fix subscriptionsInheritPrimaryAuth default value (#7795) * change overview card titles from p to h2 (#7780) Co-authored-by: katiegoines <[email protected]> * remove conditional in aria-describedby={codeId} for MDXCopyCodeButton (#7779) Co-authored-by: katiegoines <[email protected]> * Update index.mdx to fix typo (#7798) Removed mention of create-vite-app * add workflow to validate redirects (#7726) * add workflow to validate redirects * change filename * removing testing errors * finding all invalid redirects * running validation to catch all issues * remove unneeded code --------- Co-authored-by: katiegoines <[email protected]> * update set up function guide with data example (#7759) * update set up function guide with data example * add mobile snippets * remove checkboxes and circle (#7783) * fix: heading order (#7803) * restore autoSignIn section for SignIn page, and Switching Authentication Flows page for js categories (#7769) Co-authored-by: JoonWon Choi <[email protected]> * replace `amplify` to `ampx` (#7804) * feat(js): list api subpathStrategy parameter (#7794) * feat(js): list api subpathStrategy parameter * fix: adds style guide suggestions * fix: adds result structure * fix: tried to delineate between recursive exploration of entire path and subpathStrategy option * Update src/pages/[platform]/build-a-backend/storage/list-files/index.mdx Co-authored-by: Harshita Daddala <[email protected]> * Update src/pages/[platform]/build-a-backend/storage/list-files/index.mdx Co-authored-by: Harshita Daddala <[email protected]> * Update src/pages/[platform]/build-a-backend/storage/list-files/index.mdx Co-authored-by: Harshita Daddala <[email protected]> * Update src/pages/[platform]/build-a-backend/storage/list-files/index.mdx Co-authored-by: Harshita Daddala <[email protected]> * Update src/pages/[platform]/build-a-backend/storage/list-files/index.mdx Co-authored-by: ashika112 <[email protected]> * Update src/pages/[platform]/build-a-backend/storage/list-files/index.mdx Co-authored-by: josef <[email protected]> * comments and prettier * undid prettier table change * Update src/pages/[platform]/build-a-backend/storage/list-files/index.mdx Co-authored-by: josef <[email protected]> --------- Co-authored-by: haverchuck <[email protected]> Co-authored-by: Harshita Daddala <[email protected]> Co-authored-by: ashika112 <[email protected]> Co-authored-by: josef <[email protected]> * chore: update domains for proxy (#7808) * fix: typo on client code generation page (#7809) * Fix anchor link, add some scroll margin to h4 headings (#7810) * chore(deps): bump @aws-amplify/amplify-cli-core from 4.3.8 to 4.3.9 (#7788) Bumps [@aws-amplify/amplify-cli-core](https://github.com/aws-amplify/amplify-cli/tree/HEAD/packages/amplify-cli-core) from 4.3.8 to 4.3.9. - [Release notes](https://github.com/aws-amplify/amplify-cli/releases) - [Changelog](https://github.com/aws-amplify/amplify-cli/blob/dev/packages/amplify-cli-core/CHANGELOG.md) - [Commits](https://github.com/aws-amplify/amplify-cli/commits/@aws-amplify/[email protected]/packages/amplify-cli-core) --- updated-dependencies: - dependency-name: "@aws-amplify/amplify-cli-core" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump aws-actions/aws-secretsmanager-get-secrets (#7792) Bumps [aws-actions/aws-secretsmanager-get-secrets](https://github.com/aws-actions/aws-secretsmanager-get-secrets) from 2.0.3 to 2.0.5. - [Release notes](https://github.com/aws-actions/aws-secretsmanager-get-secrets/releases) - [Commits](aws-actions/aws-secretsmanager-get-secrets@ff26a0a...98c2d6b) --- updated-dependencies: - dependency-name: aws-actions/aws-secretsmanager-get-secrets dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * storage(android): update getURL options (#7736) * storage(android): update getURL options * add more code examples * Add Gen 2 SDL docs (#7793) * add gen 2 SDL docs * Update src/pages/[platform]/build-a-backend/data/data-modeling/index.mdx Co-authored-by: josef <[email protected]> * Update src/pages/[platform]/build-a-backend/data/data-modeling/index.mdx Co-authored-by: josef <[email protected]> * move support callout to migration page * update doc to state ddb-backed sources only * made updates to the sdl explanation --------- Co-authored-by: josef <[email protected]> Co-authored-by: Nikhil Swaminathan <[email protected]> * Cbonif/add-non-model-auth-section (#7817) * add callout for sql custom query/mutation return types with example * Merge branch 'main' of github.com:aws-amplify/docs * revert sql page change * revert change on gen 1 sql page * add auth permissions (#7796) * add auth permissions * fix accessibility error * fix heading * callout for mysql/postgres custom query return types (#7813) * add callout for sql custom query/mutation return types with example * add gen 1 example * shorten gen 2 example a bit * remove line breaks from gen 1 example * remove line break * Update index.mdx Co-authored-by: josef <[email protected]> * Update src/pages/gen1/[platform]/build-a-backend/graphqlapi/connect-api-to-existing-database/index.mdx Co-authored-by: josef <[email protected]> * remove ts import from bottom of page --------- Co-authored-by: josef <[email protected]> * Clarify Manual Loading of Environment Variables in Sandbox Environments (#7822) * Clarify Manual Loading of Environment Variables in Sandbox Environments * Update src/pages/[platform]/deploy-and-host/fullstack-branching/secrets-and-vars/index.mdx Co-authored-by: josef <[email protected]> --------- Co-authored-by: josef <[email protected]> * fix data env name in function example, ref #7825 (#7826) * Update app id reference for CI/CD deployments (#7832) * fix(swift): updated concurrency in quickstart (#7828) * chore(android): Update versions.ts - Android SDK 2.76.0(#7833) * feat(Swift): Adding SubpathStrategy documentation for Storage.List (#7831) * Add Gen1 banner to getting started pages (#7839) * add Gen1 Banner to all gen 1 getting started pages * update link location and add banner to how amplify works --------- Co-authored-by: Jacob Logan <[email protected]> * remove temporary disabling of copy-code button (#7835) Co-authored-by: katiegoines <[email protected]> * add streaming function logs docs (#7841) * add streaming function logs docs * Update src/pages/[platform]/build-a-backend/functions/streaming-logs/index.mdx Co-authored-by: Amplifiyer <[email protected]> * rm multiline log callout, added note for chaining --out-file * clarify log output in terminal where sandbox is running --------- Co-authored-by: Amplifiyer <[email protected]> * a11y-when closing accordion from bottom, focus back on summary element (#7837) * when closing accordion from bottom, focus back on summary element * add test * remove extra spaces --------- Co-authored-by: katiegoines <[email protected]> * a11y-remove alt text for decorative image (#7836) * remove alt text for decorative image * mark images as decorative --------- Co-authored-by: katiegoines <[email protected]> * Update index.mdx (#7840) * put feedback responses in aria-live (#7844) Co-authored-by: katiegoines <[email protected]> * when clicking on toc entry, focus on respective heading in content (#7845) Co-authored-by: katiegoines <[email protected]> * add scheduling functions docs (#7842) * add scheduling functions docs * fix path * Update src/pages/[platform]/build-a-backend/functions/scheduling-functions/index.mdx * add docs for auth custom attribute support (#7846) * add docs for auth custom attribute support * Update src/pages/[platform]/build-a-backend/auth/concepts/user-attributes/index.mdx * correct heading order * fix broken links * add mobile platform to concepts page for user attributes * remove studio reference in Amplify Gen 2 docs (#7860) * storage(android): update storage list with delimiter support (#7830) * feat(Swift): Adding SubpathStrategy documentation for Storage.List * storage(android): update storage list with delimiter support * feat(Swift): Adding SubpathStrategy documentation for Storage.List * chore: resolve review comments * chore: update per review comments * chore: resolve review comments * fix exclude subpath sample --------- Co-authored-by: Sebastian Villena <[email protected]> * Add resolution for fast-xml-parser (#7859) * a11y videos have aria-hidden but can still receive focus (#7866) * adding ariaDescriptions onto some videos to test for required prop build failure * testing error for missing prop * testing error for missing prop * fixing testing failure * re-order props * re-order props * fix invalid heading order * replace prop name --------- Co-authored-by: katiegoines <[email protected]> * chore(flutter): added push notifications snippet for updated settings.gradle file (#7848) * chore: added push notifications snippet for updated settings.gradle file * chore: remove commented code * fix: change gen2 monorepo setting image path (#7786) * fix: change gen2 monorepo setting image path * empty commit * fix: empty commit * fix: delete new line * adds storage, user and data management pages (#7814) * adds storage, user and data mangement pages * add non-dev mode info to figma to react docs (#7878) * rework "use existing cognito resources" prose, highlight configuring client libs directly (#7806) * rework "use existing cognito resources" prose, highlight configuring client libs directly * pivot use existing aws resources page to generalized 'connect _to_' * rm backend snippets in favor of referenceAuth rfc * a11y- add more descriptive text to learn more in gen2 modal (#7869) * add more descriptive text to learn more in gen2 modal * remove excess space * Update src/components/Modal/Modal.tsx Co-authored-by: Heather Buchel <[email protected]> --------- Co-authored-by: katiegoines <[email protected]> Co-authored-by: Heather Buchel <[email protected]> * a11y - add aria-label to external link instances (#7874) * remove import * adding externallink aria-labels --------- Co-authored-by: katiegoines <[email protected]> * add id to popovertrigger (#7881) Co-authored-by: katiegoines <[email protected]> * fix: removed hyphen from the logGroupName (#7856) * updated the logGroupName * added vendedlogs to cspell.json * updated the fieldname is index mapping * updating axios dependency to use new safe version (#7886) * update cdk bootstrap cmd (#7889) * update cdk bootstrap cmd * Update index.mdx * Update index.mdx * Add Docs for Email Invitation Customization (#7891) * add email invite template docs * Update src/pages/[platform]/build-a-backend/auth/customize-auth-lifecycle/email-customization/index.mdx Co-authored-by: josef <[email protected]> --------- Co-authored-by: josef <[email protected]> * [Multi-bucket] Storage - add multi bucket setup and usage examples (#7858) * adding multi bucket sections / examples * adding callout for copy * fix link * adding list example and rewording * rename to remove support * add setup section and update links * fix accessibility violations * remove from non JS sections * update download files option language Co-authored-by: ashika112 <[email protected]> * update copy example to include alternatives * update language for alternative on download Co-authored-by: ashika112 <[email protected]> * punctuation * unify language across pages * adding title to copy section * adding subpath strategy to options * resolve broken link * manual override amplify outputs * remove type def * remove amplify outputs in setup guide * modify existing storage examples * remove section from download * remove section from list page * remove section from remove * update copy files page * unify language * unify language * modify existing resources section * use resource config in override * addressing feedback * remove redundant link * address feedback * add / update links * add full code examples * update heading * clean up code samples * full examples on setup page * remove redundant text * consistent setup examples * restructure storage setup * simplify upload code examples * update tables with default values * update code snippets * Revamp list file code * update upload examples * fix leak * address feedback * moved / revamped storage without backend section --------- Co-authored-by: ashika112 <[email protected]> Co-authored-by: ashika112 <[email protected]> * remove untrue claim about device tracking (#7898) * Feat (Auth): added docs for fetchCurrentDevice API (#7737) Feat (Auth): added docs for fetchCurrentDevice API (#7737) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Michael Law <[email protected]> Co-authored-by: Jordan Nelson <[email protected]> Co-authored-by: josef <[email protected]> Co-authored-by: Hui Zhao <[email protected]> Co-authored-by: Jim Blanchard <[email protected]> Co-authored-by: Heather Buchel <[email protected]> Co-authored-by: Kha Truong <[email protected]> Co-authored-by: Chris Bonifacio <[email protected]> Co-authored-by: katiegoines <[email protected]> Co-authored-by: Dane Pilcher <[email protected]> Co-authored-by: Katie Goines <[email protected]> Co-authored-by: Nikhil Swaminathan <[email protected]> Co-authored-by: Kethan sai <[email protected]> Co-authored-by: Joon Choi <[email protected]> Co-authored-by: JoonWon Choi <[email protected]> Co-authored-by: MURAKAMI Masahiko <[email protected]> Co-authored-by: Dustin Noyes <[email protected]> Co-authored-by: haverchuck <[email protected]> Co-authored-by: Harshita Daddala <[email protected]> Co-authored-by: ashika112 <[email protected]> Co-authored-by: MJ Zhang <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tuan Pham <[email protected]> Co-authored-by: Nikhil Swaminathan <[email protected]> Co-authored-by: Kazuki Hamasaki <[email protected]> Co-authored-by: Jay Raval <[email protected]> Co-authored-by: Sébastien Stormacq <[email protected]> Co-authored-by: Sebastian Villena <[email protected]> Co-authored-by: Jacob Logan <[email protected]> Co-authored-by: Amplifiyer <[email protected]> Co-authored-by: taka <[email protected]> Co-authored-by: Emma Sauerborn <[email protected]> Co-authored-by: magisystem0408 <[email protected]> Co-authored-by: Anil Maktala <[email protected]> Co-authored-by: Jordan Van Ness <[email protected]> Co-authored-by: James Graham <[email protected]> Co-authored-by: James Jarvis <[email protected]> Co-authored-by: ashika112 <[email protected]> Co-authored-by: Kamil Sobol <[email protected]> Co-authored-by: Andrew Hahn <[email protected]>
1 parent b6368aa commit b5db1bf

File tree

71 files changed

+1205
-433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1205
-433
lines changed

Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ let mut a = String::from("a");
175175
Videos can be added using the `<Video />` component and referencing a path to the video file. The video should be an `.mp4` file and should exist in the `/public` directory
176176

177177
```jsx
178-
<Video src="/path/to/video.mp4" />
178+
<Video src="/path/to/video.mp4" description="Video - [video description]" />
179179
```
180180

181181
## Accessibility testing

cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,6 +1396,7 @@
13961396
"validationData",
13971397
"vanillajs",
13981398
"varchar",
1399+
"vendedlogs",
13991400
"verify.js",
14001401
"VerifyAuthChallengeResponse",
14011402
"VeriSign",

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@types/react": "^18.0.0",
4343
"@types/url-parse": "^1.4.3",
4444
"@typescript-eslint/eslint-plugin": "^6.13.1",
45-
"axios": "^1.3.4",
45+
"axios": "^1.7.4",
4646
"cheerio": "^1.0.0-rc.12",
4747
"classnames": "^2.3.2",
4848
"cross-env": "^7.0.3",
@@ -89,7 +89,7 @@
8989
"loader-utils": "2.0.4",
9090
"minimatch": "3.1.2",
9191
"decode-uri-component": "0.2.1",
92-
"fast-xml-parser": "4.2.5",
92+
"**/fast-xml-parser": "4.4.1",
9393
"semver": "7.5.2",
9494
"tough-cookie": "4.1.3",
9595
"aws-cdk-lib": "2.80.0",
3.75 KB
Loading
643 KB
Binary file not shown.
994 KB
Binary file not shown.
1.5 MB
Binary file not shown.

src/components/ExternalLink/__tests__/ExternalLink.test.tsx

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,27 @@ describe('ExternalLink', () => {
1414
it('should render the ExternalLink component', async () => {
1515
render(component);
1616
const externalLink = await screen.getByRole('link', {
17-
name: 'Click Here!'
17+
name: '(opens in new tab)'
1818
});
19+
const externalLinkText = await screen.findByText('Click Here!');
1920

20-
expect(externalLink).toBeInTheDocument();
21+
await waitFor(() => {
22+
expect(externalLink).toBeInTheDocument();
23+
expect(externalLinkText).toBeInTheDocument();
24+
});
2125
});
2226

2327
it('should open external links in a new window', async () => {
2428
render(component);
2529
const externalLink = await screen.getByRole('link', {
26-
name: 'Click Here!'
30+
name: '(opens in new tab)'
2731
});
32+
const externalLinkText = await screen.findByText('Click Here!');
2833

2934
expect(externalLink).toHaveAttribute('rel', 'noopener noreferrer');
3035
expect(externalLink).toHaveAttribute('target', '_blank');
36+
expect(externalLinkText).toHaveAttribute('rel', 'noopener noreferrer');
37+
expect(externalLinkText).toHaveAttribute('target', '_blank');
3138
});
3239

3340
it('should trackExternalLink on click', async () => {

src/components/ExternalLink/index.tsx

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import React, { useEffect, useRef } from 'react';
22
import { trackExternalLink } from '../../utils/track';
33

44
type ExternalLinkProps = {
@@ -15,15 +15,27 @@ const ExternalLink: React.FC<ExternalLinkProps> = ({
1515
href,
1616
className
1717
}) => {
18+
const [label, setLabel] = React.useState('');
19+
const linkRef = useRef<HTMLAnchorElement>(null);
20+
21+
useEffect(() => {
22+
if (linkRef.current) {
23+
const text = linkRef.current.innerText;
24+
setLabel(text ? text : '');
25+
}
26+
}, []);
27+
1828
return (
1929
<a
2030
href={href}
2131
className={className}
32+
aria-label={label + ' (opens in new tab)'}
2233
rel="noopener noreferrer"
2334
target="_blank"
2435
onClick={() => {
2536
trackLink(href);
2637
}}
38+
ref={linkRef}
2739
>
2840
{children}
2941
</a>

src/components/ExternalLinkButton/ExternalLinkButton.tsx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { Button, ButtonProps } from '@aws-amplify/ui-react';
22
import { IconExternalLink } from '../Icons';
33
import { trackExternalLink } from '../../utils/track';
4+
import { useEffect, useRef } from 'react';
5+
import React from 'react';
46

57
interface ExternalLinkButtonProps {
68
variation?: ButtonProps['variation'];
@@ -21,6 +23,16 @@ export const ExternalLinkButton = ({
2123
children,
2224
className
2325
}: ExternalLinkButtonProps) => {
26+
const [label, setLabel] = React.useState('');
27+
const buttonRef = useRef<HTMLAnchorElement>(null);
28+
29+
useEffect(() => {
30+
if (buttonRef.current) {
31+
const text = buttonRef.current.innerText;
32+
setLabel(text ? text : '');
33+
}
34+
}, []);
35+
2436
return (
2537
<Button
2638
href={href}
@@ -32,9 +44,11 @@ export const ExternalLinkButton = ({
3244
as="a"
3345
align-items="center"
3446
className={className}
47+
aria-label={label + ' (opens in new tab)'}
3548
onClick={() => {
3649
trackLink(href);
3750
}}
51+
ref={buttonRef}
3852
>
3953
{children} <IconExternalLink />
4054
</Button>

0 commit comments

Comments
 (0)