core-explore-common-app 2.4.0__tar.gz → 2.6.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (120) hide show
  1. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/PKG-INFO +1 -1
  2. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/access_control/api.py +1 -1
  3. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/components/abstract_query/models.py +3 -1
  4. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/components/result/models.py +1 -1
  5. core_explore_common_app-2.6.0/core_explore_common_app/migrations/0003_rename_xml_content_result_content.py +18 -0
  6. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/rest/query/views.py +5 -5
  7. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/rest/result/serializers.py +1 -1
  8. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/rest/result/views.py +1 -1
  9. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/static/core_explore_common_app/user/css/query_result.css +1 -1
  10. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/static/core_explore_common_app/user/css/results.css +9 -2
  11. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/static/core_explore_common_app/user/js/results.js +19 -3
  12. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/static/core_explore_common_app/user/js/results.raw.js +2 -1
  13. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/commons/query_content.html +1 -1
  14. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/user/ordering_menu/multi_criteria_sorting_menu.html +1 -1
  15. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/user/ordering_menu/single_criteria_sorting_menu.html +1 -1
  16. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/user/results/data_source_info.html +12 -5
  17. core_explore_common_app-2.6.0/core_explore_common_app/templates/core_explore_common_app/user/results/data_source_results.html +18 -0
  18. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/user/results/data_sources_results.html +11 -3
  19. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/utils/linked_records/pid.py +15 -8
  20. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/utils/result/result.py +2 -1
  21. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/views/user/ajax.py +4 -8
  22. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/views/user/views.py +21 -26
  23. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app.egg-info/PKG-INFO +1 -1
  24. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app.egg-info/SOURCES.txt +1 -0
  25. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app.egg-info/requires.txt +1 -1
  26. core_explore_common_app-2.6.0/requirements.core.txt +1 -0
  27. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/setup.py +1 -1
  28. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/rest/query/views/tests_unit.py +95 -1
  29. core_explore_common_app-2.6.0/tests/rest/result/tests_unit.py +2 -0
  30. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/utils/linked_records/tests_pid.py +37 -6
  31. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/views/test_unit.py +106 -4
  32. core_explore_common_app-2.4.0/core_explore_common_app/templates/core_explore_common_app/user/results/data_source_results.html +0 -14
  33. core_explore_common_app-2.4.0/requirements.core.txt +0 -1
  34. core_explore_common_app-2.4.0/tests/rest/result/tests_unit.py +0 -104
  35. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/LICENSE.md +0 -0
  36. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/MANIFEST.in +0 -0
  37. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/README.rst +0 -0
  38. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/__init__.py +0 -0
  39. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/access_control/__init__.py +0 -0
  40. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/admin.py +0 -0
  41. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/apps.py +0 -0
  42. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/commons/__init__.py +0 -0
  43. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/commons/exceptions.py +0 -0
  44. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/components/__init__.py +0 -0
  45. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/components/abstract_persistent_query/__init__.py +0 -0
  46. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/components/abstract_persistent_query/api.py +0 -0
  47. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/components/abstract_persistent_query/models.py +0 -0
  48. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/components/abstract_query/__init__.py +0 -0
  49. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/components/query/__init__.py +0 -0
  50. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/components/query/admin_site.py +0 -0
  51. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/components/query/api.py +0 -0
  52. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/components/query/models.py +0 -0
  53. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/components/result/__init__.py +0 -0
  54. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/constants.py +0 -0
  55. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/discover.py +0 -0
  56. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/migrations/0001_initial.py +0 -0
  57. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/migrations/0002_result_blob_url.py +0 -0
  58. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/migrations/__init__.py +0 -0
  59. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/rest/__init__.py +0 -0
  60. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/rest/query/__init__.py +0 -0
  61. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/rest/result/__init__.py +0 -0
  62. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/rest/urls.py +0 -0
  63. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/settings.py +0 -0
  64. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/static/core_explore_common_app/common/js/tools.js +0 -0
  65. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/static/core_explore_common_app/user/css/toggle.css +0 -0
  66. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/static/core_explore_common_app/user/js/local_selector.js +0 -0
  67. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/static/core_explore_common_app/user/js/persistent_query_config.js +0 -0
  68. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/static/core_explore_common_app/user/js/sorting_multi_criteria.js +0 -0
  69. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/static/core_explore_common_app/user/js/sorting_single_criteria.js +0 -0
  70. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/system/__init__.py +0 -0
  71. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/system/api.py +0 -0
  72. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/tasks.py +0 -0
  73. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/admin/persistent_query/content_query_box.html +0 -0
  74. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/admin/persistent_query/view_query_content.html +0 -0
  75. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/user/persistent_query/button.html +0 -0
  76. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/user/persistent_query/modal.html +0 -0
  77. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/user/persistent_query/persistent_query_content.html +0 -0
  78. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/user/persistent_query/persistent_query_pagination.html +0 -0
  79. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/user/results/data_source_pagination.html +0 -0
  80. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/user/results/results.html +0 -0
  81. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/user/selector/data_sources_selector.html +0 -0
  82. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/user/selector/list_selector_base.html +0 -0
  83. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/user/selector/local_content.html +0 -0
  84. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/templates/core_explore_common_app/user/selector/local_selector.html +0 -0
  85. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/urls.py +0 -0
  86. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/utils/__init__.py +0 -0
  87. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/utils/linked_records/__init__.py +0 -0
  88. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/utils/oaipmh/__init__.py +0 -0
  89. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/utils/oaipmh/oaipmh.py +0 -0
  90. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/utils/protocols/__init__.py +0 -0
  91. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/utils/protocols/commons.py +0 -0
  92. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/utils/protocols/oauth2.py +0 -0
  93. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/utils/query/__init__.py +0 -0
  94. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/utils/query/query.py +0 -0
  95. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/utils/result/__init__.py +0 -0
  96. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/views/__init__.py +0 -0
  97. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app/views/user/__init__.py +0 -0
  98. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app.egg-info/dependency_links.txt +0 -0
  99. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/core_explore_common_app.egg-info/top_level.txt +0 -0
  100. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/pyproject.toml +0 -0
  101. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/setup.cfg +0 -0
  102. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/__init__.py +0 -0
  103. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/components/__init__.py +0 -0
  104. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/components/abstract_persistent_query/__init__.py +0 -0
  105. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/components/query/__init__.py +0 -0
  106. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/components/query/tests_unit.py +0 -0
  107. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/rest/__init__.py +0 -0
  108. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/rest/query/__init__.py +0 -0
  109. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/rest/query/views/__init__.py +0 -0
  110. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/rest/result/__init__.py +0 -0
  111. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/rest/result/tests_permissions.py +0 -0
  112. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/test_settings.py +0 -0
  113. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/urls.py +0 -0
  114. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/utils/__init__.py +0 -0
  115. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/utils/linked_records/__init__.py +0 -0
  116. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/utils/oaipmh/__init__.py +0 -0
  117. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/utils/oaipmh/tests_oaipmh.py +0 -0
  118. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/utils/query/__init__.py +0 -0
  119. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/utils/query/tests_query.py +0 -0
  120. {core_explore_common_app-2.4.0 → core_explore_common_app-2.6.0}/tests/views/__init__.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.0
