Skip to content

refine grid logic with strict comparisons and column auto-sizing adjustments #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
solverat merged 1 commit into from
Sep 3, 2026
+37 −28
Merged

refine grid logic with strict comparisons and column auto-sizing adjustments #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions public/js/opendxp/object/folder/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,13 @@ opendxp.object.search = Class.create(opendxp.object.helpers.gridTabAbstract, {
listeners: {
refresh: function (dataview) {
Ext.each(dataview.panel.columns, function (column) {
if (column.autoSizeColumn === true) {
// a width differing from the last measurement was chosen by the user and must survive the reload
if (
column.autoSizeColumn === true &&
(column.autoSizedWidth === undefined || column.width === column.autoSizedWidth)
) {
column.autoSize();
column.autoSizedWidth = column.width;
}
})
}
Expand All @@ -331,7 +336,7 @@ opendxp.object.search = Class.create(opendxp.object.helpers.gridTabAbstract, {
listeners: {
celldblclick: function(grid, td, cellIndex, record, tr, rowIndex, e, eOpts) {
var columns = grid.grid.getColumnManager().getColumns();
if (columns[cellIndex].dataIndex == 'id' || columns[cellIndex].dataIndex == 'fullpath') {
if (columns[cellIndex].dataIndex === 'id' || columns[cellIndex].dataIndex === 'fullpath') {
var data = this.store.getAt(rowIndex);
opendxp.helpers.openObject(data.get("id"), data.get("type"));
}
Expand Down
50 changes: 26 additions & 24 deletions public/js/opendxp/object/helpers/grid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@ opendxp.object.helpers.grid = Class.create({
var key = fieldConfig.key;
var readerFieldConfig = {name: key};
// dynamic select returns data + options on cell level
if ((type == "select" || type == "multiselect") && fieldConfig.layout.optionsProviderType !== opendxp.object.helpers.selectField.OPTIONS_PROVIDER_TYPE_CONFIGURE && fieldConfig.layout.optionsProviderClass) {
if ((type === "select" || type === "multiselect") && fieldConfig.layout.optionsProviderType !== opendxp.object.helpers.selectField.OPTIONS_PROVIDER_TYPE_CONFIGURE && fieldConfig.layout.optionsProviderClass) {
if (typeof noBatchColumns != "undefined") {
if (fieldConfig.layout.dynamicOptions) {
noBatchColumns.push(key);
}
}

if (type == "select") {
if (type === "select") {
readerFieldConfig["convert"] = function (key, v, rec) {
if (v && typeof v.options !== "undefined") {
// split it up and store the options in a separate field
Expand Down Expand Up @@ -152,7 +152,7 @@ opendxp.object.helpers.grid = Class.create({
},
listeners: {
exception: function (proxy, request, operation, eOpts) {
if(operation.getAction() == "update") {
if(operation.getAction() === "update") {
Ext.MessageBox.alert(t('error'),
t('cannot_save_object_please_try_to_edit_the_object_in_detail_view'));
this.store.rejectChanges();
Expand Down Expand Up @@ -224,7 +224,7 @@ opendxp.object.helpers.grid = Class.create({
var field = fields[i];

var width = this.getColumnWidth(field, null);
if(field.key == "subtype") {
if(field.key === "subtype") {
var columnConfig = {
text: t("type"),
sortable: true,
Expand All @@ -242,7 +242,7 @@ opendxp.object.helpers.grid = Class.create({
columnConfig.width = width;
}
gridColumns.push(columnConfig);
} else if(field.key == "id") {
} else if(field.key === "id") {
var columnConfig = {
text: 'ID',
sortable: true,
Expand All @@ -257,17 +257,17 @@ opendxp.object.helpers.grid = Class.create({
columnConfig.width = width;
}
gridColumns.push(columnConfig);
} else if(field.key == "published") {
} else if(field.key === "published") {
gridColumns.push(new Ext.grid.column.Check({
text: t("published"),
width: 40,
width: this.getColumnWidth(field, 40),
sortable: true,
filter: 'boolean',
dataIndex: "published",
disabled: this.isSearch,
locked: this.getColumnLock(field)
}));
} else if(field.key == "fullpath") {
} else if(field.key === "fullpath") {
var columnConfig = {
text: t("path"),
sortable: true,
Expand All @@ -282,7 +282,7 @@ opendxp.object.helpers.grid = Class.create({
}

gridColumns.push(columnConfig);
} else if(field.key == "filename") {
} else if(field.key === "filename") {
var columnConfig = {
text: t("filename"),
sortable: true,
Expand All @@ -297,7 +297,7 @@ opendxp.object.helpers.grid = Class.create({
columnConfig.width = width;
}
gridColumns.push(columnConfig);
} else if(field.key == "key") {
} else if(field.key === "key") {
var columnConfig = {
text: t("key"),
sortable: true,
Expand All @@ -314,7 +314,7 @@ opendxp.object.helpers.grid = Class.create({
}

gridColumns.push(columnConfig);
} else if(field.key == "classname") {
} else if(field.key === "classname") {
var columnConfig = {
text: t("class"),
sortable: true,
Expand All @@ -330,15 +330,15 @@ opendxp.object.helpers.grid = Class.create({
}

gridColumns.push(columnConfig);
} else if(field.key == "index") {
} else if(field.key === "index") {
gridColumns.push({text: t("index") + " (System)", width: this.getColumnWidth(field, 160), sortable: false,
dataIndex: "index", editable: false});
} else if(field.key == "creationDate") {
} else if(field.key === "creationDate") {
gridColumns.push({text: t("creationdate") + " (System)", width: this.getColumnWidth(field, 160), sortable: true,
dataIndex: "creationDate", filter: 'date', editable: false, locked: this.getColumnLock(field), renderer: function(d) {
return Ext.Date.format(d, opendxp.globalmanager.get('localeDateTime').getDateTimeFormat());
}/*, hidden: !propertyVisibility.creationDate*/});
} else if(field.key == "modificationDate") {
} else if(field.key === "modificationDate") {
gridColumns.push({text: t("modificationdate") + " (System)", width: this.getColumnWidth(field, 160), sortable: true,
dataIndex: "modificationDate", filter: 'date', editable: false, locked: this.getColumnLock(field), renderer: function(d) {

Expand Down Expand Up @@ -387,10 +387,12 @@ opendxp.object.helpers.grid = Class.create({
if (tag) {
var fc = tag.getGridColumnConfig(field);

if(width === null) {
fc.autoSizeColumn = true;
} else {
if(width !== null) {
fc.width = width;
} else if(!fc.width) {
// several field types carry their own default width, auto-sizing would
// measure a lazily loaded thumbnail as empty and collapse the column
fc.autoSizeColumn = true;
}

if (field.layout.decimalPrecision) {
Expand Down Expand Up @@ -454,11 +456,11 @@ opendxp.object.helpers.grid = Class.create({
var fields = this.fields;
for (var i = 0; i < fields.length; i++) {

if(fields[i].key != "id" && fields[i].key != "published" && fields[i].key != "key"
&& fields[i].key != "filename" && fields[i].key != "classname"
&& fields[i].key != "creationDate" && fields[i].key != "modificationDate") {
if(fields[i].key !== "id" && fields[i].key != "published" && fields[i].key !== "key"
&& fields[i].key !== "filename" && fields[i].key !== "classname"
&& fields[i].key !== "creationDate" && fields[i].key !== "modificationDate") {

if (fields[i].key == "fullpath") {
if (fields[i].key === "fullpath") {
configuredFilters.fullpath = {
type: "string"
};
Expand Down Expand Up @@ -500,9 +502,9 @@ opendxp.object.helpers.grid = Class.create({
continue;
}

if(fields[i].key != "id" && fields[i].key != "published" && fields[i].key != "fullpath"
&& fields[i].key != "filename" && fields[i].key != "classname" && fields[i].key != "key"
&& fields[i].key != "creationDate" && fields[i].key != "modificationDate") {
if(fields[i].key !== "id" && fields[i].key !== "published" && fields[i].key !== "fullpath"
&& fields[i].key !== "filename" && fields[i].key !== "classname" && fields[i].key != "key"
&& fields[i].key !== "creationDate" && fields[i].key !== "modificationDate") {

var fieldType = fields[i].type;
var tag = opendxp.object.tags[fieldType];
Expand Down
6 changes: 4 additions & 2 deletions public/js/opendxp/object/helpers/gridTabAbstract.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@ opendxp.object.helpers.gridTabAbstract = Class.create({
name: name,
position: i,
hidden: cm[i].hidden,
width: cm[i].width,
// a width still equal to the auto-size measurement is not a user choice,
// storing it would freeze the column at whatever the first render produced
width: cm[i].width === cm[i].autoSizedWidth ? null : cm[i].width,
locked: cm[i].locked,
fieldConfig: this.fieldObject[name],
isOperator: this.fieldObject[name].isOperator
Expand Down Expand Up @@ -275,7 +277,7 @@ opendxp.object.helpers.gridTabAbstract = Class.create({
});
}

this.languageInfo.setText(t("grid_current_language") + ": " + (this.gridLanguage == "default" ? t("default") : opendxp.available_languages[this.gridLanguage]));
this.languageInfo.setText(t("grid_current_language") + ": " + (this.gridLanguage === "default" ? t("default") : opendxp.available_languages[this.gridLanguage]));

var hideSaveColumnConfig = !fromConfig || save;

Expand Down
Loading