From 317cf3a4090d81e02022cd2da58d864a7ec5b5c9 Mon Sep 17 00:00:00 2001
From: Celie Valentiny <celiev@grworkspaces.internal>
Date: Wed, 3 Aug 2022 10:31:16 +0100
Subject: [PATCH 1/3] testing

---
 .../components/config-manager/config-manager.component.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config-editor/config-editor-ui/src/app/components/config-manager/config-manager.component.html b/config-editor/config-editor-ui/src/app/components/config-manager/config-manager.component.html
index e80607c67..1814af06a 100644
--- a/config-editor/config-editor-ui/src/app/components/config-manager/config-manager.component.html
+++ b/config-editor/config-editor-ui/src/app/components/config-manager/config-manager.component.html
@@ -57,7 +57,7 @@
                         </button>
                         </mat-menu>
                 </div>
-                <span *ngIf="(pullRequestPending$ | async).pull_request_pending === false && (releaseSubmitInFlight$ | async) === false; else prMessage">
+                <span *ngIf="(pullRequestPending$ | async)?.pull_request_pending === false && (releaseSubmitInFlight$ | async) === false; else prMessage">
                     <button [disabled]="(countChangesInRelease$ | async) === 0" class="button" mat-raised-button color="accent" title="Release Configs in PR" (click)="onRelease()">
                         RELEASE PR ({{ countChangesInRelease$ | async }})
                     </button>
@@ -67,7 +67,7 @@
                         <a mat-button 
                             color="accent" 
                             style="padding: 0"
-                            *ngIf="(pullRequestPending$ | async).pull_request_url !== undefined" 
+                            *ngIf="(pullRequestPending$ | async)?.pull_request_url !== undefined"
                             href="{{(pullRequestPending$ | async)?.pull_request_url}}"
                             rel="noopener noreferrer"
                             target="_blank">PR for release pending</a>

From 8aae2f6c1b701f45f03969cdb7ca0cd76343df37 Mon Sep 17 00:00:00 2001
From: Celie Valentiny <celiev@grworkspaces.internal>
Date: Wed, 3 Aug 2022 13:25:20 +0100
Subject: [PATCH 2/3] Adding tests for config manager

---
 config-editor/config-editor-ui/package.json   |   2 +-
 .../config-manager.component.html             |   4 +-
 .../config-manager.component.spec.ts          | 175 ++++++++++++++++++
 3 files changed, 178 insertions(+), 3 deletions(-)
 create mode 100644 config-editor/config-editor-ui/src/app/components/config-manager/config-manager.component.spec.ts

diff --git a/config-editor/config-editor-ui/package.json b/config-editor/config-editor-ui/package.json
index 3d448ee4e..7c14c037f 100644
--- a/config-editor/config-editor-ui/package.json
+++ b/config-editor/config-editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rule-editor.ui",
-  "version": "2.6.6-dev",
+  "version": "2.6.7-dev",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
diff --git a/config-editor/config-editor-ui/src/app/components/config-manager/config-manager.component.html b/config-editor/config-editor-ui/src/app/components/config-manager/config-manager.component.html
index 1814af06a..281c9c0b5 100644
--- a/config-editor/config-editor-ui/src/app/components/config-manager/config-manager.component.html
+++ b/config-editor/config-editor-ui/src/app/components/config-manager/config-manager.component.html
@@ -42,7 +42,7 @@
                     </a>
                     <a 
                         *ngIf="useImporters && (importers$ | async)?.config_importers.length > 1"
-                        mat-button 
+                        mat-button
                         [matMenuTriggerFor]="menu" 
                         color="primary" 
                         title="Import Config from Clipboard" >
@@ -55,7 +55,7 @@
                             mat-menu-item>
                             {{importer.importer_name | titlecase}} Importer
                         </button>
-                        </mat-menu>
+                    </mat-menu>
                 </div>
                 <span *ngIf="(pullRequestPending$ | async)?.pull_request_pending === false && (releaseSubmitInFlight$ | async) === false; else prMessage">
                     <button [disabled]="(countChangesInRelease$ | async) === 0" class="button" mat-raised-button color="accent" title="Release Configs in PR" (click)="onRelease()">
