First model remains _isLocked when content order is randomised

[danielghost]

Since https://github.com/adaptlearning/adapt-contrib-trickle/releases/tag/v5.1.0, if page content is randomised (e.g. via an assessment) and the first component displayed isn't the first in the natural model structure order, that component remains _isLocked for the remainder of the course session. The model therefore appears locked in the pageLevelProgress despite trickle itself unlocking to the next model. All subsequent models work as expected.

[oliverfoster]

I have a feeling it's just that the locks aren't recalculated after the assessment reworks its children.

https://github.com/adaptlearning/adapt-contrib-assessment/blob/2dccd75e3e7ee563ed02958b9ef48766d338b072/js/adapt-assessmentArticleModel.js#L186

adapt-contrib-trickle/js/models.js

Line 194 in 275462a

export function applyLocks() {

[danielghost]

applyLocks does seem to be called following an assessment amending the children. Turns out this is actually the same issue as #164. The example code in #164 (comment) seems to resolve the issue. I will create a PR for review.

[oliverfoster]

That makes sense. An extra execution to cover the immediate descendants, instead of just the ancestor's next siblings:

adapt-contrib-trickle/js/models.js

Lines 207 to 209 in 275462a

	locks[id] = locks[id] || false;
	// Apply lock to all subsequent models
	const subsequentLockingModels = _getAncestorNextSiblings(siteModel);

adapt-contrib-trickle/js/models.js

Lines 222 to 227 in 275462a

	// Cascade inherited locks through the hierarchyd
	model.getAllDescendantModels().forEach(descendant => {
	const descendantId = descendant.get('_id');
	modelsById[descendantId] = descendant;
	locks[descendantId] = locks[id];
	});

[github-actions]

🎉 This issue has been resolved in version 7.4.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