Skip to content

Commit

Permalink
[Maps] Migrate maps client router to react (#65079)
Browse files Browse the repository at this point in the history
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
  • Loading branch information
Aaron Caldwell and elasticmachine committed Jun 18, 2020
1 parent b41ade3 commit 55a7361
Show file tree
Hide file tree
Showing 61 changed files with 1,457 additions and 1,126 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export function getMapsAppUrl(

return {
app: 'maps',
path: `#/map?${mapAppParams.toString()}`,
path: `/map#?${mapAppParams.toString()}`,
};
}

Expand Down
21 changes: 21 additions & 0 deletions test/functional/services/common/find.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,27 @@ export async function FindProvider({ getService }: FtrProviderContext) {
return wrapAll(elements);
}

public async allByButtonText(
buttonText: string,
element: WebDriver | WebElement | WebElementWrapper = driver,
timeout: number = defaultFindTimeout
): Promise<string[]> {
log.debug(`Find.byButtonText('${buttonText}') with timeout=${timeout}`);
return await retry.tryForTime(timeout, async () => {
// tslint:disable-next-line:variable-name
const _element = element instanceof WebElementWrapper ? element._webElement : element;
await this._withTimeout(0);
const allButtons = wrapAll(await _element.findElements(By.tagName('button')));
await this._withTimeout(defaultFindTimeout);
const buttonTexts = await Promise.all(
allButtons.map(async (el) => {
return el.getVisibleText();
})
);
return buttonTexts.filter((text) => text.trim() === buttonText.trim());
});
}

public async allByCssSelector(
selector: string,
timeout: number = defaultFindTimeout
Expand Down
2 changes: 0 additions & 2 deletions x-pack/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { monitoring } from './legacy/plugins/monitoring';
import { security } from './legacy/plugins/security';
import { dashboardMode } from './legacy/plugins/dashboard_mode';
import { beats } from './legacy/plugins/beats_management';
import { maps } from './legacy/plugins/maps';
import { spaces } from './legacy/plugins/spaces';
import { ingestManager } from './legacy/plugins/ingest_manager';

Expand All @@ -21,7 +20,6 @@ module.exports = function (kibana) {
security(kibana),
dashboardMode(kibana),
beats(kibana),
maps(kibana),
ingestManager(kibana),
];
};
41 changes: 0 additions & 41 deletions x-pack/legacy/plugins/maps/index.js

This file was deleted.

Loading

0 comments on commit 55a7361

Please sign in to comment.