@@ -535,7 +535,7 @@ export const ResourceView: React.FunctionComponent = () => {
535
535
const { push } = useHistory ( )
536
536
const { resource, findResource } = useResourceStore ( )
537
537
const { hasPermission } = useAuthStore ( )
538
- const { toast } = useToastStore ( )
538
+ const [ isLoading , setIsLoading ] = useState ( true )
539
539
540
540
const { resource : resourceSlug } = useParams < {
541
541
resource : string
@@ -547,6 +547,8 @@ export const ResourceView: React.FunctionComponent = () => {
547
547
if ( ! found ) {
548
548
push ( window . Tensei . getPath ( '' ) )
549
549
}
550
+
551
+ setIsLoading ( false )
550
552
} , [ resourceSlug ] )
551
553
552
554
const { setSidebarState } = useSidebarStore ( )
@@ -559,7 +561,7 @@ export const ResourceView: React.FunctionComponent = () => {
559
561
{ hasPermission ( `create:${ resource ?. slugPlural } ` ) ? (
560
562
< Link to = { window . Tensei . getPath ( `resources/${ resourceSlug } /create` ) } >
561
563
< EuiButton
562
- size = { 's ' }
564
+ size = { 'm ' }
563
565
fill
564
566
iconType = { 'plus' }
565
567
onClick = { ( ) => {
@@ -573,13 +575,11 @@ export const ResourceView: React.FunctionComponent = () => {
573
575
</ DashboardLayout . Topbar >
574
576
< DashboardLayout . Content >
575
577
< PageWrapper >
576
- { resource ? (
577
- hasPermission ( `index:${ resource ?. slugPlural } ` ) ? (
578
- < Resource resource = { resource } />
579
- ) : null
580
- ) : (
578
+ { isLoading ? (
581
579
< p > Loading ...</ p >
582
- ) }
580
+ ) : hasPermission ( `index:${ resource ?. slugPlural } ` ) ? (
581
+ < Resource resource = { resource ! } />
582
+ ) : null }
583
583
</ PageWrapper >
584
584
</ DashboardLayout . Content >
585
585
</ >
0 commit comments