Skip to content

Commit 77f1ad1

Browse files
rushk014xingzhang-suse
authored andcommitted
NVSHAS-10184: Fix auto-scan toggle behavior (#1156)
Dashboard auto-scan toggle only reads `auto_scan` field Nodes & Containers auto-scan toggle use `enable_auto_scan_host`/`enable_auto_scan_workload` if non-nil and fallback to `auto_scan` field
1 parent ef52044 commit 77f1ad1

4 files changed

Lines changed: 8 additions & 10 deletions

File tree

admin/src/main/scala/com/neu/service/dashboard/DashboardService.scala

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -927,12 +927,7 @@ class DashboardService()(implicit executionContext: ExecutionContext)
927927

928928
private lazy val getAutoScan = (
929929
autoScanConfig: AutoScanConfig
930-
) =>
931-
autoScanConfig.config.enable_auto_scan_host.getOrElse(
932-
autoScanConfig.config.auto_scan.getOrElse(false)
933-
) && autoScanConfig.config.enable_auto_scan_workload.getOrElse(
934-
autoScanConfig.config.auto_scan.getOrElse(false)
935-
)
930+
) => autoScanConfig.config.auto_scan.getOrElse(false)
936931

937932
private lazy val getExposedConversation = (
938933
k: String,

admin/webapp/websrc/app/common/services/dashboard.service.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ export class DashboardService {
6969

7070
setAutoScan = (isAutoScan: boolean) => {
7171
return this.assetsHttpService.postScanConfig({
72-
enable_auto_scan_host: isAutoScan,
73-
enable_auto_scan_workload: isAutoScan,
72+
auto_scan: isAutoScan,
7473
});
7574
};
7675

admin/webapp/websrc/app/routes/containers/containers.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,9 @@ export class ContainersComponent implements OnInit, OnDestroy {
133133
this.scanService.getScanConfig().subscribe({
134134
next: (config: ScanConfig) => {
135135
this.autoScan.setValue(
136-
config.enable_auto_scan_workload || (config.auto_scan as boolean)
136+
config.enable_auto_scan_workload != null
137+
? config.enable_auto_scan_workload
138+
: (config.auto_scan as boolean)
137139
);
138140
this.autoScanAuthorized = true;
139141
},

admin/webapp/websrc/app/routes/nodes/nodes.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,9 @@ export class NodesComponent implements OnInit, OnDestroy {
112112
this.scanService.getScanConfig().subscribe({
113113
next: (config: ScanConfig) => {
114114
this.autoScan.setValue(
115-
config.enable_auto_scan_host || (config.auto_scan as boolean)
115+
config.enable_auto_scan_host != null
116+
? config.enable_auto_scan_host
117+
: (config.auto_scan as boolean)
116118
);
117119
this.autoScanAuthorized = true;
118120
},

0 commit comments

Comments
 (0)