Skip to content
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

Jump to bottom

DataGrid - A custom command button's disabled function is not called when the Push API is used (T1147659) #23995

Merged
merged 1 commit into from
Mar 13, 2023
Merged

DataGrid - A custom command button's disabled function is not called when the Push API is used (T1147659) #23995

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
5 changes: 4 additions & 1 deletion js/ui/grid_core/ui.grid_core.editing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,10 @@ const EditingController = modules.ViewController.inherit((function() {
this._renderEditingButtons($container, buttons, options, change);

options.watch && options.watch(
() => buttons.map(button => this._isButtonVisible(button, options)),
() => buttons.map(button => ({
visible: this._isButtonVisible(button, options),
disabled: this._isButtonDisabled(button, options),
})),
() => {
$container.empty();
this._renderEditingButtons($container, buttons, options);
Expand Down
82 changes: 75 additions & 7 deletions testing/tests/DevExpress.ui.widgets.dataGrid/editing.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { getCells, generateItems, MockColumnsController, MockDataController, set
import pointerMock from '../../helpers/pointerMock.js';
import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js';
import { findShadowHostOrDocument } from '../../helpers/dataGridHelper.js';
import { DataSource } from 'data/data_source/data_source';

QUnit.testStart(function() {
const markup =
Expand Down Expand Up @@ -10609,8 +10610,8 @@ QUnit.module('Refresh modes', {
assert.strictEqual($cellElement.find('.dx-textbox').length, 1, 'has textbox');
});

// T690041
QUnit.test('Changing edit icon in the \'buttons\' command column if repaintChangesOnly is true', function(assert) {
// T690041, T1147659
QUnit.test('Changing command column if repaintChangesOnly is true', function(assert) {
// arrange
let $linkElements;

Expand All @@ -10619,12 +10620,14 @@ QUnit.module('Refresh modes', {
allowUpdating: true,
allowDeleting: true
});

this.options.columns = [
{
type: 'buttons',
buttons: [
{ name: 'edit', icon: 'active-icon', visible: e => e.row.data.state === 'active' },
{ name: 'delete', icon: 'remove', visible: e => e.row.data.state !== 'active' }
{ name: 'edit', icon: 'active-icon', visible: e => e.row.data.state === 'active' },
{ name: 'delete', icon: 'remove', visible: e => e.row.data.state !== 'active' },
{ name: 'custom', icon: 'custom', disabled: e => e.row.data.state !== 'active' },
]
},
'state'
Expand All @@ -10638,13 +10641,78 @@ QUnit.module('Refresh modes', {
this.setupModules();
this.cellValue(0, 'state', 'active');
$linkElements = $(this.getCellElement(0, 0)).find('.dx-link');
assert.equal($linkElements.length, 1);

// assert
assert.equal($linkElements.length, 2);
assert.ok($linkElements.eq(0).hasClass('dx-icon-active-icon'), 'the edit link');

assert.ok($linkElements.eq(1).hasClass('dx-icon-custom'), 'the custom link');
assert.notOk($linkElements.eq(1).hasClass('dx-state-disabled'), 'the custom link is enabled');

// act
this.cellValue(0, 'state', 'disabled');

// assert
$linkElements = $(this.getCellElement(0, 0)).find('.dx-link');
assert.equal($linkElements.length, 2);
assert.ok($linkElements.eq(0).hasClass('dx-icon-remove'));
assert.ok($linkElements.eq(1).hasClass('dx-icon-custom'), 'the custom link');
assert.ok($linkElements.eq(1).hasClass('dx-state-disabled'), 'the custom link is disabled');
});

// T690041, T1147659
QUnit.test('Changing command column if repaintChangesOnly is true and push API is used', function(assert) {
// arrange
let $linkElements;

this.options.columns = [
{
type: 'buttons',
buttons: [
{ name: 'edit', icon: 'active-icon', visible: e => e.row.data.state === 'active' },
{ name: 'delete', icon: 'remove', visible: e => e.row.data.state !== 'active' },
{ name: 'custom', icon: 'custom', disabled: e => e.row.data.state !== 'active' },
]
},
'state'
];

this.options.dataSource = new DataSource({
reshapeOnPush: true,
store: {
type: 'array',
key: 'id',
data: [{ id: 1, state: 'active' }],
}
});

this.options.repaintChangesOnly = true;

// act
this.setupModules();

// assert
$linkElements = $(this.getCellElement(0, 0)).find('.dx-link');
assert.equal($linkElements.length, 2);
assert.ok($linkElements.eq(0).hasClass('dx-icon-active-icon'), 'the edit link');
assert.ok($linkElements.eq(1).hasClass('dx-icon-custom'), 'the custom link');
assert.notOk($linkElements.eq(1).hasClass('dx-state-disabled'), 'the custom link is enabled');

// act
this.options.dataSource.store().push([
{
type: 'update',
key: 1,
data: { state: 'disabled'}
}
]);
this.clock.tick();

// assert
$linkElements = $(this.getCellElement(0, 0)).find('.dx-link');
assert.equal($linkElements.length, 1);
assert.equal($linkElements.length, 2);
assert.ok($linkElements.eq(0).hasClass('dx-icon-remove'));
assert.ok($linkElements.eq(1).hasClass('dx-icon-custom'), 'the custom link');
assert.ok($linkElements.eq(1).hasClass('dx-state-disabled'), 'the custom link is disabled');
});

// T700691
Expand Down