Skip to content

armgit / core

Public Imported from GitHub
0

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

UI Updates: Minor UI features, styling updates and bugfixes (#783)

Martin Peeters0aa95918e88f
diff --git a/manager/src/web/shared/locales/en/or.json b/manager/src/web/shared/locales/en/or.json
index f6fd721d5..671b6d710 100644
--- a/manager/src/web/shared/locales/en/or.json
+++ b/manager/src/web/shared/locales/en/or.json
@@ -245,6 +245,11 @@
"regularUser_plural": "Regular users",
"serviceUser_plural": "Service users",
"regenerateSecret": "Regenerate secret",
+ "generateSecretInfo": "A secret will be generated on user creation.",
+ "copySecret": "Copy Secret",
+ "copiedSecretToClipboard": "Copied the Secret to your clipboard!",
+ "clipboard": "Clipboard",
+ "savedSuccessfully": "saved successfully!",
"role": "Role",
"role_plural": "Roles",
"description": "Description",
diff --git a/manager/src/web/shared/locales/nl/or.json b/manager/src/web/shared/locales/nl/or.json
index 620e8a15a..3be62a456 100644
--- a/manager/src/web/shared/locales/nl/or.json
+++ b/manager/src/web/shared/locales/nl/or.json
@@ -244,6 +244,11 @@
"regularUser_plural": "Gebruikers",
"serviceUser_plural": "Service gebruikers",
"regenerateSecret": "Regenereer secret",
+ "generateSecretInfo": "Een secret wordt gegenereerd bij het maken van een gebruiker.",
+ "copySecret": "Kopieer secret",
+ "copiedSecretToClipboard": "Secret naar het klembord gekopieerd!",
+ "clipboard": "Klembord",
+ "savedSuccessfully": "succesvol opgeslagen!",
"role": "Rol",
"role_plural": "Rollen",
"description": "Omschrijving",
diff --git a/model/src/main/java/org/openremote/model/asset/UserAssetLink.java b/model/src/main/java/org/openremote/model/asset/UserAssetLink.java
index f1af3676b..f51133652 100644
--- a/model/src/main/java/org/openremote/model/asset/UserAssetLink.java
+++ b/model/src/main/java/org/openremote/model/asset/UserAssetLink.java
@@ -131,7 +131,7 @@ public class UserAssetLink {
@Formula("(select pa.NAME from ASSET a left outer join ASSET pa on a.PARENT_ID = pa.ID where a.ID = ASSET_ID)")
protected String parentAssetName;
- @Formula("(select u.USERNAME || ' (' || u.FIRST_NAME || ' ' || u.LAST_NAME || ')' from PUBLIC.USER_ENTITY u where u.ID = USER_ID)")
+ @Formula("(select u.USERNAME || CASE WHEN COALESCE(NULLIF(u.FIRST_NAME, ''), NULLIF(u.LAST_NAME, '')) IS NULL THEN '' ELSE ' (' END || COALESCE(u.FIRST_NAME, '') || CASE WHEN NULLIF(u.FIRST_NAME, '') IS NOT NULL AND NULLIF(u.LAST_NAME, '') IS NOT NULL THEN ' ' ELSE '' END || COALESCE(u.LAST_NAME, '') || CASE WHEN COALESCE(NULLIF(u.FIRST_NAME, ''), NULLIF(u.LAST_NAME, '')) IS NULL THEN '' ELSE ')' END from PUBLIC.USER_ENTITY u where u.ID = USER_ID)")
protected String userFullName;
protected UserAssetLink() {
diff --git a/ui/app/manager/src/index.ts b/ui/app/manager/src/index.ts
index 367135ef8..288bee110 100644
--- a/ui/app/manager/src/index.ts
+++ b/ui/app/manager/src/index.ts
@@ -22,7 +22,7 @@ import {
import "./pages/page-map";
import {PageMapConfig, pageMapProvider, pageMapReducer} from "./pages/page-map";
import "./pages/page-assets";
-import {PageAssetsConfig, pageAssetsProvider} from "./pages/page-assets";
+import {PageAssetsConfig, pageAssetsProvider, pageAssetsReducer} from "./pages/page-assets";
import "./pages/page-gateway";
import {pageGatewayProvider} from "./pages/page-gateway";
import "./pages/page-insights";
@@ -46,7 +46,8 @@ declare var CONFIG_URL_PREFIX: string;
const rootReducer = combineReducers({
app: appReducer,
- map: pageMapReducer
+ map: pageMapReducer,
+ assets: pageAssetsReducer
});
type RootState = ReturnType<typeof rootReducer>;
diff --git a/ui/app/manager/src/pages/page-assets.ts b/ui/app/manager/src/pages/page-assets.ts
index 0a57f0bfe..540558fb2 100644
--- a/ui/app/manager/src/pages/page-assets.ts
+++ b/ui/app/manager/src/pages/page-assets.ts
@@ -1,5 +1,5 @@
import {css, html, TemplateResult, unsafeCSS} from "lit";
-import {customElement, property, query} from "lit/decorators.js";
+import {customElement, property, query, state} from "lit/decorators.js";
import "@openremote/or-asset-viewer";
import {
OrAssetViewer,
@@ -18,11 +18,12 @@ import {
OrAssetTreeAssetEvent,
OrAssetTreeChangeParentEvent,
OrAssetTreeRequestSelectionEvent,
- OrAssetTreeSelectionEvent
+ OrAssetTreeSelectionEvent,
+ OrAssetTreeToggleExpandEvent,
} from "@openremote/or-asset-tree";
import manager, {DefaultBoxShadow, Util} from "@openremote/core";
import {AppStateKeyed, Page, PageProvider, router} from "@openremote/or-app";
-import {Store, createSelector} from "@reduxjs/toolkit";
+import {createSlice, Store, createSelector, PayloadAction} from "@reduxjs/toolkit";
import {showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
import i18next from "i18next";
import {AssetEventCause, WellknownAssets} from "@openremote/model";
@@ -34,24 +35,37 @@ export interface PageAssetsConfig {
viewer?: ViewerConfig;
tree?: AssetTreeConfig;
}
-
-export function pageAssetsProvider(store: Store<AppStateKeyed>, config?: PageAssetsConfig): PageProvider<AppStateKeyed> {
- return {
- name: "assets",
- routes: [
- "assets",
- "assets/:editMode",
- "assets/:editMode/:id"
- ],
- pageCreator: () => {
- const page = new PageAssets(store);
- if (config) {
- page.config = config;
+export interface AssetsState {
+ expandedParents: {realm: string, ids: string[]}[]
+}
+export interface AssetsStateKeyed extends AppStateKeyed {
+ assets: AssetsState;
+}
+const INITIAL_STATE: AssetsState = {
+ expandedParents: []
+};
+const pageAssetsSlice = createSlice({
+ name: "pageAssets",
+ initialState: INITIAL_STATE,
+ reducers: {
+ updateExpandedParents(state, action: PayloadAction<[string, boolean]>) {
+ const expandedParents = JSON.parse(JSON.stringify(state.expandedParents)); // copy state to prevent issues inserting it back
+ const expanded = expandedParents.find(x => x.realm == manager.displayRealm);
+ if(!expanded) {
+ expandedParents.push({ realm: manager.displayRealm, ids: []});
}
- return page;
+ const expandedId = expandedParents.findIndex(x => x.realm == manager.displayRealm);
+ if(!action.payload[1] && expanded.ids.includes(action.payload[0])) {
+ expandedParents[expandedId].ids = expanded.ids.filter((parent) => parent != action.payload[0]); // filter out collapsed ones
+ } else if(!expanded || (action.payload[1] && !expanded.ids.includes(action.payload[0]))) {
+ expandedParents[expandedId].ids.push(action.payload[0]); // add new extended ones
+ }
+ return { ...state, expandedParents: expandedParents }
}
- };
-}
+ }
+})
+const {updateExpandedParents} = pageAssetsSlice.actions;
+export const pageAssetsReducer = pageAssetsSlice.reducer;
export const PAGE_ASSETS_CONFIG_DEFAULT: PageAssetsConfig = {
tree: {
@@ -69,9 +83,26 @@ export const PAGE_ASSETS_CONFIG_DEFAULT: PageAssetsConfig = {
}
}
};
+export function pageAssetsProvider(store: Store<AssetsStateKeyed>, config?: PageAssetsConfig): PageProvider<AssetsStateKeyed> {
+ return {
+ name: "assets",
+ routes: [
+ "assets",
+ "assets/:editMode",
+ "assets/:editMode/:id"
+ ],
+ pageCreator: () => {
+ const page = new PageAssets(store);
+ if (config) {
+ page.config = config;
+ }
+ return page;
+ }
+ };
+}
@customElement("page-assets")
-export class PageAssets extends Page<AppStateKeyed> {
+export class PageAssets extends Page<AssetsStateKeyed> {
static get styles() {
// language=CSS
@@ -120,6 +151,9 @@ export class PageAssets extends Page<AppStateKeyed> {
@property()
protected _assetIds?: string[];
+ @state()
+ protected _expandedIds?: string[];
+
@query("#tree")
protected _tree!: OrAssetTree;
@@ -143,7 +177,7 @@ export class PageAssets extends Page<AppStateKeyed> {
}
)
- constructor(store: Store<AppStateKeyed>) {
+ constructor(store: Store<AssetsStateKeyed>) {
super(store);
this.addEventListener(OrAssetTreeRequestSelectionEvent.NAME, this._onAssetSelectionRequested);
this.addEventListener(OrAssetTreeSelectionEvent.NAME, this._onAssetSelectionChanged);
@@ -154,11 +188,18 @@ export class PageAssets extends Page<AppStateKeyed> {
this.addEventListener(OrAssetTreeAssetEvent.NAME, this._onAssetTreeAssetEvent);
this.addEventListener(OrAssetViewerChangeParentEvent.NAME, (ev) => this._onAssetParentChange(ev.detail));
this.addEventListener(OrAssetTreeChangeParentEvent.NAME, (ev) => this._onAssetParentChange(ev.detail));
+ this.addEventListener(OrAssetTreeToggleExpandEvent.NAME, this._onAssetExpandToggle);
}
+ public connectedCallback() {
+ super.connectedCallback();
+ this._expandedIds = this._store.getState().assets.expandedParents.find(x => x.realm == manager.displayRealm)?.ids;
+ }
+
+
protected render(): TemplateResult | void {
return html`
- <or-asset-tree id="tree" .config="${this.config && this.config.tree ? this.config.tree : PAGE_ASSETS_CONFIG_DEFAULT.tree}" class="${this._assetIds && this._assetIds.length === 1 ? "hideMobile" : ""}" .selectedIds="${this._assetIds}"></or-asset-tree>
+ <or-asset-tree id="tree" .config="${this.config && this.config.tree ? this.config.tree : PAGE_ASSETS_CONFIG_DEFAULT.tree}" class="${this._assetIds && this._assetIds.length === 1 ? "hideMobile" : ""}" .selectedIds="${this._assetIds}" .expandedIds="${this._expandedIds}"></or-asset-tree>
<or-asset-viewer id="viewer" .config="${this.config && this.config.viewer ? this.config.viewer : undefined}" class="${!this._assetIds || this._assetIds.length !== 1 ? "hideMobile" : ""}" .editMode="${this._editMode}"></or-asset-viewer>
`;
}
@@ -290,6 +331,10 @@ export class PageAssets extends Page<AppStateKeyed> {
}
}
+ protected _onAssetExpandToggle(event: OrAssetTreeToggleExpandEvent) {
+ this._store.dispatch(updateExpandedParents([ event.detail.node.asset.id, event.detail.node.expanded]));
+ }
+
protected _updateRoute(silent: boolean = true) {
const assetId = this._assetIds && this._assetIds.length === 1 ? this._assetIds[0] : undefined;
diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.ts
index 3bd34ea60..e3e47cace 100644
--- a/ui/app/manager/src/pages/page-users.ts
+++ b/ui/app/manager/src/pages/page-users.ts
@@ -107,6 +107,13 @@ export class PageUsers extends Page<AppStateKeyed> {
cursor: progress;
opacity: 0.4;
}
+
+ .table-actions-container {
+ text-align: right;
+ position: absolute;
+ right: 0;
+ margin: 2px;
+ }
td, th {
width: 25%
@@ -353,7 +360,7 @@ export class PageUsers extends Page<AppStateKeyed> {
}
}
} finally {
- this.loadUsers();
+ await this.loadUsers();
}
}
@@ -397,7 +404,7 @@ export class PageUsers extends Page<AppStateKeyed> {
await manager.rest.api.AssetResource.createUserAssetLinks(addedLinks);
}
}
-
+
private _deleteUser(user) {
showOkCancelDialog(i18next.t("delete"), i18next.t("deleteUserConfirm"), i18next.t("delete"))
.then((ok) => {
@@ -410,9 +417,15 @@ export class PageUsers extends Page<AppStateKeyed> {
private doDelete(user) {
manager.rest.api.UserResource.delete(manager.displayRealm, user.id).then(response => {
if (user.serviceAccount) {
- this._serviceUsers = [...this._serviceUsers.filter(u => u.id !== user.id)];
+ const elem = this.shadowRoot?.querySelector('#serviceuser-' + user.username);
+ this._toggleUserExpand(elem as HTMLTableRowElement, user).then(() => {
+ this._serviceUsers = [...this._serviceUsers.filter(u => u.id !== user.id)];
+ });
} else {
- this._users = [...this._users.filter(u => u.id !== user.id)];
+ const elem = this.shadowRoot?.querySelector('#user-' + user.username);
+ this._toggleUserExpand(elem as HTMLTableRowElement, user).then(() => {
+ this._users = [...this._users.filter(u => u.id !== user.id)];
+ });
}
})
}
@@ -486,9 +499,7 @@ export class PageUsers extends Page<AppStateKeyed> {
<th class="mdc-data-table__header-cell" role="columnheader" scope="col">
<or-translate value="username"></or-translate>
</th>
- <th class="mdc-data-table__header-cell hide-mobile" role="columnheader" scope="col">
- <or-translate value="email"></or-translate>
- </th>
+ <th class="mdc-data-table__header-cell hide-mobile" role="columnheader" scope="col"><!-- Empty --></th>
<th class="mdc-data-table__header-cell" role="columnheader" scope="col">
<or-translate value="role"></or-translate>
</th>
@@ -530,8 +541,7 @@ export class PageUsers extends Page<AppStateKeyed> {
this.realm = state.app.realm;
}
- protected async _toggleUserExpand(ev: MouseEvent, user: UserModel) {
- const trElem = ev.currentTarget as HTMLTableRowElement;
+ protected async _toggleUserExpand(trElem: HTMLTableRowElement, user: UserModel, autoScroll: boolean = false) {
const expanderIcon = trElem.getElementsByTagName("or-icon")[0] as OrIcon;
const userRow = (trElem.parentElement! as HTMLTableElement).rows[trElem.rowIndex];
@@ -585,6 +595,10 @@ export class PageUsers extends Page<AppStateKeyed> {
if (expanderIcon.icon === "chevron-right") {
expanderIcon.icon = "chevron-down";
userRow.classList.add("expanded");
+ if(autoScroll) {
+ await this.updateComplete;
+ userRow.scrollIntoView({behavior: 'auto', block: 'center', inline: 'center'});
+ }
} else {
expanderIcon.icon = "chevron-right";
userRow.classList.remove("expanded");
@@ -718,13 +732,17 @@ export class PageUsers extends Page<AppStateKeyed> {
const implicitRoleNames = user.loaded ? this.getImplicitUserRoles(user) : [];
return html`
- <tr class="mdc-data-table__row" @click="${(ev) => this._toggleUserExpand(ev, user)}">
+ <tr id="${(user.serviceAccount ? 'serviceuser-' : 'user-') + user.username}" class="mdc-data-table__row" @click="${(ev) => {
+ if((ev.path[0].tagName != 'SPAN' || ev.path[0].className == '' || ev.path[0].className == 'mdi-chevron-right' || ev.path[0].className == 'mdi-chevron-down') && ev.path[0].tagName != 'BUTTON') {
+ this._toggleUserExpand(ev.currentTarget, user); // Only toggling when not hovering an action button
+ }
+ }}">
<td class="padded-cell mdc-data-table__cell">
<or-icon icon="chevron-right"></or-icon>
<span>${user.username}</span>
</td>
<td class="padded-cell mdc-data-table__cell hide-mobile">
- ${user.email}
+ ${isServiceUser ? undefined : user.email}
</td>
<td class="padded-cell mdc-data-table__cell">
${user.roles ? user.roles.filter(r => r.composite).map(r => r.name).join(",") : null}
@@ -732,6 +750,16 @@ export class PageUsers extends Page<AppStateKeyed> {
<td class="padded-cell mdc-data-table__cell hide-mobile">
<or-translate .value="${user.enabled ? "enabled" : "disabled"}"></or-translate>
</td>
+ ${(isServiceUser) ? html`
+ <span class="table-actions-container">
+ ${user.secret ? html`
+ <or-mwc-input type="${InputType.BUTTON}" icon="key" style="margin: 0;" title="${i18next.t("copySecret")}" @click="${() => {
+ navigator.clipboard.writeText(user.secret);
+ showSnackbar(undefined, i18next.t("copiedSecretToClipboard"));
+ }}"></or-mwc-input>
+ ` : undefined}
+ </span>
+ ` : undefined}
</tr>
<tr class="item-row${!user.id ? " expanded" : ""}">
<td colspan="4">
@@ -741,7 +769,7 @@ export class PageUsers extends Page<AppStateKeyed> {
<div class="column">
<h5>${i18next.t("details")}</h5>
<!-- user details -->
- <or-mwc-input ?readonly="${!!user.id || readonly}"
+ <or-mwc-input ?readonly="${!!user.id || readonly}" .disabled="${!!user.id}"
.label="${i18next.t("username")}"
.type="${InputType.TEXT}" minLength="3" maxLength="255" required
pattern="[a-zA-Z0-9-_]+"
@@ -769,15 +797,19 @@ export class PageUsers extends Page<AppStateKeyed> {
<!-- password -->
<h5>${i18next.t("password")}</h5>
${isServiceUser ? html`
- <or-mwc-input id="password-${suffix}" readonly
- .label="${i18next.t("secret")}"
- .value="${user.secret}"
- .type="${InputType.TEXT}"></or-mwc-input>
- <or-mwc-input ?readonly="${!user.id || readonly}"
+ ${user.secret ? html`
+ <or-mwc-input id="password-${suffix}" readonly
+ .label="${i18next.t("secret")}"
+ .value="${user.secret}"
+ .type="${InputType.TEXT}"></or-mwc-input>
+ <or-mwc-input ?readonly="${!user.id || readonly}"
.label="${i18next.t("regenerateSecret")}"
.type="${InputType.BUTTON}"
- @or-mwc-input-changed="${(ev) => this._regenerateSecret(ev, user, "password-" + suffix)}"></or-mwc-input>`
- : html`
+ @or-mwc-input-changed="${(ev) => this._regenerateSecret(ev, user, "password-" + suffix)}"></or-mwc-input>
+ ` : html`
+ <span>${i18next.t("generateSecretInfo")}</span>
+ `}
+ ` : html`
<or-mwc-input id="password-${suffix}"
?readonly="${readonly}"
.label="${i18next.t("password")}"
@@ -890,7 +922,12 @@ export class PageUsers extends Page<AppStateKeyed> {
<or-mwc-input id="savebtn-${suffix}" style="margin-left: auto;"
.label="${i18next.t(user.id ? "save" : "create")}"
.type="${InputType.BUTTON}"
- @click="${() => this._createUpdateUser(user)}"></or-mwc-input>
+ @click="${() => {
+ this._createUpdateUser(user).then(() => {
+ showSnackbar(undefined, (user.username + " " + i18next.t("savedSuccessfully")));
+ })
+ }}">
+ </or-mwc-input>
</div>
`}
</div>
diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.ts
index 56f5c3f62..87daed23d 100644
--- a/ui/component/or-asset-tree/src/index.ts
+++ b/ui/component/or-asset-tree/src/index.ts
@@ -132,6 +132,21 @@ export class OrAssetTreeChangeParentEvent extends CustomEvent<any> {
});
}
}
+export interface ToggleExpandEventDetail {
+ node: UiAssetTreeNode;
+}
+export class OrAssetTreeToggleExpandEvent extends CustomEvent<ToggleExpandEventDetail> {
+
+ public static readonly NAME = "or-asset-tree-expand";
+
+ constructor(detail: ToggleExpandEventDetail) {
+ super(OrAssetTreeToggleExpandEvent.NAME, {
+ bubbles: true,
+ composed: true,
+ detail: detail
+ });
+ }
+}
enum FilterElementType {
SEARCH_FILTER, ASSET_TYPE,ATTRIBUTE_NAME, ATTRIBUTE_VALUE
@@ -295,7 +310,10 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {
public sortBy?: string = "name";
@property({type: Boolean})
- public expandNodes?: boolean = false;
+ public expandAllNodes?: boolean = false;
+
+ @property({type: Array})
+ public expandedIds?: string[] = [];
@property({type: Boolean})
public checkboxes?: boolean = false;
@@ -605,6 +623,23 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {
return result;
}
+ protected updated(_changedProperties: PropertyValues) {
+
+ // After nodes have been rendered, expand entries if necessary
+ // (for example reopening parents after switching back to the asset page)
+ if (_changedProperties.has("_nodes")) {
+ if(!this.expandAllNodes && this.expandedIds && this.expandedIds.length > 0) {
+ this.expandedIds.forEach((id) => {
+ const node = this._findNodeFromAssetId(id);
+ let elem = this.shadowRoot?.querySelector('[node-asset-id="' + id + '"]');
+ if(elem && node && !node.expanded) {
+ this._toggleExpander(elem.firstElementChild!.firstElementChild! as HTMLElement, node);
+ }
+ });
+ }
+ }
+ }
+
protected _updateSelectedNodes() {
const actuallySelectedIds: string[] = [];
const selectedNodes: UiAssetTreeNode[] = [];
@@ -675,6 +710,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {
const elem = expander.parentElement!.parentElement!.parentElement!;
elem.toggleAttribute("data-expanded");
+ this.dispatchEvent(new OrAssetTreeToggleExpandEvent({ node: node }));
}
}
@@ -1349,7 +1385,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {
const selectedOptionalAttributes = addAssetDialog.selectedAttributes;
const name = addAssetDialog.name.trim();
const parent = addAssetDialog.parent;
-
+
if (!descriptor) {
return;
}
@@ -1376,7 +1412,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {
name: attributeDescriptor.name,
type: attributeDescriptor.type,
meta: attributeDescriptor.meta ? {...attributeDescriptor.meta} : undefined
- } as Attribute<any>;
+ } as Attribute<any>;
});
}
@@ -1711,7 +1747,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {
this._updateSelectedNodes();
}
- if (this.expandNodes) {
+ if (this.expandAllNodes) {
OrAssetTree._forEachNodeRecursive(this._nodes, (node) => {
if (node.children && node.children.length > 0) {
node.expanded = true;
diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.ts
index 0d910368b..f3f5c9213 100644
--- a/ui/component/or-asset-viewer/src/index.ts
+++ b/ui/component/or-asset-viewer/src/index.ts
@@ -1107,6 +1107,13 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem
@query("#editor")
protected editor!: OrEditAssetPanel;
+ @query("#asset-header")
+ protected headerElem!: HTMLDivElement;
+
+ @query("#view-container")
+ protected containerElem!: HTMLDivElement;
+
+
constructor() {
super();
this.addEventListener(OrEditAssetModifiedEvent.NAME, (ev: OrEditAssetModifiedEvent) => this._onAssetModified(ev.detail));
@@ -1369,7 +1376,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem
}});
content = html`
- <div id="view-container" style="${viewerConfig.viewerStyles ? styleMap(viewerConfig.viewerStyles) : ""}">
+ <div id="view-container" style="${viewerConfig.viewerStyles ? styleMap(viewerConfig.viewerStyles) : ""}" @scroll="${this._toggleHeaderShadow}">
<div id="left-column" class="panelContainer">
${leftColumn}
</div>
@@ -1406,6 +1413,10 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem
`;
}
+ protected _toggleHeaderShadow() {
+ (this.containerElem.scrollTop > 0) ? this.headerElem.classList.add('scrolled') : this.headerElem.classList.remove('scrolled');
+ }
+
protected _isReadonly() {
return this.readonly || !manager.hasRole(ClientRole.WRITE_ASSETS);
}
diff --git a/ui/component/or-asset-viewer/src/style.ts b/ui/component/or-asset-viewer/src/style.ts
index 88c8ee47b..3fad9c07d 100644
--- a/ui/component/or-asset-viewer/src/style.ts
+++ b/ui/component/or-asset-viewer/src/style.ts
@@ -172,6 +172,8 @@ export const style = css`
align-items: center;
justify-content: space-between;
z-index: 1;
+ transition: box-shadow 0.2s;
+ box-shadow: none;
}
#asset-header.editmode {