Skip to content

Commit c6b18e8

Browse files
authored
Merge branch 'main' into issues/462
2 parents 23cd882 + c336bbd commit c6b18e8

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/docker_publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
echo "REGISTRY=${{ matrix.registry }}" >> $GITHUB_ENV
8686
echo "REPOSITORY=${{ github.repository }}" >> $GITHUB_ENV
8787
elif [ ${{ matrix.registry }} == 'ecr' ]; then
88-
echo "REGISTRY=${{ steps.login-ecr-public.outputs.registry }}" >> $GITHUB_ENV
88+
echo "REGISTRY=${{ vars.ECR_REGISTRY }}" >> $GITHUB_ENV
8989
echo "REPOSITORY=${{ github.repository }}" >> $GITHUB_ENV
9090
else
9191
echo "REGISTRY=" >> $GITHUB_ENV

frontend/src/components/PageContainer/PageContainer.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, {
22
type FC,
33
type PropsWithChildren,
4+
Suspense,
45
useEffect,
56
useMemo,
67
} from 'react';
@@ -15,6 +16,7 @@ import { useClusters } from 'lib/hooks/api/clusters';
1516
import { ResourceType } from 'generated-sources';
1617
import { useGetUserInfo } from 'lib/hooks/api/roles';
1718
import { useScreenSize } from 'lib/hooks/useScreenSize';
19+
import PageLoader from 'components/common/PageLoader/PageLoader';
1820

1921
const PageContainer: FC<PropsWithChildren> = ({ children }) => {
2022
const { isLarge } = useScreenSize();
@@ -62,7 +64,7 @@ const PageContainer: FC<PropsWithChildren> = ({ children }) => {
6264
aria-hidden="true"
6365
aria-label="Overlay"
6466
/>
65-
{children}
67+
<Suspense fallback={<PageLoader fullSize />}>{children}</Suspense>
6668
</S.Container>
6769
</>
6870
);

0 commit comments

Comments
 (0)