Compare commits
19 commits
wip/team_n
...
testing
Author | SHA1 | Date | |
---|---|---|---|
65755feb2f | |||
ebb13b2a85 | |||
5f0d9b8626 | |||
3635a55e39 | |||
598f758332 | |||
66a03a9dca | |||
f266133d14 | |||
b393767871 | |||
02d0c1498d | |||
198a9ccaa0 | |||
22ac146110 | |||
2886d887f5 | |||
06c0d6cf44 | |||
1e23151021 | |||
ed7186cbbd | |||
c512da2660 | |||
e4fa48eb75 | |||
b31f3758e0 | |||
9141752fdf |
49 changed files with 1002 additions and 913 deletions
|
@ -35,7 +35,7 @@ jobs:
|
|||
|
||||
- name: Populate relevant files
|
||||
run: |
|
||||
mkdir ~/.ssh
|
||||
mkdir -p ~/.ssh
|
||||
echo "${{ secrets.C3LF_SSH_TESTING }}" > ~/.ssh/id_ed25519
|
||||
chmod 0600 ~/.ssh/id_ed25519
|
||||
ls -lah ~/.ssh
|
||||
|
@ -43,7 +43,7 @@ jobs:
|
|||
eval $(ssh-agent -s)
|
||||
ssh-add ~/.ssh/id_ed25519
|
||||
echo "andromeda.lab.or.it ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDXPoO0PE+B9PYwbGaLo98zhbmjAkp6eBtVeZe43v/+T" >> ~/.ssh/known_hosts
|
||||
mkdir /etc/ansible
|
||||
mkdir -p /etc/ansible
|
||||
echo "${{ secrets.C3LF_INVENTORY_TESTING }}" > /etc/ansible/hosts
|
||||
|
||||
- name: Check ansible version
|
||||
|
|
35
core/core/metrics.py
Normal file
35
core/core/metrics.py
Normal file
|
@ -0,0 +1,35 @@
|
|||
from django.apps import apps
|
||||
from prometheus_client.core import CounterMetricFamily, REGISTRY
|
||||
from django.db.models import Case, Value, When, BooleanField, Count
|
||||
from inventory.models import Item
|
||||
|
||||
class ItemCountCollector(object):
|
||||
|
||||
def collect(self):
|
||||
counter = CounterMetricFamily("item_count", "Current number of items", labels=['event', 'returned_state'])
|
||||
|
||||
yield counter
|
||||
|
||||
if not apps.models_ready or not apps.apps_ready:
|
||||
return
|
||||
|
||||
queryset = (
|
||||
Item.all_objects
|
||||
.annotate(
|
||||
returned=Case(
|
||||
When(returned_at__isnull=True, then=Value(False)),
|
||||
default=Value(True),
|
||||
output_field=BooleanField()
|
||||
)
|
||||
)
|
||||
.values('event__slug', 'returned', 'event_id')
|
||||
.annotate(amount=Count('id'))
|
||||
.order_by('event__slug', 'returned') # Optional: order by slug and returned
|
||||
)
|
||||
|
||||
for e in queryset:
|
||||
counter.add_metric([e["event__slug"].lower(), str(e["returned"])], e["amount"])
|
||||
|
||||
yield counter
|
||||
|
||||
REGISTRY.register(ItemCountCollector())
|
|
@ -49,10 +49,6 @@ SYSTEM3_VERSION = "0.0.0-dev.0"
|
|||
|
||||
ACTIVE_SPAM_TRAINING = truthy_str(os.getenv('ACTIVE_SPAM_TRAINING', 'False'))
|
||||
|
||||
TELEGRAM_BOT_TOKEN = os.getenv('TELEGRAM_BOT_TOKEN', '1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghi')
|
||||
|
||||
TELEGRAM_GROUP_CHAT_ID = os.getenv('TELEGRAM_GROUP_CHAT_ID', '-1234567890')
|
||||
|
||||
# Application definition
|
||||
|
||||
INSTALLED_APPS = [
|
||||
|
@ -69,7 +65,6 @@ INSTALLED_APPS = [
|
|||
'drf_yasg',
|
||||
'channels',
|
||||
'authentication',
|
||||
'notifications',
|
||||
'files',
|
||||
'tickets',
|
||||
'inventory',
|
||||
|
@ -129,19 +124,12 @@ TEMPLATES = [
|
|||
},
|
||||
]
|
||||
|
||||
WSGI_APPLICATION = 'core.wsgi.application'
|
||||
ASGI_APPLICATION = 'core.asgi.application'
|
||||
|
||||
# Database
|
||||
# https://docs.djangoproject.com/en/4.2/ref/settings/#databases
|
||||
|
||||
if 'test' in sys.argv:
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.sqlite3',
|
||||
'NAME': ':memory:',
|
||||
}
|
||||
}
|
||||
else:
|
||||
if os.getenv('DB_HOST') is not None:
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.mysql',
|
||||
|
@ -154,6 +142,20 @@ else:
|
|||
'charset': 'utf8mb4',
|
||||
'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"
|
||||
}
|
||||
},
|
||||
}
|
||||
elif os.getenv('DB_FILE') is not None:
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.sqlite3',
|
||||
'NAME': os.getenv('DB_FILE', 'local.db'),
|
||||
}
|
||||
}
|
||||
else:
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.sqlite3',
|
||||
'NAME': ':memory:',
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -19,6 +19,8 @@ from django.urls import path, include
|
|||
|
||||
from .version import get_info
|
||||
|
||||
from .metrics import *
|
||||
|
||||
urlpatterns = [
|
||||
path('djangoadmin/', admin.site.urls),
|
||||
path('api/2/', include('inventory.api_v2')),
|
||||
|
@ -28,7 +30,6 @@ urlpatterns = [
|
|||
path('api/2/', include('mail.api_v2')),
|
||||
path('api/2/', include('notify_sessions.api_v2')),
|
||||
path('api/2/', include('authentication.api_v2')),
|
||||
path('api/2/', include('notifications.api_v2')),
|
||||
path('api/', get_info),
|
||||
path('', include('django_prometheus.urls')),
|
||||
]
|
||||
|
|
|
@ -7,7 +7,6 @@ from channels.db import database_sync_to_async
|
|||
from django.core.files.base import ContentFile
|
||||
|
||||
from mail.models import Email, EventAddress, EmailAttachment
|
||||
from notifications.templates import render_auto_reply
|
||||
from notify_sessions.models import SystemEvent
|
||||
from tickets.models import IssueThread
|
||||
|
||||
|
@ -49,9 +48,15 @@ def unescape_and_decode_base64(s):
|
|||
return decoded
|
||||
|
||||
|
||||
def unescape_simplified_quoted_printable(s):
|
||||
def unescape_simplified_quoted_printable(s, encoding='utf-8'):
|
||||
import quopri
|
||||
return quopri.decodestring(s).decode('utf-8')
|
||||
return quopri.decodestring(s).decode(encoding)
|
||||
|
||||
|
||||
def ascii_strip(s):
|
||||
if not s:
|
||||
return None
|
||||
return ''.join([c for c in str(s) if 128 > ord(c) > 31])
|
||||
|
||||
|
||||
def collect_references(issue_thread):
|
||||
|
@ -88,22 +93,6 @@ def make_reply(reply_email, references=None, event=None):
|
|||
return reply
|
||||
|
||||
|
||||
def make_notification(message, to, title): # TODO where should replies to this go
|
||||
from email.message import EmailMessage
|
||||
from core.settings import MAIL_DOMAIN
|
||||
notification = EmailMessage()
|
||||
notification["From"] = "notifications@%s" % MAIL_DOMAIN
|
||||
notification["To"] = to
|
||||
notification["Subject"] = f"[C3LF Notification]%s" % title
|
||||
# notification["Reply-To"] = f"{event}@{MAIL_DOMAIN}"
|
||||
# notification["In-Reply-To"] = email.reference
|
||||
# notification["Message-ID"] = email.id + "@" + MAIL_DOMAIN
|
||||
|
||||
notification.set_content(message)
|
||||
|
||||
return notification
|
||||
|
||||
|
||||
async def send_smtp(message):
|
||||
await aiosmtplib.send(message, hostname="127.0.0.1", port=25, use_tls=False, start_tls=False)
|
||||
|
||||
|
@ -133,6 +122,19 @@ def find_target_event(address):
|
|||
return None
|
||||
|
||||
|
||||
def decode_email_segment(segment, charset, transfer_encoding):
|
||||
decode_as = 'utf-8'
|
||||
if charset == 'windows-1251':
|
||||
decode_as = 'cp1251'
|
||||
elif charset == 'iso-8859-1':
|
||||
decode_as = 'latin1'
|
||||
segment = unescape_and_decode_quoted_printable(segment)
|
||||
segment = unescape_and_decode_base64(segment)
|
||||
if transfer_encoding == 'quoted-printable':
|
||||
segment = unescape_simplified_quoted_printable(segment, decode_as)
|
||||
return segment
|
||||
|
||||
|
||||
def parse_email_body(raw, log=None):
|
||||
import email
|
||||
from hashlib import sha256
|
||||
|
@ -144,21 +146,24 @@ def parse_email_body(raw, log=None):
|
|||
if parsed.is_multipart():
|
||||
for part in parsed.walk():
|
||||
ctype = part.get_content_type()
|
||||
charset = part.get_content_charset()
|
||||
cdispo = str(part.get('Content-Disposition'))
|
||||
|
||||
if ctype == 'multipart/mixed':
|
||||
log.debug("Ignoring Multipart %s %s", ctype, cdispo)
|
||||
# skip any text/plain (txt) attachments
|
||||
if ctype == 'text/plain' and 'attachment' not in cdispo:
|
||||
elif ctype == 'text/plain' and 'attachment' not in cdispo:
|
||||
segment = part.get_payload()
|
||||
if not segment:
|
||||
continue
|
||||
segment = unescape_and_decode_quoted_printable(segment)
|
||||
segment = unescape_and_decode_base64(segment)
|
||||
if part.get('Content-Transfer-Encoding') == 'quoted-printable':
|
||||
segment = unescape_simplified_quoted_printable(segment)
|
||||
segment = decode_email_segment(segment, charset, part.get('Content-Transfer-Encoding'))
|
||||
log.debug(segment)
|
||||
body = body + segment
|
||||
elif 'attachment' in cdispo or 'inline' in cdispo:
|
||||
file = ContentFile(part.get_payload(decode=True))
|
||||
content = part.get_payload(decode=True)
|
||||
if content is None:
|
||||
continue
|
||||
file = ContentFile(content)
|
||||
chash = sha256(file.read()).hexdigest()
|
||||
name = part.get_filename()
|
||||
if name is None:
|
||||
|
@ -184,10 +189,7 @@ def parse_email_body(raw, log=None):
|
|||
else:
|
||||
log.warning("Unknown content type %s", parsed.get_content_type())
|
||||
body = "Unknown content type"
|
||||
body = unescape_and_decode_quoted_printable(body)
|
||||
body = unescape_and_decode_base64(body)
|
||||
if parsed.get('Content-Transfer-Encoding') == 'quoted-printable':
|
||||
body = unescape_simplified_quoted_printable(body)
|
||||
body = decode_email_segment(body, parsed.get_content_charset(), parsed.get('Content-Transfer-Encoding'))
|
||||
log.debug(body)
|
||||
|
||||
return parsed, body, attachments
|
||||
|
@ -199,8 +201,8 @@ def receive_email(envelope, log=None):
|
|||
|
||||
header_from = parsed.get('From')
|
||||
header_to = parsed.get('To')
|
||||
header_in_reply_to = parsed.get('In-Reply-To')
|
||||
header_message_id = parsed.get('Message-ID')
|
||||
header_in_reply_to = ascii_strip(parsed.get('In-Reply-To'))
|
||||
header_message_id = ascii_strip(parsed.get('Message-ID'))
|
||||
|
||||
if match(r'^([a-zA-Z ]*<)?MAILER-DAEMON@', header_from) and envelope.mail_from.strip("<>") == "":
|
||||
log.warning("Ignoring mailer daemon")
|
||||
|
@ -212,7 +214,7 @@ def receive_email(envelope, log=None):
|
|||
|
||||
recipient = envelope.rcpt_tos[0].lower() if envelope.rcpt_tos else header_to.lower()
|
||||
sender = envelope.mail_from if envelope.mail_from else header_from
|
||||
subject = parsed.get('Subject')
|
||||
subject = ascii_strip(parsed.get('Subject'))
|
||||
if not subject:
|
||||
subject = "No subject"
|
||||
subject = unescape_and_decode_quoted_printable(subject)
|
||||
|
@ -226,7 +228,8 @@ def receive_email(envelope, log=None):
|
|||
|
||||
email = Email.objects.create(
|
||||
sender=sender, recipient=recipient, body=body, subject=subject, reference=header_message_id,
|
||||
in_reply_to=header_in_reply_to, raw_file=ContentFile(envelope.content, name=random_filename), event=target_event,
|
||||
in_reply_to=header_in_reply_to, raw_file=ContentFile(envelope.content, name=random_filename),
|
||||
event=target_event,
|
||||
issue_thread=active_issue_thread)
|
||||
for attachment in attachments:
|
||||
email.attachments.add(attachment)
|
||||
|
@ -238,9 +241,18 @@ def receive_email(envelope, log=None):
|
|||
references = collect_references(active_issue_thread)
|
||||
if not sender.startswith('noreply'):
|
||||
subject = f"Re: {subject} [#{active_issue_thread.short_uuid()}]"
|
||||
body = render_auto_reply(active_issue_thread)
|
||||
body = '''Your request (#{}) has been received and will be reviewed by our lost&found angels.
|
||||
|
||||
We are reviewing incoming requests during the event and teardown. Immediately after the event, expect a delay as the \
|
||||
workload is high. We will not forget about your request and get back in touch once we have updated information on your \
|
||||
request. Requests for devices, wallets, credit cards or similar items will be handled with priority.
|
||||
|
||||
If you happen to find your lost item or just want to add additional information, please reply to this email. Please \
|
||||
do not create a new request.
|
||||
|
||||
Your c3lf (Cloakroom + Lost&Found) Team'''.format(active_issue_thread.short_uuid())
|
||||
reply_email = Email.objects.create(
|
||||
sender=recipient, recipient=sender, body=body, subject=subject,
|
||||
sender=recipient, recipient=sender, body=body, subject=ascii_strip(subject),
|
||||
in_reply_to=header_message_id, event=target_event, issue_thread=active_issue_thread)
|
||||
reply = make_reply(reply_email, references, event=target_event.slug if target_event else None)
|
||||
else:
|
||||
|
@ -281,19 +293,11 @@ class LMTPHandler:
|
|||
'general', {"type": "generic.event", "name": "send_message_to_frontend", "event_id": systemevent.id,
|
||||
"message": "email received"})
|
||||
log.info(f"Sent message to frontend")
|
||||
|
||||
if new and reply:
|
||||
log.info('Sending message to %s' % reply['To'])
|
||||
await send_smtp(reply)
|
||||
log.info("Sent auto reply")
|
||||
|
||||
if thread:
|
||||
await channel_layer.group_send(
|
||||
'general', {"type": "generic.event", "name": "user_notification", "event_id": systemevent.id,
|
||||
"ticket_id": thread.id, "new": new})
|
||||
else:
|
||||
print("No thread found")
|
||||
|
||||
return '250 Message accepted for delivery'
|
||||
except SpecialMailException as e:
|
||||
import uuid
|
||||
|
|
|
@ -142,7 +142,7 @@ class LMTPHandlerTestCase(TestCase): # TODO replace with less hacky test
|
|||
aiosmtplib.send.assert_called_once()
|
||||
self.assertEqual('test ä', Email.objects.all()[0].subject)
|
||||
self.assertEqual('Text mit Quoted-Printable-Kodierung: äöüß', Email.objects.all()[0].body)
|
||||
self.assertTrue( Email.objects.all()[0].raw_file.path)
|
||||
self.assertTrue(Email.objects.all()[0].raw_file.path)
|
||||
|
||||
def test_handle_quoted_printable_2(self):
|
||||
from aiosmtpd.smtp import Envelope
|
||||
|
@ -163,7 +163,7 @@ class LMTPHandlerTestCase(TestCase): # TODO replace with less hacky test
|
|||
aiosmtplib.send.assert_called_once()
|
||||
self.assertEqual('suche_Mütze', Email.objects.all()[0].subject)
|
||||
self.assertEqual('Text mit Quoted-Printable-Kodierung: äöüß', Email.objects.all()[0].body)
|
||||
self.assertTrue( Email.objects.all()[0].raw_file.path)
|
||||
self.assertTrue(Email.objects.all()[0].raw_file.path)
|
||||
|
||||
def test_handle_base64(self):
|
||||
from aiosmtpd.smtp import Envelope
|
||||
|
@ -184,7 +184,7 @@ class LMTPHandlerTestCase(TestCase): # TODO replace with less hacky test
|
|||
aiosmtplib.send.assert_called_once()
|
||||
self.assertEqual('test', Email.objects.all()[0].subject)
|
||||
self.assertEqual('Text mit Base64-Kodierung: äöüß', Email.objects.all()[0].body)
|
||||
self.assertTrue( Email.objects.all()[0].raw_file.path)
|
||||
self.assertTrue(Email.objects.all()[0].raw_file.path)
|
||||
|
||||
def test_handle_client_reply(self):
|
||||
issue_thread = IssueThread.objects.create(
|
||||
|
@ -232,7 +232,7 @@ class LMTPHandlerTestCase(TestCase): # TODO replace with less hacky test
|
|||
self.assertEqual(IssueThread.objects.all()[0].name, 'test')
|
||||
self.assertEqual(IssueThread.objects.all()[0].state, 'pending_new')
|
||||
self.assertEqual(IssueThread.objects.all()[0].assigned_to, None)
|
||||
self.assertTrue( Email.objects.all()[2].raw_file.path)
|
||||
self.assertTrue(Email.objects.all()[2].raw_file.path)
|
||||
|
||||
def test_handle_client_reply_2(self):
|
||||
issue_thread = IssueThread.objects.create(
|
||||
|
@ -285,7 +285,7 @@ class LMTPHandlerTestCase(TestCase): # TODO replace with less hacky test
|
|||
self.assertEqual(IssueThread.objects.all()[0].name, 'test')
|
||||
self.assertEqual(IssueThread.objects.all()[0].state, 'pending_open')
|
||||
self.assertEqual(IssueThread.objects.all()[0].assigned_to, None)
|
||||
self.assertTrue( Email.objects.all()[2].raw_file.path)
|
||||
self.assertTrue(Email.objects.all()[2].raw_file.path)
|
||||
|
||||
def test_mail_reply(self):
|
||||
issue_thread = IssueThread.objects.create(
|
||||
|
@ -887,6 +887,59 @@ hello \xe4\xf6\xfc'''
|
|||
self.assertEqual(1, len(states))
|
||||
self.assertEqual('pending_new', states[0].state)
|
||||
|
||||
def test_mail_windows_1252(self):
|
||||
from aiosmtpd.smtp import Envelope
|
||||
from asgiref.sync import async_to_sync
|
||||
import aiosmtplib
|
||||
|
||||
aiosmtplib.send = make_mocked_coro()
|
||||
|
||||
handler = LMTPHandler()
|
||||
server = mock.Mock()
|
||||
session = mock.Mock()
|
||||
envelope = Envelope()
|
||||
|
||||
envelope.mail_from = 'test1@test'
|
||||
envelope.rcpt_tos = ['test2@test']
|
||||
|
||||
envelope.content = b'''Subject: test
|
||||
From: test1@test
|
||||
To: test2@test
|
||||
Message-ID: <1@test>
|
||||
Content-Type: text/html; charset=windows-1252
|
||||
Content-Transfer-Encoding: quoted-printable
|
||||
|
||||
=0D=0Ahello='''
|
||||
|
||||
result = async_to_sync(handler.handle_DATA)(server, session, envelope)
|
||||
self.assertEqual('250 Message accepted for delivery', result)
|
||||
self.assertEqual(2, len(Email.objects.all()))
|
||||
self.assertEqual(1, len(IssueThread.objects.all()))
|
||||
aiosmtplib.send.assert_called_once()
|
||||
self.assertEqual('test', Email.objects.all()[0].subject)
|
||||
self.assertEqual('test1@test', Email.objects.all()[0].sender)
|
||||
self.assertEqual('test2@test', Email.objects.all()[0].recipient)
|
||||
self.assertEqual('\r\nhello', Email.objects.all()[0].body)
|
||||
self.assertEqual(IssueThread.objects.all()[0], Email.objects.all()[0].issue_thread)
|
||||
self.assertEqual('<1@test>', Email.objects.all()[0].reference)
|
||||
self.assertEqual(None, Email.objects.all()[0].in_reply_to)
|
||||
self.assertEqual(expected_auto_reply_subject.format('test', IssueThread.objects.all()[0].short_uuid()),
|
||||
Email.objects.all()[1].subject)
|
||||
self.assertEqual('test2@test', Email.objects.all()[1].sender)
|
||||
self.assertEqual('test1@test', Email.objects.all()[1].recipient)
|
||||
self.assertEqual(expected_auto_reply.format(IssueThread.objects.all()[0].short_uuid()),
|
||||
Email.objects.all()[1].body)
|
||||
self.assertEqual(IssueThread.objects.all()[0], Email.objects.all()[1].issue_thread)
|
||||
self.assertTrue(Email.objects.all()[1].reference.startswith("<"))
|
||||
self.assertTrue(Email.objects.all()[1].reference.endswith("@localhost>"))
|
||||
self.assertEqual("<1@test>", Email.objects.all()[1].in_reply_to)
|
||||
self.assertEqual('test', IssueThread.objects.all()[0].name)
|
||||
self.assertEqual('pending_new', IssueThread.objects.all()[0].state)
|
||||
self.assertEqual(None, IssueThread.objects.all()[0].assigned_to)
|
||||
states = StateChange.objects.filter(issue_thread=IssueThread.objects.all()[0])
|
||||
self.assertEqual(1, len(states))
|
||||
self.assertEqual('pending_new', states[0].state)
|
||||
|
||||
def test_mail_quoted_printable_transfer_encoding(self):
|
||||
from aiosmtpd.smtp import Envelope
|
||||
from asgiref.sync import async_to_sync
|
||||
|
@ -939,3 +992,146 @@ hello =C3=A4=C3=B6=C3=BC'''
|
|||
states = StateChange.objects.filter(issue_thread=IssueThread.objects.all()[0])
|
||||
self.assertEqual(1, len(states))
|
||||
self.assertEqual('pending_new', states[0].state)
|
||||
|
||||
def test_text_with_attachment2(self):
|
||||
from aiosmtpd.smtp import Envelope
|
||||
from asgiref.sync import async_to_sync
|
||||
import aiosmtplib
|
||||
aiosmtplib.send = make_mocked_coro()
|
||||
handler = LMTPHandler()
|
||||
server = mock.Mock()
|
||||
session = mock.Mock()
|
||||
envelope = Envelope()
|
||||
envelope.mail_from = 'test1@test'
|
||||
envelope.rcpt_tos = ['test2@test']
|
||||
envelope.content = b'''Subject: test
|
||||
From: test1@test
|
||||
To: test2@test
|
||||
Message-ID: <1@test>
|
||||
Content-Type: multipart/mixed; boundary="abc"
|
||||
Content-Disposition: inline
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
--abc
|
||||
Content-Type: text/plain; charset=utf-8
|
||||
Content-Disposition: inline
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
test1
|
||||
|
||||
--abc
|
||||
Content-Type: image/jpeg; name="test.jpg"
|
||||
Content-Disposition: attachment; filename="test.jpg"
|
||||
Content-Transfer-Encoding: base64
|
||||
Content-ID: <1>
|
||||
X-Attachment-Id: 1
|
||||
|
||||
dGVzdGltYWdl
|
||||
|
||||
--abc--'''
|
||||
|
||||
result = async_to_sync(handler.handle_DATA)(server, session, envelope)
|
||||
self.assertEqual(result, '250 Message accepted for delivery')
|
||||
self.assertEqual(len(Email.objects.all()), 2)
|
||||
self.assertEqual(len(IssueThread.objects.all()), 1)
|
||||
aiosmtplib.send.assert_called_once()
|
||||
self.assertEqual('test', Email.objects.all()[0].subject)
|
||||
self.assertEqual('test1@test', Email.objects.all()[0].sender)
|
||||
self.assertEqual('test2@test', Email.objects.all()[0].recipient)
|
||||
self.assertEqual('test1\n', Email.objects.all()[0].body)
|
||||
self.assertEqual(IssueThread.objects.all()[0], Email.objects.all()[0].issue_thread)
|
||||
self.assertEqual('<1@test>', Email.objects.all()[0].reference)
|
||||
self.assertEqual(None, Email.objects.all()[0].in_reply_to)
|
||||
self.assertEqual(expected_auto_reply_subject.format('test', IssueThread.objects.all()[0].short_uuid()),
|
||||
Email.objects.all()[1].subject)
|
||||
self.assertEqual('test2@test', Email.objects.all()[1].sender)
|
||||
self.assertEqual('test1@test', Email.objects.all()[1].recipient)
|
||||
self.assertEqual(expected_auto_reply.format(IssueThread.objects.all()[0].short_uuid()),
|
||||
Email.objects.all()[1].body)
|
||||
self.assertEqual(IssueThread.objects.all()[0], Email.objects.all()[1].issue_thread)
|
||||
self.assertTrue(Email.objects.all()[1].reference.startswith("<"))
|
||||
self.assertTrue(Email.objects.all()[1].reference.endswith("@localhost>"))
|
||||
self.assertEqual("<1@test>", Email.objects.all()[1].in_reply_to)
|
||||
self.assertEqual('test', IssueThread.objects.all()[0].name)
|
||||
self.assertEqual('pending_new', IssueThread.objects.all()[0].state)
|
||||
self.assertEqual(None, IssueThread.objects.all()[0].assigned_to)
|
||||
states = StateChange.objects.filter(issue_thread=IssueThread.objects.all()[0])
|
||||
self.assertEqual(1, len(states))
|
||||
self.assertEqual('pending_new', states[0].state)
|
||||
self.assertEqual(1, len(EmailAttachment.objects.all()))
|
||||
self.assertEqual(1, EmailAttachment.objects.all()[0].id)
|
||||
self.assertEqual('image/jpeg', EmailAttachment.objects.all()[0].mime_type)
|
||||
self.assertEqual('test.jpg', EmailAttachment.objects.all()[0].name)
|
||||
file_content = EmailAttachment.objects.all()[0].file.read()
|
||||
self.assertEqual(b'testimage', file_content)
|
||||
|
||||
|
||||
def test_text_non_utf8_in_multipart(self):
|
||||
from aiosmtpd.smtp import Envelope
|
||||
from asgiref.sync import async_to_sync
|
||||
import aiosmtplib
|
||||
|
||||
aiosmtplib.send = make_mocked_coro()
|
||||
|
||||
handler = LMTPHandler()
|
||||
server = mock.Mock()
|
||||
session = mock.Mock()
|
||||
envelope = Envelope()
|
||||
|
||||
envelope.mail_from = 'test1@test'
|
||||
envelope.rcpt_tos = ['test2@test']
|
||||
|
||||
envelope.content = b'''Subject: test
|
||||
From: test1@test
|
||||
To: test2@test
|
||||
Message-ID: <1@test>
|
||||
Content-Type: multipart/alternative; boundary="abc"
|
||||
|
||||
--abc
|
||||
Content-Type: text/plain; charset=utf-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
test1
|
||||
|
||||
--abc
|
||||
Content-Type: text/plain; charset=iso-8859-1
|
||||
Content-Transfer-Encoding: quoted-printable
|
||||
|
||||
hello =E4
|
||||
|
||||
--abc
|
||||
Content-Type: text/plain; charset=windows-1252
|
||||
Content-Transfer-Encoding: quoted-printable
|
||||
|
||||
=0D=0Ahello
|
||||
|
||||
--abc--'''
|
||||
|
||||
result = async_to_sync(handler.handle_DATA)(server, session, envelope)
|
||||
self.assertEqual(result, '250 Message accepted for delivery')
|
||||
self.assertEqual(len(Email.objects.all()), 2)
|
||||
self.assertEqual(len(IssueThread.objects.all()), 1)
|
||||
aiosmtplib.send.assert_called_once()
|
||||
self.assertEqual('test', Email.objects.all()[0].subject)
|
||||
self.assertEqual('test1@test', Email.objects.all()[0].sender)
|
||||
self.assertEqual('test2@test', Email.objects.all()[0].recipient)
|
||||
self.assertEqual('test1\nhello ä\n\r\nhello\n', Email.objects.all()[0].body)
|
||||
self.assertEqual(IssueThread.objects.all()[0], Email.objects.all()[0].issue_thread)
|
||||
self.assertEqual('<1@test>', Email.objects.all()[0].reference)
|
||||
self.assertEqual(None, Email.objects.all()[0].in_reply_to)
|
||||
self.assertEqual(expected_auto_reply_subject.format('test', IssueThread.objects.all()[0].short_uuid()),
|
||||
Email.objects.all()[1].subject)
|
||||
self.assertEqual('test2@test', Email.objects.all()[1].sender)
|
||||
self.assertEqual('test1@test', Email.objects.all()[1].recipient)
|
||||
self.assertEqual(expected_auto_reply.format(IssueThread.objects.all()[0].short_uuid()),
|
||||
Email.objects.all()[1].body)
|
||||
self.assertEqual(IssueThread.objects.all()[0], Email.objects.all()[1].issue_thread)
|
||||
self.assertTrue(Email.objects.all()[1].reference.startswith("<"))
|
||||
self.assertTrue(Email.objects.all()[1].reference.endswith("@localhost>"))
|
||||
self.assertEqual("<1@test>", Email.objects.all()[1].in_reply_to)
|
||||
self.assertEqual('test', IssueThread.objects.all()[0].name)
|
||||
self.assertEqual('pending_new', IssueThread.objects.all()[0].state)
|
||||
self.assertEqual(None, IssueThread.objects.all()[0].assigned_to)
|
||||
states = StateChange.objects.filter(issue_thread=IssueThread.objects.all()[0])
|
||||
self.assertEqual(1, len(states))
|
||||
self.assertEqual('pending_new', states[0].state)
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
from django.contrib.auth.models import Permission
|
||||
from django.test import TestCase
|
||||
|
||||
from authentication.models import ExtendedUser
|
||||
from notifications.models import UserNotificationChannel
|
||||
|
||||
|
||||
class UserNotificationTestCase(TestCase):
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.user = ExtendedUser.objects.create_user('testuser', 'test', 'test')
|
||||
self.user.user_permissions.add(*Permission.objects.all())
|
||||
self.user.save()
|
||||
self.channel = UserNotificationChannel.objects.create(user=self.user, channel_type='telegram',
|
||||
channel_target='123456789',
|
||||
event_filter='*', active=True)
|
||||
|
||||
async def test_telegram_notify(self):
|
||||
pass
|
|
@ -1,15 +0,0 @@
|
|||
from django.contrib import admin
|
||||
|
||||
from notifications.models import MessageTemplate, UserNotificationChannel
|
||||
|
||||
|
||||
class MessageTemplateAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
|
||||
|
||||
class UserNotificationChannelAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
|
||||
|
||||
admin.site.register(MessageTemplate, MessageTemplateAdmin)
|
||||
admin.site.register(UserNotificationChannel, UserNotificationChannelAdmin)
|
|
@ -1,51 +0,0 @@
|
|||
from django.contrib.auth.decorators import permission_required
|
||||
from rest_framework import routers, viewsets
|
||||
from django.urls import re_path
|
||||
from rest_framework.decorators import api_view, permission_classes
|
||||
from rest_framework.permissions import IsAuthenticated
|
||||
from rest_framework.response import Response
|
||||
|
||||
from notifications.models import MessageTemplate, UserNotificationChannel
|
||||
from rest_framework import serializers
|
||||
|
||||
from notifications.templates import TEMPLATE_VARS
|
||||
from authentication.serializers import UserSerializer
|
||||
|
||||
|
||||
class MessageTemplateSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = MessageTemplate
|
||||
fields = '__all__'
|
||||
|
||||
|
||||
class UserNotificationChannelSerializer(serializers.ModelSerializer):
|
||||
user = UserSerializer()
|
||||
|
||||
class Meta:
|
||||
model = UserNotificationChannel
|
||||
fields = '__all__'
|
||||
|
||||
|
||||
class MessageTemplateViewSet(viewsets.ModelViewSet):
|
||||
serializer_class = MessageTemplateSerializer
|
||||
queryset = MessageTemplate.objects.all()
|
||||
|
||||
|
||||
class UserNotificationChannelViewSet(viewsets.ModelViewSet):
|
||||
serializer_class = UserNotificationChannelSerializer
|
||||
queryset = UserNotificationChannel.objects.all()
|
||||
|
||||
|
||||
@api_view(['GET'])
|
||||
@permission_classes([IsAuthenticated])
|
||||
@permission_required('tickets.add_issuethread_manual', raise_exception=True) # TDOO: change this permission
|
||||
def get_template_vars(self):
|
||||
return Response(TEMPLATE_VARS, status=200)
|
||||
|
||||
|
||||
router = routers.SimpleRouter()
|
||||
router.register(r'message_templates', MessageTemplateViewSet)
|
||||
router.register(r'user_notification_channels', UserNotificationChannelViewSet)
|
||||
urlpatterns = ([
|
||||
re_path('message_template_variables', get_template_vars),
|
||||
] + router.urls)
|
|
@ -1,16 +0,0 @@
|
|||
auto_reply_body = '''Your request (#{{ ticket_uuid }}) has been received and will be reviewed by our lost&found angels.
|
||||
|
||||
We are reviewing incoming requests during the event and teardown. Immediately after the event, expect a delay as the \
|
||||
workload is high. We will not forget about your request and get back in touch once we have updated information on your \
|
||||
request. Requests for devices, wallets, credit cards or similar items will be handled with priority.
|
||||
|
||||
If you happen to find your lost item or just want to add additional information, please reply to this email. Please \
|
||||
do not create a new request.
|
||||
|
||||
Your c3lf (Cloakroom + Lost&Found) Team'''
|
||||
|
||||
new_issue_notification = '''New issue "{{ ticket_name | limit_length }}" [{{ ticket_uuid }}] created
|
||||
{{ ticket_url }}'''
|
||||
|
||||
reply_issue_notification = '''Reply to issue "{{ ticket_name }}" [{{ ticket_uuid }}] (was {{ previous_state_pretty }})
|
||||
{{ ticket_url }}'''
|
|
@ -1,85 +0,0 @@
|
|||
import asyncio
|
||||
|
||||
from aiohttp.client import ClientSession
|
||||
from channels.layers import get_channel_layer
|
||||
from channels.db import database_sync_to_async
|
||||
from urllib.parse import quote as urlencode
|
||||
|
||||
from core.settings import TELEGRAM_BOT_TOKEN, TELEGRAM_GROUP_CHAT_ID
|
||||
from mail.protocol import send_smtp, make_notification
|
||||
from notifications.models import UserNotificationChannel
|
||||
from notifications.templates import render_notification_new_ticket_async, render_notification_reply_ticket_async
|
||||
from tickets.models import IssueThread
|
||||
|
||||
|
||||
async def http_get(url):
|
||||
async with ClientSession() as session:
|
||||
async with session.get(url) as response:
|
||||
return await response.text()
|
||||
|
||||
|
||||
async def telegram_notify(message, chat_id):
|
||||
encoded_message = urlencode(message)
|
||||
url = f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/sendMessage?chat_id={chat_id}&text={encoded_message}"
|
||||
return await http_get(url)
|
||||
|
||||
|
||||
async def email_notify(message, title, email):
|
||||
mail = make_notification(message, email, title)
|
||||
await send_smtp(mail)
|
||||
|
||||
|
||||
class NotificationDispatcher:
|
||||
channel_layer = None
|
||||
room_group_name = "general"
|
||||
|
||||
def __init__(self):
|
||||
self.channel_layer = get_channel_layer('default')
|
||||
if not self.channel_layer:
|
||||
raise Exception("Could not get channel layer")
|
||||
|
||||
@database_sync_to_async
|
||||
def get_notification_targets(self):
|
||||
channels = UserNotificationChannel.objects.filter(active=True)
|
||||
return list(channels)
|
||||
|
||||
@database_sync_to_async
|
||||
def get_ticket(self, ticket_id):
|
||||
return IssueThread.objects.filter(id=ticket_id).select_related('event').first()
|
||||
|
||||
async def run_forever(self):
|
||||
# Infinite loop to continuously listen for messages
|
||||
print("Listening for messages...")
|
||||
channel_name = await self.channel_layer.new_channel()
|
||||
await self.channel_layer.group_add(self.room_group_name, channel_name)
|
||||
print("Channel name:", channel_name)
|
||||
while True:
|
||||
# Blocking receive to get the message from the channel layer
|
||||
message = await self.channel_layer.receive(channel_name)
|
||||
|
||||
if (message and 'type' in message and message['type'] == 'generic.event' and 'name' in message and
|
||||
message['name'] == 'user_notification'):
|
||||
if 'ticket_id' in message and 'event_id' in message and 'new' in message:
|
||||
ticket = await self.get_ticket(message['ticket_id'])
|
||||
await self.dispatch(ticket, message['event_id'], message['new'])
|
||||
else:
|
||||
print("Error: Invalid message format")
|
||||
|
||||
async def dispatch(self, ticket, event_id, new):
|
||||
message = await render_notification_new_ticket_async(
|
||||
ticket) if new else await render_notification_reply_ticket_async(ticket)
|
||||
title = f"[#{ticket.short_uuid()}] {ticket.name}"
|
||||
print("Dispatching message:", message, "with event_id:", event_id)
|
||||
targets = await self.get_notification_targets()
|
||||
jobs = []
|
||||
jobs.append(telegram_notify(message, TELEGRAM_GROUP_CHAT_ID))
|
||||
for target in targets:
|
||||
if target.channel_type == 'telegram':
|
||||
print("Sending telegram notification to:", target.channel_target)
|
||||
jobs.append(telegram_notify(message, target.channel_target))
|
||||
elif target.channel_type == 'email':
|
||||
print("Sending email notification to:", target.channel_target)
|
||||
jobs.append(email_notify(message, title, target.channel_target))
|
||||
else:
|
||||
print("Unknown channel type:", target.channel_type)
|
||||
await asyncio.gather(*jobs)
|
|
@ -1,51 +0,0 @@
|
|||
# Generated by Django 4.2.7 on 2024-05-03 21:02
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
from notifications.defaults import auto_reply_body, new_issue_notification, reply_issue_notification
|
||||
from notifications.models import MessageTemplate
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
def create_required_templates(apps, schema_editor):
|
||||
MessageTemplate.objects.create(name='auto_reply', message=auto_reply_body, marked_required=True)
|
||||
MessageTemplate.objects.create(name='new_issue_notification', message=new_issue_notification,
|
||||
marked_required=True)
|
||||
MessageTemplate.objects.create(name='reply_issue_notification', message=reply_issue_notification,
|
||||
marked_required=True)
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='MessageTemplate',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=255)),
|
||||
('message', models.TextField()),
|
||||
('created', models.DateTimeField(auto_now_add=True)),
|
||||
('marked_confidential', models.BooleanField(default=False)),
|
||||
('marked_required', models.BooleanField(default=False)),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='UserNotificationChannel',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('channel_type',
|
||||
models.CharField(choices=[('telegram', 'telegram'), ('email', 'email')], max_length=255)),
|
||||
('channel_target', models.CharField(max_length=255)),
|
||||
('event_filter', models.CharField(max_length=255)),
|
||||
('active', models.BooleanField(default=True)),
|
||||
('created', models.DateTimeField(auto_now_add=True)),
|
||||
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
|
||||
],
|
||||
),
|
||||
migrations.RunPython(create_required_templates),
|
||||
]
|
|
@ -1,29 +0,0 @@
|
|||
from django.db import models
|
||||
|
||||
from authentication.models import ExtendedUser
|
||||
|
||||
|
||||
class MessageTemplate(models.Model):
|
||||
name = models.CharField(max_length=255)
|
||||
message = models.TextField()
|
||||
created = models.DateTimeField(auto_now_add=True)
|
||||
marked_confidential = models.BooleanField(default=False)
|
||||
marked_required = models.BooleanField(default=False) # may not be deleted
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
class UserNotificationChannel(models.Model):
|
||||
user = models.ForeignKey(ExtendedUser, models.CASCADE)
|
||||
channel_type = models.CharField(choices=[('telegram', 'telegram'), ('email', 'email')], max_length=255)
|
||||
channel_target = models.CharField(max_length=255)
|
||||
event_filter = models.CharField(max_length=255)
|
||||
active = models.BooleanField(default=True)
|
||||
created = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
def validate_constraints(self, exclude=None): # TODO: email -> emailaddress, telegram -> chatid
|
||||
return True
|
||||
|
||||
def __str__(self):
|
||||
return self.user.username + '(' + self.channel_type + ')'
|
|
@ -1,69 +0,0 @@
|
|||
import jinja2
|
||||
from channels.db import database_sync_to_async
|
||||
from core.settings import PRIMARY_HOST
|
||||
|
||||
from notifications.models import MessageTemplate
|
||||
|
||||
TEMPLATE_VARS = ['ticket_name', 'ticket_uuid', 'ticket_id', 'ticket_url',
|
||||
'current_state', 'previous_state', 'current_state_pretty', 'previous_state_pretty',
|
||||
'event_slug', 'event_name',
|
||||
'username', 'user_nick',
|
||||
'web_host'] # TODO customer_name, tracking_code
|
||||
|
||||
|
||||
def limit_length(s, length=50):
|
||||
if len(s) > length:
|
||||
return s[:(length - 3)] + "..."
|
||||
return s
|
||||
|
||||
|
||||
def ticket_url(ticket):
|
||||
eventslug = ticket.event.slug if ticket.event else "37C3" # TODO 37C3 should not be hardcoded
|
||||
return f"https://{PRIMARY_HOST}/{eventslug}/ticket/{ticket.id}/"
|
||||
|
||||
|
||||
def render_template(template, **kwargs):
|
||||
try:
|
||||
environment = jinja2.Environment()
|
||||
environment.filters['limit_length'] = limit_length
|
||||
tmpl = MessageTemplate.objects.get(name=template)
|
||||
template = environment.from_string(tmpl.message)
|
||||
return template.render(**kwargs, web_host=PRIMARY_HOST)
|
||||
except MessageTemplate.DoesNotExist:
|
||||
return None
|
||||
|
||||
|
||||
def get_ticket_vars(ticket):
|
||||
states = list(ticket.state_changes.order_by('-timestamp'))
|
||||
return {
|
||||
'ticket_name': ticket.name,
|
||||
'ticket_uuid': ticket.short_uuid(),
|
||||
'ticket_id': ticket.id,
|
||||
'ticket_url': ticket_url(ticket),
|
||||
'current_state': states[0].state if states else 'none',
|
||||
'previous_state': states[1].state if len(states) > 1 else 'none',
|
||||
'current_state_pretty': states[0].get_state_display() if states else 'none',
|
||||
'previous_state_pretty': states[1].get_state_display() if len(states) > 1 else 'none',
|
||||
'event_slug': ticket.event.slug if ticket.event else "37C3", # TODO 37C3 should not be hardcoded
|
||||
'event_name': ticket.event.name if ticket.event else "37C3",
|
||||
}
|
||||
|
||||
|
||||
def render_auto_reply(ticket):
|
||||
return render_template('auto_reply', **get_ticket_vars(ticket))
|
||||
|
||||
|
||||
def render_notification_new_ticket(ticket):
|
||||
return render_template('new_issue_notification', **get_ticket_vars(ticket))
|
||||
|
||||
|
||||
def render_notification_reply_ticket(ticket):
|
||||
return render_template('reply_issue_notification', **get_ticket_vars(ticket))
|
||||
|
||||
|
||||
async def render_notification_new_ticket_async(ticket):
|
||||
return await database_sync_to_async(render_notification_new_ticket)(ticket)
|
||||
|
||||
|
||||
async def render_notification_reply_ticket_async(ticket):
|
||||
return await database_sync_to_async(render_notification_reply_ticket)(ticket)
|
|
@ -12,7 +12,6 @@ django.setup()
|
|||
from helper import init_loop
|
||||
from mail.protocol import LMTPHandler
|
||||
from mail.socket import UnixSocketLMTPController
|
||||
from notifications.dispatch import NotificationDispatcher
|
||||
|
||||
|
||||
class UvicornServer(uvicorn.Server):
|
||||
|
@ -55,11 +54,6 @@ async def lmtp(loop):
|
|||
log.info("LMTP done")
|
||||
|
||||
|
||||
async def notifications(loop):
|
||||
dispatcher = NotificationDispatcher()
|
||||
await dispatcher.run_forever()
|
||||
|
||||
|
||||
def main():
|
||||
import sdnotify
|
||||
import setproctitle
|
||||
|
@ -73,7 +67,6 @@ def main():
|
|||
loop.create_task(web(loop))
|
||||
# loop.create_task(tcp(loop))
|
||||
loop.create_task(lmtp(loop))
|
||||
loop.create_task(notifications(loop))
|
||||
n = sdnotify.SystemdNotifier()
|
||||
n.notify("READY=1")
|
||||
log.info("Server ready")
|
||||
|
|
|
@ -143,12 +143,36 @@ def add_comment(request, pk):
|
|||
|
||||
|
||||
def filter_issues(issues, query):
|
||||
query_tokens = query.split(' ')
|
||||
query_tokens = query.lower().split(' ')
|
||||
for issue in issues:
|
||||
value = 0
|
||||
if issue.short_uuid() in query:
|
||||
value += 10
|
||||
if "T#" + str(issue.id) in query:
|
||||
value += 10
|
||||
elif "#" + str(issue.id) in query:
|
||||
value += 9
|
||||
for item in issue.related_items:
|
||||
if "I#" + str(item.id) in query:
|
||||
value += 8
|
||||
elif "#" + str(item.id) in query:
|
||||
value += 5
|
||||
for token in query_tokens:
|
||||
if token in item.description.lower():
|
||||
value += 1
|
||||
for token in query_tokens:
|
||||
if token in issue.description:
|
||||
if token in issue.name.lower():
|
||||
value += 1
|
||||
for comment in issue.comments.all():
|
||||
for token in query_tokens:
|
||||
if token in comment.comment.lower():
|
||||
value += 1
|
||||
for email in issue.emails.all():
|
||||
for token in query_tokens:
|
||||
if token in email.subject.lower():
|
||||
value += 1
|
||||
if token in email.body.lower():
|
||||
value += 1
|
||||
if value > 0:
|
||||
yield {'search_score': value, 'issue': issue}
|
||||
|
||||
|
@ -160,7 +184,10 @@ def search_issues(request, event_slug, query):
|
|||
event = Event.objects.get(slug=event_slug)
|
||||
if not request.user.has_event_perm(event, 'view_issuethread'):
|
||||
return Response(status=403)
|
||||
items = filter_issues(IssueThread.objects.filter(event=event), b64decode(query).decode('utf-8'))
|
||||
serializer = IssueSerializer()
|
||||
queryset = IssueThread.objects.filter(event=event)
|
||||
items = filter_issues(queryset.prefetch_related(*serializer.Meta.prefetch_related_fields),
|
||||
b64decode(query).decode('utf-8'))
|
||||
return Response(SearchResultSerializer(items, many=True).data)
|
||||
except Event.DoesNotExist:
|
||||
return Response(status=404)
|
||||
|
|
|
@ -139,10 +139,10 @@ class IssueSerializer(BasicIssueSerializer):
|
|||
|
||||
class SearchResultSerializer(serializers.Serializer):
|
||||
search_score = serializers.IntegerField()
|
||||
item = IssueSerializer()
|
||||
issue = IssueSerializer()
|
||||
|
||||
def to_representation(self, instance):
|
||||
return {**IssueSerializer(instance['item']).data, 'search_score': instance['search_score']}
|
||||
return {**IssueSerializer(instance['issue']).data, 'search_score': instance['search_score']}
|
||||
|
||||
class Meta:
|
||||
model = IssueThread
|
||||
|
|
|
@ -383,15 +383,85 @@ class IssueSearchTest(TestCase):
|
|||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.event = Event.objects.create(slug='EVENT', name='Event')
|
||||
self.user = ExtendedUser.objects.create_user('testuser', 'test', 'test')
|
||||
self.user.user_permissions.add(*Permission.objects.all())
|
||||
self.user.save()
|
||||
self.event = Event.objects.create(slug='EVENT', name='Event')
|
||||
self.box = Container.objects.create(name='box1')
|
||||
self.item = Item.objects.create(container=self.box, description="foo", event=self.event)
|
||||
self.token = AuthToken.objects.create(user=self.user)
|
||||
self.client = Client(headers={'Authorization': 'Token ' + self.token[1]})
|
||||
|
||||
def test_search(self):
|
||||
def test_search_empty_result(self):
|
||||
search_query = b64encode(b'abc').decode('utf-8')
|
||||
response = self.client.get(f'/api/2/{self.event.slug}/tickets/{search_query}/')
|
||||
self.assertEqual(200, response.status_code)
|
||||
self.assertEqual([], response.json())
|
||||
|
||||
def test_search(self):
|
||||
now = datetime.now()
|
||||
issue = IssueThread.objects.create(
|
||||
name="test issue Abc",
|
||||
event=self.event,
|
||||
)
|
||||
mail1 = Email.objects.create(
|
||||
subject='test',
|
||||
body='test aBc',
|
||||
sender='test',
|
||||
recipient='test',
|
||||
issue_thread=issue,
|
||||
timestamp=now,
|
||||
)
|
||||
mail2 = Email.objects.create(
|
||||
subject='test',
|
||||
body='test',
|
||||
sender='test',
|
||||
recipient='test',
|
||||
issue_thread=issue,
|
||||
in_reply_to=mail1.reference,
|
||||
timestamp=now + timedelta(seconds=2),
|
||||
)
|
||||
assignment = Assignment.objects.create(
|
||||
issue_thread=issue,
|
||||
assigned_to=self.user,
|
||||
timestamp=now + timedelta(seconds=3),
|
||||
)
|
||||
comment = Comment.objects.create(
|
||||
issue_thread=issue,
|
||||
comment="test deF",
|
||||
timestamp=now + timedelta(seconds=4),
|
||||
)
|
||||
match = ItemRelation.objects.create(
|
||||
issue_thread=issue,
|
||||
item=self.item,
|
||||
timestamp=now + timedelta(seconds=5),
|
||||
)
|
||||
search_query = b64encode(b'abC').decode('utf-8')
|
||||
response = self.client.get(f'/api/2/{self.event.slug}/tickets/{search_query}/')
|
||||
self.assertEqual(200, response.status_code)
|
||||
self.assertEqual(1, len(response.json()))
|
||||
self.assertEqual(issue.id, response.json()[0]['id'])
|
||||
score2 = response.json()[0]['search_score']
|
||||
|
||||
search_query = b64encode(b'dEf').decode('utf-8')
|
||||
response = self.client.get(f'/api/2/{self.event.slug}/tickets/{search_query}/')
|
||||
self.assertEqual(200, response.status_code)
|
||||
self.assertEqual(1, len(response.json()))
|
||||
self.assertEqual(issue.id, response.json()[0]['id'])
|
||||
score1 = response.json()[0]['search_score']
|
||||
|
||||
search_query = b64encode(b'ghi').decode('utf-8')
|
||||
response = self.client.get(f'/api/2/{self.event.slug}/tickets/{search_query}/')
|
||||
self.assertEqual(200, response.status_code)
|
||||
self.assertEqual(0, len(response.json()))
|
||||
|
||||
search_query = b64encode(b'Abc def').decode('utf-8')
|
||||
response = self.client.get(f'/api/2/{self.event.slug}/tickets/{search_query}/')
|
||||
self.assertEqual(200, response.status_code)
|
||||
self.assertEqual(1, len(response.json()))
|
||||
self.assertEqual(issue.id, response.json()[0]['id'])
|
||||
score3 = response.json()[0]['search_score']
|
||||
|
||||
self.assertGreater(score3, score2)
|
||||
self.assertGreater(score2, score1)
|
||||
self.assertGreater(score1, 0)
|
||||
|
|
|
@ -345,6 +345,13 @@
|
|||
notify:
|
||||
- restart postfix
|
||||
|
||||
- name: configure rspamd dkim
|
||||
template:
|
||||
src: templates/rspamd-dkim.cf.j2
|
||||
dest: /etc/rspamd/local.d/dkim_signing.conf
|
||||
notify:
|
||||
- restart rspamd
|
||||
|
||||
- name: configure rspamd
|
||||
copy:
|
||||
content: |
|
||||
|
|
|
@ -13,5 +13,3 @@ STATIC_ROOT=/var/www/c3lf-sys3/staticfiles
|
|||
ACTIVE_SPAM_TRAINING=True
|
||||
DEBUG_MODE_ACTIVE={{ debug_mode_active }}
|
||||
DJANGO_SECRET_KEY={{ django_secret_key }}
|
||||
TELEGRAM_GROUP_CHAT_ID={{ telegram_group_chat_id }}
|
||||
TELEGRAM_BOT_TOKEN={{ telegram_bot_token }}
|
|
@ -32,12 +32,11 @@ smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
|
|||
|
||||
|
||||
smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
|
||||
myhostname = polaris.c3lf.de
|
||||
myhostname = polaris.lab.or.it
|
||||
alias_maps = hash:/etc/aliases
|
||||
alias_database = hash:/etc/aliases
|
||||
myorigin = /etc/mailname
|
||||
mydestination = $myhostname, , localhost
|
||||
relayhost = firefly.lab.or.it
|
||||
mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
|
||||
mailbox_size_limit = 0
|
||||
recipient_delimiter = +
|
||||
|
|
79
deploy/ansible/playbooks/templates/rspamd-dkim.cf.j2
Normal file
79
deploy/ansible/playbooks/templates/rspamd-dkim.cf.j2
Normal file
|
@ -0,0 +1,79 @@
|
|||
# local.d/dkim_signing.conf
|
||||
|
||||
enabled = true;
|
||||
|
||||
# If false, messages with empty envelope from are not signed
|
||||
allow_envfrom_empty = true;
|
||||
|
||||
# If true, envelope/header domain mismatch is ignored
|
||||
allow_hdrfrom_mismatch = false;
|
||||
|
||||
# If true, multiple from headers are allowed (but only first is used)
|
||||
allow_hdrfrom_multiple = false;
|
||||
|
||||
# If true, username does not need to contain matching domain
|
||||
allow_username_mismatch = false;
|
||||
|
||||
# Default path to key, can include '$domain' and '$selector' variables
|
||||
path = "/var/lib/rspamd/dkim/$domain.$selector.key";
|
||||
|
||||
# Default selector to use
|
||||
selector = "dkim";
|
||||
|
||||
# If false, messages from authenticated users are not selected for signing
|
||||
sign_authenticated = true;
|
||||
|
||||
# If false, messages from local networks are not selected for signing
|
||||
sign_local = true;
|
||||
|
||||
# Map file of IP addresses/subnets to consider for signing
|
||||
# sign_networks = "/some/file"; # or url
|
||||
|
||||
# Symbol to add when message is signed
|
||||
symbol = "DKIM_SIGNED";
|
||||
|
||||
# Whether to fallback to global config
|
||||
try_fallback = true;
|
||||
|
||||
# Domain to use for DKIM signing: can be "header" (MIME From), "envelope" (SMTP From), "recipient" (SMTP To), "auth" (SMTP username) or directly specified domain name
|
||||
use_domain = "header";
|
||||
|
||||
# Domain to use for DKIM signing when sender is in sign_networks ("header"/"envelope"/"auth")
|
||||
#use_domain_sign_networks = "header";
|
||||
|
||||
# Domain to use for DKIM signing when sender is a local IP ("header"/"envelope"/"auth")
|
||||
#use_domain_sign_local = "header";
|
||||
|
||||
# Whether to normalise domains to eSLD
|
||||
use_esld = true;
|
||||
|
||||
# Whether to get keys from Redis
|
||||
use_redis = false;
|
||||
|
||||
# Hash for DKIM keys in Redis
|
||||
key_prefix = "DKIM_KEYS";
|
||||
|
||||
# map of domains -> names of selectors (since rspamd 1.5.3)
|
||||
#selector_map = "/etc/rspamd/dkim_selectors.map";
|
||||
|
||||
# map of domains -> paths to keys (since rspamd 1.5.3)
|
||||
#path_map = "/etc/rspamd/dkim_paths.map";
|
||||
|
||||
# If `true` get pubkey from DNS record and check if it matches private key
|
||||
check_pubkey = false;
|
||||
# Set to `false` if you want to skip signing if public and private keys mismatch
|
||||
allow_pubkey_mismatch = true;
|
||||
|
||||
# Domain specific settings
|
||||
domain {
|
||||
# Domain name is used as key
|
||||
c3lf.de {
|
||||
|
||||
# Private key path
|
||||
path = "/var/lib/rspamd/dkim/{{ mail_domain }}.key";
|
||||
|
||||
# Selector
|
||||
selector = "{{ mail_domain }}";
|
||||
}
|
||||
}
|
||||
|
|
@ -3,20 +3,15 @@ services:
|
|||
build:
|
||||
context: ../../core
|
||||
dockerfile: ../deploy/dev/Dockerfile.backend
|
||||
command: bash -c 'python manage.py migrate && python manage.py runserver 0.0.0.0:8000'
|
||||
command: bash -c 'python manage.py migrate && python testdata.py && python manage.py runserver 0.0.0.0:8000'
|
||||
environment:
|
||||
- HTTP_HOST=core
|
||||
- DB_HOST=db
|
||||
- DB_PORT=3306
|
||||
- DB_NAME=system3
|
||||
- DB_USER=system3
|
||||
- DB_PASSWORD=system3
|
||||
- DB_FILE=dev.db
|
||||
volumes:
|
||||
- ../../core:/code
|
||||
- ../testdata.py:/code/testdata.py
|
||||
ports:
|
||||
- "8000:8000"
|
||||
depends_on:
|
||||
- db
|
||||
|
||||
frontend:
|
||||
build:
|
||||
|
@ -31,18 +26,3 @@ services:
|
|||
- "8080:8080"
|
||||
depends_on:
|
||||
- core
|
||||
|
||||
db:
|
||||
image: mariadb
|
||||
environment:
|
||||
MARIADB_RANDOM_ROOT_PASSWORD: true
|
||||
MARIADB_DATABASE: system3
|
||||
MARIADB_USER: system3
|
||||
MARIADB_PASSWORD: system3
|
||||
volumes:
|
||||
- mariadb_data:/var/lib/mysql
|
||||
ports:
|
||||
- "3306:3306"
|
||||
|
||||
volumes:
|
||||
mariadb_data:
|
88
deploy/testdata.py
Normal file
88
deploy/testdata.py
Normal file
|
@ -0,0 +1,88 @@
|
|||
import os
|
||||
|
||||
|
||||
def setup():
|
||||
from authentication.models import ExtendedUser, EventPermission
|
||||
from inventory.models import Event
|
||||
from django.contrib.auth.models import Permission, Group
|
||||
permissions = ['add_item', 'view_item', 'view_file', 'delete_item', 'change_item']
|
||||
if not ExtendedUser.objects.filter(username='admin').exists():
|
||||
admin = ExtendedUser.objects.create_superuser('admin', 'admin@example.com', 'admin')
|
||||
admin.set_password('admin')
|
||||
admin.user_permissions.add(*Permission.objects.all())
|
||||
admin.save()
|
||||
|
||||
if not ExtendedUser.objects.filter(username='testuser').exists():
|
||||
testuser = ExtendedUser.objects.create_user('testuser', 'testuser@example.com', 'testuser')
|
||||
testuser.set_password('testuser')
|
||||
testuser.user_permissions.add(*Permission.objects.all())
|
||||
testuser.save()
|
||||
|
||||
team = Group.objects.get(name='Team')
|
||||
team.permissions.add(
|
||||
*Permission.objects.all()
|
||||
)
|
||||
|
||||
if not ExtendedUser.objects.filter(username='testuser2').exists():
|
||||
testuser2 = ExtendedUser.objects.create_user('testuser2', 'testuser2@example.com', 'testuser2')
|
||||
testuser2.set_password('testuser2')
|
||||
testuser2.groups.add(team)
|
||||
testuser2.save()
|
||||
|
||||
event1 = Event.objects.get_or_create(id=1, name='first test event', slug='TEST1',
|
||||
start='2023-12-18 00:00:00.000000', end='2023-12-27 00:00:00.000000',
|
||||
pre_start='2023-12-31 00:00:00.000000', post_end='2024-01-04 00:00:00.000000')[
|
||||
0]
|
||||
|
||||
event2 = Event.objects.get_or_create(id=2, name='second test event', slug='TEST2',
|
||||
start='2024-12-18 00:00:00.000000', end='2024-12-27 00:00:00.000000',
|
||||
pre_start='2024-12-31 00:00:00.000000', post_end='2025-01-04 00:00:00.000000')[
|
||||
0]
|
||||
|
||||
# for permission in permissions:
|
||||
# EventPermission.objects.create(event=event_37c3, user=foo,
|
||||
# permission=Permission.objects.get(codename=permission))
|
||||
|
||||
from tickets.models import IssueThread
|
||||
|
||||
from mail.models import Email
|
||||
|
||||
issue_thread = IssueThread.objects.get_or_create(
|
||||
id=1,
|
||||
name="test",
|
||||
event=Event.objects.get(slug='TEST1')
|
||||
)[0]
|
||||
mail1 = Email.objects.get_or_create(
|
||||
id=1,
|
||||
subject='test subject',
|
||||
body='test',
|
||||
sender='test1@test',
|
||||
recipient='test2@test',
|
||||
issue_thread=issue_thread,
|
||||
)[0]
|
||||
mail1_reply = Email.objects.get_or_create(
|
||||
id=2,
|
||||
subject='Message received',
|
||||
body='Thank you for your message.',
|
||||
sender='test2@test',
|
||||
recipient='test1@test',
|
||||
in_reply_to=mail1.reference,
|
||||
issue_thread=issue_thread,
|
||||
)[0]
|
||||
|
||||
|
||||
def main():
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "core.settings")
|
||||
import django
|
||||
|
||||
django.setup()
|
||||
|
||||
from django.core.management import call_command
|
||||
call_command('migrate')
|
||||
|
||||
setup()
|
||||
print('testdata initialised')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
|
@ -20,7 +20,7 @@ services:
|
|||
build:
|
||||
context: ../../core
|
||||
dockerfile: ../deploy/testing/Dockerfile.backend
|
||||
command: bash -c 'python manage.py migrate && python /code/server.py'
|
||||
command: bash -c 'python manage.py migrate && python testdata.py && python /code/server.py'
|
||||
environment:
|
||||
- HTTP_HOST=core
|
||||
- REDIS_HOST=redis
|
||||
|
@ -29,13 +29,16 @@ services:
|
|||
- DB_NAME=system3
|
||||
- DB_USER=system3
|
||||
- DB_PASSWORD=system3
|
||||
- MAIL_DOMAIN=mail:1025
|
||||
volumes:
|
||||
- ../../core:/code
|
||||
- ../testdata.py:/code/testdata.py
|
||||
ports:
|
||||
- "8000:8000"
|
||||
depends_on:
|
||||
- db
|
||||
- redis
|
||||
- mail
|
||||
|
||||
frontend:
|
||||
build:
|
||||
|
@ -51,5 +54,19 @@ services:
|
|||
depends_on:
|
||||
- core
|
||||
|
||||
mail:
|
||||
image: docker.io/axllent/mailpit
|
||||
volumes:
|
||||
- mailpit_data:/data
|
||||
ports:
|
||||
- 8025:8025
|
||||
- 1025:1025
|
||||
environment:
|
||||
MP_MAX_MESSAGES: 5000
|
||||
MP_DATABASE: /data/mailpit.db
|
||||
MP_SMTP_AUTH_ACCEPT_ANY: 1
|
||||
MP_SMTP_AUTH_ALLOW_INSECURE: 1
|
||||
|
||||
volumes:
|
||||
mariadb_data:
|
||||
mariadb_data:
|
||||
mailpit_data:
|
||||
|
|
0
core/notifications/__init__.py → web/node_modules/.forgit_fordocker
generated
vendored
0
core/notifications/__init__.py → web/node_modules/.forgit_fordocker
generated
vendored
|
@ -2,7 +2,29 @@
|
|||
<div>
|
||||
<Modal v-if="isModal" title="Add Item" @close="$emit('close')">
|
||||
<template #body>
|
||||
<EditItem :item="item"/>
|
||||
<div>
|
||||
<InputPhoto
|
||||
:model="item"
|
||||
field="file"
|
||||
:on-capture="storeImage"
|
||||
/>
|
||||
<InputString
|
||||
label="description"
|
||||
:model="item"
|
||||
field="description"
|
||||
:validation-fn="str => str && str.length > 0"
|
||||
/>
|
||||
<div class="form-group">
|
||||
<label for="box">box</label>
|
||||
<InputCombo
|
||||
label="box"
|
||||
:model="item"
|
||||
nameKey="box"
|
||||
uniqueKey="cid"
|
||||
:options="boxes"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<template #buttons>
|
||||
<button type="button" class="btn btn-secondary" @click="$emit('close')">Cancel</button>
|
||||
|
@ -13,33 +35,40 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import {mapActions, mapGetters, mapState} from "vuex";
|
||||
import Modal from '@/components/Modal';
|
||||
import EditItem from '@/components/EditItem';
|
||||
import {mapActions, mapState} from "vuex";
|
||||
import InputCombo from "@/components/inputs/InputCombo.vue";
|
||||
import InputPhoto from "@/components/inputs/InputPhoto.vue";
|
||||
import InputString from "@/components/inputs/InputString.vue";
|
||||
|
||||
export default {
|
||||
name: 'AddItemModal',
|
||||
components: {Modal, EditItem},
|
||||
components: {InputString, InputPhoto, InputCombo, Modal},
|
||||
props: ['isModal'],
|
||||
data: () => ({
|
||||
item: {}
|
||||
}),
|
||||
computed: {
|
||||
...mapState(['lastUsed'])
|
||||
...mapState(['lastUsed']),
|
||||
...mapGetters(['getBoxes']),
|
||||
boxes({getBoxes}) {
|
||||
return getBoxes.map(obj => ({cid: obj.id, box: obj.name}));
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
...mapActions(['postItem', 'loadBoxes', 'scheduleAfterInit']),
|
||||
saveNewItem() {
|
||||
this.postItem(this.item).then(() => {
|
||||
this.$emit('close');
|
||||
});
|
||||
async saveNewItem() {
|
||||
await this.postItem(this.item);
|
||||
this.$emit('close');
|
||||
},
|
||||
storeImage(image) {
|
||||
this.item.dataImage = image;
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.item = {box: this.lastUsed.box || '', cid: this.lastUsed.cid || ''};
|
||||
},
|
||||
mounted() {
|
||||
this.scheduleAfterInit(() => [this.loadBoxes()]);
|
||||
this.scheduleAfterInit(() => [this.loadBoxes().then(() => {
|
||||
this.item = {box: this.lastUsed.box || '', cid: this.lastUsed.cid || ''};
|
||||
})])
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
|
@ -19,11 +19,10 @@
|
|||
<script>
|
||||
import {mapActions} from 'vuex';
|
||||
import Modal from '@/components/Modal';
|
||||
import EditItem from '@/components/EditItem';
|
||||
|
||||
export default {
|
||||
name: 'AddTicketModal',
|
||||
components: {Modal, EditItem},
|
||||
components: {Modal},
|
||||
props: ['isModal'],
|
||||
data: () => ({
|
||||
ticket: {
|
||||
|
|
|
@ -1,50 +0,0 @@
|
|||
<template>
|
||||
<div>
|
||||
<h6>Editing Item <span class="badge badge-secondary">#{{ item.uid }}</span></h6>
|
||||
<InputPhoto
|
||||
:model="item"
|
||||
field="file"
|
||||
:on-capture="storeImage"
|
||||
/>
|
||||
<InputString
|
||||
label="description"
|
||||
:model="item"
|
||||
field="description"
|
||||
:validation-fn="str => str && str.length > 0"
|
||||
/>
|
||||
<div class="form-group">
|
||||
<label for="box">box</label>
|
||||
<InputCombo
|
||||
label="box"
|
||||
:model="item"
|
||||
nameKey="box"
|
||||
uniqueKey="cid"
|
||||
:options="boxes"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import InputString from './inputs/InputString';
|
||||
import InputCombo from './inputs/InputCombo';
|
||||
import {mapGetters} from 'vuex';
|
||||
import InputPhoto from './inputs/InputPhoto';
|
||||
|
||||
export default {
|
||||
name: 'EditItem',
|
||||
components: {InputPhoto, InputCombo, InputString},
|
||||
props: ['item'],
|
||||
computed: {
|
||||
...mapGetters(['getBoxes']),
|
||||
boxes({getBoxes}) {
|
||||
return getBoxes.map(obj => ({cid: obj.cid, box: obj.name}));
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
storeImage(image) {
|
||||
this.item.dataImage = image;
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
|
@ -115,10 +115,10 @@ export default {
|
|||
this.$router.push(link);
|
||||
},
|
||||
isItemView() {
|
||||
return this.getActiveView === 'items' || this.getActiveView === 'item';
|
||||
return this.getActiveView === 'items' || this.getActiveView === 'item' || this.getActiveView === 'item_search';
|
||||
},
|
||||
isTicketView() {
|
||||
return this.getActiveView === 'tickets' || this.getActiveView === 'ticket';
|
||||
return this.getActiveView === 'tickets' || this.getActiveView === 'ticket' || this.getActiveView === 'ticket_search';
|
||||
},
|
||||
setLayout(layout) {
|
||||
if (this.route.query.layout === layout)
|
||||
|
|
|
@ -1,112 +0,0 @@
|
|||
<template>
|
||||
<div contenteditable @input="onchange" ref="text">
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'FormatedText',
|
||||
props: {
|
||||
value: {
|
||||
type: String,
|
||||
required: true
|
||||
},
|
||||
format: {
|
||||
type: Function,
|
||||
default: null
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
selection: {start: 0, end: 0, direction: 'forward', type: 'Caret'}
|
||||
};
|
||||
},
|
||||
emits: ['input'],
|
||||
methods: {
|
||||
rawhtml(value) {
|
||||
if (typeof this.format === 'function') {
|
||||
return this.format(value.replace(/ /g, ' '));
|
||||
} else {
|
||||
return value;
|
||||
}
|
||||
},
|
||||
onchange(event) {
|
||||
const div = this.$refs.text;
|
||||
const sel = window.getSelection();
|
||||
if (sel.rangeCount > 0) {
|
||||
this.selection.start = this.calculateOffset(div, sel.anchorNode, sel.anchorOffset);
|
||||
this.selection.end = this.calculateOffset(div, sel.focusNode, sel.focusOffset);
|
||||
this.selection.direction = sel.direction;
|
||||
this.selection.type = sel.type;
|
||||
}
|
||||
this.$emit('input', event.target.innerText.replace(/ /g, ' ').replace(/\xA0/g, ' '));
|
||||
},
|
||||
calculateOffset(container, node, offset) {
|
||||
let position = 0;
|
||||
let found = false;
|
||||
const walk = (elem) => {
|
||||
if (elem === node) {
|
||||
found = true;
|
||||
return;
|
||||
}
|
||||
if (elem.nodeType === 3) {
|
||||
position += elem.length;
|
||||
} else {
|
||||
for (let i = 0; i < elem.childNodes.length; i++) {
|
||||
walk(elem.childNodes[i]);
|
||||
if (found) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
walk(container);
|
||||
return position + offset;
|
||||
},
|
||||
findNode(container, offset) {
|
||||
let position = 0;
|
||||
let found = false;
|
||||
let node = null;
|
||||
const walk = (elem) => {
|
||||
if (position + elem.length >= offset) {
|
||||
found = true;
|
||||
node = elem;
|
||||
return;
|
||||
}
|
||||
if (elem.nodeType === 3) {
|
||||
position += elem.length;
|
||||
} else {
|
||||
for (let i = 0; i < elem.childNodes.length; i++) {
|
||||
walk(elem.childNodes[i]);
|
||||
if (found) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
walk(container);
|
||||
return [node, offset - position]
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
value() {
|
||||
if (this.selection) {
|
||||
const div = this.$refs.text;
|
||||
div.innerHTML = this.rawhtml(this.value);
|
||||
|
||||
const range = document.createRange();
|
||||
const sel = window.getSelection();
|
||||
range.setStart(...this.findNode(div, this.selection.start));
|
||||
range.setEnd(...this.findNode(div, this.selection.end));
|
||||
|
||||
sel.removeAllRanges();
|
||||
sel.addRange(range);
|
||||
}
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
const div = this.$refs.text;
|
||||
div.innerHTML = this.rawhtml(this.value);
|
||||
}
|
||||
};
|
||||
</script>
|
|
@ -43,11 +43,11 @@ export default {
|
|||
props: ['label', 'model', 'nameKey', 'uniqueKey', 'options', 'onOptionAdd'],
|
||||
data: ({options, model, nameKey, uniqueKey}) => ({
|
||||
internalName: model[nameKey],
|
||||
selectedOption: options.filter(e => e[uniqueKey] == model[uniqueKey])[0],
|
||||
selectedOption: options.filter(e => e[uniqueKey] === model[uniqueKey])[0],
|
||||
addingOption: false
|
||||
}),
|
||||
computed: {
|
||||
isValid: ({options, nameKey, internalName}) => options.some(e => e[nameKey] == internalName),
|
||||
isValid: ({options, nameKey, internalName}) => options.some(e => e[nameKey] === internalName),
|
||||
sortedOptions: ({
|
||||
options,
|
||||
nameKey
|
||||
|
@ -56,7 +56,7 @@ export default {
|
|||
watch: {
|
||||
internalName(newValue) {
|
||||
if (this.isValid) {
|
||||
if (!this.selectedOption || newValue != this.selectedOption[this.nameKey]) {
|
||||
if (!this.selectedOption || newValue !== this.selectedOption[this.nameKey]) {
|
||||
this.selectedOption = this.options.filter(e => e[this.nameKey] === newValue)[0];
|
||||
}
|
||||
this.model[this.nameKey] = this.selectedOption[this.nameKey];
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
<script>
|
||||
|
||||
import {mapActions, mapGetters} from "vuex";
|
||||
import router from "@/router";
|
||||
|
||||
export default {
|
||||
name: 'SearchBox',
|
||||
|
@ -21,21 +22,34 @@ export default {
|
|||
}
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['getActiveView'])
|
||||
...mapGetters(['getActiveView', 'route']),
|
||||
},
|
||||
watch: {
|
||||
route() {
|
||||
this.search_query = this.route.params.search || '';
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
...mapActions(['searchEventItems', 'searchEventTickets']),
|
||||
isItemView() {
|
||||
return this.getActiveView === 'items' || this.getActiveView === 'item';
|
||||
return this.getActiveView === 'items' || this.getActiveView === 'item' || this.getActiveView === 'item_search';
|
||||
},
|
||||
isTicketView() {
|
||||
return this.getActiveView === 'tickets' || this.getActiveView === 'ticket';
|
||||
return this.getActiveView === 'tickets' || this.getActiveView === 'ticket' || this.getActiveView === 'ticket_search';
|
||||
},
|
||||
dispatchSearch() {
|
||||
if (this.isItemView()) {
|
||||
this.searchEventItems(this.search_query);
|
||||
router.push({
|
||||
name: "item_search",
|
||||
query: this.route.query,
|
||||
params: {...this.route.params, search: this.search_query}
|
||||
});
|
||||
} else if (this.isTicketView()) {
|
||||
this.searchEventTickets(this.search_query);
|
||||
router.push({
|
||||
name: "ticket_search",
|
||||
query: this.route.query,
|
||||
params: {...this.route.params, search: this.search_query}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -20,6 +20,9 @@ export default (config) => (store) => {
|
|||
}
|
||||
});
|
||||
store.state[config.isLoadedKey] = true;
|
||||
if ('validate' in config) {
|
||||
config.validate(store.state);
|
||||
}
|
||||
}
|
||||
|
||||
const reload = initialize;
|
||||
|
|
|
@ -2,6 +2,7 @@ import {createRouter, createWebHistory} from 'vue-router'
|
|||
import store from '@/store';
|
||||
|
||||
import Item from "@/views/Item.vue";
|
||||
import ItemSearch from "@/views/ItemSearch.vue";
|
||||
import Items from '@/views/Items';
|
||||
import Boxes from '@/views/Boxes';
|
||||
import Files from '@/views/Files';
|
||||
|
@ -10,15 +11,14 @@ import Login from '@/views/Login.vue';
|
|||
import Register from '@/views/Register.vue';
|
||||
import Dashboard from "@/views/admin/Dashboard.vue";
|
||||
import Tickets from "@/views/Tickets.vue";
|
||||
import TicketSearch from "@/views/TicketSearch.vue";
|
||||
import Ticket from "@/views/Ticket.vue";
|
||||
import Admin from "@/views/admin/Admin.vue";
|
||||
import Empty from "@/views/Empty.vue";
|
||||
import Events from "@/views/admin/Events.vue";
|
||||
import Settings from "@/views/admin/Settings.vue";
|
||||
import AccessControl from "@/views/admin/AccessControl.vue";
|
||||
import {default as BoxesAdmin} from "@/views/admin/Boxes.vue"
|
||||
import Shipping from "@/views/admin/Shipping.vue";
|
||||
import Notifications from "@/views/admin/Notifications.vue";
|
||||
|
||||
const routes = [
|
||||
{path: '/', redirect: '/37C3/items', meta: {requiresAuth: false}},
|
||||
|
@ -29,6 +29,10 @@ const routes = [
|
|||
path: '/:event/items/', name: 'items', component: Items, meta:
|
||||
{requiresAuth: true, requiresPermission: 'view_item'}
|
||||
},
|
||||
{
|
||||
path: '/:event/items/:search', name: 'item_search', component: ItemSearch, meta:
|
||||
{requiresAuth: true, requiresPermission: 'view_item'}
|
||||
},
|
||||
{
|
||||
path: '/:event/item/:id/', name: 'item', component: Item, meta:
|
||||
{requiresAuth: true, requiresPermission: 'view_item'}
|
||||
|
@ -45,6 +49,10 @@ const routes = [
|
|||
path: '/:event/tickets/', name: 'tickets', component: Tickets, meta:
|
||||
{requiresAuth: true, requiresPermission: 'view_issuethread'}
|
||||
},
|
||||
{
|
||||
path: '/:event/tickets/:search', name: 'ticket_search', component: TicketSearch, meta:
|
||||
{requiresAuth: true, requiresPermission: 'view_issuethread'}
|
||||
},
|
||||
{
|
||||
path: '/:event/ticket/:id/', name: 'ticket', component: Ticket, meta:
|
||||
{requiresAuth: true, requiresPermission: 'view_issuethread'}
|
||||
|
@ -61,10 +69,6 @@ const routes = [
|
|||
path: 'events/', name: 'events', component: Events, meta:
|
||||
{requiresAuth: true, requiresPermission: 'delete_event'}
|
||||
},
|
||||
{
|
||||
path: 'settings/', name: 'settings', component: Settings, meta:
|
||||
{requiresAuth: true, requiresPermission: 'delete_event'}
|
||||
},
|
||||
{
|
||||
path: '', name: 'admin', component: Dashboard, meta:
|
||||
{requiresAuth: true, requiresPermission: 'delete_event'}
|
||||
|
@ -81,10 +85,6 @@ const routes = [
|
|||
path: 'shipping/', name: 'shipping', component: Shipping, meta:
|
||||
{requiresAuth: true, requiresPermission: 'delete_event'}
|
||||
},
|
||||
{
|
||||
path: 'notifications/', name: 'notifications', component: Notifications, meta:
|
||||
{requiresAuth: true, requiresPermission: 'delete_event'}
|
||||
}
|
||||
]
|
||||
},
|
||||
{path: '/user', name: 'user', component: Empty, meta: {requiresAuth: true}},
|
||||
|
|
137
web/src/store.js
137
web/src/store.js
|
@ -9,6 +9,7 @@ import persistentStatePlugin from "@/persistent-state-plugin";
|
|||
|
||||
const store = createStore({
|
||||
state: {
|
||||
//shared
|
||||
keyIncrement: 0,
|
||||
events: [],
|
||||
items: [],
|
||||
|
@ -17,17 +18,17 @@ const store = createStore({
|
|||
users: [],
|
||||
groups: [],
|
||||
state_options: [],
|
||||
messageTemplates: [],
|
||||
messageTemplateVariables: [],
|
||||
shippingVouchers: [],
|
||||
userNotificationChannels: [],
|
||||
|
||||
loadedItems: {},
|
||||
loadedTickets: {},
|
||||
|
||||
loadedItemSearchResults: {},
|
||||
loadedTicketSearchResults: {},
|
||||
|
||||
//local
|
||||
lastEvent: 'all',
|
||||
lastUsed: {},
|
||||
searchQuery: '',
|
||||
remember: false,
|
||||
user: {
|
||||
username: null,
|
||||
|
@ -47,9 +48,7 @@ const store = createStore({
|
|||
users: 0,
|
||||
groups: 0,
|
||||
states: 0,
|
||||
messageTemplates: 0,
|
||||
shippingVouchers: 0,
|
||||
userNotificationChannels: 0,
|
||||
},
|
||||
persistent_loaded: false,
|
||||
shared_loaded: false,
|
||||
|
@ -71,12 +70,17 @@ const store = createStore({
|
|||
route: state => router.currentRoute.value,
|
||||
session: state => http_session(state.user.token),
|
||||
getEventSlug: state => router.currentRoute.value.params.event ? router.currentRoute.value.params.event : state.lastEvent,
|
||||
searchQuery: state => router.currentRoute.value.params.search,
|
||||
getAllItems: state => Object.values(state.loadedItems).flat(),
|
||||
getAllTickets: state => Object.values(state.loadedTickets).flat(),
|
||||
getEventItems: (state, getters) => getters.getEventSlug === 'all' ? getters.getAllItems : getters.getAllItems.filter(t => t.event === getters.getEventSlug || (t.event == null && getters.getEventSlug === 'none')),
|
||||
getEventTickets: (state, getters) => getters.getEventSlug === 'all' ? getters.getAllTickets : getters.getAllTickets.filter(t => t.event === getters.getEventSlug || (t.event == null && getters.getEventSlug === 'none')),
|
||||
isItemsLoaded: (state, getters) => (getters.getEventSlug === 'all' || getters.getEventSlug === 'none') ? !!state.loadedItems : Object.keys(state.loadedItems).includes(getters.getEventSlug),
|
||||
isTicketsLoaded: (state, getters) => (getters.getEventSlug === 'all' || getters.getEventSlug === 'none') ? !!state.loadedTickets : Object.keys(state.loadedTickets).includes(getters.getEventSlug),
|
||||
getItemsSearchResults: (state, getters) => state.loadedItemSearchResults[getters.getEventSlug + '/' + base64.encode(utf8.encode(getters.searchQuery))] || [],
|
||||
getTicketsSearchResults: (state, getters) => state.loadedTicketSearchResults[getters.getEventSlug + '/' + base64.encode(utf8.encode(getters.searchQuery))] || [],
|
||||
isItemsSearchLoaded: (state, getters) => Object.keys(state.loadedItemSearchResults).includes(getters.getEventSlug + '/' + base64.encode(utf8.encode(getters.searchQuery))),
|
||||
isTicketsSearchLoaded: (state, getters) => Object.keys(state.loadedTicketSearchResults).includes(getters.getEventSlug + '/' + base64.encode(utf8.encode(getters.searchQuery))),
|
||||
getActiveView: state => router.currentRoute.value.name || 'items',
|
||||
getFilters: state => router.currentRoute.value.query,
|
||||
getBoxes: state => state.loadedBoxes,
|
||||
|
@ -111,9 +115,9 @@ const store = createStore({
|
|||
layout: (state, getters) => {
|
||||
if (router.currentRoute.value.query.layout)
|
||||
return router.currentRoute.value.query.layout;
|
||||
if (getters.getActiveView === 'items')
|
||||
if (getters.getActiveView === 'items' || getters.getActiveView === 'item_search')
|
||||
return 'cards';
|
||||
if (getters.getActiveView === 'tickets')
|
||||
if (getters.getActiveView === 'tickets' || getters.getActiveView === 'ticket_search')
|
||||
return 'tasks';
|
||||
},
|
||||
isLoggedIn(state) {
|
||||
|
@ -152,6 +156,10 @@ const store = createStore({
|
|||
state.loadedItems[slug] = items;
|
||||
state.loadedItems = {...state.loadedItems};
|
||||
},
|
||||
setItemSearchResults(state, {slug, query, items}) {
|
||||
state.loadedItemSearchResults[slug + '/' + query] = items;
|
||||
state.loadedItemSearchResults = {...state.loadedItemSearchResults};
|
||||
},
|
||||
replaceItems(state, items) {
|
||||
const groups = Object.groupBy(items, i => i.event ? i.event : 'none')
|
||||
for (const [key, value] of Object.entries(groups)) state.loadedItems[key] = value;
|
||||
|
@ -172,6 +180,10 @@ const store = createStore({
|
|||
state.loadedTickets[slug] = tickets;
|
||||
state.loadedTickets = {...state.loadedTickets};
|
||||
},
|
||||
setTicketSearchResults(state, {slug, query, items}) {
|
||||
state.loadedTicketSearchResults[slug + '/' + query] = items;
|
||||
state.loadedTicketSearchResults = {...state.loadedTicketSearchResults};
|
||||
},
|
||||
replaceTickets(state, tickets) {
|
||||
const groups = Object.groupBy(tickets, t => t.event ? t.event : 'none')
|
||||
for (const [key, value] of Object.entries(groups)) state.loadedTickets[key] = value;
|
||||
|
@ -248,21 +260,10 @@ const store = createStore({
|
|||
setThumbnail(state, {url, data}) {
|
||||
state.thumbnailCache[url] = data;
|
||||
},
|
||||
setMessageTemplates(state, templates) {
|
||||
state.messageTemplates = templates;
|
||||
state.fetchedData = {...state.fetchedData, messageTemplates: Date.now()};
|
||||
},
|
||||
setMessageTemplateVariables(state, variables) {
|
||||
state.messageTemplateVariables = variables;
|
||||
},
|
||||
setShippingVouchers(state, codes) {
|
||||
state.shippingVouchers = codes;
|
||||
state.fetchedData = {...state.fetchedData, shippingVouchers: Date.now()};
|
||||
},
|
||||
setUserNotificationChannels(state, channels) {
|
||||
state.userNotificationChannels = channels;
|
||||
state.fetchedData = {...state.fetchedData, userNotificationChannels: Date.now()};
|
||||
},
|
||||
},
|
||||
actions: {
|
||||
async login({commit}, {username, password, remember}) {
|
||||
|
@ -392,11 +393,12 @@ const store = createStore({
|
|||
async searchEventItems({commit, getters, state}, query) {
|
||||
const encoded_query = base64.encode(utf8.encode(query));
|
||||
const slug = getters.getEventSlug;
|
||||
if (Object.keys(state.loadedItemSearchResults).includes(slug + '/' + encoded_query)) return;
|
||||
const {
|
||||
data, success
|
||||
} = await getters.session.get(`/2/${slug}/items/${encoded_query}/`);
|
||||
if (data && success) {
|
||||
commit('setItems', {slug, items: data});
|
||||
commit('setItemSearchResults', {slug, query: encoded_query, items: data});
|
||||
}
|
||||
},
|
||||
async loadBoxes({commit, state, getters}) {
|
||||
|
@ -444,11 +446,12 @@ const store = createStore({
|
|||
},
|
||||
async searchEventTickets({commit, getters, state}, query) {
|
||||
const encoded_query = base64.encode(utf8.encode(query));
|
||||
|
||||
const slug = getters.getEventSlug;
|
||||
if (Object.keys(state.loadedTicketSearchResults).includes(slug + '/' + encoded_query)) return;
|
||||
const {
|
||||
data, success
|
||||
} = await getters.session.get(`/2/${getters.getEventSlug}/tickets/${encoded_query}/`);
|
||||
if (data && success) commit('replaceTickets', data);
|
||||
} = await getters.session.get(`/2/${slug}/tickets/${encoded_query}/`);
|
||||
if (data && success) commit('setTicketSearchResults', {slug, query: encoded_query, items: data});
|
||||
},
|
||||
async sendMail({commit, dispatch, state, getters}, {id, message}) {
|
||||
const {data, success} = await getters.session.post(`/2/tickets/${id}/reply/`, {message},
|
||||
|
@ -459,7 +462,8 @@ const store = createStore({
|
|||
}
|
||||
},
|
||||
async postManualTicket({commit, dispatch, state, getters}, {sender, message, title,}) {
|
||||
const {data, success} = await getters.session.post(`/2/tickets/manual/`, {
|
||||
const slug = getters.getEventSlug;
|
||||
const {data, success} = await getters.session.post(`/2/${slug !== 'all' ? slug : 'none'}/tickets/manual/`, {
|
||||
name: title, sender, body: message, recipient: 'mail@c3lf.de'
|
||||
});
|
||||
await dispatch('loadTickets');
|
||||
|
@ -501,39 +505,6 @@ const store = createStore({
|
|||
const {data, success} = await getters.session.patch(`/2/tickets/${id}/`, ticket);
|
||||
commit('updateTicket', data);
|
||||
},
|
||||
async fetchMessageTemplates({commit, state}) {
|
||||
if (!state.user.token) return;
|
||||
if (state.messageTemplates.length > 0) return;
|
||||
const {data, success} = await http.get('/2/message_templates/', state.user.token);
|
||||
if (data && success) {
|
||||
commit('setMessageTemplates', data);
|
||||
}
|
||||
},
|
||||
async updateMessageTemplate({dispatch, state}, template) {
|
||||
const {data, success} = await http.patch(`/2/message_templates/${template.id}/`,
|
||||
{'message': template.message}, state.user.token);
|
||||
if (data && success) {
|
||||
state.fetchedData.messageTemplates = 0;
|
||||
dispatch('fetchMessageTemplates');
|
||||
}
|
||||
},
|
||||
async fetchMessageTemplateVariables({commit, state}) {
|
||||
if (!state.user.token) return;
|
||||
if (state.messageTemplateVariables.length > 0) return;
|
||||
const {data, success} = await http.get('/2/message_template_variables/', state.user.token);
|
||||
if (data && success) {
|
||||
commit('setMessageTemplateVariables', data);
|
||||
}
|
||||
},
|
||||
async createMessageTemplate({dispatch, state}, template_name) {
|
||||
const {data, success} = await http.post('/2/message_templates/', {
|
||||
name: template_name,
|
||||
message: '-'
|
||||
}, state.user.token);
|
||||
if (data && success) {
|
||||
dispatch('fetchMessageTemplates');
|
||||
}
|
||||
},
|
||||
async fetchShippingVouchers({commit, state, getters}) {
|
||||
if (!state.user.token) return;
|
||||
if (state.fetchedData.shippingVouchers > Date.now() - 1000 * 60 * 60 * 24) return;
|
||||
|
@ -557,36 +528,32 @@ const store = createStore({
|
|||
state.fetchedData.tickets = 0;
|
||||
await Promise.all([dispatch('loadTickets'), dispatch('fetchShippingVouchers')]);
|
||||
}
|
||||
},
|
||||
async fetchUserNotificationChannels({commit, state}) {
|
||||
if (!state.user.token) return;
|
||||
if (state.fetchedData.userNotificationChannels > Date.now() - 1000 * 60 * 60 * 24) return;
|
||||
const {data, success} = await http.get('/2/user_notification_channels/', state.user.token);
|
||||
if (data && success) {
|
||||
commit('setUserNotificationChannels', data);
|
||||
}
|
||||
},
|
||||
plugins: [persistentStatePlugin({ // TODO change remember to some kind of enable field
|
||||
prefix: "lf_",
|
||||
debug: false,
|
||||
isLoadedKey: "persistent_loaded",
|
||||
validate: (state) => {
|
||||
if (state.user && state.user.expiry && state.user.token) {
|
||||
const as_date = new Date(state.user.expiry);
|
||||
if (as_date < new Date()) {
|
||||
state.user.token = null;
|
||||
state.user.expiry = null;
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
plugins: [
|
||||
persistentStatePlugin({ // TODO change remember to some kind of enable field
|
||||
prefix: "lf_",
|
||||
debug: false,
|
||||
isLoadedKey: "persistent_loaded",
|
||||
state: ["remember", "user", "events", "lastUsed",]
|
||||
}),
|
||||
sharedStatePlugin({
|
||||
debug: false,
|
||||
isLoadedKey: "shared_loaded",
|
||||
clearingMutation: "logout",
|
||||
afterInit: "afterSharedInit",
|
||||
state: ["test", "state_options", "fetchedData", "loadedItems", "users", "groups", "loadedBoxes",
|
||||
"loadedTickets", "shippingVouchers", "messageTemplates", "messageTemplatesVariables",],
|
||||
watch: ["test", "state_options", "fetchedData", "loadedItems", "users", "groups", "loadedBoxes",
|
||||
"loadedTickets", "shippingVouchers", "messageTemplates", "messageTemplatesVariables",],
|
||||
mutations: [//"replaceTickets",
|
||||
],
|
||||
}),
|
||||
],
|
||||
state: ["remember", "user", "events", "lastUsed",]
|
||||
}), sharedStatePlugin({
|
||||
debug: false,
|
||||
isLoadedKey: "shared_loaded",
|
||||
clearingMutation: "logout",
|
||||
afterInit: "afterSharedInit",
|
||||
state: ["test", "state_options", "fetchedData", "loadedItems", "users", "groups", "loadedBoxes", "loadedTickets", "shippingVouchers",],
|
||||
watch: ["test", "state_options", "fetchedData", "loadedItems", "users", "groups", "loadedBoxes", "loadedTickets", "shippingVouchers",],
|
||||
mutations: [//"replaceTickets",
|
||||
],
|
||||
}),],
|
||||
});
|
||||
|
||||
store.watch((state) => state.user, (user) => {
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
import store from '@/store'
|
||||
|
||||
function ticketStateColorLookup(ticket) {
|
||||
if (ticket.startsWith('closed_')) {
|
||||
return 'secondary';
|
||||
|
@ -36,6 +38,8 @@ const http = {
|
|||
"Authorization": `Token ${token}`,
|
||||
},
|
||||
});
|
||||
if (response.status === 401)
|
||||
throw {http_status: response.status};
|
||||
const success = response.status === 200 || response.status === 201;
|
||||
return {data: await response.json() || {}, success};
|
||||
},
|
||||
|
@ -51,6 +55,8 @@ const http = {
|
|||
},
|
||||
body: JSON.stringify(data),
|
||||
});
|
||||
if (response.status === 401)
|
||||
throw {http_status: response.status};
|
||||
const success = response.status === 200 || response.status === 201;
|
||||
return {data: await response.json() || {}, success};
|
||||
},
|
||||
|
@ -66,6 +72,8 @@ const http = {
|
|||
},
|
||||
body: JSON.stringify(data),
|
||||
});
|
||||
if (response.status === 401)
|
||||
throw {http_status: response.status};
|
||||
const success = response.status === 200 || response.status === 201;
|
||||
return {data: await response.json() || {}, success};
|
||||
},
|
||||
|
@ -81,6 +89,8 @@ const http = {
|
|||
},
|
||||
body: JSON.stringify(data),
|
||||
});
|
||||
if (response.status === 401)
|
||||
throw {http_status: response.status};
|
||||
const success = response.status === 200 || response.status === 201;
|
||||
return {data: await response.json() || {}, success};
|
||||
},
|
||||
|
@ -95,17 +105,34 @@ const http = {
|
|||
"Authorization": `Token ${token}`,
|
||||
},
|
||||
});
|
||||
if (response.status === 401)
|
||||
throw {http_status: response.status};
|
||||
const success = response.status === 204;
|
||||
return {data: await response.text() || {}, success};
|
||||
}
|
||||
}
|
||||
|
||||
const http_session = token => ({
|
||||
get: async (url) => await http.get(url, token),
|
||||
post: async (url, data) => await http.post(url, data, token),
|
||||
put: async (url, data) => await http.put(url, data, token),
|
||||
patch: async (url, data) => await http.patch(url, data, token),
|
||||
delete: async (url) => await http.delete(url, token),
|
||||
get: async (url) => await http.get(url, token).catch((e) => {
|
||||
if (e.http_status === 401) store.commit('logout');
|
||||
return {data: {}, success: false};
|
||||
}),
|
||||
post: async (url, data) => await http.post(url, data, token).catch((e) => {
|
||||
if (e.http_status === 401) store.commit('logout');
|
||||
return {data: {}, success: false};
|
||||
}),
|
||||
put: async (url, data) => await http.put(url, data, token).catch((e) => {
|
||||
if (e.http_status === 401) store.commit('logout');
|
||||
return {data: {}, success: false};
|
||||
}),
|
||||
patch: async (url, data) => await http.patch(url, data, token).catch((e) => {
|
||||
if (e.http_status === 401) store.commit('logout');
|
||||
return {data: {}, success: false};
|
||||
}),
|
||||
delete: async (url) => await http.delete(url, token).catch((e) => {
|
||||
if (e.http_status === 401) store.commit('logout');
|
||||
return {data: {}, success: false};
|
||||
}),
|
||||
});
|
||||
|
||||
export {ticketStateColorLookup, ticketStateIconLookup, http, http_session};
|
|
@ -112,14 +112,12 @@ import InputString from "@/components/inputs/InputString.vue";
|
|||
import AuthenticatedImage from "@/components/AuthenticatedImage.vue";
|
||||
import InputPhoto from "@/components/inputs/InputPhoto.vue";
|
||||
import Modal from "@/components/Modal.vue";
|
||||
import EditItem from "@/components/EditItem.vue";
|
||||
import AsyncButton from "@/components/inputs/AsyncButton.vue";
|
||||
|
||||
export default {
|
||||
name: 'Item',
|
||||
components: {
|
||||
AsyncButton,
|
||||
EditItem,
|
||||
Modal, InputPhoto, AuthenticatedImage, InputString, InputCombo, AsyncLoader, ClipboardButton, Timeline
|
||||
},
|
||||
data() {
|
||||
|
|
114
web/src/views/ItemSearch.vue
Normal file
114
web/src/views/ItemSearch.vue
Normal file
|
@ -0,0 +1,114 @@
|
|||
<template>
|
||||
<AsyncLoader :loaded="isItemsSearchLoaded">
|
||||
<div class="container-fluid px-xl-5 mt-3">
|
||||
<div class="row" v-if="layout === 'table'">
|
||||
<div class="col-xl-8 offset-xl-2">
|
||||
<Table
|
||||
:columns="['id', 'description', 'box']"
|
||||
:items="getItemsSearchResults"
|
||||
:keyName="'id'"
|
||||
@itemActivated="showItemDetail"
|
||||
>
|
||||
<template #actions="{ item }">
|
||||
<div class="btn-group">
|
||||
<button class="btn btn-success"
|
||||
@click.stop="confirm('return Item?') && markItemReturned(item)"
|
||||
title="returned">
|
||||
<font-awesome-icon icon="check"/>
|
||||
</button>
|
||||
<button class="btn btn-secondary" @click.stop="openEditingModalWith(item)" title="edit">
|
||||
<font-awesome-icon icon="edit"/>
|
||||
</button>
|
||||
<button class="btn btn-danger" @click.stop="confirm('delete Item?') && deleteItem(item)"
|
||||
title="delete">
|
||||
<font-awesome-icon icon="trash"/>
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
</Table>
|
||||
</div>
|
||||
</div>
|
||||
<Cards
|
||||
v-if="layout === 'cards'"
|
||||
:columns="['id', 'description', 'box']"
|
||||
:items="getItemsSearchResults"
|
||||
:keyName="'id'"
|
||||
v-slot="{ item }"
|
||||
@itemActivated="item => openLightboxModalWith(item.file)"
|
||||
>
|
||||
<AuthenticatedImage v-if="item.file" cached
|
||||
:src="`/media/2/256/${item.file}/`"
|
||||
class="card-img-top img-fluid"
|
||||
/>
|
||||
<div class="card-body">
|
||||
<h6 class="card-title">{{ item.description }}</h6>
|
||||
<h6 class="card-subtitle text-secondary">id: {{ item.id }} box: {{ item.box }}</h6>
|
||||
<div class="row mx-auto mt-2">
|
||||
<div class="btn-group">
|
||||
<button class="btn btn-outline-success"
|
||||
@click.stop="confirm('return Item?') && markItemReturned(item)" title="returned">
|
||||
<font-awesome-icon icon="check"/>
|
||||
</button>
|
||||
<button class="btn btn-outline-secondary" @click.stop="showItemDetail(item)"
|
||||
title="edit">
|
||||
<font-awesome-icon icon="edit"/>
|
||||
</button>
|
||||
<button class="btn btn-outline-danger"
|
||||
@click.stop="confirm('delete Item?') && deleteItem(item)"
|
||||
title="delete">
|
||||
<font-awesome-icon icon="trash"/>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</Cards>
|
||||
</div>
|
||||
</AsyncLoader>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {mapActions, mapGetters, mapMutations, mapState} from 'vuex';
|
||||
import Table from '@/components/Table';
|
||||
import Cards from '@/components/Cards';
|
||||
import Modal from '@/components/Modal';
|
||||
import AuthenticatedImage from "@/components/AuthenticatedImage.vue";
|
||||
import AsyncLoader from "@/components/AsyncLoader.vue";
|
||||
import router from "@/router";
|
||||
|
||||
export default {
|
||||
name: 'Items',
|
||||
data: () => ({
|
||||
lightboxHash: null,
|
||||
editingItem: null,
|
||||
}),
|
||||
components: {AsyncLoader, AuthenticatedImage, Table, Cards, Modal},
|
||||
computed: {
|
||||
...mapGetters(['getItemsSearchResults', 'isItemsSearchLoaded', 'layout', 'getEventSlug', 'searchQuery']),
|
||||
},
|
||||
methods: {
|
||||
...mapActions(['deleteItem', 'markItemReturned', 'searchEventItems', 'updateItem', 'scheduleAfterInit']),
|
||||
...mapMutations(['openLightboxModalWith']),
|
||||
showItemDetail(item) {
|
||||
router.push({name: 'item', params: {id: item.id}});
|
||||
},
|
||||
confirm(message) {
|
||||
return window.confirm(message);
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
searchQuery() {
|
||||
this.scheduleAfterInit(() => [this.searchEventItems(this.searchQuery)]);
|
||||
},
|
||||
getEventSlug() {
|
||||
this.scheduleAfterInit(() => [this.searchEventItems(this.searchQuery)]);
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.scheduleAfterInit(() => [this.searchEventItems(this.searchQuery)]);
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
|
@ -67,11 +67,10 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import {mapActions, mapGetters, mapMutations, mapState} from 'vuex';
|
||||
import Table from '@/components/Table';
|
||||
import Cards from '@/components/Cards';
|
||||
import Modal from '@/components/Modal';
|
||||
import EditItem from '@/components/EditItem';
|
||||
import {mapActions, mapGetters, mapMutations} from 'vuex';
|
||||
import AuthenticatedImage from "@/components/AuthenticatedImage.vue";
|
||||
import AsyncLoader from "@/components/AsyncLoader.vue";
|
||||
import router from "@/router";
|
||||
|
@ -82,9 +81,9 @@ export default {
|
|||
lightboxHash: null,
|
||||
editingItem: null,
|
||||
}),
|
||||
components: {AsyncLoader, AuthenticatedImage, Table, Cards, Modal, EditItem},
|
||||
components: {AsyncLoader, AuthenticatedImage, Table, Cards, Modal},
|
||||
computed: {
|
||||
...mapGetters(['getEventItems', 'isItemsLoaded', 'layout']),
|
||||
...mapGetters(['getEventItems', 'isItemsLoaded', 'layout', 'getEventSlug']),
|
||||
},
|
||||
methods: {
|
||||
...mapActions(['deleteItem', 'markItemReturned', 'loadEventItems', 'updateItem', 'scheduleAfterInit']),
|
||||
|
@ -96,6 +95,11 @@ export default {
|
|||
return window.confirm(message);
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
getEventSlug() {
|
||||
this.scheduleAfterInit(() => [this.loadEventItems()]);
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.scheduleAfterInit(() => [this.loadEventItems()]);
|
||||
}
|
||||
|
|
|
@ -72,7 +72,7 @@ export default {
|
|||
name: 'Login',
|
||||
data() {
|
||||
return {
|
||||
msg: 'Welcome to ' + window.location.hostname,
|
||||
msg: 'Lost&Found Team Login',
|
||||
username: '',
|
||||
password: '',
|
||||
remember: false
|
||||
|
|
|
@ -87,7 +87,7 @@ export default {
|
|||
name: 'Register',
|
||||
data() {
|
||||
return {
|
||||
msg: 'Register',
|
||||
msg: 'Register as team member',
|
||||
password2: '',
|
||||
form: {
|
||||
username: '',
|
||||
|
|
102
web/src/views/TicketSearch.vue
Normal file
102
web/src/views/TicketSearch.vue
Normal file
|
@ -0,0 +1,102 @@
|
|||
<template>
|
||||
<AsyncLoader :loaded="isTicketsSearchLoaded">
|
||||
<div class="container-fluid px-xl-5 mt-3">
|
||||
<div class="row" v-if="layout === 'table'">
|
||||
<div class="col-xl-8 offset-xl-2">
|
||||
<Table
|
||||
:columns="['id', 'name', 'state', 'last_activity', 'assigned_to',
|
||||
...(getEventSlug==='all'?['event']:[])]"
|
||||
:items="getTicketsSearchResults.map(formatTicket)"
|
||||
:keyName="'id'"
|
||||
>
|
||||
<template v-slot:actions="{item}">
|
||||
<div class="btn-group">
|
||||
<router-link :to="{name: 'ticket', params: {id: item.id}}" class="btn btn-primary"
|
||||
title="view">
|
||||
<font-awesome-icon icon="eye"/>
|
||||
View
|
||||
</router-link>
|
||||
</div>
|
||||
</template>
|
||||
</Table>
|
||||
</div>
|
||||
</div>
|
||||
<CollapsableCards v-if="layout === 'tasks'" :items="getTicketsSearchResults"
|
||||
:columns="['id', 'name', 'last_activity', 'assigned_to',
|
||||
...(getEventSlug==='all'?['event']:[])]"
|
||||
:keyName="'state'" :sections="['pending_new', 'pending_open','pending_shipping',
|
||||
'pending_physical_confirmation','pending_return','pending_postponed'].map(stateInfo)">
|
||||
<template #section_header="{index, section, count}">
|
||||
{{ section.text }} <span class="badge badge-light ml-1">{{ count }}</span>
|
||||
</template>
|
||||
<template #section_body="{item}">
|
||||
<tr>
|
||||
<td>{{ item.id }}</td>
|
||||
<td>{{ item.name }}</td>
|
||||
<td>{{ item.last_activity }}</td>
|
||||
<td>{{ item.assigned_to }}</td>
|
||||
<td v-if="getEventSlug==='all'">{{ item.event }}</td>
|
||||
<td>
|
||||
<div class="btn-group">
|
||||
<router-link :to="{name: 'ticket', params: {id: item.id}}" class="btn btn-primary"
|
||||
title="view">
|
||||
<font-awesome-icon icon="eye"/>
|
||||
View
|
||||
</router-link>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</template>
|
||||
</CollapsableCards>
|
||||
</div>
|
||||
</AsyncLoader>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Cards from '@/components/Cards';
|
||||
import {mapActions, mapGetters, mapState} from 'vuex';
|
||||
import Table from '@/components/Table';
|
||||
import CollapsableCards from "@/components/CollapsableCards.vue";
|
||||
import AsyncLoader from "@/components/AsyncLoader.vue";
|
||||
import router from "@/router";
|
||||
|
||||
export default {
|
||||
name: 'TicketSearch',
|
||||
components: {AsyncLoader, Table, Cards, CollapsableCards},
|
||||
computed: {
|
||||
...mapGetters(['getTicketsSearchResults', 'isTicketsSearchLoaded', 'stateInfo', 'getEventSlug', 'layout', 'searchQuery']),
|
||||
},
|
||||
methods: {
|
||||
...mapActions(['searchEventTickets', 'fetchTicketStates', 'scheduleAfterInit']),
|
||||
gotoDetail(ticket) {
|
||||
router.push({name: 'ticket', params: {id: ticket.id}});
|
||||
},
|
||||
formatTicket(ticket) {
|
||||
return {
|
||||
id: ticket.id,
|
||||
name: ticket.name,
|
||||
state: this.stateInfo(ticket.state).text,
|
||||
stateColor: this.stateInfo(ticket.state).color,
|
||||
last_activity: ticket.last_activity,
|
||||
assigned_to: ticket.assigned_to,
|
||||
event: ticket.event
|
||||
};
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
searchQuery() {
|
||||
this.scheduleAfterInit(() => [this.searchEventTickets(this.searchQuery)]);
|
||||
},
|
||||
getEventSlug() {
|
||||
this.scheduleAfterInit(() => [this.searchEventTickets(this.searchQuery)]);
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.scheduleAfterInit(() => [this.fetchTicketStates(), this.searchEventTickets(this.searchQuery)]);
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
|
@ -8,15 +8,9 @@
|
|||
<li class="nav-item">
|
||||
<router-link class="nav-link" :to="{name: 'admin'}" active-class="dummy" exact-active-class="active">Dashboard</router-link>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<router-link class="nav-link" :to="{name: 'settings'}" active-class="active">Settings</router-link>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<router-link class="nav-link" :to="{name: 'events'}" active-class="active">Events</router-link>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<router-link class="nav-link" :to="{name: 'notifications'}" active-class="active">Notifications</router-link>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<router-link class="nav-link" :to="{name: 'shipping'}" active-class="active">Shipping</router-link>
|
||||
</li>
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<template>
|
||||
<AsyncLoader :loaded="events.length > 0">
|
||||
<ExpandableTable v-if="!!events" :columns="['slug', 'name']" :items="events" :keyName="'slug'">
|
||||
<ExpandableTable v-if="!!events" :columns="['slug', 'name']" :items="events.map((e,i)=>({idx: i, ...e}))"
|
||||
:keyName="'slug'">
|
||||
<template v-slot:header_actions>
|
||||
<button class="btn btn-success" @click.prevent="openAddEventModal">
|
||||
<font-awesome-icon icon="plus"/>
|
||||
|
@ -43,7 +44,7 @@
|
|||
<div class="mt-3">
|
||||
<label class="mr-3">Addresses: </label>
|
||||
<div v-for="(address, a_id) in item.addresses" class="btn-group btn-group-sm mr-3"
|
||||
@click.stop="deleteAddress(id, a_id)">
|
||||
@click.stop="deleteAddress(item.idx, a_id)">
|
||||
<button class="btn btn-secondary" disabled style="opacity: 1">
|
||||
{{ address }}
|
||||
</button>
|
||||
|
@ -52,8 +53,9 @@
|
|||
</button>
|
||||
</div>
|
||||
<div class="btn-group btn-group-sm">
|
||||
<input type="text" v-model="new_address[id]">
|
||||
<button class="btn btn-secondary" @click.stop="addAddress(id)" style="white-space: nowrap;">
|
||||
<input type="text" v-model="new_address[item.idx]">
|
||||
<button class="btn btn-secondary" @click.stop="addAddress(item.idx)"
|
||||
style="white-space: nowrap;">
|
||||
<font-awesome-icon icon="envelope"/> add
|
||||
</button>
|
||||
</div>
|
||||
|
@ -88,11 +90,11 @@ export default {
|
|||
if (!this.events[id].addresses.includes(a))
|
||||
this.events[id].addresses.push(a)
|
||||
this.new_address[id] = ""
|
||||
this.updateEvent({id: this.events[id].eid, partial_event: {addresses: this.events[id].addresses}});
|
||||
this.updateEvent({id: this.events[id].id, partial_event: {addresses: this.events[id].addresses}});
|
||||
},
|
||||
deleteAddress(id, a_id) {
|
||||
this.events[id].addresses = this.events[id].addresses.filter((e, i) => i !== a_id);
|
||||
this.updateEvent({id: this.events[id].eid, partial_event: {addresses: this.events[id].addresses}});
|
||||
this.updateEvent({id: this.events[id].id, partial_event: {addresses: this.events[id].addresses}});
|
||||
}
|
||||
},
|
||||
};
|
||||
|
|
|
@ -1,53 +0,0 @@
|
|||
<template>
|
||||
<div>
|
||||
<Table :items="userNotificationChannels.map(channel => ({...channel, username: channel.user.username || {}}))"
|
||||
:columns="['id', 'username', 'channel_type', 'channel_target', 'event_filter', /*'active', 'created'*/]">
|
||||
<template #actions="{ item }">
|
||||
<div class="btn-group">
|
||||
<button class="btn btn-danger" @click.stop="">
|
||||
<font-awesome-icon icon="trash"/>
|
||||
delete
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
</Table>
|
||||
<div class="card bg-dark">
|
||||
<div class="card-body">
|
||||
<div class="input-group">
|
||||
<select class="form-control">
|
||||
<option value="1">user</option>
|
||||
<option value="2">admin</option>
|
||||
</select>
|
||||
<select class="form-control">
|
||||
<option value="email">Email</option>
|
||||
<option value="telegram">Telegram</option>
|
||||
</select>
|
||||
<input type="text" class="form-control" placeholder="channel_target">
|
||||
<input type="text" class="form-control" value="*">
|
||||
<div class="input-group-append">
|
||||
<button class="btn btn-primary">Add</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {mapActions, mapState} from 'vuex';
|
||||
import Table from '@/components/Table';
|
||||
|
||||
export default {
|
||||
name: 'Notifications',
|
||||
components: {Table},
|
||||
computed: mapState(['userNotificationChannels']),
|
||||
methods: mapActions(['fetchUserNotificationChannels']),
|
||||
mounted() {
|
||||
this.fetchUserNotificationChannels();
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
|
@ -1,109 +0,0 @@
|
|||
<template>
|
||||
<h3 class="text-center">Available Message Template Variables</h3>
|
||||
<p>
|
||||
<span v-for="(variable, key) in messageTemplateVariables" :key="key" class="badge badge-primary"
|
||||
style="margin: 5px;">
|
||||
{{ variable }}
|
||||
</span>
|
||||
</p>
|
||||
<h3 class="text-center">Message Templates</h3>
|
||||
<div v-for="template in messageTemplatesIntermediate" :key="template.id" class="card bg-dark"
|
||||
style="margin-bottom: 10px;">
|
||||
<div class="card-header">{{ template.name }}</div>
|
||||
<FormatedText :value="template.message" :format="formatText" class="card-body"
|
||||
@input="changeMessageTemplate(template.id, $event)"/>
|
||||
<div class="card-body">
|
||||
<button class="btn btn-primary" @click="resetMessageTemplate(template.id)"
|
||||
:disabled="messageTemplates.find(t => t.id === template.id).message === template.message">Reset
|
||||
</button>
|
||||
<button class="btn btn-success" @click="saveMessageTemplate(template.id)"
|
||||
:disabled="messageTemplates.find(t => t.id === template.id).message === template.message">Save
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card bg-dark">
|
||||
<div class="card-body">
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" v-model="newTemplateName" placeholder="New Template Name">
|
||||
<button class="btn btn-success input-group-btn" @click="createMessageTemplateAndReset()"
|
||||
ref="createButton">Create
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {mapActions, mapState} from 'vuex';
|
||||
import Table from '@/components/Table';
|
||||
import FormatedText from "@/components/inputs/FormatedText.vue";
|
||||
|
||||
export default {
|
||||
name: 'Settings',
|
||||
components: {FormatedText, Table},
|
||||
data() {
|
||||
return {
|
||||
messageTemplatesIntermediate: [],
|
||||
newTemplateName: '',
|
||||
};
|
||||
},
|
||||
computed: mapState(['messageTemplates', 'messageTemplateVariables']),
|
||||
methods: {
|
||||
...mapActions(['fetchMessageTemplates', 'fetchMessageTemplateVariables', 'updateMessageTemplate', 'createMessageTemplate']),
|
||||
formatText(value) {
|
||||
return value.replace(/{{(.+?)}}/g, (match, key) => {
|
||||
return `<span class="text-primary">{{${key}}}</span>`;
|
||||
}).replace(/\n/g, '<br>').replace(/\t/g, ' ');
|
||||
},
|
||||
changeMessageTemplate(id, message) {
|
||||
console.log(id, message);
|
||||
this.messageTemplatesIntermediate.forEach(template => {
|
||||
if (template.id === id) {
|
||||
template.message = message;
|
||||
}
|
||||
});
|
||||
},
|
||||
saveMessageTemplate(id) {
|
||||
this.updateMessageTemplate(this.messageTemplatesIntermediate.find(template => template.id === id));
|
||||
},
|
||||
resetMessageTemplate(id) {
|
||||
this.messageTemplatesIntermediate.find(template => template.id === id).message =
|
||||
this.messageTemplates.find(template => template.id === id).message;
|
||||
},
|
||||
async createMessageTemplateAndReset() {
|
||||
this.$refs.createButton.disabled = true;
|
||||
await this.createMessageTemplate(this.newTemplateName);
|
||||
this.newTemplateName = '';
|
||||
this.$refs.createButton.disabled = false;
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.fetchMessageTemplates().then(() => {
|
||||
this.messageTemplatesIntermediate = JSON.parse(JSON.stringify(this.messageTemplates));
|
||||
});
|
||||
this.fetchMessageTemplateVariables();
|
||||
},
|
||||
watch: {
|
||||
messageTemplates() {
|
||||
for (const template of this.messageTemplates) {
|
||||
if (!this.messageTemplatesIntermediate.find(t => t.id === template.id)) {
|
||||
this.messageTemplatesIntermediate.push(JSON.parse(JSON.stringify(template)));
|
||||
}
|
||||
}
|
||||
for (const template of this.messageTemplatesIntermediate) {
|
||||
if (!this.messageTemplates.find(t => t.id === template.id)) {
|
||||
this.messageTemplatesIntermediate = this.messageTemplatesIntermediate.filter(t => t.id !== template.id);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
pre {
|
||||
white-space: pre-wrap;
|
||||
word-wrap: break-word;
|
||||
color: inherit;
|
||||
}
|
||||
</style>
|
Loading…
Add table
Reference in a new issue