From 5e4f30bfd76504d0a3419d7389890f757bf212c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraj=20Ma=C5=BE=C3=A1ri?= Date: Mon, 11 Nov 2024 10:41:00 +0100 Subject: [PATCH] [NAB-327] - Release 2.0.0 - update lint versions to latest 8.13.0 - fix lint issues in dialog-refactor.component.ts and page-master.ts --- package.json | 6 +++--- .../dialogs/dialog-refactor/dialog-refactor.component.ts | 7 ++----- .../actions-mode/action-master/action-master.component.ts | 4 ++-- .../master-detail/main-master/main-master.component.ts | 4 ++-- .../{page-master.ts => page-master.component.ts} | 2 +- 5 files changed, 10 insertions(+), 13 deletions(-) rename src/app/modeler/components/master-detail/{page-master.ts => page-master.component.ts} (97%) diff --git a/package.json b/package.json index 36dc00c..9634962 100644 --- a/package.json +++ b/package.json @@ -107,11 +107,11 @@ "@types/jasminewd2": "~2.0.3", "@types/moment": "~2.13.0", "@types/node": "~12.12.29", - "@typescript-eslint/eslint-plugin": "5.11.0", - "@typescript-eslint/parser": "5.11.0", + "@typescript-eslint/eslint-plugin": "8.13.0", + "@typescript-eslint/parser": "8.13.0", "codelyzer": "^6.0.0", "cspell": "~5.18.4", - "eslint": "^8.2.0", + "eslint": "^8.13.0", "jasmine-core": "~3.6.0", "jasmine-reporters": "^2.3.2", "jasmine-spec-reporter": "~5.0.0", diff --git a/src/app/dialogs/dialog-refactor/dialog-refactor.component.ts b/src/app/dialogs/dialog-refactor/dialog-refactor.component.ts index cfd6d73..ac239d3 100644 --- a/src/app/dialogs/dialog-refactor/dialog-refactor.component.ts +++ b/src/app/dialogs/dialog-refactor/dialog-refactor.component.ts @@ -1,4 +1,4 @@ -import {Component, Inject, OnInit} from '@angular/core'; +import {Component, Inject} from '@angular/core'; import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import {FormControl, ValidatorFn, Validators} from '@angular/forms'; import {ModelService} from '../../modeler/services/model/model.service'; @@ -14,7 +14,7 @@ export interface DialogRefactorData { templateUrl: './dialog-refactor.component.html', styleUrls: ['./dialog-refactor.component.scss'] }) -export class DialogRefactorComponent implements OnInit { +export class DialogRefactorComponent { formControl: FormControl; result: string; @@ -31,9 +31,6 @@ export class DialogRefactorComponent implements OnInit { ]); } - ngOnInit(): void { - } - refactor() { if (this.formControl.valid) { this.result = this.formControl.value; diff --git a/src/app/modeler/actions-mode/action-master/action-master.component.ts b/src/app/modeler/actions-mode/action-master/action-master.component.ts index fb804a9..5763af5 100644 --- a/src/app/modeler/actions-mode/action-master/action-master.component.ts +++ b/src/app/modeler/actions-mode/action-master/action-master.component.ts @@ -1,5 +1,5 @@ import {Component, Injector, OnInit} from '@angular/core'; -import {PageMaster} from '../../components/master-detail/page-master'; +import {PageMasterComponent} from '../../components/master-detail/page-master.component'; import {ActionsModeService} from '../actions-mode.service'; import {Sort} from '@angular/material/sort'; import {DataActionsTool} from '../tools/data-actions-tool'; @@ -19,7 +19,7 @@ import {MasterItem} from '../action-editor/classes/master-item'; templateUrl: './action-master.component.html', styleUrl: './action-master.component.scss' }) -export class ActionMasterComponent extends PageMaster implements OnInit { +export class ActionMasterComponent extends PageMasterComponent implements OnInit { constructor(private _parentInjector: Injector, private _actionsModeService: ActionsModeService, diff --git a/src/app/modeler/components/master-detail/main-master/main-master.component.ts b/src/app/modeler/components/master-detail/main-master/main-master.component.ts index cadedf4..e81fcf6 100644 --- a/src/app/modeler/components/master-detail/main-master/main-master.component.ts +++ b/src/app/modeler/components/master-detail/main-master/main-master.component.ts @@ -1,12 +1,12 @@ import {Component, Injector, OnInit} from '@angular/core'; -import {PageMaster} from '../page-master'; +import {PageMasterComponent} from '../page-master.component'; @Component({ selector: 'nab-main-master', templateUrl: './main-master.component.html', styleUrl: './main-master.component.scss' }) -export class MainMasterComponent extends PageMaster implements OnInit { +export class MainMasterComponent extends PageMasterComponent implements OnInit { constructor() { super(); diff --git a/src/app/modeler/components/master-detail/page-master.ts b/src/app/modeler/components/master-detail/page-master.component.ts similarity index 97% rename from src/app/modeler/components/master-detail/page-master.ts rename to src/app/modeler/components/master-detail/page-master.component.ts index 1be4060..9f04133 100644 --- a/src/app/modeler/components/master-detail/page-master.ts +++ b/src/app/modeler/components/master-detail/page-master.component.ts @@ -7,7 +7,7 @@ import {PageEvent} from '@angular/material/paginator'; selector: 'nab-abstract-page-master-component', template: '' }) -export abstract class PageMaster extends AbstractMasterComponent implements OnInit { +export abstract class PageMasterComponent extends AbstractMasterComponent implements OnInit { @Input()protected _pageSize: number = 20; protected _pageIndex: number;