Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly redirect legacy URLs #68284

Merged
merged 35 commits into from
Jun 24, 2020
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
6edb494
wip
flash1293 Jun 4, 2020
cf93233
remove some stuff
flash1293 Jun 4, 2020
b461786
Merge remote-tracking branch 'upstream/master' into fix-legacy-links
flash1293 Jun 5, 2020
a2e6c70
redirect legacy hashes correctly as well
flash1293 Jun 5, 2020
b9ae162
Merge remote-tracking branch 'upstream/master' into fix-legacy-links
flash1293 Jun 8, 2020
7ff5f35
fix some problems
flash1293 Jun 8, 2020
7a49b56
Merge remote-tracking branch 'upstream/master' into fix-legacy-links
flash1293 Jun 8, 2020
c51e0d6
fix a few bugs
flash1293 Jun 8, 2020
dfa0613
move fontawesome into kibana_legacy
flash1293 Jun 9, 2020
6a777f4
Merge remote-tracking branch 'upstream/master' into fix-legacy-links
flash1293 Jun 12, 2020
63b7403
fix font awesome loading and path normalization cases
flash1293 Jun 12, 2020
ee47247
Merge remote-tracking branch 'upstream/master' into fix-legacy-links
flash1293 Jun 12, 2020
8bd49ff
fix some bugs
flash1293 Jun 12, 2020
eb9f50e
Merge remote-tracking branch 'upstream/master' into fix-legacy-links
flash1293 Jun 15, 2020
85f20d6
fix unit test and add functional test
flash1293 Jun 15, 2020
3ad0d99
fix browser tests
flash1293 Jun 15, 2020
ecac41a
Merge remote-tracking branch 'upstream/master' into fix-legacy-links
flash1293 Jun 15, 2020
be4f50c
fix api integration tests
flash1293 Jun 15, 2020
ecc4669
remove styles file
flash1293 Jun 16, 2020
4d2cb4a
Merge remote-tracking branch 'upstream/master' into fix-legacy-links
flash1293 Jun 16, 2020
49d6218
load fontawesome in all consuming plugins
flash1293 Jun 16, 2020
c80744e
fix type errors
flash1293 Jun 16, 2020
55a3825
Merge remote-tracking branch 'upstream/master' into fix-legacy-links
flash1293 Jun 17, 2020
5ef11db
import legacy maps styles
flash1293 Jun 17, 2020
fb32fb2
Merge remote-tracking branch 'upstream/master' into fix-legacy-links
flash1293 Jun 17, 2020
97ea613
remove unused parts of font-awesome
flash1293 Jun 17, 2020
9fa685e
Merge remote-tracking branch 'upstream/master' into fix-legacy-links
flash1293 Jun 18, 2020
929f121
use apply async and fix scss structure
flash1293 Jun 18, 2020
c41ffdd
move scss import into management section
flash1293 Jun 18, 2020
965b5a2
Merge remote-tracking branch 'upstream/master' into fix-legacy-links
flash1293 Jun 23, 2020
433e217
fix timelion app icons
flash1293 Jun 23, 2020
50162fa
fix type
flash1293 Jun 23, 2020
6605a14
Merge remote-tracking branch 'upstream/master' into fix-legacy-links
flash1293 Jun 23, 2020
ef64821
adjust karma mock
flash1293 Jun 23, 2020
79656a4
Merge branch 'master' into fix-legacy-links
elasticmachine Jun 23, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/kbn-storybook/lib/webpack.dll.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ module.exports = {
'rxjs',
'sinon',
'tinycolor2',
'./src/legacy/ui/public/styles/font_awesome.less',
'./src/legacy/ui/public/styles/bootstrap/bootstrap_light.less',
],
plugins: [
Expand Down
32 changes: 0 additions & 32 deletions src/legacy/core_plugins/kibana/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ import { importApi } from './server/routes/api/import';
import { exportApi } from './server/routes/api/export';
import { getUiSettingDefaults } from './server/ui_setting_defaults';
import { registerCspCollector } from './server/lib/csp_usage_collector';
import { injectVars } from './inject_vars';

import { kbnBaseUrl } from '../../../plugins/kibana_legacy/server';

const mkdirAsync = promisify(Fs.mkdir);

Expand All @@ -45,35 +42,7 @@ export default function (kibana) {
},

uiExports: {
app: {
id: 'kibana',
title: 'Kibana',
listed: false,
main: 'plugins/kibana/kibana',
},
styleSheetPaths: resolve(__dirname, 'public/index.scss'),
links: [],

injectDefaultVars(server, options) {
const mapConfig = server.config().get('map');
const tilemap = mapConfig.tilemap;

return {
kbnIndex: options.index,
kbnBaseUrl,

// required on all pages due to hacks that use these values
mapConfig,
tilemapsConfig: {
deprecated: {
// If url is set, old settings must be used for backward compatibility
isOverridden: typeof tilemap.url === 'string' && tilemap.url !== '',
config: tilemap,
},
},
};
},

uiSettingDefaults: getUiSettingDefaults(),
},

Expand All @@ -95,7 +64,6 @@ export default function (kibana) {
importApi(server);
exportApi(server);
registerCspCollector(usageCollection, server);
server.injectUiAppVars('kibana', () => injectVars(server));
},
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,5 @@ const pluginInstance = new TableVisPlugin({} as PluginInitializerContext);
export const setup = pluginInstance.setup(npSetup.core, plugins);
export const start = pluginInstance.start(npStart.core, {
data: npStart.plugins.data,
kibanaLegacy: npStart.plugins.kibanaLegacy,
});
9 changes: 0 additions & 9 deletions src/legacy/core_plugins/kibana/public/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,3 @@
// Public UI styles
@import 'src/legacy/ui/public/index';

// Has to come after visualize because of some
// bad cascading in the Editor layout
@import '../../../../plugins/maps_legacy/public/index';
cchaos marked this conversation as resolved.
Show resolved Hide resolved

// Management styles
@import './management/index';

// Local application mount wrapper styles
@import 'local_application_service/index';
59 changes: 0 additions & 59 deletions src/legacy/core_plugins/kibana/public/kibana.js

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions src/legacy/core_plugins/kibana/public/management/index.scss

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion src/legacy/ui/public/autoload/all.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@
import './accessibility';
import './modules';
import './settings';
import './styles';
3 changes: 3 additions & 0 deletions src/legacy/ui/public/directives/__tests__/input_focus.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import expect from '@kbn/expect';
import ngMock from 'ng_mock';
import $ from 'jquery';
import '../input_focus';
import uiRoutes from 'ui/routes';

describe('Input focus directive', function () {
let $compile;
Expand All @@ -32,6 +33,8 @@ describe('Input focus directive', function () {
let selectedText;
const inputValue = 'Input Text Value';

uiRoutes.enable();

beforeEach(ngMock.module('kibana'));
beforeEach(
ngMock.inject(function (_$compile_, _$rootScope_, _$timeout_) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just a note: checked the usage of input-focus, and just found usage in timelion, so I think this is a good candidate to migrate there (at a later cleanup)

Expand Down
10 changes: 0 additions & 10 deletions src/legacy/ui/public/styles/font_awesome.less

This file was deleted.

Loading