Merge remote-tracking branch 'origin/backlog/compliance-evaluation' into backlog/compliance-evaluation

Author: elmilan06

frontend/src/app/compliance/compliance-management/compliance-management.module.ts

@@ -23,8 +23,6 @@ import {UtmCpStandardSectionComponent} from './utm-cp-standard-section/utm-cp-st
 import {UtmCpStandardDeleteComponent} from './utm-cp-standard/utm-cp-standard-delete/utm-cp-standard-delete.component';
 import {UtmCpStandardComponent} from './utm-cp-standard/utm-cp-standard.component';
 
-
-
 @NgModule({
   declarations: [
     CpStandardManagementComponent,

frontend/src/app/log-analyzer/explorer/log-analyzer-tabs/log-analyzer-tabs.component.html

@@ -5,7 +5,7 @@ <h5 class="card-title mb-0 text-uppercase label-header">
         Log analyzer
       </h5>
       <div class="header-elements">
-        <button class="btn utm-button utm-button-primary" routerLink="/discover/log-analyzer-query-config">
+        <button class="btn utm-button utm-button-primary" routerLink="/discover/log-analyzer-queries">
           <i class="icon-zoomin3 mr-1"></i> Queries
         </button>
       </div>

frontend/src/app/log-analyzer/explorer/log-analyzer-tabs/log-analyzer-tabs.component.ts

@@ -72,7 +72,7 @@ export class LogAnalyzerTabsComponent implements OnInit, OnDestroy {
     this.router.events.pipe(
       filter(event => event instanceof NavigationStart),
       tap((event: NavigationStart) => {
-        if (event.url !== '/discover/log-analyzer-query-config' && !event.url.includes('/discover/log-analyzer')) {
+        if (event.url !== '/discover/log-analyzer-queries' && !event.url.includes('/discover/log-analyzer')) {
           this.tabService.closeAllTabs();
         }
       }),

frontend/src/app/log-analyzer/log-analyzer-routing.module.ts

@@ -14,7 +14,7 @@ const routes: Routes = [
     data: {authorities: [ADMIN_ROLE, USER_ROLE]}
   },
   {
-    path: 'log-analyzer-query-config',
+    path: 'log-analyzer-queries',
     component: LogAnalyzerQueryListComponent,
     canActivate: [UserRouteAccessService],
     data: {authorities: [ADMIN_ROLE, USER_ROLE]}

frontend/src/app/log-analyzer/queries/log-analyzer-query-list/log-analyzer-query-list.component.ts

@@ -58,7 +58,7 @@ export class LogAnalyzerQueryListComponent implements OnInit, OnDestroy {
     this.router.events.pipe(
       filter(event => event instanceof NavigationStart),
       tap((event: NavigationStart) => {
-        if (event.url !== '/discover/log-analyzer-query-config' && !event.url.includes('/discover/log-analyzer')) {
+        if (event.url !== '/discover/log-analyzer-queries' && !event.url.includes('/discover/log-analyzer')) {
           this.tabService.closeAllTabs();
         }
       }),

frontend/src/app/log-analyzer/shared/services/log-analyzer-query.service.ts

@@ -10,7 +10,7 @@ import {LogAnalyzerQueryType} from '../type/log-analyzer-query.type';
 })
 export class LogAnalyzerQueryService {
 
-  public resourceUrl = SERVER_API_URL + 'api/log-analyzer/query-config';
+  public resourceUrl = SERVER_API_URL + 'api/log-analyzer/queries';
 
   constructor(private http: HttpClient) {
   }

frontend/src/environments/environment.ts

@@ -4,8 +4,8 @@
 
 export const environment = {
   production: false,
-  //SERVER_API_URL: 'https://192.168.1.18/',
-  SERVER_API_URL: 'http://localhost:8080/',
+  SERVER_API_URL: 'https://192.168.1.18/',
+  //SERVER_API_URL: 'http://localhost:8080/',
   SERVER_API_CONTEXT: '',
   SESSION_AUTH_TOKEN: window.location.host.split(':')[0].toLocaleUpperCase(),
   WEBSOCKET_URL: '//localhost:8080',