From 82f9eefd61563f4765554d25bd396e8ef4a1511d Mon Sep 17 00:00:00 2001
From: Akshat-Kalra <akshatkalra2005@gmail.com>
Date: Thu, 25 Sep 2025 10:27:19 -0700
Subject: [PATCH 1/9] small fix for quizzes; initial fetch without selecting
 resource wasn't showing up

---
 .../src/lmsIntegration/lmsIntegration.controller.ts       | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/server/src/lmsIntegration/lmsIntegration.controller.ts b/packages/server/src/lmsIntegration/lmsIntegration.controller.ts
index a93b3eb2d..923b98616 100644
--- a/packages/server/src/lmsIntegration/lmsIntegration.controller.ts
+++ b/packages/server/src/lmsIntegration/lmsIntegration.controller.ts
@@ -510,14 +510,6 @@ export class LMSIntegrationController {
       );
     }
 
-    const selectedResources: LMSResourceType[] =
-      integration.selectedResourceTypes;
-    if (!selectedResources.includes(LMSResourceType.QUIZZES)) {
-      throw new BadRequestException(
-        ERROR_MESSAGES.lmsController.resourceDisabled,
-      );
-    }
-
     return await this.integrationService.getItems(courseId, LMSGet.Quizzes);
   }
 

From 75dbfe3e57129319ad267d2c51e7d23c36f8e1cc Mon Sep 17 00:00:00 2001
From: Akshat-Kalra <akshatkalra2005@gmail.com>
Date: Thu, 25 Sep 2025 15:57:01 -0700
Subject: [PATCH 2/9] mostly made data model changes; added types; wrote some
 code for module fetching.

---
 packages/common/index.ts                      | 17 +++++
 .../lmsCourseIntegration.entity.ts            |  3 +
 .../lmsIntegration/lmsIntegration.adapter.ts  | 75 +++++++++++++++++++
 .../lmsIntegration/lmsIntegration.service.ts  |  1 +
 .../src/lmsIntegration/lmsPage.entity.ts      |  3 +
 5 files changed, 99 insertions(+)

