Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2026-03-02 04:09:24 +00:00
Code Issues Projects Releases Wiki Activity

(core) Fixing bug with collapsed custom widget.

Browse Source 
Summary:
Fix for a bug. Custom widget when collapsed and expanded was disconnecting from
Grist, as WidgetFrame was disposed to early.

Test Plan: Added new

Reviewers: georgegevoian

Reviewed By: georgegevoian

Differential Revision: https://phab.getgrist.com/D4109
This commit is contained in:
Jarosław Sadziński
2023-11-06 16:28:14 +01:00
parent 3210eee24f
commit 9262e1f1ef
4 changed files with 69 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
test/nbrowser/ViewLayoutCollapse.ts
View File

@@ -4,11 +4,12 @@ import {getCollapsedSection, openCollapsedSectionMenu} from 'test/nbrowser/ViewL
import {assert, driver, Key, WebElement, WebElementPromise} from 'mocha-webdriver';
import {arrayRepeat} from 'app/plugin/gutil';
import {addStatic, serveSomething} from 'test/server/customUtil';
import {AccessLevel} from 'app/common/CustomWidget';
const GAP = 16; // Distance between buttons representing collapsed widgets.
describe("ViewLayoutCollapse", function() {
this.timeout(40000);
this.timeout('50s');
const cleanup = setupTestSuite();
gu.bigScreen();
let session: gu.Session;
@@ -19,6 +20,45 @@ describe("ViewLayoutCollapse", function() {
await gu.openPage("Overview");
});
it('fix: custom widget should restart when added back after collapsing', async function() {
const revert = await gu.begin();
// Add custom section.
await gu.addNewPage('Table', 'Companies');
await gu.addNewSection('Custom', 'Companies', { selectBy: 'COMPANIES'});
// Serve custom widget.
const widgetServer = await serveSomething(app => {
addStatic(app);
});
cleanup.addAfterAll(widgetServer.shutdown);
await gu.openWidgetPanel();
await gu.setWidgetUrl(widgetServer.url + '/probe/index.html');
await gu.widgetAccess(AccessLevel.full);
// Collapse it.
await collapseByMenu('COMPANIES Custom');
// Now restore its position.
await addToMainByMenu('COMPANIES Custom');
// Collapsed widget used to lost connection with Grist as it was disposed to early.
// Make sure that this widget can call the API.
await gu.doInIframe(async () => {
await gu.waitToPass(async () => {
assert.equal(await driver.find('#output').getText(),
`["Companies","Investments","Companies_summary_category_code","Investments_summary_funded_year",` +
`"Investments_summary_Company_category_code_funded_year","Investments_summary_Company_category_code"]`
);
});
});
// Make sure we don't have an error.
await gu.checkForErrors();
await revert();
});
it('fix: custom widget should not throw errors when collapsed', async function() {
const revert = await gu.begin();
@@ -33,9 +73,7 @@ describe("ViewLayoutCollapse", function() {
cleanup.addAfterAll(widgetServer.shutdown);
await gu.openWidgetPanel();
await gu.setWidgetUrl(widgetServer.url + '/probe/index.html');
await driver.find('.test-config-widget-access .test-select-open').click();
await driver.findContent('.test-select-menu li', 'Full document access').click();
await gu.waitForServer();
await gu.widgetAccess(AccessLevel.full);
// Collapse it.
await collapseByMenu('COMPANIES Custom');

11
test/nbrowser/gristUtils.ts
View File

@@ -894,8 +894,17 @@ export async function importUrlDialog(url: string): Promise<void> {
* Executed passed function in the context of given iframe, and then switching back to original context
*
*/
export async function doInIframe<T>(iframe: WebElement, func: () => Promise<T>) {
export async function doInIframe<T>(func: () => Promise<T>): Promise<T>
export async function doInIframe<T>(iframe: WebElement, func: () => Promise<T>): Promise<T>
export async function doInIframe<T>(frameOrFunc: WebElement|(() => Promise<T>), func?: () => Promise<T>): Promise<T> {
try {
let iframe: WebElement;
if (!func) {
func = frameOrFunc as () => Promise<T>;
iframe = await driver.findWait('iframe', 5000);
} else {
iframe = frameOrFunc as WebElement;
}
await driver.switchTo().frame(iframe);
return await func();
} finally {