Merge pull request #1546 from FlowFuse/pre-release-niggles

Pre release niggles
FlowFuse · Dec 20, 2024 · 8197214 · 8197214
2 parents abf3130 + 3de169c
commit 8197214
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ui/src/layouts/Group.vue b/ui/src/layouts/Group.vue
@@ -117,8 +117,8 @@ export default {
         widgetStyles () {
             return (widget) => {
                 const styles = {}
-                const height = widget.props.height || widget.layout.height
-                const width = widget.props.width || widget.layout.width
+                const height = widget.props.height
+                const width = widget.props.width
                 styles['grid-row-end'] = `span ${height}`
                 styles['grid-template-rows'] = `repeat(${height}, minmax(var(--widget-row-height), auto))`
                 styles['grid-column-end'] = `span min(${this.getWidgetWidth(+width)}, var(--layout-columns))`

diff --git a/ui/src/widgets/ui-table/UITable.vue b/ui/src/widgets/ui-table/UITable.vue
@@ -193,7 +193,7 @@ export default {
         calculatePaginatedRows () {
             if (this.itemsPerPage > 0) {
                 this.pagination.pages = Math.ceil(this.localData?.length / this.props.maxrows)
-                this.pagination.rows = this.localData.slice(
+                this.pagination.rows = (this.localData || []).slice(
                     (this.pagination.page - 1) * this.props.maxrows,
                     (this.pagination.page) * this.props.maxrows
                 )