Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Hide realm picker for non-admin users (#2872)

Koenccc1aa840e61
diff --git a/ui/app/manager/test/test.setup.ts b/ui/app/manager/test/test.setup.ts
index 354a54831..52c008900 100644
--- a/ui/app/manager/test/test.setup.ts
+++ b/ui/app/manager/test/test.setup.ts
@@ -81,4 +81,6 @@ setup(`Login as "smartcity" user`, async ({ page, manager, context }) => {
await manager.login("smartcity");
await page.waitForURL("**/manager/**");
await context.storageState({ path: userStatePath });
+ await expect(page.getByRole("menuitem", { name: "More options" })).toBeVisible();
+ await expect(page.locator("#realm-picker")).not.toBeVisible();
});
diff --git a/ui/component/or-app/src/or-header.ts b/ui/component/or-app/src/or-header.ts
index 6ef53e54e..015715725 100644
--- a/ui/component/or-app/src/or-header.ts
+++ b/ui/component/or-app/src/or-header.ts
@@ -403,12 +403,13 @@ export class OrHeader extends LitElement {
}
protected _getRealmMenu(callback: (realm: string) => void): TemplateResult {
+ if (!manager.isSuperUser()) return html``;
const currentRealm = this.realms.find((t) => t.name === this.realm);
const items = this.realms.map(r => ({value: r.name, label: r.displayName}));
+
return html`
- <or-vaadin-select id="realm-picker" .items=${items} .value=${currentRealm?.name}
- ?readonly=${!manager.isSuperUser()} ?disabled=${(items?.length ?? 0) <= 1}
+ <or-vaadin-select id="realm-picker" .items=${items} .value=${currentRealm?.name} ?disabled=${(items?.length ?? 0) <= 1}
@change="${(ev: CustomEvent) => callback((ev.currentTarget as OrVaadinSelect).value)}"
></or-vaadin-select>
`;