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.

Sign up for GitHub

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

🪟 🎨 Show Schema Update Errors to User #18008

Merged
merged 8 commits into from
Oct 19, 2022
Merged

🪟 🎨 Show Schema Update Errors to User #18008

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c4ffcc1
show schema update error
teallarson Oct 14, 2022
8ec6ff9
remove test code
teallarson Oct 14, 2022
fd004f4
use i18n for error message label and string
teallarson Oct 18, 2022
5335d30
update snapshot of create connection
teallarson Oct 18, 2022
7417fc7
Merge branch 'master' into teal/schema-updates-error-messaging
teallarson Oct 18, 2022
d60184d
Merge branch 'master' into teal/schema-updates-error-messaging
teallarson Oct 18, 2022
ee21d64
fix intl string parsing
teallarson Oct 18, 2022
4d5bbce
update snapshot
teallarson Oct 18, 2022
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
2 changes: 1 addition & 1 deletion airbyte-webapp/src/components/CreateConnection/SchemaError.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const SchemaError = ({ schemaError }: { schemaError: SchemaErrorType }) =
const { refreshSchema } = useConnectionFormService();
return (
<Card>
<TryAfterErrorBlock onClick={refreshSchema} />
<TryAfterErrorBlock onClick={refreshSchema} message={schemaError?.message} />
{job && <JobItem job={job} />}
</Card>
);
Expand Down
31 changes: 19 additions & 12 deletions airbyte-webapp/src/components/CreateConnection/TryAfterErrorBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,25 @@ import { Text } from "components/ui/Text";
import styles from "./TryAfterErrorBlock.module.scss";

interface TryAfterErrorBlockProps {
message?: React.ReactNode;
message?: string;
onClick: () => void;
}

export const TryAfterErrorBlock: React.FC<TryAfterErrorBlockProps> = ({ message, onClick }) => (
<div className={styles.container}>
<StatusIcon big />
<Text as="p" size="lg" centered className={styles.message}>
{message || <FormattedMessage id="form.schemaFailed" />}
</Text>
<Button className={styles.retryButton} onClick={onClick} variant="danger">
<FormattedMessage id="form.tryAgain" />
</Button>
</div>
);
export const TryAfterErrorBlock: React.FC<TryAfterErrorBlockProps> = ({ message, onClick }) => {
return (
<div className={styles.container}>
<StatusIcon big />
<Text as="p" size="lg" centered className={styles.message}>
<FormattedMessage id="form.schemaFailed" />
</Text>
{message && (
<Text as="p" size="lg" centered className={styles.message}>
<FormattedMessage id="form.error" values={{ message }} />
</Text>
)}
<Button className={styles.retryButton} onClick={onClick} variant="danger">
<FormattedMessage id="form.tryAgain" />
</Button>
</div>
);
};
5 changes: 5 additions & 0 deletions ...e-webapp/src/components/CreateConnection/__snapshots__/CreateConnectionForm.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,6 +996,11 @@ exports[`CreateConnectionForm should render with an error 1`] = `
>
Failed to fetch schema. Please try again
</p>
<p
class="<removed-for-snapshot-test>"
>
Error: {value}
</p>
<button
class="<removed-for-snapshot-test>"
>
Expand Down
1 change: 1 addition & 0 deletions airbyte-webapp/src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"sidebar.recipes": "Tutorials - Use cases",

"form.continue": "Continue",
"form.error": "Error: {value}",
"form.yourEmail": "Your email",
"form.email.placeholder": "[email protected]",
"form.email.error": "Enter a valid email",
Expand Down