From f540b3dc8d6f59163d9ae4d0249c5f771e03c959 Mon Sep 17 00:00:00 2001 From: Anton Date: Wed, 19 Jul 2023 09:55:27 +0200 Subject: [PATCH] Fix js error in console log [SCI-8890] --- app/assets/javascripts/experiments/table.js | 4 +++- .../label_templates/label_templates_datatable.js | 6 ++++-- app/javascript/vue/navigation/navigator_item.vue | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/experiments/table.js b/app/assets/javascripts/experiments/table.js index c7bc43316..716694c7a 100644 --- a/app/assets/javascripts/experiments/table.js +++ b/app/assets/javascripts/experiments/table.js @@ -499,7 +499,9 @@ var ExperimnetTable = { }); }, updateExperimentToolbar: function() { - window.actionToolbarComponent.fetchActions({ my_module_ids: this.selectedMyModules }); + if (window.actionToolbarComponent) { + window.actionToolbarComponent.fetchActions({ my_module_ids: this.selectedMyModules }); + } }, selectDate: function($field) { var datePicker = $field.data('DateTimePicker'); diff --git a/app/assets/javascripts/label_templates/label_templates_datatable.js b/app/assets/javascripts/label_templates/label_templates_datatable.js index 0c153a9d2..4e7e166bd 100644 --- a/app/assets/javascripts/label_templates/label_templates_datatable.js +++ b/app/assets/javascripts/label_templates/label_templates_datatable.js @@ -144,8 +144,10 @@ } function updateButtons() { - window.actionToolbarComponent.fetchActions({ label_template_ids: rowsSelectedIDs() }); - $('.dataTables_scrollBody').css('padding-bottom', `${rowsSelectedIDs().length > 0 ? 68 : 0}px`); + if (window.actionToolbarComponent) { + window.actionToolbarComponent.fetchActions({ label_template_ids: rowsSelectedIDs() }); + $('.dataTables_scrollBody').css('padding-bottom', `${rowsSelectedIDs().length > 0 ? 68 : 0}px`); + } } function reloadTable() { diff --git a/app/javascript/vue/navigation/navigator_item.vue b/app/javascript/vue/navigation/navigator_item.vue index 2c29c7632..4b4e1e7c0 100644 --- a/app/javascript/vue/navigation/navigator_item.vue +++ b/app/javascript/vue/navigation/navigator_item.vue @@ -114,7 +114,7 @@ export default { } }, children: function() { - if (this.children.length > 0) { + if (this.children && this.children.length > 0) { this.childrenExpanded = true; } else if (this.childrenLoaded) { this.item.has_children = false;