diff --git a/springwolf-examples/e2e/util/page_object.ts b/springwolf-examples/e2e/util/page_object.ts index e44399319..e4a727684 100644 --- a/springwolf-examples/e2e/util/page_object.ts +++ b/springwolf-examples/e2e/util/page_object.ts @@ -2,13 +2,11 @@ import { Locator, Page } from "@playwright/test"; export function locateChannels(locator: Page | Locator) { - return locator.locator("app-channels > mat-accordion"); - // return locator.locator("section#channels article"); // for new ui + return locator.locator("section#channels article"); } export function locateChannelItems(locator: Page | Locator) { - return locator.locator("app-channels > mat-accordion > mat-expansion-panel"); - // return locator.locator("section#channels article > mat-card"); // for new ui + return locator.locator("section#channels article > mat-card"); } export function locateChannel( @@ -18,9 +16,8 @@ export function locateChannel( action: string, payload: string ) { - return locator.getByTestId( - // return locator.locator( // for new ui - "channel-" + protocol + "-" + channelName + "-" + action + "-" + payload + return locator.locator( + "#channel-" + protocol + "-" + channelName + "-" + action + "-" + payload ); } diff --git a/springwolf-ui/src/app/components/header/header.component.ts b/springwolf-ui/src/app/components/header/header.component.ts index 4652958fb..cdad3a66c 100644 --- a/springwolf-ui/src/app/components/header/header.component.ts +++ b/springwolf-ui/src/app/components/header/header.component.ts @@ -9,7 +9,7 @@ import { AsyncApiService } from "../../service/asyncapi/asyncapi.service"; styleUrls: ["./header.component.css"], }) export class HeaderComponent implements OnInit { - isNewUi: boolean = false; + isNewUi: boolean = true; title: string = ""; constructor( diff --git a/springwolf-ui/src/app/service/ui.service.ts b/springwolf-ui/src/app/service/ui.service.ts index d148199d9..d3470e25e 100644 --- a/springwolf-ui/src/app/service/ui.service.ts +++ b/springwolf-ui/src/app/service/ui.service.ts @@ -6,7 +6,7 @@ import { BehaviorSubject } from "rxjs"; providedIn: "root", }) export class UiService { - private _isNewUi = new BehaviorSubject(false); + private _isNewUi = new BehaviorSubject(true); isNewUi$ = this._isNewUi.asObservable(); toggleIsNewUi(value: boolean) {