diff --git a/frontend/projects/upgrade/src/app/features/dashboard/feature-flags/pages/feature-flag-details-page/feature-flag-details-page-header/feature-flag-details-page-header.component.html b/frontend/projects/upgrade/src/app/features/dashboard/feature-flags/pages/feature-flag-details-page/feature-flag-details-page-header/feature-flag-details-page-header.component.html index 08a820d34b..0b6180b476 100644 --- a/frontend/projects/upgrade/src/app/features/dashboard/feature-flags/pages/feature-flag-details-page/feature-flag-details-page-header/feature-flag-details-page-header.component.html +++ b/frontend/projects/upgrade/src/app/features/dashboard/feature-flags/pages/feature-flag-details-page/feature-flag-details-page-header/feature-flag-details-page-header.component.html @@ -1,5 +1,5 @@ - +> diff --git a/frontend/projects/upgrade/src/app/features/dashboard/feature-flags/pages/feature-flag-details-page/feature-flag-details-page-header/feature-flag-details-page-header.component.ts b/frontend/projects/upgrade/src/app/features/dashboard/feature-flags/pages/feature-flag-details-page/feature-flag-details-page-header/feature-flag-details-page-header.component.ts index f49b02ef6e..bad4626bac 100644 --- a/frontend/projects/upgrade/src/app/features/dashboard/feature-flags/pages/feature-flag-details-page/feature-flag-details-page-header/feature-flag-details-page-header.component.ts +++ b/frontend/projects/upgrade/src/app/features/dashboard/feature-flags/pages/feature-flag-details-page/feature-flag-details-page-header/feature-flag-details-page-header.component.ts @@ -1,10 +1,10 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { CommonDetailsPageHeaderContainerComponent } from '../../../../../../shared-standalone-component-lib/components/'; +import { CommonDetailsPageHeaderComponent } from '../../../../../../shared-standalone-component-lib/components'; @Component({ selector: 'app-feature-flag-details-page-header', standalone: true, - imports: [CommonDetailsPageHeaderContainerComponent], + imports: [CommonDetailsPageHeaderComponent], templateUrl: './feature-flag-details-page-header.component.html', styleUrl: './feature-flag-details-page-header.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/frontend/projects/upgrade/src/app/features/dashboard/feature-flags/pages/feature-flag-root-page/feature-flag-root-page-header/feature-flag-root-page-header.component.html b/frontend/projects/upgrade/src/app/features/dashboard/feature-flags/pages/feature-flag-root-page/feature-flag-root-page-header/feature-flag-root-page-header.component.html index 690536fb25..70d763ad79 100644 --- a/frontend/projects/upgrade/src/app/features/dashboard/feature-flags/pages/feature-flag-root-page/feature-flag-root-page-header/feature-flag-root-page-header.component.html +++ b/frontend/projects/upgrade/src/app/features/dashboard/feature-flags/pages/feature-flag-root-page/feature-flag-root-page-header/feature-flag-root-page-header.component.html @@ -1,4 +1,4 @@ - +> diff --git a/frontend/projects/upgrade/src/app/features/dashboard/feature-flags/pages/feature-flag-root-page/feature-flag-root-page-header/feature-flag-root-page-header.component.ts b/frontend/projects/upgrade/src/app/features/dashboard/feature-flags/pages/feature-flag-root-page/feature-flag-root-page-header/feature-flag-root-page-header.component.ts index 80dfc20fb9..dbfc977bf7 100644 --- a/frontend/projects/upgrade/src/app/features/dashboard/feature-flags/pages/feature-flag-root-page/feature-flag-root-page-header/feature-flag-root-page-header.component.ts +++ b/frontend/projects/upgrade/src/app/features/dashboard/feature-flags/pages/feature-flag-root-page/feature-flag-root-page-header/feature-flag-root-page-header.component.ts @@ -1,10 +1,10 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { CommonRootPageHeaderContainerComponent } from '../../../../../../shared-standalone-component-lib/components/'; +import { CommonRootPageHeaderComponent } from '../../../../../../shared-standalone-component-lib/components'; @Component({ selector: 'app-feature-flag-root-page-header', standalone: true, - imports: [CommonRootPageHeaderContainerComponent], + imports: [CommonRootPageHeaderComponent], templateUrl: './feature-flag-root-page-header.component.html', styleUrl: './feature-flag-root-page-header.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header-container/common-details-page-header-container.component.html b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header/common-details-page-header.component.html similarity index 84% rename from frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header-container/common-details-page-header-container.component.html rename to frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header/common-details-page-header.component.html index ac221b8dd9..e62db661d1 100644 --- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header-container/common-details-page-header-container.component.html +++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header/common-details-page-header.component.html @@ -1,4 +1,4 @@ - +
{{ rootName | translate }} > diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header-container/common-details-page-header-container.component.scss b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header/common-details-page-header.component.scss similarity index 91% rename from frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header-container/common-details-page-header-container.component.scss rename to frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header/common-details-page-header.component.scss index 0adb839e9d..2fc7504b6e 100644 --- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header-container/common-details-page-header-container.component.scss +++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header/common-details-page-header.component.scss @@ -1,4 +1,4 @@ -::ng-deep .header-container { +::ng-deep .header { margin-top: -25px; // drawer__main-content-header pushes the header down by 25px height: 64px; display: flex; diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header-container/common-details-page-header-container.component.ts b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header/common-details-page-header.component.ts similarity index 69% rename from frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header-container/common-details-page-header-container.component.ts rename to frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header/common-details-page-header.component.ts index 17131d2ce8..6875cc3b77 100644 --- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header-container/common-details-page-header-container.component.ts +++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header/common-details-page-header.component.ts @@ -9,22 +9,22 @@ import { RouterModule } from '@angular/router'; * Example usage: * * ``` - * + * > * ``` */ @Component({ - selector: 'app-common-details-page-header-container', + selector: 'app-common-details-page-header', standalone: true, imports: [CommonModule, TranslateModule, MatButton, RouterModule], - templateUrl: './common-details-page-header-container.component.html', - styleUrl: './common-details-page-header-container.component.scss', + templateUrl: './common-details-page-header.component.html', + styleUrl: './common-details-page-header.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, }) -export class CommonDetailsPageHeaderContainerComponent { +export class CommonDetailsPageHeaderComponent { @Input() rootName!: string; @Input() detailsName!: string; @Input() rootLink!: string; diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header/common-details-page-header.spec.ts b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header/common-details-page-header.spec.ts new file mode 100644 index 0000000000..611a497a23 --- /dev/null +++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-details-page-header/common-details-page-header.spec.ts @@ -0,0 +1,22 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CommonDetailsPageHeaderComponent } from './common-details-page-header.component'; + +xdescribe('CommonDetailsPageHeaderComponent', () => { + let component: CommonDetailsPageHeaderComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [CommonDetailsPageHeaderComponent], + }).compileComponents(); + + fixture = TestBed.createComponent(CommonDetailsPageHeaderComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-page/common-page.component.html b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-page/common-page.component.html index d9d44aa781..726e48190e 100644 --- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-page/common-page.component.html +++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-page/common-page.component.html @@ -1,8 +1,8 @@ -
-
+
+
-
+
diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-page/common-page.component.scss b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-page/common-page.component.scss index d0f1f7d633..06e20ae25f 100644 --- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-page/common-page.component.scss +++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-page/common-page.component.scss @@ -1,4 +1,4 @@ -.common-page-container { +.common-page { display: flex; flex-direction: column; width: 100%; diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-page/common-page.component.ts b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-page/common-page.component.ts index d2485e1406..8f1f68fd42 100644 --- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-page/common-page.component.ts +++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-page/common-page.component.ts @@ -5,7 +5,7 @@ import { TranslateModule } from '@ngx-translate/core'; /** * A component nested in this component can be displayed in the **header** or **content** slot. * The **header** slot should contain a component that wraps a **app-common-page-header**. - * The **content** slot should contain a component that wraps a **app-common-section-card-list**. + * The **content** slot should contain a component that wraps a list of **app-common-section-card**. * Simply nest the component and add the slot name as an attribute. * * Example usage: diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header-container/common-root-page-header-container.component.spec.ts b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header-container/common-root-page-header-container.component.spec.ts deleted file mode 100644 index 8e7452112e..0000000000 --- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header-container/common-root-page-header-container.component.spec.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { CommonRootPageHeaderContainerComponent } from './common-root-page-header-container.component'; - -xdescribe('CommonRootPageHeaderContainerComponent', () => { - let component: CommonRootPageHeaderContainerComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [CommonRootPageHeaderContainerComponent], - }).compileComponents(); - - fixture = TestBed.createComponent(CommonRootPageHeaderContainerComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header-container/common-root-page-header-container.component.html b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header/common-root-page-header.component.html similarity index 77% rename from frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header-container/common-root-page-header-container.component.html rename to frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header/common-root-page-header.component.html index 4c4fa9e6d3..bc224c9aad 100644 --- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header-container/common-root-page-header-container.component.html +++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header/common-root-page-header.component.html @@ -1,4 +1,4 @@ - +

{{ title | translate }}

{{ subtitle | translate }}

 diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header-container/common-root-page-header-container.component.scss b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header/common-root-page-header.component.scss similarity index 93% rename from frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header-container/common-root-page-header-container.component.scss rename to frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header/common-root-page-header.component.scss index 3b0aeef3f6..c01af3a03c 100644 --- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header-container/common-root-page-header-container.component.scss +++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header/common-root-page-header.component.scss @@ -1,4 +1,4 @@ -::ng-deep .header-container { +::ng-deep .header { // TODO: Remove the drawer__main-content-header element from dashboard-root.component.html and update the existing root page styles (e.g., height and margin in home.component.scss) margin-top: -25px; // drawer__main-content-header pushes the header down by 25px height: 112px; diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header/common-root-page-header.component.spec.ts b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header/common-root-page-header.component.spec.ts new file mode 100644 index 0000000000..8930eb3bd2 --- /dev/null +++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header/common-root-page-header.component.spec.ts @@ -0,0 +1,22 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CommonRootPageHeaderComponent } from './common-root-page-header.component'; + +xdescribe('CommonRootPageHeaderComponent', () => { + let component: CommonRootPageHeaderComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [CommonRootPageHeaderComponent], + }).compileComponents(); + + fixture = TestBed.createComponent(CommonRootPageHeaderComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header-container/common-root-page-header-container.component.ts b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header/common-root-page-header.component.ts similarity index 60% rename from frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header-container/common-root-page-header-container.component.ts rename to frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header/common-root-page-header.component.ts index 6a792249af..a27a6ffc1a 100644 --- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header-container/common-root-page-header-container.component.ts +++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-root-page-header/common-root-page-header.component.ts @@ -9,18 +9,18 @@ import { TranslateModule } from '@ngx-translate/core'; * Example usage: * * ``` - * + * * ``` */ @Component({ - selector: 'app-common-root-page-header-container', + selector: 'app-common-root-page-header', standalone: true, imports: [CommonModule, TranslateModule, MatButton], - templateUrl: './common-root-page-header-container.component.html', - styleUrl: './common-root-page-header-container.component.scss', + templateUrl: './common-root-page-header.component.html', + styleUrl: './common-root-page-header.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, }) -export class CommonRootPageHeaderContainerComponent { +export class CommonRootPageHeaderComponent { @Input() title!: string; @Input() subtitle!: string; } diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-section-card/common-section-card.component.html b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-section-card/common-section-card.component.html index 53705852ad..f3119c9575 100644 --- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-section-card/common-section-card.component.html +++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-section-card/common-section-card.component.html @@ -1,11 +1,11 @@ -
-
+
+
-
+
-
+
diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-section-card/common-section-card.component.scss b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-section-card/common-section-card.component.scss index bdaef32580..4b531f5f94 100644 --- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-section-card/common-section-card.component.scss +++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-section-card/common-section-card.component.scss @@ -1,4 +1,4 @@ -::ng-deep .common-section-card-container { +::ng-deep .common-section-card { width: 100%; border: 1px solid var(--light-grey); border-radius: 4px; diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-section-card/common-section-card.component.ts b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-section-card/common-section-card.component.ts index 8cc3d04ffd..1d8390aae5 100644 --- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-section-card/common-section-card.component.ts +++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-section-card/common-section-card.component.ts @@ -1,5 +1,5 @@ import { CommonModule } from '@angular/common'; -import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; /** diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/index.ts b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/index.ts index 20065ac4c3..b22208ab31 100644 --- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/index.ts +++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/index.ts @@ -1,11 +1,11 @@ import { CommonPageComponent } from './common-page/common-page.component'; -import { CommonRootPageHeaderContainerComponent } from './common-root-page-header-container/common-root-page-header-container.component'; -import { CommonDetailsPageHeaderContainerComponent } from './common-details-page-header-container/common-details-page-header-container.component'; +import { CommonRootPageHeaderComponent } from './common-root-page-header/common-root-page-header.component'; +import { CommonDetailsPageHeaderComponent } from './common-details-page-header/common-details-page-header.component'; import { CommonSectionCardListComponent } from './common-section-card-list/common-section-card-list.component'; export { CommonPageComponent, - CommonRootPageHeaderContainerComponent, - CommonDetailsPageHeaderContainerComponent, + CommonRootPageHeaderComponent, + CommonDetailsPageHeaderComponent, CommonSectionCardListComponent, };