100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
MQTT session disconnect UI and service startup ordering changes (#949)
Rich Turner1c21bdbedaa6
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.ymlindex 0727accbf..57d26ca4c 100644--- a/.github/workflows/ci_cd.yml+++ b/.github/workflows/ci_cd.yml@@ -701,15 +701,14 @@ jobs:if key.startswith("_"):if key.startswith("_TEMP_"):key = key.replace("_TEMP_", "")- envFile = "temp.env"else:continueos.system(f"echo 'Setting environment variable {key}...'")os.putenv(key, value)-+buildCmd = os.getenv("CMD")- result = subprocess.run(f"bash {buildCmd}", shell=True)+ result = subprocess.run(f"{buildCmd}", shell=True)if result.returncode != 0:os.system("echo 'installDist failed'")diff --git a/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorProtocol.javaindex b533423cb..75baf712b 100644--- a/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorProtocol.java@@ -145,7 +145,7 @@ public class SimulatorProtocol extends AbstractProtocol<SimulatorAgent, Simulato.orElse(simulatorReplayDatapoints[0]);if (nextDatapoint == null) {- LOG.info("Next datapoint not found so replay cancelled: " + attributeRef);+ LOG.warning("Next datapoint not found so replay cancelled: " + attributeRef);return null;}long nextRun = nextDatapoint.timestamp;@@ -154,10 +154,10 @@ public class SimulatorProtocol extends AbstractProtocol<SimulatorAgent, Simulato}long nextRunRelative = nextRun - now;- LOG.info("Next update for asset " + attributeRef.getId() + " for attribute " + attributeRef.getName() + " in " + nextRunRelative + " second(s)");+ LOG.fine("Next update for asset " + attributeRef.getId() + " for attribute " + attributeRef.getName() + " in " + nextRunRelative + " second(s)");return executorService.schedule(() -> {withLock(getProtocolName() + "::firingNextUpdate", () -> {- LOG.info("Updating asset " + attributeRef.getId() + " for attribute " + attributeRef.getName() + " with value " + nextDatapoint.value.toString());+ LOG.fine("Updating asset " + attributeRef.getId() + " for attribute " + attributeRef.getName() + " with value " + nextDatapoint.value.toString());try {updateLinkedAttribute(new AttributeState(attributeRef, nextDatapoint.value));} catch (Exception e) {diff --git a/build.gradle b/build.gradleindex fe0798cff..16f113e86 100644--- a/build.gradle+++ b/build.gradle@@ -18,7 +18,7 @@ gradleFileEncrypt {// Use custom password provider as standard env mechanism doesn't seem to workpasswordProvider = {def password = System.env.GFE_PASSWORD- return password != null ? password.toCharArray() : 'd'.toCharArray()+ return password != null ? password.toCharArray() : ''.toCharArray()}}task checkFilesGitIgnoredNew(type: Exec) {diff --git a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java b/container/src/main/java/org/openremote/container/message/MessageBrokerService.javaindex f5cbb5770..1d8dab657 100644--- a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java+++ b/container/src/main/java/org/openremote/container/message/MessageBrokerService.java@@ -58,11 +58,11 @@ public class MessageBrokerService implements ContainerService {public static final String MESSAGE_SESSION_ALLOWED_ORIGIN = "MESSAGE_SESSION_ALLOWED_ORIGIN";public static final String MESSAGE_SESSION_ALLOWED_ORIGIN_DEFAULT = null;private static final Logger LOG = Logger.getLogger(MessageBrokerService.class.getName());- public static final int PRIORITY = ContainerService.HIGH_PRIORITY;+ public static final int PRIORITY = ContainerService.LOW_PRIORITY;- protected ProducerTemplate producerTemplate;- protected FluentProducerTemplate fluentProducerTemplate;- protected DefaultCamelContext context;+ protected DefaultCamelContext context = new DefaultCamelContext();+ protected ProducerTemplate producerTemplate = context.createProducerTemplate();+ protected FluentProducerTemplate fluentProducerTemplate = context.createFluentProducerTemplate();@Overridepublic int getPriority() {@@ -73,8 +73,6 @@ public class MessageBrokerService implements ContainerService {@Overridepublic void init(Container container) throws Exception {- context = new DefaultCamelContext();-final ExecutorServiceManager executorServiceManager = context.getExecutorServiceManager();executorServiceManager.setThreadNamePattern("#counter# #name#");executorServiceManager.setThreadPoolFactory(new ThreadPoolFactory() {@@ -156,8 +154,6 @@ public class MessageBrokerService implements ContainerService {@Overridepublic void start(Container container) throws Exception {- producerTemplate = context.createProducerTemplate();- fluentProducerTemplate = context.createFluentProducerTemplate();LOG.info("Starting Camel message broker");context.start();}diff --git a/container/src/main/java/org/openremote/container/web/WebService.java b/container/src/main/java/org/openremote/container/web/WebService.javaindex 991c2387f..e54e25ad2 100644--- a/container/src/main/java/org/openremote/container/web/WebService.java+++ b/container/src/main/java/org/openremote/container/web/WebService.java@@ -113,6 +113,11 @@ public abstract class WebService implements ContainerService {return new RequestHandler(name, exchange -> exchange.getRequestPath().startsWith(path), handler);}+ @Override+ public int getPriority() {+ return LOW_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {devMode = container.isDevMode();diff --git a/deployment/manager/fcm.json.encrypted b/deployment/manager/fcm.json.encryptedindex 05c49824c..4cce13d66 100644Binary files a/deployment/manager/fcm.json.encrypted and b/deployment/manager/fcm.json.encrypted differdiff --git a/gradle.properties b/gradle.propertiesindex 5c2987145..934ab57ab 100644--- a/gradle.properties+++ b/gradle.properties@@ -38,7 +38,7 @@ flywaydbVersion = 9.0.1ical4jVersion = 3.2.6friendlyIdVersion = 1.0.1geotoolsVersion = 19.1-firebaseAdminVersion = 7.1.0+firebaseAdminVersion = 9.1.1simpleJavaMailVersion = 5.0.4jaywayJsonPathVersion = 2.7.0typescriptGeneratorVersion = 2.28.785diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.javaindex 65550971a..a89ee40d8 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java@@ -475,8 +475,10 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSerString consumerProcessor = null;boolean complete = false;long startMillis = System.currentTimeMillis();+ StringBuilder processorTimings = new StringBuilder();for (AssetUpdateProcessor processor : processors) {+ long processorStartMillis = System.currentTimeMillis();if (LOG.isLoggable(Level.FINEST)) {LOG.finest("==> Processor " + processor + " accepts: " + attributeStrSupplier.get());@@ -484,6 +486,7 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSertry {complete = processor.processAssetUpdate(em, asset, attribute, source);+ processorTimings.append(processor).append("=").append(System.currentTimeMillis() - processorStartMillis).append("ms ");} catch (AssetProcessingException ex) {throw ex;} catch (Throwable t) {@@ -507,9 +510,16 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer}}+ long processingMillis = System.currentTimeMillis() - startMillis;- if (LOG.isLoggable(Level.FINE)) {- LOG.fine("<<< Attribute event processed in " + (System.currentTimeMillis() - startMillis) + "ms: attribute=" + attributeStrSupplier.get() + ", consumer=" + consumerProcessor);+ if (processingMillis > 50) {+ if (LOG.isLoggable(Level.INFO)) {+ LOG.info("<<< Attribute event processing took a long time " + processingMillis + "ms: attribute=" + attributeStrSupplier.get() + ", consumer=" + consumerProcessor + ", timings=" + processorTimings);+ }+ } else {+ if (LOG.isLoggable(Level.FINE)) {+ LOG.fine("<<< Attribute event processed in " + processingMillis + "ms: attribute=" + attributeStrSupplier.get() + ", consumer=" + consumerProcessor);+ }}return complete;}diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.javaindex db3e9e146..021ac689f 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java@@ -680,4 +680,11 @@ public class GatewayService extends RouteBuilder implements ContainerService, Asconnector.onGatewayEvent(messageId, event);}}++ @Override+ public String toString() {+ return getClass().getSimpleName() + "{" ++ "active=" + active ++ '}';+ }}diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MQTTBrokerService.java b/manager/src/main/java/org/openremote/manager/mqtt/MQTTBrokerService.javaindex d71c86adb..a47e16976 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/MQTTBrokerService.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/MQTTBrokerService.java@@ -464,6 +464,17 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,connection.disconnect(false);}+ public boolean disconnectSession(String sessionID) {+ RemotingConnection connection = connectionIDConnectionMap.get(sessionID);+ if (connection != null) {+ LOG.log(DEBUG, "Force disconnecting client connection: " + connectionToString(connection));+ doForceDisconnect(connection);+ return true;+ }++ return false;+ }+public void publishMessage(String topic, Object data, MqttQoS qoS) {try {if (internalSession != null) {diff --git a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.javaindex b5eb33988..90f9db732 100644--- a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java@@ -336,11 +336,19 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource}return mqttBrokerService.getUserConnections(userId).stream().map(connection -> new UserSession(+ MQTTBrokerService.getConnectionIDString(connection),connection.getSubject() != null ? KeycloakIdentityProvider.getSubjectName(connection.getSubject()) : userId,connection.getCreationTime(),connection.getRemoteAddress())).toArray(UserSession[]::new);}+ @Override+ public void disconnectUserSession(RequestParams requestParams, String realm, String sessionID) {+ if (!mqttBrokerService.disconnectSession(sessionID)) {+ throw new NotFoundException("User session not found");+ }+ }+protected void throwIfIllegalMasterAdminUserDeletion(RequestParams requestParams, String realm, String userId) throws WebApplicationException {if (!realm.equals(MASTER_REALM)) {return;diff --git a/manager/src/main/java/org/openremote/manager/system/SslHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/system/SslHealthStatusProvider.javaindex 1d138344e..e5b57f028 100644--- a/manager/src/main/java/org/openremote/manager/system/SslHealthStatusProvider.java+++ b/manager/src/main/java/org/openremote/manager/system/SslHealthStatusProvider.java@@ -20,7 +20,6 @@package org.openremote.manager.system;import com.fasterxml.jackson.databind.node.ObjectNode;-import io.grpc.netty.shaded.io.netty.internal.tcnative.SSL;import org.openremote.model.Constants;import org.openremote.model.Container;import org.openremote.model.ContainerService;diff --git a/manager/src/web/shared/locales/en/or.json b/manager/src/web/shared/locales/en/or.jsonindex 79dbf22f7..fb0245696 100644--- a/manager/src/web/shared/locales/en/or.json+++ b/manager/src/web/shared/locales/en/or.json@@ -653,5 +653,7 @@"admin": "Super admin"},"saveRealmFailed": "Save realm failed",- "saveRealmSucceeded": "Saved realm successfully!"+ "saveRealmSucceeded": "Saved realm successfully!",+ "userDisconnected": "Disconnected successfully!",+ "userDisconnectFailed": "Disconnect failed"}diff --git a/model/src/main/java/org/openremote/model/security/UserResource.java b/model/src/main/java/org/openremote/model/security/UserResource.javaindex 14b80937a..0a0398e27 100644--- a/model/src/main/java/org/openremote/model/security/UserResource.java+++ b/model/src/main/java/org/openremote/model/security/UserResource.java@@ -166,4 +166,8 @@ public interface UserResource {@Path("{realm}/userSessions/{userId}")@Produces(APPLICATION_JSON)UserSession[] getUserSessions(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("userId") String userId);++ @GET+ @Path("{realm}/disconnect/{sessionID}")+ void disconnectUserSession(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("sessionID") String sessionID);}diff --git a/model/src/main/java/org/openremote/model/security/UserSession.java b/model/src/main/java/org/openremote/model/security/UserSession.javaindex 388417900..7c948cec1 100644--- a/model/src/main/java/org/openremote/model/security/UserSession.java+++ b/model/src/main/java/org/openremote/model/security/UserSession.java@@ -20,16 +20,16 @@package org.openremote.model.security;import com.fasterxml.jackson.annotation.JsonCreator;-import com.fasterxml.jackson.annotation.JsonIgnore;-import com.fasterxml.jackson.annotation.JsonProperty;public class UserSession {+ protected final String ID;protected final String username;protected final long startTimeMillis;protected final String remoteAddress;@JsonCreator- public UserSession(String username, long startTimeMillis, String remoteAddress) {+ public UserSession(String ID, String username, long startTimeMillis, String remoteAddress) {+ this.ID = ID;this.username = username;this.startTimeMillis = startTimeMillis;this.remoteAddress = remoteAddress;@@ -46,4 +46,8 @@ public class UserSession {public String getRemoteAddress() {return remoteAddress;}++ public String getID() {+ return ID;+ }}diff --git a/profile/deploy.yml b/profile/deploy.ymlindex 3a5b50843..caa0b36a1 100644--- a/profile/deploy.yml+++ b/profile/deploy.yml@@ -294,22 +294,20 @@ services:# OR_FORECAST_SOLAR_API_KEY# Custom JVM options (override default manager options)-# OR_JAVA_OPTS: ${OR_JAVA_OPTS:--Xms500m -Xmx2g-# -XX:NativeMemoryTracking=summary-# -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10-# -XX:GCLogFileSize=50M -Xloggc:/gc.log-# -XX:OnOutOfMemoryError="shutdown -r" -d64-# -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/dump.hprof}-#-# THE FOLLOWING OPTIONS CAN BE USED TO ENABLE JMX; PORT MUST ALSO BE EXPOSED-# ACCESS SHOULD BE RESTRICTED BY FIREWALL TO SPECIFIC IPs FOR DIAGNOSTIC PURPOSES-#-# -Dcom.sun.management.jmxremote=true-# -Dcom.sun.management.jmxremote.ssl=false-# -Dcom.sun.management.jmxremote.authenticate=false-# -Dcom.sun.management.jmxremote.port=8085-# -Dcom.sun.management.jmxremote.rmi.port=8085-# -Djava.rmi.server.hostname=${OR_HOSTNAME:-localhost}+ #OR_JAVA_OPTS: ${OR_JAVA_OPTS:--Xms500m -Xmx2g+ # -XX:NativeMemoryTracking=summary+ # -Xlog:all=warning:stdout:uptime,level,tags+ # -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/dump.hprof}+ #+ # THE FOLLOWING OPTIONS CAN BE USED TO ENABLE JMX; PORT MUST ALSO BE EXPOSED+ # ACCESS SHOULD BE RESTRICTED BY FIREWALL TO SPECIFIC IPs FOR DIAGNOSTIC PURPOSES+ #+ # -Dcom.sun.management.jmxremote=true+ # -Dcom.sun.management.jmxremote.ssl=false+ # -Dcom.sun.management.jmxremote.authenticate=false+ # -Dcom.sun.management.jmxremote.port=8085+ # -Dcom.sun.management.jmxremote.rmi.port=8085+ # -Djava.rmi.server.hostname=${OR_HOSTNAME:-localhost}# Custom JVM tool options (for remote debugging)#JAVA_TOOL_OPTIONS: '-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n'diff --git a/project.gradle b/project.gradleindex 9432668ff..5c72d392a 100644--- a/project.gradle+++ b/project.gradle@@ -48,8 +48,9 @@ exit \$statusFiles.setPosixFilePermissions(path, perms)} catch (Exception ignored) {}- // Add dependency on decrypt task for deployment installDist if custom project- if (isCustomProject()) {+ // Add dependency on decrypt task for deployment installDist only if GFE_PASSWORD defined+ def password = System.env.GFE_PASSWORD+ if (password != null) {Task decryptTask = getTasksByName("decryptFiles", false)[0]try {diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.tsindex 9b30e48d2..dac26c15a 100644--- a/ui/app/manager/src/pages/page-users.ts+++ b/ui/app/manager/src/pages/page-users.ts@@ -5,7 +5,7 @@ import "@openremote/or-components/or-panel";import "@openremote/or-translate";import {Store} from "@reduxjs/toolkit";import {AppStateKeyed, Page, PageProvider, router} from "@openremote/or-app";-import {ClientRole, Role, User, UserAssetLink, UserQuery} from "@openremote/model";+import {ClientRole, Role, User, UserAssetLink, UserQuery, UserSession} from "@openremote/model";import {i18next} from "@openremote/or-translate";import {InputType, OrInputChangedEvent, OrMwcInput} from "@openremote/or-mwc-components/or-mwc-input";import {OrMwcDialog, showDialog, showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";@@ -59,7 +59,6 @@ export class PageUsers extends Page<AppStateKeyed> {width: 100%;display: flex;flex-direction: column;- overflow: auto;}#title {@@ -80,17 +79,22 @@ export class PageUsers extends Page<AppStateKeyed> {}.panel {- width: calc(100% - 90px);- max-width: 1310px;+ flex: 0;+ width: 100%;+ box-sizing: border-box;+ max-width: 1360px;background-color: white;border: 1px solid #e5e5e5;border-radius: 5px;position: relative;margin: 0 auto 10px;padding: 12px 24px 24px;+ display: flex;+ flex-direction: column;}.panel-title {+ display: flex;text-transform: uppercase;font-weight: bolder;color: var(--or-app-color3, ${unsafeCSS(DefaultColor3)});@@ -99,7 +103,6 @@ export class PageUsers extends Page<AppStateKeyed> {margin-top: 0;flex: 0 0 auto;letter-spacing: 0.025em;- display: flex;align-items: center;min-height: 36px;}@@ -119,7 +122,6 @@ export class PageUsers extends Page<AppStateKeyed> {.row {display: flex;flex-direction: row;- margin: 10px 0;flex: 1 1 0;gap: 24px;}@@ -154,6 +156,17 @@ export class PageUsers extends Page<AppStateKeyed> {--or-icon-width: 16px;--or-icon-height: 16px;}++ #session-table {+ --or-mwc-table-column-width-3: 0;+ }++ .button-row {+ display: flex !important;+ flex-direction: row !important;+ margin-bottom: 0;+ justify-content: space-between;+ }@media screen and (max-width: 768px) {#title {@@ -171,7 +184,6 @@ export class PageUsers extends Page<AppStateKeyed> {border-radius: 0;border-left: 0px;border-right: 0px;- width: calc(100% - 48px);}}`,@@ -209,6 +221,9 @@ export class PageUsers extends Page<AppStateKeyed> {@state()protected _saveUserPromise?: Promise<any>;+ @state()+ private _sessionLoader: Promise<TemplateResult>;+get name(): string {return "user_plural";}@@ -437,7 +452,7 @@ export class PageUsers extends Page<AppStateKeyed> {];const userTableRows: TableRow[] = this._users.map((user) => {return {- content: [user.username, user.firstName, user.lastName, user.email, user.enabled ? i18next.t('enabled') : i18next.t('disabled')],+ content: [user.username, user.firstName, user.lastName, user.email, user.enabled ? i18next.t('enabled') : i18next.t('disabled')] as string[],clickable: true}});@@ -449,7 +464,7 @@ export class PageUsers extends Page<AppStateKeyed> {];const serviceUserTableRows: TableRow[] = this._serviceUsers.map((user) => {return {- content: [user.username, user.enabled ? i18next.t('enabled') : i18next.t('disabled')],+ content: [user.username, user.enabled ? i18next.t('enabled') : i18next.t('disabled')] as string[],clickable: true}})@@ -735,30 +750,33 @@ export class PageUsers extends Page<AppStateKeyed> {protected getMQTTSessionTemplate(user: UserModel): TemplateResult {- const sessionLoader = async () => {-- const userSessionsResponse = await (manager.rest.api.UserResource.getUserSessions(manager.displayRealm, user.id));-- if (!this.responseAndStateOK(() => userSessionsResponse.status === 200, userSessionsResponse, i18next.t("loadFailedUserInfo"))) {- return html``;- }-- const cols = [i18next.t("address"), i18next.t("since")];- const rows = userSessionsResponse.data.map((session) => {- return [session.remoteAddress, new Date(session.startTimeMillis)]- });-- return html`<or-mwc-table .rows="${rows}" .config="${{stickyFirstColumn:false}}" .columns="${cols}"></or-mwc-table>`;- };+ if (!this._sessionLoader) {+ this._sessionLoader = this.getSessionLoader(user);+ }return html`<div id="content" class="panel"><p class="panel-title">${i18next.t('mqttSessions')}</p>- ${until(sessionLoader(), html`${i18next.t('loading')}`)}+ ${until(this._sessionLoader, html`${i18next.t('loading')}`)}</div>`;}+ protected async getSessionLoader(user: UserModel): Promise<TemplateResult> {+ const userSessionsResponse = await (manager.rest.api.UserResource.getUserSessions(manager.displayRealm, user.id));++ if (!this.responseAndStateOK(() => userSessionsResponse.status === 200, userSessionsResponse, i18next.t("loadFailedUserInfo"))) {+ return html``;+ }++ const cols = [i18next.t("address"), i18next.t("since"), ""];+ 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>`]+ });++ return html`<or-mwc-table id="session-table" .rows="${rows}" .config="${{stickyFirstColumn:false}}" .columns="${cols}"></or-mwc-table>`;+ }+protected getSingleUserTemplate(user: UserModel, compositeRoleOptions: string[], realmRoleOptions: [string, string][], suffix: string, readonly: boolean = true): TemplateResult {const isServiceUser = user.serviceAccount;const isSameUser = user.username === manager.username;@@ -923,7 +941,7 @@ export class PageUsers extends Page<AppStateKeyed> {</div><!-- Bottom controls (save/update and delete button) -->${when(!(readonly && !this._saveUserPromise), () => html`- <div class="row" style="margin-bottom: 0; justify-content: space-between;">+ <div class="row button-row">${when((!isSameUser && user.id), () => html`<or-mwc-input style="margin: 0;" outlined ?disabled="${readonly}"@@ -997,4 +1015,14 @@ export class PageUsers extends Page<AppStateKeyed> {callHandler: !silent});}++ protected disconnectSession(user: UserModel, session: UserSession) {+ this._sessionLoader = manager.rest.api.UserResource.disconnectUserSession(manager.displayRealm, session.ID)+ .then(() => showSnackbar(undefined, i18next.t("userDisconnected")))+ .catch((e) => {+ showSnackbar(undefined, i18next.t("userDisconnectFailed"));+ console.error("Failed to disconnect user", e);+ })+ .then(() =>this.getSessionLoader(user));+ }}diff --git a/ui/component/or-app/src/index.ts b/ui/component/or-app/src/index.tsindex f8a691f51..13b2e337f 100644--- a/ui/component/or-app/src/index.ts+++ b/ui/component/or-app/src/index.ts@@ -120,6 +120,7 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {.main-content {display: flex;+ flex-direction: column;flex: 1;box-sizing: border-box;background-color: var(--or-app-color2);diff --git a/ui/component/or-mwc-components/src/or-mwc-table.ts b/ui/component/or-mwc-components/src/or-mwc-table.tsindex 9ff6ca770..8cec498a6 100644--- a/ui/component/or-mwc-components/src/or-mwc-table.ts+++ b/ui/component/or-mwc-components/src/or-mwc-table.ts@@ -69,11 +69,6 @@ const style = css`cursor: default;}- th:not(:first-of-type), td:not(:first-of-type) {- max-width: 100px;- text-overflow: ellipsis;- }-.mdc-data-table__header-cell {font-weight: bold;color: ${unsafeCSS(DefaultColor3)};@@ -91,6 +86,37 @@ const style = css`.mdc-data-table__cell--clickable {cursor: pointer;}++ #column-1 {+ width: var(--or-mwc-table-column-width-1, unset);+ }+ #column-2 {+ width: var(--or-mwc-table-column-width-2, unset);+ }+ #column-3 {+ width: var(--or-mwc-table-column-width-3, unset);+ }+ #column-4 {+ width: var(--or-mwc-table-column-width-4, unset);+ }+ #column-5 {+ width: var(--or-mwc-table-column-width-5, unset);+ }+ #column-6 {+ width: var(--or-mwc-table-column-width-6, unset);+ }+ #column-7 {+ width: var(--or-mwc-table-column-width-7, unset);+ }+ #column-8 {+ width: var(--or-mwc-table-column-width-8, unset);+ }+ #column-9 {+ width: var(--or-mwc-table-column-width-9, unset);+ }+ #column-10 {+ width: var(--or-mwc-table-column-width-10, unset);+ }@media screen and (max-width: 768px) {.hide-mobile {@@ -114,7 +140,7 @@ export interface TableColumn {}export interface TableRow {- content?: string[]+ content?: (string | number | TemplateResult)[]clickable?: boolean}@@ -213,9 +239,9 @@ export class OrMwcTable extends LitElement {return this.columns ? html`<thead><tr class="mdc-data-table__header-row">- ${this.columns.map((column: TableColumn | string) => {+ ${this.columns.map((column: TableColumn | string, index: number) => {return (typeof column == "string") ? html`- <th class="mdc-data-table__header-cell" role="columnheader" scope="col"+ <th class="mdc-data-table__header-cell" id="column-${index+1}" role="columnheader" scope="col"title="${column}">${column}</th>` : html`@@ -250,11 +276,11 @@ export class OrMwcTable extends LitElement {return this.rows ? (this.rows as any[]).filter((row, index) => (index >= (this.paginationIndex * this.paginationSize)) && (index < (this.paginationIndex * this.paginationSize + this.paginationSize))).map((item: TableRow | string[]) => {- const content: string[] | undefined = (Array.isArray(item) ? item : (item as TableRow).content);+ const content: (string | number | TemplateResult)[] | undefined = (Array.isArray(item) ? item : (item as TableRow).content);return html`<tr class="mdc-data-table__row"@click="${(ev: MouseEvent) => this.dispatchEvent(new OrMwcTableRowClickEvent((this.rows as any[]).indexOf(item)))}">- ${content?.map((cell: string | number, index: number) => {+ ${content?.map((cell: string | number | TemplateResult, index: number) => {const classes = {"mdc-data-table__cell": true,"mdc-data-table__cell--numeric": typeof cell === "number",