2
2
  Name: core_explore_common_app
3
- Version: 2.4.0
3
+ Version: 2.6.0
4
4
  Summary: Base exploration function for the curator core project
5
5
  Home-page: https://github.com/usnistgov/core_explore_common_app
6
6
  Author: NIST IT Lab
@@ -182,7 +182,7 @@ def can_access_explore_views(func, *args, **kwargs):
182
182
 
183
183
  """
184
184
  request = next((arg for arg in args if isinstance(arg, HttpRequest)), None)
185
- access_control_api._check_anonymous_access(
185
+ access_control_api.check_anonymous_access(
186
186
  request.user if request else None
187
187
  )
188
188
  return func(*args, **kwargs)
@@ -48,7 +48,9 @@ class AbstractQuery(models.Model):
48
48
 
49
49
  user_id = models.CharField(blank=False, max_length=200)
50
50
  content = models.TextField(blank=True, null=True)
51
- templates = models.ManyToManyField(Template, blank=True, default=[])
51
+ templates = models.ManyToManyField(
52
+ Template, blank=True, default=[], symmetrical=False
53
+ )
52
54
  data_sources = models.JSONField(blank=True, default=list)
53
55
  creation_date = models.DateTimeField(auto_now_add=True)
54
56
 
@@ -7,7 +7,7 @@ class Result(models.Model):
7
7
  """Result class"""
8
8
 
9
9
  title = models.CharField(blank=False, max_length=200)
10
- xml_content = models.TextField(blank=False)
10
+ content = models.TextField(blank=False)
11
11
  template_info = models.JSONField(default=dict)
12
12
  permission_url = models.CharField(blank=True, null=True, max_length=200)
13
13
  detail_url = models.CharField(blank=True, null=True, max_length=200)
@@ -0,0 +1,18 @@
1
+ # Generated by Django 3.2.18 on 2023-05-12 20:34
2
+
3
+ from django.db import migrations
4
+
5
+
6
+ class Migration(migrations.Migration):
7
+
8
+ dependencies = [
9
+ ("core_explore_common_app", "0002_result_blob_url"),
10
+ ]
11
+
12
+ operations = [
13
+ migrations.RenameField(
14
+ model_name="result",
15
+ old_name="xml_content",
16
+ new_name="content",
17
+ ),
18
+ ]
@@ -4,8 +4,8 @@ import json
4
4
  import logging
5
5
 
6
6
  import pytz
7
- from django.conf import settings as conf_settings
8
7
  from django import urls as django_urls
8
+ from django.conf import settings as conf_settings
9
9
 
10
10
  from core_explore_common_app.components.result.models import Result
11
11
  from core_explore_common_app.utils.linked_records import pid as pid_utils
@@ -59,7 +59,7 @@ def build_local_query(query_data):
59
59
  # update the criteria with templates information
60
60
  if templates is not None and len(templates) > 0:
61
61
  list_template_ids = [
62
- AbstractExecuteLocalQueryView.parse_id(template["id"])
62
+ AbstractExecuteLocalQueryView.parse_id(template)
63
63
  for template in templates
64
64
  ]
65
65
  query_builder.add_list_criteria("template", list_template_ids)
@@ -148,8 +148,8 @@ def format_local_results(results, request):
148
148
  detail_url = f"{data_detail_url_base}?id={str(data.id)}"
149
149
 
150
150
  # Use the PID link if the app is installed, and a PID is defined for the document
151
- if pid_utils.auto_set_pid_enabled(
152
- installed_apps=conf_settings.INSTALLED_APPS
151
+ if pid_utils.is_auto_set_pid_enabled(
152
+ installed_apps=conf_settings.INSTALLED_APPS, user=request.user
153
153
  ):
154
154
  pid_url = pid_utils.get_pid_url(data, request)
155
155
  # Ensure the PID is set
@@ -168,7 +168,7 @@ def format_local_results(results, request):
168
168
  blob_url=f"{blob_detail_url_base}?id={blob.id}"
169
169
  if blob_detail_url_base and blob
170
170
  else None,
171
- xml_content=data.xml_content,
171
+ content=data.content,
172
172
  template_info=template_info[template_id],
173
173
  permission_url=f'{url_permission_data}?ids=%5B"{str(data.id)}"%5D',
174
174
  detail_url=detail_url,
@@ -22,4 +22,4 @@ class ResultBaseSerializer(ModelSerializer):
22
22
  """Meta"""
23
23
 
24
24
  model = Result
25
- fields = ("title", "xml_content")
25
+ fields = ("title", "content")
@@ -44,7 +44,7 @@ def get_result_from_data_id(request):
44
44
  data = data_api.get_by_id(data_id, request.user)
45
45
 
46
46
  # Build a Result
47
- result = Result(title=data.title, xml_content=data.xml_content)
47
+ result = Result(title=data.title, content=data.content)
48
48
 
49
49
  # Serialize results
50
50
  return_value = ResultSerializer(result)
@@ -137,11 +137,18 @@ span.expand {
137
137
  float: left;
138
138
  }
139
139
 
140
- .xmlResult {
140
+ .content-result {
141
141
  width: 100%;
142
142
  overflow: auto;
143
143
  }
144
144
 
145
145
  #data_sources_selector {
146
146
  word-break: break-all;
147
- }
147
+ }
148
+
149
+ .highlight-content{
150
+ max-height:160px !important;
151
+ overflow:auto;
152
+ font-size: 18px;
153
+ }
154
+
@@ -73,6 +73,17 @@ var get_data_source_results = function(result_page, data_source_url) {
73
73
  initDisplayDateToggle();
74
74
  // permission api calls for the edit button
75
75
  getDataPermission();
76
+ // format and highlight data content
77
+ $('.highlight-content code').each(function(i, block) {
78
+ if ($(".data-template-format").val() == "JSON"){
79
+ var jsonContent = JSON.parse($(block).text());
80
+ var highlightedContent = hljs.highlight('json',JSON.stringify(jsonContent, null, 8)).value
81
+ $(block).html(highlightedContent);
82
+ }
83
+ else {
84
+ hljs.highlightElement(block);
85
+ }
86
+ });
76
87
  // Add leave notice on links from loaded data
77
88
  leaveNotice($("#results_" + nb_results_id.match(/(\d+)/)[0] + " a"));
78
89
  },
@@ -108,14 +119,19 @@ var getDataPermission = function() {
108
119
  }());
109
120
  // show the open icon
110
121
  var openLinkElement = inputElement.siblings(".permissions-link-open");
122
+ var dataFormat = inputElement.siblings(".data-template-format").val();
111
123
  openLinkElement.css('display', "inline");
112
124
  // add link to text editor
113
- openLinkElement.attr("href", openRecordUrl + '?id=' + id);
125
+ if(dataFormat == "XSD") openLinkElement.attr("href", openXMLRecordUrl + '?id=' + id);
126
+ else if (dataFormat == "JSON") openLinkElement.attr("href", openJSONRecordUrl + '?id=' + id);
127
+ else $.notify("Error while initializing the text editor URL page. Unsupported data format.", 'danger');
128
+
114
129
  }
115
130
  }
116
131
  },
117
132
  error: function(data) {
118
- console.log(data)
133
+ var errors = $.parseJSON(data.responseText);
134
+ $.notify(errors.message, "danger");
119
135
  }
120
136
  })
121
137
  });
@@ -209,7 +225,7 @@ showhideResult = function(event) {
209
225
  let button = event.target;
210
226
  // find the xml container
211
227
  $(button).parents('.result-line-main-container')
212
- .find(".xmlResult")
228
+ .find(".content-result")
213
229
  .toggle("blind", 500);
214
230
 
215
231
  if ($(button).attr("class") === "expand") {
@@ -4,4 +4,5 @@ var displayPersistentQueryButton = '{{display_persistent_query_button}}';
4
4
  var defaultDataSortingFields = '{{data.default_data_sorting_fields}}';
5
5
  var defaultDateToggleValue = '{{data.default_date_toggle_value}}'
6
6
  var editRecordUrl = "{% url 'core_dashboard_edit_record' %}";
7
- var openRecordUrl = "{% url 'core_main_app_xml_text_editor_view' %}";
7
+ var openXMLRecordUrl = "{% url 'core_main_app_xml_text_editor_view' %}";
8
+ var openJSONRecordUrl = "{% url 'core_main_app_json_text_editor_view' %}";
@@ -1,6 +1,6 @@
1
1
 
2
2
  <div >
3
- <button type="button" class="btn btn-secondary {% if BOOTSTRAP_VERSION == "4.6.2" %}float-right{% elif BOOTSTRAP_VERSION == "5.1.3"%}float-end{% endif %} back-to-previous">
3
+ <button type="button" class="btn btn-secondary {% if BOOTSTRAP_VERSION|first == "4" %}float-right{% elif BOOTSTRAP_VERSION|first == "5" %}float-end{% endif %} back-to-previous">
4
4
  <i class="fas fa-arrow-left"></i> Back to previous
5
5
  </button>
6
6
  <div>
@@ -1,5 +1,5 @@
1
1
  <div class="filter">
2
- <button id="result-button-filter{{data_source_index}}" class="result-toolbar-button" {% if BOOTSTRAP_VERSION == "4.6.2" %}data-toggle{% elif BOOTSTRAP_VERSION == "5.1.3"%}data-bs-toggle{% endif %}="dropdown" aria-haspopup="true"
2
+ <button id="result-button-filter{{data_source_index}}" class="result-toolbar-button" {% if BOOTSTRAP_VERSION|first == "4" %}data-toggle{% elif BOOTSTRAP_VERSION|first == "5" %}data-bs-toggle{% endif %}="dropdown" aria-haspopup="true"
3
3
  aria-expanded="false">
4
4
  <i class="fas fa-sort-amount-up"></i> Sort
5
5
  </button>
@@ -1,5 +1,5 @@
1
1
  <div class="filter">
2
- <button id="result-button-filter{{data_source_index}}" class="result-toolbar-button" {% if BOOTSTRAP_VERSION == "4.6.2" %}data-toggle{% elif BOOTSTRAP_VERSION == "5.1.3"%}data-bs-toggle{% endif %}="dropdown" aria-haspopup="true"
2
+ <button id="result-button-filter{{data_source_index}}" class="result-toolbar-button" {% if BOOTSTRAP_VERSION|first == "4" %}data-toggle{% elif BOOTSTRAP_VERSION|first == "5" %}data-bs-toggle{% endif %}="dropdown" aria-haspopup="true"
3
3
  aria-expanded="false">
4
4
  <i class="fas fa-sort-amount-up"></i> Sort
5
5
  </button>
@@ -25,19 +25,26 @@
25
25
  <span class="template-info-name">{{result.template_info.name}}</span>
26
26
  {% if result.permission_url and display_edit_button %}
27
27
  <input class="input-permission-url" type="hidden" value="{{result.permission_url}}">
28
- <a class="permissions-link-open mx-2" href="#" {% if BOOTSTRAP_VERSION == "4.6.2" %}data-toggle{% elif BOOTSTRAP_VERSION == "5.1.3"%}data-bs-toggle{% endif %}="tooltip" title="Open in text editor">
28
+ <input class="data-template-format" type="hidden" value="{{result.template_info.format}}">
29
+ <a class="permissions-link-open mx-2" href="#" {% if BOOTSTRAP_VERSION|first == "4" %}data-toggle{% elif BOOTSTRAP_VERSION|first == "5" %}data-bs-toggle{% endif %}="tooltip" title="Open in text editor">
29
30
  <i class="fas fa-code" aria-hidden="true"></i>
30
31
  </a>
31
- <a class="permissions-link mx-2" href="#" {% if BOOTSTRAP_VERSION == "4.6.2" %}data-toggle{% elif BOOTSTRAP_VERSION == "5.1.3"%}data-bs-toggle{% endif %}="tooltip" title="Edit">
32
+ {% if result.template_info.format == 'XSD' %}
33
+ <a class="permissions-link mx-2" href="#" {% if BOOTSTRAP_VERSION|first == "4" %}data-toggle{% elif BOOTSTRAP_VERSION|first == "5" %}data-bs-toggle{% endif %}="tooltip" title="Edit">
32
34
  <i class="fas fa-pencil-alt permissions-icon edit" aria-hidden="true"></i>
33
35
  </a>
36
+ {% endif %}
34
37
  {% endif %}
35
38
  <div title="Last modification date" class="data-info-right-container">
36
39
  {{result.last_modification_date|parse_date|localtime|json_date:"N d Y g:iA"}}
37
40
  </div>
38
41
  </div>
39
42
  </div>
40
- <div class='xmlResult' readonly='true'>
41
- {{ xml_representation }}
43
+ <div class="content-result highlight-content" readonly='true'>
44
+ {% if result.template_info.format == 'XSD' %}
45
+ {{ html_string }}
46
+ {% else %}
47
+ <pre><code>{{html_string}}</code></pre>
48
+ {% endif %}
42
49
  </div>
43
- </div>
50
+ </div>
@@ -0,0 +1,18 @@
1
+ {% load xsl_transform_tag %}
2
+ {% load blob_tags %}
3
+ {% load get_attribute %}
4
+ {% for result in results %}
5
+ {% if result.template_info.format == 'XSD' %}
6
+ {% xsl_transform_list xml_content=result.content template_id=result.template_info.id template_hash=result.template_info.hash as html_string %}
7
+ {% if blobs_preview %}
8
+ {% render_blob_links_in_span xml_string=html_string as html_string %}
9
+ {% endif %}
10
+ {% include 'core_explore_common_app/user/results/data_source_info.html' with html_string=html_string|safe %}
11
+ {% else %}
12
+ {% include 'core_explore_common_app/user/results/data_source_info.html' with html_string=result.content|safe %}
13
+ {% endif %}
14
+ {% empty %}
15
+ <span style="font-style:italic; color:red;"> No Results found... </span>
16
+ {% endfor %}
17
+
18
+ {% include 'core_explore_common_app/user/results/data_source_pagination.html'%}
@@ -1,11 +1,19 @@
1
1
  <div>
2
2
  {% if query.data_sources|length > 0 %}
3
- <ul class="nav nav-tabs"role="tablist">
3
+ <ul class="nav nav-tabs" role="tablist">
4
4
  {% for data_source in query.data_sources %}
5
5
  <li role="presentation" class="nav-item">
6
- <a class="nav-link{% if forloop.counter0 == 0 %} active {% endif %}" href="#results_{{forloop.counter0}}" id="tab_results_{{forloop.counter0}}" aria-controls="profile" role="tab" {% if BOOTSTRAP_VERSION == "4.6.2" %}data-toggle{% elif BOOTSTRAP_VERSION == "5.1.3" %}data-bs-toggle{% endif %}="tab">
6
+ <a class="nav-link{% if forloop.counter0 == 0 %} active{% endif %}"
7
+ href="#results_{{forloop.counter0}}"
8
+ id="tab_results_{{forloop.counter0}}"
9
+ aria-controls="profile"
10
+ role="tab"
11
+ {% if BOOTSTRAP_VERSION|first == "4" %}data-toggle="tab"
12
+ {% elif BOOTSTRAP_VERSION|first == "5" %}data-bs-toggle="tab"
13
+ {% endif %}
14
+ >
7
15
  From {{ data_source.name }}
8
- <span class="badge {% if BOOTSTRAP_VERSION == "4.6.2" %}badge-secondary{% elif BOOTSTRAP_VERSION == "5.1.3" %}bg-secondary{% endif %}" id="results_infos_{{forloop.counter0}}">-</span>
16
+ <span class="badge {% if BOOTSTRAP_VERSION|first == "4" %}badge-secondary{% elif BOOTSTRAP_VERSION|first == "5" %}bg-secondary{% endif %}" id="results_infos_{{forloop.counter0}}">-</span>
9
17
  </a>
10
18
  </li>
11
19
  {% endfor %}
@@ -6,18 +6,25 @@ from logging import getLogger
6
6
  logger = getLogger(__name__)
7
7
 
8
8
 
9
- def auto_set_pid_enabled(installed_apps):
10
- """Check if Auto Set Pid enabled
9
+ def is_auto_set_pid_enabled(installed_apps, user, use_system_api=False):
10
+ """Check if PID are available and enabled.
11
11
 
12
12
  Returns:
13
-
13
+ bool - True if core_linked_records_app is installed and PID are activated.
14
14
  """
