Fix: Include check for model.get('_type') !== 'block' when filtering models (fixes #197)

[joe-allen-89]

adaptlearning/adapt-contrib-trickle#221

Fix

• Include check for model.get('_type') !== 'block' when filtering models (fixes Trickle button not showing when assessment has been completed adapt-contrib-trickle#221)

[danielghost]

Seems to only be an issue when trickle "_onChildren": false for the article, as that is when the trickle-button is included in this._originalChildModelsStore and then subsequently removed in the filter.

This works, but is model.get('_type') !== 'block' the clearest way to maintain the trickle-button in the list? Should it be more explicit regarding the intention, e.g. model.get('_component') === 'trickle-button' or model.get('_isTrackable') === false. Maybe a comment would suffice?

[oliverfoster]

Why is it failing the data.hasId() check? The trickle button should be in the data collection still...

Perhaps I never added them to data? https://github.com/adaptlearning/adapt-contrib-trickle/blob/2c550355f0e98f0d50d07f8fdf9614ccfc94ac6d/js/models.js#L294-L319 Weird.

Could you try with a data.add(trickleButtonModel); here as an alternative please? @joe-allen-89

[joe-allen-89]

@danielghost - I used model.get('_type') !== 'block' as it's the same method used further down to identify trickle, but yes a comment to make more obvious would have helped.

@oliverfoster - Tbh I assumed there was a reason you'd kept it out the data, adding the trickle to data also works, I'll close this PR, transfer issue and raise a new PR on trickle if that's your preferred option.

[oliverfoster]

I suspect I was probably just cautious about it initially, but there's really no reason not to.

Branching clears cloned models up if it comes to remove them https://github.com/adaptlearning/adapt-contrib-branching/blob/036b75fef296c5e09446ef09dfa3969f29eb695e/js/BranchingSet.js#L313

[joe-allen-89]

Closing PR as transferring issue to trickle for alternative fix.

[joe-allen-89]

Alternative fix implemented, PR raised - adaptlearning/adapt-contrib-trickle#222