|
|
|
@ -140,8 +140,8 @@ export class ToolbarFilterPage extends BasePage {
|
|
|
|
|
.click(); |
|
|
|
|
} else { |
|
|
|
|
await this.waitForResponse({ |
|
|
|
|
uiAction: () => |
|
|
|
|
this.rootPage |
|
|
|
|
uiAction: async () => |
|
|
|
|
await this.rootPage |
|
|
|
|
.locator('div.ant-select-dropdown.nc-dropdown-toolbar-field-list') |
|
|
|
|
.locator(`div[label="${title}"]:visible`) |
|
|
|
|
.click(), |
|
|
|
@ -164,8 +164,8 @@ export class ToolbarFilterPage extends BasePage {
|
|
|
|
|
.click(); |
|
|
|
|
} else { |
|
|
|
|
await this.waitForResponse({ |
|
|
|
|
uiAction: () => |
|
|
|
|
this.rootPage |
|
|
|
|
uiAction: async () => |
|
|
|
|
await this.rootPage |
|
|
|
|
.locator('.nc-dropdown-filter-comp-op') |
|
|
|
|
.locator(`.ant-select-item:has-text("${operation}")`) |
|
|
|
|
.first() |
|
|
|
@ -193,8 +193,8 @@ export class ToolbarFilterPage extends BasePage {
|
|
|
|
|
.click(); |
|
|
|
|
} else { |
|
|
|
|
await this.waitForResponse({ |
|
|
|
|
uiAction: () => |
|
|
|
|
this.rootPage |
|
|
|
|
uiAction: async () => |
|
|
|
|
await this.rootPage |
|
|
|
|
.locator('.nc-dropdown-filter-comp-sub-op') |
|
|
|
|
.locator(`.ant-select-item:has-text("${subOperation}")`) |
|
|
|
|
.first() |
|
|
|
@ -239,7 +239,7 @@ export class ToolbarFilterPage extends BasePage {
|
|
|
|
|
await this.rootPage.locator(`.ant-picker-cell-inner:has-text("${value}")`).click(); |
|
|
|
|
} else { |
|
|
|
|
await this.waitForResponse({ |
|
|
|
|
uiAction: () => this.rootPage.locator(`.ant-picker-cell-inner:has-text("${value}")`).click(), |
|
|
|
|
uiAction: async () => await this.rootPage.locator(`.ant-picker-cell-inner:has-text("${value}")`).click(), |
|
|
|
|
httpMethodsToMatch: ['GET'], |
|
|
|
|
requestUrlPathToMatch: locallySaved ? `/api/v1/db/public/` : `/api/v1/db/data/noco/`, |
|
|
|
|
}); |
|
|
|
@ -260,7 +260,7 @@ export class ToolbarFilterPage extends BasePage {
|
|
|
|
|
await this.get().locator('.nc-filter-value-select').locator('input').fill(value); |
|
|
|
|
} else { |
|
|
|
|
await this.waitForResponse({ |
|
|
|
|
uiAction: () => this.get().locator('.nc-filter-value-select').locator('input').fill(value), |
|
|
|
|
uiAction: async () => await this.get().locator('.nc-filter-value-select').locator('input').fill(value), |
|
|
|
|
httpMethodsToMatch: ['GET'], |
|
|
|
|
requestUrlPathToMatch: locallySaved ? `/api/v1/db/public/` : `/api/v1/db/data/noco/`, |
|
|
|
|
}); |
|
|
|
@ -320,7 +320,7 @@ export class ToolbarFilterPage extends BasePage {
|
|
|
|
|
await this.toolbar.clickFilter(); |
|
|
|
|
if (networkValidation) { |
|
|
|
|
await this.waitForResponse({ |
|
|
|
|
uiAction: () => this.get().locator('.nc-filter-item-remove-btn').click(), |
|
|
|
|
uiAction: async () => await this.get().locator('.nc-filter-item-remove-btn').click(), |
|
|
|
|
httpMethodsToMatch: ['DELETE'], |
|
|
|
|
requestUrlPathToMatch: '/api/v1/db/meta/filters/', |
|
|
|
|
}); |
|
|
|
@ -333,7 +333,7 @@ export class ToolbarFilterPage extends BasePage {
|
|
|
|
|
async remove({ networkValidation = true }: { networkValidation?: boolean } = {}) { |
|
|
|
|
if (networkValidation) { |
|
|
|
|
await this.waitForResponse({ |
|
|
|
|
uiAction: () => this.get().locator('.nc-filter-item-remove-btn').click(), |
|
|
|
|
uiAction: async () => await this.get().locator('.nc-filter-item-remove-btn').click(), |
|
|
|
|
httpMethodsToMatch: ['DELETE'], |
|
|
|
|
requestUrlPathToMatch: '/api/v1/db/meta/filters/', |
|
|
|
|
}); |
|
|
|
|