Merge remote-tracking branch 'origin/main' into stojanovic/fe-95-move…

…-form-field-hints-under-input-make-text-more-subtle-less

oarepo_ui/ext.py

@@ -97,10 +97,23 @@ def catalog(self):
         return self._catalog_config(self._catalog, self.templates.jinja_env)
 
     def _catalog_config(self, catalog, env):
+
+        # monkeypatch component - see https://github.com/jpsca/jinjax/issues/32
+        from markupsafe import Markup
+        from jinjax.component import Component
+
+        def render(self, **kwargs):
+            assert self.tmpl, f"Component {self.name} has no template"
+            return Markup(self.tmpl.render(**kwargs).strip())
+        render.__name__ = 'render_patched_by_oarepo_ui'
+        Component.render = render
+        # monkeypatch end
+
         context = {}
         env.policies.setdefault("json.dumps_kwargs", {}).setdefault("default", str)
         self.app.update_template_context(context)
         catalog.jinja_env.loader = env.loader
+        catalog.jinja_env.autoescape = env.autoescape
         context.update(catalog.jinja_env.globals)
         context.update(env.globals)
         catalog.jinja_env.globals = context

oarepo_ui/resources/catalog.py

@@ -74,6 +74,7 @@ def _get_component_path(
             f"Unable to find a file named {name}{file_ext} "
             f"or one following the pattern {name_dot}*{file_ext}"
         )
+
     def _get_from_file(self, *, prefix: str, name: str, url_prefix: str, file_ext: str) -> "Component":
         root_path, path = self._get_component_path(prefix, name, file_ext=file_ext)
         component = Component(
@@ -87,7 +88,9 @@ def _get_from_file(self, *, prefix: str, name: str, url_prefix: str, file_ext: s
         return component
 
 
-def get_jinja_template(_catalog, template_def, fields=[]):
+def get_jinja_template(_catalog, template_def, fields=None):
+    if fields is None:
+        fields = []
     jinja_content = None
     for component in _catalog.jinja_env.loader.searchpath:
         if component["component_file"].endswith(template_def["layout"]):

oarepo_ui/resources/resource.py

@@ -260,13 +260,13 @@ def search(self):
         )
 
         search_config = partial(self.config.search_app_config, **search_options)
+
         search_app_config = search_config(app_id=app_id)
-        json_data = json.dumps(search_app_config, default=lazy_string_encoder, indent=4)
 
         return _catalog.render(
             "search",
             __source=source,
-            search_app_config=json_data,
+            search_app_config=search_app_config,
             ui_config=self.config,
             ui_resource=self,
             layout=layout,

oarepo_ui/theme/assets/semantic-ui/js/oarepo_ui/search/SearchAppResultOptions.jsx

@@ -8,18 +8,7 @@ import { i18next } from "@translations/oarepo_ui/i18next";
 import { SearchConfigurationContext } from "@js/invenio_search_ui/components";
 import { SearchAppSort } from "./SearchAppSort";
 
-const sortTranslation = (sortOptions) => {
-  const translatedSortOptions = sortOptions.map((sortOption) => {
-    return {
-      ...sortOption,
-      text: i18next.t(sortOption.sortBy),
-    };
-  });
-  return translatedSortOptions;
-};
-
 export const SearchAppResultOptions = ({ sortOptions, layoutOptions }) => {
-  sortOptions = sortTranslation(sortOptions);
   const { buildUID } = useContext(SearchConfigurationContext);
   const multipleLayouts =
     Object.values(layoutOptions).filter((i) => i).length > 1;

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-ui
-version = 5.0.72
+version = 5.0.75
 description = UI module for invenio 3.5+
 long_description = file: README.md
 long_description_content_type = text/markdown

tests/test_ui_resource.py

@@ -16,10 +16,12 @@ def test_permissions_on_detail(
     with client.get(f"/simple-model/{simple_record.id}") as c:
         assert c.status_code == 200
         assert (
-            "permissions={'can_edit': False, 'can_new_version': False, 'can_manage': "
-            "False, 'can_update_draft': False, 'can_read_files': True, 'can_review': "
-            "False, 'can_view': False, 'can_delete_draft': False, 'can_manage_files': "
-            "False, 'can_manage_record_access': False}"
+            'permissions={'can_edit': False, 'can_new_version': False, '
+ ''can_manage': False, 'can_update_draft': False, '
+ ''can_read_files': True, 'can_review': False, '
+ ''can_view': False, 'can_delete_draft': False, '
+ ''can_manage_files': False, 'can_manage_record_access': '
+ 'False}'
         ) in c.text
 
 
@@ -36,7 +38,7 @@ def test_permissions_on_search(
 ):
     with client.get(f"/simple-model/") as c:
         assert c.status_code == 200
-        assert ("permissions={'can_create': True}") in c.text
+        assert ("permissions={'can_create': True}") in c.text
 
 
 def test_filter_on_search(