diff --git a/studio/components/to-be-cleaned/DisplayProjectSettings.tsx b/studio/components/to-be-cleaned/DisplayProjectSettings.tsx index 334fc76c771..fde666ff8dd 100644 --- a/studio/components/to-be-cleaned/DisplayProjectSettings.tsx +++ b/studio/components/to-be-cleaned/DisplayProjectSettings.tsx @@ -2,7 +2,7 @@ import useSWR from 'swr' import { FC } from 'react' import { useRouter } from 'next/router' import { get } from 'lib/common/fetch' -import { ProjectEvents } from '@supabase/shared-types/out/events' +import { JwtSecretUpdateStatus, ProjectEvents } from '@supabase/shared-types/out/events' import { IconAlertCircle, Input, Loading, Typography } from '@supabase/ui' import { useJwtSecretUpdateStatus } from 'hooks' @@ -23,14 +23,9 @@ export const DisplayApiSettings = () => { jwtSecretUpdateStatus, }: any = useJwtSecretUpdateStatus(ref) - const { - ProjectJwtSecretUpdated: JwtSecretUpdated, - ProjectJwtSecretUpdateFailure: JwtSecretUpdateFailure, - ProjectJwtSecretUpdateProgress: JwtSecretUpdateProgress, - } = ProjectEvents - const isNotUpdatingJwtSecret = - !jwtSecretUpdateStatus || jwtSecretUpdateStatus === JwtSecretUpdated + jwtSecretUpdateStatus === undefined || jwtSecretUpdateStatus === JwtSecretUpdateStatus.Updated + console.log(isNotUpdatingJwtSecret) if (!data || isJwtSecretUpdateStatusLoading) return ( @@ -95,9 +90,9 @@ export const DisplayApiSettings = () => { disabled reveal={x.tags !== 'anon' && isNotUpdatingJwtSecret} value={ - jwtSecretUpdateStatus === JwtSecretUpdateFailure + jwtSecretUpdateStatus === JwtSecretUpdateStatus.Failed ? 'JWT secret update failed, new API key may have issues' - : jwtSecretUpdateStatus === JwtSecretUpdateProgress + : jwtSecretUpdateStatus === JwtSecretUpdateStatus.Updating ? 'Updating JWT secret...' : x.api_key } @@ -126,14 +121,8 @@ export const DisplayConfigSettings = () => { jwtSecretUpdateStatus, }: any = useJwtSecretUpdateStatus(ref) - const { - ProjectJwtSecretUpdated: JwtSecretUpdated, - ProjectJwtSecretUpdateFailure: JwtSecretUpdateFailure, - ProjectJwtSecretUpdateProgress: JwtSecretUpdateProgress, - } = ProjectEvents - const isNotUpdatingJwtSecret = - !jwtSecretUpdateStatus || jwtSecretUpdateStatus === JwtSecretUpdated + jwtSecretUpdateStatus === undefined || jwtSecretUpdateStatus === JwtSecretUpdateStatus.Updated if (!data || isJwtSecretUpdateStatusLoading) return ( @@ -192,9 +181,9 @@ export const DisplayConfigSettings = () => { reveal={isNotUpdatingJwtSecret} disabled value={ - jwtSecretUpdateStatus === JwtSecretUpdateFailure + jwtSecretUpdateStatus === JwtSecretUpdateStatus.Failed ? 'JWT secret update failed' - : jwtSecretUpdateStatus === JwtSecretUpdateProgress + : jwtSecretUpdateStatus === JwtSecretUpdateStatus.Updating ? 'Updating JWT secret...' : jwtSecret } diff --git a/studio/hooks/queries/useJwtSecretUpdateStatus.ts b/studio/hooks/queries/useJwtSecretUpdateStatus.ts index 0d829ea1aa2..898ca22c93a 100644 --- a/studio/hooks/queries/useJwtSecretUpdateStatus.ts +++ b/studio/hooks/queries/useJwtSecretUpdateStatus.ts @@ -1,24 +1,23 @@ import useSWR from 'swr' import { get } from 'lib/common/fetch' -import { ProjectEvents } from '@supabase/shared-types/out/events' +import { JwtSecretUpdateStatus } from '@supabase/shared-types/out/events' import { API_URL } from 'lib/constants' export function useJwtSecretUpdateStatus(projectRef: string | string[] | undefined) { const url = `${API_URL}/props/project/${projectRef}/jwt-secret-update-status` const { data, error, mutate } = useSWR(url, get, { refreshInterval: (data) => - data?.jwtSecretUpdateStatus?.event_type === ProjectEvents.ProjectJwtSecretUpdateProgress - ? 1_000 - : 0, + data?.jwtSecretUpdateStatus?.meta?.status === JwtSecretUpdateStatus.Updating ? 1_000 : 0, }) const anyError = data?.error || error - + const meta = data?.jwtSecretUpdateStatus?.meta return { - changeTrackingId: data?.jwtSecretUpdateStatus?.meta?.change_tracking_id, + changeTrackingId: meta?.change_tracking_id, isError: !!anyError, isLoading: !anyError && !data, + jwtSecretUpdateError: meta?.error, + jwtSecretUpdateProgress: meta?.progress, + jwtSecretUpdateStatus: meta?.status, mutateJwtSecretUpdateStatus: mutate, - jwtSecretUpdateMessage: data?.jwtSecretUpdateStatus?.meta?.message, - jwtSecretUpdateStatus: data?.jwtSecretUpdateStatus?.event_type, } } diff --git a/studio/pages/project/[ref]/settings/api.tsx b/studio/pages/project/[ref]/settings/api.tsx index 8096635c90e..fbffd0b443b 100644 --- a/studio/pages/project/[ref]/settings/api.tsx +++ b/studio/pages/project/[ref]/settings/api.tsx @@ -4,7 +4,12 @@ import { indexOf } from 'lodash' import { useRouter } from 'next/router' import { AutoField } from 'uniforms-bootstrap4' import { observer, useLocalObservable } from 'mobx-react-lite' -import { ProjectEvents } from '@supabase/shared-types/out/events' +import { + JwtSecretUpdateError, + JwtSecretUpdateProgress, + JwtSecretUpdateStatus, + ProjectEvents, +} from '@supabase/shared-types/out/events' import { Typography, Input, @@ -30,6 +35,26 @@ import { DisplayApiSettings } from 'components/to-be-cleaned/DisplayProjectSetti import ConfirmationModal from 'components/ui/ConfirmationModal' import { uuidv4 } from 'lib/helpers' +const JWT_SECRET_UPDATE_ERROR_MESSAGES = { + [JwtSecretUpdateError.APIServicesConfigurationUpdateFailed]: + 'failed to update configuration for API services', + [JwtSecretUpdateError.APIServicesRestartFailed]: 'failed to restart API services', + [JwtSecretUpdateError.DatabaseAdminAPIConfigurationUpdateFailed]: + 'failed to update configuration for database admin API', + [JwtSecretUpdateError.PostgreSQLRestartFailed]: 'failed to restart PostgreSQL service', + [JwtSecretUpdateError.SupabaseAPIKeyUpdateFailed]: 'failed to update Supabase API key', +} + +const JWT_SECRET_UPDATE_PROGRESS_MESSAGES = { + [JwtSecretUpdateProgress.RestartedAPIServices]: 'restarted API services', + [JwtSecretUpdateProgress.RestartedPostgreSQL]: 'restarted PostgreSQL service', + [JwtSecretUpdateProgress.Started]: 'started updating', + [JwtSecretUpdateProgress.UpdatedAPIServicesConfiguration]: + 'updated configuration for API services', + [JwtSecretUpdateProgress.UpdatedDatabaseAdminAPIConfiguration]: + 'updated configuration for database admin API', +} + const PageContext: any = createContext(null) const ApiSettings = () => { @@ -95,35 +120,37 @@ const ServiceList: FC = ({ projectRef }) => { changeTrackingId, isError: isJwtSecretUpdateStatusError, isLoading: isJwtSecretUpdateStatusLoading, - mutateJwtSecretUpdateStatus, - jwtSecretUpdateMessage, + jwtSecretUpdateError, + jwtSecretUpdateProgress, jwtSecretUpdateStatus, + mutateJwtSecretUpdateStatus, }: any = useJwtSecretUpdateStatus(ref) - const { - ProjectJwtSecretUpdated: JwtSecretUpdated, - ProjectJwtSecretUpdateFailure: JwtSecretUpdateFailure, - ProjectJwtSecretUpdateProgress: JwtSecretUpdateProgress, - } = ProjectEvents + const { Failed, Updated, Updating } = JwtSecretUpdateStatus - const isJwtSecretUpdateFailure = jwtSecretUpdateStatus === JwtSecretUpdateFailure - const isJwtSecretUpdateProgress = jwtSecretUpdateStatus === JwtSecretUpdateProgress + const isJwtSecretUpdateFailed = jwtSecretUpdateStatus === Failed const isNotUpdatingJwtSecret = - !jwtSecretUpdateStatus || jwtSecretUpdateStatus === JwtSecretUpdated + jwtSecretUpdateStatus === undefined || jwtSecretUpdateStatus === Updated + console.log(isNotUpdatingJwtSecret) + const isUpdatingJwtSecret = jwtSecretUpdateStatus === Updating + const jwtSecretUpdateErrorMessage = + JWT_SECRET_UPDATE_ERROR_MESSAGES[jwtSecretUpdateError as JwtSecretUpdateError] + const jwtSecretUpdateProgressMessage = + JWT_SECRET_UPDATE_PROGRESS_MESSAGES[jwtSecretUpdateProgress as JwtSecretUpdateProgress] const previousJwtSecretUpdateStatus = useRef() useEffect(() => { - if (previousJwtSecretUpdateStatus.current === JwtSecretUpdateProgress) { + if (previousJwtSecretUpdateStatus.current === Updating) { switch (jwtSecretUpdateStatus) { - case JwtSecretUpdated: + case Updated: mutateConfig() mutateSettings() ui.setNotification({ category: 'success', message: 'Successfully updated JWT secret' }) break - case JwtSecretUpdateFailure: + case Failed: ui.setNotification({ category: 'error', - message: `JWT secret update failed: ${jwtSecretUpdateMessage}`, + message: `JWT secret update failed: ${jwtSecretUpdateErrorMessage}`, }) break } @@ -223,9 +250,9 @@ const ServiceList: FC = ({ projectRef }) => { reveal={isNotUpdatingJwtSecret} disabled value={ - isJwtSecretUpdateFailure + isJwtSecretUpdateFailed ? 'JWT secret update failed' - : isJwtSecretUpdateProgress + : isUpdatingJwtSecret ? 'Updating JWT secret...' : config?.jwt_secret || '' } @@ -237,18 +264,18 @@ const ServiceList: FC = ({ projectRef }) => { />
- {isJwtSecretUpdateFailure ? ( + {isJwtSecretUpdateFailed ? ( Failed to update JWT secret, please contact Supabase support with the following details:
Change tracking ID: {changeTrackingId}
- Error message: {jwtSecretUpdateMessage} + Error message: {jwtSecretUpdateErrorMessage} ) : ( <> - {isJwtSecretUpdateProgress ? ( + {isUpdatingJwtSecret ? ( - JWT secret update progress: {jwtSecretUpdateMessage} + JWT secret update progress: {jwtSecretUpdateProgressMessage} ) : (
@@ -267,7 +294,7 @@ const ServiceList: FC = ({ projectRef }) => {
)}
- {isJwtSecretUpdateProgress ? ( + {isUpdatingJwtSecret ? (