npm - sfdx-browserforce-plugin - Versions diffs - 5.2.0-next.1 → 5.2.0-next.2 - Mend

sfdx-browserforce-plugin 5.2.0-next.1 → 5.2.0-next.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (101) hide show

package/lib/browserforce.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { Org } from '@salesforce/core';
 import { type Ux } from '@salesforce/sf-plugins-core';
-import { Browser, BrowserContext, Page, FrameLocator } from 'playwright';
+import { type Browser, type BrowserContext, type Page, type FrameLocator } from 'playwright';
 export declare class Browserforce {
     org: Org;
     logger?: Ux;
@@ -11,11 +11,8 @@ export declare class Browserforce {
     constructor(org: Org, logger?: Ux);
     login(): Promise<Browserforce>;
     logout(): Promise<Browserforce>;
-    throwPageErrors(page: Page): Promise<void>;
     getNewPage(): Promise<Page>;
-    openPage(urlPath: string, options?: {
-        waitUntil?: 'load' | 'domcontentloaded' | 'networkidle' | 'commit';
-    }): Promise<Page>;
+    openPage(urlPath: string): Promise<Page>;
     waitForSelectorInFrameOrPage(page: Page, selector: string): Promise<Page | FrameLocator>;
     getMyDomain(): string | null;
     getInstanceUrl(): string;
@@ -23,7 +20,6 @@ export declare class Browserforce {
      * @returns the setup url (e.g. https://[MyDomainName].my.salesforce-setup.com)
      */
     getLightningSetupUrl(): Promise<string>;
-    waitForIdle(page: Page, maxWaitTime?: number): Promise<void>;
 }
-export declare function throwPageErrors(page: Page): Promise<void>;
+export declare function waitForPageErrors(page: Page, timeout?: number): Promise<void>;
 export declare function retry<T>(input: (attemptCount: number) => PromiseLike<T> | T): Promise<T>;

package/lib/browserforce.js CHANGED Viewed

@@ -1,8 +1,6 @@
 import pRetry from 'p-retry';
 import { chromium, } from 'playwright';
 import { LoginPage } from './pages/login.js';
-const ERROR_DIV_SELECTOR = '#errorTitle';
-const ERROR_DIVS_SELECTOR = 'div.errorMsg';
 const VF_IFRAME_SELECTOR = 'force-aloha-page iframe[name^=vfFrameId]';
 export class Browserforce {
     org;
@@ -23,7 +21,7 @@ export class Browserforce {
             slowMo: parseInt(process.env.BROWSER_SLOWMO, 10) ?? 0,
         });
         this.context = await this.browser.newContext({
-            viewport: { width: 1024, height: 768 },
+            viewport: { width: 1280, height: 1536 },
         });
         // Start tracing if PLAYWRIGHT_TRACE is set
         if (process.env.PLAYWRIGHT_TRACE === 'true') {
@@ -58,16 +56,13 @@ export class Browserforce {
         }
         return this;
     }
-    async throwPageErrors(page) {
-        await throwPageErrors(page);
-    }
     async getNewPage() {
         const page = await this.context.newPage();
         page.setDefaultNavigationTimeout(parseInt(process.env.BROWSERFORCE_NAVIGATION_TIMEOUT_MS ?? '90000', 10));
         return page;
     }
     // path instead of url
-    async openPage(urlPath, options) {
+    async openPage(urlPath) {
         let page;
         const result = await pRetry(async () => {
             page = await this.getNewPage();
@@ -75,12 +70,15 @@ export class Browserforce {
                 ? await this.getLightningSetupUrl()
                 : this.getInstanceUrl();
             const url = `${setupUrl}/${urlPath}`;
-            const response = await page.goto(url, options ?? { waitUntil: 'load' });
-            if (response) {
-                if (!response.ok()) {
-                    await this.throwPageErrors(page);
-                    throw new Error(`${response.status()}: ${response.statusText()}`);
-                }
+            const response = await page.goto(url);
+            if (response && !response.ok()) {
+                await Promise.race([
+                    waitForPageErrors(page, 5_000),
+                    (async () => {
+                        await page.waitForTimeout(10_000);
+                        throw new Error(`${response.status()}: ${response.statusText()}`);
+                    })(),
+                ]);
             }
             return page;
         }, {
@@ -137,7 +135,7 @@ export class Browserforce {
         if (!this.lightningSetupUrl) {
             const page = await this.getNewPage();
             try {
-                const lightningResponse = await page.goto(`${this.getInstanceUrl()}/lightning/setup/SetupOneHome/home`, { waitUntil: 'load' });
+                const lightningResponse = await page.goto(`${this.getInstanceUrl()}/lightning/setup/SetupOneHome/home`);
                 this.lightningSetupUrl = new URL(lightningResponse.url()).origin;
             }
             finally {
@@ -146,39 +144,18 @@ export class Browserforce {
         }
         return this.lightningSetupUrl;
     }
-    async waitForIdle(page, maxWaitTime = 2000) {
-        try {
-            await page.waitForLoadState('networkidle', { timeout: maxWaitTime });
-        }
-        catch {
-            console.log(`Waited ${maxWaitTime}ms, continuing regardless of network state`);
-        }
-    }
 }
-export async function throwPageErrors(page) {
-    const errorLocator = page.locator(ERROR_DIV_SELECTOR);
-    const errorCount = await errorLocator.count();
-    if (errorCount > 0) {
-        const errorMsg = await errorLocator.first().innerText();
-        if (errorMsg && errorMsg.trim()) {
-            throw new Error(errorMsg.trim());
-        }
+export async function waitForPageErrors(page, timeout = 90_000) {
+    const anyErrorsLocator = page.locator(`#error, #errorTitle, #errorDesc, #validationError, div.errorMsg`);
+    await anyErrorsLocator.first().waitFor({ state: 'attached', timeout });
+    const errorMessages = (await anyErrorsLocator.allInnerTexts())
+        .map((t) => t.trim())
+        .filter(Boolean);
+    if (errorMessages.length === 1) {
+        throw new Error(errorMessages[0]);
     }
-    const errorDivsLocator = page.locator(ERROR_DIVS_SELECTOR);
-    const errorDivsCount = await errorDivsLocator.count();
-    if (errorDivsCount > 0) {
-        const errorMessages = [];
-        for (let i = 0; i < errorDivsCount; i++) {
-            const text = await errorDivsLocator.nth(i).innerText();
-            errorMessages.push(text);
-        }
-        const errorMsg = errorMessages
-            .map((m) => m.trim())
-            .join(' ')
-            .trim();
-        if (errorMsg) {
-            throw new Error(errorMsg);
-        }
+    else if (errorMessages.length > 1) {
+        throw new Error(errorMessages.join('\n'));
     }
 }
 export async function retry(input) {

package/lib/browserforce.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"browserforce.js","sourceRoot":"","sources":["../src/browserforce.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAO,EACL,QAAQ,GAKT,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,MAAM,kBAAkB,GAAG,~~aAAa,CAAC;AACzC,MAAM,mBAAmB,GAAG,cAAc,CAAC;AAC3C,MAAM,kBAAkB,GAAG,~~0CAA0C,CAAC;AAEtE,MAAM,OAAO,YAAY;IAChB,GAAG,CAAM;IACT,MAAM,CAAM;IACZ,OAAO,CAAU;IACjB,OAAO,CAAiB;IACxB,IAAI,CAAO;IACX,iBAAiB,CAAS;IAEjC,YAAY,GAAQ,EAAE,MAAW;QAC/B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,IAAI,CAAC,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;YACnC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;YAC9C,IAAI,EAAE,CAAC,cAAc,EAAE,0BAA0B,CAAC;YAClD,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,MAAM,CAAC;YACjD,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,CAAC,IAAI,CAAC;SACtD,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YAC3C,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,~~GAAG~~,EAAE;~~SACvC~~,CAAC,CAAC;QAEH,2CAA2C;QAC3C,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,MAAM,EAAE,CAAC;YAC5C,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;gBAC/B,WAAW,EAAE,IAAI;gBACjB,SAAS,EAAE,IAAI;gBACf,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;QACL,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACrC,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;YACtC,MAAM,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClC,CAAC;gBAAS,CAAC;YACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,MAAM;QACjB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,0CAA0C;YAC1C,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,MAAM,EAAE,CAAC;gBAC5C,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;gBACjE,MAAM,SAAS,GAAG,SAAS,SAAS,MAAM,CAAC;gBAC3C,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;gBACrD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;oBAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,8BAA8B,SAAS,EAAE,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC;YACD,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAC7B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,~~eAAe,CAAC,IAAU;QACrC,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAEM,KAAK,CAAC,~~UAAU;QACrB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAC1C,IAAI,CAAC,2BAA2B,CAC9B,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,kCAAkC,IAAI,OAAO,EAAE,EAAE,CAAC,CACxE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,sBAAsB;IACf,KAAK,CAAC,QAAQ,~~CACnB~~,OAAe~~,EACf,OAEC~~;~~QAED~~,IAAI,IAAU,CAAC;QACf,MAAM,MAAM,GAAG,MAAM,MAAM,CACzB,KAAK,IAAI,EAAE;YACT,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC;gBAC9C,CAAC,CAAC,MAAM,IAAI,CAAC,oBAAoB,EAAE;gBACnC,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YAC1B,MAAM,GAAG,GAAG,GAAG,QAAQ,IAAI,OAAO,EAAE,CAAC;YACrC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,~~EAAE~~,~~OAAO~~,IAAI,~~EAAE~~,~~SAAS~~,EAAE,~~MAAM~~,EAAE,CAAC~~,CAAC~~;~~YACxE~~,~~IAAI~~,~~QAAQ~~,~~EAAE,~~CAAC~~;gBACb~~,IAAI,CAAC,~~QAAQ~~,CAAC,~~EAAE~~,EAAE,~~EAAE~~,CAAC;~~oBACnB~~,MAAM,IAAI,CAAC,~~eAAe~~,CAAC,~~IAAI~~,CAAC,CAAC;~~oBACjC~~,MAAM,IAAI,KAAK,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,KAAK,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;~~gBACpE~~,CAAC;~~YACH~~,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,EACD;YACE,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;gBACjC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;oBAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,YAAY,OAAO,CAAC,WAAW,6BAA6B,OAAO,CAAC,KAAK,GAAG,CAC7E,CAAC;gBACJ,CAAC;gBACD,IAAI,IAAI,EAAE,CAAC;oBACT,IAAI,CAAC;wBACH,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;oBACrB,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,cAAc;oBAChB,CAAC;gBACH,CAAC;YACH,CAAC;YACD,OAAO,EAAE,QAAQ,CACf,OAAO,CAAC,GAAG,CAAC,8BAA8B,IAAI,GAAG,EACjD,EAAE,CACH;YACD,UAAU,EAAE,QAAQ,CAClB,OAAO,CAAC,GAAG,CAAC,6BAA6B,IAAI,MAAM,EACnD,EAAE,CACH;SACF,CACF,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,kEAAkE;IAClE,6DAA6D;IAC7D,wCAAwC;IACjC,KAAK,CAAC,4BAA4B,CACvC,IAAU,EACV,QAAgB;QAEhB,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,QAAQ,KAAK,kBAAkB,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC;QAE3E,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,KAAK,EAAE,CAAC;QAEnE,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;YACpB,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;YAC3D,MAAM,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC;YACvD,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,WAAW;QAChB,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC1C,yBAAyB;QACzB,4CAA4C;QAC5C,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACzE,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,cAAc;QACnB,sDAAsD;QACtD,OAAO,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAClE,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,oBAAoB;QAC/B,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YACrC,IAAI,CAAC;gBACH,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,IAAI,CACvC,GAAG,IAAI,CAAC,cAAc,EAAE,oCAAoC,~~EAC5D~~,~~EAAE,SAAS,EAAE,MAAM,EAAE,CACtB,~~CAAC;gBACF,IAAI,CAAC,iBAAiB,GAAG,IAAI,GAAG,CAAC,iBAAiB,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC;YACnE,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;~~IAEM,KAAK,CAAC,WAAW,CAAC,IAAU,EAAE,WAAW,GAAG,IAAI~~;~~QACrD~~,~~IAAI,CAAC;YACH,~~MAAM,~~IAAI,~~CAAC,~~gBAAgB~~,~~CAAC~~,~~aAAa~~,~~EAAE~~,~~EAAE~~,~~OAAO~~,~~EAAE,WAAW,EAAE,CAAC,CAAC;QACvE,CAAC;QAAC,MAAM,CAAC;YACP,~~OAAO,~~CAAC,~~GAAG,~~CACT,UAAU,WAAW,4CAA4C,CAClE,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED,~~MAAM~~,CAAC,KAAK,UAAU,eAAe,CAAC,IAAU~~;~~IAC9C~~,MAAM,~~YAAY~~,GAAG,IAAI,CAAC,OAAO,~~CAAC~~,~~kBAAkB~~,~~CAAC~~,CAAC;~~IACtD~~,MAAM,~~UAAU~~,~~GAAG,MAAM,YAAY,~~CAAC,KAAK,EAAE,CAAC~~;IAE9C~~,~~IAAI~~,~~UAAU,GAAG,~~CAAC,EAAE,~~CAAC;QACnB,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,~~KAAK,EAAE,~~CAAC~~,~~SAAS,~~EAAE,~~CAAC;QACxD~~,~~IAAI~~,~~QAAQ,IAAI,QAAQ,~~CAAC,~~IAAI,EAAE,EAAE,~~CAAC;~~YAChC~~,MAAM,~~IAAI~~,~~KAAK~~,CAAC,~~QAAQ~~,CAAC,~~IAAI~~,EAAE,CAAC~~,CAAC~~;~~QACnC~~,~~CAAC;IACH~~,CAAC~~;IAED~~,~~MAAM,gBAAgB,GAAG,IAAI,~~CAAC,~~OAAO,~~CAAC,~~mBAAmB~~,~~CAAC~~,CAAC~~;IAC3D~~,~~MAAM,cAAc,GAAG,MAAM,gBAAgB,~~CAAC,~~KAAK,EAAE,~~CAAC~~;IAEtD~~,IAAI,~~cAAc,GAAG,CAAC,~~EAAE,CAAC;~~QACvB~~,MAAM,~~aAAa~~,~~GAAa~~,~~EAAE~~,CAAC;~~QACnC~~,~~KAAK,~~IAAI,~~CAAC~~,~~GAAG,~~CAAC,~~EAAE~~,~~CAAC~~,~~GAAG,cAAc,EAAE,~~CAAC,EAAE,~~EAAE,~~CAAC;~~YACxC~~,MAAM,IAAI,~~GAAG~~,~~MAAM,gBAAgB,~~CAAC,~~GAAG~~,CAAC,CAAC,CAAC,CAAC,~~SAAS,EAAE,~~CAAC;~~YACvD~~,~~aAAa,~~CAAC,IAAI,~~CAAC~~,~~IAAI,~~CAAC,~~CAAC;QAC3B,CAAC;QACD,~~MAAM,~~QAAQ,~~GAAG,~~aAAa;aAC3B,GAAG,~~CAAC,~~CAAC,CAAC,~~EAAE,~~EAAE,~~CAAC,~~CAAC~~,~~CAAC,~~IAAI,~~EAAE~~,CAAC~~;aACpB~~,~~IAAI~~,CAAC,~~GAAG,CAAC;aACT,~~IAAI,~~EAAE,~~CAAC~~;QACV~~,IAAI,~~QAAQ,EAAE,~~CAAC~~;YACb~~,~~MAAM,IAAI,KAAK,~~CAAC,~~QAAQ,~~CAAC~~,CAAC~~;~~QAC5B~~,CAAC;~~IACH,CAAC;~~AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,KAAK,CACzB,KAAmD;IAEnD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,KAAK,EAAE;QAC9B,eAAe,EAAE,CAAC,OAAO,EAAE,EAAE;YAC3B,OAAO,CAAC,IAAI,CACV,YAAY,OAAO,CAAC,WAAW,6BAA6B,OAAO,CAAC,KAAK,GAAG,CAC7E,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B,IAAI,GAAG,EAAE,EAAE,CAAC;QACxE,UAAU,EAAE,QAAQ,CAClB,OAAO,CAAC,GAAG,CAAC,6BAA6B,IAAI,MAAM,EACnD,EAAE,CACH;KACF,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC"}
1	+ {"version":3,"file":"browserforce.js","sourceRoot":"","sources":["../src/browserforce.ts"],"names":[],"mappings":"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"}

package/lib/pages/login.d.ts CHANGED Viewed

@@ -4,5 +4,4 @@ export declare class LoginPage {
     private page;
     constructor(page: Page);
     login(org: Org): Promise<this>;
-    throwPageErrors(): Promise<void>;
 }

package/lib/pages/login.js CHANGED Viewed

@@ -1,6 +1,6 @@
+import { waitForPageErrors } from '../browserforce.js';
 const FRONT_DOOR_PATH = 'secur/frontdoor.jsp';
 const POST_LOGIN_PATH = 'setup/forcecomHomepage.apexp';
-const ERROR_DIV_SELECTOR = '#error';
 export class LoginPage {
     page;
     constructor(page) {
@@ -14,26 +14,12 @@ export class LoginPage {
             throw new Error('login failed');
         }
         const conn = org.getConnection();
-        const response = await this.page.goto(`${conn.instanceUrl.replace(/\/$/, '')}/${FRONT_DOOR_PATH}?sid=${conn.accessToken}&retURL=${encodeURIComponent(POST_LOGIN_PATH)}`, {
-            waitUntil: 'load',
-        });
-        const url = new URL(response.url());
-        if (url.searchParams.has('startURL')) {
-            // when query param startURL exists, the login failed
-            // e.g. /?ec=302&startURL=https...
-            await this.throwPageErrors();
-        }
+        await this.page.goto(`${conn.instanceUrl.replace(/\/$/, '')}/${FRONT_DOOR_PATH}?sid=${conn.accessToken}&retURL=${encodeURIComponent(POST_LOGIN_PATH)}`);
+        await Promise.race([
+            this.page.waitForURL((url) => url.pathname === `/${POST_LOGIN_PATH}`),
+            waitForPageErrors(this.page),
+        ]);
         return this;
     }
-    async throwPageErrors() {
-        const errorLocator = this.page.locator(ERROR_DIV_SELECTOR);
-        const errorCount = await errorLocator.count();
-        if (errorCount > 0) {
-            const errorMessage = (await errorLocator.first().innerText())?.trim();
-            if (errorMessage) {
-                throw new Error(errorMessage);
-            }
-        }
-    }
 }
 //# sourceMappingURL=login.js.map

package/lib/pages/login.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/pages/login.ts"],"names":[],"mappings":"~~AAGA~~,~~MAAM~~,~~eAAe~~,~~GAAG~~,~~qBAAqB~~,CAAC;~~AAC9C~~,MAAM,eAAe,GAAG,~~8BAA8B~~,CAAC;~~AAEvD~~,MAAM,~~kBAAkB~~,GAAG,~~QAAQ~~,CAAC;~~AAEpC~~,MAAM,OAAO,SAAS;IACZ,IAAI,CAAO;IAEnB,YAAY,IAAU;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAQ;QAClB,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC;QAC1B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;QAClC,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC;QACjC,MAAM,~~QAAQ,GAAG,MAAM,~~IAAI,CAAC,IAAI,CAAC,IAAI,~~CACnC~~,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,eAAe,QACvD,IAAI,CAAC,WACP,WAAW,kBAAkB,CAAC,eAAe,CAAC,EAAE,~~EAChD;YACE~~,~~SAAS,EAAE,MAAM;SAClB,CACF,~~CAAC;QACF,MAAM,~~GAAG~~,~~GAAG~~,IAAI,~~GAAG,~~CAAC~~,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC~~;~~QACpC~~,IAAI,~~GAAG,~~CAAC,~~YAAY~~,CAAC,~~GAAG,CAAC,~~UAAU,CAAC,~~EAAE,~~CAAC~~;YACrC~~,~~qDAAqD;YACrD~~,~~kCAAkC;YAClC~~,~~MAAM,IAAI,CAAC,eAAe,~~EAAE,CAAC~~;QAC/B~~,~~CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,YAAY,~~GAAG,~~IAAI,~~CAAC,~~IAAI~~,~~CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAC3D,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,~~KAAK,~~EAAE,CAAC;QAE9C,~~IAAI,~~UAAU~~,~~GAAG,CAAC,~~EAAE,CAAC;~~YACnB~~,~~MAAM~~,~~YAAY,GAAG,~~CAAC,~~MAAM~~,~~YAAY,~~CAAC,~~KAAK,EAAE,CAAC,SAAS,EAAE,CAAC,EAAE,~~IAAI,~~EAAE,~~CAAC;~~YACtE~~,~~IAAI~~,~~YAAY,EAAE,~~CAAC;~~gBACjB~~,~~MAAM~~,IAAI,~~KAAK,~~CAAC~~,YAAY,CAAC,CAAC~~;~~YAChC~~,CAAC;~~QACH,CAAC;IACH,CAAC;~~CACF"}
1	+ {"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/pages/login.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,eAAe,GAAG,qBAAqB,CAAC;AAC9C,MAAM,eAAe,GAAG,8BAA8B,CAAC;AAEvD,MAAM,OAAO,SAAS;IACZ,IAAI,CAAO;IAEnB,YAAY,IAAU;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAQ;QAClB,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC;QAC1B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;QAClC,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC;QACjC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAClB,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,eAAe,QACvD,IAAI,CAAC,WACP,WAAW,kBAAkB,CAAC,eAAe,CAAC,EAAE,CACjD,CAAC;QACF,MAAM,OAAO,CAAC,IAAI,CAAC;YACjB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,eAAe,EAAE,CAAC;YACrE,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;SAC7B,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}

package/lib/plugins/activity-settings/index.js CHANGED Viewed

@@ -21,13 +21,10 @@ export class ActivitySettings extends BrowserforcePlugin {
         await page.locator(MANY_WHO_PREF_INPUT_SELECTOR).waitFor();
         await page
             .locator(MANY_WHO_PREF_INPUT_SELECTOR)
-            .evaluate((e, v) => {
-            e.checked = v;
-        }, config.allowUsersToRelateMultipleContactsToTasksAndEvents);
-        await Promise.all([
-            page.waitForLoadState('load'),
-            page.locator(SUBMIT_BUTTON_SELECTOR).click(),
-        ]);
+            .setChecked(config.allowUsersToRelateMultipleContactsToTasksAndEvents);
+        await page.locator(SUBMIT_BUTTON_SELECTOR).click();
+        // ui/setup/Setup?setupid=Activity
+        await page.waitForURL((url) => url.pathname !== `/${BASE_PATH}`);
         await page.close();
     }
 }

package/lib/plugins/activity-settings/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/activity-settings/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,SAAS,GAAG,iCAAiC,CAAC;AAEpD,MAAM,4BAA4B,GAChC,kDAAkD,CAAC;AACrD,MAAM,sBAAsB,GAC1B,qDAAqD,CAAC;AAMxD,MAAM,OAAO,gBAAiB,SAAQ,kBAAkB;IAC/C,KAAK,CAAC,QAAQ;QACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG;YACf,kDAAkD,EAAE,MAAM,IAAI;iBAC3D,OAAO,CAAC,4BAA4B,CAAC;iBACrC,SAAS,EAAE;SACf,CAAC;QACF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,MAAc;QAC/B,IAAI,MAAM,CAAC,kDAAkD,KAAK,KAAK,EAAE,CAAC;YACxE,MAAM,IAAI,KAAK,CACb,wHAAwH,CACzH,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,IAAI,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC,OAAO,EAAE,CAAC;QAE3D,MAAM,IAAI;aACP,OAAO,CAAC,4BAA4B,CAAC;aACrC,~~QAAQ~~,CAAC,CAAC,~~CAAmB~~,~~EAAE~~,~~CAAU~~,~~EAAE~~,~~EAAE;YAC5C~~,CAAC,~~CAAC,~~OAAO,~~GAAG,~~CAAC,~~CAAC;QAChB~~,CAAC,~~EAAE,MAAM,~~CAAC,~~kDAAkD~~,~~CAAC~~,CAAC;~~QAEhE~~,MAAM,~~OAAO~~,CAAC,~~GAAG~~,CAAC~~;YAChB~~,~~IAAI,~~CAAC,~~gBAAgB~~,~~CAAC~~,~~MAAM~~,CAAC~~;YAC7B~~,~~IAAI~~,CAAC,~~OAAO~~,~~CAAC~~,~~sBAAsB~~,~~CAAC~~,~~CAAC,KAAK,~~EAAE~~;SAC7C~~,CAAC,CAAC;~~QACH~~,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;CACF"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/activity-settings/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,SAAS,GAAG,iCAAiC,CAAC;AAEpD,MAAM,4BAA4B,GAChC,kDAAkD,CAAC;AACrD,MAAM,sBAAsB,GAC1B,qDAAqD,CAAC;AAMxD,MAAM,OAAO,gBAAiB,SAAQ,kBAAkB;IAC/C,KAAK,CAAC,QAAQ;QACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG;YACf,kDAAkD,EAAE,MAAM,IAAI;iBAC3D,OAAO,CAAC,4BAA4B,CAAC;iBACrC,SAAS,EAAE;SACf,CAAC;QACF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,MAAc;QAC/B,IAAI,MAAM,CAAC,kDAAkD,KAAK,KAAK,EAAE,CAAC;YACxE,MAAM,IAAI,KAAK,CACb,wHAAwH,CACzH,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,IAAI,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC,OAAO,EAAE,CAAC;QAE3D,MAAM,IAAI;aACP,OAAO,CAAC,4BAA4B,CAAC;aACrC,UAAU,CAAC,MAAM,CAAC,kDAAkD,CAAC,CAAC;QAEzE,MAAM,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,KAAK,EAAE,CAAC;QACnD,kCAAkC;QAClC,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,SAAS,EAAE,CAAC,CAAC;QACjE,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;CACF"}

package/lib/plugins/company-information/index.js CHANGED Viewed

@@ -5,13 +5,11 @@ const SAVE_BUTTON_SELECTOR = 'input[class="btn"][type="submit"][name="save"]';
 export class CompanyInformation extends BrowserforcePlugin {
     async retrieve() {
         const page = await this.browserforce.openPage(getUrl(this.org.getOrgId()));
-        await page.locator(CURRENCY_DROPDOWN_SELECTOR).waitFor();
         const response = {
             defaultCurrencyIsoCode: '',
         };
         const selectedOption = await page
             .locator(`${CURRENCY_DROPDOWN_SELECTOR} > option[selected]`)
-            .first()
             .textContent();
         if (selectedOption) {
             response.defaultCurrencyIsoCode = selectedOption;
@@ -22,10 +20,6 @@ export class CompanyInformation extends BrowserforcePlugin {
     async apply(config) {
         if (config.defaultCurrencyIsoCode !== undefined) {
             const page = await this.browserforce.openPage(getUrl(this.org.getOrgId()));
-            // wait for selectors
-            await page.locator(CURRENCY_DROPDOWN_SELECTOR).waitFor();
-            await page.locator(SAVE_BUTTON_SELECTOR).waitFor();
-            // apply changes
             const optionLocator = page.locator(`${CURRENCY_DROPDOWN_SELECTOR} > option`);
             const optionCount = await optionLocator.count();
             const optionList = [];
@@ -49,10 +43,8 @@ export class CompanyInformation extends BrowserforcePlugin {
                 dialog.accept();
             });
             // save
-            await Promise.all([
-                page.waitForLoadState('load'),
-                page.locator(SAVE_BUTTON_SELECTOR).click(),
-            ]);
+            await page.locator(SAVE_BUTTON_SELECTOR).click();
+            await page.waitForURL((url) => !url.pathname.endsWith('/e'));
             await page.close();
         }
     }

package/lib/plugins/company-information/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/company-information/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC;AAEhD,MAAM,0BAA0B,GAAG,yBAAyB,CAAC;AAC7D,MAAM,oBAAoB,GAAG,gDAAgD,CAAC;AAM9E,MAAM,OAAO,kBAAmB,SAAQ,kBAAkB;IACjD,KAAK,CAAC,QAAQ;QACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;~~QAC3E~~,MAAM,~~IAAI,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE,CAAC;QAEzD,MAAM,~~QAAQ,GAAW;YACvB,sBAAsB,EAAE,EAAE;SAC3B,CAAC;QACF,MAAM,cAAc,GAAG,MAAM,IAAI;aAC9B,OAAO,CAAC,GAAG,0BAA0B,qBAAqB,CAAC;aAC3D,~~KAAK,EAAE;aACP,~~WAAW,EAAE,CAAC;QACjB,IAAI,cAAc,EAAE,CAAC;YACnB,QAAQ,CAAC,sBAAsB,GAAG,cAAc,CAAC;QACnD,CAAC;QACD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,MAAc;QAC/B,IAAI,MAAM,CAAC,sBAAsB,KAAK,SAAS,EAAE,CAAC;YAChD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAC3C,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAC5B,CAAC;YACF,~~qBAAqB;YACrB,~~MAAM,~~IAAI,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE,CAAC;YACzD,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,EAAE,CAAC;YAEnD,gBAAgB;YAChB,MAAM,~~aAAa,GAAG,IAAI,CAAC,OAAO,CAChC,GAAG,0BAA0B,WAAW,CACzC,CAAC;YACF,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC;YAChD,MAAM,UAAU,GAAkD,EAAE,CAAC;YAErE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACpC,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBACjD,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC;gBAC/C,IAAI,KAAK,IAAI,WAAW,EAAE,CAAC;oBACzB,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;gBAC1C,CAAC;YACH,CAAC;YAED,MAAM,kBAAkB,GAAG,UAAU,CAAC,IAAI,CACxC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,KAAK,MAAM,CAAC,sBAAsB,CACjE,CAAC;YACF,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACxB,MAAM,IAAI,KAAK,CACb,+BAA+B,MAAM,CAAC,sBAAsB,wGAAwG,CACrK,CAAC;YACJ,CAAC;YACD,MAAM,IAAI;iBACP,OAAO,CAAC,0BAA0B,CAAC;iBACnC,YAAY,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAE1C,yCAAyC;YACzC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;gBAC3B,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,OAAO;YACP,MAAM,OAAO,CAAC,~~GAAG~~,CAAC;~~gBAChB~~,IAAI,CAAC,~~gBAAgB~~,CAAC,~~MAAM,~~CAAC~~;gBAC7B~~,~~IAAI~~,CAAC,~~OAAO~~,CAAC,~~oBAAoB~~,CAAC,CAAC,~~KAAK~~,~~EAAE;aAC3C~~,CAAC,CAAC;~~YACH~~,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC;IACH,CAAC;CACF"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/company-information/index.ts"],"names":[],"mappings":"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"}

package/lib/plugins/customer-portal/available-custom-objects/index.js CHANGED Viewed

@@ -54,7 +54,7 @@ export class CustomerPortalAvailableCustomObjects extends BrowserforcePlugin {
                     ...result,
                     available: await frameOrPage
                         .locator(CUSTOM_OBJECT_AVAILABLE_FOR_CUSTOMER_PORTAL_SELECTOR)
-                        .evaluate((el) => el.checked),
+                        .isChecked(),
                 });
                 await editPage.close();
             }

package/lib/plugins/customer-portal/available-custom-objects/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/customer-portal/available-custom-objects/index.ts"],"names":[],"mappings":"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~~QAAQ~~,~~CAAC,CAAC,EAAoB,~~EAAE~~,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC~~;~~iBAClD~~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"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/customer-portal/available-custom-objects/index.ts"],"names":[],"mappings":"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"}

package/lib/plugins/customer-portal/enabled/index.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import { waitForPageErrors } from '../../../browserforce.js';
 import { BrowserforcePlugin } from '../../../plugin.js';
 const BASE_PATH = '_ui/core/portal/CustomerSuccessPortalSetup/e';
 const SAVE_BUTTON = 'input[name="save"]';
@@ -13,13 +14,12 @@ export class CustomerPortalEnable extends BrowserforcePlugin {
             throw new Error('`enabled` cannot be disabled once enabled');
         }
         const page = await this.browserforce.openPage(BASE_PATH);
-        await page
-            .locator(ENABLE_CHECKBOX)
-            .evaluate((checkbox) => {
-            checkbox.checked = true;
-        });
+        await page.locator(ENABLE_CHECKBOX).setChecked(true);
         await page.locator(SAVE_BUTTON).first().click();
-        await page.waitForLoadState('load');
+        await Promise.race([
+            page.waitForURL((url) => url.pathname !== `/${BASE_PATH}`),
+            waitForPageErrors(page),
+        ]);
         await page.close();
     }
 }

package/lib/plugins/customer-portal/enabled/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/customer-portal/enabled/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAExD,MAAM,SAAS,GAAG,8CAA8C,CAAC;AAEjE,MAAM,WAAW,GAAG,oBAAoB,CAAC;AACzC,MAAM,eAAe,GAAG,uCAAuC,CAAC;AAIhE,MAAM,OAAO,oBAAqB,SAAQ,kBAAkB;IACnD,KAAK,CAAC,QAAQ;QACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;QACzD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QACnE,OAAO,WAAW,CAAC,2BAA2B,IAAI,KAAK,CAAC;IAC1D,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,IAAY;QAC7B,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC/D,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,IAAI~~;aACP~~,OAAO,CAAC,eAAe,CAAC~~;aACxB~~,~~QAAQ,~~CAAC,CAAC,~~QAA0B~~,~~EAAE~~,~~EAAE~~;~~YACvC~~,~~QAAQ~~,CAAC,OAAO,~~GAAG~~,~~IAAI~~,CAAC~~;QAC1B~~,CAAC,CAAC,CAAC;~~QACL~~,MAAM,IAAI,CAAC,~~OAAO~~,CAAC,~~WAAW~~,CAAC,CAAC,~~KAAK~~,EAAE,CAAC,KAAK,EAAE,CAAC;~~QAChD~~,~~MAAM~~,~~IAAI,~~CAAC,~~gBAAgB~~,CAAC,~~MAAM,~~CAAC,CAAC;~~QACpC~~,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;CACF"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/customer-portal/enabled/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAExD,MAAM,SAAS,GAAG,8CAA8C,CAAC;AAEjE,MAAM,WAAW,GAAG,oBAAoB,CAAC;AACzC,MAAM,eAAe,GAAG,uCAAuC,CAAC;AAIhE,MAAM,OAAO,oBAAqB,SAAQ,kBAAkB;IACnD,KAAK,CAAC,QAAQ;QACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;QACzD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QACnE,OAAO,WAAW,CAAC,2BAA2B,IAAI,KAAK,CAAC;IAC1D,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,IAAY;QAC7B,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC/D,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC;QAChD,MAAM,OAAO,CAAC,IAAI,CAAC;YACjB,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,SAAS,EAAE,CAAC;YAC1D,iBAAiB,CAAC,IAAI,CAAC;SACxB,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;CACF"}

package/lib/plugins/customer-portal/index.e2e-spec.js CHANGED Viewed

@@ -83,9 +83,8 @@ describe('CustomerPortal', () => {
             catch (e) {
                 err = e;
             }
-            assert.throws(() => {
-                throw err;
-            }, /This user has insufficient permissions to be a portal administrator/);
+            const errors = err instanceof AggregateError ? [err, ...err.errors] : [err];
+            assert(errors.find((e) => /This user has insufficient permissions to be a portal administrator/.test(e)));
         });
         it('should set up user for portal', async () => {
             const sourceDeployCmd = child.spawnSync('sf', [
@@ -123,16 +122,10 @@ describe('CustomerPortal', () => {
         it('should cleanup', async () => {
             const conn = global.bf.org.getConnection();
             await conn.metadata.delete('Profile', ['Dummy']);
-            const permSetUnassignCmd = child.spawnSync('sf', [
-                'data',
-                'delete',
-                'record',
-                '-s',
-                'PermissionSetAssignment',
-                '-w',
-                'PermissionSet.Name=Customer_Portal_Admin',
-            ]);
-            assert.deepStrictEqual(permSetUnassignCmd.status, 0, permSetUnassignCmd.output.toString());
+            const result = await conn.query("SELECT Id FROM PermissionSetAssignment WHERE PermissionSet.Name='Customer_Portal_Admin'");
+            if (result.records.length) {
+                await conn.delete('PermissionSetAssignment', result.records.map((rec) => rec.Id));
+            }
             await conn.metadata.delete('PermissionSet', ['Customer_Portal_Admin']);
         });
     });

package/lib/plugins/customer-portal/index.e2e-spec.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.e2e-spec.js","sourceRoot":"","sources":["../../../src/plugins/customer-portal/index.e2e-spec.ts"],"names":[],"mappings":"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~~MAAM~~,CAAC,GAAG,EAAE~~;gBACjB~~,MAAM,GAAG,CAAC;~~YACZ~~,CAAC,EAAE,qEAAqE,CAAC,CAAC;~~QAC5E~~,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;YAC7C,MAAM,eAAe,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE;gBAC5C,SAAS;gBACT,QAAQ;gBACR,OAAO;gBACP,IAAI;gBACJ,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC;gBAC7B,QAAQ;aACT,CAAC,CAAC;YACH,MAAM,CAAC,eAAe,CACpB,eAAe,CAAC,MAAM,EACtB,CAAC,EACD,eAAe,CAAC,MAAM,CAAC,QAAQ,EAAE,CAClC,CAAC;YACF,MAAM,gBAAgB,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE;gBAC7C,KAAK;gBACL,QAAQ;gBACR,SAAS;gBACT,IAAI;gBACJ,uBAAuB;aACxB,CAAC,CAAC;YACH,MAAM,CAAC,eAAe,CACpB,gBAAgB,CAAC,MAAM,EACvB,CAAC,EACD,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,CACnC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;YACpC,MAAM,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;YACvC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YAChD,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,qBAAqB,EAAE,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;YAClC,MAAM,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;YACvC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YACjD,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,qBAAqB,EAAE,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;YAC9B,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;YAC3C,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;YACjD,MAAM,~~kBAAkB~~,GAAG,~~KAAK~~,~~CAAC~~,~~SAAS,~~CAAC,~~IAAI~~,~~EAAE;gBAC/C~~,~~MAAM;gBACN~~,~~QAAQ;gBACR~~,~~QAAQ~~;~~gBACR~~,IAAI~~;gBACJ~~,~~yBAAyB;gBACzB~~,~~IAAI;gBACJ~~,~~0CAA0C;aAC3C~~,CAAC,CAAC;~~YACH~~,MAAM,CAAC,~~eAAe~~,~~CACpB~~,~~kBAAkB~~,~~CAAC~~,MAAM,~~EACzB~~,CAAC,~~EACD~~,~~kBAAkB~~,CAAC,~~MAAM~~,CAAC,~~QAAQ~~,EAAE,~~CACrC~~,CAAC;~~YACF~~,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oCAAoC,CAAC,IAAI,EAAE;QAClD,IAAI,MAA4C,CAAC;QACjD,MAAM,CAAC,GAAG,EAAE;YACV,MAAM,GAAG,IAAI,oCAAoC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,MAAM,4BAA4B,GAAG;YACnC;gBACE,IAAI,EAAE,OAAO;gBACb,SAAS,EAAE,IAAI;aAChB;SACF,CAAC;QACF,MAAM,+BAA+B,GAAG;YACtC;gBACE,IAAI,EAAE,UAAU;gBAChB,SAAS,EAAE,IAAI;aAChB;SACF,CAAC;QACF,MAAM,8BAA8B,GAAG;YACrC;gBACE,IAAI,EAAE,OAAO;gBACb,SAAS,EAAE,KAAK;aACjB;SACF,CAAC;QAEF,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,0BAA0B,CAAC,CAAC,CAAC;QAC3E,EAAE,CAAC,+EAA+E,EAAE,KAAK,IAAI,EAAE;YAC7F,IAAI,GAAG,CAAC;YACR,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;YACpD,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,GAAG,GAAG,CAAC,CAAC;YACV,CAAC;YACD,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE;gBACjB,MAAM,GAAG,CAAC;YACZ,CAAC,EAAE,6BAA6B,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACrC,MAAM,eAAe,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE;gBAC5C,SAAS;gBACT,QAAQ;gBACR,OAAO;gBACP,IAAI;gBACJ,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC;gBAC7B,QAAQ;aACT,CAAC,CAAC;YACH,MAAM,CAAC,eAAe,CACpB,eAAe,CAAC,MAAM,EACtB,CAAC,EACD,eAAe,CAAC,MAAM,CAAC,QAAQ,EAAE,CAClC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;YACxE,MAAM,MAAM,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;YAC1E,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;YAC3D,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,qBAAqB,EAAE,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;YAC1E,MAAM,MAAM,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;YAC3C,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"index.e2e-spec.js","sourceRoot":"","sources":["../../../src/plugins/customer-portal/index.e2e-spec.ts"],"names":[],"mappings":"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"}

package/lib/plugins/customer-portal/portals/index.js CHANGED Viewed

@@ -1,4 +1,5 @@
 import * as queryString from 'querystring';
+import { waitForPageErrors } from '../../../browserforce.js';
 import { BrowserforcePlugin } from '../../../plugin.js';
 import { semanticallyCleanObject } from '../../utils.js';
 const LIST_VIEW_PATH = '_ui/core/portal/CustomerSuccessPortalSetup/d';
@@ -34,7 +35,6 @@ export class CustomerPortalSetup extends BrowserforcePlugin {
         });
         for (const portal of response) {
             const portalPage = await this.browserforce.openPage(`${portal._id}/e`);
-            await portalPage.locator(PORTAL_DESCRIPTION_SELECTOR).waitFor();
             portal.description = await portalPage
                 .locator(PORTAL_DESCRIPTION_SELECTOR)
                 .evaluate((el) => el.value);
@@ -43,7 +43,7 @@ export class CustomerPortalSetup extends BrowserforcePlugin {
                 .evaluate((el) => el.value);
             portal.isSelfRegistrationActivated = await portalPage
                 .locator(`#${PORTAL_IS_SELF_REGISTRATION_ACTIVATED_ID_SELECTOR}`)
-                .evaluate((el) => el.checked);
+                .isChecked();
             portal.selfRegUserDefaultLicense = await portalPage
                 .locator(`#${PORTAL_SELF_REG_USER_DEFAULT_LICENSE_ID_SELECTOR}`)
                 .evaluate((el) => el.selectedOptions[0].text);
@@ -184,15 +184,11 @@ export class CustomerPortalSetup extends BrowserforcePlugin {
                         .locator(`#${PORTAL_SELF_REG_USER_DEFAULT_PROFILE_ID_SELECTOR}`)
                         .selectOption(profileValue);
                 }
-                await page.locator(SAVE_BUTTON_SELECTOR).first().waitFor();
                 await page.locator(SAVE_BUTTON_SELECTOR).first().click();
-                await page.waitForLoadState('load');
-                if ((await page.url()).includes(portal._id)) {
-                    // error handling
-                    await page.locator(PORTAL_DESCRIPTION_SELECTOR).waitFor();
-                    await this.browserforce.throwPageErrors(page);
-                    throw new Error(`saving customer portal '${portal._id}' failed`);
-                }
+                await Promise.race([
+                    page.waitForURL((url) => !url.href.includes(portal._id)),
+                    waitForPageErrors(page),
+                ]);
                 // portalProfileMemberships
                 if (portal.portalProfileMemberships) {
                     const membershipUrlAttributes = {};
@@ -200,12 +196,11 @@ export class CustomerPortalSetup extends BrowserforcePlugin {
                         membershipUrlAttributes[member._id] = member.active ? 1 : 0;
                     }
                     const portalProfilePage = await this.browserforce.openPage(`${PORTAL_PROFILE_MEMBERSHIP_PATH}?portalId=${portal._id}&setupid=CustomerSuccessPortalSettings&${queryString.stringify(membershipUrlAttributes)}`);
-                    await portalProfilePage
-                        .locator(SAVE_BUTTON_SELECTOR)
-                        .first()
-                        .waitFor();
                     await portalProfilePage.locator(SAVE_BUTTON_SELECTOR).first().click();
-                    await portalProfilePage.waitForLoadState('load');
+                    await Promise.race([
+                        portalProfilePage.waitForURL((url) => url.pathname !== `/${PORTAL_PROFILE_MEMBERSHIP_PATH}`),
+                        waitForPageErrors(portalProfilePage),
+                    ]);
                     await portalProfilePage.close();
                 }
                 await page.close();

package/lib/plugins/customer-portal/portals/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/customer-portal/portals/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,MAAM,cAAc,GAAG,8CAA8C,CAAC;AACtE,MAAM,8BAA8B,GAClC,+CAA+C,CAAC;AAElD,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AAClD,MAAM,qCAAqC,GACzC,kGAAkG,CAAC;AACrG,MAAM,2BAA2B,GAAG,cAAc,CAAC;AACnD,MAAM,kBAAkB,GAAG,WAAW,CAAC;AACvC,MAAM,wBAAwB,GAAG,OAAO,CAAC;AACzC,MAAM,iDAAiD,GACrD,6BAA6B,CAAC;AAChC,MAAM,gDAAgD,GACpD,2BAA2B,CAAC;AAC9B,MAAM,6CAA6C,GAAG,wBAAwB,CAAC;AAC/E,MAAM,gDAAgD,GACpD,2BAA2B,CAAC;AAC9B,MAAM,2CAA2C,GAAG,aAAa,CAAC;AAClE,MAAM,6CAA6C,GAAG,mBAAmB,CAAC;AAuB1E,MAAM,OAAO,mBAAoB,SAAQ,kBAAkB;IAClD,KAAK,CAAC,QAAQ;QACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAC9D,MAAM,IAAI;aACP,OAAO,CAAC,SAAS,qCAAqC,EAAE,CAAC;aACzD,KAAK,EAAE;aACP,OAAO,EAAE,CAAC;QAEb,MAAM,QAAQ,GAAW,MAAM,IAAI;aAChC,OAAO,CAAC,SAAS,qCAAqC,EAAE,CAAC;aACzD,WAAW,CAAC,CAAC,KAA0B,EAAE,EAAE;YAC1C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACrB,OAAO;oBACL,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;oBAC7B,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,wBAAwB,EAAE,EAAE;iBAC7B,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACL,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;YAC9B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;YACvE,MAAM,~~UAAU,~~CAAC,~~OAAO,CAAC,2BAA2B,CAAC,CAAC,OAAO,EAAE,CAAC;YAChE,MAAM,CAAC,~~WAAW,GAAG,MAAM,UAAU;iBAClC,OAAO,CAAC,2BAA2B,CAAC;iBACpC,QAAQ,CAAC,CAAC,EAAoB,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;YAChD,MAAM,CAAC,SAAS,GAAG,MAAM,UAAU;iBAChC,OAAO,CAAC,IAAI,wBAAwB,EAAE,CAAC;iBACvC,QAAQ,CAAC,CAAC,EAAoB,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;YAChD,MAAM,CAAC,2BAA2B,GAAG,MAAM,UAAU;iBAClD,OAAO,CAAC,IAAI,iDAAiD,EAAE,CAAC;iBAChE,~~QAAQ~~,~~CAAC,CAAC,EAAoB,~~EAAE,~~EAAE,~~CAAC~~,EAAE,CAAC,OAAO,CAAC,CAAC~~;~~YAClD~~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~~OAAO~~,EAAE,CAAC;~~gBAC3D~~,MAAM,~~IAAI,CAAC,~~OAAO,CAAC,~~oBAAoB~~,CAAC,~~CAAC~~,~~KAAK,EAAE,~~CAAC,~~KAAK~~,~~EAAE,~~CAAC~~;gBACzD~~,~~MAAM,IAAI,~~CAAC,~~gBAAgB~~,~~CAAC~~,~~MAAM~~,CAAC,CAAC~~;gBACpC~~,~~IAAI~~,CAAC,~~MAAM,~~IAAI,CAAC,~~GAAG,EAAE,CAAC,CAAC,~~QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,~~EAAE,~~CAAC;~~oBAC5C~~,iBAAiB~~;oBACjB~~,~~MAAM,IAAI,~~CAAC,~~OAAO,CAAC,2BAA2B,CAAC,CAAC,OAAO,EAAE,CAAC;oBAC1D,MAAM,~~IAAI,CAAC~~,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC~~;~~oBAC9C~~,~~MAAM,IAAI,KAAK,~~CAAC,~~2BAA2B,MAAM,~~CAAC~~,GAAG,UAAU,CAAC,CAAC~~;~~gBACnE~~,~~CAAC;gBACD,~~2BAA2B;gBAC3B,IAAI,MAAM,CAAC,wBAAwB,EAAE,CAAC;oBACpC,MAAM,uBAAuB,GAA8B,EAAE,CAAC;oBAC9D,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,wBAAwB,EAAE,CAAC;wBACrD,uBAAuB,CAAC,MAAM,CAAC,GAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC/D,CAAC;oBACD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CACxD,GAAG,8BAA8B,aAC/B,MAAM,CAAC,GACT,0CAA0C,WAAW,CAAC,SAAS,CAC7D,uBAAuB,CACxB,EAAE,CACJ,CAAC;oBACF,MAAM,iBAAiB~~;yBACpB~~,OAAO,CAAC,oBAAoB,CAAC~~;yBAC7B~~,KAAK,EAAE~~;yBACP~~,~~OAAO~~,EAAE,CAAC;~~oBACb~~,MAAM,~~iBAAiB~~,CAAC,~~OAAO~~,CAAC,~~oBAAoB~~,CAAC,CAAC,~~KAAK~~,EAAE,CAAC,KAAK,EAAE,~~CAAC~~;~~oBACtE~~,~~MAAM,~~iBAAiB,CAAC,~~gBAAgB~~,CAAC,~~MAAM,~~CAAC,CAAC;~~oBACjD~~,MAAM,iBAAiB,CAAC,KAAK,EAAE,CAAC;gBAClC,CAAC;gBACD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/customer-portal/portals/index.ts"],"names":[],"mappings":"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"}

package/lib/plugins/density-settings/index.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import { waitForPageErrors } from '../../browserforce.js';
 import { BrowserforcePlugin } from '../../plugin.js';
 const BASE_PATH = 'lightning/setup/DensitySetup/home';
 export class DensitySettings extends BrowserforcePlugin {
@@ -30,8 +31,12 @@ export class DensitySettings extends BrowserforcePlugin {
             throw new Error(`Could not find density "${config.density}". Available options: ${radioValues.filter(Boolean).join(', ')}`);
         }
         // Click the radio button with force to bypass label interception
+        const promise = Promise.race([
+            page.waitForResponse(/DensityUserSettings\.setDefaultDensitySetting=1/),
+            waitForPageErrors(page),
+        ]);
         await radioButton.click();
-        await this.browserforce.waitForIdle(page);
+        await promise;
         await page.close();
     }
     async getSelectedDensity(page) {

package/lib/plugins/density-settings/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/density-settings/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,SAAS,GAAG,mCAAmC,CAAC;AAMtD,MAAM,OAAO,eAAgB,SAAQ,kBAAkB;IAC9C,KAAK,CAAC,QAAQ;QACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO;YACL,OAAO;SACR,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,MAAc;QAC/B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAEzD,+CAA+C;QAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAEpE,sDAAsD;QACtD,IAAI,CAAC;YACH,MAAM,WAAW,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACnE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC;YACtD,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CACnC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBAC5B,IAAI,CAAC;oBACH,OAAO,MAAM,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC3C,CAAC;gBAAC,MAAM,CAAC;oBACP,OAAO,SAAS,CAAC;gBACnB,CAAC;YACH,CAAC,CAAC,CACH,CAAC;YACF,MAAM,IAAI,KAAK,CACb,2BACE,MAAM,CAAC,OACT,yBAAyB,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAClE,CAAC;QACJ,CAAC;QAED,iEAAiE;QACjE,MAAM,~~WAAW~~,CAAC,~~KAAK~~,~~EAAE~~,CAAC;~~QAC1B~~,~~MAAM~~,IAAI,CAAC,~~YAAY~~,CAAC,WAAW,CAAC,~~IAAI~~,CAAC,CAAC;~~QAC1C~~,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,IAAU;QACzC,yEAAyE;QACzE,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAE5C,KAAK,MAAM,WAAW,IAAI,cAAc,EAAE,CAAC;YACzC,8EAA8E;YAC9E,+DAA+D;YAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;gBAC1C,IAAI,EAAE,IAAI,MAAM,CAAC,IAAI,WAAW,EAAE,EAAE,GAAG,CAAC;aACzC,CAAC,CAAC;YAEH,wCAAwC;YACxC,IAAI,MAAM,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC;gBAClC,OAAO,WAAW,CAAC;YACrB,CAAC;QACH,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;CACF"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/density-settings/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,SAAS,GAAG,mCAAmC,CAAC;AAMtD,MAAM,OAAO,eAAgB,SAAQ,kBAAkB;IAC9C,KAAK,CAAC,QAAQ;QACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO;YACL,OAAO;SACR,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,MAAc;QAC/B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAEzD,+CAA+C;QAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAEpE,sDAAsD;QACtD,IAAI,CAAC;YACH,MAAM,WAAW,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACnE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC;YACtD,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CACnC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBAC5B,IAAI,CAAC;oBACH,OAAO,MAAM,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC3C,CAAC;gBAAC,MAAM,CAAC;oBACP,OAAO,SAAS,CAAC;gBACnB,CAAC;YACH,CAAC,CAAC,CACH,CAAC;YACF,MAAM,IAAI,KAAK,CACb,2BACE,MAAM,CAAC,OACT,yBAAyB,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAClE,CAAC;QACJ,CAAC;QAED,iEAAiE;QACjE,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;YAC3B,IAAI,CAAC,eAAe,CAAC,iDAAiD,CAAC;YACvE,iBAAiB,CAAC,IAAI,CAAC;SACxB,CAAC,CAAC;QACH,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC;QAC1B,MAAM,OAAO,CAAC;QACd,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,IAAU;QACzC,yEAAyE;QACzE,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAE5C,KAAK,MAAM,WAAW,IAAI,cAAc,EAAE,CAAC;YACzC,8EAA8E;YAC9E,+DAA+D;YAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;gBAC1C,IAAI,EAAE,IAAI,MAAM,CAAC,IAAI,WAAW,EAAE,EAAE,GAAG,CAAC;aACzC,CAAC,CAAC;YAEH,wCAAwC;YACxC,IAAI,MAAM,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC;gBAClC,OAAO,WAAW,CAAC;YACrB,CAAC;QACH,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;CACF"}