Merge branch 'dev' into release/v2.2.1

Author: jboddey

framework/python/src/common/testreport.py

@@ -284,7 +284,12 @@ def to_html(self):
 
     module_reports = self._module_reports
     env_module = Environment(loader=BaseLoader())
-    pages_num = self._pages_num(json_data)
+    manufacturer_length = len(json_data['device']['manufacturer'])
+    device_name_length = len(json_data['device']['model'])
+    title_length = manufacturer_length + device_name_length +1
+    tests_first_page = self._calculate_tests_first_page(title_length)
+    pages_num = self._pages_num(json_data, tests_first_page)
+
     module_templates = [
         env_module.from_string(s).render(
           name=current_test_pack.name,
@@ -310,11 +315,28 @@ def to_html(self):
                            steps_to_resolve=steps_to_resolve_,
                            module_reports=module_reports,
                            pages_num=pages_num,
-                           tests_first_page=TESTS_FIRST_PAGE,
+                           tests_first_page=tests_first_page,
                            tests_per_page=TESTS_PER_PAGE,
                            module_templates=module_templates
                            ))
 
+  def _calculate_tests_first_page(self, title_length):
+    # Calculation of test results lines at first page
+
+    # Average chars per line is 25
+    estimated_lines = title_length // 25
+    if title_length % 25 > 0:
+      estimated_lines += 1
+
+    if estimated_lines > 1:
+      # Line height is 60 px
+      title_px = (estimated_lines - 1) * 60
+      available_space_px = 445 - title_px
+      estimated_tests_first_page = available_space_px // 39
+      return min(estimated_tests_first_page, TESTS_FIRST_PAGE)
+    else:
+      return TESTS_FIRST_PAGE
+
   def _add_page_counter(self, html):
     # Add page nums and total page
     soup = BeautifulSoup(html, features='html5lib')
@@ -324,18 +346,18 @@ def _add_page_counter(self, html):
       div.string = f'Page {index+1}/{total_pages}'
     return str(soup)
 
-  def _pages_num(self, json_data):
+  def _pages_num(self, json_data, tests_first_page=TESTS_FIRST_PAGE):
 
     # Calculate pages
     test_count = len(json_data['tests']['results'])
 
     # Multiple pages required
-    if test_count > TESTS_FIRST_PAGE:
+    if test_count > tests_first_page:
       # First page
       pages = 1
 
       # Remaining testsgenerate
-      test_count -= TESTS_FIRST_PAGE
+      test_count -= tests_first_page
       pages += (int)(test_count / TESTS_PER_PAGE)
       pages = pages + 1 if test_count % TESTS_PER_PAGE > 0 else pages
 

framework/python/src/core/session.py

@@ -453,6 +453,9 @@ def add_test_result(self, result):
         if len(result.description) != 0:
           test_result.description = result.description
 
+        # Add details to test result
+        test_result.details = result.details
+
         # Add recommendations if provided
         if result.recommendations is not None:
           test_result.recommendations = result.recommendations

framework/python/src/test_orc/test_case.py

@@ -28,12 +28,14 @@ class TestCase:  # pylint: disable=too-few-public-methods,too-many-instance-attr
   result: str = TestResult.NON_COMPLIANT
   recommendations: list = field(default_factory=lambda: [])
   optional_recommendations: list = field(default_factory=lambda: [])
+  details: str = ""
 
   def to_dict(self):
 
     test_dict = {
       "name": self.name,
       "description": self.description,
+      "details": self.details,
       "expected_behavior": self.expected_behavior,
       "required_result": self.required_result,
       "result": self.result
@@ -47,3 +49,6 @@ def to_dict(self):
       test_dict["optional_recommendations"] = self.optional_recommendations
 
     return test_dict
+
+  def __post_init__(self):
+    self.details = self.details.replace("\n", "", 1)

framework/python/src/test_orc/test_orchestrator.py

@@ -611,14 +611,18 @@ def _run_test_module(self, module):
           # Convert dict from json into TestCase object
           test_case = TestCase(name=test_result["name"],
                                result=test_result["result"],
-                               description=test_result["description"])
+                               description=test_result["description"]
+                               )
 
           # Add steps to resolve if test is non-compliant
           if (test_case.result == TestResult.NON_COMPLIANT
               and "recommendations" in test_result):
             test_case.recommendations = test_result["recommendations"]
           else:
             test_case.recommendations = []
+          # Add details to the test case if presented
+          if "details" in test_result:
+            test_case.details = test_result["details"]
 
           self.get_session().add_test_result(test_case)
 