15
15
  if "core_linked_records_app" in installed_apps:
16
- from core_linked_records_app.components.pid_settings import (
17
- api as pid_settings_api,
18
- )
19
-
20
- return pid_settings_api.get().auto_set_pid
16
+ if not use_system_api:
17
+ from core_linked_records_app.components.pid_settings import (
18
+ api as pid_settings_api,
19
+ )
20
+
21
+ return pid_settings_api.get(user).auto_set_pid
22
+ else:
23
+ from core_linked_records_app.system.pid_settings import (
24
+ api as pid_settings_system_api,
25
+ )
26
+
27
+ return pid_settings_system_api.get().auto_set_pid
21
28
  return False
22
29
 
23
30
 
@@ -24,6 +24,7 @@ def get_template_info(template, include_template_id=True):
24
24
  "id": template.id if include_template_id else "",
25
25
  "name": template.display_name,
26
26
  "hash": template.hash,
27
+ "format": template.format,
27
28
  }
28
29
 
29
30
  return return_value
@@ -45,7 +46,7 @@ def get_result_from_rest_data_response(response):
45
46
  # Build a Result
46
47
  result = Result(
47
48
  title=result_serialized.data["title"],
48
- xml_content=result_serialized.data["xml_content"],
49
+ content=result_serialized.data["content"],
49
50
  )
