Skip to content

Commit 1aed786

Browse files
[OGUI-1869] Broken virtual table edit layout show (#3292)
* fix: correct height layout of virtual table in object tree sidebar * fix: update virtual table layout to use 'main' context in object tree sidebar * fix: adjust virtual table context between 'main' and 'side' in object tree components * fix: remove table header from virtual table
1 parent ba2c8e0 commit 1aed786

3 files changed

Lines changed: 4 additions & 16 deletions

File tree

QualityControl/public/layout/view/panels/objectTreeSidebar.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,11 @@ export default (model) =>
3838
}
3939
return [
4040
searchForm(model),
41-
h(
42-
'.scroll-y',
41+
h('.flex-column.flex-grow', {}, [
4342
searchInput.trim() !== ''
4443
? virtualTable(model, 'side', objectsToDisplay)
45-
: treeTable(model),
46-
),
44+
: h('.scroll-y', treeTable(model)),
45+
]),
4746
objectPreview(model),
4847
];
4948
},

QualityControl/public/object/objectTreePage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export default (model) => {
6262
qcObject.name.toLowerCase().includes(searchInput.toLowerCase()));
6363
return h('.flex-column.flex-grow', [
6464
actionablesHeaderGroup(model.object),
65-
virtualTable(model, 'side', objectsToDisplay),
65+
virtualTable(model, 'main', objectsToDisplay),
6666
]);
6767
}
6868
return h('', [

QualityControl/public/object/virtualTable.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export default function virtualTable(model, location = 'main', objects = []) {
2929
FONT = location === 'side' ? '.f6' : '';
3030
return h('.flex-grow.flex-column', {
3131
}, [
32-
location !== 'side' && tableHeader(),
3332
h(
3433
'.scroll-y.animate-width',
3534
tableContainerHooks(model),
@@ -94,16 +93,6 @@ const objectFullRow = (model, item, location) =>
9493
]),
9594
]);
9695

97-
/**
98-
* Create a table header separately so that it does not get included
99-
* in the virtual list scrolling events
100-
* @returns {vnode} - virtual node element
101-
*/
102-
const tableHeader = () =>
103-
h('table.table.table-sm.text-no-select', {
104-
style: 'margin-bottom:0',
105-
}, h('thead', [h('tr', [h('th', 'Name')])]));
106-
10796
/**
10897
* Set styles of the floating table and its position inside the big div .tableLogsContentPlaceholder
10998
* @param {Model} model - root model of the application

0 commit comments

Comments
 (0)