diff --git a/web-server/pages/api/resources/orgs/[org_id]/onboarding.ts b/web-server/pages/api/resources/orgs/[org_id]/onboarding.ts index f35e2931e..7c6509544 100644 --- a/web-server/pages/api/resources/orgs/[org_id]/onboarding.ts +++ b/web-server/pages/api/resources/orgs/[org_id]/onboarding.ts @@ -2,13 +2,12 @@ import * as yup from 'yup'; import { Endpoint, nullSchema } from '@/api-helpers/global'; import { Columns, Table } from '@/constants/db'; -import { OnboardingSteps } from '@/types/resources'; import { db } from '@/utils/db'; const putSchema = yup.object().shape({ onboarding_state: yup .array() - .of(yup.string().oneOf(Object.values(OnboardingSteps)).required()) + .of(yup.string().oneOf(Object.values(OnboardingStep)).required()) .required() }); @@ -27,7 +26,7 @@ endpoint.handle.PUT(putSchema, async (req, res) => { const { org_id, onboarding_state } = req.payload; return res.send( - await updateOnBoardingState(org_id, onboarding_state as OnboardingSteps[]) + await updateOnBoardingState(org_id, onboarding_state as OnboardingStep[]) ); }); @@ -35,7 +34,7 @@ export default endpoint.serve(); export const getOnBoardingState = async ( org_id: string -): Promise<{ onboarding_state: OnboardingSteps[] }> => { +): Promise<{ onboarding_state: OnboardingStep[] }> => { const results = await db(Table.UIPreferences) .select(Columns[Table.UIPreferences].data) .where(Columns[Table.UIPreferences].entity_id, org_id); @@ -44,8 +43,8 @@ export const getOnBoardingState = async ( export const updateOnBoardingState = async ( org_id: ID, - onboarding_state: OnboardingSteps[] -): Promise<{ onboarding_state: OnboardingSteps[] }> => { + onboarding_state: OnboardingStep[] +): Promise<{ onboarding_state: OnboardingStep[] }> => { const results = await db(Table.UIPreferences) .insert({ entity_type: 'ORG', diff --git a/web-server/pages/api/resources/orgs/[org_id]/teams/v2.ts b/web-server/pages/api/resources/orgs/[org_id]/teams/v2.ts index 7e683d966..843411515 100644 --- a/web-server/pages/api/resources/orgs/[org_id]/teams/v2.ts +++ b/web-server/pages/api/resources/orgs/[org_id]/teams/v2.ts @@ -17,7 +17,7 @@ import { Columns, Table } from '@/constants/db'; import { Integration } from '@/constants/integrations'; import { getTeamV2Mock } from '@/mocks/teams'; import { BaseTeam } from '@/types/api/teams'; -import { OnboardingSteps, ReqOrgRepo } from '@/types/resources'; +import { ReqOrgRepo } from '@/types/resources'; import { db, getFirstRow } from '@/utils/db'; const getSchema = yup.object().shape({ @@ -123,7 +123,7 @@ endpoint.handle.POST(postSchema, async (req, res) => { getOnBoardingState(org_id) ]); const updatedOnboardingState = Array.from( - new Set(onboardingState.onboarding_state).add(OnboardingSteps.TEAM_CREATED) + new Set(onboardingState.onboarding_state).add(OnboardingStep.TEAM_CREATED) ); const [teamRepos] = await Promise.all([ addReposToTeam( diff --git a/web-server/src/constants/useRoute.ts b/web-server/src/constants/useRoute.ts index 473ea00a0..90cfc0a43 100644 --- a/web-server/src/constants/useRoute.ts +++ b/web-server/src/constants/useRoute.ts @@ -2,7 +2,7 @@ import { useRouter } from 'next/router'; import { useEffect } from 'react'; import { useAuth } from '@/hooks/useAuth'; -import { OnboardingSteps, UserRole } from '@/types/resources'; +import { UserRole } from '@/types/resources'; import { ROUTES } from './routes'; @@ -15,12 +15,10 @@ export const useRedirectWithSession = () => { const router = useRouter(); const { org, orgId, onboardingState } = useAuth(); - const isOrgWelcomed = onboardingState.includes( - OnboardingSteps.WELCOME_SCREEN - ); + const isOrgWelcomed = onboardingState.includes(OnboardingStep.WELCOME_SCREEN); const anyTeamEverExisted = onboardingState.includes( - OnboardingSteps.TEAM_CREATED + OnboardingStep.TEAM_CREATED ); const isOneCodeProviderIntegrated = diff --git a/web-server/src/types/resources.ts b/web-server/src/types/resources.ts index 12e5bab34..37ab1e454 100644 --- a/web-server/src/types/resources.ts +++ b/web-server/src/types/resources.ts @@ -994,9 +994,3 @@ export interface UserStat { MERGED: number; REVIEWED: number; } - -export enum OnboardingSteps { - 'WELCOME_SCREEN' = 'WELCOME_SCREEN', - 'CODE_PROVIDER_INTEGRATED' = 'CODE_PROVIDER_INTEGRATED', - 'TEAM_CREATED' = 'TEAM_CREATED' -}