50
51
  # Serialize results
51
52
  return_value = ResultSerializer(result)
@@ -38,6 +38,7 @@ from core_main_app.utils.pagination.rest_framework_paginator.rest_framework_pagi
38
38
  get_page_number,
39
39
  )
40
40
  from core_main_app.views.common.views import CommonView
41
+ from core_explore_common_app.utils.linked_records import pid as pid_utils
41
42
 
42
43
 
43
44
  @access_control(explore_common_acl_api.can_access_explore_views)
@@ -144,13 +145,9 @@ def get_data_sources_html(request):
144
145
  query = query_api.get_by_id(query_id, request.user)
145
146
 
146
147
  # Check if 'core_linked_records_app' is installed and activated
147
- is_linked_records_installed = False
148
- if "core_linked_records_app" in settings.INSTALLED_APPS:
149
- from core_linked_records_app.components.pid_settings import (
150
- api as pid_settings_api,
151
- )
152
-
153
- is_linked_records_installed = pid_settings_api.get().auto_set_pid
148
+ is_linked_records_installed = pid_utils.is_auto_set_pid_enabled(
149
+ settings.INSTALLED_APPS, request.user
150
+ )
154
151
 
155
152
  # set query in context
156
153
  context = {
@@ -437,7 +434,6 @@ class ContentPersistentQueryView(CommonView):
437
434
  "is_raw": True,
438
435
  },
