Merge branch 'master' into next
This commit is contained in:
commit
741ebbacca
|
@ -46,6 +46,15 @@ export class Message extends LitElement {
|
||||||
<p class="pf-c-alert__title">
|
<p class="pf-c-alert__title">
|
||||||
${this.message?.message}
|
${this.message?.message}
|
||||||
</p>
|
</p>
|
||||||
|
<div class="pf-c-alert__action">
|
||||||
|
<button class="pf-c-button pf-m-plain" type="button" @click=${() => {
|
||||||
|
if (!this.message) return;
|
||||||
|
if (!this.onRemove) return;
|
||||||
|
this.onRemove(this.message);
|
||||||
|
}}>
|
||||||
|
<i class="fas fa-times" aria-hidden="true"></i>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</li>`;
|
</li>`;
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@ export function showMessage(message: APIMessage): void {
|
||||||
if (!container) {
|
if (!container) {
|
||||||
throw new Error("failed to find message container");
|
throw new Error("failed to find message container");
|
||||||
}
|
}
|
||||||
container.messages.push(message);
|
container.addMessage(message);
|
||||||
container.requestUpdate();
|
container.requestUpdate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,6 +34,14 @@ export class MessageContainer extends LitElement {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// add a new message, but only if the message isn't currently shown.
|
||||||
|
addMessage(message: APIMessage): void {
|
||||||
|
const matchingMessages = this.messages.filter(m => m.message == message.message);
|
||||||
|
if (matchingMessages.length < 1) {
|
||||||
|
this.messages.push(message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
connect(): void {
|
connect(): void {
|
||||||
if (navigator.webdriver) return;
|
if (navigator.webdriver) return;
|
||||||
const wsUrl = `${window.location.protocol.replace("http", "ws")}//${
|
const wsUrl = `${window.location.protocol.replace("http", "ws")}//${
|
||||||
|
@ -60,7 +68,7 @@ export class MessageContainer extends LitElement {
|
||||||
});
|
});
|
||||||
this.messageSocket.addEventListener("message", (e) => {
|
this.messageSocket.addEventListener("message", (e) => {
|
||||||
const data = JSON.parse(e.data);
|
const data = JSON.parse(e.data);
|
||||||
this.messages.push(data);
|
this.addMessage(data);
|
||||||
this.requestUpdate();
|
this.requestUpdate();
|
||||||
});
|
});
|
||||||
this.messageSocket.addEventListener("error", (e) => {
|
this.messageSocket.addEventListener("error", (e) => {
|
||||||
|
|
|
@ -50,18 +50,17 @@ export class RouterOutlet extends LitElement {
|
||||||
if (activeUrl === "") {
|
if (activeUrl === "") {
|
||||||
activeUrl = this.defaultUrl || "/";
|
activeUrl = this.defaultUrl || "/";
|
||||||
window.location.hash = `#${activeUrl}`;
|
window.location.hash = `#${activeUrl}`;
|
||||||
console.debug(`authentik/router: set to ${window.location.hash}`);
|
console.debug(`authentik/router: defaulted URL to ${window.location.hash}`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let matchedRoute: RouteMatch | null = null;
|
let matchedRoute: RouteMatch | null = null;
|
||||||
ROUTES.some((route) => {
|
ROUTES.some((route) => {
|
||||||
console.debug(`authentik/router: matching ${activeUrl} against ${route.url}`);
|
|
||||||
const match = route.url.exec(activeUrl);
|
const match = route.url.exec(activeUrl);
|
||||||
if (match != null) {
|
if (match != null) {
|
||||||
matchedRoute = new RouteMatch(route);
|
matchedRoute = new RouteMatch(route);
|
||||||
matchedRoute.arguments = match.groups || {};
|
matchedRoute.arguments = match.groups || {};
|
||||||
matchedRoute.fullUrl = activeUrl;
|
matchedRoute.fullUrl = activeUrl;
|
||||||
console.debug(`authentik/router: found match ${matchedRoute}`);
|
console.debug("authentik/router: found match ", matchedRoute);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Reference in New Issue