Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-03-31 22:51:25 -05:00
Code Issues Activity

Merge pull request #1070 from logto-io/charles-log-2880-fix-check-demo-app-logic

Browse source 
fix(console): only check demo app existence on get-started page
This commit is contained in:
Charles Zhao 2022-06-08 14:27:21 +08:00 • committed by GitHub
commit 8b1e9c2a81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/console/src/pages/GetStarted/components/GetStartedProgress/index.tsx
View file

@ -17,7 +17,7 @@ const GetStartedProgress = () => {
} = useUserPreferences();
const anchorRef = useRef<HTMLDivElement>(null);
const [showDropDown, setShowDropdown] = useState(false);
const { data, completedCount, totalCount } = useGetStartedMetadata();
const { data, completedCount, totalCount } = useGetStartedMetadata({ checkDemoAppExists: false });
if (hideGetStarted) {
return null;

27
packages/console/src/pages/GetStarted/hook.ts
View file

@ -23,17 +23,24 @@ type GetStartedMetadata = {
onClick: () => void;
};
const useGetStartedMetadata = () => {
const { settings, updateSettings } = useSettings();
const { data: demoApp, error } = useSWR<Application, RequestError>('/api/applications/demo_app', {
shouldRetryOnError: (error: unknown) => {
if (error instanceof RequestError) {
return error.status !== 404;
}
type Props = {
checkDemoAppExists: boolean;
};
return true;
},
});
const useGetStartedMetadata = ({ checkDemoAppExists }: Props) => {
const { settings, updateSettings } = useSettings();
const { data: demoApp, error } = useSWR<Application, RequestError>(
checkDemoAppExists && '/api/applications/demo_app',
{
shouldRetryOnError: (error: unknown) => {
if (error instanceof RequestError) {
return error.status !== 404;
}
return true;
},
}
);
const navigate = useNavigate();
const isLoadingDemoApp = !demoApp && !error;
const hideDemo = error?.status === 404;

2
packages/console/src/pages/GetStarted/index.tsx
View file

@ -16,7 +16,7 @@ import * as styles from './index.module.scss';
const GetStarted = () => {
const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
const navigate = useNavigate();
const { data, isLoading } = useGetStartedMetadata();
const { data, isLoading } = useGetStartedMetadata({ checkDemoAppExists: true });
const { update } = useUserPreferences();
const [showConfirmModal, setShowConfirmModal] = useState(false);