[ML] remove escaping with !, adjust a unit test for security app

elastic · Sep 14, 2020 · e8b935e · e8b935e
1 parent 33fc97f
commit e8b935e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/x-pack/plugins/ml/public/application/util/custom_url_utils.test.ts b/x-pack/plugins/ml/public/application/util/custom_url_utils.test.ts
@@ -414,7 +414,7 @@ describe('ML - custom URL utils', () => {
  const urlConfig = {
  url_name: 'Hosts Overview by process name',
  url_value:
- "security/hosts/ml-hosts?_g=()&query=(query:'process.name%20:%20%22$process.name$%22',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
+ "security/hosts/ml-hosts/$host.name$?_g=()&query=(query:'process.name%20:%20%22$process.name$%22',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
  };
 
  const testRecords = {
@@ -458,7 +458,7 @@ describe('ML - custom URL utils', () => {
  };
 
  expect(getUrlForRecord(urlConfig, testRecords)).toBe(
- "security/hosts/ml-hosts?_g=()&query=(language:kuery,query:'process.name:\"seq\"')&timerange=(global:(linkTo:!(timeline),timerange:(from:'2019-02-01T16:00:00.000Z',kind:absolute,to:'2019-02-01T18:59:59.999Z')),timeline:(linkTo:!(global),timerange:(from:'2019-02-01T16%3A00%3A00.000Z',kind:absolute,to:'2019-02-01T18%3A59%3A59.999Z')))"
+ "security/hosts/ml-hosts/showcase?_g=()&query=(language:kuery,query:'process.name:\"seq\"')&timerange=(global:(linkTo:!(timeline),timerange:(from:'2019-02-01T16:00:00.000Z',kind:absolute,to:'2019-02-01T18:59:59.999Z')),timeline:(linkTo:!(global),timerange:(from:'2019-02-01T16%3A00%3A00.000Z',kind:absolute,to:'2019-02-01T18%3A59%3A59.999Z')))"
  );
  });
 

diff --git a/x-pack/plugins/ml/public/application/util/custom_url_utils.ts b/x-pack/plugins/ml/public/application/util/custom_url_utils.ts
@@ -203,11 +203,7 @@ function buildKibanaUrl(urlConfig: UrlConfig, record: CustomUrlAnomalyRecordDoc)
  ? escapeForElasticsearchQuery
  : escapeForKQL;
 
- const commonEscapeCallback = flow(
- // Kibana URLs used rison encoding, so escape with ! any ! or ' characters
- (v: string): string => v.replace(/[!']/g, '!$&'),
- encodeURIComponent
- );
+ const commonEscapeCallback = flow(encodeURIComponent);
 
  const replaceSingleTokenValues = (str: string) => {
  const getResultTokenValue: GetResultTokenValue = flow(