diff --git a/kolibri/core/assets/src/views/CoreTable.vue b/kolibri/core/assets/src/views/CoreTable.vue index 09dbc67dd03..8a0ceb88b5e 100644 --- a/kolibri/core/assets/src/views/CoreTable.vue +++ b/kolibri/core/assets/src/views/CoreTable.vue @@ -60,11 +60,20 @@ const tbodyCopy = [...this.$slots.tbody]; tbodyCopy.forEach(tbody => { - // Need to check componentOptions if wrapped in , or just children - // if in regular const tgroupChildren = get(tbody, 'componentOptions.children'); if (tgroupChildren) { - tableHasRows = tgroupChildren.length > 0; + if (tgroupChildren.length === 0) { + tableHasRows = false; + } else if ( + tgroupChildren.length === 1 && + tgroupChildren[0]?.tag?.includes('transition-group') + ) { + const [child] = tgroupChildren; + const children = child.children || child.componentOptions?.children; + tableHasRows = !!children?.length > 0; + } else { + tableHasRows = true; + } } if (tbody.children) { diff --git a/kolibri/core/assets/src/views/sortable/DragSortWidget/index.vue b/kolibri/core/assets/src/views/sortable/DragSortWidget/index.vue index cf37b363a2a..f9ec278307b 100644 --- a/kolibri/core/assets/src/views/sortable/DragSortWidget/index.vue +++ b/kolibri/core/assets/src/views/sortable/DragSortWidget/index.vue @@ -3,6 +3,7 @@
- -
- - {{ coachString('classLabel') }} - - - {{ className }} - -
-
{{ coachString('lessonVisibleLabel') }} - + {{ coachString('recipientsLabel') }} - +
{{ coachString('descriptionLabel') }} - +