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: User navigtion from assets page and small styling updates (#970)

DonWillems48ae67f99f21
diff --git a/manager/src/web/shared/locales/nl/or.json b/manager/src/web/shared/locales/nl/or.json
index 776f1457b..8c3743fe1 100644
--- a/manager/src/web/shared/locales/nl/or.json
+++ b/manager/src/web/shared/locales/nl/or.json
@@ -677,9 +677,14 @@
"geoJsonDescription": "Bewerk de GeoJSON; voeg punten, lijnen, en andere vormen toe aan de kaart.",
"deleteMapCustomization": "Kaartinstelling verwijderen",
"deleteMapCustomizationConfirm":"Weet je zeker dat je deze kaart wilt verwijderen",
- "addMapCustomization" : "Voeg een Kaartinstelling toe",
- "realmRole": {
- "admin": "Super admin"
- }
- }
+ "addMapCustomization" : "Voeg een Kaartinstelling toe"
+ },
+ "realmRole": {
+ "admin": "Super admin"
+ },
+ "mqttSessions": "MQTT sessies",
+ "address": "Adres",
+ "since": "Vanaf",
+ "roles": "Rollen",
+ "restrictedUser": "Gebruiker met beperkte toegang"
}
diff --git a/ui/app/manager/src/pages/page-assets.ts b/ui/app/manager/src/pages/page-assets.ts
index d58a06037..02a23e593 100644
--- a/ui/app/manager/src/pages/page-assets.ts
+++ b/ui/app/manager/src/pages/page-assets.ts
@@ -7,6 +7,7 @@ import {
OrAssetViewerEditToggleEvent,
OrAssetViewerRequestEditToggleEvent,
OrAssetViewerSaveEvent,
+ OrAssetViewerLoadUserEvent,
saveAsset,
SaveResult,
ViewerConfig
@@ -28,7 +29,7 @@ import {showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
import i18next from "i18next";
import {AssetEventCause, WellknownAssets} from "@openremote/model";
import "@openremote/or-json-forms";
-import {getAssetsRoute} from "../routes";
+import {getAssetsRoute, getUsersRoute} from "../routes";
import {showSnackbar} from "@openremote/or-mwc-components/or-mwc-snackbar";
export interface PageAssetsConfig {
@@ -189,6 +190,7 @@ export class PageAssets extends Page<AssetsStateKeyed> {
this.addEventListener(OrAssetViewerChangeParentEvent.NAME, (ev) => this._onAssetParentChange(ev.detail));
this.addEventListener(OrAssetTreeChangeParentEvent.NAME, (ev) => this._onAssetParentChange(ev.detail));
this.addEventListener(OrAssetTreeToggleExpandEvent.NAME, this._onAssetExpandToggle);
+ this.addEventListener(OrAssetViewerLoadUserEvent.NAME, this._onLoadUserEvent);
}
public connectedCallback() {
@@ -343,4 +345,11 @@ export class PageAssets extends Page<AssetsStateKeyed> {
callHandler: !silent
});
}
+
+ protected _onLoadUserEvent(event: OrAssetViewerLoadUserEvent, silent: boolean = false) {
+ router.navigate(getUsersRoute(event.detail), {
+ callHooks: !silent,
+ callHandler: !silent
+ });
+ }
}
diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.ts
index 6ae6d2246..ef9e41f0b 100644
--- a/ui/app/manager/src/pages/page-users.ts
+++ b/ui/app/manager/src/pages/page-users.ts
@@ -769,6 +769,9 @@ export class PageUsers extends Page<AppStateKeyed> {
const rows = userSessionsResponse.data.map((session) => {
return [session.remoteAddress, new Date(session.startTimeMillis), html`<or-mwc-input .type="${InputType.BUTTON}" label="${i18next.t("disconnect")}" @or-mwc-input-changed="${() => {this.disconnectSession(user, session)}}"></or-mwc-input>`]
});
+ if (rows.length < 1){
+ return html`<or-mwc-table .rows="${[['This user has no active MQTT sessions',null]]}" .config="${{stickyFirstColumn:false}}" .columns="${cols}"></or-mwc-table>`;
+ }
return html`<or-mwc-table id="session-table" .rows="${rows}" .config="${{stickyFirstColumn:false}}" .columns="${cols}"></or-mwc-table>`;
}
diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.ts
index fc2c8619d..c9f1f381d 100644
--- a/ui/component/or-asset-viewer/src/index.ts
+++ b/ui/component/or-asset-viewer/src/index.ts
@@ -16,7 +16,7 @@ import "@openremote/or-mwc-components/or-mwc-list";
import {translate} from "@openremote/or-translate";
import {InputType, OrInputChangedEvent, OrMwcInput} from "@openremote/or-mwc-components/or-mwc-input";
import manager, {subscribe, Util, DefaultColor5} from "@openremote/core";
-import {OrMwcTable} from "@openremote/or-mwc-components/or-mwc-table";
+import {OrMwcTable, OrMwcTableRowClickEvent} from "@openremote/or-mwc-components/or-mwc-table";
import {OrChartConfig} from "@openremote/or-chart";
import {HistoryConfig, OrAttributeHistory} from "@openremote/or-attribute-history";
import {
@@ -125,6 +125,7 @@ export interface ViewerConfig {
}
interface UserAssetLinkInfo {
+ userId: string;
usernameAndId: string;
roles: string[];
restrictedUser: boolean;
@@ -254,6 +255,19 @@ export class OrAssetViewerEditToggleEvent extends CustomEvent<boolean> {
}
}
+export class OrAssetViewerLoadUserEvent extends CustomEvent<string> {
+
+ public static readonly NAME = "or-asset-viewer-load-user-event";
+
+ constructor(userId: string) {
+ super(OrAssetViewerLoadUserEvent.NAME, {
+ bubbles: true,
+ composed: true,
+ detail: userId
+ });
+ }
+}
+
declare global {
export interface HTMLElementEventMap {
[OrAssetViewerComputeGridEvent.NAME]: OrAssetViewerComputeGridEvent;
@@ -262,6 +276,7 @@ declare global {
[OrAssetViewerRequestEditToggleEvent.NAME]: OrAssetViewerRequestEditToggleEvent;
[OrAssetViewerEditToggleEvent.NAME]: OrAssetViewerEditToggleEvent;
[OrAssetViewerChangeParentEvent.NAME]: OrAssetViewerChangeParentEvent;
+ [OrAssetViewerLoadUserEvent.NAME]: OrAssetViewerLoadUserEvent;
}
}
@@ -781,8 +796,11 @@ function getPanelContent(id: string, assetInfo: AssetInfo, hostElement: LitEleme
assetLinkInfo.restrictedUser ? i18next.t("yes") : i18next.t("no")
];
});
-
- return html`<or-mwc-table .rows="${rows}" .config="${{stickyFirstColumn:false}}" .columns="${cols}"></or-mwc-table>`;
+ return html`<or-mwc-table .rows="${rows}" .config="${{stickyFirstColumn:false}}" .columns="${cols}"
+ @or-mwc-table-row-click="${(ev: OrMwcTableRowClickEvent) => {
+ hostElement.dispatchEvent(new OrAssetViewerLoadUserEvent(assetLinkInfos[ev.detail.index].userId));
+ }}">
+ </or-mwc-table>`;
}
}
@@ -931,6 +949,7 @@ async function getLinkedUserInfo(userAssetLink: UserAssetLink): Promise<UserAsse
});
return {
+ userId: userId,
usernameAndId: username,
roles: roleNames,
restrictedUser: isRestrictedUser
diff --git a/ui/component/or-json-forms/src/styles.ts b/ui/component/or-json-forms/src/styles.ts
index a062bbe43..1af67b25f 100644
--- a/ui/component/or-json-forms/src/styles.ts
+++ b/ui/component/or-json-forms/src/styles.ts
@@ -125,10 +125,10 @@ export const addItemOrParameterDialogStyle = html`
border-bottom-width: 1px;
border-bottom-style: solid;
padding: 0;
- overflow: visible;
}
form {
display: flex;
+ height: 100%;
}
#type-list {
overflow: auto;
@@ -152,6 +152,7 @@ export const addItemOrParameterDialogStyle = html`
display: flex;
flex-direction: column;
justify-content: flex-start;
+ overflow: auto;
}
</style>
`;