Skip to content

Commit 1ec8b36

Browse files
mjabascal10Kbayeroc3s4rfred
authored
Bugfix/10.4/621 the system lets you remove the last integration tenant without disabling the integration (#698)
* Improvement integrations component * Refactor guides generation process . * Refactor guides generation process . * Refactor guides generation process . * Add fortiweb filter * Added new integrations(). * Update pfsense_fw.conf Updating pfsense filter * Update ibm_aix.conf Updating aix filter * Update fortiweb.conf Updating fortiweb filter * Update netflow.conf Updating netflow filter * Added pfsense changeset * Add pfsense changeset * Add pfsense changeset * Added confirmation for disabling the log collector action. * Added pfsense changeset * Added netflow changeset * Added netflow changeset * Added netflow changeset * Added aix changeset * Refactor changesets * Disabled modules UFW and LINUX_LOGS * Fixed integration bugs * Disabled modules UFW and LINUX_LOGS * Adding modules to log-firewall-* index-pattern * Update README.md * Migrate agent configurations * Update UTMStack Version * Update UTMStack Agent Version * Fixed the Enable Integration button for Syslog * Added theadWinds menu * Added theadWinds menu * Added theadWinds menu * Added theadWinds menu * Added theadWinds menu * Added theadWinds menu * Fixed menu url validation * Added theadWinds logo * Set timeout to mailSender bean * Set timeout to mailSender bean * Added shm-size param to selenium * Added shm-size param to selenium * Fixing selenium service * Trigger web-pdf workflow * Updating installer shm volume * Updating dockerfile comment * Set timeout to mailSender bean * Remove tls syslog servers * Validate UTF8 messages and create buffer for syslog messages * Close syslog connections * Accept multiple connections in syslog servers * Refactor threat intelligence component * Removed SSL protocol * Fixed Data Parsing processed events is not matching between outside and inside component (#622) * Set threat winds changeset * Fix ibm aix id * Updated pfsense filter * Fixed The system lets you remove the last integration tenant without disabling the integration (#621) * Fixed Validation for character-limited fields (#644) * Fixed Index-Pattern search continues displaying information despite no results found(#645) * Updated module category for aix and pfsense integration * Fixed the space problem between the iframe and the header. * Updated module category for aix and pfsense integration * Fixed Index-Pattern search continues displaying information despite no results found (#645) * Fixed menu refresh issue when updated --------- Co-authored-by: Yorjander Hernandez Vergara <[email protected]> Co-authored-by: Freddy R. Laffita Almaguer <[email protected]>
1 parent 853b51a commit 1ec8b36

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

frontend/src/app/app-module/shared/components/app-module-activate-button/app-module-activate-button.component.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Component, Input, OnDestroy, OnInit} from '@angular/core';
22
import {NgbModal} from '@ng-bootstrap/ng-bootstrap';
33
import {Subject} from 'rxjs';
4-
import {takeUntil, filter} from 'rxjs/operators';
4+
import {filter, takeUntil, tap} from 'rxjs/operators';
55
import {UtmToastService} from '../../../../shared/alert/utm-toast.service';
66
import {NavBehavior} from '../../../../shared/behaviors/nav.behavior';
77
import {ModuleChangeStatusBehavior} from '../../behavior/module-change-status.behavior';
@@ -40,7 +40,11 @@ export class AppModuleActivateButtonComponent implements OnInit, OnDestroy {
4040
this.moduleChangeStatusBehavior.moduleStatus$
4141
.pipe(filter(value => value !== null),
4242
takeUntil(this.destroy$))
43-
.subscribe( value => this.changeModuleStatus(value));
43+
.subscribe( value => {
44+
if (this.moduleDetail.moduleActive) {
45+
this.changeModuleStatus(value);
46+
}
47+
});
4448
this.getModuleDetail(this.module);
4549
}
4650

frontend/src/app/compliance/shared/components/utm-compliance-schedule-delete/utm-compliance-schedule-delete.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export class UtmComplianceScheduleDeleteComponent implements OnInit {
2828
.subscribe(() => {
2929
this.utmToastService.showSuccessBottom('Schedule Compliance deleted successfully');
3030
this.activeModal.close();
31-
this.navBehavior.$nav.next(true);
3231
this.complianceScheduleDeleted.emit('deleted');
3332
}, () => {
3433
this.utmToastService.showError('Error deleting schedule compliance',

frontend/src/app/shared/components/layout/header/header-menu-navigation/header-menu-navigation.component.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@ export class HeaderMenuNavigationComponent implements OnInit, OnDestroy {
3737
}
3838

3939
ngOnInit() {
40+
this.navBehavior.$nav.asObservable()
41+
.subscribe( value => {
42+
if (value) {
43+
this.loadMenus();
44+
}
45+
});
46+
4047
this.loadMenus();
4148

4249
this.navBehavior.$nav

0 commit comments

Comments
 (0)