-
Notifications
You must be signed in to change notification settings - Fork 415
Remove topics from backend-api #2334
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
Draft
jvorcak
wants to merge
6
commits into
master
Choose a base branch
from
UX-978-remove-topics-from-backend-api
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
a961052
Remove topics from backend-api'
jvorcak a48084a
Fixes integration test
jvorcak 7022209
Merge branch 'master' into UX-978-remove-topics-from-backend-api
jvorcak dfb55a3
remove quotas from backend-api
jvorcak 89885ca
Merge branch 'master' into UX-978-remove-topics-from-backend-api
jvorcak 4ee14d2
Fixes permission check in topic configuration
jvorcak File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ | |
| import React, { useEffect, useRef, useState } from 'react'; | ||
|
|
||
| import { ConfigPage } from './dynamic-ui/components'; | ||
| import { useTopicsQuery } from '../../../react-query/api/topic'; | ||
| import { appGlobal } from '../../../state/app-global'; | ||
| import { api, createMessageSearch, type MessageSearch, type MessageSearchRequest } from '../../../state/backend-api'; | ||
| import { ConnectClusterStore } from '../../../state/connect/state'; | ||
|
|
@@ -89,7 +90,8 @@ const KafkaConnectorMain = ({ | |
| }) => { | ||
| const [connectClusterStore] = useState(() => ConnectClusterStore.getInstance(clusterName)); | ||
|
|
||
| const logsTopic = api.topics?.first((x) => x.topicName === LOGS_TOPIC_NAME); | ||
| const { data: topicsData } = useTopicsQuery(); | ||
| const logsTopic = topicsData?.topics?.first((x) => x.topicName === LOGS_TOPIC_NAME); | ||
|
|
||
| useEffect(() => { | ||
| const init = async () => { | ||
|
|
@@ -494,7 +496,8 @@ const ConnectorErrorModal = (p: { error: ConnectorError }) => { | |
|
|
||
| const errorType = p.error.type === 'ERROR' ? 'error' : 'warning'; | ||
|
|
||
| const hasConnectorLogs = api.topics?.any((x) => x.topicName === LOGS_TOPIC_NAME); | ||
| const { data: connectorTopicsData } = useTopicsQuery(); | ||
| const hasConnectorLogs = connectorTopicsData?.topics?.any((x) => x.topicName === LOGS_TOPIC_NAME); | ||
|
|
||
| return ( | ||
| <> | ||
|
|
@@ -552,13 +555,11 @@ class KafkaConnectorDetails extends PageComponent<{ clusterName: string; connect | |
| appGlobal.onRefresh = () => this.refreshData(true).catch(console.error); | ||
| } | ||
|
|
||
| async refreshData(force: boolean): Promise<void> { | ||
| async refreshData(_force: boolean): Promise<void> { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If we don't use the |
||
| ConnectClusterStore.connectClusters.clear(); | ||
| await api.refreshConnectClusters(); | ||
|
|
||
| // refresh topics so we know whether or not we can show the "go to error logs topic" button in the connector details error popup | ||
| // and show the logs tab | ||
| api.refreshTopics(force); | ||
| // React Query handles topics fetching via useTopicsQuery hooks in child components | ||
| } | ||
|
|
||
| render() { | ||
|
|
@@ -569,9 +570,6 @@ class KafkaConnectorDetails extends PageComponent<{ clusterName: string; connect | |
| return <NotConfigured />; | ||
| } | ||
|
|
||
| // Touch observables so PageComponent's Reaction tracks them for re-renders. | ||
| void api.topics; | ||
|
|
||
| return ( | ||
| <PageContent> | ||
| <KafkaConnectorMain clusterName={clusterName} connectorName={connectorName} refreshData={this.refreshData} /> | ||
|
|
@@ -674,7 +672,8 @@ const LogsTab = (p: { | |
| const { connector } = p; | ||
| const connectorName = connector.name; | ||
| const topicName = LOGS_TOPIC_NAME; | ||
| const topic = api.topics?.first((x) => x.topicName === topicName); | ||
| const { data: logsTopicsData } = useTopicsQuery(); | ||
| const topic = logsTopicsData?.topics?.first((x) => x.topicName === topicName); | ||
|
|
||
| const [logState, setLogState] = useState<{ messages: TopicMessage[]; isComplete: boolean }>({ | ||
| messages: [], | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
You can rely on a
useQueryClienthook to grab the singleton instance too.