diff --git a/backend/apps/mentorship/api/internal/queries/module.py b/backend/apps/mentorship/api/internal/queries/module.py
index a9951d0a82..fd93effbc5 100644
--- a/backend/apps/mentorship/api/internal/queries/module.py
+++ b/backend/apps/mentorship/api/internal/queries/module.py
@@ -3,14 +3,15 @@
import logging
import strawberry
-from django.db.models import Q
+from django.db.models import Prefetch, Q
+from django.db.models.functions import Lower
from apps.mentorship.api.internal.graphql_errors import (
AuthenticationRequiredError,
ManagementProgramAccessDeniedError,
)
from apps.mentorship.api.internal.nodes.module import ModuleNode
-from apps.mentorship.models import Module, Program
+from apps.mentorship.models import Mentor, Module, Program
logger = logging.getLogger(__name__)
@@ -35,7 +36,14 @@ def get_program_modules(self, info: strawberry.Info, program_key: str) -> list[M
return (
Module.objects.filter(program=program)
.select_related("program", "project")
- .prefetch_related("mentors__github_user")
+ .prefetch_related(
+ Prefetch(
+ "mentors",
+ queryset=Mentor.objects.select_related("github_user").order_by(
+ Lower("github_user__login")
+ ),
+ )
+ )
.order_by("order", "started_at")
)
@@ -66,7 +74,14 @@ def get_management_program_modules(
return (
modules.select_related("program", "project")
- .prefetch_related("mentors__github_user")
+ .prefetch_related(
+ Prefetch(
+ "mentors",
+ queryset=Mentor.objects.select_related("github_user").order_by(
+ Lower("github_user__login")
+ ),
+ )
+ )
.distinct()
.order_by("order", "started_at")
)
@@ -77,7 +92,14 @@ def get_project_modules(self, project_key: str) -> list[ModuleNode]:
return (
Module.objects.filter(project__key=project_key)
.select_related("program", "project")
- .prefetch_related("mentors__github_user")
+ .prefetch_related(
+ Prefetch(
+ "mentors",
+ queryset=Mentor.objects.select_related("github_user").order_by(
+ Lower("github_user__login")
+ ),
+ )
+ )
.order_by("order", "started_at")
)
@@ -89,7 +111,14 @@ def get_module(
try:
module = (
Module.objects.select_related("program", "project")
- .prefetch_related("mentors__github_user")
+ .prefetch_related(
+ Prefetch(
+ "mentors",
+ queryset=Mentor.objects.select_related("github_user").order_by(
+ Lower("github_user__login")
+ ),
+ )
+ )
.get(key=module_key, program__key=program_key)
)
except Module.DoesNotExist:
@@ -116,7 +145,14 @@ def get_management_module(
try:
module = (
Module.objects.select_related("program", "project")
- .prefetch_related("mentors__github_user")
+ .prefetch_related(
+ Prefetch(
+ "mentors",
+ queryset=Mentor.objects.select_related("github_user").order_by(
+ Lower("github_user__login")
+ ),
+ )
+ )
.get(key=module_key, program__key=program_key)
)
except Module.DoesNotExist:
diff --git a/frontend/__tests__/unit/components/ModuleForm.test.tsx b/frontend/__tests__/unit/components/ModuleForm.test.tsx
index 5beb3f837a..a72e94e392 100644
--- a/frontend/__tests__/unit/components/ModuleForm.test.tsx
+++ b/frontend/__tests__/unit/components/ModuleForm.test.tsx
@@ -325,12 +325,21 @@ describe('ModuleForm', () => {
expect(screen.getByTestId('text-input-module-labels')).toBeInTheDocument()
})
- it('renders mentor logins field only when isEdit is true (line 312)', () => {
- renderModuleForm({ isEdit: false })
- expect(screen.queryByTestId('text-input-module-mentor-logins')).not.toBeInTheDocument()
-
- renderModuleForm({ isEdit: true })
+ it('renders and updates mentor logins field', () => {
+ renderModuleForm()
expect(screen.getByTestId('text-input-module-mentor-logins')).toBeInTheDocument()
+
+ const input = screen.getByTestId('input-module-mentor-logins')
+ fireEvent.change(input, { target: { value: 'johndoe, Kateryna' } })
+ expect(mockSetFormData).toHaveBeenCalled()
+
+ const setterFn = mockSetFormData.mock.calls[mockSetFormData.mock.calls.length - 1][0]
+ const result = setterFn(defaultFormData)
+ expect(result).toEqual(
+ expect.objectContaining({
+ mentorLogins: 'johndoe, Kateryna',
+ })
+ )
})
})
@@ -375,13 +384,6 @@ describe('ModuleForm', () => {
expect(mockSetFormData).toHaveBeenCalled()
})
- it('updates mentor logins field when in edit mode (line 312)', () => {
- renderModuleForm({ isEdit: true })
- const mentorInput = screen.getByTestId('input-module-mentor-logins')
- fireEvent.change(mentorInput, { target: { value: 'johndoe, Kateryna' } })
-
- expect(mockSetFormData).toHaveBeenCalled()
- })
it('updates start date field', () => {
renderModuleForm()
diff --git a/frontend/src/app/globals.css b/frontend/src/app/globals.css
index f2115fc706..e9e698acd9 100644
--- a/frontend/src/app/globals.css
+++ b/frontend/src/app/globals.css
@@ -482,3 +482,32 @@ select:disabled,
.chapter-map .leaflet-marker-shadow {
cursor: pointer !important;
}
+
+/* MarkdownWrapper CSS */
+
+.md-wrapper p {
+ margin: 0 0 16px;
+}
+
+.md-wrapper ul {
+ margin: 16px 0;
+ padding-left: 24px;
+}
+
+.md-wrapper ol {
+ margin: 16px 0;
+ padding-left: 24px;
+}
+
+.md-wrapper li {
+ margin-bottom: 8px;
+}
+
+.md-wrapper h1,
+.md-wrapper h2,
+.md-wrapper h3,
+.md-wrapper h4,
+.md-wrapper h5,
+.md-wrapper h6 {
+ margin: 24px 0 16px;
+}
diff --git a/frontend/src/app/my/mentorship/programs/[programKey]/modules/[moduleKey]/edit/page.tsx b/frontend/src/app/my/mentorship/programs/[programKey]/modules/[moduleKey]/edit/page.tsx
index 947e1e286b..42fd7b055b 100644
--- a/frontend/src/app/my/mentorship/programs/[programKey]/modules/[moduleKey]/edit/page.tsx
+++ b/frontend/src/app/my/mentorship/programs/[programKey]/modules/[moduleKey]/edit/page.tsx
@@ -190,7 +190,6 @@ const EditModulePage = () => {
onSubmit={handleSubmit}
loading={mutationLoading}
submitText="Save"
- isEdit
validationErrors={validationErrors}
minDate={
data?.managementProgram?.startedAt
diff --git a/frontend/src/app/my/mentorship/programs/[programKey]/modules/create/page.tsx b/frontend/src/app/my/mentorship/programs/[programKey]/modules/create/page.tsx
index 042a3c8fb4..e8c5f6bb99 100644
--- a/frontend/src/app/my/mentorship/programs/[programKey]/modules/create/page.tsx
+++ b/frontend/src/app/my/mentorship/programs/[programKey]/modules/create/page.tsx
@@ -169,7 +169,6 @@ const CreateModulePage = () => {
setFormData={setFormData}
onSubmit={handleSubmit}
loading={mutationLoading}
- isEdit={false}
validationErrors={validationErrors}
minDate={
programData?.managementProgram?.startedAt
diff --git a/frontend/src/components/ModuleCard.tsx b/frontend/src/components/ModuleCard.tsx
index ec6b9a4f02..80453e37fe 100644
--- a/frontend/src/components/ModuleCard.tsx
+++ b/frontend/src/components/ModuleCard.tsx
@@ -247,7 +247,7 @@ const ModuleItem = ({
diff --git a/frontend/src/components/ModuleForm.tsx b/frontend/src/components/ModuleForm.tsx
index 31b11a42a5..def5764d88 100644
--- a/frontend/src/components/ModuleForm.tsx
+++ b/frontend/src/components/ModuleForm.tsx
@@ -39,7 +39,6 @@ interface ModuleFormProps {
setFormData: React.Dispatch>
onSubmit: (e: React.FormEvent) => void
loading: boolean
- isEdit?: boolean
title: string
submitText?: string
minDate?: string
@@ -60,7 +59,6 @@ const ModuleForm = ({
onSubmit,
loading,
title,
- isEdit,
submitText = 'Save',
minDate,
maxDate,
@@ -308,16 +306,14 @@ const ModuleForm = ({
errorMessage={touched.projectId ? errors.projectId : undefined}
/>
- {isEdit && (
- handleInputChange('mentorLogins', value)}
- className="w-full min-w-0 lg:col-span-2"
- />
- )}
+ handleInputChange('mentorLogins', value)}
+ className="w-full min-w-0 lg:col-span-2"
+ />