ref(tsc): convert orgDashboards to FC #84351
Merged
Conversation
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
github-actions
bot
added
the
Scope: Frontend
This comment was marked as off-topic.
This comment was marked as off-topic.
michellewzhang
commented
Jan 31, 2025
| @@ -123,6 +125,11 @@ describe('Dashboards > Detail', function () { | |||
| }); | |||
|
|
|||
| it('assigns unique IDs to all widgets so grid keys are unique', async function () { | |||
| const router = RouterFixture({ | |||
There was a problem hiding this comment.
had to update all these routers bc they all depend on OrgDashboards
Bundle ReportChanges will decrease total bundle size by 80.01kB (-0.24%) ⬇️. This is within the configured threshold ✅ Detailed changes
Affected Assets, Files, and Routes:view changes for bundle: app-webpack-bundle-array-pushAssets Changed:
Files in
Files in
Files in
|
michellewzhang
commented
Jan 31, 2025
| const location = useLocation(); | ||
| const organization = useOrganization(); | ||
| const navigate = useNavigate(); | ||
| const {dashboardId} = useParams<{dashboardId: string}>(); |
There was a problem hiding this comment.
orgId wasn't used, so I removed it from the params
michellewzhang
commented
Jan 31, 2025
Comment on lines
+66
to
+70
| useEffect(() => { | ||
| if (dashboardId && !isEqual(dashboardId, selectedDashboard?.id)) { | ||
| setSelectedDashboardState(null); | ||
| } | ||
| } | ||
|
|
||
| getEndpoints(): ReturnType<DeprecatedAsyncComponent['getEndpoints']> { | ||
| const {organization, params} = this.props; | ||
| const url = `/organizations/${organization.slug}/dashboards/`; | ||
| const endpoints: ReturnType<DeprecatedAsyncComponent['getEndpoints']> = [ | ||
| ['dashboards', url], | ||
| ]; | ||
|
|
||
| if (params.dashboardId) { | ||
| endpoints.push(['selectedDashboard', `${url}${params.dashboardId}/`]); | ||
| }, [dashboardId, selectedDashboard]); |
There was a problem hiding this comment.
this replaces the componentDidUpdate
michellewzhang
commented
Jan 31, 2025
| endpoints.push(['selectedDashboard', `${url}${params.dashboardId}/`]); | ||
| }, [dashboardId, selectedDashboard]); | ||
|
|
||
| // If we don't have a selected dashboard, and one isn't going to arrive |
There was a problem hiding this comment.
taken from old line 125
michellewzhang
commented
Jan 31, 2025
Comment on lines
+91
to
+92
| useEffect(() => { | ||
| if (dashboardId || selectedDashboard) { |
There was a problem hiding this comment.
replaces the onRequestSuccess
There was a problem hiding this comment.
stateKey === 'selectedDashboard' --> selectedDashboard
michellewzhang
commented
Jan 31, 2025
| }, [dashboardId, location, navigate, selectedDashboard]); | ||
|
|
||
| useEffect(() => { | ||
| if (!organization.features.includes('dashboards-basic')) { |
There was a problem hiding this comment.
moved from old line 187
There was a problem hiding this comment.
(had to put the navigate in a useEffect)
malwilley
reviewed
Feb 3, 2025
| let dashboard = selectedDashboard; | ||
| if (isDashboardsError || isSelectedDashboardError) { | ||
| const notFound = | ||
| dashboardsError?.status === 404 || selectedDashboardError?.status === 404; |
There was a problem hiding this comment.
If you're checking for an error status you'll want retry: false in the useApiQuery (honestly we should probably have a default setting that doesn't retry for 404s but we don't right now)
malwilley
reviewed
Feb 3, 2025
|
|
||
| const { | ||
| data: fetchedSelectedDashboard, | ||
| isPending: isSelectedDashboardPending, |
There was a problem hiding this comment.
When the query is disabled, this will always be true. If that's not intended use isLoading instead (which will only be true when it's actively fetching)
There was a problem hiding this comment.
updated to isLoading!
malwilley
approved these changes
Feb 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
ref https://github.com/getsentry/frontend-tsc/issues/2