diff --git a/core/files/media_v2.py b/core/files/media_v2.py index 00161b3..9cc8f23 100644 --- a/core/files/media_v2.py +++ b/core/files/media_v2.py @@ -38,8 +38,6 @@ def media_urls(request, hash): 'Age': 0, 'ETag': file.hash, }) - except FileNotFoundError: - return Response(status=status.HTTP_404_NOT_FOUND) except File.DoesNotExist: return Response(status=status.HTTP_404_NOT_FOUND) except EmailAttachment.DoesNotExist: @@ -82,8 +80,6 @@ def thumbnail_urls(request, size, hash): 'ETag': file.hash + "_" + str(size), }) - except FileNotFoundError: - return Response(status=status.HTTP_404_NOT_FOUND) except File.DoesNotExist: return Response(status=status.HTTP_404_NOT_FOUND) except EmailAttachment.DoesNotExist: diff --git a/core/files/migrations/0003_ensure_creation_date.py b/core/files/migrations/0003_ensure_creation_date.py deleted file mode 100644 index 63e5760..0000000 --- a/core/files/migrations/0003_ensure_creation_date.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 4.2.7 on 2024-11-21 22:40 - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ('files', '0002_alter_file_file'), - ] - - def set_creation_date(apps, schema_editor): - File = apps.get_model('files', 'File') - for file in File.objects.all(): - if file.created_at is None: - if not file.item.created_at is None: - file.created_at = file.item.created_at - else: - file.created_at = max(File.objects.filter( - id__lt=file.id, created_at__isnull=False).values_list('created_at', flat=True)) - file.save() - - operations = [ - migrations.RunPython(set_creation_date), - ] diff --git a/core/inventory/admin.py b/core/inventory/admin.py index 24cd14a..2457b5b 100644 --- a/core/inventory/admin.py +++ b/core/inventory/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from inventory.models import Item, Container, ItemPlacement, Comment, Event +from inventory.models import Item, Container, Event class ItemAdmin(admin.ModelAdmin): @@ -22,17 +22,3 @@ class EventAdmin(admin.ModelAdmin): admin.site.register(Event, EventAdmin) - - -class ItemPlacementAdmin(admin.ModelAdmin): - pass - - -admin.site.register(ItemPlacement, ItemPlacementAdmin) - - -class CommentAdmin(admin.ModelAdmin): - pass - - -admin.site.register(Comment, CommentAdmin) diff --git a/core/inventory/api_v2.py b/core/inventory/api_v2.py index 326c049..e1f643e 100644 --- a/core/inventory/api_v2.py +++ b/core/inventory/api_v2.py @@ -1,13 +1,12 @@ from django.urls import re_path from django.contrib.auth.decorators import permission_required -from rest_framework import routers, viewsets, status +from rest_framework import routers, viewsets from rest_framework.decorators import api_view, permission_classes from rest_framework.response import Response from rest_framework.permissions import IsAuthenticated -from inventory.models import Event, Container, Item, Comment -from inventory.serializers import EventSerializer, ContainerSerializer, CommentSerializer, ItemSerializer, \ - SearchResultSerializer +from inventory.models import Event, Container, Item +from inventory.serializers import EventSerializer, ContainerSerializer, ItemSerializer, SearchResultSerializer from base64 import b64decode @@ -23,20 +22,6 @@ class ContainerViewSet(viewsets.ModelViewSet): queryset = Container.objects.all() -class ItemViewSet(viewsets.ModelViewSet): - serializer_class = ItemSerializer - - def prefetch_queryset(self, queryset): - serializer = self.get_serializer_class() - if hasattr(serializer, 'Meta') and hasattr(serializer.Meta, 'prefetch_related_fields'): - queryset = queryset.prefetch_related(*serializer.Meta.prefetch_related_fields) - return queryset - - def get_queryset(self): - queryset = Item.objects.all() - return self.prefetch_queryset(queryset) - - def filter_items(items, query): query_tokens = query.split(' ') for item in items: @@ -64,7 +49,6 @@ def search_items(request, event_slug, query): @api_view(['GET', 'POST']) @permission_classes([IsAuthenticated]) def item(request, event_slug): - vs = ItemViewSet() try: event = None if event_slug != 'none': @@ -72,7 +56,7 @@ def item(request, event_slug): if request.method == 'GET': if not request.user.has_event_perm(event, 'view_item'): return Response(status=403) - return Response(ItemSerializer(vs.prefetch_queryset(Item.objects.filter(event=event)), many=True).data) + return Response(ItemSerializer(Item.objects.filter(event=event), many=True).data) elif request.method == 'POST': if not request.user.has_event_perm(event, 'add_item'): return Response(status=403) @@ -83,27 +67,6 @@ def item(request, event_slug): return Response(status=400) except Event.DoesNotExist: return Response(status=404) - except KeyError: - return Response(status=400) - - -@api_view(['POST']) -@permission_classes([IsAuthenticated]) -@permission_required('tickets.add_comment', raise_exception=True) -def add_comment(request, event_slug, id): - event = None - if event_slug != 'none': - event = Event.objects.get(slug=event_slug) - item = Item.objects.get(event=event, id=id) - if not request.user.has_event_perm(event, 'view_item'): - return Response(status=403) - if 'comment' not in request.data or request.data['comment'] == '': - return Response({'status': 'error', 'message': 'missing comment'}, status=status.HTTP_400_BAD_REQUEST) - comment = Comment.objects.create( - item=item, - comment=request.data['comment'], - ) - return Response(CommentSerializer(comment).data, status=status.HTTP_201_CREATED) @api_view(['GET', 'PUT', 'DELETE', 'PATCH']) @@ -152,6 +115,5 @@ urlpatterns = router.urls + [ re_path(r'^(?P[\w-]+)/items/$', item, name='item'), re_path(r'^(?P[\w-]+)/items/(?P[-A-Za-z0-9+/]*={0,3})/$', search_items, name='search_items'), re_path(r'^(?P[\w-]+)/item/$', item, name='item'), - re_path(r'^(?P[\w-]+)/item/(?P\d+)/comment/$', add_comment, name='add_comment'), re_path(r'^(?P[\w-]+)/item/(?P\d+)/$', item_by_id, name='item_by_id'), ] diff --git a/core/inventory/migrations/0007_rename_container_item_container_old_itemplacement_and_more.py b/core/inventory/migrations/0007_rename_container_item_container_old_itemplacement_and_more.py deleted file mode 100644 index 918f636..0000000 --- a/core/inventory/migrations/0007_rename_container_item_container_old_itemplacement_and_more.py +++ /dev/null @@ -1,52 +0,0 @@ -# Generated by Django 4.2.7 on 2024-11-23 15:27 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - dependencies = [ - ('inventory', '0006_alter_event_table'), - ] - - def set_initial_container(apps, schema_editor): - Item = apps.get_model('inventory', 'Item') - for item in Item.objects.all(): - item.container_history.get_or_create(container=item.container_old) - item.save() - - operations = [ - migrations.RenameField( - model_name='item', - old_name='container', - new_name='container_old', - ), - migrations.CreateModel( - name='ItemPlacement', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('timestamp', models.DateTimeField(auto_now_add=True)), - ('container', - models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='item_history', - to='inventory.container')), - ('item', - models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='container_history', - to='inventory.item')), - ], - ), - migrations.CreateModel( - name='Comment', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('comment', models.TextField()), - ('timestamp', models.DateTimeField(auto_now_add=True)), - ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', - to='inventory.item')), - ], - ), - migrations.RunPython(set_initial_container), - migrations.RemoveField( - model_name='item', - name='container_old', - ), - ] diff --git a/core/inventory/models.py b/core/inventory/models.py index 231094e..3421680 100644 --- a/core/inventory/models.py +++ b/core/inventory/models.py @@ -7,14 +7,11 @@ from django_softdelete.models import SoftDeleteModel, SoftDeleteManager class ItemManager(SoftDeleteManager): def create(self, **kwargs): - container = kwargs.pop('container') if 'uid_deprecated' in kwargs: raise ValueError('uid_deprecated must not be set manually') uid_deprecated = Item.all_objects.filter(event=kwargs['event']).count() + 1 kwargs['uid_deprecated'] = uid_deprecated - item = super().create(**kwargs) - item.container = container - return item + return super().create(**kwargs) def get_queryset(self): return super().get_queryset().filter(returned_at__isnull=True) @@ -25,32 +22,18 @@ class Item(SoftDeleteModel): uid_deprecated = models.IntegerField() description = models.TextField() event = models.ForeignKey('Event', models.CASCADE) + container = models.ForeignKey('Container', models.CASCADE) returned_at = models.DateTimeField(blank=True, null=True) created_at = models.DateTimeField(null=True, auto_now_add=True) updated_at = models.DateTimeField(blank=True, null=True) - @property - def container(self): - try: - history = sorted(self.container_history.all(), key=lambda x: x.timestamp, reverse=True) - if history: - return history[0].container - else: - return None - except AttributeError: - return None - - @container.setter - def container(self, value): - if self.container == value: - return - self.container_history.create(container=value) - @property def related_issues(self): groups = groupby(self.issue_relation_changes.all(), lambda rel: rel.issue_thread.id) return [sorted(v, key=lambda r: r.timestamp)[0].issue_thread for k, v in groups] + + objects = ItemManager() all_objects = models.Manager() @@ -70,35 +53,10 @@ class Container(SoftDeleteModel): created_at = models.DateTimeField(blank=True, null=True) updated_at = models.DateTimeField(blank=True, null=True) - @property - def items(self): - try: - history = self.item_history.order_by('-timestamp').all() - return [v for k, v in groupby(history, key=lambda item: item.item.id)] - except AttributeError: - return [] - def __str__(self): return '[' + str(self.id) + ']' + self.name -class ItemPlacement(models.Model): - id = models.AutoField(primary_key=True) - item = models.ForeignKey('Item', models.CASCADE, related_name='container_history') - container = models.ForeignKey('Container', models.CASCADE, related_name='item_history') - timestamp = models.DateTimeField(auto_now_add=True) - - -class Comment(models.Model): - id = models.AutoField(primary_key=True) - item = models.ForeignKey(Item, on_delete=models.CASCADE, related_name='comments') - comment = models.TextField() - timestamp = models.DateTimeField(auto_now_add=True) - - def __str__(self): - return str(self.item) + ' comment #' + str(self.id) - - class Event(models.Model): id = models.AutoField(primary_key=True) name = models.CharField(max_length=255) @@ -114,4 +72,4 @@ class Event(models.Model): return '[' + str(self.slug) + ']' + self.name class Meta: - db_table = 'common_event' + db_table = 'common_event' \ No newline at end of file diff --git a/core/inventory/serializers.py b/core/inventory/serializers.py index 26a5be4..9a611f6 100644 --- a/core/inventory/serializers.py +++ b/core/inventory/serializers.py @@ -3,28 +3,26 @@ from rest_framework import serializers from rest_framework.relations import SlugRelatedField from files.models import File -from inventory.models import Event, Container, Item, Comment +from inventory.models import Event, Container, Item from inventory.shared_serializers import BasicItemSerializer from mail.models import EventAddress from tickets.shared_serializers import BasicIssueSerializer +class EventAdressSerializer(serializers.ModelSerializer): + class Meta: + model = EventAddress + fields = ['address'] + + class EventSerializer(serializers.ModelSerializer): - addresses = SlugRelatedField(many=True, slug_field='address', queryset=EventAddress.objects.all()) + addresses = EventAdressSerializer(many=True, required=False) class Meta: model = Event fields = ['id', 'slug', 'name', 'start', 'end', 'pre_start', 'post_end', 'addresses'] read_only_fields = ['id'] - def to_internal_value(self, data): - data = data.copy() - addresses = data.pop('addresses', None) - dict = super().to_internal_value(data) - if addresses: - dict['addresses'] = [EventAddress.objects.get_or_create(address=x)[0] for x in addresses] - return dict - class ContainerSerializer(serializers.ModelSerializer): itemCount = serializers.SerializerMethodField() @@ -35,37 +33,17 @@ class ContainerSerializer(serializers.ModelSerializer): read_only_fields = ['id', 'itemCount'] def get_itemCount(self, instance): - return len(instance.items) - - -class CommentSerializer(serializers.ModelSerializer): - - def validate(self, attrs): - if 'comment' not in attrs or attrs['comment'] == '': - raise serializers.ValidationError('comment cannot be empty') - return attrs - - class Meta: - model = Comment - fields = ('id', 'comment', 'timestamp', 'item') + return Item.objects.filter(container=instance.id).count() class ItemSerializer(BasicItemSerializer): - timeline = serializers.SerializerMethodField() dataImage = serializers.CharField(write_only=True, required=False) related_issues = BasicIssueSerializer(many=True, read_only=True) class Meta: model = Item - fields = ['cid', 'box', 'id', 'description', 'file', 'dataImage', 'returned', 'event', 'related_issues', - 'timeline'] + fields = ['cid', 'box', 'id', 'description', 'file', 'dataImage', 'returned', 'event', 'related_issues'] read_only_fields = ['id'] - prefetch_related_fields = ['comments', 'issue_relation_changes', 'container_history', - 'container_history__container', 'files', 'event', - 'issue_relation_changes__issue_thread', - 'issue_relation_changes__issue_thread__event', - 'issue_relation_changes__issue_thread__state_changes', - 'issue_relation_changes__issue_thread__assignments'] def to_internal_value(self, data): container = None @@ -106,34 +84,6 @@ class ItemSerializer(BasicItemSerializer): instance.files.add(file) return super().update(instance, validated_data) - @staticmethod - def get_timeline(obj): - timeline = [] - for comment in obj.comments.all(): - timeline.append({ - 'type': 'comment', - 'id': comment.id, - 'timestamp': comment.timestamp, - 'comment': comment.comment, - }) - for relation in (obj.issue_relation_changes.all()): - timeline.append({ - 'type': 'issue_relation', - 'id': relation.id, - 'status': relation.status, - 'timestamp': relation.timestamp, - 'issue_thread': BasicIssueSerializer(relation.issue_thread).data, - }) - for placement in (obj.container_history.all()): - timeline.append({ - 'type': 'placement', - 'id': placement.id, - 'timestamp': placement.timestamp, - 'cid': placement.container.id, - 'box': placement.container.name - }) - return sorted(timeline, key=lambda x: x['timestamp']) - class SearchResultSerializer(serializers.Serializer): search_score = serializers.IntegerField() diff --git a/core/inventory/tests/v2/test_events.py b/core/inventory/tests/v2/test_events.py index bd58515..6d6cadb 100644 --- a/core/inventory/tests/v2/test_events.py +++ b/core/inventory/tests/v2/test_events.py @@ -47,20 +47,6 @@ class EventTestCase(TestCase): self.assertEqual(Event.objects.all()[0].slug, 'EVENT2') self.assertEqual(Event.objects.all()[0].name, 'Event 2 new') - def test_update_event(self): - from rest_framework.test import APIClient - event = Event.objects.create(slug='EVENT1', name='Event 1') - response = APIClient().patch(f'/api/2/events/{event.id}/', {'addresses': ['foo@bar.baz', 'foo1@bar.baz']}) - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json()['slug'], 'EVENT1') - self.assertEqual(response.json()['name'], 'Event 1') - self.assertEqual(2, len(response.json()['addresses'])) - self.assertEqual('foo@bar.baz', response.json()['addresses'][0]) - self.assertEqual('foo1@bar.baz', response.json()['addresses'][1]) - self.assertEqual(len(Event.objects.all()), 1) - self.assertEqual(Event.objects.all()[0].slug, 'EVENT1') - self.assertEqual(Event.objects.all()[0].name, 'Event 1') - def test_remove_event(self): event = Event.objects.create(slug='EVENT1', name='Event 1') Event.objects.create(slug='EVENT2', name='Event 2') @@ -69,10 +55,10 @@ class EventTestCase(TestCase): self.assertEqual(response.status_code, 204) self.assertEqual(len(Event.objects.all()), 1) - def test_event_with_address(self): + def test_items2(self): from mail.models import EventAddress event1 = Event.objects.create(slug='TEST1', name='Event') - EventAddress.objects.create(event=event1, address='foo@bar.baz') + EventAddress.objects.create(event=Event.objects.get(slug='TEST1'), address='foo@bar.baz') response = self.client.get('/api/2/events/') self.assertEqual(response.status_code, 200) self.assertEqual(1, len(response.json())) @@ -80,15 +66,3 @@ class EventTestCase(TestCase): self.assertEqual('Event', response.json()[0]['name']) self.assertEqual(1, len(response.json()[0]['addresses'])) - def test_items_remove_addresss(self): - from mail.models import EventAddress - from rest_framework.test import APIClient - event1 = Event.objects.create(slug='TEST1', name='Event') - EventAddress.objects.create(event=event1, address='foo@bar.baz') - EventAddress.objects.create(event=event1, address='fo1o@bar.baz') - response = APIClient().patch(f'/api/2/events/{event1.id}/', {'addresses': ['foo1@bar.baz']}) - self.assertEqual(response.status_code, 200) - self.assertEqual('TEST1', response.json()['slug']) - self.assertEqual('Event', response.json()['name']) - self.assertEqual(1, len(response.json()['addresses'])) - self.assertEqual('foo1@bar.baz', response.json()['addresses'][0]) diff --git a/core/inventory/tests/v2/test_items.py b/core/inventory/tests/v2/test_items.py index 0c85eb4..59a5a4e 100644 --- a/core/inventory/tests/v2/test_items.py +++ b/core/inventory/tests/v2/test_items.py @@ -1,5 +1,3 @@ -from datetime import datetime, timedelta - from django.utils import timezone from django.test import TestCase, Client from django.contrib.auth.models import Permission @@ -7,140 +5,72 @@ from knox.models import AuthToken from authentication.models import ExtendedUser from files.models import File -from inventory.models import Event, Container, Item, Comment, ItemPlacement +from inventory.models import Event, Container, Item from base64 import b64encode -from tickets.models import IssueThread, ItemRelation - class ItemTestCase(TestCase): def setUp(self): super().setUp() self.event = Event.objects.create(slug='EVENT', name='Event') - self.box1 = Container.objects.create(name='BOX1') - self.box2 = Container.objects.create(name='BOX2') + self.box = Container.objects.create(name='BOX') self.user = ExtendedUser.objects.create_user('testuser', 'test', 'test') self.user.user_permissions.add(*Permission.objects.all()) self.token = AuthToken.objects.create(user=self.user) self.client = Client(headers={'Authorization': 'Token ' + self.token[1]}) - self.issue = IssueThread.objects.create( - name="test issue", - event=self.event, - ) def test_empty(self): response = self.client.get(f'/api/2/{self.event.slug}/item/') self.assertEqual(response.status_code, 200) self.assertEqual(response.content, b'[]') - def test_members_and_timeline(self): - now = datetime.now() - item = Item.objects.create(container=self.box1, event=self.event, description='1') - comment = Comment.objects.create( - item=item, - comment="test", - timestamp=now + timedelta(seconds=3), - ) - match = ItemRelation.objects.create( - issue_thread=self.issue, - item=item, - timestamp=now + timedelta(seconds=4), - ) - placement = ItemPlacement.objects.create( - container=self.box2, - item=item, - timestamp=now + timedelta(seconds=5), - ) + def test_members(self): + item = Item.objects.create(container=self.box, event=self.event, description='1') response = self.client.get(f'/api/2/{self.event.slug}/item/') self.assertEqual(response.status_code, 200) self.assertEqual(len(response.json()), 1) self.assertEqual(response.json()[0]['id'], item.id) self.assertEqual(response.json()[0]['description'], '1') - self.assertEqual(response.json()[0]['box'], 'BOX2') - self.assertEqual(response.json()[0]['cid'], self.box2.id) + self.assertEqual(response.json()[0]['box'], 'BOX') + self.assertEqual(response.json()[0]['cid'], self.box.id) self.assertEqual(response.json()[0]['file'], None) self.assertEqual(response.json()[0]['returned'], False) self.assertEqual(response.json()[0]['event'], self.event.slug) - self.assertEqual(len(response.json()[0]['timeline']), 4) - self.assertEqual(response.json()[0]['timeline'][0]['type'], 'placement') - self.assertEqual(response.json()[0]['timeline'][1]['type'], 'comment') - self.assertEqual(response.json()[0]['timeline'][2]['type'], 'issue_relation') - self.assertEqual(response.json()[0]['timeline'][3]['type'], 'placement') - self.assertEqual(response.json()[0]['timeline'][1]['id'], comment.id) - self.assertEqual(response.json()[0]['timeline'][2]['id'], match.id) - self.assertEqual(response.json()[0]['timeline'][3]['id'], placement.id) - self.assertEqual(response.json()[0]['timeline'][0]['box'], 'BOX1') - self.assertEqual(response.json()[0]['timeline'][0]['cid'], self.box1.id) - self.assertEqual(response.json()[0]['timeline'][1]['comment'], 'test') - self.assertEqual(response.json()[0]['timeline'][1]['timestamp'], - comment.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ')) - self.assertEqual(response.json()[0]['timeline'][2]['status'], 'possible') - self.assertEqual(response.json()[0]['timeline'][2]['timestamp'], - match.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ')) - self.assertEqual(response.json()[0]['timeline'][2]['issue_thread']['name'], "test issue") - self.assertEqual(response.json()[0]['timeline'][2]['issue_thread']['event'], "EVENT") - self.assertEqual(response.json()[0]['timeline'][2]['issue_thread']['state'], "pending_new") - self.assertEqual(response.json()[0]['timeline'][3]['box'], 'BOX2') - self.assertEqual(response.json()[0]['timeline'][3]['cid'], self.box2.id) - self.assertEqual(response.json()[0]['timeline'][3]['timestamp'], - placement.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ')) - self.assertEqual(len(response.json()[0]['related_issues']), 1) - self.assertEqual(response.json()[0]['related_issues'][0]['name'], "test issue") - self.assertEqual(response.json()[0]['related_issues'][0]['event'], "EVENT") - self.assertEqual(response.json()[0]['related_issues'][0]['state'], "pending_new") + self.assertEqual(len(response.json()[0]['related_issues']), 0) def test_members_with_file(self): import base64 - item = Item.objects.create(container=self.box1, event=self.event, description='1') + item = Item.objects.create(container=self.box, event=self.event, description='1') file = File.objects.create(item=item, data="data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8')) response = self.client.get(f'/api/2/{self.event.slug}/item/') self.assertEqual(response.status_code, 200) self.assertEqual(len(response.json()), 1) self.assertEqual(response.json()[0]['id'], item.id) self.assertEqual(response.json()[0]['description'], '1') - self.assertEqual(response.json()[0]['box'], 'BOX1') - self.assertEqual(response.json()[0]['cid'], self.box1.id) + self.assertEqual(response.json()[0]['box'], 'BOX') + self.assertEqual(response.json()[0]['cid'], self.box.id) self.assertEqual(response.json()[0]['file'], file.hash) self.assertEqual(response.json()[0]['returned'], False) self.assertEqual(response.json()[0]['event'], self.event.slug) self.assertEqual(len(response.json()[0]['related_issues']), 0) - def test_members_with_two_file(self): - import base64 - item = Item.objects.create(container=self.box1, event=self.event, description='1') - file1 = File.objects.create(item=item, - data="data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8')) - file2 = File.objects.create(item=item, - data="data:text/plain;base64," + base64.b64encode(b"bar").decode('utf-8')) - response = self.client.get(f'/api/2/{self.event.slug}/item/') - self.assertEqual(response.status_code, 200) - self.assertEqual(len(response.json()), 1) - self.assertEqual(response.json()[0]['id'], item.id) - self.assertEqual(response.json()[0]['description'], '1') - self.assertEqual(response.json()[0]['box'], 'BOX1') - self.assertEqual(response.json()[0]['cid'], self.box1.id) - self.assertEqual(response.json()[0]['file'], file2.hash) - self.assertEqual(response.json()[0]['returned'], False) - self.assertEqual(response.json()[0]['event'], self.event.slug) - self.assertEqual(len(response.json()[0]['related_issues']), 0) - def test_multi_members(self): - Item.objects.create(container=self.box1, event=self.event, description='1') - Item.objects.create(container=self.box1, event=self.event, description='2') - Item.objects.create(container=self.box1, event=self.event, description='3') + Item.objects.create(container=self.box, event=self.event, description='1') + Item.objects.create(container=self.box, event=self.event, description='2') + Item.objects.create(container=self.box, event=self.event, description='3') response = self.client.get(f'/api/2/{self.event.slug}/item/') self.assertEqual(response.status_code, 200) self.assertEqual(len(response.json()), 3) def test_create_item(self): - response = self.client.post(f'/api/2/{self.event.slug}/item/', {'cid': self.box1.id, 'description': '1'}) + response = self.client.post(f'/api/2/{self.event.slug}/item/', {'cid': self.box.id, 'description': '1'}) self.assertEqual(response.status_code, 201) self.assertEqual(response.json()['id'], 1) self.assertEqual(response.json()['description'], '1') - self.assertEqual(response.json()['box'], 'BOX1') - self.assertEqual(response.json()['cid'], self.box1.id) + self.assertEqual(response.json()['box'], 'BOX') + self.assertEqual(response.json()['cid'], self.box.id) self.assertEqual(response.json()['file'], None) self.assertEqual(response.json()['returned'], False) self.assertEqual(response.json()['event'], self.event.slug) @@ -148,43 +78,43 @@ class ItemTestCase(TestCase): self.assertEqual(len(Item.objects.all()), 1) self.assertEqual(Item.objects.all()[0].id, 1) self.assertEqual(Item.objects.all()[0].description, '1') - self.assertEqual(Item.objects.all()[0].container.id, self.box1.id) + self.assertEqual(Item.objects.all()[0].container.id, self.box.id) def test_create_item_without_container(self): response = self.client.post(f'/api/2/{self.event.slug}/item/', {'description': '1'}) self.assertEqual(response.status_code, 400) def test_create_item_without_description(self): - response = self.client.post(f'/api/2/{self.event.slug}/item/', {'cid': self.box1.id}) + response = self.client.post(f'/api/2/{self.event.slug}/item/', {'cid': self.box.id}) self.assertEqual(response.status_code, 400) def test_create_item_with_file(self): import base64 response = self.client.post(f'/api/2/{self.event.slug}/item/', - {'cid': self.box1.id, 'description': '1', + {'cid': self.box.id, 'description': '1', 'dataImage': "data:text/plain;base64," + base64.b64encode(b"foo").decode( 'utf-8')}, content_type='application/json') self.assertEqual(response.status_code, 201) self.assertEqual(response.json()['id'], 1) self.assertEqual(response.json()['description'], '1') - self.assertEqual(response.json()['box'], 'BOX1') - self.assertEqual(response.json()['id'], self.box1.id) + self.assertEqual(response.json()['box'], 'BOX') + self.assertEqual(response.json()['id'], self.box.id) self.assertEqual(len(response.json()['file']), 64) self.assertEqual(len(Item.objects.all()), 1) self.assertEqual(Item.objects.all()[0].id, 1) self.assertEqual(Item.objects.all()[0].description, '1') - self.assertEqual(Item.objects.all()[0].container.id, self.box1.id) + self.assertEqual(Item.objects.all()[0].container.id, self.box.id) self.assertEqual(len(File.objects.all()), 1) def test_update_item(self): - item = Item.objects.create(container=self.box1, event=self.event, description='1') + item = Item.objects.create(container=self.box, event=self.event, description='1') response = self.client.patch(f'/api/2/{self.event.slug}/item/{item.id}/', {'description': '2'}, - content_type='application/json') + content_type='application/json') self.assertEqual(response.status_code, 200) self.assertEqual(response.json()['id'], item.id) self.assertEqual(response.json()['description'], '2') - self.assertEqual(response.json()['box'], 'BOX1') - self.assertEqual(response.json()['cid'], self.box1.id) + self.assertEqual(response.json()['box'], 'BOX') + self.assertEqual(response.json()['cid'], self.box.id) self.assertEqual(response.json()['file'], None) self.assertEqual(response.json()['returned'], False) self.assertEqual(response.json()['event'], self.event.slug) @@ -192,62 +122,60 @@ class ItemTestCase(TestCase): self.assertEqual(len(Item.objects.all()), 1) self.assertEqual(Item.objects.all()[0].id, 1) self.assertEqual(Item.objects.all()[0].description, '2') - self.assertEqual(Item.objects.all()[0].container.id, self.box1.id) + self.assertEqual(Item.objects.all()[0].container.id, self.box.id) def test_update_item_with_file(self): import base64 - item = Item.objects.create(container=self.box1, event=self.event, description='1') + item = Item.objects.create(container=self.box, event=self.event, description='1') response = self.client.patch(f'/api/2/{self.event.slug}/item/{item.id}/', - {'description': '2', - 'dataImage': "data:text/plain;base64," + base64.b64encode(b"foo").decode( - 'utf-8')}, - content_type='application/json') + {'description': '2', + 'dataImage': "data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8')}, + content_type='application/json') self.assertEqual(response.status_code, 200) self.assertEqual(response.json()['id'], 1) self.assertEqual(response.json()['description'], '2') - self.assertEqual(response.json()['box'], 'BOX1') - self.assertEqual(response.json()['id'], self.box1.id) + self.assertEqual(response.json()['box'], 'BOX') + self.assertEqual(response.json()['id'], self.box.id) self.assertEqual(len(response.json()['file']), 64) self.assertEqual(len(Item.objects.all()), 1) self.assertEqual(Item.objects.all()[0].id, 1) self.assertEqual(Item.objects.all()[0].description, '2') - self.assertEqual(Item.objects.all()[0].container.id, self.box1.id) + self.assertEqual(Item.objects.all()[0].container.id, self.box.id) self.assertEqual(len(File.objects.all()), 1) def test_delete_item(self): - item = Item.objects.create(container=self.box1, event=self.event, description='1') - Item.objects.create(container=self.box1, event=self.event, description='2') + item = Item.objects.create(container=self.box, event=self.event, description='1') + Item.objects.create(container=self.box, event=self.event, description='2') self.assertEqual(len(Item.objects.all()), 2) response = self.client.delete(f'/api/2/{self.event.slug}/item/{item.id}/') self.assertEqual(response.status_code, 204) self.assertEqual(len(Item.objects.all()), 1) def test_delete_item2(self): - Item.objects.create(container=self.box1, event=self.event, description='1') - item2 = Item.objects.create(container=self.box1, event=self.event, description='2') + Item.objects.create(container=self.box, event=self.event, description='1') + item2 = Item.objects.create(container=self.box, event=self.event, description='2') self.assertEqual(len(Item.objects.all()), 2) response = self.client.delete(f'/api/2/{self.event.slug}/item/{item2.id}/') self.assertEqual(response.status_code, 204) self.assertEqual(len(Item.objects.all()), 1) - item3 = Item.objects.create(container=self.box1, event=self.event, description='3') + item3 = Item.objects.create(container=self.box, event=self.event, description='3') self.assertEqual(item3.id, 3) self.assertEqual(len(Item.objects.all()), 2) def test_item_count(self): - Item.objects.create(container=self.box1, event=self.event, description='1') - Item.objects.create(container=self.box1, event=self.event, description='2') + Item.objects.create(container=self.box, event=self.event, description='1') + Item.objects.create(container=self.box, event=self.event, description='2') response = self.client.get('/api/2/boxes/') self.assertEqual(response.status_code, 200) - self.assertEqual(len(response.json()), 2) + self.assertEqual(len(response.json()), 1) self.assertEqual(response.json()[0]['itemCount'], 2) - self.assertEqual(response.json()[1]['itemCount'], 0) def test_item_nonexistent(self): response = self.client.get(f'/api/2/NOEVENT/item/') self.assertEqual(response.status_code, 404) def test_item_return(self): - item = Item.objects.create(container=self.box1, event=self.event, description='1') + item = Item.objects.create(container=self.box, event=self.event, description='1') self.assertEqual(item.returned_at, None) response = self.client.get(f'/api/2/{self.event.slug}/item/') self.assertEqual(response.status_code, 200) @@ -262,8 +190,8 @@ class ItemTestCase(TestCase): self.assertEqual(len(response.json()), 0) def test_item_show_not_returned(self): - item1 = Item.objects.create(container=self.box1, event=self.event, description='1') - item2 = Item.objects.create(container=self.box1, event=self.event, description='2') + item1 = Item.objects.create(container=self.box, event=self.event, description='1') + item2 = Item.objects.create(container=self.box, event=self.event, description='2') response = self.client.get(f'/api/2/{self.event.slug}/item/') self.assertEqual(response.status_code, 200) self.assertEqual(len(response.json()), 2) @@ -280,15 +208,15 @@ class ItemSearchTestCase(TestCase): def setUp(self): super().setUp() self.event = Event.objects.create(slug='EVENT', name='Event') - self.box1 = Container.objects.create(name='BOX1') + self.box = Container.objects.create(name='BOX') self.user = ExtendedUser.objects.create_user('testuser', 'test', 'test') self.user.user_permissions.add(*Permission.objects.all()) self.token = AuthToken.objects.create(user=self.user) self.client = Client(headers={'Authorization': 'Token ' + self.token[1]}) - self.item1 = Item.objects.create(container=self.box1, event=self.event, description='abc def') - self.item2 = Item.objects.create(container=self.box1, event=self.event, description='def ghi') - self.item3 = Item.objects.create(container=self.box1, event=self.event, description='jkl mno pqr') - self.item4 = Item.objects.create(container=self.box1, event=self.event, description='stu vwx') + self.item1 = Item.objects.create(container=self.box, event=self.event, description='abc def') + self.item2 = Item.objects.create(container=self.box, event=self.event, description='def ghi') + self.item3 = Item.objects.create(container=self.box, event=self.event, description='jkl mno pqr') + self.item4 = Item.objects.create(container=self.box, event=self.event, description='stu vwx') def test_search(self): search_query = b64encode(b'abc').decode('utf-8') @@ -297,8 +225,8 @@ class ItemSearchTestCase(TestCase): self.assertEqual(1, len(response.json())) self.assertEqual(self.item1.id, response.json()[0]['id']) self.assertEqual('abc def', response.json()[0]['description']) - self.assertEqual('BOX1', response.json()[0]['box']) - self.assertEqual(self.box1.id, response.json()[0]['cid']) + self.assertEqual('BOX', response.json()[0]['box']) + self.assertEqual(self.box.id, response.json()[0]['cid']) self.assertEqual(1, response.json()[0]['search_score']) def test_search2(self): @@ -308,13 +236,13 @@ class ItemSearchTestCase(TestCase): self.assertEqual(2, len(response.json())) self.assertEqual(self.item1.id, response.json()[0]['id']) self.assertEqual('abc def', response.json()[0]['description']) - self.assertEqual('BOX1', response.json()[0]['box']) - self.assertEqual(self.box1.id, response.json()[0]['cid']) + self.assertEqual('BOX', response.json()[0]['box']) + self.assertEqual(self.box.id, response.json()[0]['cid']) self.assertEqual(1, response.json()[0]['search_score']) - self.assertEqual(self.item2.id, response.json()[1]['id']) + self.assertEqual(self.box.id, response.json()[1]['cid']) self.assertEqual('def ghi', response.json()[1]['description']) - self.assertEqual('BOX1', response.json()[1]['box']) - self.assertEqual(self.box1.id, response.json()[1]['cid']) + self.assertEqual('BOX', response.json()[1]['box']) + self.assertEqual(self.box.id, response.json()[1]['cid']) self.assertEqual(1, response.json()[0]['search_score']) def test_search3(self): @@ -324,8 +252,8 @@ class ItemSearchTestCase(TestCase): self.assertEqual(1, len(response.json())) self.assertEqual(self.item3.id, response.json()[0]['id']) self.assertEqual('jkl mno pqr', response.json()[0]['description']) - self.assertEqual('BOX1', response.json()[0]['box']) - self.assertEqual(self.box1.id, response.json()[0]['cid']) + self.assertEqual('BOX', response.json()[0]['box']) + self.assertEqual(self.box.id, response.json()[0]['cid']) self.assertEqual(1, response.json()[0]['search_score']) def test_search4(self): @@ -335,11 +263,12 @@ class ItemSearchTestCase(TestCase): self.assertEqual(2, len(response.json())) self.assertEqual(self.item1.id, response.json()[0]['id']) self.assertEqual('abc def', response.json()[0]['description']) - self.assertEqual('BOX1', response.json()[0]['box']) - self.assertEqual(self.box1.id, response.json()[0]['cid']) + self.assertEqual('BOX', response.json()[0]['box']) + self.assertEqual(self.box.id, response.json()[0]['cid']) self.assertEqual(2, response.json()[0]['search_score']) self.assertEqual(self.item2.id, response.json()[1]['id']) self.assertEqual('def ghi', response.json()[1]['description']) - self.assertEqual('BOX1', response.json()[1]['box']) - self.assertEqual(self.box1.id, response.json()[1]['cid']) + self.assertEqual('BOX', response.json()[1]['box']) + self.assertEqual(self.box.id, response.json()[1]['cid']) self.assertEqual(1, response.json()[1]['search_score']) + diff --git a/core/tickets/api_v2.py b/core/tickets/api_v2.py index 99dc008..1f2696d 100644 --- a/core/tickets/api_v2.py +++ b/core/tickets/api_v2.py @@ -21,13 +21,7 @@ from tickets.shared_serializers import RelationSerializer class IssueViewSet(viewsets.ModelViewSet): serializer_class = IssueSerializer - - def get_queryset(self): - queryset = IssueThread.objects.all() - serializer = self.get_serializer_class() - if hasattr(serializer, 'Meta') and hasattr(serializer.Meta, 'prefetch_related_fields'): - queryset = queryset.prefetch_related(*serializer.Meta.prefetch_related_fields) - return queryset + queryset = IssueThread.objects.all().prefetch_related('state_changes', 'comments', 'emails', 'emails__attachments', 'assignments', 'assignments__assigned_to__username', 'item_relation_changes', 'shipping_vouchers') class RelationViewSet(viewsets.ModelViewSet): @@ -154,12 +148,12 @@ def filter_issues(issues, query): @api_view(['GET']) -@permission_classes([IsAuthenticated]) +@permission_classes([]) +# @permission_classes([IsAuthenticated]) +# @permission_required('view_item', raise_exception=True) def search_issues(request, event_slug, query): try: 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')) return Response(SearchResultSerializer(items, many=True).data) except Event.DoesNotExist: @@ -177,5 +171,5 @@ urlpatterns = ([ re_path(r'^tickets/(?P\d+)/comment/$', add_comment, name='add_comment'), re_path(r'^(?P[\w-]+)/tickets/manual/$', manual_ticket, name='manual_ticket'), re_path(r'^(?P[\w-]+)/tickets/(?P[-A-Za-z0-9+/]*={0,3})/$', search_issues, - name='search_issues'), + name='search_issues'), ] + router.urls) diff --git a/core/tickets/serializers.py b/core/tickets/serializers.py index 50cdb72..b7d8b28 100644 --- a/core/tickets/serializers.py +++ b/core/tickets/serializers.py @@ -47,12 +47,6 @@ class IssueSerializer(BasicIssueSerializer): model = IssueThread fields = ('id', 'timeline', 'name', 'state', 'assigned_to', 'last_activity', 'uuid', 'related_items', 'event') read_only_fields = ('id', 'timeline', 'last_activity', 'uuid', 'related_items') - prefetch_related_fields = ['state_changes', 'comments', 'emails', 'emails__attachments', 'assignments', - 'item_relation_changes', 'shipping_vouchers', 'item_relation_changes__item', - 'item_relation_changes__item__container_history', 'event', - 'item_relation_changes__item__container_history__container', - 'item_relation_changes__item__files', 'item_relation_changes__item__event', - 'item_relation_changes__item__event'] def to_internal_value(self, data): ret = super().to_internal_value(data) @@ -69,14 +63,12 @@ class IssueSerializer(BasicIssueSerializer): @staticmethod def get_last_activity(self): try: - last_state_change = max( - [t.timestamp for t in self.state_changes.all()]) if self.state_changes.exists() else None + last_state_change = max([t.timestamp for t in self.state_changes.all()]) if self.state_changes.exists() else None last_comment = max([t.timestamp for t in self.comments.all()]) if self.comments.exists() else None last_mail = max([t.timestamp for t in self.emails.all()]) if self.emails.exists() else None last_assignment = max([t.timestamp for t in self.assignments.all()]) if self.assignments.exists() else None - last_relation = max([t.timestamp for t in - self.item_relation_changes.all()]) if self.item_relation_changes.exists() else None + last_relation = max([t.timestamp for t in self.item_relation_changes.all()]) if self.item_relation_changes.exists() else None args = [x for x in [last_state_change, last_comment, last_mail, last_assignment, last_relation] if x is not None] return max(args) @@ -137,6 +129,7 @@ class IssueSerializer(BasicIssueSerializer): return sorted(timeline, key=lambda x: x['timestamp']) + class SearchResultSerializer(serializers.Serializer): search_score = serializers.IntegerField() item = IssueSerializer() diff --git a/core/tickets/tests/v2/test_tickets.py b/core/tickets/tests/v2/test_tickets.py index 9720625..105de93 100644 --- a/core/tickets/tests/v2/test_tickets.py +++ b/core/tickets/tests/v2/test_tickets.py @@ -5,7 +5,7 @@ from django.test import TestCase, Client from authentication.models import ExtendedUser from inventory.models import Event, Container, Item from mail.models import Email, EmailAttachment -from tickets.models import IssueThread, StateChange, Comment, ItemRelation, Assignment +from tickets.models import IssueThread, StateChange, Comment, ItemRelation from django.contrib.auth.models import Permission from knox.models import AuthToken @@ -53,24 +53,19 @@ class IssueApiTest(TestCase): 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", - timestamp=now + timedelta(seconds=4), + timestamp=now + timedelta(seconds=3), ) match = ItemRelation.objects.create( issue_thread=issue, - item=self.item, + item = self.item, timestamp=now + timedelta(seconds=5), ) self.assertEqual('pending_new', issue.state) self.assertEqual('test issue', issue.name) - self.assertEqual(self.user, issue.assigned_to) + self.assertEqual(None, issue.assigned_to) self.assertEqual(36, len(issue.uuid)) response = self.client.get('/api/2/tickets/') self.assertEqual(response.status_code, 200) @@ -79,16 +74,14 @@ class IssueApiTest(TestCase): self.assertEqual(response.json()[0]['name'], "test issue") self.assertEqual(response.json()[0]['state'], "pending_new") self.assertEqual(response.json()[0]['event'], "evt") - self.assertEqual(response.json()[0]['assigned_to'], self.user.username) + self.assertEqual(response.json()[0]['assigned_to'], None) self.assertEqual(response.json()[0]['uuid'], issue.uuid) self.assertEqual(response.json()[0]['last_activity'], match.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ')) - self.assertEqual(len(response.json()[0]['timeline']), 6) + self.assertEqual(len(response.json()[0]['timeline']), 5) self.assertEqual(response.json()[0]['timeline'][0]['type'], 'state') self.assertEqual(response.json()[0]['timeline'][1]['type'], 'mail') self.assertEqual(response.json()[0]['timeline'][2]['type'], 'mail') - self.assertEqual(response.json()[0]['timeline'][3]['type'], 'assignment') - self.assertEqual(response.json()[0]['timeline'][4]['type'], 'comment') - self.assertEqual(response.json()[0]['timeline'][5]['type'], 'item_relation') + self.assertEqual(response.json()[0]['timeline'][3]['type'], 'comment') self.assertEqual(response.json()[0]['timeline'][1]['id'], mail1.id) self.assertEqual(response.json()[0]['timeline'][2]['id'], mail2.id) self.assertEqual(response.json()[0]['timeline'][3]['id'], comment.id) @@ -105,18 +98,15 @@ class IssueApiTest(TestCase): self.assertEqual(response.json()[0]['timeline'][2]['body'], 'test') self.assertEqual(response.json()[0]['timeline'][2]['timestamp'], mail2.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ')) - self.assertEqual(response.json()[0]['timeline'][3]['assigned_to'], self.user.username) + self.assertEqual(response.json()[0]['timeline'][3]['comment'], 'test') self.assertEqual(response.json()[0]['timeline'][3]['timestamp'], - assignment.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ')) - self.assertEqual(response.json()[0]['timeline'][4]['comment'], 'test') - self.assertEqual(response.json()[0]['timeline'][4]['timestamp'], comment.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ')) - self.assertEqual(response.json()[0]['timeline'][5]['status'], 'possible') - self.assertEqual(response.json()[0]['timeline'][5]['timestamp'], + self.assertEqual(response.json()[0]['timeline'][4]['status'], 'possible') + self.assertEqual(response.json()[0]['timeline'][4]['timestamp'], match.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ')) - self.assertEqual(response.json()[0]['timeline'][5]['item']['description'], "foo") - self.assertEqual(response.json()[0]['timeline'][5]['item']['event'], "evt") - self.assertEqual(response.json()[0]['timeline'][5]['item']['box'], "box1") + self.assertEqual(response.json()[0]['timeline'][4]['item']['description'], "foo") + self.assertEqual(response.json()[0]['timeline'][4]['item']['event'], "evt") + self.assertEqual(response.json()[0]['timeline'][4]['item']['box'], "box1") self.assertEqual(response.json()[0]['related_items'][0]['description'], "foo") self.assertEqual(response.json()[0]['related_items'][0]['event'], "evt") self.assertEqual(response.json()[0]['related_items'][0]['box'], "box1") diff --git a/deploy/ansible/playbooks/templates/nginx.conf.j2 b/deploy/ansible/playbooks/templates/nginx.conf.j2 index 1bde29a..3533f37 100644 --- a/deploy/ansible/playbooks/templates/nginx.conf.j2 +++ b/deploy/ansible/playbooks/templates/nginx.conf.j2 @@ -75,14 +75,6 @@ server { allow 127.0.0.1; allow ::1; deny all; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - proxy_redirect off; - proxy_buffering off; - proxy_pass http://c3lf-sys3; } listen 443 ssl http2; # managed by Certbot diff --git a/web/src/App.vue b/web/src/App.vue index d2c9f7d..bd4956f 100644 --- a/web/src/App.vue +++ b/web/src/App.vue @@ -1,6 +1,5 @@ diff --git a/web/src/components/ExpandableTable.vue b/web/src/components/ExpandableTable.vue deleted file mode 100644 index 6bd5175..0000000 --- a/web/src/components/ExpandableTable.vue +++ /dev/null @@ -1,124 +0,0 @@ - - - - - \ No newline at end of file diff --git a/web/src/components/Timeline.vue b/web/src/components/Timeline.vue index 41e1274..2cf8b97 100644 --- a/web/src/components/Timeline.vue +++ b/web/src/components/Timeline.vue @@ -21,9 +21,6 @@ - - - @@ -33,15 +30,40 @@ - -