diff --git a/packages/common/index.ts b/packages/common/index.ts
index 319b935a5..23ee4f515 100644
--- a/packages/common/index.ts
+++ b/packages/common/index.ts
@@ -1790,6 +1790,7 @@ export type LMSPage = {
   syncEnabled?: boolean
   modified?: Date
   uploaded?: Date
+  isModuleLinked?: boolean
 }
 
 export type LMSFile = {
@@ -1803,6 +1804,22 @@ export type LMSFile = {
   uploaded?: Date
 }
 
+export type LMSModule = {
+  id: number
+  name: string
+  items_url?: string
+  items?: LMSModuleItem[]
+}
+
+export type LMSModuleItem = {
+  id: number
+  title: string
+  type: string
+  content_id?: number
+  html_url?: string
+  page_url?: string
+}
+
 export enum LMSQuizAccessLevel {
   LOGISTICS_ONLY = 'logistics_only',
   LOGISTICS_AND_QUESTIONS = 'logistics_and_questions',
diff --git a/packages/server/src/lmsIntegration/lmsCourseIntegration.entity.ts b/packages/server/src/lmsIntegration/lmsCourseIntegration.entity.ts
index 76c33d916..bd05898f8 100644
--- a/packages/server/src/lmsIntegration/lmsCourseIntegration.entity.ts
+++ b/packages/server/src/lmsIntegration/lmsCourseIntegration.entity.ts
@@ -69,6 +69,9 @@ export class LMSCourseIntegrationModel extends BaseEntity {
   @OneToMany((type) => LMSPageModel, (page) => page.course)
   pages: LMSPageModel[];
 
+  @Column({ type: 'boolean', default: false })
+  moduleLinkedPagesOnly: boolean;
+
   @OneToMany((type) => LMSFileModel, (file) => file.course)
   files: LMSFileModel[];
 
diff --git a/packages/server/src/lmsIntegration/lmsIntegration.adapter.ts b/packages/server/src/lmsIntegration/lmsIntegration.adapter.ts
index 3896652f7..6d488bfd7 100644
--- a/packages/server/src/lmsIntegration/lmsIntegration.adapter.ts
+++ b/packages/server/src/lmsIntegration/lmsIntegration.adapter.ts
@@ -7,6 +7,8 @@ import {
   LMSCourseAPIResponse,
   LMSFile,
   LMSIntegrationPlatform,
+  LMSModule,
+  LMSModuleItem,
   LMSPage,
   LMSQuiz,
 } from '@koh/common';
@@ -83,6 +85,13 @@ export abstract class AbstractLMSAdapter {
     return null;
   }
 
+  async getModules(): Promise<{
+    status: LMSApiResponseStatus;
+    modules: LMSModule[];
+  }> {
+    return null;
+  }
+
   async getFiles(): Promise<{
     status: LMSApiResponseStatus;
     files: LMSFile[];
@@ -389,6 +398,10 @@ class CanvasLMSAdapter extends ImplementedLMSAdapter {
 
     if (status != LMSApiResponseStatus.Success) return { status, pages: [] };
 
+    const moduleLinkedPageUrls = await this.getModuleLinkedPageUrls();
+
+    console.log(moduleLinkedPageUrls);
+
     const pages: LMSPage[] = [];
 
     // Individual page calls will now be cached by the Get() method
@@ -405,6 +418,7 @@ class CanvasLMSAdapter extends ImplementedLMSAdapter {
           url: page.url,
           frontPage: page.front_page,
           modified: new Date(pageResult.data.updated_at),
+          isModuleLinked: moduleLinkedPageUrls.includes(page.url),
         });
       }
     }
@@ -422,6 +436,67 @@ class CanvasLMSAdapter extends ImplementedLMSAdapter {
     return result;
   }
 
+  private async getModuleLinkedPageUrls(): Promise<string[]> {
+    const modulesResult = await this.getModules();
+    if (modulesResult.status !== LMSApiResponseStatus.Success) return [];
+
+    const pageUrls: string[] = [];
+
+    for (const module of modulesResult.modules) {
+      const itemsResult = await this.getModuleItems(module.id);
+      if (itemsResult.status === LMSApiResponseStatus.Success) {
+        const modulePageUrls = itemsResult.items
+          .filter((item) => item.type === 'Page')
+          .map((item) => item.page_url)
+          .filter((url) => url);
+
+        pageUrls.push(...modulePageUrls);
+      }
+    }
+
+    return [...new Set(pageUrls)];
+  }
+
+  async getModules(): Promise<{
+    status: LMSApiResponseStatus;
+    modules: LMSModule[];
+  }> {
+    const { status, data } = await this.GetPaginated(
+      `courses/${this.integration.apiCourseId}/modules`,
+    );
+
+    if (status != LMSApiResponseStatus.Success) return { status, modules: [] };
+
+    const modules: LMSModule[] = data.map((module: any) => {
+      return {
+        id: module.id,
+        name: module.name,
+        items_url: module.items_url,
+      } as LMSModule;
+    });
+
+    return {
+      status: LMSApiResponseStatus.Success,
+      modules,
+    };
+  }
+
+  async getModuleItems(moduleId: number): Promise<{
+    status: LMSApiResponseStatus;
+    items: LMSModuleItem[];
+  }> {
+    const { status, data } = await this.GetPaginated(
+      `courses/${this.integration.apiCourseId}/modules/${moduleId}/items`,
+    );
+
+    if (status != LMSApiResponseStatus.Success) return { status, items: [] };
+
+    return {
+      status: LMSApiResponseStatus.Success,
+      items: data,
+    };
+  }
+
   async getFiles(): Promise<{
     status: LMSApiResponseStatus;
     files: LMSFile[];
diff --git a/packages/server/src/lmsIntegration/lmsIntegration.service.ts b/packages/server/src/lmsIntegration/lmsIntegration.service.ts
index d25fd1cdc..22a1ebaf4 100644
--- a/packages/server/src/lmsIntegration/lmsIntegration.service.ts
+++ b/packages/server/src/lmsIntegration/lmsIntegration.service.ts
@@ -330,6 +330,7 @@ export class LMSIntegrationService {
               modified: pages[idx].modified ?? found.modified,
               uploaded: found.uploaded,
               syncEnabled: found.syncEnabled,
+              isModuleLinked: found.isModuleLinked,
             };
           }
         }
diff --git a/packages/server/src/lmsIntegration/lmsPage.entity.ts b/packages/server/src/lmsIntegration/lmsPage.entity.ts
index 375de7ad2..178a7c14c 100644
--- a/packages/server/src/lmsIntegration/lmsPage.entity.ts
+++ b/packages/server/src/lmsIntegration/lmsPage.entity.ts
@@ -47,6 +47,9 @@ export class LMSPageModel extends BaseEntity {
   @Column({ type: 'boolean', default: true })
   syncEnabled: boolean;
 
+  @Column({ type: 'boolean', default: false })
+  isModuleLinked: boolean;
+
   @ManyToOne(
     (type) => LMSCourseIntegrationModel,
     (integration) => integration.pages,

From fa5a73f96e5aa83a71a3a7e85cc19a52b7667785 Mon Sep 17 00:00:00 2001
From: Akshat-Kalra <akshatkalra2005@gmail.com>
Date: Thu, 25 Sep 2025 16:19:57 -0700
Subject: [PATCH 3/9] Add module-linked pages setting to LMS integration.
 Works! But have to test more

---
 packages/common/index.ts                      |  1 +
 .../settings/lms_integrations/page.tsx        | 48 ++++++++++++++++++-
 packages/frontend/app/api/index.ts            | 10 ++++
 .../lmsIntegration.controller.ts              | 23 ++++++++-
 .../lmsIntegration/lmsIntegration.service.ts  |  6 +++
 5 files changed, 86 insertions(+), 2 deletions(-)

diff --git a/packages/common/index.ts b/packages/common/index.ts
index 23ee4f515..7952796a0 100644
--- a/packages/common/index.ts
+++ b/packages/common/index.ts
@@ -1753,6 +1753,7 @@ export class LMSCourseIntegrationPartial {
   lmsSynchronize!: boolean
   isExpired!: boolean
   selectedResourceTypes?: LMSResourceType[]
+  moduleLinkedPagesOnly?: boolean
 }
 
 export type LMSCourseAPIResponse = {
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx
index e05bb8361..3b37eee31 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx
@@ -127,12 +127,17 @@ export default function CourseLMSIntegrationPage(props: {
   const [delModalOpen, setDelModalOpen] = useState<boolean>(false)
   const [isTesting, setIsTesting] = useState<boolean>(false)
   const [selectedResources, setSelectedResources] = useState<string[]>([])
+  const [moduleLinkedPagesOnly, setModuleLinkedPagesOnly] =
+    useState<boolean>(false)
 
   useEffect(() => {
     if (integration?.selectedResourceTypes) {
       setSelectedResources(integration.selectedResourceTypes)
     }
-  }, [integration?.selectedResourceTypes])
+    if (integration?.moduleLinkedPagesOnly !== undefined) {
+      setModuleLinkedPagesOnly(integration.moduleLinkedPagesOnly)
+    }
+  }, [integration?.selectedResourceTypes, integration?.moduleLinkedPagesOnly])
 
   const onSelectedResourcesChange: GetProp<
     typeof Checkbox.Group,
@@ -299,6 +304,23 @@ export default function CourseLMSIntegrationPage(props: {
     }
   }
 
+  const updateModuleLinkedPagesOnly = async () => {
+    if (!integration) return
+
+    try {
+      await API.lmsIntegration.updateModuleLinkedPagesOnly(
+        courseId,
+        moduleLinkedPagesOnly,
+      )
+      message.success('Module pages setting updated!')
+      // No need to refresh - the toggle state is already updated locally
+    } catch (error) {
+      message.error(getErrorMessage(error))
+      // Revert the toggle if the API call failed
+      setModuleLinkedPagesOnly(!moduleLinkedPagesOnly)
+    }
+  }
+
   const clearDocuments = async () => {
     if (integration == undefined) {
       message.error('No integration was specified')
@@ -847,6 +869,30 @@ export default function CourseLMSIntegrationPage(props: {
                                 </Col>
                               </Row>
                             </Checkbox.Group>
+
+                            {/* Module-linked pages toggle */}
+                            {selectedResources.includes('pages') && (
+                              <div className="mt-4 w-full rounded-lg bg-gray-50 p-3">
+                                <Checkbox
+                                  checked={moduleLinkedPagesOnly}
+                                  onChange={(e) => {
+                                    setModuleLinkedPagesOnly(e.target.checked)
+                                    // Auto-update when changed
+                                    setTimeout(
+                                      () => updateModuleLinkedPagesOnly(),
+                                      100,
+                                    )
+                                  }}
+                                >
+                                  <Tooltip title="Only sync pages that are linked within course modules. When enabled, standalone pages will be excluded from the chatbot.">
+                                    <span className="text-sm font-medium">
+                                      Module-linked pages only
+                                    </span>
+                                  </Tooltip>
+                                </Checkbox>
+                              </div>
+                            )}
+
                             <Button
                               size={'large'}
                               shape={'round'}
diff --git a/packages/frontend/app/api/index.ts b/packages/frontend/app/api/index.ts
index 28031576f..eb115c8cf 100644
--- a/packages/frontend/app/api/index.ts
+++ b/packages/frontend/app/api/index.ts
@@ -1440,6 +1440,16 @@ class APIClient {
       this.req('POST', `/api/v1/lms/course/${courseId}/resources`, undefined, {
         selectedResourceTypes,
       }),
+    updateModuleLinkedPagesOnly: async (
+      courseId: number,
+      moduleLinkedPagesOnly: boolean,
+    ): Promise<string> =>
+      this.req(
+        'PUT',
+        `/api/v1/lms/course/${courseId}/module-pages-only`,
+        undefined,
+        { moduleLinkedPagesOnly },
+      ),
     testIntegration: async (
       courseId: number,
       props: TestLMSIntegrationParams,
diff --git a/packages/server/src/lmsIntegration/lmsIntegration.controller.ts b/packages/server/src/lmsIntegration/lmsIntegration.controller.ts
index 923b98616..00d7137eb 100644
--- a/packages/server/src/lmsIntegration/lmsIntegration.controller.ts
+++ b/packages/server/src/lmsIntegration/lmsIntegration.controller.ts
@@ -10,7 +10,7 @@ import {
   Post,
   UseGuards,
 } from '@nestjs/common';
-import { Get } from '@nestjs/common/decorators';
+import { Get, Put } from '@nestjs/common/decorators';
 import {
   ERROR_MESSAGES,
   LMSApiResponseStatus,
@@ -878,4 +878,25 @@ export class LMSIntegrationController {
 
     return `Successfully updated selected resource types for course ${courseId}.`;
   }
+
+  @Put('course/:courseId/module-pages-only')
+  @UseGuards(JwtAuthGuard, CourseRolesGuard)
+  @Roles(Role.PROFESSOR)
+  async updateModuleLinkedPagesOnly(
+    @Param('courseId', ParseIntPipe) courseId: number,
+    @Body() body: { moduleLinkedPagesOnly: boolean },
+  ): Promise<string> {
+    const integration = await LMSCourseIntegrationModel.findOne({
+      where: { courseId },
+    });
+
+    if (!integration) {
+      throw new HttpException('Integration not found', HttpStatus.NOT_FOUND);
+    }
+
+    integration.moduleLinkedPagesOnly = body.moduleLinkedPagesOnly;
+    await LMSCourseIntegrationModel.save(integration);
+
+    return `Successfully updated module pages setting for course ${courseId}.`;
+  }
 }
diff --git a/packages/server/src/lmsIntegration/lmsIntegration.service.ts b/packages/server/src/lmsIntegration/lmsIntegration.service.ts
index 22a1ebaf4..8e1bf6536 100644
--- a/packages/server/src/lmsIntegration/lmsIntegration.service.ts
+++ b/packages/server/src/lmsIntegration/lmsIntegration.service.ts
@@ -580,6 +580,11 @@ export class LMSIntegrationService {
           break;
         case LMSUpload.Pages:
           items = result.pages;
+          if (courseIntegration.moduleLinkedPagesOnly) {
+            items = (items as LMSPage[]).filter(
+              (page) => page.isModuleLinked === true,
+            );
+          }
           break;
         case LMSUpload.Files:
           items = result.files;
@@ -1316,6 +1321,7 @@ export class LMSIntegrationService {
         lmsIntegration.apiKeyExpiry != undefined &&
         new Date(lmsIntegration.apiKeyExpiry).getTime() < new Date().getTime(),
       selectedResourceTypes: lmsIntegration.selectedResourceTypes,
+      moduleLinkedPagesOnly: lmsIntegration.moduleLinkedPagesOnly,
     } satisfies LMSCourseIntegrationPartial;
   }
 

From 27363830069b42efb86d374bed0b39f5409cf906 Mon Sep 17 00:00:00 2001
From: Akshat-Kalra <akshatkalra2005@gmail.com>
Date: Fri, 26 Sep 2025 09:55:02 -0700
Subject: [PATCH 4/9] Remove redundant test case for disabled quiz resource in
 LMS integration tests

---
 packages/server/test/lmsIntegration.integration.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/server/test/lmsIntegration.integration.ts b/packages/server/test/lmsIntegration.integration.ts
index 30b0a57e0..3e3e8e6ca 100644
--- a/packages/server/test/lmsIntegration.integration.ts
+++ b/packages/server/test/lmsIntegration.integration.ts
@@ -275,16 +275,6 @@ describe('Lms Integration Integrations', () => {
       });
     });
 
-    describe('GET /lms/:courseId/quizzes', () => {
-      it('should return 400 when quiz resource is disabled', async () => {
-        const res = await supertest({ userId: prof.id }).get(
-          `/lms/${course.id}/quizzes`,
-        );
-        expect(res.status).toBe(400);
-        expect(res.body.message).toContain('resource type');
-      });
-    });
-
     describe('GET /lms/:courseId/quiz/:quizId/preview/:accessLevel', () => {
       it('should return 400 when quiz resource is disabled', async () => {
         const res = await supertest({ userId: prof.id }).get(

From 8d64de8bd719c27e8d5f345a3a92b63543925b74 Mon Sep 17 00:00:00 2001
From: Akshat-Kalra <akshatkalra2005@gmail.com>
Date: Fri, 26 Sep 2025 10:08:43 -0700
Subject: [PATCH 5/9] fixed some responsiveness issues with tablet view

---
 .../settings/lms_integrations/page.tsx        | 66 ++++++++++++-------
 1 file changed, 41 insertions(+), 25 deletions(-)

diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx
index 3b37eee31..aa00593c3 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx
@@ -832,40 +832,56 @@ export default function CourseLMSIntegrationPage(props: {
                         label: 'Resource Selector',
                         key: '2',
                         children: (
-                          <div className={'flex flex-col items-center gap-2'}>
+                          <div
+                            className={
+                              'flex flex-col items-center gap-4 px-4 py-2'
+                            }
+                          >
                             <Checkbox.Group
                               style={{ width: '100%' }}
                               onChange={onSelectedResourcesChange}
                               value={selectedResources}
                             >
-                              <Row gutter={[16, 16]}>
-                                <Col xs={24} sm={12} md={8}>
-                                  <Checkbox value="assignments">
-                                    Assignments
-                                  </Checkbox>
+                              <Row gutter={[24, 16]}>
+                                <Col xs={24} sm={12} lg={8}>
+                                  <div className="flex min-h-[50px] items-center p-3">
+                                    <Checkbox value="assignments">
+                                      Assignments
+                                    </Checkbox>
+                                  </div>
                                 </Col>
-                                <Col xs={24} sm={12} md={8}>
-                                  <Checkbox value="announcements">
-                                    Announcements
-                                  </Checkbox>
+                                <Col xs={24} sm={12} lg={8}>
+                                  <div className="flex min-h-[50px] items-center p-3">
+                                    <Checkbox value="announcements">
+                                      Announcements
+                                    </Checkbox>
+                                  </div>
                                 </Col>
-                                <Col xs={24} sm={12} md={8}>
-                                  <Checkbox value="files">Files</Checkbox>
+                                <Col xs={24} sm={12} lg={8}>
+                                  <div className="flex min-h-[50px] items-center p-3">
+                                    <Checkbox value="files">Files</Checkbox>
+                                  </div>
                                 </Col>
-                                <Col xs={24} sm={12} md={8}>
-                                  <Checkbox value="pages">Pages</Checkbox>
+                                <Col xs={24} sm={12} lg={8}>
+                                  <div className="flex min-h-[50px] items-center p-3">
+                                    <Checkbox value="pages">Pages</Checkbox>
+                                  </div>
                                 </Col>
-                                <Col xs={24} sm={12} md={8}>
-                                  <Checkbox value="quizzes">Quizzes</Checkbox>
+                                <Col xs={24} sm={12} lg={8}>
+                                  <div className="flex min-h-[50px] items-center p-3">
+                                    <Checkbox value="quizzes">Quizzes</Checkbox>
+                                  </div>
                                 </Col>
-                                <Col xs={24} sm={12} md={8}>
-                                  <Checkbox value="Syllabus" disabled={true}>
-                                    <Tooltip title="Coming Soon!">
-                                      <span className="text-gray-400 line-through">
-                                        Syllabus
-                                      </span>
-                                    </Tooltip>
-                                  </Checkbox>
+                                <Col xs={24} sm={12} lg={8}>
+                                  <div className="flex min-h-[50px] items-center p-3">
+                                    <Checkbox value="Syllabus" disabled={true}>
+                                      <Tooltip title="Coming Soon!">
+                                        <span className="text-gray-400 line-through">
+                                          Syllabus
+                                        </span>
+                                      </Tooltip>
+                                    </Checkbox>
+                                  </div>
                                 </Col>
                               </Row>
                             </Checkbox.Group>
@@ -912,7 +928,7 @@ export default function CourseLMSIntegrationPage(props: {
                               style={{ marginTop: '30px' }}
                               onClick={handleSaveAndResync}
                               loading={syncing && integration.lmsSynchronize}
-                              className="w-full sm:w-auto"
+                              className="w-full sm:w-auto md:max-w-xs lg:max-w-sm"
                             >
                               <span className="hidden sm:inline">
                                 Save and Re-Sync Documents

From 990286418df7045e4a36c108e2fc06d54737cc47 Mon Sep 17 00:00:00 2001
From: Akshat-Kalra <akshatkalra2005@gmail.com>
Date: Wed, 22 Oct 2025 09:35:12 -0700
Subject: [PATCH 6/9] add module-linked pages validation and cache clearing,
 improve page filtering logic

---
 .../settings/lms_integrations/page.tsx        | 63 +++++++------
 .../lmsIntegration/lmsIntegration.adapter.ts  | 89 +++++++++++--------
 .../lmsIntegration.controller.ts              | 14 +++
 .../lmsIntegration/lmsIntegration.service.ts  | 44 +++++++--
 4 files changed, 138 insertions(+), 72 deletions(-)

diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx
index aa00593c3..58a9a5109 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx
@@ -150,9 +150,18 @@ export default function CourseLMSIntegrationPage(props: {
     if (!integration?.selectedResourceTypes) return false
     const currentSorted = [...selectedResources].sort()
     const dbSorted = [...integration.selectedResourceTypes].sort()
-    if (currentSorted.length !== dbSorted.length) return true
-    return currentSorted.some((item, index) => item !== dbSorted[index])
-  }, [selectedResources, integration?.selectedResourceTypes])
+    const resourcesChanged =
+      currentSorted.length !== dbSorted.length ||
+      currentSorted.some((item, index) => item !== dbSorted[index])
+    const moduleLinkedChanged =
+      moduleLinkedPagesOnly !== integration.moduleLinkedPagesOnly
+    return resourcesChanged || moduleLinkedChanged
+  }, [
+    selectedResources,
+    integration?.selectedResourceTypes,
+    moduleLinkedPagesOnly,
+    integration?.moduleLinkedPagesOnly,
+  ])
 
   const fetchOrgIntegrationsAsync = useCallback(async () => {
     await API.lmsIntegration
@@ -291,33 +300,40 @@ export default function CourseLMSIntegrationPage(props: {
   }
 
   const handleSaveAndResync = async () => {
+    const wasModuleLinkedDisabled = !integration?.moduleLinkedPagesOnly
+    const isEnablingModuleLinked =
+      wasModuleLinkedDisabled && moduleLinkedPagesOnly
+
+    if (isEnablingModuleLinked) {
+      const confirmed = window.confirm(
+        'Enabling "Module-linked pages only" will remove any standalone pages (not linked in course modules) from the chatbot. ' +
+          'Only pages that are specifically linked within course modules will remain available to the chatbot. ' +
+          'Are you sure you want to continue?',
+      )
+
+      if (!confirmed) {
+        return
+      }
+    }
+
     try {
+      // Update selected resource types
       await API.lmsIntegration.updateSelectedResourceTypes(
         courseId,
         selectedResources as string[],
       )
-      message.success('Resource types updated!')
-      await forceSync()
-      setUpdateFlag(!updateFlag)
-    } catch (err) {
-      message.error(getErrorMessage(err))
-    }
-  }
-
-  const updateModuleLinkedPagesOnly = async () => {
-    if (!integration) return
 
-    try {
+      // Update module-linked pages setting
       await API.lmsIntegration.updateModuleLinkedPagesOnly(
         courseId,
         moduleLinkedPagesOnly,
       )
-      message.success('Module pages setting updated!')
-      // No need to refresh - the toggle state is already updated locally
-    } catch (error) {
-      message.error(getErrorMessage(error))
-      // Revert the toggle if the API call failed
-      setModuleLinkedPagesOnly(!moduleLinkedPagesOnly)
+
+      message.success('Settings updated!')
+      await forceSync()
+      setUpdateFlag(!updateFlag)
+    } catch (err) {
+      message.error(getErrorMessage(err))
     }
   }
 
@@ -893,14 +909,9 @@ export default function CourseLMSIntegrationPage(props: {
                                   checked={moduleLinkedPagesOnly}
                                   onChange={(e) => {
                                     setModuleLinkedPagesOnly(e.target.checked)
-                                    // Auto-update when changed
-                                    setTimeout(
-                                      () => updateModuleLinkedPagesOnly(),
-                                      100,
-                                    )
                                   }}
                                 >
-                                  <Tooltip title="Only sync pages that are linked within course modules. When enabled, standalone pages will be excluded from the chatbot.">
+                                  <Tooltip title="Only sync pages that are linked within course modules. When enabled, standalone pages will be excluded from the chatbot. WARNING: This will remove any previously synced standalone pages from the chatbot when you save changes.">
                                     <span className="text-sm font-medium">
                                       Module-linked pages only
                                     </span>
diff --git a/packages/server/src/lmsIntegration/lmsIntegration.adapter.ts b/packages/server/src/lmsIntegration/lmsIntegration.adapter.ts
index 6d488bfd7..077e98af8 100644
--- a/packages/server/src/lmsIntegration/lmsIntegration.adapter.ts
+++ b/packages/server/src/lmsIntegration/lmsIntegration.adapter.ts
@@ -112,6 +112,13 @@ export abstract class AbstractLMSAdapter {
         return '';
     }
   }
+
+  async clearPageCache(): Promise<void> {
+    if (this.cacheManager) {
+      const pagesKey = `pages_basic_${this.integration.apiCourseId}`;
+      await this.cacheManager.del(pagesKey);
+    }
+  }
 }
 
 abstract class ImplementedLMSAdapter extends AbstractLMSAdapter {
@@ -182,7 +189,7 @@ class CanvasLMSAdapter extends ImplementedLMSAdapter {
         }
       })
       .catch((error) => {
-        console.log(
+        console.error(
           `Error contacting ${this.integration.orgIntegration.rootUrl}: ${error}`,
         );
         return { status: LMSApiResponseStatus.Error };
@@ -379,38 +386,41 @@ class CanvasLMSAdapter extends ImplementedLMSAdapter {
     status: LMSApiResponseStatus;
     pages: LMSPage[];
   }> {
-    const pagesKey = `pages_complete_${this.integration.apiCourseId}`;
+    const pagesKey = `pages_basic_${this.integration.apiCourseId}`;
 
+    let basicPages: any[] | null = null;
     if (this.cacheManager) {
-      const cachedPages = await this.cacheManager.get(pagesKey);
-      if (cachedPages) {
-        return cachedPages as {
-          status: LMSApiResponseStatus;
-          pages: LMSPage[];
-        };
-      }
+      basicPages = await this.cacheManager.get(pagesKey);
     }
 
-    // If not cached, fetch as normal
-    const { status, data } = await this.GetPaginated(
-      `courses/${this.integration.apiCourseId}/pages`,
-    );
+    if (!basicPages) {
+      const { status, data } = await this.GetPaginated(
+        `courses/${this.integration.apiCourseId}/pages`,
+      );
 
-    if (status != LMSApiResponseStatus.Success) return { status, pages: [] };
+      if (status != LMSApiResponseStatus.Success) return { status, pages: [] };
 
-    const moduleLinkedPageUrls = await this.getModuleLinkedPageUrls();
+      basicPages = data.filter((datum: any) => datum.published == true);
+
+      if (this.cacheManager) {
+        await this.cacheManager.set(pagesKey, basicPages, 600000);
+      }
+    }
 
-    console.log(moduleLinkedPageUrls);
+    // Always fetch module-linked status fresh (not cached)
+    const moduleLinkedPageUrls = await this.getModuleLinkedPageUrls();
 
     const pages: LMSPage[] = [];
 
     // Individual page calls will now be cached by the Get() method
-    for (const page of data.filter((datum: any) => datum.published == true)) {
+    for (const page of basicPages) {
       const pageResult = await this.Get(
         `courses/${this.integration.apiCourseId}/pages/${page.url}`,
       );
 
       if (pageResult.status === LMSApiResponseStatus.Success) {
+        const isModuleLinked = moduleLinkedPageUrls.includes(page.url);
+
         pages.push({
           id: pageResult.data.page_id,
           title: pageResult.data.title,
@@ -418,43 +428,51 @@ class CanvasLMSAdapter extends ImplementedLMSAdapter {
           url: page.url,
           frontPage: page.front_page,
           modified: new Date(pageResult.data.updated_at),
-          isModuleLinked: moduleLinkedPageUrls.includes(page.url),
+          isModuleLinked,
         });
       }
     }
 
-    const result = {
+    return {
       status: LMSApiResponseStatus.Success,
       pages,
     };
-
-    // Cache complete result for 10 minutes
-    if (this.cacheManager) {
-      await this.cacheManager.set(pagesKey, result, 600000);
-    }
-
-    return result;
   }
 
   private async getModuleLinkedPageUrls(): Promise<string[]> {
     const modulesResult = await this.getModules();
-    if (modulesResult.status !== LMSApiResponseStatus.Success) return [];
+    if (modulesResult.status !== LMSApiResponseStatus.Success) {
+      return [];
+    }
 
     const pageUrls: string[] = [];
 
     for (const module of modulesResult.modules) {
       const itemsResult = await this.getModuleItems(module.id);
       if (itemsResult.status === LMSApiResponseStatus.Success) {
-        const modulePageUrls = itemsResult.items
-          .filter((item) => item.type === 'Page')
-          .map((item) => item.page_url)
-          .filter((url) => url);
+        const pageItems = itemsResult.items.filter(
+          (item) => item.type === 'Page',
+        );
 
-        pageUrls.push(...modulePageUrls);
+        for (const item of pageItems) {
+          let pageUrl = item.page_url;
+
+          if (!pageUrl && item.html_url) {
+            const match = item.html_url.match(/\/pages\/([^\/\?]+)/);
+            if (match) {
+              pageUrl = match[1];
+            }
+          }
+
+          if (pageUrl) {
+            pageUrls.push(pageUrl);
+          }
+        }
       }
     }
 
-    return [...new Set(pageUrls)];
+    const uniqueUrls = [...new Set(pageUrls)];
+    return uniqueUrls;
   }
 
   async getModules(): Promise<{
@@ -490,7 +508,6 @@ class CanvasLMSAdapter extends ImplementedLMSAdapter {
     );
 
     if (status != LMSApiResponseStatus.Success) return { status, items: [] };
-
     return {
       status: LMSApiResponseStatus.Success,
       items: data,
@@ -557,9 +574,7 @@ class CanvasLMSAdapter extends ImplementedLMSAdapter {
 
       // Placeholder questions if no questions fetched from the API
       if (questionsData.length === 0 && quizData?.question_count > 0) {
-        console.log(
-          `Quiz ${quiz.id}: No question details available (likely permissions), using question_count: ${quizData.question_count}`,
-        );
+        // No question details available (likely permissions), using question_count
         for (let i = 1; i <= quizData.question_count; i++) {
           questionsData.push({
             id: `placeholder_${quiz.id}_${i}`,
diff --git a/packages/server/src/lmsIntegration/lmsIntegration.controller.ts b/packages/server/src/lmsIntegration/lmsIntegration.controller.ts
index 00d7137eb..ee36320d0 100644
--- a/packages/server/src/lmsIntegration/lmsIntegration.controller.ts
+++ b/packages/server/src/lmsIntegration/lmsIntegration.controller.ts
@@ -767,6 +767,20 @@ export class LMSIntegrationController {
       );
     }
 
+    if (
+      newState &&
+      uploadType === LMSUpload.Pages &&
+      integration.moduleLinkedPagesOnly
+    ) {
+      const page = item as LMSPage;
+      if (!page.isModuleLinked) {
+        throw new HttpException(
+          'Cannot sync unlinked page when "Module-linked pages only" setting is enabled',
+          HttpStatus.BAD_REQUEST,
+        );
+      }
+    }
+
     try {
       const result = await this.integrationService.singleDocOperation(
         courseId,
diff --git a/packages/server/src/lmsIntegration/lmsIntegration.service.ts b/packages/server/src/lmsIntegration/lmsIntegration.service.ts
index 8e1bf6536..f408f097e 100644
--- a/packages/server/src/lmsIntegration/lmsIntegration.service.ts
+++ b/packages/server/src/lmsIntegration/lmsIntegration.service.ts
@@ -470,6 +470,11 @@ export class LMSIntegrationService {
       errors: 0,
     };
 
+    const adapterForCache = await this.getAdapter(courseId);
+    if (adapterForCache) {
+      await adapterForCache.clearPageCache();
+    }
+
     // maybe add this later to fallback to all resources if db fetch does not work
 
     //   const selectedResources: LMSResourceType[] =
@@ -581,9 +586,20 @@ export class LMSIntegrationService {
         case LMSUpload.Pages:
           items = result.pages;
           if (courseIntegration.moduleLinkedPagesOnly) {
-            items = (items as LMSPage[]).filter(
+            const allPages = items as LMSPage[];
+            const moduleLinkedPages = allPages.filter(
               (page) => page.isModuleLinked === true,
             );
+            if (moduleLinkedPages.length === 0 && allPages.length > 0) {
+              console.warn(
+                `Module-linked pages only setting is enabled for course ${courseId}, ` +
+                  `but no pages were detected as module-linked out of ${allPages.length} total pages. ` +
+                  `This might indicate that no pages are linked in course modules, or there's a ` +
+                  `configuration issue. Proceeding with filter - this will remove all page content from chatbot.`,
+              );
+            }
+
+            items = moduleLinkedPages;
           }
           break;
         case LMSUpload.Files:
@@ -602,13 +618,29 @@ export class LMSIntegrationService {
         | LMSQuizModel
       )[] = modelAndPersisted.items;
 
-      const toRemove: (
+      let toRemove: (
         | LMSAnnouncementModel
         | LMSAssignmentModel
         | LMSPageModel
         | LMSFileModel
         | LMSQuizModel
-      )[] = persistedItems.filter((i0) => !items.find((i1) => i1.id == i0.id));
+      )[] = [];
+
+      if (type === LMSUpload.Pages && courseIntegration.moduleLinkedPagesOnly) {
+        const allPagesFromLMS = result.pages as LMSPage[];
+        const persistedPages = persistedItems as LMSPageModel[];
+
+        toRemove = persistedPages.filter((persistedPage) => {
+          const currentLMSPage = allPagesFromLMS.find(
+            (p) => p.id === persistedPage.id,
+          );
+          return !currentLMSPage || !currentLMSPage.isModuleLinked;
+        });
+      } else {
+        toRemove = persistedItems.filter(
+          (i0) => !items.find((i1) => i1.id == i0.id),
+        );
+      }
 
       if (toRemove.length > 0) {
         // the code below led to inconsistent behaviour of syncDocuments when items
@@ -1393,10 +1425,6 @@ export class LMSIntegrationService {
       await quiz.save();
 
       if (quiz.syncEnabled && quiz.chatbotDocumentId) {
-        console.log(
-          `Updating chatbot document for quiz ${quizId} with new access level: ${accessLevel}`,
-        );
-
         await this.singleDocOperation(
           courseId,
           quiz,
@@ -1410,8 +1438,6 @@ export class LMSIntegrationService {
           LMSUpload.Quizzes,
           'Sync',
         );
-
-        console.log(`Successfully updated chatbot document for quiz ${quizId}`);
       }
 
       return true;

From fecc69d42eb861f2f10e6d82e6aade3b4e0a145c Mon Sep 17 00:00:00 2001
From: Akshat <akshatkalra2005@gmail.com>
Date: Wed, 29 Oct 2025 10:51:10 -0700
Subject: [PATCH 7/9] Update
 packages/server/src/lmsIntegration/lmsIntegration.adapter.ts

Co-authored-by: Fabian Lozano <45581810+FabianLCH@users.noreply.github.com>
---
 packages/server/src/lmsIntegration/lmsIntegration.adapter.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/lmsIntegration/lmsIntegration.adapter.ts b/packages/server/src/lmsIntegration/lmsIntegration.adapter.ts
index 077e98af8..e7f470e72 100644
--- a/packages/server/src/lmsIntegration/lmsIntegration.adapter.ts
+++ b/packages/server/src/lmsIntegration/lmsIntegration.adapter.ts
@@ -457,8 +457,8 @@ class CanvasLMSAdapter extends ImplementedLMSAdapter {
         for (const item of pageItems) {
           let pageUrl = item.page_url;
 
-          if (!pageUrl && item.html_url) {
-            const match = item.html_url.match(/\/pages\/([^\/\?]+)/);
+          if (!pageUrl && item.url) {
+            const match = item.url.match(/\/pages\/([^\/\?]+)/);
             if (match) {
               pageUrl = match[1];
             }

From 3fa12982256f1084fca6fce9a5febd415e394651 Mon Sep 17 00:00:00 2001
From: Akshat-Kalra <akshatkalra2005@gmail.com>
Date: Wed, 29 Oct 2025 11:10:45 -0700
Subject: [PATCH 8/9] Add 'url' property to LMSModuleItem type and filter
 unpublished modules in CanvasLMSAdapter

---
 packages/common/index.ts                         |  1 +
 .../src/lmsIntegration/lmsIntegration.adapter.ts | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/common/index.ts b/packages/common/index.ts
index 7952796a0..2cd088932 100644
--- a/packages/common/index.ts
+++ b/packages/common/index.ts
@@ -1818,6 +1818,7 @@ export type LMSModuleItem = {
   type: string
   content_id?: number
   html_url?: string
+  url?: string
   page_url?: string
 }
 
diff --git a/packages/server/src/lmsIntegration/lmsIntegration.adapter.ts b/packages/server/src/lmsIntegration/lmsIntegration.adapter.ts
index e7f470e72..a53e4b4d8 100644
--- a/packages/server/src/lmsIntegration/lmsIntegration.adapter.ts
+++ b/packages/server/src/lmsIntegration/lmsIntegration.adapter.ts
@@ -485,13 +485,15 @@ class CanvasLMSAdapter extends ImplementedLMSAdapter {
 
     if (status != LMSApiResponseStatus.Success) return { status, modules: [] };
 
-    const modules: LMSModule[] = data.map((module: any) => {
-      return {
-        id: module.id,
-        name: module.name,
-        items_url: module.items_url,
-      } as LMSModule;
-    });
+    const modules: LMSModule[] = data
+      .filter((module: any) => module.published == true)
+      .map((module: any) => {
+        return {
+          id: module.id,
+          name: module.name,
+          items_url: module.items_url,
+        } as LMSModule;
+      });
 
     return {
       status: LMSApiResponseStatus.Success,

From 69ab8ff1c95df28a96b5ecef708903ef2d53b414 Mon Sep 17 00:00:00 2001
From: Akshat-Kalra <akshatkalra2005@gmail.com>
Date: Wed, 29 Oct 2025 11:19:41 -0700
Subject: [PATCH 9/9] Refactor module-linked pages update confirmation to use
 Modal

---
 .../settings/lms_integrations/page.tsx        | 56 ++++++++++---------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx
index 58a9a5109..b0f116636 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx
@@ -304,36 +304,38 @@ export default function CourseLMSIntegrationPage(props: {
     const isEnablingModuleLinked =
       wasModuleLinkedDisabled && moduleLinkedPagesOnly
 
-    if (isEnablingModuleLinked) {
-      const confirmed = window.confirm(
-        'Enabling "Module-linked pages only" will remove any standalone pages (not linked in course modules) from the chatbot. ' +
-          'Only pages that are specifically linked within course modules will remain available to the chatbot. ' +
-          'Are you sure you want to continue?',
-      )
-
-      if (!confirmed) {
-        return
+    const performUpdate = async () => {
+      try {
+        await API.lmsIntegration.updateSelectedResourceTypes(
+          courseId,
+          selectedResources as string[],
+        )
+
+        await API.lmsIntegration.updateModuleLinkedPagesOnly(
+          courseId,
+          moduleLinkedPagesOnly,
+        )
+
+        message.success('Settings updated!')
+        await forceSync()
+        setUpdateFlag(!updateFlag)
+      } catch (err) {
+        message.error(getErrorMessage(err))
       }
     }
 
-    try {
-      // Update selected resource types
-      await API.lmsIntegration.updateSelectedResourceTypes(
-        courseId,
-        selectedResources as string[],
-      )
-
-      // Update module-linked pages setting
-      await API.lmsIntegration.updateModuleLinkedPagesOnly(
-        courseId,
-        moduleLinkedPagesOnly,
-      )
-
-      message.success('Settings updated!')
-      await forceSync()
-      setUpdateFlag(!updateFlag)
-    } catch (err) {
-      message.error(getErrorMessage(err))
+    if (isEnablingModuleLinked) {
+      Modal.confirm({
+        title: 'Enable Module-linked Pages Only?',
+        content:
+          'Enabling "Module-linked pages only" will remove any standalone pages (not linked in course modules) from the chatbot. ' +
+          'Only pages that are specifically linked within course modules will remain available to the chatbot.',
+        okText: 'Continue',
+        cancelText: 'Cancel',
+        onOk: performUpdate,
+      })
+    } else {
+      await performUpdate()
     }
   }