Merge pull request #321 from quenti-io/staging

fix: assignment creation flow + available at handling

Author: miapolis

apps/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenti/next",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "private": true,
   "scripts": {
     "build": "next build",

apps/next/src/modules/classes/pages/assignment-collab.tsx

@@ -59,7 +59,6 @@ export const AssignmentCollab = () => {
         <Skeleton isLoaded={isLoaded} rounded="lg" fitContent alignSelf="end">
           <Button
             w="max"
-            size="sm"
             rightIcon={<IconArrowRight size={18} />}
             isLoading={editCollab.isLoading}
             onClick={() => {

apps/next/src/modules/classes/pages/assignment-publish.tsx

@@ -138,7 +138,7 @@ export const AssignmentPublish = () => {
               </HStack>
             </Stack>
             {isLoaded ? (
-              <EditorContent editor={editor} />
+              assignment?.description && <EditorContent editor={editor} />
             ) : (
               <SkeletonText noOfLines={3} skeletonHeight={4} spacing="3" />
             )}

packages/trpc/server/routers/assignments/feed.handler.ts

@@ -98,6 +98,7 @@ const getStudent = async (
       classId,
       sectionId,
       published: true,
+      availableAt: { lte: new Date() },
       ...(query ? { title: { contains: query } } : {}),
     },
     select: {

packages/trpc/server/routers/assignments/get.handler.ts

@@ -157,6 +157,7 @@ const getStudent = async (
         classId,
       },
       AND: {
+        availableAt: { lte: new Date() },
         published: true,
       },
     },

packages/trpc/server/routers/study-sets/queries/collab.ts

@@ -50,6 +50,22 @@ export const collabSelect = (userId?: string) =>
 export const assignmentArgs = (userId: string) =>
   Prisma.validator<Prisma.StudySet$assignmentArgs>()({
     where: {
+      OR: [
+        {
+          availableAt: { lte: new Date() },
+        },
+        {
+          class: {
+            members: {
+              some: {
+                userId,
+                deletedAt: null,
+                type: "Teacher",
+              },
+            },
+          },
+        },
+      ],
       class: {
         members: {
           some: {