-
+
-
{keyName}
-
)
diff --git a/rdmo/management/assets/js/components/import/common/FieldRowDiffs.js b/rdmo/management/assets/js/components/import/common/FieldRowDiffs.js
index 8bfe470552..271ffc7e7a 100644
--- a/rdmo/management/assets/js/components/import/common/FieldRowDiffs.js
+++ b/rdmo/management/assets/js/components/import/common/FieldRowDiffs.js
@@ -11,9 +11,10 @@ const FieldRowDiffs = ({ element, field }) => {
return null
}
const fieldDiffData = element.updated_and_changed[field]
- const newVal = fieldDiffData.newValue.toString() ?? ''
- const oldVal = fieldDiffData.oldValue.toString() ?? ''
+ const newVal = fieldDiffData.newValue ?? ''
+ const oldVal = fieldDiffData.oldValue ?? ''
const changed = fieldDiffData.changed ?? false
+ const compareMethod = fieldDiffData.compareMethod
const splitView = false
const hideLineNumbers = true
const warnings = fieldDiffData.warnings ?? {}
@@ -23,12 +24,44 @@ const FieldRowDiffs = ({ element, field }) => {
variables: {
light: {
diffViewerBackground: '#fff',
+ addedBackground: '#eafaf0',
+ removedBackground: '#fff0f2',
changedBackground: '#fff',
gutterBackground: '#fff',
+ wordAddedBackground: '#a7e8b8',
+ wordRemovedBackground: '#f5b5bf',
+ },
+ },
+ diffContainer: {
+ minWidth: '100%',
+ maxWidth: '100%',
+ width: '100%',
+ },
+ marker: {
+ width: '28px',
+ minWidth: '28px',
+ paddingLeft: 8,
+ paddingRight: 4,
+ textAlign: 'left',
+ overflow: 'visible',
+ pre: {
+ backgroundColor: 'transparent',
+ border: 'none',
+ boxShadow: 'none',
+ lineHeight: '1.6em',
+ overflow: 'visible',
+ padding: 0,
},
},
contentText: {
backgroundColor: '#fff !important',
+ border: '1px solid #ccc',
+ borderRadius: 4,
+ display: 'block',
+ lineHeight: '1.6em',
+ overflowWrap: 'anywhere',
+ padding: '5px 10px',
+ wordBreak: 'break-word',
},
}
@@ -38,7 +71,9 @@ const FieldRowDiffs = ({ element, field }) => {
styles={newStyles}
oldValue={oldVal}
newValue={newVal}
+ compareMethod={compareMethod}
splitView={splitView}
+ hideSummary={true}
hideLineNumbers={hideLineNumbers}
// leftTitle={leftTitle}
// rightTitle={rightTitle}
diff --git a/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js b/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js
index c451ebf1f2..c7ffdcc6d5 100644
--- a/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js
+++ b/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js
@@ -13,12 +13,14 @@ import Link from 'rdmo/core/assets/js/components/Link'
import { UploadForm } from '../common/Forms'
const ElementsSidebar = ({ config, elements, elementActions, importActions }) => {
- const { elementType, elementId } = elements
+ const { elementType, elementId, elementAction } = elements
const model = invert(elementTypes)[elementType]
const exportUrl = isNil(elementId) ? buildApiPath(elementModules[model], elementType, 'export')
: buildApiPath(elementModules[model], elementType, elementId, 'export')
- const exportParams = isNil(config.filter) ? '' : getExportParams(config.filter[elementType])
+ const exportParams = (isNil(elementId) && elementAction != 'nested' && !isNil(config.filter))
+ ? getExportParams(config.filter[elementType])
+ : ''
return (
+ {
+ showDiff ? (
+
@@ -79,7 +81,7 @@ const ElementsSidebar = ({ config, elements, elementActions, importActions }) =>
- - {gettext('XML')} + {gettext('XML')} { [ @@ -93,7 +95,9 @@ const ElementsSidebar = ({ config, elements, elementActions, importActions }) => 'tasks' ].includes(elementType) && (
- - {gettext('XML (full)')} + + {gettext('XML (full)')} + ) } @@ -103,12 +107,12 @@ const ElementsSidebar = ({ config, elements, elementActions, importActions }) => { elementType == 'attributes' && <>
- - + {gettext('CSV comma separated')}
- - + {gettext('CSV semicolon separated')} @@ -117,7 +121,7 @@ const ElementsSidebar = ({ config, elements, elementActions, importActions }) => { config.settings.export_formats && config.settings.export_formats.map(([key, label], index) =>
- - {label} ) diff --git a/rdmo/management/assets/scss/management.scss b/rdmo/management/assets/scss/management.scss index 787c2b4b0b..c1f98b247c 100644 --- a/rdmo/management/assets/scss/management.scss +++ b/rdmo/management/assets/scss/management.scss @@ -69,6 +69,10 @@ margin-left: auto; } } + + .field-diff { + overflow-x: auto; + } } &.panel-import-warnings, @@ -236,57 +240,47 @@ table[class*="react-diff-"][class*="diff-container"] { margin: 0; border-collapse: separate; // needed for border radius since this is a table + border: 1px solid #ccc; + border-radius: 4px; + border-spacing: 0; tr { - td[class*="marker"] { - border-left: 1px solid #ccc; - } - td[class*="content"] { - border-right: 1px solid #ccc; - } - &:first-child { - td[class*="marker"] { - border-top: 1px solid #ccc; - border-left: 1px solid #ccc; - border-top-left-radius: 4px; - } + &:not(:last-child) { + td[class*="marker"], td[class*="content"] { - border-top: 1px solid #ccc; - border-right: 1px solid #ccc; - border-top-right-radius: 4px; - } - } - &:last-child { - td[class*="marker"] { - border-bottom: 1px solid #ccc; - border-left: 1px solid #ccc; - border-bottom-left-radius: 4px; - } - td[class*="content"] { - border-bottom: 1px solid #ccc; - border-right: 1px solid #ccc; - border-bottom-right-radius: 4px; + border-bottom: 1px solid #ddd; } } } - // Target elements with classes containing "react-diff-", and "marker" - // Target elements with classes containing "react-diff-", and "content" - [class*="marker"], - [class*="content"] { - padding: 8px 12px; + td[class*="marker"], + td[class*="content"] { vertical-align: top; + } + + td[class*="marker"] { + padding-top: 4px; + padding-left: 8px; + pre { - padding: 5px 10px; - border-radius: 4px; - font-size: 13px; - line-height: 18px; - background-color: #fff; + background-color: transparent; + border: none; + border-radius: 0; + box-shadow: none; + padding: 0; } } - [class*="marker"] { - padding-right: 0; + td[class*="content"] { + padding: 6px 12px; + + pre { + padding: 2px; + } + + [class*="word-diff"] { + border-radius: 0; + } } } } diff --git a/rdmo/management/tests/e2e/conftest.py b/rdmo/management/tests/e2e/conftest.py index 86ceee0f6c..d84695b52b 100644 --- a/rdmo/management/tests/e2e/conftest.py +++ b/rdmo/management/tests/e2e/conftest.py @@ -1,20 +1,19 @@ import pytest -from _pytest.fixtures import SubRequest -from playwright.sync_api import Page +from playwright.sync_api import Page, expect -from rdmo.core.tests.e2e.conftest import ( # noqa: F401 +from rdmo.core.tests.e2e.fixtures import ( # noqa: F401 PLAYWRIGHT_TIMEOUT, _set_django_allow_async_unsafe, + allow_live_server_host, authenticated_context, authenticated_page, django_db_setup, - fail_on_js_error, ) -@pytest.fixture -def e2e_username(scope="session") -> str: +@pytest.fixture(scope="session") +def e2e_username() -> str: """Fixture to specify which user should be authenticated. This can be overridden in individual test modules or fixtures. """ @@ -22,29 +21,24 @@ def e2e_username(scope="session") -> str: @pytest.fixture -def page_single(django_db_setup, live_server, browser, authenticated_page: Page) -> Page: # noqa: F811 +def page_single(transactional_db, live_server, authenticated_page: Page) -> Page: # noqa: F811 """Navigates the authenticated page to /management.""" authenticated_page.goto("/management") # Navigate to the projects section - authenticated_page.wait_for_load_state() # maybe not needed + expect(authenticated_page.get_by_role("heading", name="Management")).to_be_visible() return authenticated_page @pytest.fixture -def page_multisite(django_db_setup, live_server, browser, authenticated_page: Page, settings) -> Page: # noqa: F811 +def page_multisite(transactional_db, live_server, authenticated_page: Page, settings) -> Page: # noqa: F811 """Enables the multisite and navigates the authenticated page to /management.""" settings.MULTISITE = True authenticated_page.goto("/management") # Navigate to the projects section - authenticated_page.wait_for_load_state() # maybe not needed + expect(authenticated_page.get_by_role("heading", name="Management")).to_be_visible() return authenticated_page @pytest.fixture -def page(request, django_db_setup, authenticated_page) -> Page: # noqa: F811 - """Allows for the specific page fixtures to be parameters and returns a default fixture for page""" - try: - return request.getfixturevalue(request.param) - except AttributeError as e: - if isinstance(request, SubRequest) and request.fixturename == "page": - # set a default return fixture for "page" - return request.getfixturevalue("page_multisite") - raise e from e +def page(request, transactional_db) -> Page: + """Allow specific page fixtures to be selected indirectly and default to multisite.""" + fixture_name = getattr(request, "param", "page_multisite") + return request.getfixturevalue(fixture_name) diff --git a/rdmo/management/tests/e2e/test_frontend_import_options.py b/rdmo/management/tests/e2e/test_frontend_import_options.py index 748e66137a..f0f1916125 100644 --- a/rdmo/management/tests/e2e/test_frontend_import_options.py +++ b/rdmo/management/tests/e2e/test_frontend_import_options.py @@ -6,7 +6,7 @@ from rdmo.management.tests.helpers_import_elements import IMPORT_ELEMENT_PANELS_LOCATOR from rdmo.options.models import Option, OptionSet -pytestmark = pytest.mark.e2e +pytestmark = [pytest.mark.e2e, pytest.mark.django_db(transaction=True)] import_xml = "./testing/xml/elements/optionsets.xml" import_xml_1 = "./testing/xml/elements/updated-and-changed/optionsets-1.xml" diff --git a/rdmo/management/tests/e2e/test_frontend_import_questions.py b/rdmo/management/tests/e2e/test_frontend_import_questions.py index 512e0b5ef9..f03a481c1b 100644 --- a/rdmo/management/tests/e2e/test_frontend_import_questions.py +++ b/rdmo/management/tests/e2e/test_frontend_import_questions.py @@ -7,7 +7,7 @@ from rdmo.questions.models import Page as PageModel from rdmo.questions.models.questionset import QuestionSet -pytestmark = pytest.mark.e2e +pytestmark = [pytest.mark.e2e, pytest.mark.django_db(transaction=True)] def test_import_catalogs_in_management(db, page, delete_all_objects) -> None: diff --git a/rdmo/management/tests/e2e/test_frontend_management_catalog_copy.py b/rdmo/management/tests/e2e/test_frontend_management_catalog_copy.py index 537ff1b193..ad93b86056 100644 --- a/rdmo/management/tests/e2e/test_frontend_management_catalog_copy.py +++ b/rdmo/management/tests/e2e/test_frontend_management_catalog_copy.py @@ -4,25 +4,31 @@ from rdmo.questions.models import Catalog -pytestmark = pytest.mark.e2e +pytestmark = [pytest.mark.e2e, pytest.mark.django_db(transaction=True)] @pytest.mark.parametrize("page", ["page_single", "page_multisite"], indirect=True) def test_management_catalog_copy(page: Page) -> None: """Test that each content type is available through the navigation.""" + source_uri = "http://example.com/terms/questions/catalog" + copied_uri = "http://example.com/terms/questions/catalog-copy" + copied_prefix = "http://example.com/terms" expect(page.get_by_role("heading", name="Management")).to_be_visible() expect(page.locator("strong").filter(has_text="Catalogs")).to_be_visible() - # open the copy form: click on the "Copy catalog" button - # page.goto(f"/management/catalogs/1/copy") # goto does not work with auto return after copy - # page.locator('a[title="Copy catalog"]').first.click() - page.get_by_title("Copy catalog").first.click() + # Open the copy form from the example.com catalog row. + source_row = page.locator(".list-group-item").filter( + has=page.get_by_role("link", name=source_uri, exact=True) + ) + expect(source_row).to_be_visible() + source_row.get_by_title("Copy catalog").click() # expect the form is there with a URI Prefix field expect(page.get_by_role("textbox", name="URI Prefix")).to_be_visible() # create a copy of the catalog + page.get_by_role("textbox", name="URI Prefix").fill(copied_prefix) page.get_by_role("textbox", name="URI Path").click() page.get_by_role("textbox", name="URI Path").fill("catalog-copy") page.get_by_role("textbox", name="Title (English)").click() @@ -33,6 +39,6 @@ def test_management_catalog_copy(page: Page) -> None: # assert copy was successful # page.wait_for_url("/management/catalogs/") expect(page.locator("strong").filter(has_text="Catalogs")).to_be_visible() - expect(page.get_by_role("link", name="http://example.com/terms/questions/catalog-copy")).to_be_visible() + expect(page.get_by_role("link", name=copied_uri)).to_be_visible() - assert Catalog.objects.filter(uri="http://example.com/terms/questions/catalog-copy").exists() + assert Catalog.objects.filter(uri=copied_uri).exists() diff --git a/rdmo/management/tests/e2e/test_frontend_management_elements.py b/rdmo/management/tests/e2e/test_frontend_management_elements.py index 9ca313234b..3ad9b43c27 100644 --- a/rdmo/management/tests/e2e/test_frontend_management_elements.py +++ b/rdmo/management/tests/e2e/test_frontend_management_elements.py @@ -10,7 +10,7 @@ from rdmo.management.tests.helpers_models import ModelHelper, model_helpers from rdmo.questions.models import Catalog -pytestmark = pytest.mark.e2e +pytestmark = [pytest.mark.e2e, pytest.mark.django_db(transaction=True)] @pytest.mark.parametrize("page", ["page_single", "page_multisite"], indirect=True) @@ -41,6 +41,7 @@ def test_management_has_items(page: Page, helper: ModelHelper) -> None: """Test all items in database are visible in management UI.""" num_items_in_database = helper.model.objects.count() page.goto(f"/management/{helper.url}") + expect(page.get_by_role("heading", name="Management")).to_be_visible() items_in_ui = page.locator(".list-group > .list-group-item") expect(items_in_ui).to_have_count(num_items_in_database) diff --git a/rdmo/management/tests/test_view_multisite.py b/rdmo/management/tests/test_view_multisite.py index 9d2d5b2b17..df840a7ea3 100644 --- a/rdmo/management/tests/test_view_multisite.py +++ b/rdmo/management/tests/test_view_multisite.py @@ -2,8 +2,7 @@ from django.urls import reverse -from rdmo.core.tests.constants import multisite_users -from rdmo.core.tests.utils import multisite_status_map +from rdmo.core.tests.constants import multisite_status_map, multisite_users @pytest.mark.parametrize('username,password', multisite_users) diff --git a/rdmo/management/tests/test_viewset_import_multisite.py b/rdmo/management/tests/test_viewset_import_multisite.py index 06697ddf28..391ce63906 100644 --- a/rdmo/management/tests/test_viewset_import_multisite.py +++ b/rdmo/management/tests/test_viewset_import_multisite.py @@ -4,9 +4,85 @@ from rdmo.core.tests.constants import multisite_status_map as status_map from rdmo.core.tests.constants import multisite_users as users -from rdmo.core.tests.utils import get_obj_perms_status_code from rdmo.questions.models import Catalog, Page, Question, QuestionSet, Section +STATUS_CODES = { + 'upload-import': { + 'foo-catalog': { + 'user': 403, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 403, + 'foo-reviewer': 403, 'foo-editor': 200, 'bar-user': 403, + 'bar-reviewer': 404, 'bar-editor': 404, 'anonymous': 401, + }, + 'bar-catalog': { + 'user': 403, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 403, + 'foo-reviewer': 404, 'foo-editor': 404, 'bar-user': 403, + 'bar-reviewer': 403, 'bar-editor': 200, 'anonymous': 401, + }, + 'foo-section': { + 'user': 403, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 403, + 'foo-reviewer': 403, 'foo-editor': 200, 'bar-user': 403, + 'bar-reviewer': 404, 'bar-editor': 404, 'anonymous': 401, + }, + 'bar-section': { + 'user': 403, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 403, + 'foo-reviewer': 404, 'foo-editor': 404, 'bar-user': 403, + 'bar-reviewer': 403, 'bar-editor': 200, 'anonymous': 401, + }, + 'foo-page': { + 'user': 403, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 403, + 'foo-reviewer': 403, 'foo-editor': 200, 'bar-user': 403, + 'bar-reviewer': 404, 'bar-editor': 404, 'anonymous': 401, + }, + 'bar-page': { + 'user': 403, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 403, + 'foo-reviewer': 404, 'foo-editor': 404, 'bar-user': 403, + 'bar-reviewer': 403, 'bar-editor': 200, 'anonymous': 401, + }, + 'foo-questionset': { + 'user': 403, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 403, + 'foo-reviewer': 403, 'foo-editor': 200, 'bar-user': 403, + 'bar-reviewer': 404, 'bar-editor': 404, 'anonymous': 401, + }, + 'bar-questionset': { + 'user': 403, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 403, + 'foo-reviewer': 404, 'foo-editor': 404, 'bar-user': 403, + 'bar-reviewer': 403, 'bar-editor': 200, 'anonymous': 401, + }, + 'foo-questionset-parent': { + 'user': 403, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 403, + 'foo-reviewer': 403, 'foo-editor': 200, 'bar-user': 403, + 'bar-reviewer': 404, 'bar-editor': 404, 'anonymous': 401, + }, + 'bar-questionset-parent': { + 'user': 403, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 403, + 'foo-reviewer': 404, 'foo-editor': 404, 'bar-user': 403, + 'bar-reviewer': 403, 'bar-editor': 200, 'anonymous': 401, + }, + 'foo-question': { + 'user': 403, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 403, + 'foo-reviewer': 403, 'foo-editor': 200, 'bar-user': 403, + 'bar-reviewer': 404, 'bar-editor': 404, 'anonymous': 401, + }, + 'bar-question': { + 'user': 403, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 403, + 'foo-reviewer': 404, 'foo-editor': 404, 'bar-user': 403, + 'bar-reviewer': 403, 'bar-editor': 200, 'anonymous': 401, + }, + }, +} + catalog_uri_paths = [ 'catalog', 'catalog2', @@ -19,6 +95,7 @@ } + @pytest.mark.parametrize('username,password', users) def test_list(db, client, username, password): client.login(username=username, password=password) @@ -63,7 +140,9 @@ def test_create_update(db, client, username, password, json_data): if response.status_code == 200: for element in response.json(): assert element.get('created') is False - obj_perm_status_code = get_obj_perms_status_code(element.get('uri_path'), username, 'upload-import') + obj_perm_status_code = STATUS_CODES['upload-import'].get( + element['uri_path'], status_map['upload-import'] + )[username] if obj_perm_status_code == 200: assert element.get('updated') is True else: @@ -85,7 +164,9 @@ def test_create_update_certain_catalog(db, client, username, password, catalog_u assert response.status_code == status_map['upload-import'].get(username), response.json() if response.status_code == 200: - obj_perm_status_code = get_obj_perms_status_code(catalog_uri_path, username, 'upload-import') + obj_perm_status_code = STATUS_CODES['upload-import'].get( + catalog_uri_path, status_map['upload-import'] + )[username] for element in response.json(): assert element.get('created') is False if obj_perm_status_code == 200: diff --git a/rdmo/options/models.py b/rdmo/options/models.py index 1aa9315132..9f4c4e25e2 100644 --- a/rdmo/options/models.py +++ b/rdmo/options/models.py @@ -109,6 +109,10 @@ def is_locked(self) -> bool: def elements(self) -> list[Option]: return [element.option for element in sorted(self.optionset_options.all(), key=lambda e: e.order)] + @property + def condition_uris(self): + return [condition.uri for condition in self.conditions.all()] + @classmethod def build_uri(cls, uri_prefix, uri_path): if not uri_path: diff --git a/rdmo/options/serializers/v1/option.py b/rdmo/options/serializers/v1/option.py index 8fecf0d123..055ddbb731 100644 --- a/rdmo/options/serializers/v1/option.py +++ b/rdmo/options/serializers/v1/option.py @@ -76,6 +76,36 @@ class Meta: ) +class OptionNestedSerializer( + ElementModelSerializerMixin, + ElementWarningSerializerMixin, + ReadOnlyObjectPermissionSerializerMixin, + MarkdownSerializerMixin, + serializers.ModelSerializer +): + markdown_fields = ('text',) + + model = serializers.SerializerMethodField() + + warning = serializers.SerializerMethodField() + read_only = serializers.SerializerMethodField() + + class Meta: + model = Option + fields = ( + 'id', + 'model', + 'uri', + 'locked', + 'text', + 'warning', + 'read_only', + ) + warning_fields = ( + 'text', + ) + + class OptionIndexSerializer(serializers.ModelSerializer): class Meta: diff --git a/rdmo/options/serializers/v1/optionset.py b/rdmo/options/serializers/v1/optionset.py index 14a4b5169e..4189ba46b3 100644 --- a/rdmo/options/serializers/v1/optionset.py +++ b/rdmo/options/serializers/v1/optionset.py @@ -9,7 +9,7 @@ from ...models import OptionSet, OptionSetOption from ...validators import OptionSetLockedValidator, OptionSetUniqueURIValidator -from .option import OptionSerializer +from .option import OptionNestedSerializer class OptionSetOptionSerializer(serializers.ModelSerializer): @@ -32,8 +32,6 @@ class OptionSetSerializer(ThroughModelSerializerMixin, ElementModelSerializerMix read_only = serializers.SerializerMethodField() - condition_uris = serializers.SerializerMethodField() - class Meta: model = OptionSet fields = ( @@ -44,7 +42,6 @@ class Meta: 'uri_path', 'comment', 'locked', - 'read_only', 'order', 'provider_key', 'options', @@ -65,23 +62,36 @@ class Meta: OptionSetLockedValidator() ) - def get_condition_uris(self, obj) -> list[str]: - return [condition.uri for condition in obj.conditions.all()] +class OptionSetNestedSerializer( + ElementModelSerializerMixin, + ReadOnlyObjectPermissionSerializerMixin, + serializers.ModelSerializer, +): + model = serializers.SerializerMethodField() -class OptionSetNestedSerializer(OptionSetSerializer): + read_only = serializers.SerializerMethodField() elements = serializers.SerializerMethodField() - class Meta(OptionSetSerializer.Meta): + class Meta: + model = OptionSet fields = ( - *OptionSetSerializer.Meta.fields, - 'elements' + 'id', + 'model', + 'uri', + 'locked', + 'order', + 'provider_key', + 'conditions', + 'read_only', + 'condition_uris', + 'elements', ) def get_elements(self, obj) -> list[dict]: for element in obj.elements: - yield OptionSerializer(element, context=self.context).data + yield OptionNestedSerializer(element, context=self.context).data class OptionSetIndexSerializer(serializers.ModelSerializer): diff --git a/rdmo/options/tests/test_queries_option.py b/rdmo/options/tests/test_queries_option.py new file mode 100644 index 0000000000..38caa19f24 --- /dev/null +++ b/rdmo/options/tests/test_queries_option.py @@ -0,0 +1,31 @@ +from urllib.parse import urlencode + +import pytest + +from django.urls import reverse + +from .test_viewset_options import urlnames + +max_queries = [ + # action, max_queries, url_kwargs, url_params + ('list', 6, {}, {}), + ('index', 3, {}, {}), + ('export', 6, {'export_format': 'xml'}, {}), + ('export', 6, {'export_format': 'xml'}, {'full': '1'}), + ('detail', 6, {'pk': 1}, {}), + ('detail_export', 6, {'pk': 1, 'export_format': 'xml'}, {}), + ('detail_export', 6, {'pk': 1, 'export_format': 'xml'}, {'full': '1'}), +] + + +@pytest.mark.performance +@pytest.mark.parametrize('action,max_queries,url_kwargs,url_params', max_queries) +def test_queries(db, admin_client, django_assert_max_num_queries, action, max_queries, url_kwargs, url_params): + url = reverse(urlnames[action], kwargs=url_kwargs) + if url_params: + url += f'?{urlencode(url_params)}' + + with django_assert_max_num_queries(max_queries): + response = admin_client.get(url) + + assert response.status_code == 200 diff --git a/rdmo/options/tests/test_queries_optionset.py b/rdmo/options/tests/test_queries_optionset.py new file mode 100644 index 0000000000..17090e0bc3 --- /dev/null +++ b/rdmo/options/tests/test_queries_optionset.py @@ -0,0 +1,32 @@ +from urllib.parse import urlencode + +import pytest + +from django.urls import reverse + +from .test_viewset_optionsets import urlnames + +max_queries = [ + # action, max_queries, url_kwargs, url_params + ('list', 8, {}, {}), + ('index', 3, {}, {}), + ('nested', 6, {'pk': 1}, {}), + ('export', 8, {'export_format': 'xml'}, {}), + ('export', 8, {'export_format': 'xml'}, {'full': '1'}), + ('detail', 8, {'pk': 1}, {}), + ('detail_export', 6, {'pk': 1, 'export_format': 'xml'}, {}), + ('detail_export', 6, {'pk': 1, 'export_format': 'xml'}, {'full': '1'}), +] + + +@pytest.mark.performance +@pytest.mark.parametrize('action,max_queries,url_kwargs,url_params', max_queries) +def test_queries(db, admin_client, django_assert_max_num_queries, action, max_queries, url_kwargs, url_params): + url = reverse(urlnames[action], kwargs=url_kwargs) + if url_params: + url += f'?{urlencode(url_params)}' + + with django_assert_max_num_queries(max_queries): + response = admin_client.get(url) + + assert response.status_code == 200 diff --git a/rdmo/options/tests/test_viewset_options_multisite.py b/rdmo/options/tests/test_viewset_options_multisite.py index f3060223ce..32ff66986b 100644 --- a/rdmo/options/tests/test_viewset_options_multisite.py +++ b/rdmo/options/tests/test_viewset_options_multisite.py @@ -2,15 +2,111 @@ import pytest +from django.db.models import Max from django.urls import reverse from rdmo.core.tests.constants import multisite_status_map as status_map from rdmo.core.tests.constants import multisite_users as users -from rdmo.core.tests.utils import get_obj_perms_status_code -from ..models import Option +from ..models import Option, OptionSet from .test_viewset_options import urlnames +STATUS_CODES = { + 'detail': { + 'https://foo.com/terms/options/foo-option-1': { + 'user': 404, 'reviewer': 200, 'editor': 200, + 'example-reviewer': 200, 'example-editor': 200, 'foo-user': 404, + 'foo-reviewer': 200, 'foo-editor': 200, 'bar-user': 404, + 'bar-reviewer': 404, 'bar-editor': 404, 'anonymous': 401, + }, + 'https://foo.com/terms/options/foo-option-2': { + 'user': 404, 'reviewer': 200, 'editor': 200, + 'example-reviewer': 200, 'example-editor': 200, 'foo-user': 404, + 'foo-reviewer': 200, 'foo-editor': 200, 'bar-user': 404, + 'bar-reviewer': 404, 'bar-editor': 404, 'anonymous': 401, + }, + 'https://bar.com/terms/options/bar-option-1': { + 'user': 404, 'reviewer': 200, 'editor': 200, + 'example-reviewer': 200, 'example-editor': 200, 'foo-user': 404, + 'foo-reviewer': 404, 'foo-editor': 404, 'bar-user': 404, + 'bar-reviewer': 200, 'bar-editor': 200, 'anonymous': 401, + }, + 'https://bar.com/terms/options/bar-option-2': { + 'user': 404, 'reviewer': 200, 'editor': 200, + 'example-reviewer': 200, 'example-editor': 200, 'foo-user': 404, + 'foo-reviewer': 404, 'foo-editor': 404, 'bar-user': 404, + 'bar-reviewer': 200, 'bar-editor': 200, 'anonymous': 401, + }, + }, + 'create-with-parent': { + 'https://foo.com/terms/options/foo-optionset': { + 'user': 403, 'reviewer': 403, 'editor': 201, + 'example-reviewer': 403, 'example-editor': 403, 'foo-user': 403, + 'foo-reviewer': 403, 'foo-editor': 403, 'bar-user': 403, + 'bar-reviewer': 403, 'bar-editor': 403, 'anonymous': 401, + }, + 'https://bar.com/terms/options/bar-optionset': { + 'user': 403, 'reviewer': 403, 'editor': 201, + 'example-reviewer': 403, 'example-editor': 403, 'foo-user': 403, + 'foo-reviewer': 403, 'foo-editor': 403, 'bar-user': 403, + 'bar-reviewer': 403, 'bar-editor': 403, 'anonymous': 401, + }, + }, + 'update': { + 'https://foo.com/terms/options/foo-option-1': { + 'user': 404, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 404, + 'foo-reviewer': 403, 'foo-editor': 200, 'bar-user': 404, + 'bar-reviewer': 404, 'bar-editor': 404, 'anonymous': 401, + }, + 'https://foo.com/terms/options/foo-option-2': { + 'user': 404, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 404, + 'foo-reviewer': 403, 'foo-editor': 200, 'bar-user': 404, + 'bar-reviewer': 404, 'bar-editor': 404, 'anonymous': 401, + }, + 'https://bar.com/terms/options/bar-option-1': { + 'user': 404, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 404, + 'foo-reviewer': 404, 'foo-editor': 404, 'bar-user': 404, + 'bar-reviewer': 403, 'bar-editor': 200, 'anonymous': 401, + }, + 'https://bar.com/terms/options/bar-option-2': { + 'user': 404, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 404, + 'foo-reviewer': 404, 'foo-editor': 404, 'bar-user': 404, + 'bar-reviewer': 403, 'bar-editor': 200, 'anonymous': 401, + }, + }, + 'delete': { + 'https://foo.com/terms/options/foo-option-1': { + 'user': 404, 'reviewer': 403, 'editor': 204, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 404, + 'foo-reviewer': 403, 'foo-editor': 204, 'bar-user': 404, + 'bar-reviewer': 404, 'bar-editor': 404, 'anonymous': 401, + }, + 'https://foo.com/terms/options/foo-option-2': { + 'user': 404, 'reviewer': 403, 'editor': 204, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 404, + 'foo-reviewer': 403, 'foo-editor': 204, 'bar-user': 404, + 'bar-reviewer': 404, 'bar-editor': 404, 'anonymous': 401, + }, + 'https://bar.com/terms/options/bar-option-1': { + 'user': 404, 'reviewer': 403, 'editor': 204, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 404, + 'foo-reviewer': 404, 'foo-editor': 404, 'bar-user': 404, + 'bar-reviewer': 403, 'bar-editor': 204, 'anonymous': 401, + }, + 'https://bar.com/terms/options/bar-option-2': { + 'user': 404, 'reviewer': 403, 'editor': 204, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 404, + 'foo-reviewer': 404, 'foo-editor': 404, 'bar-user': 404, + 'bar-reviewer': 403, 'bar-editor': 204, 'anonymous': 401, + }, + }, +} + + @pytest.mark.parametrize('username,password', users) def test_list(db, client, username, password): @@ -53,7 +149,9 @@ def test_detail(db, client, username, password): for instance in instances: url = reverse(urlnames['detail'], args=[instance.pk]) response = client.get(url) - assert response.status_code == get_obj_perms_status_code(instance, username, 'detail'), response.json() + assert response.status_code == ( + STATUS_CODES['detail'].get(instance.uri, status_map['detail'])[username] + ), response.json() @pytest.mark.parametrize('username,password', users) @@ -74,6 +172,68 @@ def test_create(db, client, username, password): assert response.status_code == status_map['create'][username], response.json() +@pytest.mark.parametrize('username,password', users) +def test_create_optionset(db, client, username, password): + client.login(username=username, password=password) + instances = Option.objects.all() + + for instance in instances: + optionset = instance.optionsets.first() + if optionset is not None: + optionset_options = list(optionset.optionset_options.values_list('option', 'order')) + order = optionset.optionset_options.aggregate(order=Max('order')).get('order') + 1 + + url = reverse(urlnames['list']) + data = { + 'uri_prefix': instance.uri_prefix, + 'uri_path': f'{instance.uri_path}_new_{username}', + 'comment': instance.comment, + 'text_en': instance.text_lang1, + 'text_de': instance.text_lang2, + 'optionsets': [optionset.id] + } + response = client.post(url, data, content_type='application/json') + assert response.status_code == ( + STATUS_CODES['create-with-parent'].get( + optionset.uri, status_map['create-with-parent'] + )[username] + ), response.json() + + if response.status_code == 201: + new_instance = Option.objects.get(id=response.json().get('id')) + optionset.refresh_from_db() + assert [*optionset_options, (new_instance.id, order)] == \ + list(optionset.optionset_options.values_list('option', 'order')) + + +def test_create_optionset_rejects_foreign_site_parent(db, client, sites): + sites.activate('bar.com') + client.login(username='bar-editor', password='bar-editor') + + optionset = OptionSet.objects.get(uri_path='foo-optionset') + + optionset_options = list(optionset.optionset_options.values_list('option', 'order')) + + url = reverse(urlnames['list']) + data = { + 'uri_prefix': 'https://bar.com/terms', + 'uri_path': 'bar-option-with-foo-optionset-denied', + 'text_en': 'Bar option with foo optionset denied', + 'optionsets': [optionset.id] + } + + response = client.post(url, data, content_type='application/json') + + assert response.status_code == ( + STATUS_CODES['create-with-parent'].get( + optionset.uri, status_map['create-with-parent'] + )['bar-editor'] + ), response.json() + + optionset.refresh_from_db() + assert optionset_options == list(optionset.optionset_options.values_list('option', 'order')) + + @pytest.mark.parametrize('username,password', users) def test_update_multisite(db, client, username, password): client.login(username=username, password=password) @@ -91,7 +251,9 @@ def test_update_multisite(db, client, username, password): 'text_de': instance.text_lang2 } response = client.put(url, data, content_type='application/json') - assert response.status_code == get_obj_perms_status_code(instance, username, 'update'), response.json() + assert response.status_code == ( + STATUS_CODES['update'].get(instance.uri, status_map['update'])[username] + ), response.json() instance.refresh_from_db() assert optionsets == [optionset.id for optionset in instance.optionsets.all()] @@ -103,9 +265,8 @@ def test_delete(db, client, username, password): instances = Option.objects.all() for instance in instances: - editors = list(instance.editors.values_list('domain', flat=True)) url = reverse(urlnames['detail'], args=[instance.pk]) response = client.delete(url) - assert response.status_code == get_obj_perms_status_code( - instance, username, 'delete', editors=editors + assert response.status_code == ( + STATUS_CODES['delete'].get(instance.uri, status_map['delete'])[username] ), response.json() diff --git a/rdmo/options/tests/test_viewset_optionsets_multisite.py b/rdmo/options/tests/test_viewset_optionsets_multisite.py index 9c32a3c947..a66245353b 100644 --- a/rdmo/options/tests/test_viewset_optionsets_multisite.py +++ b/rdmo/options/tests/test_viewset_optionsets_multisite.py @@ -6,11 +6,70 @@ from rdmo.core.tests.constants import multisite_status_map as status_map from rdmo.core.tests.constants import multisite_users as users -from rdmo.core.tests.utils import get_obj_perms_status_code from ..models import OptionSet from .test_viewset_optionsets import urlnames +STATUS_CODES = { + 'detail': { + 'https://foo.com/terms/options/foo-optionset': { + 'user': 404, 'reviewer': 200, 'editor': 200, + 'example-reviewer': 200, 'example-editor': 200, 'foo-user': 404, + 'foo-reviewer': 200, 'foo-editor': 200, 'bar-user': 404, + 'bar-reviewer': 404, 'bar-editor': 404, 'anonymous': 401, + }, + 'https://bar.com/terms/options/bar-optionset': { + 'user': 404, 'reviewer': 200, 'editor': 200, + 'example-reviewer': 200, 'example-editor': 200, 'foo-user': 404, + 'foo-reviewer': 404, 'foo-editor': 404, 'bar-user': 404, + 'bar-reviewer': 200, 'bar-editor': 200, 'anonymous': 401, + }, + }, + 'nested': { + 'https://foo.com/terms/options/foo-optionset': { + 'user': 404, 'reviewer': 200, 'editor': 200, + 'example-reviewer': 200, 'example-editor': 200, 'foo-user': 404, + 'foo-reviewer': 200, 'foo-editor': 200, 'bar-user': 404, + 'bar-reviewer': 404, 'bar-editor': 404, 'anonymous': 401, + }, + 'https://bar.com/terms/options/bar-optionset': { + 'user': 404, 'reviewer': 200, 'editor': 200, + 'example-reviewer': 200, 'example-editor': 200, 'foo-user': 404, + 'foo-reviewer': 404, 'foo-editor': 404, 'bar-user': 404, + 'bar-reviewer': 200, 'bar-editor': 200, 'anonymous': 401, + }, + }, + 'update': { + 'https://foo.com/terms/options/foo-optionset': { + 'user': 404, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 404, + 'foo-reviewer': 403, 'foo-editor': 200, 'bar-user': 404, + 'bar-reviewer': 404, 'bar-editor': 404, 'anonymous': 401, + }, + 'https://bar.com/terms/options/bar-optionset': { + 'user': 404, 'reviewer': 403, 'editor': 200, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 404, + 'foo-reviewer': 404, 'foo-editor': 404, 'bar-user': 404, + 'bar-reviewer': 403, 'bar-editor': 200, 'anonymous': 401, + }, + }, + 'delete': { + 'https://foo.com/terms/options/foo-optionset': { + 'user': 404, 'reviewer': 403, 'editor': 204, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 404, + 'foo-reviewer': 403, 'foo-editor': 204, 'bar-user': 404, + 'bar-reviewer': 404, 'bar-editor': 404, 'anonymous': 401, + }, + 'https://bar.com/terms/options/bar-optionset': { + 'user': 404, 'reviewer': 403, 'editor': 204, + 'example-reviewer': 404, 'example-editor': 404, 'foo-user': 404, + 'foo-reviewer': 404, 'foo-editor': 404, 'bar-user': 404, + 'bar-reviewer': 403, 'bar-editor': 204, 'anonymous': 401, + }, + }, +} + + @pytest.mark.parametrize('username,password', users) def test_list(db, client, username, password): @@ -29,7 +88,9 @@ def test_detail(db, client, username, password): for instance in instances: url = reverse(urlnames['detail'], args=[instance.pk]) response = client.get(url) - assert response.status_code == get_obj_perms_status_code(instance, username, 'detail'), response.json() + assert response.status_code == ( + STATUS_CODES['detail'].get(instance.uri, status_map['detail'])[username] + ), response.json() @pytest.mark.parametrize('username,password', users) @@ -40,7 +101,9 @@ def test_nested(db, client, username, password): for instance in instances: url = reverse(urlnames['nested'], args=[instance.pk]) response = client.get(url) - assert response.status_code == get_obj_perms_status_code(instance, username, 'nested'), response.json() + assert response.status_code == ( + STATUS_CODES['nested'].get(instance.uri, status_map['nested'])[username] + ), response.json() @pytest.mark.parametrize('username,password', users) @@ -85,6 +148,39 @@ def test_create(db, client, username, password): assert response.status_code == status_map['create'][username], response.json() +@pytest.mark.parametrize('username,password', users) +def test_create_m2m(db, client, username, password): + client.login(username=username, password=password) + instances = OptionSet.objects.all() + + for instance in instances: + optionset_options = [{ + 'option': optionset_option.option.id, + 'order': optionset_option.order + } for optionset_option in instance.optionset_options.all()[:1]] + conditions = [condition.pk for condition in instance.conditions.all()[:1]] + + url = reverse(urlnames['list']) + data = { + 'uri_prefix': instance.uri_prefix, + 'uri_path': f'{instance.uri_path}_new_{username}', + 'comment': instance.comment, + 'order': instance.order, + 'options': optionset_options, + 'conditions': conditions, + } + response = client.post(url, data, content_type='application/json') + assert response.status_code == status_map['create'][username], response.json() + + if response.status_code == 201: + new_instance = OptionSet.objects.get(id=response.json().get('id')) + assert optionset_options == [{ + 'option': optionset_option.option.id, + 'order': optionset_option.order + } for optionset_option in new_instance.optionset_options.all()] + assert conditions == [condition.pk for condition in new_instance.conditions.all()] + + @pytest.mark.parametrize('username,password', users) def test_update_m2m_multisite(db, client, username, password): client.login(username=username, password=password) @@ -107,7 +203,9 @@ def test_update_m2m_multisite(db, client, username, password): 'conditions': conditions, } response = client.put(url, data, content_type='application/json') - assert response.status_code == get_obj_perms_status_code(instance, username, 'update'), response.json() + assert response.status_code == ( + STATUS_CODES['update'].get(instance.uri, status_map['update'])[username] + ), response.json() if response.status_code == 200: instance.refresh_from_db() @@ -124,11 +222,10 @@ def test_delete(db, client, username, password): instances = OptionSet.objects.all() for instance in instances: - editors = list(instance.editors.values_list('domain', flat=True)) url = reverse(urlnames['detail'], args=[instance.pk]) response = client.delete(url) - assert response.status_code == get_obj_perms_status_code( - instance, username, 'delete', editors=editors + assert response.status_code == ( + STATUS_CODES['delete'].get(instance.uri, status_map['delete'])[username] ), response.json() @@ -140,7 +237,9 @@ def test_detail_export(db, client, username, password): for instance in instances: url = reverse(urlnames['detail_export'], args=[instance.pk]) response = client.get(url) - assert response.status_code == get_obj_perms_status_code(instance, username, 'detail'), response.json() + assert response.status_code == ( + STATUS_CODES['detail'].get(instance.uri, status_map['detail'])[username] + ), response.json() if response.status_code == 200: root = et.fromstring(response.content) diff --git a/rdmo/options/viewsets.py b/rdmo/options/viewsets.py index b0eaffd2d4..e4d8f9d46e 100644 --- a/rdmo/options/viewsets.py +++ b/rdmo/options/viewsets.py @@ -13,6 +13,7 @@ from rdmo.core.permissions import HasModelPermission, HasObjectPermission from rdmo.core.utils import is_truthy, render_to_format from rdmo.core.views import ChoicesViewSet +from rdmo.domain.models import Attribute from .models import Option, OptionSet from .renderers import OptionRenderer, OptionSetRenderer @@ -29,12 +30,6 @@ class OptionSetViewSet(ModelViewSet): permission_classes = (HasModelPermission | HasObjectPermission, ) serializer_class = OptionSetSerializer - queryset = OptionSet.objects.prefetch_related( - 'optionset_options__option', - 'conditions', - 'questions', - 'editors' - ) filter_backends = (SearchFilter, DjangoFilterBackend) search_fields = ('uri', ) @@ -45,6 +40,23 @@ class OptionSetViewSet(ModelViewSet): 'comment' ) + def get_queryset(self): + queryset = OptionSet.objects.all() + if self.action in ['index']: + return queryset + elif self.action in ['nested', 'export', 'detail_export']: + return queryset.prefetch_related( + 'optionset_options__option', + 'conditions', + ) + else: + return queryset.prefetch_related( + 'optionset_options__option', + 'conditions', + 'questions', + 'editors', + ) + @action(detail=False) def index(self, request): queryset = self.filter_queryset(self.get_queryset()) @@ -60,8 +72,12 @@ def nested(self, request, pk): def export(self, request, export_format='xml'): queryset = self.filter_queryset(self.get_queryset()) if export_format == 'xml': - serializer = OptionSetExportSerializer(queryset, many=True) - xml = OptionSetRenderer().render(serializer.data, context=self.get_export_renderer_context(request)) + serializer = OptionSetExportSerializer( + queryset, + many=True, + context=self.get_export_serializer_context(queryset), + ) + xml = OptionSetRenderer().render(serializer.data, context=self.get_export_flags()) return XMLResponse(xml, name='optionsets') else: return render_to_format(self.request, export_format, 'optionsets', 'options/export/optionsets.html', { @@ -70,32 +86,45 @@ def export(self, request, export_format='xml'): @action(detail=True, url_path='export(?:/(?P
- -Lorem ipsum dolor sit amet, consetetur sadipscing elitr + Lorem ipsum dolor sit amet, consetetur sadipscing elitr
- -sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua + sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua
- -Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet.
- -Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet.
- -Yes + Yes
- -No + No
- -Yes + Yes
- -One + One
- -Two + Two
- -Three + Three
- -One + One
- -Two + Two
- -Three + Three
- -0 + 0
- -50 + 50
- -100 + 100
- -April 1, 2017 + April 1, 2017
- -April 2, 2017 + April 2, 2017
- -April 3, 2017 + April 3, 2017
- -One + One
- -Three + Three
- -Lorem ipsum dolor sit amet, consetetur sadipscing elitr + Lorem ipsum dolor sit amet, consetetur sadipscing elitr
- -sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua + sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua
- -Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet.
- -Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet.
- -Yes + Yes
- -No + No
- -Yes + Yes
- -One + One
- -Two + Two
- -Three + Three
- -One + One
- -Two + Two
- -Three + Three
- -0 + 0
- -50 + 50
- -100 + 100
- -April 1, 2017 + April 1, 2017
- -April 2, 2017 + April 2, 2017
- -April 3, 2017 + April 3, 2017
- -One + One
- -Three + Three
- -Yes + Yes
- -No + No
- -Yes + Yes
- -No + No
- -Yes + Yes
- -No + No
- -One + One
- -Two + Two
- -Three + Three
- -Three + Three
- -Two + Two
- -One + One
- -One + One
- -Two + Two
- -16 + 16
- -31 + 31
- -Jan. 7, 2018 + Jan. 7, 2018
- -Feb. 7, 2018 + Feb. 7, 2018
- -Oct. 7, 2018 + Oct. 7, 2018
- -Nov. 7, 2018 + Nov. 7, 2018
- -Two + Two
- -Three + Three
- -c01 + c01
- -c02 + c02
- -c10 + c10
- -c11 + c11
Single questions
Text
Text?
-Lorem ipsum dolor sit amet + Lorem ipsum dolor sit amet
Textarea
Textarea?
-Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet.
Yes or no
Yes or no?
-Yes + Yes
Radio buttons
Radio buttons?
-Text: Lorem ipsum + Text: Lorem ipsum
Select drop-down
Select drop-down?
-One + One
Select drop-down (free)
Select drop-down (free)?
Range slider
Range slider?
-37 + 37
File
File?
@@ -45,66 +45,66 @@File
Datetime
Date picker?
-Jan. 1, 2018 + Jan. 1, 2018
Collections
Text
Text?
Textarea
Textarea?
Yes or no
Yes or no?
Radio buttons
Radio buttons?
Select drop-down
Select drop-down?
Select drop-down (free)
@@ -113,26 +113,26 @@Range slider
Range slider?
Date picker
Date picker?
File
@@ -149,42 +149,42 @@Checkbox
Checkbox?
Sets
Individual sets I
Text?
-Lorem ipsum dolor sit amet + Lorem ipsum dolor sit amet
Textarea?
-Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet.
Yes or no?
-Yes + Yes
Radio buttons?
-Text: Lorem ipsum + Text: Lorem ipsum
Select drop-down?
-One + One
Select drop-down (free)?
Range slider?
-37 + 37
Date picker?
-Jan. 1, 2018 + Jan. 1, 2018
File?
@@ -194,80 +194,80 @@
Individual sets II
Text?
Textarea?
Yes or no?
Radio buttons?
Select drop-down?
Select drop-down (free)?
Range slider?
Date picker?
File?
@@ -282,96 +282,96 @@Individual sets II
Checkbox?
Set collections I
Text?
Set "First": -Lorem ipsum dolor sit amet, consetetur sadipscing elitr + Lorem ipsum dolor sit amet, consetetur sadipscing elitr
Set "Second": -Lorem ipsum dolor sit amet, consetetur sadipscing elitr + Lorem ipsum dolor sit amet, consetetur sadipscing elitr
Textarea?
Set "First": -Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet.
Set "Second": -Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet.
Yes or no?
Set "First": -Yes + Yes
Set "Second": -No + No
Radio buttons?
Set "First": -One + One
Set "Second": -Two + Two
Select drop-down?
Set "First": -One + One
Set "Second": -Two + Two
Select drop-down (free)?
Range slider?
Set "First": -1 + 1
Set "Second": -2 + 2
Date picker?
Set "First": -Jan. 7, 2018 + Jan. 7, 2018
Set "Second": -Feb. 7, 2018 + Feb. 7, 2018
File?
Set collections II
Text?
Set "First": -Lorem ipsum dolor sit amet, consetetur sadipscing elitr + Lorem ipsum dolor sit amet, consetetur sadipscing elitr
Set "Second": -Lorem ipsum dolor sit amet, consetetur sadipscing elitr + Lorem ipsum dolor sit amet, consetetur sadipscing elitr
Textarea?
Set "First": -Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet.
Set "Second": -Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet.
Yes or no?
@@ -379,13 +379,13 @@
Set collections II
@@ -393,13 +393,13 @@
Set collections II
Radio buttons?
@@ -408,13 +408,13 @@Set collections II
@@ -422,13 +422,13 @@
Set collections II
Select drop-down?
@@ -437,15 +437,15 @@Set collections II
Set "Second": -Three + Three
Select drop-down (free)?
Range slider?
@@ -454,15 +454,15 @@Set collections II
Set "Second": -86 + 86
Date picker?
@@ -470,10 +470,10 @@
Set collections II
@@ -481,10 +481,10 @@
Set collections II
File?
@@ -494,37 +494,37 @@Set collections II
Set "Second": -One + One
Conditions
Input
Text
-test + test
Option
-One + One
Text I
text_contains?
-test + test
Text II
text empty?
Text III
text_equal?
-test + test
Text IV
text_greater_than?
@@ -537,7 +537,7 @@Text VII
Text VIII
text_not_empty?
-test + test
Text IX
text_not_equal?
@@ -546,12 +546,12 @@Options I
Options II
option_equal?
-One + One
Options III
option_not_empty?
-One + One
Options IV
option_not_equal?
@@ -594,20 +594,20 @@A set of questionsets and questions
A?
Set "First", Block #1: -a0 + a0
Set "First", Block #2: -a1 + a1
B?
Set "First", Block #1: -b1 + b1
Set "First", Block #2: -b1 + b1
C?
@@ -615,10 +615,10 @@
A set of questionsets and questions
@@ -626,40 +626,40 @@
A set of questionsets and questions
Y?
Set "First", Block #1, Set #1: -Three + Three
Set "First", Block #2, Set #1: -Three + Three
Set "Second", Block #1, Set #1: -Three + Three
Set "Second", Block #2, Set #1: -Three + Three
Set "Second", Block #3, Set #1: -One + One
Set "Second", Block #3, Set #2: -Two + Two
Set "Second", Block #3, Set #3: -Three + Three
Question