Skip to content

Commit b62848c

Browse files
Corey Robertsonkibanamachine
Corey Robertson
and
kibanamachine
authored
[Canvas] Switch Canvas to use React Router (#100579)
* Switch Canvas to use React Router * Fix typescript errors * Remove @scant/router from package.json * Fix tests * Fix functional test * Fix functional tests * Fix bad merge in package.json * Cleanup from code review comments * Fix double basepath append Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
1 parent 72d5b8a commit b62848c

107 files changed

Lines changed: 2071 additions & 2311 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,20 +131,21 @@
131131
"@kbn/config": "link:bazel-bin/packages/kbn-config/npm_module",
132132
"@kbn/config-schema": "link:bazel-bin/packages/kbn-config-schema/npm_module",
133133
"@kbn/crypto": "link:bazel-bin/packages/kbn-crypto/npm_module",
134-
"@kbn/mapbox-gl": "link:bazel-bin/packages/kbn-mapbox-gl/npm_module",
135134
"@kbn/i18n": "link:bazel-bin/packages/kbn-i18n/npm_module",
136135
"@kbn/interpreter": "link:packages/kbn-interpreter",
137136
"@kbn/io-ts-utils": "link:bazel-bin/packages/kbn-io-ts-utils/npm_module",
138137
"@kbn/legacy-logging": "link:bazel-bin/packages/kbn-legacy-logging/npm_module",
139138
"@kbn/logging": "link:bazel-bin/packages/kbn-logging/npm_module",
139+
"@kbn/mapbox-gl": "link:bazel-bin/packages/kbn-mapbox-gl/npm_module",
140140
"@kbn/monaco": "link:bazel-bin/packages/kbn-monaco/npm_module",
141-
"@kbn/securitysolution-list-constants": "link:bazel-bin/packages/kbn-securitysolution-list-constants/npm_module",
141+
"@kbn/rule-data-utils": "link:packages/kbn-rule-data-utils",
142142
"@kbn/securitysolution-es-utils": "link:bazel-bin/packages/kbn-securitysolution-es-utils/npm_module",
143-
"@kbn/securitysolution-io-ts-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-types/npm_module",
144143
"@kbn/securitysolution-io-ts-alerting-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-alerting-types/npm_module",
145144
"@kbn/securitysolution-io-ts-list-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-list-types/npm_module",
145+
"@kbn/securitysolution-io-ts-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-types/npm_module",
146146
"@kbn/securitysolution-io-ts-utils": "link:bazel-bin/packages/kbn-securitysolution-io-ts-utils/npm_module",
147147
"@kbn/securitysolution-list-api": "link:bazel-bin/packages/kbn-securitysolution-list-api/npm_module",
148+
"@kbn/securitysolution-list-constants": "link:bazel-bin/packages/kbn-securitysolution-list-constants/npm_module",
148149
"@kbn/securitysolution-list-hooks": "link:bazel-bin/packages/kbn-securitysolution-list-hooks/npm_module",
149150
"@kbn/securitysolution-list-utils": "link:bazel-bin/packages/kbn-securitysolution-list-utils/npm_module",
150151
"@kbn/securitysolution-utils": "link:bazel-bin/packages/kbn-securitysolution-utils/npm_module",
@@ -163,7 +164,6 @@
163164
"@mapbox/mapbox-gl-rtl-text": "0.2.3",
164165
"@mapbox/vector-tile": "1.3.1",
165166
"@reduxjs/toolkit": "^1.5.1",
166-
"@scant/router": "^0.1.1",
167167
"@slack/webhook": "^5.0.4",
168168
"@turf/along": "6.0.1",
169169
"@turf/area": "6.0.1",
@@ -276,7 +276,6 @@
276276
"json-stringify-safe": "5.0.1",
277277
"jsonwebtoken": "^8.5.1",
278278
"jsts": "^1.6.2",
279-
"@kbn/rule-data-utils": "link:packages/kbn-rule-data-utils",
280279
"kea": "^2.4.2",
281280
"leaflet": "1.5.1",
282281
"leaflet-draw": "0.4.14",

‎x-pack/plugins/canvas/i18n/components.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,12 @@ export const ComponentStrings = {
175175
defaultMessage: 'Asset thumbnail',
176176
}),
177177
},
178+
CanvasLoading: {
179+
getLoadingLabel: () =>
180+
i18n.translate('xpack.canvas.canvasLoading.loadingMessage', {
181+
defaultMessage: 'Loading',
182+
}),
183+
},
178184
ColorManager: {
179185
getAddAriaLabel: () =>
180186
i18n.translate('xpack.canvas.colorManager.addAriaLabel', {
@@ -1384,6 +1390,14 @@ export const ComponentStrings = {
13841390
i18n.translate('xpack.canvas.workpadHeaderKioskControl.controlTitle', {
13851391
defaultMessage: 'Cycle fullscreen pages',
13861392
}),
1393+
getAutoplayListDurationManualText: () =>
1394+
i18n.translate('xpack.canvas.workpadHeaderKioskControl.autoplayListDurationManual', {
1395+
defaultMessage: 'Manually',
1396+
}),
1397+
getDisableTooltip: () =>
1398+
i18n.translate('xpack.canvas.workpadHeaderKioskControl.disableTooltip', {
1399+
defaultMessage: 'Disable auto-play',
1400+
}),
13871401
},
13881402
WorkpadHeaderRefreshControlSettings: {
13891403
getRefreshAriaLabel: () =>

‎x-pack/plugins/canvas/public/application.tsx‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { includes, remove } from 'lodash';
1818
import { AppMountParameters, CoreStart, CoreSetup, AppUpdater } from 'kibana/public';
1919

2020
import { CanvasStartDeps, CanvasSetupDeps } from './plugin';
21-
// @ts-expect-error untyped local
2221
import { App } from './components/app';
2322
import { KibanaContextProvider } from '../../../../src/plugins/kibana_react/public';
2423
import { registerLanguage } from './lib/monaco_language_def';
@@ -32,10 +31,6 @@ import { init as initStatsReporter } from './lib/ui_metric';
3231
import { CapabilitiesStrings } from '../i18n';
3332

3433
import { startServices, services, ServicesProvider } from './services';
35-
// @ts-expect-error untyped local
36-
import { createHistory, destroyHistory } from './lib/history_provider';
37-
// @ts-expect-error untyped local
38-
import { stopRouter } from './lib/router_provider';
3934
import { initFunctions } from './functions';
4035
// @ts-expect-error untyped local
4136
import { appUnload } from './state/actions/app';
@@ -103,9 +98,6 @@ export const initializeCanvas = async (
10398
services.expressions.getService().registerFunction(fn);
10499
}
105100

106-
// Re-initialize our history
107-
createHistory();
108-
109101
// Create Store
110102
const canvasStore = await createStore(coreSetup, setupPlugins);
111103

@@ -178,7 +170,4 @@ export const teardownCanvas = (coreStart: CoreStart, startPlugins: CanvasStartDe
178170

179171
coreStart.chrome.setBadge(undefined);
180172
coreStart.chrome.setHelpExtension(undefined);
181-
182-
destroyHistory();
183-
stopRouter();
184173
};

‎x-pack/plugins/canvas/public/apps/export/routes.ts‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎x-pack/plugins/canvas/public/apps/home/home_app/home_app.ts‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎x-pack/plugins/canvas/public/apps/home/routes.ts‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎x-pack/plugins/canvas/public/apps/index.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎x-pack/plugins/canvas/public/apps/workpad/routes.ts‎

Lines changed: 0 additions & 110 deletions
This file was deleted.

0 commit comments

Comments
 (0)