Skip to content

[#12200] fix(web-v2): Gate metalake fetch until OAuth token is ready #12203

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

Open
vanphuoc3012 wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −11
Open

[#12200] fix(web-v2): Gate metalake fetch until OAuth token is ready #12203

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
12 changes: 10 additions & 2 deletions web-v2/web/src/app/metalakes/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ const MetalakeList = () => {
const [search, setSearch] = useState('')
const [ownerRefreshKey, setOwnerRefreshKey] = useState(0)
const auth = useAppSelector(state => state.auth)
const { serviceAdmins, authUser, anthEnable } = auth
const { serviceAdmins, authUser, anthEnable, authType, authToken } = auth
const isAuthReady = authType && (authType !== 'oauth' || !!authToken)
const admins = normalizeServiceAdmins(serviceAdmins)
const isServiceAdmin = admins.includes(authUser?.name)
const dispatch = useAppDispatch()
Expand All @@ -79,9 +80,16 @@ const MetalakeList = () => {

useEffect(() => {
dispatch(resetMetalakeStore())
dispatch(fetchMetalakes())
}, [dispatch])

useEffect(() => {
if (!isAuthReady) {
return
Comment on lines +85 to +87
}

dispatch(fetchMetalakes())
}, [dispatch, isAuthReady])

useEffect(() => {
const filteredData = store.metalakes
.filter(i => i.name.toLowerCase().includes(search.toLowerCase()))
Expand Down
30 changes: 21 additions & 9 deletions web-v2/web/src/lib/store/metalakes/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,19 +108,31 @@ const mergeWithViewNodes = ({ tree, key, entities }) => {
return _.uniqBy([...subSchemas, ...tables, ...functions, ...entities], 'key')
}

export const fetchMetalakes = createAsyncThunk('appMetalakes/fetchMetalakes', async (params, { getState }) => {
const [err, res] = await to(getMetalakesApi())
const isAuthReady = state => {
const { authType, authToken } = state.auth

if (err || !res) {
throw new Error(err)
}
return !!authType && (authType !== 'oauth' || !!authToken)
}

const { metalakes } = res
export const fetchMetalakes = createAsyncThunk(
'appMetalakes/fetchMetalakes',
async () => {
const [err, res] = await to(getMetalakesApi())

metalakes.sort((a, b) => new Date(b.audit.createTime) - new Date(a.audit.createTime))
if (err || !res) {
throw new Error(err)
}

return { metalakes }
})
const { metalakes } = res

metalakes.sort((a, b) => new Date(b.audit.createTime) - new Date(a.audit.createTime))

return { metalakes }
},
{
condition: (_, { getState }) => isAuthReady(getState())
}
)

export const createMetalake = createAsyncThunk('appMetalakes/createMetalake', async (data, { getState, dispatch }) => {
const [err, res] = await to(createMetalakeApi(data))
Expand Down