-
Notifications
You must be signed in to change notification settings - Fork 22
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
#7684: adds error details for multiple selectors and no selectors found errors #7752
Merged
grahamlangford
merged 8 commits into
main
from
7684-report-selector-in-error-detail-in-page-editor
Feb 28, 2024
Merged
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
c9f23cb
adds error details for multiple selectors and no selectors found errors
grahamlangford e073fbe
add new files to strict null checks
grahamlangford 45cba17
merge main
grahamlangford 528dddb
remove console logs
grahamlangford 5fe688e
adds very basic null checks to prevent NPE
grahamlangford 7d82107
revert change added to wrong branch
grahamlangford a3aecd2
combined No and Multiple selectors error detail components
grahamlangford 384cfd8
update strict null checks
grahamlangford File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
37 changes: 37 additions & 0 deletions
37
src/components/errors/MultipleElementsFoundErrorDetail.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,37 @@ | ||
/* | ||
* Copyright (C) 2024 PixieBrix, 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 React from "react"; | ||
import { type MultipleElementsFoundError } from "@/errors/businessErrors"; | ||
import styles from "./ErrorDetail.module.scss"; | ||
|
||
const MultipleElementsFoundErrorDetail: React.FunctionComponent<{ | ||
error: MultipleElementsFoundError; | ||
}> = ({ error: { message, selector } }) => ( | ||
<div className={styles.root}> | ||
<div className={styles.column}> | ||
<h5>Error</h5> | ||
<p>{message}</p> | ||
</div> | ||
<div className={styles.column}> | ||
<h5>Selector</h5> | ||
<p>{selector}</p> | ||
</div> | ||
</div> | ||
); | ||
|
||
export default MultipleElementsFoundErrorDetail; |
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,37 @@ | ||
/* | ||
* Copyright (C) 2024 PixieBrix, 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 React from "react"; | ||
import { type NoElementsFoundError } from "@/errors/businessErrors"; | ||
import styles from "./ErrorDetail.module.scss"; | ||
|
||
const NoElementsFoundErrorDetail: React.FunctionComponent<{ | ||
error: NoElementsFoundError; | ||
}> = ({ error: { message, selector } }) => ( | ||
<div className={styles.root}> | ||
<div className={styles.column}> | ||
<h5>Error</h5> | ||
<p>{message}</p> | ||
</div> | ||
<div className={styles.column}> | ||
<h5>Selector</h5> | ||
<p>{selector}</p> | ||
</div> | ||
</div> | ||
); | ||
|
||
export default NoElementsFoundErrorDetail; |
8 changes: 4 additions & 4 deletions
8
src/components/errors/__snapshots__/getErrorDetails.test.tsx.snap
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like you could use a single component that takes either a MultipleElementsFoundError or NoElementsFoundError because you're relying on the same property?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed. I should've opened this as a draft and called it out. I kept them separate in case there were any design concerns where they would end up different.