From d9606cc8e226782337babe022a8d3f637378a2bb Mon Sep 17 00:00:00 2001 From: kurilova Date: Fri, 24 May 2024 08:48:24 +0000 Subject: [PATCH] Rename settings component --- modules/ui/src/app/app.component.html | 4 ++-- modules/ui/src/app/app.component.spec.ts | 2 +- modules/ui/src/app/app.component.ts | 4 ++-- modules/ui/src/app/app.module.ts | 4 ++-- ...settings.component.html => settings.component.html} | 0 ...settings.component.scss => settings.component.scss} | 0 ...gs.component.spec.ts => settings.component.spec.ts} | 10 +++++----- ...ral-settings.component.ts => settings.component.ts} | 8 ++++---- 8 files changed, 16 insertions(+), 16 deletions(-) rename modules/ui/src/app/pages/settings/{general-settings.component.html => settings.component.html} (100%) rename modules/ui/src/app/pages/settings/{general-settings.component.scss => settings.component.scss} (100%) rename modules/ui/src/app/pages/settings/{general-settings.component.spec.ts => settings.component.spec.ts} (97%) rename modules/ui/src/app/pages/settings/{general-settings.component.ts => settings.component.ts} (96%) diff --git a/modules/ui/src/app/app.component.html b/modules/ui/src/app/app.component.html index 7cc5284ea..6a853db98 100644 --- a/modules/ui/src/app/app.component.html +++ b/modules/ui/src/app/app.component.html @@ -200,11 +200,11 @@

Testrun

position="end" autoFocus="#setting-panel-close-button" class="settings-drawer"> - - + { }); @Component({ - selector: 'app-general-settings', + selector: 'app-settings', template: '
', }) class FakeGeneralSettingsComponent { diff --git a/modules/ui/src/app/app.component.ts b/modules/ui/src/app/app.component.ts index 39e4789c6..97e017daf 100644 --- a/modules/ui/src/app/app.component.ts +++ b/modules/ui/src/app/app.component.ts @@ -30,7 +30,7 @@ import { updateFocusNavigation, } from './store/actions'; import { appFeatureKey } from './store/reducers'; -import { GeneralSettingsComponent } from './pages/settings/general-settings.component'; +import { SettingsComponent } from './pages/settings/settings.component'; import { AppStore } from './app.store'; import { TestRunService } from './services/test-run.service'; @@ -60,7 +60,7 @@ export class AppComponent { @ViewChild('toggleCertificatesBtn') public toggleCertificatesBtn!: HTMLButtonElement; @ViewChild('navigation') public navigation!: ElementRef; - @ViewChild('settings') public settings!: GeneralSettingsComponent; + @ViewChild('settings') public settings!: SettingsComponent; viewModel$ = this.appStore.viewModel$; constructor( diff --git a/modules/ui/src/app/app.module.ts b/modules/ui/src/app/app.module.ts index 26c16c693..2f0e5b277 100644 --- a/modules/ui/src/app/app.module.ts +++ b/modules/ui/src/app/app.module.ts @@ -26,7 +26,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; -import { GeneralSettingsComponent } from './pages/settings/general-settings.component'; +import { SettingsComponent } from './pages/settings/settings.component'; import { ReactiveFormsModule } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatSnackBarModule } from '@angular/material/snack-bar'; @@ -50,7 +50,7 @@ import { CertificatesComponent } from './pages/certificates/certificates.compone import { LOADER_TIMEOUT_CONFIG_TOKEN } from './services/loaderConfig'; @NgModule({ - declarations: [AppComponent, GeneralSettingsComponent], + declarations: [AppComponent, SettingsComponent], imports: [ BrowserModule, AppRoutingModule, diff --git a/modules/ui/src/app/pages/settings/general-settings.component.html b/modules/ui/src/app/pages/settings/settings.component.html similarity index 100% rename from modules/ui/src/app/pages/settings/general-settings.component.html rename to modules/ui/src/app/pages/settings/settings.component.html diff --git a/modules/ui/src/app/pages/settings/general-settings.component.scss b/modules/ui/src/app/pages/settings/settings.component.scss similarity index 100% rename from modules/ui/src/app/pages/settings/general-settings.component.scss rename to modules/ui/src/app/pages/settings/settings.component.scss diff --git a/modules/ui/src/app/pages/settings/general-settings.component.spec.ts b/modules/ui/src/app/pages/settings/settings.component.spec.ts similarity index 97% rename from modules/ui/src/app/pages/settings/general-settings.component.spec.ts rename to modules/ui/src/app/pages/settings/settings.component.spec.ts index 8095468fd..3cb50e23a 100644 --- a/modules/ui/src/app/pages/settings/general-settings.component.spec.ts +++ b/modules/ui/src/app/pages/settings/settings.component.spec.ts @@ -15,7 +15,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { GeneralSettingsComponent } from './general-settings.component'; +import { SettingsComponent } from './settings.component'; import { of } from 'rxjs'; import { MatRadioModule } from '@angular/material/radio'; import { ReactiveFormsModule } from '@angular/forms'; @@ -39,8 +39,8 @@ import { import { SettingsDropdownComponent } from './components/settings-dropdown/settings-dropdown.component'; describe('GeneralSettingsComponent', () => { - let component: GeneralSettingsComponent; - let fixture: ComponentFixture; + let component: SettingsComponent; + let fixture: ComponentFixture; let mockLiveAnnouncer: SpyObj; let compiled: HTMLElement; let mockLoaderService: SpyObj; @@ -60,7 +60,7 @@ describe('GeneralSettingsComponent', () => { await TestBed.configureTestingModule({ declarations: [ - GeneralSettingsComponent, + SettingsComponent, FakeSpinnerComponent, FakeCalloutComponent, ], @@ -86,7 +86,7 @@ describe('GeneralSettingsComponent', () => { TestBed.overrideProvider(SettingsStore, { useValue: mockSettingsStore }); - fixture = TestBed.createComponent(GeneralSettingsComponent); + fixture = TestBed.createComponent(SettingsComponent); component = fixture.componentInstance; component.viewModel$ = of({ diff --git a/modules/ui/src/app/pages/settings/general-settings.component.ts b/modules/ui/src/app/pages/settings/settings.component.ts similarity index 96% rename from modules/ui/src/app/pages/settings/general-settings.component.ts rename to modules/ui/src/app/pages/settings/settings.component.ts index 3698d3f34..1f9b4f62a 100644 --- a/modules/ui/src/app/pages/settings/general-settings.component.ts +++ b/modules/ui/src/app/pages/settings/settings.component.ts @@ -35,14 +35,14 @@ import { SettingsStore } from './settings.store'; import { LoaderService } from '../../services/loader.service'; @Component({ - selector: 'app-general-settings', - templateUrl: './general-settings.component.html', - styleUrls: ['./general-settings.component.scss'], + selector: 'app-settings', + templateUrl: './settings.component.html', + styleUrls: ['./settings.component.scss'], hostDirectives: [CdkTrapFocus], providers: [SettingsStore], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class GeneralSettingsComponent implements OnInit, OnDestroy { +export class SettingsComponent implements OnInit, OnDestroy { @ViewChild('reloadSettingLink') public reloadSettingLink!: ElementRef; @Output() closeSettingEvent = new EventEmitter();