Skip to content

Commit

Permalink
combined No and Multiple selectors error detail components
Browse files Browse the repository at this point in the history
  • Loading branch information
grahamlangford committed Feb 28, 2024
1 parent 7d82107 commit a3aecd2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 45 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@
*/

import React from "react";
import { type MultipleElementsFoundError } from "@/errors/businessErrors";
import {
type NoElementsFoundError,
type MultipleElementsFoundError,
} from "@/errors/businessErrors";
import styles from "./ErrorDetail.module.scss";

const MultipleElementsFoundErrorDetail: React.FunctionComponent<{
error: MultipleElementsFoundError;
const InvalidSelectorErrorDetail: React.FunctionComponent<{
error: MultipleElementsFoundError | NoElementsFoundError;
}> = ({ error: { message, selector } }) => (
<div className={styles.root}>
<div className={styles.column}>
Expand All @@ -34,4 +37,4 @@ const MultipleElementsFoundErrorDetail: React.FunctionComponent<{
</div>
);

export default MultipleElementsFoundErrorDetail;
export default InvalidSelectorErrorDetail;
37 changes: 0 additions & 37 deletions src/components/errors/NoElementsFoundErrorDetail.tsx

This file was deleted.

7 changes: 3 additions & 4 deletions src/components/errors/getErrorDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ import {
ProxiedRemoteServiceError,
} from "@/errors/businessErrors";
import RemoteApiErrorDetail from "@/components/errors/RemoteApiErrorDetail";
import MultipleElementsFoundErrorDetail from "@/components/errors/MultipleElementsFoundErrorDetail";
import NoElementsFoundErrorDetail from "@/components/errors/NoElementsFoundErrorDetail";
import InvalidSelectorErrorDetail from "@/components/errors/InvalidSelectorErrorDetail";

type ErrorDetails = {
title: string;
Expand All @@ -46,7 +45,7 @@ export default function getErrorDetails(error: ErrorObject): ErrorDetails {
return {
title: "No elements found for selector",
detailsElement: (
<NoElementsFoundErrorDetail error={noElementsFoundError} />
<InvalidSelectorErrorDetail error={noElementsFoundError} />
),
};
}
Expand All @@ -59,7 +58,7 @@ export default function getErrorDetails(error: ErrorObject): ErrorDetails {
return {
title: "Multiple elements found for selector",
detailsElement: (
<MultipleElementsFoundErrorDetail error={multipleElementsFoundError} />
<InvalidSelectorErrorDetail error={multipleElementsFoundError} />
),
};
}
Expand Down

0 comments on commit a3aecd2

Please sign in to comment.