oarepo-runtime 1.5.86__py3-none-any.whl → 1.5.88__py3-none-any.whl

oarepo_runtime/cli/assets.py

@@ -6,6 +6,7 @@ from pathlib import Path
 import click
 from flask import current_app
 from flask.cli import with_appcontext
+from flask_webpackext import current_webpack
 from importlib_metadata import entry_points
 
 from .base import oarepo
@@ -22,7 +23,7 @@ def assets():
 @click.option("--assets-dir", default=".assets")
 @with_appcontext
 def collect(output_file, repository_dir, assets_dir):
-    aliases, asset_dirs = enumerate_assets()
+    aliases, asset_dirs, generated_paths = enumerate_assets()
 
     app_and_blueprints = [current_app] + list(current_app.blueprints.values())
 
@@ -60,6 +61,7 @@ def collect(output_file, repository_dir, assets_dir):
                 "static": static_deps,
                 "@aliases": aliases,
                 "@root_aliases": root_aliases,
+                "generated": generated_paths,
             },
             f,
             indent=4,
@@ -69,15 +71,22 @@ def collect(output_file, repository_dir, assets_dir):
 
 def enumerate_assets():
     asset_dirs = []
+    generated_paths = []
     aliases = {}
     themes = current_app.config["APP_THEME"] or ["semantic-ui"]
+    project = current_webpack.project
+    if hasattr(project, 'generated_paths'):
+        generated_paths += project.generated_paths
+
     for ep in entry_points(group="invenio_assets.webpack"):
         webpack = ep.load()
         for wp_theme_name, wp_theme in webpack.themes.items():
             if wp_theme_name in themes:
                 asset_dirs.append(wp_theme.path)
+                if hasattr(wp_theme, "generated_paths"):
+                    generated_paths += list(set(wp_theme.generated_paths) - set(generated_paths))
                 aliases.update(wp_theme.aliases)
-    return aliases, asset_dirs
+    return aliases, asset_dirs, generated_paths
 
 
 COMPONENT_LIST_RE = re.compile(
@@ -115,7 +124,7 @@ COMPONENT_RE = re.compile(
 @click.argument("output_file", default="-")
 @with_appcontext
 def less_components(output_file):
-    aliases, asset_dirs = enumerate_assets()
+    aliases, asset_dirs, _ = enumerate_assets()
     asset_dirs = [Path(x) for x in asset_dirs]
     less_component_files = []
     for asset_dir in asset_dirs:

oarepo_runtime/services/permissions/generators.py

@@ -14,10 +14,13 @@ class RecordOwners(Generator):
             return []
         if current_app.config.get('INVENIO_RDM_ENABLED', False):
             owners = getattr(record.parent.access, "owned_by", None)
+            if owners is not None:
+                owners_list = owners if isinstance(owners, list) else [owners]
+                return [UserNeed(owner.owner_id) for owner in owners_list]
         else:
             owners = getattr(record.parent, "owners", None)
-        if owners is not None:
-            return [UserNeed(owner.id) for owner in owners]
+            if owners is not None:
+                return [UserNeed(owner.id) for owner in owners]
         return []
 
     def query_filter(self, identity=None, **kwargs):

{oarepo_runtime-1.5.86.dist-info → oarepo_runtime-1.5.88.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: oarepo-runtime
-Version: 1.5.86
+Version: 1.5.88
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE

{oarepo_runtime-1.5.86.dist-info → oarepo_runtime-1.5.88.dist-info}/RECORD

@@ -6,7 +6,7 @@ oarepo_runtime/proxies.py,sha256=NN_WNj1xuKc-OveoZmzvTFlUonNjSmLIGsv_JUcHGls,285
 oarepo_runtime/tasks.py,sha256=AciXN1fUq6tzfzNSICh1S6XoHGWiuH76bUqXyzTsOPU,140
 oarepo_runtime/uow.py,sha256=iyF3R2oCPSVUu38GXoxZallgRD-619q1fWTb8sSaeyQ,4412
 oarepo_runtime/cli/__init__.py,sha256=daAODgUAB9Nb0O0Kg8vSgJIPKJm92EHMTRuoKwxBCug,373
-oarepo_runtime/cli/assets.py,sha256=Yrg9O2dXmrOGH87_3SNxmgrgyt2w4ZzkvQQJVTmLZjk,3634
+oarepo_runtime/cli/assets.py,sha256=ZG80xIOKch7rsU_7QlvZxBQAXNQ9ow5xLsUREsl5MEE,4076
 oarepo_runtime/cli/base.py,sha256=94RBTa8TOSPxEyEUmYLGXaWen-XktP2-MIbTtZSlCZo,544
 oarepo_runtime/cli/cf.py,sha256=W0JEJK2JqKubQw8qtZJxohmADDRUBode4JZAqYLDGvc,339
 oarepo_runtime/cli/check.py,sha256=sCe2PeokSHvNOXHFZ8YHF8NMhsu5nYjyuZuvXHJ6X18,5092
@@ -103,7 +103,7 @@ oarepo_runtime/services/files/__init__.py,sha256=K8MStrEQf_BUhvzhwPTF93Hkhwrd1dt
 oarepo_runtime/services/files/components.py,sha256=x6Wd-vvkqTqB1phj2a6h42DNQksN8PuR2XKaOGoNHfw,2400
 oarepo_runtime/services/files/service.py,sha256=8DH0Pefr9kilM2JnOb-UYsnqerE8Z1Mu4p6DOJ4j_ZU,608
 oarepo_runtime/services/permissions/__init__.py,sha256=Cgin2Zr1fpaYr-aZcUotdmv0hsrPTUJVQt8ouvU8tuU,95
-oarepo_runtime/services/permissions/generators.py,sha256=OAJ_1W5eiLPkNvSXnWTDq0Z4-FU799qHa9tOufiOL3c,1722
+oarepo_runtime/services/permissions/generators.py,sha256=y_jptL-pHDU91xJsLMR0Bfva5EXcZv6JDLZ1x7XxzKQ,1919
 oarepo_runtime/services/records/__init__.py,sha256=hIoa2fx1AkDr6c-MgY561U2oN9LFeUCtfbVnetpBUOg,78
 oarepo_runtime/services/records/links.py,sha256=gVe-_hGkLtX7pd6sS6jTbRIhBby2FTn9PXyYPy3yxzs,737
 oarepo_runtime/services/relations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -135,9 +135,9 @@ tests/marshmallow_to_json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 tests/marshmallow_to_json/test_datacite_ui_schema.py,sha256=82iLj8nW45lZOUewpWbLX3mpSkpa9lxo-vK-Qtv_1bU,48552
 tests/marshmallow_to_json/test_simple_schema.py,sha256=izZN9p0v6kovtSZ6AdxBYmK_c6ZOti2_z_wPT_zXIr0,1500
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.5.86.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.86.dist-info/METADATA,sha256=F6oJ8K7b-A6hNzXd3xLxqaHkYJEcQaEs6r2NEXTOivA,4720
-oarepo_runtime-1.5.86.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-oarepo_runtime-1.5.86.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.86.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.86.dist-info/RECORD,,
+oarepo_runtime-1.5.88.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.88.dist-info/METADATA,sha256=FtYVZcPcE9i3_AG_61zkkHPUNueJDHR6-7da2B8nd_c,4720
+oarepo_runtime-1.5.88.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+oarepo_runtime-1.5.88.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.88.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.88.dist-info/RECORD,,