Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2025-06-13 20:53:59 +00:00
Code Issues Projects Releases Wiki Activity

(core) Fix the switch of a new column from Common to Separate settings

Browse Source 
Summary:
The switching between Common and Separate settings for a field was broken when
the field had never modified settings.

Test Plan: Added a test case that tickles the issue and tests the fix.

Reviewers: jarek

Reviewed By: jarek

Differential Revision: https://phab.getgrist.com/D4072
This commit is contained in:
Dmitry S 2023-10-11 01:43:14 -04:00
parent 1be1e5f647
commit 519f2f4fb6
2 changed files with 72 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/widgets/FieldBuilder.ts
View File

@ -502,7 +502,7 @@ export class FieldBuilder extends Disposable {
return this.gristDoc.docData.bundleActions(
t("Use separate field settings for {{colId}}", { colId: this.origColumn.colId() }), () => {
return Promise.all([
setSaveValue(this.field.widgetOptions, this.field.column().widgetOptions()),
setSaveValue(this.field.widgetOptions, this.field.column().widgetOptions() || "{}"),
setSaveValue(this.field.visibleCol, this.field.column().visibleCol()),
this.field.saveDisplayFormula(this.field.column()._displayColModel().formula() || '')
]);

71
test/nbrowser/FieldSettings2.ts Normal file
View File

@ -0,0 +1,71 @@
import {assert, driver} from 'mocha-webdriver';
import * as gu from 'test/nbrowser/gristUtils';
import {setupTestSuite} from 'test/nbrowser/testUtils';
describe('FieldSettings2', function() {
this.timeout(20000);
const cleanup = setupTestSuite();
afterEach(() => gu.checkForErrors());
it('should allow separate field settings for a new field', async function() {
const session = await gu.session().teamSite.user('user1').login();
const docId = (await session.tempNewDoc(cleanup, 'FieldSettings2A', {load: false}));
const api = session.createHomeApi();
await api.applyUserActions(docId, [
['AddTable', 'TestTable', [{id: 'Num', type: 'Numeric'}]],
['BulkAddRecord', 'TestTable', [null, null, null], {Num: ['5', '10', '15']}],
]);
await session.loadDoc(`/doc/${docId}/p/2`);
// Add a second widget of the same table to the page.
await gu.openAddWidgetToPage();
await gu.selectWidget(/Table/, /TestTable/);
await gu.renameSection('TESTTABLE', 'T1');
await gu.renameSection('TESTTABLE', 'T2');
// Change Num field to "Separate"
await gu.getCell({section: 'T1', rowNum: 1, col: 'Num'}).click();
await gu.toggleSidePanel('right', 'open');
await driver.find('.test-right-tab-field').click();
await fieldSettingsUseSeparate();
// Now change background color of this column.
await gu.openCellColorPicker();
await gu.setFillColor('blue');
await driver.find('.test-colors-save').click();
await gu.waitForServer();
// Check that only one of the two views changed.
const cell1 = await gu.getCell({section: 'T1', rowNum: 1, col: 'Num'});
const cell2 = await gu.getCell({section: 'T2', rowNum: 1, col: 'Num'});
await gu.assertFillColor(cell1, 'blue');
await gu.assertFillColor(cell2, 'transparent');
// Saving as common updates the other view.
await fieldSettingsSaveAsCommon();
await gu.assertFillColor(cell1, 'blue');
await gu.assertFillColor(cell2, 'blue');
// Undo; then reverting reverts the saved change.
await gu.undo();
await gu.assertFillColor(cell1, 'blue');
await gu.assertFillColor(cell2, 'transparent');
await fieldSettingsRevertToCommon();
await gu.assertFillColor(cell1, 'transparent');
await gu.assertFillColor(cell2, 'transparent');
});
});
const getFieldSettingsButton = () => driver.find('.fieldbuilder_settings_button');
const switchFieldSettings = async (fromLabel: string, option: string, toLabel: string) => {
assert.include(await getFieldSettingsButton().getText(), fromLabel);
await getFieldSettingsButton().click();
await driver.findContent('.grist-floating-menu li', option).click();
await gu.waitForServer();
assert.include(await getFieldSettingsButton().getText(), toLabel);
};
const fieldSettingsUseSeparate = () => switchFieldSettings('Common', 'Use separate', 'Separate');
const fieldSettingsSaveAsCommon = () => switchFieldSettings('Separate', 'Save as common', 'Common');
const fieldSettingsRevertToCommon = () => switchFieldSettings('Separate', 'Revert to common', 'Common');