Skip to content

Commit a8dafc4

Browse files
committed
fix events QL
1 parent 5701eb0 commit a8dafc4

File tree

1 file changed

+25
-8
lines changed

1 file changed

+25
-8
lines changed

angular/src/app/pages/api/manage/manage.component.ts

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,8 @@ export class ApiManageComponent implements OnInit {
9090
const sle_details_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!dashboard\/(?<detail>serviceLevels|wiredserviceLevels|wanServiceLevels|juniperGateway)\/page2\/(stats|timeline)\/[a-zA-Z-]+\/[a-zA-Z-]+\/(?<scope>site|device|client|juniperSwitch|juniperGateway)\/(?<scope_id>[a-f0-9-]*)\/(?<sle_name>[a-z-]*)\/(?<sle_sub_1>[a-zA-Z-]+)\/(?<sle_sub_2>[a-zA-Z-]+)(\/(?<period>[0-9a-z]*))?(\/(?<start>[0-9]*))?(\/(?<stop>[0-9]*))?\/(?<site_id>[a-f0-9-]*)/iys;
9191
const sle_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!dashboard\/(?<detail>serviceLevels|wiredserviceLevels|wanServiceLevels|juniperGateway|applicationServiceLevels)(\/(?<scope>org|site|device|client|juniperSwitch|juniperGateway))?(\/(?<scope_id>[a-f0-9-]*))?(\/(?<period>[0-9a-z-]*))?(\/(?<start>[0-9]*))?(\/(?<stop>[0-9]*))?\/(?<site_id>[a-f0-9-]*)(\?app=(?<app>[a-zA-Z]*))?/iys;
9292
const insights_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!dashboard\/(?<detail>insights|insights-full-stack)\/((?<obj>[a-z]+)\/)?((?<obj_id>[a-z0-9-]+)\/)?((?<period>[a-z0-9]+)\/)?((?<start>[0-9]*)\/)?((?<stop>[0-9]*)\/)?(?<site_id>[0-9a-f-]{36})?/iys;
93-
//const alarm_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!alerts\/?(?<scope>org|site)?\/?(?<uuid>[0-9a-z-]*)\/?(?<period>[0-9a-z]*)?\/?(?<start>[0-9]*)?\/?(?<stop>[0-9]*)?\/?(?<show_ack>true|false)?\/?(?<group>[a-z%0-9]*)?\/?(?<show_crit>true|false)?\/?(?<show_warn>true|false)?\/?(?<show_info>true|false)?\/?(?<site_id>[0-9a-z-]*)?/iys;
9493
const alarm_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!alerts\/?(?<site_id>[0-9a-z-]*)\??(?<query_param>.*)?$/iys;
95-
const events_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!marvis\/?(?<scope>org|site)?\/?(?<period>[0-9a-z]*)?\/?(?<start>[0-9]*)?\/?(?<stop>[0-9]*)?\/?(?<site_id>[0-9a-z-]*)?/iys;
94+
const events_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!marvis\/?(?<site_id>[0-9a-z-]*)\??(?<query_param>.*)?$/iys;
9695
const floorplans_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!cliLocation\/(?<detail>view|config|validationPath|wayfinding)?\/?(?<uuid>[0-9a-f-]{36})\/?(floorplan|beaconsAndZones)?\/?(?<site_id>[0-9a-f-]{36})?/iys;
9796
const site_evpn_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!evpn\/site\/?([0-9]\/)?(?<site_id>[0-9a-z_-]*)?(\/(?<topology_id>[0-9a-f-]{36}))?/yis;
9897
const site_wlan_template_re = /https:\/\/(manage|integration|manage-staging)\.(?<host>[a-z0-9.]*(mist|mistsys|mist-federal)\.com)\/admin\/\?org_id=(?<org_id>[0-9a-f-]{36})#!wlan\/orgWlanDetail\/(?<template_id>[0-9a-z_-]*)\/(?<wlan_id>[0-9a-f-]{36})\/(?<site_id>[0-9a-f-]{36})/is;
@@ -292,12 +291,12 @@ export class ApiManageComponent implements OnInit {
292291
if (detail && !this.not_detail.includes(detail)) {
293292
// set QUICK LINK
294293
url = "https://api." + host + "/api/v1/sites/" + this.site_id + "/" + obj_name + "/search?mac=" + this.obj_id;
295-
this.quick_links.push({ url: url, name: ui_name});
294+
this.quick_links.push({ url: url, name: ui_name });
296295
} else {
297296
// set QUICK LINK
298297
url = "https://api." + host + "/api/v1/sites/" + this.site_id + "/" + obj_name + "/search";
299298
if (extra_param) url += "?" + extra_param;
300-
this.quick_links.push({ url: url, name: ui_name});
299+
this.quick_links.push({ url: url, name: ui_name });
301300
}
302301
}
303302

@@ -1202,12 +1201,12 @@ export class ApiManageComponent implements OnInit {
12021201
res?.groups?.query_param.split("&").forEach(param => {
12031202
let key = param.split("=")[0];
12041203
let value = param.split("=")[1];
1205-
switch (key.toLowerCase()){
1204+
switch (key.toLowerCase()) {
12061205
case "start":
1207-
extra_params_array.push("start="+value);
1206+
extra_params_array.push("start=" + value);
12081207
break;
12091208
case "end":
1210-
extra_params_array.push("end="+value);
1209+
extra_params_array.push("end=" + value);
12111210
break;
12121211
}
12131212
})
@@ -1317,7 +1316,25 @@ export class ApiManageComponent implements OnInit {
13171316
////////////////////// EVENTS URL FUNCTION DISPATCHER
13181317
eventsUrl(res: RegExpExecArray): void {
13191318
this.org_id = res?.groups?.org_id;
1320-
let extra_params = "";
1319+
let extra_params: string = "";
1320+
let extra_params_array: string[] = [];
1321+
1322+
if (res?.groups?.query_param) {
1323+
res?.groups?.query_param.split("&").forEach(param => {
1324+
let key = param.split("=")[0];
1325+
let value = param.split("=")[1];
1326+
switch (key.toLowerCase()) {
1327+
case "start":
1328+
extra_params_array.push("start=" + value);
1329+
break;
1330+
case "end":
1331+
extra_params_array.push("end=" + value);
1332+
break;
1333+
}
1334+
})
1335+
}
1336+
1337+
if (extra_params_array) extra_params = "?" + extra_params_array.join("&");
13211338
if (res?.groups?.site_id) {
13221339
this.site_id = res?.groups?.site_id;
13231340
} else {

0 commit comments

Comments
 (0)