diff --git a/config-editor/config-editor-ui/src/app/components/config-manager/config-manager.component.spec.ts b/config-editor/config-editor-ui/src/app/components/config-manager/config-manager.component.spec.ts
new file mode 100644
index 000000000..57f1e0a70
--- /dev/null
+++ b/config-editor/config-editor-ui/src/app/components/config-manager/config-manager.component.spec.ts
@@ -0,0 +1,175 @@
+import { TestBed, waitForAsync } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { ConfigManagerComponent } from './config-manager.component';
+import { of } from 'rxjs';
+import { MatDialog } from '@angular/material/dialog';
+import { cold, getTestScheduler } from 'jasmine-marbles';
+import { EditorService } from '@app/services/editor.service';
+import { mockUiMetadataAlert } from 'testing/uiMetadataMap';
+import { AppConfigService } from '@app/services/app-config.service';
+import { PopupService } from '@app/services/popup.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { MatMenuModule } from '@angular/material/menu';
+import { By } from '@angular/platform-browser';
+import {MatMenuHarness} from '@angular/material/menu/testing';
+import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
+import {MatButtonHarness} from '@angular/material/button/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+
+class MatDialogMock {
+  open() {
+    return {
+      afterClosed: () => of(true)
+    }
+  }
+}
+
+function spyPropertyGetter<T, K extends keyof T>(
+  spyObj: jasmine.SpyObj<T>,
+  propName: K
+): jasmine.Spy<() => T[K]> {
+  return Object.getOwnPropertyDescriptor(spyObj, propName)?.get as jasmine.Spy<() => T[K]>;
+}
+
+fdescribe('ConfigManagerComponent', () => {
+  let mockRouter: any;
+  let mockEditorService: any;
+  let mockConfigStore: any;
+  let mockAppConfigService: any;
+
+  beforeEach(waitForAsync(() => {
+    const mockPopupService = jasmine.createSpyObj('PopupService', ['openNotification']);
+    const mockActivatedRoute = jasmine.createSpyObj('ActivatedRoute', [], {'queryParamMap': cold('x|', {x: { 'filter': ['general|unreleased']}})});
+    mockAppConfigService = jasmine.createSpyObj('AppConfigService', [], ['useImporters', 'blockingTimeout']);
+    mockRouter = jasmine.createSpyObj('Router', ['navigate']);
+    mockConfigStore = jasmine.createSpyObj(
+      'ConfigStoreService',
+      ['upgradeConfigInRelease', 'incrementChangesInRelease', 'moveConfigInRelease', 'addConfigToRelease', 'removeConfigFromRelease', 'loadPullRequestStatus', 'submitRelease', 'resetChangesInRelease', 'reloadStoreAndRelease', 'deleteConfig'],
+      ['sortedConfigs$', 'pullRequestPending$', 'releaseSubmitInFlight$', 'searchTerm$', 'release$', 'releaseHistory$', 'importers$', 'configManagerRowData$', 'isAnyFilterPresent$', 'countChangesInRelease$', 'serviceFilters$', 'serviceFilterConfig$', 'clipboardService']
+    );
+    
+    mockEditorService = jasmine.createSpyObj(
+      'EditorService',
+      ['getLatestFilters', 'onSaveSearch', 'onDeleteSearch'],
+      { 
+        'serviceName': 'test', 
+        'metaDataMap': mockUiMetadataAlert, 
+        'configStore': mockConfigStore, 
+        'searchHistoryService': { getSearchHistory: () => undefined }
+      }
+    );
+  
+    TestBed.configureTestingModule({
+      imports: [
+        MatMenuModule,
+        NoopAnimationsModule
+      ],
+      providers: [
+        { provide: MatDialog, useClass: MatDialogMock },
+        { provide: EditorService, useValue: mockEditorService },
+        { provide: AppConfigService, useValue: mockAppConfigService},
+        { provide: PopupService, useValue: mockPopupService},
+        { provide: ActivatedRoute, useValue: mockActivatedRoute},
+        { provide: Router, useValue: mockRouter},
+      ],
+      declarations: [
+        ConfigManagerComponent
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    // values needed in constructor and onInit
+    spyPropertyGetter(mockAppConfigService, 'useImporters').and.returnValue(true);
+    spyPropertyGetter(mockConfigStore, 'pullRequestPending$').and.returnValue(cold('x', { x: { pull_request_pending: false, pull_request_url: "hi"}}));
+    spyPropertyGetter(mockConfigStore, 'releaseSubmitInFlight$').and.returnValue(cold('x', { x: false} ));
+    spyPropertyGetter(mockConfigStore, 'countChangesInRelease$').and.returnValue(cold('x', { x: 2} ));
+    spyPropertyGetter(mockConfigStore, 'release$').and.returnValue(cold('x', {x: {}}));
+    spyPropertyGetter(mockConfigStore, 'sortedConfigs$').and.returnValue(cold('x', {x: {}}));
+    spyPropertyGetter(mockConfigStore, 'releaseHistory$').and.returnValue(cold('x', {x: {}}));
+    spyPropertyGetter(mockConfigStore, 'isAnyFilterPresent$').and.returnValue(cold('x|', {x: false}));
+    spyPropertyGetter(mockConfigStore, 'importers$').and.returnValue(cold('x', {x: {'config_importers': []}}));
+    spyPropertyGetter(mockConfigStore, 'serviceFilterConfig$').and.returnValue(cold('x', {x: {}}));
+  });
+
+  it('should create the config manager', () => {
+    const fixture = TestBed.createComponent(ConfigManagerComponent);
+    const component = fixture.debugElement.componentInstance;
+    fixture.detectChanges();
+    expect(component).toBeTruthy();
+  });
+
+  it('should add to search', () => {
+    const fixture = TestBed.createComponent(ConfigManagerComponent);
+    const component = fixture.debugElement.componentInstance;
+    fixture.detectChanges();
+    const search = fixture.debugElement.query(By.css('re-search'));
+    search.triggerEventHandler('searchTermChange', 'test');
+    expect(mockRouter.navigate).toHaveBeenCalledOnceWith(
+      ['test'], 
+      { queryParams: { search: 'test'}, queryParamsHandling: 'merge'}
+    );
+  });
+
+  it('should click checkbox', () => {
+    const fixture = TestBed.createComponent(ConfigManagerComponent);
+    const component = fixture.debugElement.componentInstance;
+    fixture.detectChanges();
+    mockEditorService.getLatestFilters.and.returnValue(['general|my_edits', 'general|unreleased']);
+    const checkboxes = fixture.debugElement.query(By.css('re-checkbox-filters'));
+    checkboxes.triggerEventHandler('selectedCheckbox', { name:'general|my_edits', checked: true });
+    expect(mockRouter.navigate).toHaveBeenCalledOnceWith(
+      ['test'], 
+      { queryParams: { filter: ['general|my_edits', 'general|unreleased']}, queryParamsHandling: 'merge'}
+    );
+  });
+
+  it('should make changes to release', () => {
+    const fixture = TestBed.createComponent(ConfigManagerComponent);
+    const component = fixture.debugElement.componentInstance;
+    fixture.detectChanges();
+    component.addToRelease("test_config");
+    expect(mockConfigStore.addConfigToRelease).toHaveBeenCalledOnceWith("test_config");
+    expect(mockConfigStore.incrementChangesInRelease).toHaveBeenCalledOnceWith();
+  })
+
+  it('editing features enabled by default', () => {
+    const fixture = TestBed.createComponent(ConfigManagerComponent);
+    fixture.detectChanges();
+    const pasteButton = fixture.debugElement.queryAll(By.css('.add-button'))[1];
+    expect(pasteButton).toBeTruthy();
+    expect(pasteButton.nativeElement.textContent).toEqual("content_paste");
+  })
+
+  it('importers correctly loaded: more than one', async() => {
+    spyPropertyGetter(mockConfigStore, 'importers$').and.returnValue(cold('x', {x: {config_importers: [{importer_name: "test1"}, {importer_name: "test2"}]}}));
+    const fixture = TestBed.createComponent(ConfigManagerComponent);
+    let loader = TestbedHarnessEnvironment.loader(fixture);
+    fixture.detectChanges();
+    getTestScheduler().flush();
+    let menu = await loader.getHarness(MatMenuHarness);
+    await menu.open();
+    let items= await menu.getItems();
+    expect(items.length).toEqual(2);
+    let item1 = await items[0].getText();
+    let item2 = await items[1].getText();
+    expect(item1).toEqual("Test1 Importer");
+    expect(item2).toEqual("Test2 Importer");
+  })
+
+  it('importers correctly loaded: one importer', async() => {
+    spyPropertyGetter(mockConfigStore, 'importers$').and.returnValue(cold('x', {x: {config_importers: [{importer_name: "test1"}]}}));
+    const fixture = TestBed.createComponent(ConfigManagerComponent);
+    const component = fixture.debugElement.componentInstance;
+    const importSpy = spyOn(component, 'onClickImport');
+    let loader = TestbedHarnessEnvironment.loader(fixture);
+    fixture.detectChanges();
+    getTestScheduler().flush();
+    const importButton = await loader.getHarness(MatButtonHarness.with({text: 'file_upload'}));
+    await importButton.click();
+    expect(importSpy).toHaveBeenCalledOnceWith(0);
+  })
+
+
+});
\ No newline at end of file

From 1b5009f0d9cdb2a89708413b7939cd65886ebffc Mon Sep 17 00:00:00 2001
From: Celie Valentiny <celiev@grworkspaces.internal>
Date: Thu, 4 Aug 2022 10:59:37 +0100
Subject: [PATCH 3/3] Small fix

---
 .../components/config-manager/config-manager.component.spec.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config-editor/config-editor-ui/src/app/components/config-manager/config-manager.component.spec.ts b/config-editor/config-editor-ui/src/app/components/config-manager/config-manager.component.spec.ts
index 57f1e0a70..27c533009 100644
--- a/config-editor/config-editor-ui/src/app/components/config-manager/config-manager.component.spec.ts
+++ b/config-editor/config-editor-ui/src/app/components/config-manager/config-manager.component.spec.ts
@@ -31,7 +31,7 @@ function spyPropertyGetter<T, K extends keyof T>(
   return Object.getOwnPropertyDescriptor(spyObj, propName)?.get as jasmine.Spy<() => T[K]>;
 }
 
-fdescribe('ConfigManagerComponent', () => {
+describe('ConfigManagerComponent', () => {
   let mockRouter: any;
   let mockEditorService: any;
   let mockConfigStore: any;