Connect, collaborate, and grow with a community of TypeScript developers
misc (#911)
bautistaaac634b4d72546
diff --git a/apps/admin/src/app/tracks/[trackId]/page.tsx b/apps/admin/src/app/tracks/[trackId]/page.tsxindex d71ce1ba..f3cf4209 100644--- a/apps/admin/src/app/tracks/[trackId]/page.tsx+++ b/apps/admin/src/app/tracks/[trackId]/page.tsx@@ -1,6 +1,5 @@import { prisma } from '@repo/db';import { UpdateTrackForm } from './_components/update-track-form';-import { cache } from 'react';export interface Props {params: {@@ -16,7 +15,7 @@ export default async function (props: Props) {}export type TrackToManage = NonNullable<Awaited<ReturnType<typeof getTrackById>>>;-const getTrackById = cache((id: number) => {+const getTrackById = (id: number) => {return prisma.track.findFirstOrThrow({where: {id,@@ -25,7 +24,7 @@ const getTrackById = cache((id: number) => {trackChallenges: true,},});-});+};export type ChallengesForTrack = NonNullable<Awaited<ReturnType<typeof getChallenges>>>;function getChallenges() {diff --git a/apps/web/src/app/[locale]/tracks/[slug]/error.tsx b/apps/web/src/app/[locale]/tracks/[slug]/error.tsxnew file mode 100644index 00000000..ae3f1a95--- /dev/null+++ b/apps/web/src/app/[locale]/tracks/[slug]/error.tsx@@ -0,0 +1,18 @@+'use client'; // Error components must be Client Components++import { Button } from '@repo/ui/components/button';+import { Text } from '@repo/ui/components/typography/typography';+import Link from 'next/link';++export default function Error() {+ return (+ <div className="container flex h-full flex-col items-center justify-center">+ <Text className="mb-6" intent="h2">+ Uh oh! We couldn't find the track you were looking for.+ </Text>+ <Link href="/tracks">+ <Button>Explore Tracks</Button>+ </Link>+ </div>+ );+}diff --git a/apps/web/src/app/[locale]/tracks/_components/track-enrolled-section.tsx b/apps/web/src/app/[locale]/tracks/_components/track-enrolled-section.tsxindex 6936fdf1..d9f58714 100644--- a/apps/web/src/app/[locale]/tracks/_components/track-enrolled-section.tsx+++ b/apps/web/src/app/[locale]/tracks/_components/track-enrolled-section.tsx@@ -36,7 +36,7 @@ export async function EnrolledTrackSection() {const tracks = await withUnstableCache({fn: getUserEnrolledTracks,args: [session],- keys: [createEnrolledTrackCacheKey(session.user.id)],+ keys: [],tags: [createEnrolledTrackCacheKey(session.user.id)],});diff --git a/apps/web/src/app/[locale]/tracks/_components/track-grid.tsx b/apps/web/src/app/[locale]/tracks/_components/track-grid.tsxindex 81a50ad0..95a4db07 100644--- a/apps/web/src/app/[locale]/tracks/_components/track-grid.tsx+++ b/apps/web/src/app/[locale]/tracks/_components/track-grid.tsx@@ -1,14 +1,17 @@-import { getServerAuthSession } from '@repo/auth/server';+import { getServerAuthSession, type Session } from '@repo/auth/server';import { prisma } from '@repo/db';import { withUnstableCache } from '~/utils/withUnstableCache';import { TrackCard } from './track-card';+export const createTrackGridCacheKey = (userId: string) => `user-${userId}-tracks`;export async function TrackGrid() {+ const session = await getServerAuthSession();+const tracks = await withUnstableCache({fn: getTracks,- args: [],- keys: ['tracks'],- tags: ['tracks'],+ args: [session],+ keys: [],+ tags: [createTrackGridCacheKey(session?.user.id ?? '')],});return (<div className="container flex items-center justify-between gap-3">@@ -21,8 +24,7 @@ export async function TrackGrid() {export type Tracks = Awaited<ReturnType<typeof getTracks>>;-async function getTracks() {- const session = await getServerAuthSession();+async function getTracks(session: Session | null) {return prisma.track.findMany({include: {_count: {diff --git a/apps/web/src/app/[locale]/tracks/_components/track.action.ts b/apps/web/src/app/[locale]/tracks/_components/track.action.tsindex 397bc728..0a75274b 100644--- a/apps/web/src/app/[locale]/tracks/_components/track.action.ts+++ b/apps/web/src/app/[locale]/tracks/_components/track.action.ts@@ -5,6 +5,7 @@ import { prisma } from '@repo/db';import { revalidateTag } from 'next/cache';import { cache } from 'react';import { createEnrolledTrackCacheKey } from './track-enrolled-section';+import { createTrackGridCacheKey } from './track-grid';/*** Enrolls the session user in the track given a track id.@@ -30,7 +31,7 @@ export async function enrollUserInTrack(id: number) {});revalidateTag(`track-${id}-detail`);- revalidateTag('tracks');+ revalidateTag(createTrackGridCacheKey(session.user.id));revalidateTag(createEnrolledTrackCacheKey(session.user.id));}@@ -58,7 +59,7 @@ export async function unenrollUserFromTrack(id: number) {});revalidateTag(`track-${id}-detail`);- revalidateTag('tracks');+ revalidateTag(createTrackGridCacheKey(session.user.id));revalidateTag(createEnrolledTrackCacheKey(session.user.id));}diff --git a/packages/db/mocks/challenges.mock.ts b/packages/db/mocks/challenges.mock.tsindex 898e5862..0d598456 100644--- a/packages/db/mocks/challenges.mock.ts+++ b/packages/db/mocks/challenges.mock.ts@@ -16,11 +16,16 @@ export interface InfoFile {difficulty: 'easy' | 'extreme' | 'hard' | 'medium' | 'warm';}+const redundantChallenges = ['pick', 'flatten'];++const creditLine = (author: string) =>+ `\n\n\nThis challenge was ported from [Type Challenges](https://tsch.js.org/) and was authored by [${author}](https://www.github.com/${author})`;+/*** @description clones the type-challenges repo and extracts our necessary data from them* @returns an array of data for the type challenges from the repo*/-export async function loadChallengesFromTypeChallenge() {+export async function loadChallengesFromTypeChallenge(isProd = false) {// Clone Repoconst git = simpleGit();await git.clone('https://github.com/type-challenges/type-challenges.git', 'tmp/type-challenges');@@ -34,12 +39,14 @@ export async function loadChallengesFromTypeChallenge() {for (const dir of folders) {const infoFile = resolve('./tmp/type-challenges/questions', dir.name, 'info.yml');const contents = await readFile(infoFile).then((r) => r.toString());- const { title, difficulty } = parse(contents) as InfoFile;+ const { title, difficulty, author } = parse(contents) as InfoFile;const README = await readFile(resolve(QUESTIONS_PATH, dir.name, 'README.md')).then((r) =>r.toString().replace(/<!--info-(header|footer)-start-->.*?<!--info-\1-end-->/g, ''),);+ const descriptionWithCredit = `${README}${creditLine(author.github)}`;+const prompt = await readFile(resolve(QUESTIONS_PATH, dir.name, 'template.ts')).then((f) =>f.toString(),);@@ -59,17 +66,19 @@ export async function loadChallengesFromTypeChallenge() {continue;}- arr.push({- id: idNum,- name: title,- slug: slugify(title),- description: README,- status: ChallengeStatus.ACTIVE,- code: prompt,- tests: testData,- difficulty: difficulty === 'warm' ? 'BEGINNER' : (difficulty.toUpperCase() as Difficulty),- shortDescription: README.slice(0, 100),- });+ if ((isProd && !redundantChallenges.includes(title.toLowerCase())) || !isProd) {+ arr.push({+ ...(isProd ? {} : { id: idNum }),+ name: title,+ slug: slugify(title),+ description: descriptionWithCredit,+ status: ChallengeStatus.ACTIVE,+ code: prompt,+ tests: testData,+ difficulty: difficulty === 'warm' ? 'BEGINNER' : (difficulty.toUpperCase() as Difficulty),+ shortDescription: README.slice(0, 100),+ });+ }}// Cleanupdiff --git a/packages/db/schema.prisma b/packages/db/schema.prismaindex 5993e85a..46af7c3a 100644--- a/packages/db/schema.prisma+++ b/packages/db/schema.prisma@@ -401,7 +401,10 @@ model Track {name String @uniqueslug String @uniquedescription String @db.MediumText+ /// determines if a track can be seen on tracks pagevisible Boolean @default(true)+ /// use this to display coming soon UI+ isComingSoon Boolean @default(false)trackChallenges TrackChallenge[]enrolledUsers User[]}diff --git a/packages/db/seed/prod.ts b/packages/db/seed/prod.tsindex d732efa7..8928d89f 100644--- a/packages/db/seed/prod.ts+++ b/packages/db/seed/prod.ts@@ -3,6 +3,8 @@ import { fileURLToPath } from 'node:url';import uuidByString from 'uuid-by-string';import { prisma } from '../src';import { ingestChallenges } from './data/challenge-ingest';+import { loadChallengesFromTypeChallenge } from '../mocks/challenges.mock';+import { tracks } from './data/tracks';const __filename = fileURLToPath(import.meta.url);const __dirname = path.dirname(__filename);@@ -11,8 +13,23 @@ const challengePath = path.join(__dirname, '../../../challenges');export const slugify = (str: string) => str.toLowerCase().replace(/\s/g, '-');const TYPE_CHALLENGE_ID = uuidByString('type-challenges');+const TYPEHERO_ID = uuidByString('typehero');try {+ const typeHeroUser = await prisma.user.upsert({+ where: { id: TYPEHERO_ID },+ update: {},+ create: {+ id: TYPEHERO_ID,+ email: '[email protected]',+ name: 'TypeHero',+ userLinks: {+ create: {+ url: 'https://typhero.dev',+ },+ },+ },+ });const typeChallengeUser = await prisma.user.upsert({where: { id: TYPE_CHALLENGE_ID },update: {},@@ -28,11 +45,59 @@ try {},});+ const challengesFromTypeChallenges = await loadChallengesFromTypeChallenge(true);const challengesToCreate = await ingestChallenges(challengePath);await prisma.challenge.createMany({- data: challengesToCreate.map((challenge) => ({ ...challenge, userId: typeChallengeUser.id })),+ data: challengesFromTypeChallenges.map((challenge) => ({+ ...challenge,+ userId: typeChallengeUser.id,+ })),+ });+ await prisma.challenge.createMany({+ data: challengesToCreate.map((challenge) => ({ ...challenge, userId: typeHeroUser.id })),});+ for (const track of tracks) {+ const createdTrack = await prisma.track.create({+ data: {+ name: track.name,+ slug: slugify(track.name),+ description: track.description,+ visible: true,+ isComingSoon: track.name !== 'TypeScript Foundations',+ },+ });++ if (track.name === 'TypeScript Foundations') {+ const challengesForTrack = await prisma.challenge.findMany({+ where: {+ slug: {+ in: [+ 'generic-type-arguments',+ 'generic-type-constraints',+ 'index-signatures',+ 'indexed-types',+ 'keyof',+ 'literal-types',+ 'mapped-object-types',+ 'primitive-data-types',+ 'type-aliases',+ 'type-unions',+ 'typeof',+ ],+ },+ },+ });+ await prisma.trackChallenge.createMany({+ data: challengesForTrack.map((challenge, index) => ({+ challengeId: challenge.id,+ trackId: createdTrack.id,+ orderId: index,+ })),+ });+ }+ }+await prisma.$disconnect();} catch (e) {console.error(e);