modules/ui/src/app/components/list-layout/list-layout.component.html

@@ -38,10 +38,23 @@
         </mat-toolbar-row>
         <mat-toolbar-row>
           <div class="search-field">
-            <input (input)="updateQuery($event)" placeholder="Search" />
-            <mat-icon>search</mat-icon>
-          </div></mat-toolbar-row
-        >
+            <input
+              [value]="searchText()"
+              (input)="updateQuery($event)"
+              placeholder="Search" />
+            <button
+              *ngIf="searchText().length > 2; else searchIcon"
+              (click)="clearSearch()"
+              class="clear-search-button"
+              mat-icon-button
+              aria-label="Clear search">
+              <mat-icon>close</mat-icon>
+            </button>
+            <ng-template #searchIcon>
+              <mat-icon>search</mat-icon>
+            </ng-template>
+          </div>
+        </mat-toolbar-row>
       </mat-toolbar>
       <div class="entity-list-container">
         <section class="entity-list">

modules/ui/src/app/components/list-layout/list-layout.component.scss

@@ -112,6 +112,10 @@
   }
 }
 
+.clear-search-button {
+  margin-right: 10px;
+}
+
 ::ng-deep .using-mouse .search-field input:focus {
   outline: none;
 }

modules/ui/src/app/components/list-layout/list-layout.component.spec.ts

@@ -13,7 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
 import { ListLayoutComponent } from './list-layout.component';
 import { MatSidenavModule } from '@angular/material/sidenav';
 import { MatToolbarModule } from '@angular/material/toolbar';
@@ -22,6 +27,7 @@ import { MatButtonModule } from '@angular/material/button';
 import { ListItemComponent } from '../list-item/list-item.component';
 import { Component } from '@angular/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { By } from '@angular/platform-browser';
 
 interface Entity {
   id: number;
@@ -63,6 +69,7 @@ describe('ListLayoutComponent', () => {
   let component: HostComponent;
   let fixture: ComponentFixture<HostComponent>;
   let compiled: HTMLElement;
+  let listLayoutComponentInstance: ListLayoutComponent<Entity>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
@@ -79,6 +86,13 @@ describe('ListLayoutComponent', () => {
     fixture = TestBed.createComponent(HostComponent);
     component = fixture.componentInstance;
     compiled = fixture.nativeElement as HTMLElement;
+
+    const listLayoutDebugElement = fixture.debugElement.query(
+      By.directive(ListLayoutComponent)
+    );
+    listLayoutComponentInstance =
+      listLayoutDebugElement.componentInstance as ListLayoutComponent<Entity>;
+
     fixture.detectChanges();
   });
 
@@ -146,5 +160,46 @@ describe('ListLayoutComponent', () => {
 
       expect(listItemComponent.length).toEqual(2);
     });
+
+    it('clearSearch() should reset searchText to an empty string and clear input', fakeAsync(() => {
+      const searchInputElement = compiled.querySelector(
+        '.search-field input'
+      ) as HTMLInputElement;
+      expect(searchInputElement).toBeTruthy();
+
+      searchInputElement.value = 'testing';
+      searchInputElement.dispatchEvent(new Event('input'));
+      fixture.detectChanges();
+      tick();
+
+      // Verify ListLayoutComponent's internal searchText is updated
+      expect(listLayoutComponentInstance.searchText()).toBe('testing');
+
+      const buttonClearSearch = compiled.querySelector(
+        '.clear-search-button'
+      ) as HTMLButtonElement;
+      expect(buttonClearSearch).toBeTruthy();
+
+      buttonClearSearch.click();
+      fixture.detectChanges();
+      tick();
+
+      // Verify ListLayoutComponent's internal searchText is cleared
+      expect(listLayoutComponentInstance.searchText()).toBe('');
+
+      // Verify the input field in the DOM is also cleared
+      expect(searchInputElement.value).toBe('');
+
+      // Verify the clear button is gone and search icon is back
+      const clearButtonAfterClear = compiled.querySelector(
+        '.clear-search-button'
+      );
+      expect(clearButtonAfterClear).toBeNull();
+      const searchIcon = compiled.querySelector(
+        '.search-field mat-icon:not(button mat-icon)'
+      );
+      expect(searchIcon).toBeTruthy();
+      expect(searchIcon?.textContent?.trim()).toBe('search');
+    }));
   });
 });

modules/ui/src/app/components/list-layout/list-layout.component.ts

@@ -82,6 +82,10 @@ export class ListLayoutComponent<T extends object> {
     return this.actions();
   };
 
