trustchain-oc1-orchestral/authentik
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

static: fix messages update only working once

Browse source
This commit is contained in:
Jens Langhammer 2020-10-16 16:30:38 +02:00
parent c49b57ad1d
commit 6c0c12c90a
5 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
passbook/admin/api/tasks.py
View file

@ -53,7 +53,7 @@ class TaskViewSet(ViewSet):
task_module = import_module(task.task_call_module)
task_func = getattr(task_module, task.task_call_func)
task_func.delay(*task.task_call_args, **task.task_call_kwargs)
messages.success(self.request, _("Successfully re-scheduled Task!"))
messages.success(self.request, _("Successfully re-scheduled Task %(name)s!" % {'name': task.task_name}))
return Response(
{
"successful": True,

6
passbook/static/static/passbook/passbook.js
View file

File diff suppressed because one or more lines are too long

2
passbook/static/static/passbook/passbook.js.map
View file

File diff suppressed because one or more lines are too long

3
passbook/static/static/src/ActionButton.js
View file

@ -32,8 +32,9 @@ class ActionButton extends HTMLButtonElement {
this.classList.remove(...PROGRESS_CLASSES);
this.innerText = this.oldBody;
this.classList.replace(PRIMARY_CLASS, statusClass);
// Trigger messages to update
document.querySelector("pb-messages").setAttribute("touch", Date.now());
setTimeout(() => {
console.log('test');
this.classList.replace(statusClass, PRIMARY_CLASS);
}, 1000);
}

20
passbook/static/static/src/Messages.js
View file

@ -7,8 +7,8 @@ const LEVEL_ICON_MAP = {
"info": "fas fa-info",
};
let ID = function () {
return '_' + Math.random().toString(36).substr(2, 9);
let ID = function (prefix) {
return prefix + Math.random().toString(36).substr(2, 9);
};
class Messages extends LitElement {
@ -17,23 +17,29 @@ class Messages extends LitElement {
return {
url: { type: String },
messages: { type: Array },
touch: { type: Object },
};
}
set touch(value) {
this.firstUpdated();
}
createRenderRoot() {
return this;
}
firstUpdated() {
fetch(this.url).then(r => r.json()).then(r => this.messages = r);
return fetch(this.url).then(r => r.json()).then(r => this.messages = r);
}
renderMessage(message) {
const id = `pb-message-${ID()}`;
const item = html`<li id=${id} class="pf-c-alert-group__item">
const id = ID("pb-message");
const el = document.createElement("template");
el.innerHTML = `<li id=${id} class="pf-c-alert-group__item">
<div class="pf-c-alert pf-m-${message.level_tag} ${message.level_tag === 'error' ? 'pf-m-danger': ''}">
<div class="pf-c-alert__icon">
<i class="${LEVEL_ICON_MAP[message.level_tag]}">
<i class="${LEVEL_ICON_MAP[message.level_tag]}"></i>
</div>
<p class="pf-c-alert__title">
${message.message}
@ -43,7 +49,7 @@ class Messages extends LitElement {
setTimeout(() => {
this.querySelector(`#${id}`).remove();
}, 1500);
return item;
return el.content.firstChild;
}
render() {