github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

URL field formatter fix (#46332) (#47464)

Browse source 
* Fix url render relative hyperlinks

* Fix test cases

* Make prefix less errorable

* Add some tests for url formatter
This commit is contained in:
Daniil Suleiman 2019-10-08 00:41:27 +03:00 • committed by GitHub
parent 3fe9dcc095
commit 2d04d700a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/url.js
View file

@ -189,5 +189,29 @@ describe('UrlFormat', function () {
expect(converter('../foo/bar', null, null, parsedUrl))
.to.be('<span ng-non-bindable><a href="http://kibana.host.com/nbc/app/../foo/bar" target="_blank" rel="noopener noreferrer">../foo/bar</a></span>');
});
it('should support multiple types of urls w/o basePath', function () {
const url = new UrlFormat();
const parsedUrl = {
origin: 'http://kibana.host.com',
pathname: '/app/kibana',
};
const converter = url.getConverterFor('html');
expect(converter('10.22.55.66', null, null, parsedUrl))
.to.be('<span ng-non-bindable><a href="http://kibana.host.com/app/10.22.55.66" target="_blank" rel="noopener noreferrer">10.22.55.66</a></span>');
expect(converter('http://www.domain.name/app/kibana#/dashboard/', null, null, parsedUrl))
.to.be('<span ng-non-bindable><a href="http://www.domain.name/app/kibana#/dashboard/" target="_blank" rel="noopener noreferrer">http://www.domain.name/app/kibana#/dashboard/</a></span>');
expect(converter('/app/kibana', null, null, parsedUrl))
.to.be('<span ng-non-bindable><a href="http://kibana.host.com/app/kibana" target="_blank" rel="noopener noreferrer">/app/kibana</a></span>');
expect(converter('kibana#/dashboard/', null, null, parsedUrl))
.to.be('<span ng-non-bindable><a href="http://kibana.host.com/app/kibana#/dashboard/" target="_blank" rel="noopener noreferrer">kibana#/dashboard/</a></span>');
expect(converter('#/dashboard/', null, null, parsedUrl))
.to.be('<span ng-non-bindable><a href="http://kibana.host.com/app/kibana#/dashboard/" target="_blank" rel="noopener noreferrer">#/dashboard/</a></span>');
});
});
});

4
src/legacy/core_plugins/kibana/common/field_formats/types/url.js
View file

@ -157,7 +157,9 @@ export function createUrlFormat(FieldFormat) {
}
// Handle urls like: `../app/kibana`
else {
prefix = `${parsedUrl.origin}${parsedUrl.basePath}/app/`;
const prefixEnd = url[0] === '/' ? '' : '/';
prefix = `${parsedUrl.origin}${parsedUrl.basePath || ''}/app${prefixEnd}`;
}
}