Skip to content

armgit / core

Public Imported from GitHub
0

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

UI Fix for MQTT sessions window not refreshing (#1975)

Martin Peeters56df3fcb26a0
diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.ts
index 9bfb87891..ec6121bd0 100644
--- a/ui/app/manager/src/pages/page-users.ts
+++ b/ui/app/manager/src/pages/page-users.ts
@@ -224,7 +224,7 @@ export class PageUsers extends Page<AppStateKeyed> {
protected _saveUserPromise?: Promise<any>;
@state()
- private _sessionLoader: Promise<TemplateResult>;
+ private _sessionLoader?: Promise<TemplateResult>;
get name(): string {
return "user_plural";
@@ -237,6 +237,7 @@ export class PageUsers extends Page<AppStateKeyed> {
this.loadData();
}
if (changedProperties.has('userId')) {
+ this._sessionLoader = undefined; // Reset the MQTT sessions view
this._updateRoute();
} else if (changedProperties.has('creationState')) {
this._updateNewUserRoute();
@@ -530,6 +531,7 @@ export class PageUsers extends Page<AppStateKeyed> {
${when((this.userId && index !== undefined) || this.creationState, () => html`
${when(mergedUserList[index] !== undefined || this.creationState, () => {
const user: UserModel = (index !== undefined ? mergedUserList[index] : this.creationState.userModel);
+ const showMqttSessions = user.serviceAccount && this.userId;
return html`
<div id="content" class="panel">
<p class="panel-title">
@@ -538,7 +540,7 @@ export class PageUsers extends Page<AppStateKeyed> {
${this.getSingleUserView(user, compositeRoleOptions, realmRoleOptions, ("user" + index), (readonly || this._saveUserPromise != undefined))}
</div>
- ${user.serviceAccount ? this.getMQTTSessionTemplate(user) : ``}
+ ${when(showMqttSessions, () => this.getMQTTSessionTemplate(user))}
`;
})}