fix for mappings lookup, cleanup

Mat-O-Lab · Sep 12, 2024 · 48f361f · 48f361f
1 parent 7556f1d
commit 48f361f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 33 deletions.
diff --git a/ckanext/csvwmapandtransform/action.py b/ckanext/csvwmapandtransform/action.py
@@ -35,14 +35,23 @@ def __init__(self, **kwargs):
 
 
 def csvwmapandtransform_find_mappings(context: Context, data_dict):
-    groups = [entry.name for entry in toolkit.get_action("group_list")({}, {"all_fields": True})]
-    if MAPPING_GROUP in groups:
+    mapping_group_id = next(
+        (
+            entry["id"] if entry["title"] == MAPPING_GROUP else None
+            for entry in toolkit.get_action("group_list")({}, {"all_fields": True})
+        ),
+        None,
+    )
+    # log.info(f"groups=={groups}")
+    if mapping_group_id:
         mapping_group = toolkit.get_action("group_show")(
-            {}, {"id": MAPPING_GROUP, "include_datasets": True}
+            {"ignore_auth": True}, {"id": mapping_group_id, "include_datasets": True}
         )
     else:
         mapping_group = create_group(MAPPING_GROUP)
     packages = mapping_group.get("packages", None)
+    log.info(f"mappings=={packages}")
+
     if packages:
         packages = [
             toolkit.get_action("package_show")({}, {"id": package["id"]})

diff --git a/ckanext/csvwmapandtransform/assets/script.js b/ckanext/csvwmapandtransform/assets/script.js
diff --git a/ckanext/csvwmapandtransform/assets/style.css b/ckanext/csvwmapandtransform/assets/style.css
diff --git a/ckanext/csvwmapandtransform/assets/webassets.yml b/ckanext/csvwmapandtransform/assets/webassets.yml
diff --git a/ckanext/csvwmapandtransform/plugin.py b/ckanext/csvwmapandtransform/plugin.py
@@ -67,7 +67,7 @@ def notify(self, resource: model.Resource):
 
     # IResourceController
 
-    if not toolkit.check_ckan_version("2.10"):
+    if not toolkit.check_ckan_version("2.10") or toolkit.check_ckan_version("2.11"):
 
         def after_create(self, context, resource_dict):
             self.after_resource_create(context, resource_dict)