+  clearSearch(): void {
+    this.searchText.set('');
+  }
+
   updateQuery(e: Event) {
     const input = e.target as HTMLInputElement;
     const value = input.value;

modules/ui/src/app/model/testrun-status.ts

@@ -53,6 +53,7 @@ export interface IResult {
   description: string;
   result: string;
   recommendations?: string[];
+  details?: string;
   required_result: RequiredResult;
 }
 

modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.spec.ts

@@ -448,7 +448,7 @@ describe('DeviceQualificationFromComponent', () => {
         autoFocus: true,
         hasBackdrop: true,
         disableClose: true,
-        panelClass: ['simple-dialog', 'close-device'],
+        panelClass: ['simple-dialog', 'discard-dialog'],
       });
 
       openSpy.calls.reset();

modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.ts

@@ -476,7 +476,7 @@ export class DeviceQualificationFromComponent implements OnInit, AfterViewInit {
       autoFocus: true,
       hasBackdrop: true,
       disableClose: true,
-      panelClass: ['simple-dialog', 'close-device'],
+      panelClass: ['simple-dialog', 'discard-dialog'],
     });
 
     return dialogRef?.beforeClosed();

modules/ui/src/app/pages/general-settings/general-settings.component.html

@@ -95,11 +95,13 @@
         "></ng-container>
       <mat-divider></mat-divider>
     </section>
-    <mat-error
-      *ngIf="vm.isSubmitting && isFormError"
-      class="error-message-container">
-      <span>Both interfaces must have different values</span>
-    </mat-error>
+    <div class="section-item error-message-section">
+      <mat-error
+        *ngIf="vm.isSubmitting && isFormError"
+        class="error-message-container">
+        <span>Both interfaces must have different values</span>
+      </mat-error>
+    </div>
     <div class="setting-drawer-footer">
       <button
         mat-flat-button

modules/ui/src/app/pages/general-settings/general-settings.component.scss

@@ -37,11 +37,15 @@
   }
 }
 
+.section-item.error-message-section {
+  min-height: 20px;
+  padding-bottom: 0;
+}
+
 .error-message-container {
-  display: block;
-  margin-top: auto;
-  padding-bottom: 8px;
-  text-align: center;
+  display: flex;
+  align-items: flex-end;
+  grid-column: 2 / 4;
 }
 
 .message {

modules/ui/src/app/pages/general-settings/general-settings.store.ts

@@ -151,17 +151,20 @@ export class GeneralSettingsStore extends ComponentStore<SettingsComponentState>
     config: SystemConfig;
   }>(trigger$ => {
     return trigger$.pipe(
-      exhaustMap(trigger => {
-        return this.testRunService.createSystemConfig(trigger.config).pipe(
-          tap(() => {
-            this.store.dispatch(
-              AppActions.fetchSystemConfigSuccess({
-                systemConfig: trigger.config,
-              })
-            );
-            trigger.onSystemConfigUpdate();
-          })
-        );
+      withLatestFrom(this.systemConfig$),
+      exhaustMap(([trigger, currentConfig]) => {
+        return this.testRunService
+          .createSystemConfig({ ...currentConfig, ...trigger.config })
+          .pipe(
+            tap(() => {
+              this.store.dispatch(
+                AppActions.fetchSystemConfigSuccess({
+                  systemConfig: { ...currentConfig, ...trigger.config },
+                })
+              );
+              trigger.onSystemConfigUpdate();
+            })
+          );
       })
     );
   });

modules/ui/src/app/pages/testrun/components/test-result-dialog/test-result-dialog.component.html

@@ -31,6 +31,11 @@
     <ul class="info-steps-list">
       <li *ngFor="let point of data.testResult.recommendations">{{ point }}</li>
     </ul>
+    <div *ngIf="data.testResult.details" class="details-info">
+      <p class="info-label">Details</p>
+      <p class="info-details">{{ data.testResult.details }}</p>
+      <p></p>
+    </div>
   </section>
 </mat-dialog-content>
 <mat-dialog-actions align="end" class="actions-container">

modules/ui/src/app/pages/testrun/components/test-result-dialog/test-result-dialog.component.scss

@@ -86,14 +86,19 @@ mat-dialog-content.content-container {
   padding: 32px 48px;
 }
 
-.info-steps-list {
+.info-steps-list,
+.info-details {
   margin: 0;
   padding-left: 24px;
   font-size: 16px;
   line-height: 24px;
   letter-spacing: 0;
 }
 
+.details-info {
+  margin-top: 16px;
+}
+
 mat-dialog-actions.actions-container {
   padding: 18px 36px 26px;
 }