entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 11 Releases Wiki Activity

Revert "wcs: cell for forms the user can access (#55041)" 

This reverts commit 18bb48c5b3.
This commit is contained in:
Lauréline Guérin 2021-08-06 10:25:30 +02:00 committed by Frédéric Péters
parent cb5966dc71
commit 4dcd011cae
7 changed files with 17 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
combo/apps/wcs/forms.py
View File

@ -31,7 +31,6 @@ from .models import (
WcsCurrentFormsCell,
WcsFormCell,
WcsFormsOfCategoryCell,
WcsFormsUserCanAccessCell,
)
from .utils import get_wcs_options, get_wcs_services
@ -196,17 +195,6 @@ class WcsCareFormsCellForm(WcsFormsMixin, forms.ModelForm):
self._init_categories()
class WcsFormsUserCanAccessCell(WcsFormsMixin, forms.ModelForm):
class Meta:
model = WcsFormsUserCanAccessCell
fields = ['wcs_site', 'categories']
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self._init_wcs_site()
self._init_categories()
class BackofficeSubmissionCellForm(WcsFormsMixin, forms.ModelForm):
class Meta:
model = WcsCurrentDraftsCell

1
combo/apps/wcs/migrations/0032_forms_user_can_access.py
View File

@ -56,7 +56,6 @@ class Migration(migrations.Migration):
bases=(
combo.apps.wcs.models.CategoriesValidityMixin,
combo.apps.wcs.models.CategoriesFilteringMixin,
combo.apps.wcs.models.FormsUserCanAccessMixin,
models.Model,
combo.apps.wcs.models.WcsBlurpMixin,
),

56
combo/apps/wcs/models.py
View File

