@sunbird-cb/toc 0.0.11 → 0.0.12

package/fesm2022/sunbird-cb-toc.mjs

@@ -701,11 +701,11 @@ class WidgetContentService {
         const forPreview = window.location.href.includes('/public/') || window.location.href.includes('&preview=true');
         if (primaryCategory && this.isResource(primaryCategory)) {
             if (!forPreview) {
-                url = `/apis/proxies/v8/extended/content/v1/read/${contentId}`;
+                url = `/apis/proxies/v8/action/content/v3/read/${contentId}`;
             }
             else {
                 if (window.location.href.includes('editMode=true') && window.location.href.includes('_rc')) {
-                    url = `/apis/proxies/v8/extended/content/v1/read/${contentId}`;
+                    url = `/apis/proxies/v8/action/content/v3/read/${contentId}`;
                 }
                 else {
                     url = `/api/content/v1/read/${contentId}`;
@@ -1635,7 +1635,6 @@ class AppTocService {
     resetContentData() {
         this.hashmap = {};
         this.hashmapUpdated.next(null);
-        console.log('Content data cleared - hashmap reset');
     }
     fetchContentParents(contentId) {
         // return this.http.get<NsContent.IContentMinimal[]>(
@@ -2023,14 +2022,6 @@ class AppTocService {
                     child.primaryCategory === 'Standalone Assessment' ||
                     child.mimeType === 'application/vnd.sunbird.questionset';
                 if (isAssessment) {
-                    console.log(`📋 Adding assessment to hashmap: "${child.name}"`, {
-                        identifier: child.identifier,
-                        primaryCategory: child.primaryCategory,
-                        parent: correctParentId,
-                        originalParent: child?.parent,
-                        parentName: hierarchyData.name,
-                        parentCategory: hierarchyData.primaryCategory
-                    });
                 }
                 this.hashmap[child.identifier] = localMap;
             });
@@ -2162,11 +2153,6 @@ class AppTocService {
             console.warn('⚠️  Hashmap is empty - cannot compute milestone locking');
             return;
         }
-        console.log('\n═══════════════════════════════════════════════════════════');
-        console.log('🔒 MILESTONE LOCKING COMPUTATION START');
-        console.log('═══════════════════════════════════════════════════════════');
-        console.log('User enrolled:', isEnrolled);
-        console.log('Hashmap size:', Object.keys(this.hashmap).length);
         // STEP 1: Find all milestones and sort by index
         const milestoneEntries = Object.keys(this.hashmap)
             .filter(key => {
@@ -2184,11 +2170,8 @@ class AppTocService {
             return numA - numB;
         });
         if (milestoneEntries.length === 0) {
-            console.log('ℹ️  No milestones found - skipping milestone locking');
-            console.log('═══════════════════════════════════════════════════════════\n');
             return;
         }
-        console.log(`\n📍 Found ${milestoneEntries.length} milestones:`);
         milestoneEntries.forEach((id, i) => {
             console.log(`   M${i + 1}: ${this.hashmap[id].name || id}`);
         });
@@ -2207,32 +2190,30 @@ class AppTocService {
             });
             this.hashmap = { ...this.hashmap };
             this.hashmapUpdated.next({ timestamp: Date.now(), hashmap: this.hashmap });
-            console.log('═══════════════════════════════════════════════════════════\n');
             return;
         }
         // STEP 3: Check pre-assessment completion
         const isPreAssessmentCompleted = this.checkPreAssessmentCompletion();
-        console.log(`\n📝 Pre-assessment: ${isPreAssessmentCompleted ? '✅ COMPLETE' : '❌ INCOMPLETE'}`);
+        console.log('🔍 [MILESTONE LOCK] Pre-assessment completed:', isPreAssessmentCompleted ? '✅ YES' : '❌ NO');
         // STEP 4: Compute locking for each milestone
-        console.log('\n🔐 Computing milestone locks:');
-        console.log('─────────────────────────────────────────────────────────────');
         milestoneEntries.forEach((milestoneId, index) => {
             const milestone = this.hashmap[milestoneId];
             if (!milestone)
                 return;
             const milestoneNum = index + 1;
-            console.log(`\n📌 Milestone ${milestoneNum} (${milestone.name || milestoneId}):`);
             // MILESTONE 1: Unlocks when pre-assessment complete
             if (index === 0) {
                 const isLocked = !isPreAssessmentCompleted;
                 this.hashmap[milestoneId].computedIsLocked = isLocked;
                 this.hashmap[milestoneId].unlockMessage = isLocked ?
                     'Complete the preliminary assessment to unlock this milestone' : '';
-                console.log(`   ${isLocked ? '🔒 LOCKED' : '🔓 UNLOCKED'}`);
-                console.log(`   Reason: Pre-assessment ${isPreAssessmentCompleted ? 'complete' : 'incomplete'}`);
+                console.log(`📌 [MILESTONE 1] ${milestone.name}:`, {
+                    isPreAssessmentCompleted,
+                    isLocked: isLocked ? '🔒 LOCKED' : '🔓 UNLOCKED',
+                    unlockMessage: this.hashmap[milestoneId].unlockMessage
+                });
                 // For unlocked M1, check assessment locking
                 if (!isLocked) {
-                    console.log(`   ✓ Checking assessment lock...`);
                     this.computeAssessmentLockingInMilestone(milestoneId);
                 }
                 else {
@@ -2251,27 +2232,38 @@ class AppTocService {
                 const prevStatus = Number(previousMilestone.status) || 0;
                 const prevCompletedLeafNodes = Number(previousMilestone.completedLeafNodesCount) || 0;
                 const prevLeafNodesCount = Number(previousMilestone.leafNodesCount) || 0;
+                console.log(`🔍 [MILESTONE ${milestoneNum}] Checking if previous M${index} is complete:`, {
+                    previousMilestoneName: previousMilestone.name,
+                    completionPercentage: prevCompletionPct,
+                    completionStatus: prevCompletionStatus,
+                    status: prevStatus,
+                    completedLeafNodes: prevCompletedLeafNodes,
+                    leafNodesCount: prevLeafNodesCount
+                });
                 let previousMilestoneComplete = prevCompletionPct >= 100 ||
                     prevCompletionStatus === 2 ||
                     prevStatus === 2 ||
                     (prevLeafNodesCount > 0 && prevCompletedLeafNodes >= prevLeafNodesCount);
+                console.log(`   Primary check result: ${previousMilestoneComplete ? '✅ COMPLETE' : '❌ INCOMPLETE'}`);
                 // Fallback: Check individual items
                 if (!previousMilestoneComplete) {
+                    console.log(`   Running fallback check (mandatory content + assessment)...`);
                     const isPreviousMilestoneAssessmentComplete = this.checkMilestoneAssessmentComplete(previousMilestoneId);
                     const isPreviousMilestoneMandatoryComplete = this.checkMilestoneMandatoryContentComplete(previousMilestoneId);
                     previousMilestoneComplete = isPreviousMilestoneAssessmentComplete && isPreviousMilestoneMandatoryComplete;
-                    console.log(`   Fallback check: mandatory=${isPreviousMilestoneMandatoryComplete}, assessment=${isPreviousMilestoneAssessmentComplete}`);
+                    console.log(`   Fallback check: mandatory=${isPreviousMilestoneMandatoryComplete}, assessment=${isPreviousMilestoneAssessmentComplete}, result=${previousMilestoneComplete}`);
                 }
                 const isLocked = !previousMilestoneComplete;
                 this.hashmap[milestoneId].computedIsLocked = isLocked;
                 this.hashmap[milestoneId].unlockMessage = isLocked ?
                     `Complete all mandatory content and assessment in Milestone ${index} to unlock this milestone` : '';
-                console.log(`   ${isLocked ? '🔒 LOCKED' : '🔓 UNLOCKED'}`);
-                console.log(`   Reason: Previous milestone ${previousMilestoneComplete ? 'complete' : 'incomplete'}`);
-                console.log(`   Previous M${index} progress: ${prevCompletionPct}%`);
+                console.log(`   📊 [MILESTONE ${milestoneNum}] ${milestone.name}:`, {
+                    previousMilestoneComplete: previousMilestoneComplete ? '✅ YES' : '❌ NO',
+                    isLocked: isLocked ? '🔒 LOCKED' : '🔓 UNLOCKED',
+                    unlockMessage: this.hashmap[milestoneId].unlockMessage
+                });
                 // For unlocked milestones, check assessment locking
                 if (!isLocked) {
-                    console.log(`   ✓ Checking assessment lock...`);
                     this.computeAssessmentLockingInMilestone(milestoneId);
                 }
                 else {
@@ -2285,6 +2277,43 @@ class AppTocService {
                 console.log(`   🔒 LOCKED (previous milestone not found)`);
             }
         });
+        // STEP 4.5: Debug log milestone leaf nodes and their completion status
+        console.log('\n📊 Milestone Leaf Nodes Completion Status:');
+        milestoneEntries.forEach((milestoneId, index) => {
+            const milestone = this.hashmap[milestoneId];
+            if (!milestone)
+                return;
+            console.log(`   Leaf Nodes Array:`, milestone.leafNodes);
+            console.log(`   Leaf Nodes Count: ${milestone.leafNodesCount}`);
+            console.log(`   Completed Leaf Nodes Count: ${milestone.completedLeafNodesCount || 0}`);
+            console.log(`   Completion %: ${milestone.completionPercentage}%`);
+            if (milestone.leafNodes && milestone.leafNodes.length > 0) {
+                console.log(`   Individual Leaf Node Status:`);
+                milestone.leafNodes.forEach((leafId, i) => {
+                    const leafData = this.hashmap[leafId];
+                    if (leafData) {
+                        const isComplete = leafData.completionStatus === 2 ||
+                            leafData.status === 2 ||
+                            (leafData.completionPercentage && leafData.completionPercentage >= 100) ||
+                            (leafData.progress && leafData.progress >= 100);
+                        console.log(`      ${i + 1}. ${leafData.name || leafId} [${leafData.primaryCategory}]:`, {
+                            id: leafId,
+                            completionStatus: leafData.completionStatus,
+                            status: leafData.status,
+                            completionPercentage: leafData.completionPercentage,
+                            progress: leafData.progress,
+                            isComplete: isComplete ? '✅' : '❌'
+                        });
+                    }
+                    else {
+                        console.log(`      ${i + 1}. ⚠️ Leaf node ${leafId} NOT FOUND in hashmap`);
+                    }
+                });
+            }
+            else {
+                console.log(`   ⚠️ No leaf nodes defined for this milestone`);
+            }
+        });
         // STEP 5: Compute parent milestone lock status for ALL children
         console.log('\n🔗 Computing parent milestone locks for all children...');
         Object.keys(this.hashmap).forEach(key => {
@@ -2316,9 +2345,7 @@ class AppTocService {
             }
         });
         // STEP 6: Trigger hashmap update
-        console.log('\n─────────────────────────────────────────────────────────────');
         console.log('✅ Milestone locking computation COMPLETE');
-        console.log('═══════════════════════════════════════════════════════════\n');
         this.hashmap = { ...this.hashmap };
         this.hashmapUpdated.next({ timestamp: Date.now(), hashmap: this.hashmap });
     }
@@ -2343,6 +2370,7 @@ class AppTocService {
      * Pre-assessment is typically a Course Assessment at the root level of Learning Pathway (before milestones)
      */
     checkPreAssessmentCompletion() {
+        console.log('🔍 [PRE-ASSESSMENT] Starting pre-assessment completion check');
         // Find the Learning Pathway root
         let learningPathwayId = null;
         for (const key of Object.keys(this.hashmap)) {
@@ -2352,7 +2380,7 @@ class AppTocService {
                 break;
             }
         }
-        console.log('Checking pre-assessment completion. Learning Pathway ID:', learningPathwayId);
+        console.log('🔍 [PRE-ASSESSMENT] Learning Pathway ID:', learningPathwayId);
         // PRIORITY 1: Look for items explicitly marked as pre-assessment
         for (const key of Object.keys(this.hashmap)) {
             const item = this.hashmap[key];
@@ -2361,20 +2389,19 @@ class AppTocService {
                 const isCompleted = (item.completionStatus === 2 || item.status === 2 ||
                     (item.completionPercentage !== undefined && item.completionPercentage >= 100) ||
                     (item.progress !== undefined && item.progress >= 100));
-                console.log(`✅ Pre-assessment found (isPreAssessment flag): ${key}`, {
-                    name: item.name,
+                console.log(`✅ [PRE-ASSESSMENT] Found (isPreAssessment flag): ${item.name}`, {
+                    id: key,
                     completionStatus: item.completionStatus,
                     status: item.status,
                     completionPercentage: item.completionPercentage,
                     progress: item.progress,
-                    isCompleted,
-                    // Show ALL fields to debug what's available
-                    allData: JSON.stringify(item, null, 2)
+                    isCompleted: isCompleted ? '✅ COMPLETE' : '❌ INCOMPLETE'
                 });
                 // Pre-assessment exists - return its completion status (true/false)
                 return isCompleted;
             }
         }
+        console.log('🔍 [PRE-ASSESSMENT] No item with isPreAssessment flag found, checking for first non-milestone child');
         // PRIORITY 2: Find pre-assessment in hashmap - direct child of Learning Pathway that is NOT a milestone
         // Check for first non-milestone child of Learning Pathway
         for (const key of Object.keys(this.hashmap)) {
@@ -2383,26 +2410,32 @@ class AppTocService {
             if (item.parent !== learningPathwayId)
                 continue;
             // Skip milestones
-            if (item.isMilestone)
+            if (item.isMilestone || item.primaryCategory === 'Milestone')
                 continue;
+            console.log(`🔍 [PRE-ASSESSMENT] Checking potential pre-assessment: ${item.name}`, {
+                id: key,
+                parent: item.parent,
+                primaryCategory: item.primaryCategory,
+                courseCategory: item.courseCategory,
+                isMilestone: item.isMilestone
+            });
             // This is a non-milestone direct child - it's the pre-assessment
             // Must check for actual completion - not just any value
             const isCompleted = (item.completionStatus === 2 || item.status === 2 ||
                 (item.completionPercentage !== undefined && item.completionPercentage >= 100) ||
                 (item.progress !== undefined && item.progress >= 100));
-            console.log(`✅ Pre-assessment found (first non-milestone child): ${key}`, {
-                name: item.name,
+            console.log(`✅ [PRE-ASSESSMENT] Found (first non-milestone child): ${item.name}`, {
+                id: key,
                 completionStatus: item.completionStatus,
                 status: item.status,
                 completionPercentage: item.completionPercentage,
                 progress: item.progress,
-                isCompleted,
-                // Show ALL fields to debug what's available
-                allData: JSON.stringify(item, null, 2)
+                isCompleted: isCompleted ? '✅ COMPLETE' : '❌ INCOMPLETE'
             });
             // Pre-assessment exists - return its completion status (true/false)
             return isCompleted;
         }
+        console.log('🔍 [PRE-ASSESSMENT] No pre-assessment found yet');
         // CRITICAL: If we reach here, no pre-assessment was found in the hashmap
         // This could mean either:
         // 1. There IS no pre-assessment (unlock M1 by default)
@@ -2411,41 +2444,60 @@ class AppTocService {
         const hasAnyChildren = Object.keys(this.hashmap).some(key => this.hashmap[key].parent === learningPathwayId);
         if (!hasAnyChildren) {
             // Hashmap not populated yet - lock M1 until data is ready
-            console.log('⚠️ No children found in hashmap yet - locking M1 until data is ready');
+            console.log('⚠️ [PRE-ASSESSMENT] No children found in hashmap yet - LOCKING M1 until data is ready');
             return false;
         }
         // Hashmap is populated but no pre-assessment found - allow M1 to unlock
-        console.log('No pre-assessment found in fully populated hashmap - allowing M1 to be unlocked by default');
+        console.log('ℹ️ [PRE-ASSESSMENT] No pre-assessment found in fully populated hashmap - allowing M1 to be unlocked by default');
         return true;
     }
     /**
      * Check if a milestone's assessment is completed
-     * Searches for any assessment type (Course Assessment, Final Assessment, etc.) that belongs to this milestone
+     * ONLY checks the milestone assessment (Course Assessment that is a direct child of the milestone)
+     * Does NOT check assessments nested inside courses within the milestone
      */
     checkMilestoneAssessmentComplete(milestoneId) {
         const milestone = this.hashmap[milestoneId];
-        // Check all items in hashmap that are assessments and belong to this milestone
+        let foundMilestoneAssessment = false;
+        let isMilestoneAssessmentComplete = false;
+        console.log(`🔍 Checking milestone assessment for: ${milestoneId}`);
+        // Check all items in hashmap that are DIRECT children of this milestone
         for (const key of Object.keys(this.hashmap)) {
             const item = this.hashmap[key];
-            // Check if this is an assessment type
-            const isAssessmentType = item.primaryCategory === 'Course Assessment' ||
+            // CRITICAL: Only check DIRECT children (parent === milestoneId)
+            if (item.parent !== milestoneId)
+                continue;
+            // Check if this is a milestone assessment (Course Assessment as direct child of milestone)
+            const isMilestoneAssessment = item.primaryCategory === 'Course Assessment' ||
                 item.primaryCategory === 'Final Assessment' ||
-                item.primaryCategory === 'Practice Question Set' ||
-                item.courseCategory === 'Course Assessment' ||
-                item.courseCategory === 'Final Assessment' ||
-                (item.name && item.name.toLowerCase().includes('assessment'));
-            if (!isAssessmentType)
+                item.primaryCategory === 'Standalone Assessment';
+            if (!isMilestoneAssessment)
                 continue;
-            // Check if this assessment belongs to this milestone
-            if (this.isChildOfMilestone(key, milestoneId)) {
-                const isCompleted = item.completionStatus === 2 || item.status === 2 || item.completionPercentage >= 100 || item.progress >= 100;
-                if (isCompleted) {
-                    return true;
-                }
+            // Found the milestone assessment
+            foundMilestoneAssessment = true;
+            const isCompleted = item.completionStatus === 2 || item.status === 2 || item.completionPercentage >= 100 || item.progress >= 100;
+            console.log(`📋 Found milestone assessment (direct child): ${item.name || key}`, {
+                milestoneId,
+                assessmentId: key,
+                completionStatus: item.completionStatus,
+                status: item.status,
+                completionPercentage: item.completionPercentage,
+                isCompleted
+            });
+            if (isCompleted) {
+                isMilestoneAssessmentComplete = true;
             }
+            // Usually only one milestone assessment per milestone, but check all just in case
         }
-        // If no assessment found, consider it as completed (no assessment requirement)
-        return true;
+        // CRITICAL LOGIC:
+        // - If NO milestone assessment found → consider complete (no assessment requirement)
+        // - If milestone assessment found → it must be completed
+        if (!foundMilestoneAssessment) {
+            console.log(`ℹ️ No milestone assessment (direct child) found for ${milestoneId} - considering as complete`);
+            return true;
+        }
+        console.log(`${isMilestoneAssessmentComplete ? '✅' : '❌'} Milestone ${milestoneId} assessment: ${isMilestoneAssessmentComplete ? 'COMPLETE' : 'INCOMPLETE'}`);
+        return isMilestoneAssessmentComplete;
     }
     /**
      * Check if a milestone's mandatory content is completed
@@ -2455,6 +2507,7 @@ class AppTocService {
         const milestone = this.hashmap[milestoneId];
         let mandatoryCount = 0;
         let completedMandatoryCount = 0;
+        console.log(`🔍 Checking mandatory content for milestone: ${milestoneId}`);
         // Check all items in hashmap that are direct children of this milestone (courses)
         for (const key of Object.keys(this.hashmap)) {
             const item = this.hashmap[key];
@@ -2467,20 +2520,36 @@ class AppTocService {
             // Skip assessments - they're checked separately
             const isAssessment = item.primaryCategory === 'Course Assessment' ||
                 item.primaryCategory === 'Final Assessment' ||
+                item.primaryCategory === 'Standalone Assessment' ||
                 item.courseCategory === 'Course Assessment' ||
                 (item.name && item.name.toLowerCase().includes('assessment'));
             if (isAssessment)
                 continue;
-            // Check if this content is mandatory
-            if (item.isMandatory) {
+            // CRITICAL: Check if this content is mandatory
+            // By default, courses ARE mandatory unless explicitly marked as optional (isMandatory: false)
+            const isMandatory = item.isMandatory !== false;
+            if (isMandatory) {
                 mandatoryCount++;
                 const isCompleted = item.completionStatus === 2 || item.status === 2 || item.completionPercentage >= 100 || item.progress >= 100;
+                console.log(`   📝 Mandatory item: ${item.name || key}`, {
+                    isMandatory: item.isMandatory,
+                    completionStatus: item.completionStatus,
+                    status: item.status,
+                    completionPercentage: item.completionPercentage,
+                    progress: item.progress,
+                    isCompleted,
+                    hasCompletionStatus: item.completionStatus !== undefined,
+                    hasStatus: item.status !== undefined,
+                    hasCompletionPercentage: item.completionPercentage !== undefined,
+                    hasProgress: item.progress !== undefined
+                });
                 if (isCompleted) {
                     completedMandatoryCount++;
                 }
             }
         }
         const allComplete = mandatoryCount === 0 || completedMandatoryCount >= mandatoryCount;
+        console.log(`📊 Milestone ${milestoneId} mandatory status: ${completedMandatoryCount}/${mandatoryCount} complete = ${allComplete ? '✅ ALL COMPLETE' : '❌ INCOMPLETE'}`);
         return allComplete;
     }
     /**
@@ -6318,6 +6387,7 @@ class AppTocContentCardV2Component {
         this._cachedIsMilestoneAssessment = false;
         this._cachedIsMilestoneAssessmentLocked = false;
         this._cachedResourceLink = { url: '', queryParams: {} };
+        this._cachedMilestoneCompletedCount = 0;
         this._cacheInitialized = false;
     }
     ngOnInit() {
@@ -6331,7 +6401,6 @@ class AppTocContentCardV2Component {
         // Subscribe to hashmap updates to recompute cached properties when progress changes
         this.hashmapUpdatedSubscription = this.appTocSvc.hashmapUpdated$.subscribe((update) => {
             if (update && update.hashmap) {
-                console.log('🔄 Hashmap updated, recomputing cached properties for:', this.content?.identifier);
                 // IMPORTANT: Update hierarchyMapData with the latest hashmap from the service
                 // This ensures the component uses the updated data, not the stale @Input reference
                 this.hierarchyMapData = update.hashmap;
@@ -6385,6 +6454,7 @@ class AppTocContentCardV2Component {
         this._cachedIsMilestoneAssessment = this.computeIsMilestoneAssessment();
         this._cachedIsMilestoneAssessmentLocked = this.computeIsMilestoneAssessmentLocked();
         this._cachedResourceLink = this.computeResourceLink();
+        this._cachedMilestoneCompletedCount = this.computeMilestoneCompletedCount();
         this._cacheInitialized = true;
     }
     computeIsResource() {
@@ -7189,6 +7259,12 @@ class AppTocContentCardV2Component {
         return this.computeIsMilestone();
     }
     getMilestoneCompletedCount() {
+        if (this._cacheInitialized) {
+            return this._cachedMilestoneCompletedCount;
+        }
+        return this.computeMilestoneCompletedCount();
+    }
+    computeMilestoneCompletedCount() {
         if (!this.content || !this.hierarchyMapData) {
             return 0;
         }
@@ -7199,8 +7275,15 @@ class AppTocContentCardV2Component {
         let completedCount = 0;
         milestoneData.leafNodes.forEach((leafId) => {
             const leafData = this.hierarchyMapData[leafId];
-            if (leafData && leafData.completionStatus === 2) {
-                completedCount++;
+            if (leafData) {
+                // CRITICAL: Check multiple completion indicators
+                const isCompleted = leafData.completionStatus === 2 ||
+                    leafData.status === 2 ||
+                    (leafData.completionPercentage && leafData.completionPercentage >= 100) ||
+                    (leafData.progress && leafData.progress >= 100);
+                if (isCompleted) {
+                    completedCount++;
+                }
             }
         });
         return completedCount;
@@ -15567,7 +15650,7 @@ class AppTocV2Service {
             milestoneIndex++;
         });
         contentHeirarchy['leafNodes'] = [...leafNodes];
-        console.log('content Heirarchy', contentHeirarchy);
+        contentHeirarchy['leafNodesCount'] = leafNodes.length;
         return contentHeirarchy;
     }
     mapModuleCount(content) {
@@ -15583,9 +15666,6 @@ class AppTocV2Service {
         }
     }
     mapContentHierarchyProgressUpdate(contentHeirarchyData, enrollmentListData) {
-        console.log('=== mapContentHierarchyProgressUpdate ===');
-        console.log('Content hierarchy:', contentHeirarchyData?.name, contentHeirarchyData?.identifier);
-        console.log('Enrollment list data:', enrollmentListData);
         if (contentHeirarchyData && contentHeirarchyData.children) {
             let totalLeafNodes = 0;
             let totalCompletedLeafNodes = 0;
@@ -15702,13 +15782,6 @@ class AppTocV2Service {
         }
         // Try both contentId and collectionId as the API response may use either field
         const nodeEnrollData = enrollment?.contentList?.find((ele) => ele?.contentId === node.identifier || ele?.collectionId === node.identifier);
-        console.log(`Updating node progress for ${node.identifier} (${node.name}):`, {
-            hasEnrollment: !!enrollment,
-            hasNodeEnrollData: !!nodeEnrollData,
-            nodeEnrollData,
-            currentCompletionStatus: node.completionStatus,
-            currentCompletionPercentage: node.completionPercentage
-        });
         if (enrollment && nodeEnrollData && nodeEnrollData.status < 2) {
             node.completionPercentage = nodeEnrollData.completionPercentage || nodeEnrollData.progress || 0;
             node.completionStatus = Number(nodeEnrollData.status) || 0;
@@ -20842,7 +20915,6 @@ class AppTocHomeV2Component {
                     }
                 }
                 if (this.baseContentReadData?.courseCategory === 'Learning Pathway') {
-                    console.log('User enrolled in LP - computing milestone locks with isEnrolled=true');
                     this.tocSvc.callHirarchyProgressHashmap(this.content);
                     this.tocSvc.computeMilestoneLockingStatus(true);
                     this.syncMilestoneLockStatus();
@@ -20875,7 +20947,6 @@ class AppTocHomeV2Component {
                 this.tocSvc.callHirarchyProgressHashmap(this.content);
                 // For Learning Pathways, compute milestone locking when not enrolled (all locked)
                 if (this.baseContentReadData?.courseCategory === 'Learning Pathway') {
-                    console.log('User not enrolled - computing milestone locks');
                     this.tocSvc.computeMilestoneLockingStatus(false);
                     this.syncMilestoneLockStatus();
                 }
@@ -21509,7 +21580,6 @@ class AppTocHomeV2Component {
         this.hashmapUpdatedSubscription = this.tocSvc.hashmapUpdated$.subscribe((update) => {
             if (update && this.baseContentReadData?.courseCategory === 'Learning Pathway') {
                 const isEnrolled = this.userEnrollmentList && this.userEnrollmentList.length > 0;
-                console.log('Hashmap updated at:', update.timestamp, 'Enrolled:', isEnrolled, 'Syncing milestone lock status...');
                 // Sync content tree's isLocked with the updated hashmap values
                 this.syncMilestoneLockStatus();
             }
@@ -21633,18 +21703,17 @@ class AppTocHomeV2Component {
         if (this.baseContentReadData?.courseCategory === 'Learning Pathway') {
             return new Promise((resolve) => {
                 const content = this.baseContentReadData;
+                // STEP 1: Construct hierarchy structure
                 this.content = this.appTocV2Svc.constructHeirarchyData(content);
-                // Update progress with latest enrollment data
+                // STEP 2: Update progress with latest enrollment data
                 this.appTocV2Svc.mapContentHierarchyProgressUpdate(this.content, this.userEnrollmentList);
-                // Create hashmap and compute milestone locking after progress is updated
+                // STEP 3: Create hashmap from updated hierarchy (this should preserve completion status)
                 this.tocSvc.callHirarchyProgressHashmap(this.content);
-                console.log('Learning Pathway hashmap updated:', this.tocSvc.hashmap);
                 // Check if user is enrolled
                 const isEnrolled = this.userEnrollmentList && this.userEnrollmentList.length > 0;
-                // Compute milestone locking status with enrollment status and updated progress data
+                // STEP 4: Compute milestone locking status with enrollment status and updated progress data
                 this.tocSvc.computeMilestoneLockingStatus(isEnrolled);
-                console.log('Milestone locking recomputed. Enrolled:', isEnrolled);
-                // Sync content tree's isLocked with computed values
+                // STEP 5: Sync content tree's isLocked with computed values
                 this.syncMilestoneLockStatus();
                 this.getOrgIdForShare();
                 this.getTocStructure();
@@ -21728,7 +21797,6 @@ class AppTocHomeV2Component {
                     if (oldLocked !== child.isLocked) {
                         hasChanges = true;
                     }
-                    console.log(`Synced lock status for ${child.name} (${child.identifier}): isLocked=${child.isLocked}`);
                 }
             }
         });
@@ -21743,7 +21811,6 @@ class AppTocHomeV2Component {
             return;
         }
         try {
-            console.log('🔄 Refreshing milestone locks from hashmap...');
             // Check if user is enrolled
             const isEnrolled = this.userEnrollmentList && this.userEnrollmentList.length > 0;
             // Recompute milestone locking status from existing hashmap