Skip to content

Fix import and enum name issues #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 22, 2024
Merged

Fix import and enum name issues #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c232b39
Remove unused import and fix typo in useRoute.ts
shivam-bit Apr 22, 2024
9f5e65d
Fix enum name in onboarding.ts and v2.ts
shivam-bit Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions web-server/pages/api/resources/orgs/[org_id]/onboarding.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
});

Expand All @@ -27,15 +26,15 @@ 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[])
);
});

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);
Expand All @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions web-server/pages/api/resources/orgs/[org_id]/teams/v2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down Expand Up @@ -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(
Expand Down
8 changes: 3 additions & 5 deletions web-server/src/constants/useRoute.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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 =
Expand Down
6 changes: 0 additions & 6 deletions web-server/src/types/resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}