From 9d4355455f88b581ededa12abe2b4f33e3ea44d6 Mon Sep 17 00:00:00 2001 From: jacob Date: Tue, 21 Dec 2021 16:27:35 -0500 Subject: [PATCH] Fix precommit issues --- adam/flask_backend/app.py | 36 +++-- adam/paths.py | 1 + .../adam-angular-demo/.eslintrc.json | 145 ++++++++++++++++++ .../adam-angular-demo/.stylelintrc.json | 16 ++ .../src/app/app.component.spec.ts | 13 +- .../src/app/app.component.ts | 2 +- .../adam-angular-demo/src/app/app.module.ts | 21 ++- .../src/app/classes/main-object.ts | 1 - .../button/button.component.spec.ts | 6 +- .../app/components/button/button.component.ts | 8 +- .../header/header.component.spec.ts | 6 +- .../app/components/header/header.component.ts | 7 +- .../image-output.component.spec.ts | 6 +- .../image-output/image-output.component.ts | 14 +- .../object-results.component.spec.ts | 6 +- .../object-results.component.ts | 26 +--- .../panel-viewer.component.spec.ts | 6 +- .../panel-viewer/panel-viewer.component.ts | 19 +-- .../selector-parent.component.html | 4 +- .../selector-parent.component.spec.ts | 6 +- .../selector-parent.component.ts | 91 +++++++---- .../src/app/services/adam.service.spec.ts | 16 -- .../src/app/services/adam.service.ts | 39 ----- 23 files changed, 306 insertions(+), 189 deletions(-) create mode 100644 angular-viewer/adam-angular-demo/.eslintrc.json create mode 100644 angular-viewer/adam-angular-demo/.stylelintrc.json delete mode 100644 angular-viewer/adam-angular-demo/src/app/services/adam.service.spec.ts delete mode 100644 angular-viewer/adam-angular-demo/src/app/services/adam.service.ts diff --git a/adam/flask_backend/app.py b/adam/flask_backend/app.py index f78cde343..c28f2f5e2 100644 --- a/adam/flask_backend/app.py +++ b/adam/flask_backend/app.py @@ -27,11 +27,13 @@ def get_all_learners() -> Any: """Get all learner configurations which are prepared.""" return { - "learner_types": [ - possible_dir.name - for possible_dir in LEARNERS_DIR.iterdir() - if possible_dir.is_dir() - ] + "learner_types": sorted( + [ + possible_dir.name + for possible_dir in LEARNERS_DIR.iterdir() + if possible_dir.is_dir() + ] + ) } @@ -39,11 +41,13 @@ def get_all_learners() -> Any: def get_all_train_curriculum() -> Any: """Get all possible training curriculum.""" return { - "training_curriculum": [ - possible_dir.name - for possible_dir in TRAINING_CURRICULUM_DIR.iterdir() - if possible_dir.is_dir() - ] + "training_curriculum": sorted( + [ + possible_dir.name + for possible_dir in TRAINING_CURRICULUM_DIR.iterdir() + if possible_dir.is_dir() + ] + ), } @@ -51,11 +55,13 @@ def get_all_train_curriculum() -> Any: def get_all_test_curriculum() -> Any: """Get all available test curriculum.""" return { - "testing_curriculum": [ - possible_dir.name - for possible_dir in TESTING_CURRICULUM_DIR.iterdir() - if possible_dir.is_dir() - ] + "testing_curriculum": sorted( + [ + possible_dir.name + for possible_dir in TESTING_CURRICULUM_DIR.iterdir() + if possible_dir.is_dir() + ] + ) } diff --git a/adam/paths.py b/adam/paths.py index 9d508d2e7..beda3b18e 100644 --- a/adam/paths.py +++ b/adam/paths.py @@ -24,3 +24,4 @@ PRE_LEARN_FILE_NAME = "pre_decode.yaml" POST_LEARN_FILE_NAME = "post_decode.yaml" GENERATION_YAML_DIR_NAME = "generation_yaml" +CURRICULUM_INFO = "info.yaml" diff --git a/angular-viewer/adam-angular-demo/.eslintrc.json b/angular-viewer/adam-angular-demo/.eslintrc.json new file mode 100644 index 000000000..c65e183b0 --- /dev/null +++ b/angular-viewer/adam-angular-demo/.eslintrc.json @@ -0,0 +1,145 @@ +{ + "root": true, + "ignorePatterns": ["projects/**/*"], + "overrides": [ + { + "files": ["*.ts"], + "parserOptions": { + "project": [ + "tsconfig.app.json", + "tsconfig.spec.json", + "e2e/tsconfig.json" + ], + "createDefaultProgram": true + }, + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/recommended", + "plugin:import/errors", + "plugin:import/warnings", + "plugin:import/typescript", + "plugin:@angular-eslint/recommended", + "plugin:@angular-eslint/recommended--extra", + "prettier" + ], + "plugins": ["deprecation", "import", "jsdoc"], + "rules": { + "@angular-eslint/component-selector": [ + "error", + { "type": "element", "prefix": "app", "style": "kebab-case" } + ], + "@angular-eslint/directive-selector": [ + "error", + { "type": "attribute", "prefix": "app", "style": "camelCase" } + ], + "@angular-eslint/no-empty-lifecycle-method": "off", + "@angular-eslint/use-component-view-encapsulation": "error", + "@typescript-eslint/consistent-type-definitions": "error", + "@typescript-eslint/dot-notation": "off", + "@typescript-eslint/explicit-member-accessibility": [ + "off", + { "accessibility": "explicit" } + ], + "@typescript-eslint/member-ordering": [ + "error", + { + "default": { + "memberTypes": ["signature", "field", "constructor", "method"] + } + } + ], + "@typescript-eslint/naming-convention": [ + "error", + { + "selector": "variable", + "format": ["camelCase", "snake_case", "UPPER_CASE"] + } + ], + "@typescript-eslint/no-empty-function": [ + "error", + { "allow": ["constructors"] } + ], + "@typescript-eslint/no-inferrable-types": [ + "error", + { "ignoreParameters": true } + ], + "@typescript-eslint/no-non-null-assertion": "error", + "@typescript-eslint/no-this-alias": "error", + "@typescript-eslint/quotes": [ + "error", + "single", + { "avoidEscape": true } + ], + "capitalized-comments": [ + "error", + "always", + { "ignorePattern": "import", "ignoreConsecutiveComments": true } + ], + "consistent-return": "error", + "curly": ["error", "all"], + "default-case": "error", + "default-case-last": "error", + "deprecation/deprecation": "warn", + "eqeqeq": ["error", "always", { "null": "ignore" }], + "import/no-extraneous-dependencies": "error", + "import/no-internal-modules": "off", + "import/order": [ + "error", + { "alphabetize": { "order": "asc", "caseInsensitive": true } } + ], + "jsdoc/no-types": "error", + "new-parens": "off", + "no-alert": "error", + "no-bitwise": "error", + "no-console": ["error", { "allow": ["error", "warn"] }], + "no-duplicate-case": "error", + "no-duplicate-imports": "error", + "no-else-return": "error", + "no-empty-function": "off", + "no-eval": "error", + "no-extra-bind": "error", + "no-implicit-coercion": "error", + "no-implicit-globals": "error", + "no-implied-eval": "error", + "no-label-var": "error", + "no-lone-blocks": "error", + "no-lonely-if": "error", + "no-new-func": "error", + "no-param-reassign": "error", + "no-redeclare": "error", + "no-restricted-imports": ["error", "rxjs/Rx"], + "no-return-assign": "error", + "no-return-await": "error", + "no-script-url": "error", + "no-self-compare": "error", + "no-sequences": "error", + "no-shadow": "error", + "no-sparse-arrays": "error", + "no-template-curly-in-string": "error", + "no-throw-literal": "error", + "no-unreachable-loop": "error", + "no-unused-expressions": "error", + "no-unneeded-ternary": "error", + "no-use-before-define": "error", + "no-useless-backreference": "error", + "no-useless-concat": "error", + "no-useless-return": "error", + "no-var": "error", + "no-void": "error", + "prefer-object-spread": "error", + "quote-props": ["error", "as-needed"], + "sort-imports": [ + "error", + { "ignoreCase": true, "ignoreDeclarationSort": true } + ], + "spaced-comment": ["error", "always", { "exceptions": ["*"] }], + "strict": "error" + } + }, + { + "files": ["*.html"], + "extends": ["plugin:@angular-eslint/template/recommended"], + "rules": {} + } + ] +} diff --git a/angular-viewer/adam-angular-demo/.stylelintrc.json b/angular-viewer/adam-angular-demo/.stylelintrc.json new file mode 100644 index 000000000..97a3bf86a --- /dev/null +++ b/angular-viewer/adam-angular-demo/.stylelintrc.json @@ -0,0 +1,16 @@ +{ + "extends": ["stylelint-config-standard", "stylelint-config-idiomatic-order"], + "plugins": ["stylelint-order"], + "rules": { + "color-function-notation": "legacy", + "order/order": [ + "dollar-variables", + "custom-properties", + "at-rules", + "declarations", + { "type": "at-rule", "name": "supports" }, + { "type": "at-rule", "name": "media" }, + "rules" + ] + } +} diff --git a/angular-viewer/adam-angular-demo/src/app/app.component.spec.ts b/angular-viewer/adam-angular-demo/src/app/app.component.spec.ts index 158917ef4..d23a21ba6 100644 --- a/angular-viewer/adam-angular-demo/src/app/app.component.spec.ts +++ b/angular-viewer/adam-angular-demo/src/app/app.component.spec.ts @@ -1,13 +1,14 @@ -import { TestBed, async } from '@angular/core/testing'; +import { TestBed } from '@angular/core/testing'; +import { RouterTestingModule } from '@angular/router/testing'; import { AppComponent } from './app.component'; -import { FormsModule } from '@angular/forms'; describe('AppComponent', () => { - beforeEach(async(() => { - TestBed.configureTestingModule({ + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [RouterTestingModule], declarations: [AppComponent], }).compileComponents(); - })); + }); it('should create the app', () => { const fixture = TestBed.createComponent(AppComponent); @@ -15,7 +16,7 @@ describe('AppComponent', () => { expect(app).toBeTruthy(); }); - it(`should have as title 'adam-angular-demo'`, () => { + it("should have as title 'adam-angular-demo'", () => { const fixture = TestBed.createComponent(AppComponent); const app = fixture.componentInstance; expect(app.title).toEqual('adam-angular-demo'); diff --git a/angular-viewer/adam-angular-demo/src/app/app.component.ts b/angular-viewer/adam-angular-demo/src/app/app.component.ts index 9d84ec055..208590b21 100644 --- a/angular-viewer/adam-angular-demo/src/app/app.component.ts +++ b/angular-viewer/adam-angular-demo/src/app/app.component.ts @@ -1,5 +1,5 @@ -import { Component } from '@angular/core'; import { HttpClient } from '@angular/common/http'; +import { Component } from '@angular/core'; @Component({ selector: 'app-root', diff --git a/angular-viewer/adam-angular-demo/src/app/app.module.ts b/angular-viewer/adam-angular-demo/src/app/app.module.ts index 466f88bdd..51f9636d2 100644 --- a/angular-viewer/adam-angular-demo/src/app/app.module.ts +++ b/angular-viewer/adam-angular-demo/src/app/app.module.ts @@ -1,15 +1,17 @@ -import { BrowserModule } from '@angular/platform-browser'; +import { HttpClientModule } from '@angular/common/http'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { AppComponent } from './app.component'; -import { HeaderComponent } from './components/header/header.component'; +import { BrowserModule } from '@angular/platform-browser'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { SelectorParentComponent } from './components/selector-parent/selector-parent.component'; +import { ToastrModule } from 'ngx-toastr'; +import { AppComponent } from './app.component'; import { ButtonComponent } from './components/button/button.component'; +import { HeaderComponent } from './components/header/header.component'; import { ImageOutputComponent } from './components/image-output/image-output.component'; import { ObjectResultsComponent } from './components/object-results/object-results.component'; -import { HttpClientModule } from '@angular/common/http'; import { PanelViewerComponent } from './components/panel-viewer/panel-viewer.component'; +import { SelectorParentComponent } from './components/selector-parent/selector-parent.component'; @NgModule({ declarations: [ @@ -21,7 +23,14 @@ import { PanelViewerComponent } from './components/panel-viewer/panel-viewer.com ObjectResultsComponent, PanelViewerComponent, ], - imports: [FormsModule, BrowserModule, NgbModule, HttpClientModule], + imports: [ + FormsModule, + BrowserModule, + NgbModule, + HttpClientModule, + ToastrModule.forRoot(), + BrowserAnimationsModule, + ], providers: [], bootstrap: [AppComponent], }) diff --git a/angular-viewer/adam-angular-demo/src/app/classes/main-object.ts b/angular-viewer/adam-angular-demo/src/app/classes/main-object.ts index a6df69e3c..d22ecfd98 100644 --- a/angular-viewer/adam-angular-demo/src/app/classes/main-object.ts +++ b/angular-viewer/adam-angular-demo/src/app/classes/main-object.ts @@ -1,4 +1,3 @@ -import { subscribeOn } from 'rxjs/operators'; import { Features } from './features'; import { SubObject } from './sub-object'; diff --git a/angular-viewer/adam-angular-demo/src/app/components/button/button.component.spec.ts b/angular-viewer/adam-angular-demo/src/app/components/button/button.component.spec.ts index 3c712f846..cc6023559 100644 --- a/angular-viewer/adam-angular-demo/src/app/components/button/button.component.spec.ts +++ b/angular-viewer/adam-angular-demo/src/app/components/button/button.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ButtonComponent } from './button.component'; @@ -6,11 +6,11 @@ describe('ButtonComponent', () => { let component: ButtonComponent; let fixture: ComponentFixture; - beforeEach(async(() => { + beforeEach(async () => { TestBed.configureTestingModule({ declarations: [ButtonComponent], }).compileComponents(); - })); + }); beforeEach(() => { fixture = TestBed.createComponent(ButtonComponent); diff --git a/angular-viewer/adam-angular-demo/src/app/components/button/button.component.ts b/angular-viewer/adam-angular-demo/src/app/components/button/button.component.ts index 24661f2b2..1a52d0c02 100644 --- a/angular-viewer/adam-angular-demo/src/app/components/button/button.component.ts +++ b/angular-viewer/adam-angular-demo/src/app/components/button/button.component.ts @@ -1,18 +1,16 @@ -import { Component, OnInit, Output, EventEmitter } from '@angular/core'; +import { Component, EventEmitter, Output } from '@angular/core'; @Component({ selector: 'app-button', templateUrl: './button.component.html', styleUrls: ['./button.component.css'], }) -export class ButtonComponent implements OnInit { +export class ButtonComponent { @Output() btnClick = new EventEmitter(); constructor() {} - ngOnInit(): void {} - - OnClick() { + OnClick(): void { this.btnClick.emit(); } } diff --git a/angular-viewer/adam-angular-demo/src/app/components/header/header.component.spec.ts b/angular-viewer/adam-angular-demo/src/app/components/header/header.component.spec.ts index 550f4857c..8594ef2fe 100644 --- a/angular-viewer/adam-angular-demo/src/app/components/header/header.component.spec.ts +++ b/angular-viewer/adam-angular-demo/src/app/components/header/header.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { HeaderComponent } from './header.component'; @@ -6,11 +6,11 @@ describe('HeaderComponent', () => { let component: HeaderComponent; let fixture: ComponentFixture; - beforeEach(async(() => { + beforeEach(async () => { TestBed.configureTestingModule({ declarations: [HeaderComponent], }).compileComponents(); - })); + }); beforeEach(() => { fixture = TestBed.createComponent(HeaderComponent); diff --git a/angular-viewer/adam-angular-demo/src/app/components/header/header.component.ts b/angular-viewer/adam-angular-demo/src/app/components/header/header.component.ts index bdb5d4d84..a20ed197a 100644 --- a/angular-viewer/adam-angular-demo/src/app/components/header/header.component.ts +++ b/angular-viewer/adam-angular-demo/src/app/components/header/header.component.ts @@ -1,13 +1,10 @@ -import { Component, OnInit } from '@angular/core'; -import { NgbButtonsModule, NgbButtonLabel } from '@ng-bootstrap/ng-bootstrap'; +import { Component } from '@angular/core'; @Component({ selector: 'app-header', templateUrl: './header.component.html', styleUrls: ['./header.component.css'], }) -export class HeaderComponent implements OnInit { +export class HeaderComponent { constructor() {} - - ngOnInit(): void {} } diff --git a/angular-viewer/adam-angular-demo/src/app/components/image-output/image-output.component.spec.ts b/angular-viewer/adam-angular-demo/src/app/components/image-output/image-output.component.spec.ts index 3b876f696..67aaf1c7a 100644 --- a/angular-viewer/adam-angular-demo/src/app/components/image-output/image-output.component.spec.ts +++ b/angular-viewer/adam-angular-demo/src/app/components/image-output/image-output.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ImageOutputComponent } from './image-output.component'; @@ -6,11 +6,11 @@ describe('ImageOutputComponent', () => { let component: ImageOutputComponent; let fixture: ComponentFixture; - beforeEach(async(() => { + beforeEach(async () => { TestBed.configureTestingModule({ declarations: [ImageOutputComponent], }).compileComponents(); - })); + }); beforeEach(() => { fixture = TestBed.createComponent(ImageOutputComponent); diff --git a/angular-viewer/adam-angular-demo/src/app/components/image-output/image-output.component.ts b/angular-viewer/adam-angular-demo/src/app/components/image-output/image-output.component.ts index 96580a11e..a89019b37 100644 --- a/angular-viewer/adam-angular-demo/src/app/components/image-output/image-output.component.ts +++ b/angular-viewer/adam-angular-demo/src/app/components/image-output/image-output.component.ts @@ -1,17 +1,11 @@ -import { - Component, - Input, - OnInit, - SimpleChanges, - OnChanges, -} from '@angular/core'; +import { Component, Input, OnChanges, SimpleChanges } from '@angular/core'; @Component({ selector: 'app-image-output', templateUrl: './image-output.component.html', styleUrls: ['./image-output.component.css'], }) -export class ImageOutputComponent implements OnInit, OnChanges { +export class ImageOutputComponent implements OnChanges { @Input() imgSrc: [] = []; isImg = false; @@ -21,7 +15,7 @@ export class ImageOutputComponent implements OnInit, OnChanges { constructor() {} - ngOnChanges(changes: SimpleChanges) { + ngOnChanges(changes: SimpleChanges): void { this.imageArray = []; let tempObject; for (const propName of Object.keys(changes)) { @@ -37,6 +31,4 @@ export class ImageOutputComponent implements OnInit, OnChanges { } this.isImg = true; } - - ngOnInit(): void {} } diff --git a/angular-viewer/adam-angular-demo/src/app/components/object-results/object-results.component.spec.ts b/angular-viewer/adam-angular-demo/src/app/components/object-results/object-results.component.spec.ts index 626f520ad..2f85807b7 100644 --- a/angular-viewer/adam-angular-demo/src/app/components/object-results/object-results.component.spec.ts +++ b/angular-viewer/adam-angular-demo/src/app/components/object-results/object-results.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ObjectResultsComponent } from './object-results.component'; @@ -6,11 +6,11 @@ describe('ObjectResultsComponent', () => { let component: ObjectResultsComponent; let fixture: ComponentFixture; - beforeEach(async(() => { + beforeEach(async () => { TestBed.configureTestingModule({ declarations: [ObjectResultsComponent], }).compileComponents(); - })); + }); beforeEach(() => { fixture = TestBed.createComponent(ObjectResultsComponent); diff --git a/angular-viewer/adam-angular-demo/src/app/components/object-results/object-results.component.ts b/angular-viewer/adam-angular-demo/src/app/components/object-results/object-results.component.ts index 321aa9313..cac2636c0 100644 --- a/angular-viewer/adam-angular-demo/src/app/components/object-results/object-results.component.ts +++ b/angular-viewer/adam-angular-demo/src/app/components/object-results/object-results.component.ts @@ -1,30 +1,22 @@ -import { - Component, - OnInit, - Input, - SimpleChange, - SimpleChanges, - OnChanges, -} from '@angular/core'; -import { AdamService } from 'src/app/services/adam.service'; -import { MainObject } from 'src/app/classes/main-object'; -import { Features } from 'src/app/classes/features'; -import { SubObject } from 'src/app/classes/sub-object'; +import { Component, Input, OnChanges, SimpleChanges } from '@angular/core'; +import { Features } from '../../classes/features'; +import { MainObject } from '../../classes/main-object'; +import { SubObject } from '../../classes/sub-object'; @Component({ selector: 'app-object-results', templateUrl: './object-results.component.html', styleUrls: ['./object-results.component.css'], }) -export class ObjectResultsComponent implements OnInit, OnChanges { +export class ObjectResultsComponent implements OnChanges { @Input() outputObject; resultArray: Array = []; isObject = false; - constructor(private getResponseData: AdamService) {} + constructor() {} - ngOnChanges(changes: SimpleChanges) { + ngOnChanges(changes: SimpleChanges): void { let tempObject; for (const propName of Object.keys(changes)) { const chng = changes[propName]; @@ -45,7 +37,7 @@ export class ObjectResultsComponent implements OnInit, OnChanges { feat.name = element; tempMain.features.push(feat); }); - if (entry.hasOwnProperty('sub_objects')) { + if (entry.sub_objects) { entry.sub_objects.forEach((element) => { const subobject = new SubObject(); subobject.confidence = element.confidence; @@ -64,6 +56,4 @@ export class ObjectResultsComponent implements OnInit, OnChanges { this.isObject = true; } - - ngOnInit(): void {} } diff --git a/angular-viewer/adam-angular-demo/src/app/components/panel-viewer/panel-viewer.component.spec.ts b/angular-viewer/adam-angular-demo/src/app/components/panel-viewer/panel-viewer.component.spec.ts index 2dcd5ea9a..f5212bfc4 100644 --- a/angular-viewer/adam-angular-demo/src/app/components/panel-viewer/panel-viewer.component.spec.ts +++ b/angular-viewer/adam-angular-demo/src/app/components/panel-viewer/panel-viewer.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { PanelViewerComponent } from './panel-viewer.component'; @@ -6,11 +6,11 @@ describe('PanelViewerComponent', () => { let component: PanelViewerComponent; let fixture: ComponentFixture; - beforeEach(async(() => { + beforeEach(async () => { TestBed.configureTestingModule({ declarations: [PanelViewerComponent], }).compileComponents(); - })); + }); beforeEach(() => { fixture = TestBed.createComponent(PanelViewerComponent); diff --git a/angular-viewer/adam-angular-demo/src/app/components/panel-viewer/panel-viewer.component.ts b/angular-viewer/adam-angular-demo/src/app/components/panel-viewer/panel-viewer.component.ts index 0dc00b47c..1b9b62149 100644 --- a/angular-viewer/adam-angular-demo/src/app/components/panel-viewer/panel-viewer.component.ts +++ b/angular-viewer/adam-angular-demo/src/app/components/panel-viewer/panel-viewer.component.ts @@ -1,18 +1,11 @@ -import { - Component, - OnInit, - Input, - SimpleChanges, - OnChanges, -} from '@angular/core'; -import { TouchSequence } from 'selenium-webdriver'; +import { Component, Input, OnChanges, SimpleChanges } from '@angular/core'; @Component({ selector: 'app-panel-viewer', templateUrl: './panel-viewer.component.html', styleUrls: ['./panel-viewer.component.css'], }) -export class PanelViewerComponent implements OnInit, OnChanges { +export class PanelViewerComponent implements OnChanges { @Input() differencesObject; similarities = []; @@ -24,23 +17,20 @@ export class PanelViewerComponent implements OnInit, OnChanges { submit = false; constructor() {} - ngOnChanges(changes: SimpleChanges) { + ngOnChanges(changes: SimpleChanges): void { let tempObject; for (const propName of Object.keys(changes)) { const chng = changes[propName]; const cur = JSON.parse(JSON.stringify(chng.currentValue)); tempObject = cur; } - console.log('Differences change:', tempObject); - console.log(Object.keys(tempObject)); for (const key in tempObject) { if (key === 'similarities') { continue; } this.objectsArray.push(key); } - console.log(this.objectsArray); this.objectOne = this.objectsArray[0]; this.objectTwo = this.objectsArray[1]; @@ -49,9 +39,6 @@ export class PanelViewerComponent implements OnInit, OnChanges { this.objectTwoArray = tempObject[this.objectTwo]; this.similarities = tempObject.similarities; - console.log(this.objectOneArray); this.submit = true; } - - ngOnInit(): void {} } diff --git a/angular-viewer/adam-angular-demo/src/app/components/selector-parent/selector-parent.component.html b/angular-viewer/adam-angular-demo/src/app/components/selector-parent/selector-parent.component.html index 019f98e6b..925e97471 100644 --- a/angular-viewer/adam-angular-demo/src/app/components/selector-parent/selector-parent.component.html +++ b/angular-viewer/adam-angular-demo/src/app/components/selector-parent/selector-parent.component.html @@ -1,4 +1,4 @@ -
+
Choose Learner