Skip to content
This repository was archived by the owner on Nov 1, 2024. It is now read-only.

fix loading confusing message and front page product area link #289

Merged
merged 1 commit into from
Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 components/productArea/productAreaLinks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ const ProductAreaHasItems = (p: any)=> !!p?.teams.filter((it: any)=> it.dataprod

const ProductAreaLinks = () => {
var defaultProductAreaID = '6b149078-927b-4570-a1ce-97bbb9499fb6'
const {productAreas} = useGetProductAreas()
const {productAreas, error} = useGetProductAreas()
const productAreaWithItems = productAreas?.filter(it=> ProductAreaHasItems(it));
if(productAreaWithItems.length>0){
defaultProductAreaID = productAreaWithItems.find(it=> it.id== defaultProductAreaID)?.id || productAreaWithItems[0].id
}else{
}else if(error){
return null
}

Expand Down
5 changes: 5 additions & 0 deletions pages/dataproduct/new.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,15 @@ import {
import { GetServerSideProps } from 'next'
import { addApolloState, initializeApollo } from '../../lib/apollo'
import InnerContainer from '../../components/lib/innerContainer'
import LoaderSpinner from '../../components/lib/spinner'

const NewDataproduct = () => {
const userInfo = useUserInfoDetailsQuery()

if(!userInfo || userInfo.loading){
return <LoaderSpinner />
}

if (!userInfo.data?.userInfo)
return (
<div>
Expand Down
5 changes: 5 additions & 0 deletions pages/insightProduct/new.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,15 @@ import {
import { GetServerSideProps } from 'next'
import { addApolloState, initializeApollo } from '../../lib/apollo'
import InnerContainer from '../../components/lib/innerContainer'
import LoaderSpinner from '../../components/lib/spinner'

const NewInsightProduct = () => {
const userInfo = useUserInfoDetailsQuery()

if(!userInfo || userInfo.loading){
return <LoaderSpinner />
}

if (!userInfo.data?.userInfo)
return (
<div>
Expand Down
5 changes: 5 additions & 0 deletions pages/story/new.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,15 @@ import {
import { GetServerSideProps } from 'next'
import { addApolloState, initializeApollo } from '../../lib/apollo'
import InnerContainer from '../../components/lib/innerContainer'
import LoaderSpinner from '../../components/lib/spinner'

const NewStory = () => {
const userInfo = useUserInfoDetailsQuery()

if(!userInfo || userInfo.loading){
return <LoaderSpinner />
}

if (!userInfo.data?.userInfo)
return (
<div>
Expand Down
5 changes: 5 additions & 0 deletions pages/user/[[...page]].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ export const UserPages = () => {

if (error) return <ErrorMessage error={error} />
if (loading || !data) return <LoaderSpinner />

if(loading){
return <LoaderSpinner />
}

if (!data.userInfo)
return (
<div>
Expand Down