439
436
  ],
440
- "css": ["core_main_app/common/css/highlight.css"],
441
437
  }
442
438
 
443
439
  return self.common_render(
@@ -14,17 +14,18 @@ from core_explore_common_app.components.query.models import Query
14
14
  from core_explore_common_app.settings import (
15
15
  EXPLORE_ADD_DEFAULT_LOCAL_DATA_SOURCE_TO_QUERY,
16
16
  )
17
+ from core_explore_common_app.utils.linked_records import pid as pid_utils
17
18
 
18
19
 
19
20
  class ResultsView(View):
20
21
  """Results View"""
21
22
 
22
23
  def __init__(self, **kwargs):
24
+ super().__init__(**kwargs)
25
+
23
26
  self.assets = self._load_assets()
24
27
  self.modals = self._load_modals()
25
28
 
26
- super().__init__(**kwargs)
27
-
28
29
  @staticmethod
29
30
  def build_sorting_context_array(query):
30
31
  """Get the query data-sources dans build the context sorting array for the JS
@@ -109,23 +110,20 @@ class ResultsView(View):
109
110
  )
110
111
 
111
112
  # Add assets needed for the PID sharing
112
- if "core_linked_records_app" in settings.INSTALLED_APPS:
113
- from core_linked_records_app.components.pid_settings import (
114
- api as pid_settings_api,
113
+ if pid_utils.is_auto_set_pid_enabled(
114
+ settings.INSTALLED_APPS, None, use_system_api=True
115
+ ):
116
+ assets["js"].extend(
117
+ [
118
+ {
119
+ "path": "core_linked_records_app/user/js/sharing/explore.js",
120
+ "is_raw": False,
121
+ }
122
+ ]
123
+ )
124
+ assets["css"].append(
125
+ "core_linked_records_app/user/css/sharing.css"
115
126
  )
116
-
117
- if pid_settings_api.get().auto_set_pid:
118
- assets["js"].extend(
119
- [
120
- {
121
- "path": "core_linked_records_app/user/js/sharing/explore.js",
122
- "is_raw": False,
123
- }
124
- ]
125
- )
126
- assets["css"].append(
127
- "core_linked_records_app/user/css/sharing.css"
128
- )
129
127
 
130
128
  return assets
131
129
 
@@ -148,16 +146,13 @@ class ResultsView(View):
148
146
  modals.append("core_file_preview_app/user/file_preview_modal.html")
149
147
 
150
148
  # Add PID modal
151
- if "core_linked_records_app" in settings.INSTALLED_APPS:
152
- from core_linked_records_app.components.pid_settings import (
153
- api as pid_settings_api,
149
+ if pid_utils.is_auto_set_pid_enabled(
150
+ settings.INSTALLED_APPS, None, use_system_api=True
151
+ ):
152
+ modals.append(
153
+ "core_linked_records_app/user/sharing/explore/modal.html"
154
154
  )
155
155
 
156
- if pid_settings_api.get().auto_set_pid:
157
- modals.append(
158
- "core_linked_records_app/user/sharing/explore/modal.html"
159
- )
160
-
161
156
  return modals
162
157
 
163
158
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.0
2
2
  Name: core-explore-common-app
3
- Version: 2.4.0
3
+ Version: 2.6.0
4
4
  Summary: Base exploration function for the curator core project
5
5
  Home-page: https://github.com/usnistgov/core_explore_common_app
6
6
  Author: NIST IT Lab
@@ -35,6 +35,7 @@ core_explore_common_app/components/result/__init__.py
35
35
  core_explore_common_app/components/result/models.py
36
36
  core_explore_common_app/migrations/0001_initial.py
37
37
  core_explore_common_app/migrations/0002_result_blob_url.py
38
+ core_explore_common_app/migrations/0003_rename_xml_content_result_content.py
38
39
  core_explore_common_app/migrations/__init__.py
39
40
  core_explore_common_app/rest/__init__.py
40
41
  core_explore_common_app/rest/urls.py
@@ -3,4 +3,4 @@ Django
3
3
  djangorestframework
4
4
  pytz
5
5
  requests
6
- core-main-app==2.4.*
6
+ core-main-app==2.6.*
@@ -0,0 +1 @@
1
+ core-main-app==2.6.*
@@ -37,7 +37,7 @@ required = [req_link(r) if r.startswith("https://") else r for r in required]
37
37
 
38
38
  setup(
39
39
  name="core_explore_common_app",
40
- version="2.4.0",
40
+ version="2.6.0",
41
41
  description="Base exploration function for the curator core project",
42
42
  long_description=long_desc,
43
43
  author="NIST IT Lab",
@@ -1,9 +1,11 @@
1
1
  """ Unit tests for local query views
2
2
  """
3
+
3
4
  from unittest.mock import patch, MagicMock
4
5
 
5
6
  from django.core import paginator as django_paginator
6
- from django.test import SimpleTestCase, tag, override_settings
7
+ from django.test import SimpleTestCase, override_settings
8
+ from django.test import tag
7
9
 
8
10
  from core_explore_common_app.rest.query import views as query_views
9
11
  from core_main_app.commons.exceptions import ApiError
@@ -108,3 +110,95 @@ class TestExecuteLocalQuery(SimpleTestCase):
108
110
  query_views.execute_local_query(
109
111
  query_data=mock_query_data, page=1, request=mock_request
110
112
  )
113
+
114
+
115
+ class TestFormatLocalResults(SimpleTestCase):
116
+ """TestFormatLocalResults"""
117
+
118
+ def test_format_local_empty_results_returns_empty_list(
119
+ self,
120
+ ):
121
+ """test_format_local_empty_results_returns_empty_list
122
+
123
+ Returns:
124
+
125
+ """
126
+ # Arrange
127
+ mock_user = create_mock_user(1)
128
+ mock_results = MagicMock()
129
+ mock_results.object_list = []
130
+ mock_request = create_mock_request(user=mock_user)
131
+
132
+ # Act
133
+ results = query_views.format_local_results(
134
+ results=mock_results, request=mock_request
135
+ )
136
+
137
+ # Assert
138
+ self.assertIsInstance(results, list)
139
+
140
+ @override_settings(INSTALLED_APPS=[])
141
+ def test_format_local_results_returns_list(
142
+ self,
143
+ ):
144
+ """test_format_local_results_returns_list
145
+
146
+ Returns:
147
+
148
+ """
149
+ # Arrange
150
+ mock_user = create_mock_user(1)
151
+ mock_data = MagicMock()
152
+ mock_data.template_id = 1
153
+ mock_template = MagicMock()
154
+ mock_template.id = 1
155
+ mock_template.name = "template_name"
156
+ mock_data.template = mock_template
157
+ mock_results = MagicMock()
158
+ mock_results.object_list = [mock_data]
159
+ mock_request = create_mock_request(user=mock_user)
160
+
161
+ # Act
162
+ results = query_views.format_local_results(
163
+ results=mock_results, request=mock_request
164
+ )
165
+
166
+ # Assert
167
+ self.assertIsInstance(results, list)
168
+ self.assertTrue(len(results), 1)
169
+
170
+ @patch(
171
+ "core_explore_common_app.utils.linked_records.pid.is_auto_set_pid_enabled"
172
+ )
173
+ @patch("core_explore_common_app.utils.linked_records.pid.get_pid_url")
174
+ def test_format_local_results_with_pid_returns_list(
175
+ self, mock_get_pid_url, mock_auto_set_pid_enabled
176
+ ):
177
+ """test_format_local_results_with_pid_returns_list
178
+
179
+ Returns:
180
+
181
+ """
182
+ # Arrange
183
+ mock_user = create_mock_user(1)
184
+ mock_data = MagicMock()
185
+ mock_data.template_id = 1
186
+ mock_template = MagicMock()
187
+ mock_template.id = 1
188
+ mock_template.name = "template_name"
189
+ mock_data.template = mock_template
190
+ mock_results = MagicMock()
191
+ mock_results.object_list = [mock_data]
192
+ mock_request = create_mock_request(user=mock_user)
193
+
194
+ mock_get_pid_url.return_value = None
195
+ mock_auto_set_pid_enabled.return_value = True
196
+
197
+ # Act
198
+ results = query_views.format_local_results(
199
+ results=mock_results, request=mock_request
200
+ )
201
+
202
+ # Assert
203
+ self.assertIsInstance(results, list)
204
+ self.assertTrue(len(results), 1)
@@ -0,0 +1,2 @@
1
+ """ Unit tests for Explore Common REST API
2
+ """