admin/sao2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix AG Grid restored grouping values

Browse Source
This commit is contained in:
laurentbarontini
2026-05-04 11:24:39 +02:00
parent d9292b82c2
commit d78c9e0f32
2 changed files with 80 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
dist/tryton-sao.js vendored
View File

@@ -23284,6 +23284,30 @@ function eval_pyson(value){
var text = this._get_column_text_value(column, record); var text = this._get_column_text_value(column, record);
return text || Sao.i18n.gettext('(Empty)'); return text || Sao.i18n.gettext('(Empty)');
}, },
_load_grouping_values: function() {
if (!this._is_grouping_active()) {
return null;
}
var grouping = this._get_grouping_state();
var promises = [];
grouping.groupBy.forEach(name => {
this.group.forEach(record => {
if (record && !record.is_loaded(name)) {
promises.push(record.load(name, true, false));
}
});
});
if (!promises.length) {
return null;
}
console.log('[AGGRID][GROUPING_LOAD_FIELDS_FLAT_JSON]',
JSON.stringify({
viewId: this.view_id,
groupBy: grouping.groupBy,
pendingLoads: promises.length,
}));
return jQuery.when.apply(jQuery, promises);
},
_get_column_raw_value: function(column, record) { _get_column_raw_value: function(column, record) {
if (!column || !record || !column.attributes || !column.attributes.name) { if (!column || !record || !column.attributes || !column.attributes.name) {
return null; return null;
@@ -23529,6 +23553,18 @@ function eval_pyson(value){
} }
bucket.records.push(record); bucket.records.push(record);
}); });
if (window.console && level === 0) {
console.log('[AGGRID][GROUPING_KEYS_FLAT_JSON]',
JSON.stringify({
viewId: this.view_id,
column: column_name,
groupCount: groups.length,
groups: groups.slice(0, 12).map(group => ({
key: group.key,
count: group.records.length,
})),
}));
}
groups.forEach(group => { groups.forEach(group => {
var group_path = path.concat([column_name + ':' + group.key]); var group_path = path.concat([column_name + ':' + group.key]);
var is_expanded = grouping.expandAll || var is_expanded = grouping.expandAll ||
@@ -24194,6 +24230,10 @@ function eval_pyson(value){
if (!this.gridApi) { if (!this.gridApi) {
return jQuery.when(); return jQuery.when();
} }
var grouping_load = this._load_grouping_values();
if (grouping_load) {
return grouping_load.then(() => this.display(selected));
}
this._grid_columns = this._build_column_defs(); this._grid_columns = this._build_column_defs();
var row_data = this._get_row_data(); var row_data = this._get_row_data();
console.log('[AGGRID][ROW_DATA_KIND_FLAT_JSON]', JSON.stringify({ console.log('[AGGRID][ROW_DATA_KIND_FLAT_JSON]', JSON.stringify({

40
tryton-sao.js
View File

@@ -23284,6 +23284,30 @@ function eval_pyson(value){
var text = this._get_column_text_value(column, record); var text = this._get_column_text_value(column, record);
return text || Sao.i18n.gettext('(Empty)'); return text || Sao.i18n.gettext('(Empty)');
}, },
_load_grouping_values: function() {
if (!this._is_grouping_active()) {
return null;
}
var grouping = this._get_grouping_state();
var promises = [];
grouping.groupBy.forEach(name => {
this.group.forEach(record => {
if (record && !record.is_loaded(name)) {
promises.push(record.load(name, true, false));
}
});
});
if (!promises.length) {
return null;
}
console.log('[AGGRID][GROUPING_LOAD_FIELDS_FLAT_JSON]',
JSON.stringify({
viewId: this.view_id,
groupBy: grouping.groupBy,
pendingLoads: promises.length,
}));
return jQuery.when.apply(jQuery, promises);
},
_get_column_raw_value: function(column, record) { _get_column_raw_value: function(column, record) {
if (!column || !record || !column.attributes || !column.attributes.name) { if (!column || !record || !column.attributes || !column.attributes.name) {
return null; return null;
@@ -23529,6 +23553,18 @@ function eval_pyson(value){
} }
bucket.records.push(record); bucket.records.push(record);
}); });
if (window.console && level === 0) {
console.log('[AGGRID][GROUPING_KEYS_FLAT_JSON]',
JSON.stringify({
viewId: this.view_id,
column: column_name,
groupCount: groups.length,
groups: groups.slice(0, 12).map(group => ({
key: group.key,
count: group.records.length,
})),
}));
}
groups.forEach(group => { groups.forEach(group => {
var group_path = path.concat([column_name + ':' + group.key]); var group_path = path.concat([column_name + ':' + group.key]);
var is_expanded = grouping.expandAll || var is_expanded = grouping.expandAll ||
@@ -24194,6 +24230,10 @@ function eval_pyson(value){
if (!this.gridApi) { if (!this.gridApi) {
return jQuery.when(); return jQuery.when();
} }
var grouping_load = this._load_grouping_values();
if (grouping_load) {
return grouping_load.then(() => this.display(selected));
}
this._grid_columns = this._build_column_defs(); this._grid_columns = this._build_column_defs();
var row_data = this._get_row_data(); var row_data = this._get_row_data();
console.log('[AGGRID][ROW_DATA_KIND_FLAT_JSON]', JSON.stringify({ console.log('[AGGRID][ROW_DATA_KIND_FLAT_JSON]', JSON.stringify({