diff --git a/ereuse_devicehub/workbench/forms.py b/ereuse_devicehub/workbench/forms.py
new file mode 100644
index 00000000..648f5ceb
--- /dev/null
+++ b/ereuse_devicehub/workbench/forms.py
@@ -0,0 +1,47 @@
+from flask import g
+from flask_wtf import FlaskForm
+from wtforms import StringField, validators
+
+from ereuse_devicehub.db import db
+from ereuse_devicehub.resources.device.models import Placeholder
+
+
+class KangarooForm(FlaskForm):
+ phid = StringField('Phid', [validators.length(min=1)])
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+
+ self.placeholder = None
+ self.kangaroos = Placeholder.query.filter(
+ Placeholder.kangaroo.is_(True)
+ ).filter(Placeholder.owner_id == g.user.id)
+
+ def validate(self, extra_validators=None):
+ is_valid = super().validate(extra_validators)
+ if not is_valid:
+ return False
+
+ if not self.placeholder:
+ self.placeholder = (
+ Placeholder.query.filter(Placeholder.phid == self.phid.data)
+ .filter(Placeholder.owner_id == g.user.id)
+ .first()
+ )
+ if self.placeholder:
+ if self.placeholder.status not in ['Snapshot', 'Twin']:
+ self.placeholder = None
+
+ if not self.placeholder:
+ self.phid.errors = ["Device not exist"]
+ return False
+
+ return True
+
+ def save(self):
+ if not self.placeholder or self.placeholder.kangaroo:
+ return
+
+ self.placeholder.kangaroo = True
+ db.session.commit()
+ return self.placeholder
diff --git a/ereuse_devicehub/workbench/views.py b/ereuse_devicehub/workbench/views.py
index 3640ab5b..60c34fd3 100644
--- a/ereuse_devicehub/workbench/views.py
+++ b/ereuse_devicehub/workbench/views.py
@@ -3,34 +3,43 @@ import time
import flask
from flask import Blueprint
from flask import current_app as app
-from flask import g, make_response, request
+from flask import g, make_response, request, url_for
+from flask.views import View
from flask_login import login_required
from ereuse_devicehub import auth
from ereuse_devicehub.db import db
+from ereuse_devicehub.resources.device.models import Placeholder
from ereuse_devicehub.resources.enums import SessionType
from ereuse_devicehub.resources.user.models import Session
from ereuse_devicehub.views import GenericMixin
from ereuse_devicehub.workbench import isos
+from ereuse_devicehub.workbench.forms import KangarooForm
workbench = Blueprint('workbench', __name__, url_prefix='/workbench')
class SettingsView(GenericMixin):
decorators = [login_required]
+ methods = ['GET', 'POST']
template_name = 'workbench/settings.html'
page_title = "Workbench"
def dispatch_request(self):
self.get_context()
+ form_kangaroo = KangarooForm()
self.context.update(
{
'page_title': self.page_title,
'demo': g.user.email == app.config['EMAIL_DEMO'],
'iso': isos,
+ 'form': form_kangaroo,
}
)
+ if form_kangaroo.validate_on_submit():
+ form_kangaroo.save()
+
self.opt = request.values.get('opt')
if self.opt in ['register', 'erease_basic', 'erease_sectors']:
return self.download()
@@ -86,4 +95,24 @@ class SettingsView(GenericMixin):
return token
+class ErasureHostView(View):
+ decorators = [login_required]
+ methods = ['GET']
+
+ def dispatch_request(self, id):
+ self.placeholder = (
+ Placeholder.query.filter(Placeholder.id == id)
+ .filter(Placeholder.kangaroo.is_(True))
+ .filter(Placeholder.owner_id == g.user.id)
+ .one()
+ )
+ self.placeholder.kangaroo = False
+ db.session.commit()
+
+ return flask.redirect(url_for('workbench.settings'))
+
+
workbench.add_url_rule('/', view_func=SettingsView.as_view('settings'))
+workbench.add_url_rule(
+ '/erasure_host//', view_func=ErasureHostView.as_view('erasure_host')
+)
diff --git a/tests/test_basic.py b/tests/test_basic.py
index 43c93d3c..3d7a0ad8 100644
--- a/tests/test_basic.py
+++ b/tests/test_basic.py
@@ -105,6 +105,7 @@ def test_api_docs(client: Client):
'/users/logout/',
'/versions/',
'/workbench/',
+ '/workbench/erasure_host/{id}/',
}
assert docs['info'] == {'title': 'Devicehub', 'version': '0.2'}
assert docs['components']['securitySchemes']['bearerAuth'] == {
diff --git a/tests/test_render_2_0.py b/tests/test_render_2_0.py
index f918cb80..2dcd7100 100644
--- a/tests/test_render_2_0.py
+++ b/tests/test_render_2_0.py
@@ -1374,6 +1374,7 @@ def test_wb_settings_register(user3: UserClientFlask):
def test_create_transfer(user3: UserClientFlask):
user3.get('/inventory/lot/add/')
lot_name = 'lot1'
+ lot_name2 = 'lot2'
data = {
'name': lot_name,
'csrf_token': generate_csrf(),
@@ -1390,13 +1391,14 @@ def test_create_transfer(user3: UserClientFlask):
assert 'Description' in body
assert 'Save' in body
- data = {'csrf_token': generate_csrf(), 'code': 'AAA'}
+ data = {'csrf_token': generate_csrf(), 'code': 'AAA', 'lot_name': lot_name2}
body, status = user3.post(uri, data=data)
assert status == '200 OK'
assert 'Transfer created successfully!' in body
assert 'Delete Lot' in body
assert 'Incoming Lot' in body
+ assert lot_name2 in body
@pytest.mark.mvp
@@ -1405,6 +1407,8 @@ def test_edit_transfer(user3: UserClientFlask):
# create lot
user3.get('/inventory/lot/add/')
lot_name = 'lot1'
+ lot_name2 = 'lot2'
+ lot_name3 = 'lot3'
data = {
'name': lot_name,
'csrf_token': generate_csrf(),
@@ -1422,12 +1426,13 @@ def test_edit_transfer(user3: UserClientFlask):
# create new incoming lot
uri = f'/inventory/lot/{lot_id}/transfer/incoming/'
- data = {'csrf_token': generate_csrf(), 'code': 'AAA'}
+ data = {'csrf_token': generate_csrf(), 'code': 'AAA', 'lot_name': lot_name2}
body, status = user3.post(uri, data=data)
assert 'Transfer (Open)' in body
assert ' Delete Lot' in body
lot = Lot.query.filter()[1]
assert lot.transfer is not None
+ assert lot_name2 in body
# edit transfer with errors
lot_id = lot.id
@@ -1436,6 +1441,7 @@ def test_edit_transfer(user3: UserClientFlask):
'csrf_token': generate_csrf(),
'code': 'AAA',
'description': 'one one one',
+ 'lot_name': lot_name3,
'date': datetime.datetime.now().date() + datetime.timedelta(15),
}
body, status = user3.post(uri, data=data)
@@ -1450,6 +1456,7 @@ def test_edit_transfer(user3: UserClientFlask):
'csrf_token': generate_csrf(),
'code': 'AAA',
'description': 'one one one',
+ 'lot_name': lot_name3,
'date': datetime.datetime.now().date() - datetime.timedelta(15),
}
body, status = user3.post(uri, data=data)
@@ -1458,6 +1465,7 @@ def test_edit_transfer(user3: UserClientFlask):
assert 'one one one' in body
assert ' Delete Lot' not in body
assert 'Transfer (Closed)' in body
+ assert lot_name3 in body
@pytest.mark.mvp
@@ -1476,7 +1484,7 @@ def test_edit_deliverynote(user3: UserClientFlask):
# create new incoming lot
uri = f'/inventory/lot/{lot_id}/transfer/incoming/'
- data = {'csrf_token': generate_csrf(), 'code': 'AAA'}
+ data = {'csrf_token': generate_csrf(), 'code': 'AAA', 'lot_name': lot_name}
user3.post(uri, data=data)
lot = Lot.query.filter()[1]
lot_id = lot.id
@@ -1517,7 +1525,7 @@ def test_edit_receivernote(user3: UserClientFlask):
# create new incoming lot
uri = f'/inventory/lot/{lot_id}/transfer/incoming/'
- data = {'csrf_token': generate_csrf(), 'code': 'AAA'}
+ data = {'csrf_token': generate_csrf(), 'code': 'AAA', 'lot_name': lot_name}
user3.post(uri, data=data)
lot = Lot.query.filter()[1]
lot_id = lot.id
@@ -1558,7 +1566,7 @@ def test_edit_notes_with_closed_transfer(user3: UserClientFlask):
# create new incoming lot
uri = f'/inventory/lot/{lot_id}/transfer/incoming/'
- data = {'csrf_token': generate_csrf(), 'code': 'AAA'}
+ data = {'csrf_token': generate_csrf(), 'code': 'AAA', 'lot_name': lot_name}
user3.post(uri, data=data)
lot = Lot.query.filter()[1]
lot_id = lot.id
@@ -2403,7 +2411,7 @@ def test_bug_3831_documents(user3: UserClientFlask):
uri = f'/inventory/lot/{lot_id}/transfer/incoming/'
user3.get(uri)
- data = {'csrf_token': generate_csrf(), 'code': 'AAA'}
+ data = {'csrf_token': generate_csrf(), 'code': 'AAA', 'lot_name': lot_name}
body, status = user3.post(uri, data=data)
assert status == '200 OK'
@@ -2430,3 +2438,99 @@ def test_bug_3831_documents(user3: UserClientFlask):
uri = f'/inventory/lot/{lot_id}/trade-document/add/'
# body, status = user3.post(uri, data=data, content_type="multipart/form-data")
# assert status == '200 OK'
+
+
+@pytest.mark.mvp
+@pytest.mark.usefixtures(conftest.app_context.__name__)
+def test_hdd_filter(user3: UserClientFlask):
+ create_device(user3, 'real-eee-1001pxd.snapshot.12.json')
+
+ hdds = Device.query.filter_by(type='HardDrive').all()
+ for hdd in hdds:
+ hdd.parent = None
+ db.session.commit()
+
+ csrf = generate_csrf()
+ uri = f'/inventory/device/?filter=All+DataStorage&csrf_token={csrf}'
+ body, status = user3.get(uri)
+
+ assert status == '200 OK'
+ for hdd in hdds:
+ assert hdd.dhid in body
+
+
+@pytest.mark.mvp
+@pytest.mark.usefixtures(conftest.app_context.__name__)
+def test_add_kangaroo(user3: UserClientFlask):
+ create_device(user3, 'real-eee-1001pxd.snapshot.12.json')
+
+ body, status = user3.get('/workbench/')
+
+ assert status == '200 OK'
+
+ pc = Device.query.filter_by(type='Laptop').first()
+ data = {
+ 'csrf_token': generate_csrf(),
+ 'phid': pc.phid(),
+ }
+
+ body, status = user3.post('/workbench/', data=data)
+ assert status == '200 OK'
+ assert pc.phid() in body
+
+
+@pytest.mark.mvp
+@pytest.mark.usefixtures(conftest.app_context.__name__)
+def test_drop_kangaroo(user3: UserClientFlask):
+ create_device(user3, 'real-eee-1001pxd.snapshot.12.json')
+ pc = Device.query.filter_by(type='Laptop').first()
+ phid = 'AAA'
+ pc.placeholder.phid = phid
+ db.session.commit()
+
+ body, status = user3.get('/workbench/')
+ assert phid not in body
+
+ data = {
+ 'csrf_token': generate_csrf(),
+ 'phid': phid,
+ }
+
+ body, status = user3.post('/workbench/', data=data)
+ assert status == '200 OK'
+ assert phid in body
+
+ placeholder_id = pc.placeholder.id
+ uri = f'/workbench/erasure_host/{placeholder_id}/'
+ body, status = user3.get(uri)
+ assert status == '200 OK'
+ assert phid not in body
+
+
+@pytest.mark.mvp
+@pytest.mark.usefixtures(conftest.app_context.__name__)
+def test_filter_hdd_in_kangaroo(user3: UserClientFlask):
+ create_device(user3, 'real-eee-1001pxd.snapshot.12.json')
+ csrf = generate_csrf()
+ uri = f'/inventory/device/?filter=All+DataStorage&csrf_token={csrf}'
+ body, status = user3.get(uri)
+
+ assert status == '200 OK'
+ for hdd in Device.query.filter_by(type='HardDrive').all():
+ assert hdd.dhid not in body
+
+ user3.get('/workbench/')
+ pc = Device.query.filter_by(type='Laptop').first()
+ data = {
+ 'csrf_token': generate_csrf(),
+ 'phid': pc.phid(),
+ }
+ user3.post('/workbench/', data=data)
+
+ csrf = generate_csrf()
+ uri = f'/inventory/device/?filter=All+DataStorage&csrf_token={csrf}'
+ body, status = user3.get(uri)
+
+ assert status == '200 OK'
+ for hdd in Device.query.filter_by(type='HardDrive').all():
+ assert hdd.dhid in body