merge integration to validation

os-climate · Jul 18, 2024 · c3be5ad · c3be5ad
2 parents ba2529a + 6a98202
commit c3be5ad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/app/modules/post-processings/post-processing-bundle/post-processing-bundle.component.ts b/src/app/modules/post-processings/post-processing-bundle/post-processing-bundle.component.ts
@@ -152,7 +152,7 @@ export class PostProcessingBundleComponent implements OnInit, OnDestroy {
       }
     });
 
-    // Add new array with filter on postProcessingWithoutSection
+    // Replace the new array with filter on postProcessingWithoutSection
     if (postProcessingWithoutSectionWithFilter.length > 0) {
       this.postProcessingWithoutSection = postProcessingWithoutSectionWithFilter
     }  

diff --git a/...dules/study-case/study-case-execution-logging/study-case-execution-logging.component.html b/...dules/study-case/study-case-execution-logging/study-case-execution-logging.component.html
@@ -44,7 +44,7 @@
       {{ memoryLoad }}
     </div>
     <button
-      *ngIf="!isCalculationRunning"
+      *ngIf="!isCalculationRunning && displayIconInfoMemoryCpu"
       mat-button
       [matTooltip]="'Last metrics recorded from file system. The memory unit is in ' + memoryUnit "
       color='accent'

diff --git a/...modules/study-case/study-case-execution-logging/study-case-execution-logging.component.ts b/...modules/study-case/study-case-execution-logging/study-case-execution-logging.component.ts
@@ -38,6 +38,7 @@ export class StudyCaseExecutionLoggingComponent implements OnInit, OnDestroy, Af
   public memoryLoad: string;
   public memoryUnit: string;
   public displayMemoryCpu: boolean;
+  public displayIconInfoMemoryCpu: boolean;
   public isCalculationRunning: boolean;
 
   public bottomAnchorLog: boolean;
@@ -70,6 +71,7 @@ export class StudyCaseExecutionLoggingComponent implements OnInit, OnDestroy, Af
     this.memoryLoad = '----';
     this.isCalculationRunning = false;
     this.displayMemoryCpu = false;
+    this.displayIconInfoMemoryCpu = false;
     this.memoryUnit = "";
   }
 
@@ -246,6 +248,7 @@ export class StudyCaseExecutionLoggingComponent implements OnInit, OnDestroy, Af
     if ((this.cpuLoad !== null && this.cpuLoad !== undefined && this.cpuLoad.length > 0) && (this.memoryLoad !== null && this.memoryLoad !== undefined && this.memoryLoad.length > 0)) {
       this.displayMemoryCpu = true;
       if (this.memoryLoad !== "----") {
+        this.displayIconInfoMemoryCpu = true;
         if (this.memoryLoad.includes("MB")) {
           this.memoryUnit = "Megabyte"
         }