{{ item }}

  • - + + + +
    +
    + + + + Save Comment + +
    +
  • - + + + +
    +
    + {{ newestMailSubject }} +
    +
    + + + + Send Mail + +
    +
    • @@ -56,20 +78,12 @@ import TimelineAssignment from "@/components/TimelineAssignment.vue"; import TimelineRelatedItem from "@/components/TimelineRelatedItem.vue"; import TimelineShippingVoucher from "@/components/TimelineShippingVoucher.vue"; import AsyncButton from "@/components/inputs/AsyncButton.vue"; -import TimelinePlacement from "@/components/TimelinePlacement.vue"; -import TimelineRelatedTicket from "@/components/TimelineRelatedTicket.vue"; export default { name: 'Timeline', components: { - TimelineRelatedTicket, - TimelinePlacement, - TimelineShippingVoucher, - TimelineRelatedItem, - TimelineAssignment, - TimelineStateChange, - TimelineComment, - TimelineMail + TimelineShippingVoucher, AsyncButton, + TimelineRelatedItem, TimelineAssignment, TimelineStateChange, TimelineComment, TimelineMail }, props: { timeline: { @@ -77,13 +91,36 @@ export default { default: () => [] } }, + emits: ['sendMail', 'addComment'], + data: () => ({ + newMail: "", + newComment: "" + }), computed: { - ...mapGetters(['stateInfo']) + ...mapGetters(['stateInfo']), + newestMailSubject() { + const mail = this.timeline.filter(item => item.type === 'mail').pop(); + return mail ? mail.subject : ""; + }, }, + methods: { + ...mapActions(['fetchShippingVouchers']), + sendMailAndClear: function () { + this.$emit('sendMail', this.newMail); + this.newMail = ""; + }, + addCommentAndClear: function () { + this.$emit('addComment', this.newComment); + this.newComment = ""; + } + }, + mounted() { + this.fetchShippingVouchers(); + } }; - \ No newline at end of file diff --git a/web/src/components/TimelineRelatedItem.vue b/web/src/components/TimelineRelatedItem.vue index 2670215..c17a3a8 100644 --- a/web/src/components/TimelineRelatedItem.vue +++ b/web/src/components/TimelineRelatedItem.vue @@ -1,15 +1,12 @@ @@ -38,11 +72,16 @@ import AuthenticatedImage from "@/components/AuthenticatedImage.vue"; import AuthenticatedDataLink from "@/components/AuthenticatedDataLink.vue"; -import {mapMutations} from "vuex"; +import Lightbox from "@/components/Lightbox.vue"; export default { name: 'TimelineRelatedItem', - components: {AuthenticatedImage, AuthenticatedDataLink}, + components: {Lightbox, AuthenticatedImage, AuthenticatedDataLink}, + data() { + return { + lightboxHash: null, + } + }, props: { 'item': { type: Object, @@ -59,8 +98,13 @@ export default { }, methods: { - ...mapMutations(['openLightboxModalWith']) - } + openLightboxModalWith(attachment) { + this.lightboxHash = attachment.hash; + }, + closeLightboxModal() { // Closes the editing modal and discards the edited copy of the item. + this.lightboxHash = null; + }, + }, }; diff --git a/web/src/components/TimelineRelatedTicket.vue b/web/src/components/TimelineRelatedTicket.vue deleted file mode 100644 index 694a4e0..0000000 --- a/web/src/components/TimelineRelatedTicket.vue +++ /dev/null @@ -1,94 +0,0 @@ - - - - - \ No newline at end of file diff --git a/web/src/components/inputs/AsyncButton.vue b/web/src/components/inputs/AsyncButton.vue index 833f964..a3c1712 100644 --- a/web/src/components/inputs/AsyncButton.vue +++ b/web/src/components/inputs/AsyncButton.vue @@ -24,6 +24,7 @@ export default { }, methods: { async handleClick() { + console.log("AsyncButton.handleClick() called"); if (this.task && typeof this.task === 'function') { this.disabled = true; try { diff --git a/web/src/components/inputs/InputCombo.vue b/web/src/components/inputs/InputCombo.vue index fc64d42..50b5459 100644 --- a/web/src/components/inputs/InputCombo.vue +++ b/web/src/components/inputs/InputCombo.vue @@ -1,36 +1,39 @@ diff --git a/web/src/components/inputs/InputPhoto.vue b/web/src/components/inputs/InputPhoto.vue index 90745a4..e50033b 100644 --- a/web/src/components/inputs/InputPhoto.vue +++ b/web/src/components/inputs/InputPhoto.vue @@ -2,10 +2,9 @@
    Image not available.