From ff765f38f8617f330dacabde4768a7741221dc17 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 20 Sep 2022 10:27:02 +0200 Subject: [PATCH 1/4] add view for list of hdd eraseds --- ereuse_devicehub/inventory/views.py | 24 +- .../templates/ereuse_devicehub/base_site.html | 8 + .../templates/inventory/erasure_list.html | 265 ++++++++++++++++++ 3 files changed, 296 insertions(+), 1 deletion(-) create mode 100644 ereuse_devicehub/templates/inventory/erasure_list.html diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 4e480537..67e1f0ee 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -36,7 +36,7 @@ from ereuse_devicehub.inventory.forms import ( ) from ereuse_devicehub.labels.forms import PrintLabelsForm from ereuse_devicehub.parser.models import PlaceholdersLog, SnapshotsLog -from ereuse_devicehub.resources.action.models import Trade +from ereuse_devicehub.resources.action.models import EraseBasic, Trade from ereuse_devicehub.resources.device.models import ( Computer, DataStorage, @@ -112,6 +112,25 @@ class DeviceListMixin(GenericMixin): return [] +class ErasureListView(DeviceListMixin): + template_name = 'inventory/erasure_list.html' + + def dispatch_request(self): + self.get_context() + self.get_devices() + return flask.render_template(self.template_name, **self.context) + + def get_devices(self): + erasure = EraseBasic.query.filter_by(author=g.user) + # ids = [ac.device.id for ac in actions] + # devices = Device.query.filter(Device.owner_id == g.user.id).filter( + # Device.id.in_(ids) + # # Device.binding == None # noqa: E711 + # ) + # self.context['devices'] = devices + self.context['erasure'] = erasure + + class DeviceListView(DeviceListMixin): def dispatch_request(self, lot_id=None): self.get_context(lot_id) @@ -1324,3 +1343,6 @@ devices.add_url_rule( '/device//binding/', view_func=BindingSearchView.as_view('binding_search'), ) +devices.add_url_rule( + '/device/erasure/', view_func=ErasureListView.as_view('device_erasure_list') +) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index b52bab2a..6fdf1129 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -256,6 +256,14 @@ +
  • Others views
    • + +
  • + +
    • +
  • Unique Identifiers (Tags)
  • diff --git a/ereuse_devicehub/templates/inventory/erasure_list.html b/ereuse_devicehub/templates/inventory/erasure_list.html new file mode 100644 index 00000000..40f4b89d --- /dev/null +++ b/ereuse_devicehub/templates/inventory/erasure_list.html @@ -0,0 +1,265 @@ +{% extends "ereuse_devicehub/base_site.html" %} +{% block main %} + +
    +

    Inventory

    + +
    + +
    +
    + +
    + +
    +
    +
    +
    + +
    + + + +
    + +
    + + + + + + + + + + + + + + + {% for ac in erasure %} + + + + + + + + + + + {% endfor %} + +
    SelectData Storage SerialSnapshot IDType of erasurePhid erasure hostReultTime
    + + + + {{ ac.device.serial_number.upper() }} + + + + {{ ac.snapshot.id }} + + + {{ ac.type or '' }} + + + {{ ac.device.parent.phid() }} + + + {{ ac.severity }} + {{ ac.date_str }} + + + +
    + +
    +
    + {% if lot and not lot.is_temporary %} +
    +
    Documents
    + + + + + + + + + {% for doc in lot.trade.documents %} + + + + + {% endfor %} + +
    FileUploaded on
    + {% if doc.url %} + {{ doc.file_name}} + {% else %} + {{ doc.file_name}} + {% endif %} + + {{ doc.created.strftime('%H:%M %d-%m-%Y')}} +
    +
    +
    +
    Transfer
    +
    + {{ form_transfer.csrf_token }} + + {% for field in form_transfer %} + {% if field != form_transfer.csrf_token %} +
    + {% if field != form_transfer.type %} + {{ field.label(class_="form-label") }} + {% if field == form_transfer.code %} + * + {% endif %} + {{ field }} + {{ field.description }} + {% if field.errors %} +

    + {% for error in field.errors %} + {{ error }}
    + {% endfor %} +

    + {% endif %} + {% endif %} +
    + {% endif %} + {% endfor %} + +
    + Cancel + +
    +
    +
    +
    +
    Delivery Note
    +
    + {{ form_delivery.csrf_token }} + + {% for field in form_delivery %} + {% if field != form_delivery.csrf_token %} +
    + {% if field != form_delivery.type %} + {{ field.label(class_="form-label") }} + {{ field }} + {{ field.description }} + {% if field.errors %} +

    + {% for error in field.errors %} + {{ error }}
    + {% endfor %} +

    + {% endif %} + {% endif %} +
    + {% endif %} + {% endfor %} + + {% if lot.transfer and form_receiver.is_editable() %} +
    + Cancel + +
    + {% endif %} +
    +
    +
    +
    Receiver Note
    +
    + {{ form_receiver.csrf_token }} + + {% for field in form_receiver %} + {% if field != form_receiver.csrf_token %} +
    + {% if field != form_receiver.type %} + {{ field.label(class_="form-label") }} + {{ field }} + {{ field.description }} + {% if field.errors %} +

    + {% for error in field.errors %} + {{ error }}
    + {% endfor %} +

    + {% endif %} + {% endif %} +
    + {% endif %} + {% endfor %} + + {% if lot.transfer and form_receiver.is_editable() %} +
    + Cancel + +
    + {% endif %} +
    +
    + {% endif %} + +
    +
    +
    +
    + +
    + +
    + +
    +{% include "inventory/lot_delete_modal.html" %} +{% include "inventory/actions.html" %} +{% include "inventory/allocate.html" %} +{% include "inventory/data_wipe.html" %} +{% include "inventory/trade.html" %} +{% include "inventory/alert_export_error.html" %} +{% include "inventory/alert_lots_changes.html" %} + + + +{% if config['DEBUG'] %} + +{% else %} + +{% endif %} + + +{% endblock main %} From e02644f75cc6825ec98fc4e3e5e9442ca0de2cc5 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 20 Sep 2022 12:20:30 +0200 Subject: [PATCH 2/4] add test for erasure list view --- ereuse_devicehub/inventory/views.py | 10 ++----- .../templates/inventory/erasure_list.html | 2 +- tests/files/erase-sectors-2-hdd.snapshot.yaml | 6 ++-- tests/test_render_2_0.py | 29 +++++++++++++++++++ 4 files changed, 36 insertions(+), 11 deletions(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 67e1f0ee..73e3badc 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -121,13 +121,9 @@ class ErasureListView(DeviceListMixin): return flask.render_template(self.template_name, **self.context) def get_devices(self): - erasure = EraseBasic.query.filter_by(author=g.user) - # ids = [ac.device.id for ac in actions] - # devices = Device.query.filter(Device.owner_id == g.user.id).filter( - # Device.id.in_(ids) - # # Device.binding == None # noqa: E711 - # ) - # self.context['devices'] = devices + erasure = EraseBasic.query.filter_by(author=g.user).order_by( + EraseBasic.created.desc() + ) self.context['erasure'] = erasure diff --git a/ereuse_devicehub/templates/inventory/erasure_list.html b/ereuse_devicehub/templates/inventory/erasure_list.html index 40f4b89d..2e9802a3 100644 --- a/ereuse_devicehub/templates/inventory/erasure_list.html +++ b/ereuse_devicehub/templates/inventory/erasure_list.html @@ -90,7 +90,7 @@ {{ ac.severity }} - {{ ac.date_str }} + {{ ac.created.strftime('%Y-%m-%d %H:%M:%S')}} diff --git a/tests/files/erase-sectors-2-hdd.snapshot.yaml b/tests/files/erase-sectors-2-hdd.snapshot.yaml index 67cea324..8a89c61c 100644 --- a/tests/files/erase-sectors-2-hdd.snapshot.yaml +++ b/tests/files/erase-sectors-2-hdd.snapshot.yaml @@ -1,9 +1,9 @@ { "version": "11.0a3", "device": { - "serialNumber": 'foo', - "manufacturer": 'bar', - "model": 'baz', + "serialNumber": "foo", + "manufacturer": "bar", + "model": "baz", "type": "Desktop", "actions": [], "chassis": "Tower" diff --git a/tests/test_render_2_0.py b/tests/test_render_2_0.py index aaa60707..227db4cc 100644 --- a/tests/test_render_2_0.py +++ b/tests/test_render_2_0.py @@ -2295,3 +2295,32 @@ def test_upload_snapshot_smartphone(user3: UserClientFlask): assert dev.binding.device.serial_number == 'abcdef' assert dev.placeholder is None assert len(dev.actions) == 2 + + +@pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) +def test_list_erasures(user3: UserClientFlask): + uri = '/inventory/upload-snapshot/' + file_name = 'erase-sectors-2-hdd.snapshot.yaml' + body, status = user3.get(uri) + + assert status == '200 OK' + assert "Select a Snapshot file" in body + + snapshot = conftest.yaml2json(file_name.split(".yaml")[0]) + b_snapshot = bytes(json.dumps(snapshot), 'utf-8') + file_snap = (BytesIO(b_snapshot), file_name) + + data = { + 'snapshot': file_snap, + 'csrf_token': generate_csrf(), + } + + user3.post(uri, data=data, content_type="multipart/form-data") + + uri = '/inventory/device/erasure/' + body, status = user3.get(uri) + + txt = "WD-WCAV27984668" + assert status == '200 OK' + assert txt in body From 31c903230adc8f9686b85dd1c4e542dab178d3a0 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 20 Sep 2022 12:43:04 +0200 Subject: [PATCH 3/4] fix uuid of snapshot --- ereuse_devicehub/templates/inventory/erasure_list.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ereuse_devicehub/templates/inventory/erasure_list.html b/ereuse_devicehub/templates/inventory/erasure_list.html index 2e9802a3..555b29e0 100644 --- a/ereuse_devicehub/templates/inventory/erasure_list.html +++ b/ereuse_devicehub/templates/inventory/erasure_list.html @@ -75,8 +75,8 @@ - - {{ ac.snapshot.id }} + + {{ ac.snapshot.uuid }} @@ -92,7 +92,7 @@ {{ ac.created.strftime('%Y-%m-%d %H:%M:%S')}} - + From 60e783258e0ab95407913ca9bb9a00e3b207bfd7 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 20 Sep 2022 13:05:23 +0200 Subject: [PATCH 4/4] fix basic test --- tests/test_basic.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_basic.py b/tests/test_basic.py index 6ee73062..427363f0 100644 --- a/tests/test_basic.py +++ b/tests/test_basic.py @@ -55,6 +55,7 @@ def test_api_docs(client: Client): '/inventory/device/add/', '/inventory/device/{id}/', '/inventory/device/{dhid}/binding/', + '/inventory/device/erasure/', '/inventory/all/device/', '/inventory/export/{export_id}/', '/inventory/lot/add/',