@ -713,34 +713,8 @@ class WcsFormsOfCategoryCell(WcsCommonCategoryCell, WcsBlurpMixin):
yield {'url': formdef['url'], 'title': formdef['title'], 'text': text}
class FormsUserCanAccessMixin:
def get_cell_extra_context(self, context):
context = super().get_cell_extra_context(context)
categories_filter = []
if self.categories:
for category in self.categories.get('data', []):
categories_filter.append(tuple(category.split(':')))
# regroup all forms in a flat list
context['forms'] = []
for wcs_site in context[self.variable_name]:
if not context[self.variable_name].get(wcs_site):
continue
context[self.variable_name][wcs_site]['categories'] = [
v for k, v in categories_filter if k == wcs_site
]
if not context[self.variable_name][wcs_site].get('data'):
continue
context['forms'].extend(context[self.variable_name][wcs_site]['data'])
return context
@register_cell_class
class WcsCareFormsCell(
CategoriesValidityMixin, CategoriesFilteringMixin, FormsUserCanAccessMixin, WcsDataBaseCell
):
class WcsCareFormsCell(CategoriesValidityMixin, CategoriesFilteringMixin, WcsDataBaseCell):
categories = JSONField(_('Categories'), blank=True, default=dict)
api_url = '/api/forms/?limit=10'
@ -757,26 +731,20 @@ class WcsCareFormsCell(
return WcsCareFormsCellForm
def get_cell_extra_context(self, context):
context = super().get_cell_extra_context(context)
@register_cell_class
class WcsFormsUserCanAccessCell(
CategoriesValidityMixin, CategoriesFilteringMixin, FormsUserCanAccessMixin, WcsDataBaseCell
):
categories = JSONField(_('Categories'), blank=True, default=dict)
categories_filter = []
if self.categories:
for category in self.categories.get('data', []):
categories_filter.append(tuple(category.split(':')))
api_url = '/api/forms/'
variable_name = 'user_forms'
default_template_name = 'combo/wcs/user_can_access_forms.html'
cache_duration = 120
user_dependant = True
for wcs_site in context['care_forms']:
if not context['care_forms'].get(wcs_site):
continue
context['care_forms'][wcs_site]['categories'] = [v for k, v in categories_filter if k == wcs_site]
class Meta:
verbose_name = _('Forms to which user has access')
def get_default_form_class(self):
from .forms import WcsFormsUserCanAccessCell
return WcsFormsUserCanAccessCell
return context
@register_cell_class

14
combo/apps/wcs/templates/combo/wcs/user_can_access_forms.html
View File

@ -1,14 +0,0 @@
{% load i18n %}
{% block cell-content %}
<h2>{% trans 'Forms you can access' %}</h2>
{% if forms %}
{% for slug, forms in user_forms.items %}
<div class="links-list user-can-access-forms-{{ slug }} user-can-access-forms list-of-forms">
{% include "combo/wcs/list_of_forms.html" with forms=forms %}
</div>
{% endfor %}
{% include "combo/pagination.html" %}
{% else %}
<div class="cell--body"><p class="empty-message">{% trans "There are no forms you can access." %}</p></div>
{% endif %}
{% endblock %}

8
tests/test_manager.py
View File

@ -881,7 +881,7 @@ def test_site_export_import_json(app, admin_user):
resp.form['site_file'] = Upload('site-export.json', site_export, 'application/json')
with CaptureQueriesContext(connection) as ctx:
resp = resp.form.submit()
assert len(ctx.captured_queries) in [303, 304]
assert len(ctx.captured_queries) in [298, 299]
assert Page.objects.count() == 4
assert PageSnapshot.objects.all().count() == 4
@ -892,7 +892,7 @@ def test_site_export_import_json(app, admin_user):
resp.form['site_file'] = Upload('site-export.json', site_export, 'application/json')
with CaptureQueriesContext(connection) as ctx:
resp = resp.form.submit()
assert len(ctx.captured_queries) == 272
assert len(ctx.captured_queries) == 268
assert set(Page.objects.get(slug='one').related_cells['cell_types']) == {'data_textcell', 'data_linkcell'}
assert Page.objects.count() == 4
assert LinkCell.objects.count() == 2
@ -2218,7 +2218,7 @@ def test_page_versionning(app, admin_user):
with CaptureQueriesContext(connection) as ctx:
resp2 = resp.click('view', index=1)
assert len(ctx.captured_queries) == 71
assert len(ctx.captured_queries) == 70
assert Page.snapshots.latest('pk').related_cells == {'cell_types': ['data_textcell']}
assert resp2.text.index('Hello world') < resp2.text.index('Foobar3')
@ -2279,7 +2279,7 @@ def test_page_versionning(app, admin_user):
resp = resp.click('restore', index=6)
with CaptureQueriesContext(connection) as ctx:
resp = resp.form.submit().follow()
assert len(ctx.captured_queries) == 144
assert len(ctx.captured_queries) == 142
resp2 = resp.click('See online')
assert resp2.text.index('Foobar1') < resp2.text.index('Foobar2') < resp2.text.index('Foobar3')

2
tests/test_search.py
View File

@ -1371,7 +1371,7 @@ def test_index_site_num_queries(settings, app):
assert IndexedCell.objects.count() == 50
with CaptureQueriesContext(connection) as ctx:
index_site()
assert len(ctx.captured_queries) == 224
assert len(ctx.captured_queries) == 223
SearchCell.objects.create(
page=page, placeholder='content', order=0, _search_services={'data': ['search1']}

182
tests/test_wcs.py
View File

@ -32,7 +32,6 @@ from combo.apps.wcs.models import (
WcsCurrentFormsCell,
WcsFormCell,
WcsFormsOfCategoryCell,
WcsFormsUserCanAccessCell,
)
from combo.data.library import get_cell_classes
from combo.data.models import CellBase, LinkListCell, Page, ValidityInfo
@ -96,21 +95,10 @@ WCS_FORMS_DATA = [
{
'form_receipt_datetime': '2019-10-17T16:46:03',
'form_url_backoffice': '/backoffice/management/foobar/1/',
'readable': True,
'title': 'Title',
'url': '/forms/1/',
},
{
'form_receipt_datetime': '2019-10-17T16:46:04',
'form_url_backoffice': '/backoffice/management/foobar/2/',
'title': 'Title',
'url': '/forms/2/',
},
{
'form_receipt_datetime': '2019-10-17T16:46:04',
'form_url_backoffice': '/backoffice/management/foobar/3/',
'readable': True,
'url': '/forms/3/',
},
]
@ -917,175 +905,6 @@ def test_care_forms_cell_render_single_site(mock_send, context):
assert 'other' not in data
def test_forms_user_can_access_cell_setup():
cell = WcsFormsUserCanAccessCell()
form_class = cell.get_default_form_class()
form = form_class()
assert form.fields['wcs_site'].widget.choices == [
('', 'All'),
('default', 'test'),
('other', 'test2'),
]
assert cell.get_additional_label() == 'All Sites'
cell.wcs_site = 'default'
assert cell.get_additional_label() == 'test'
@mock.patch('combo.apps.wcs.utils.requests.send', side_effect=mocked_requests_send)
def test_forms_user_can_access_cell_render(mock_send, context):
page = Page(title='xxx', slug='test_forms_user_can_access_cell_render', template_name='standard')
page.save()
cell = WcsFormsUserCanAccessCell(page=page, placeholder='content', order=0)
cell.save()
context['request'].user = MockUser()
# query should fail as nothing is cached
cache.clear()
with pytest.raises(NothingInCacheException):
result = cell.render(context)
context['synchronous'] = True # to get fresh content
result = cell.render(context)
assert 'http://127.0.0.1:8999/forms/1' in result
assert 'http://127.0.0.1:8999/forms/2' not in result # not readable
assert 'http://127.0.0.1:8999/forms/3' not in result # no title
assert 'http://127.0.0.2:8999/forms/1' in result
assert 'http://127.0.0.2:8999/forms/2' not in result # not readable
assert 'http://127.0.0.2:8999/forms/3' not in result # no title
data = cell.get_data(context)
assert 'default' in data
assert 'other' in data
with mock.patch('combo.apps.wcs.models.requests.get') as requests_get:
mock_json = mock.Mock(status_code=200)
requests_get.return_value = mock_json
cell.render(context)
assert requests_get.call_args_list[0][0][0] == '/api/forms/'
assert requests_get.call_args_list[1][0][0] == '/api/forms/'
# limit to a list of categories
cell.categories = {'data': ['default:test-3', 'other:test-4']}
with mock.patch('combo.apps.wcs.models.requests.get') as requests_get:
mock_json = mock.Mock(status_code=200)
requests_get.return_value = mock_json
cell.render(context)
assert len(requests_get.call_args_list) == 2
assert requests_get.call_args_list[0][0][0] == '/api/forms/?category_slugs=test-3'
assert requests_get.call_args_list[0][1]['remote_service']['url'] == 'http://127.0.0.1:8999/'
assert requests_get.call_args_list[1][0][0] == '/api/forms/?category_slugs=test-4'
assert requests_get.call_args_list[1][1]['remote_service']['url'] == 'http://127.0.0.2:8999/'
# limit to a single category
cell.categories = {'data': ['default:test-3']}
with mock.patch('combo.apps.wcs.models.requests.get') as requests_get:
mock_json = mock.Mock(status_code=200)
requests_get.return_value = mock_json
cell.render(context)
assert len(requests_get.call_args_list) == 1
assert requests_get.call_args_list[0][0][0] == '/api/forms/?category_slugs=test-3'
assert requests_get.call_args_list[0][1]['remote_service']['url'] == 'http://127.0.0.1:8999/'
# no category selected: call all sites
cell.categories = {'data': []}
with mock.patch('combo.apps.wcs.models.requests.get') as requests_get:
mock_json = mock.Mock(status_code=200)
requests_get.return_value = mock_json
cell.render(context)
assert len(requests_get.call_args_list) == 2
def test_forms_user_can_access_cell_validity(context):
page = Page.objects.create(
title='xxx', slug='test_forms_user_can_access_cell_render', template_name='standard'
)
cell = WcsFormsUserCanAccessCell.objects.create(page=page, placeholder='content', order=0)
context['synchronous'] = True # to get fresh content
with mock.patch('combo.apps.wcs.models.requests.get') as requests_get:
mock_json = mock.Mock(status_code=200)
requests_get.return_value = mock_json
cell.get_data(context)
assert ValidityInfo.objects.exists() is False
# can not retrieve data, don't set cell as invalid
with mock.patch('combo.apps.wcs.models.requests.get') as requests_get:
mock_resp = Response()
mock_resp.status_code = 500
requests_get.return_value = mock_resp
cell.get_data(context)
assert ValidityInfo.objects.exists() is False
with mock.patch('combo.apps.wcs.models.requests.get') as requests_get:
requests_get.side_effect = ConnectionError()
cell.get_data(context)
assert ValidityInfo.objects.exists() is False
# can not retrieve data, don't set cell as invalid
with mock.patch('combo.apps.wcs.models.requests.get') as requests_get:
mock_json = mock.Mock(status_code=500)
requests_get.return_value = mock_json
cell.get_data(context)
assert ValidityInfo.objects.exists() is False
with mock.patch('combo.apps.wcs.models.requests.get') as requests_get:
mock_json = mock.Mock(status_code=404)
requests_get.return_value = mock_json
cell.get_data(context)
validity_info = ValidityInfo.objects.latest('pk')
assert validity_info.invalid_reason_code == 'wcs_data_failure'
assert validity_info.invalid_since is not None
@mock.patch('combo.apps.wcs.utils.requests.send', side_effect=mocked_requests_send)
def test_forms_user_can_access_cell_check_validity(mock_send, context):
page = Page.objects.create(
title='xxx', slug='test_forms_user_can_access_cell_render', template_name='standard'
)
cell = WcsFormsUserCanAccessCell.objects.create(page=page, placeholder='content', order=0)
# no category
cell.check_validity()
assert ValidityInfo.objects.exists() is False
# valid categories
cell.categories = {'data': ['default:test-3', 'default:test-9']}
cell.save()
cell.check_validity()
assert ValidityInfo.objects.exists() is False
# can not retrieve data, don't set cell as invalid
with mock.patch('combo.apps.wcs.models.requests.get') as requests_get:
mock_resp = Response()
mock_resp.status_code = 500
requests_get.return_value = mock_resp
cell.check_validity()
assert ValidityInfo.objects.exists() is False
with mock.patch('combo.apps.wcs.models.requests.get') as requests_get:
requests_get.side_effect = ConnectionError()
cell.check_validity()
assert ValidityInfo.objects.exists() is False
# can not retrieve categories, don't set cell as invalid
with mock.patch('combo.apps.wcs.models.requests.get') as requests_get:
mock_resp = Response()
mock_resp.status_code = 404
requests_get.return_value = mock_resp
cell.check_validity()
assert ValidityInfo.objects.exists() is False
# invalid category
cell.categories = {'data': ['default:foobar', 'default:test-9']}
cell.save()
cell.check_validity()
validity_info = ValidityInfo.objects.latest('pk')
assert validity_info.invalid_reason_code == 'wcs_category_not_found'
assert validity_info.invalid_since is not None
@mock.patch('combo.apps.wcs.utils.requests.send', side_effect=mocked_requests_send)
def test_forms_of_category_cell_setup(mock_send):
cell = WcsFormsOfCategoryCell()
@ -2500,7 +2319,6 @@ def test_hourly():
WcsCurrentFormsCell,
WcsCurrentDraftsCell,
WcsFormsOfCategoryCell,
WcsFormsUserCanAccessCell,
BackofficeSubmissionCell,
]:
with mock.patch('combo.apps.wcs.models.%s.check_validity' % klass.__name__) as check_validity: