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

[#2996][#3011] fix(web): fix refresh issue and kafka topic property issue #3014

Merged
merged 1 commit into from
Apr 19, 2024
Merged

[#2996][#3011] fix(web): fix refresh issue and kafka topic property issue #3014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions web/src/app/metalakes/metalake/MetalakeTree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@ const MetalakeTree = props => {
case 'fileset': {
if (store.selectedNodes.includes(nodeProps.data.key)) {
const pathArr = extractPlaceholder(nodeProps.data.key)
const [metalake, catalog, schema, fileset] = pathArr
const [metalake, catalog, type, schema, fileset] = pathArr
dispatch(getFilesetDetails({ init: true, metalake, catalog, schema, fileset }))
}
break
}
case 'topic': {
if (store.selectedNodes.includes(nodeProps.data.key)) {
const pathArr = extractPlaceholder(nodeProps.data.key)
const [metalake, catalog, schema, topic] = pathArr
const [metalake, catalog, type, schema, topic] = pathArr
dispatch(getTopicDetails({ init: true, metalake, catalog, schema, topic }))
}
break
Expand Down
35 changes: 23 additions & 12 deletions web/src/app/metalakes/metalake/MetalakeView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useEffect } from 'react'

import { Box } from '@mui/material'

import { useAppDispatch } from '@/lib/hooks/useStore'
import { useAppDispatch, useAppSelector } from '@/lib/hooks/useStore'
import { useSearchParams } from 'next/navigation'
import MetalakePageLeftBar from './MetalakePageLeftBar'
import RightContent from './rightContent/RightContent'
Expand All @@ -32,8 +32,8 @@ import {
const MetalakeView = () => {
const dispatch = useAppDispatch()
const searchParams = useSearchParams()

const paramsSize = [...searchParams.keys()].length
const store = useAppSelector(state => state.metalakes)

useEffect(() => {
const routeParams = {
Expand All @@ -54,11 +54,18 @@ const MetalakeView = () => {
}

if (paramsSize === 3 && catalog) {
if (!store.catalogs.length) {
dispatch(fetchCatalogs({ metalake }))
}
dispatch(fetchSchemas({ init: true, page: 'catalogs', metalake, catalog, type }))
dispatch(getCatalogDetails({ metalake, catalog, type }))
}

if (paramsSize === 4 && catalog && type && schema) {
if (!store.catalogs.length) {
dispatch(fetchCatalogs({ metalake }))
dispatch(fetchSchemas({ metalake, catalog, type }))
}
switch (type) {
case 'relational':
dispatch(fetchTables({ init: true, page: 'schemas', metalake, catalog, schema }))
Expand All @@ -75,16 +82,20 @@ const MetalakeView = () => {
dispatch(getSchemaDetails({ metalake, catalog, schema }))
}

if (paramsSize === 5 && catalog && schema && table) {
dispatch(getTableDetails({ init: true, metalake, catalog, schema, table }))
}

if (paramsSize === 5 && catalog && schema && fileset) {
dispatch(getFilesetDetails({ init: true, metalake, catalog, schema, fileset }))
}

if (paramsSize === 5 && catalog && schema && topic) {
dispatch(getTopicDetails({ init: true, metalake, catalog, schema, topic }))
if (paramsSize === 5 && catalog && schema) {
if (!store.catalogs.length) {
dispatch(fetchCatalogs({ metalake }))
dispatch(fetchSchemas({ metalake, catalog, type }))
}
if (table) {
dispatch(getTableDetails({ init: true, metalake, catalog, schema, table }))
}
if (fileset) {
dispatch(getFilesetDetails({ init: true, metalake, catalog, schema, fileset }))
}
if (topic) {
dispatch(getTopicDetails({ init: true, metalake, catalog, schema, topic }))
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion web/src/app/metalakes/metalake/rightContent/CreateCatalogDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ const CreateCatalogDialog = props => {
setInnerProps(propsItems)
setValue('propItems', propsItems)
}
}, [open, data, setValue])
}, [open, data, setValue, type])

return (
<Dialog fullWidth maxWidth='sm' scroll='body' TransitionComponent={Transition} open={open} onClose={handleClose}>
Expand Down
19 changes: 10 additions & 9 deletions web/src/app/metalakes/metalake/rightContent/tabsContent/detailsView/DetailsView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const DetailsView = () => {

const audit = activatedItem?.audit || {}

const properties = Object.keys(activatedItem?.properties || [])
let properties = Object.keys(activatedItem?.properties || [])
.filter(key => !['partition-count', 'replication-factor'].includes(key))
.map(item => {
return {
Expand All @@ -32,14 +32,15 @@ const DetailsView = () => {
}
})
if (paramsSize === 5 && searchParams.get('topic')) {
properties.unshift({
key: 'replication-factor',
value: JSON.stringify(activatedItem?.properties['replication-factor'])?.replace(/^"|"$/g, '')
})
properties.unshift({
key: 'partition-count',
value: JSON.stringify(activatedItem?.properties['partition-count'])?.replace(/^"|"$/g, '')
})
const topicPros = Object.keys(activatedItem?.properties || [])
.filter(key => ['partition-count', 'replication-factor'].includes(key))
.map(item => {
return {
key: item,
value: JSON.stringify(activatedItem?.properties[item]).replace(/^"|"$/g, '')
}
})
properties = [...topicPros, ...properties]
}

const renderFieldText = ({ value, linkBreak = false, isDate = false }) => {
Expand Down
28 changes: 0 additions & 28 deletions web/src/lib/store/metalakes/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,10 +492,6 @@ export const fetchSchemas = createAsyncThunk(
)
}

if (getState().metalakes.metalakeTree.length === 0) {
dispatch(fetchCatalogs({ metalake }))
}

dispatch(setExpandedNodes([`{{${metalake}}}`, `{{${metalake}}}{{${catalog}}}{{${type}}}`]))

return { schemas, page, init }
Expand Down Expand Up @@ -567,10 +563,6 @@ export const fetchTables = createAsyncThunk(
)
}

if (getState().metalakes.metalakeTree.length === 0) {
dispatch(fetchCatalogs({ metalake }))
}

dispatch(
setExpandedNodes([
`{{${metalake}}}`,
Expand Down Expand Up @@ -688,10 +680,6 @@ export const getTableDetails = createAsyncThunk(

dispatch(setTableProps(tableProps))

if (getState().metalakes.metalakeTree.length === 0) {
dispatch(fetchCatalogs({ metalake }))
}

dispatch(
setExpandedNodes([
`{{${metalake}}}`,
Expand Down Expand Up @@ -753,10 +741,6 @@ export const fetchFilesets = createAsyncThunk(
)
}

if (getState().metalakes.metalakeTree.length === 0) {
dispatch(fetchCatalogs({ metalake }))
}

dispatch(
setExpandedNodes([
`{{${metalake}}}`,
Expand Down Expand Up @@ -786,10 +770,6 @@ export const getFilesetDetails = createAsyncThunk(

const { fileset: resFileset } = res

if (getState().metalakes.metalakeTree.length === 0) {
dispatch(fetchCatalogs({ metalake }))
}

dispatch(
setExpandedNodes([
`{{${metalake}}}`,
Expand Down Expand Up @@ -851,10 +831,6 @@ export const fetchTopics = createAsyncThunk(
)
}

if (getState().metalakes.metalakeTree.length === 0) {
dispatch(fetchCatalogs({ metalake }))
}

dispatch(
setExpandedNodes([
`{{${metalake}}}`,
Expand Down Expand Up @@ -884,10 +860,6 @@ export const getTopicDetails = createAsyncThunk(

const { topic: resTopic } = res

if (getState().metalakes.metalakeTree.length === 0) {
dispatch(fetchCatalogs({ metalake }))
}

dispatch(
setExpandedNodes([
`{{${metalake}}}`,
Expand Down
Loading