Rework Code Base for Single Instance

changes/1583.feature

@@ -0,0 +1 @@
+Reworked the Public Publishing Flow to use Core CKAN public/private. This assumes that the Registry and Portal share a database.

ckanext/canada/assets/internal/webassets.yml

@@ -13,11 +13,6 @@ cascading_select:
     - cascading_select.js
   output: canada_internal/%(version)s_cascading_select.js
 
-geomap_zoom:
-  contents:
-    - geomapzoom.js
-  output: canada_internal/%(version)s_geomapzoom.js
-
 organization_edit:
   contents:
     - registry_organization_edit.js

ckanext/canada/assets/public/canada_public.css

@@ -1622,6 +1622,14 @@ body .canada-admin-trash #accordion-group{
   }
 }
 /* BS4+ Fix. TODO: remove after upgrade to BS4+ */
+body .float-right{
+  float: right;
+}
+/* BS4+ Fix. TODO: remove after upgrade to BS4+ */
+body .float-left{
+  float: left;
+}
+/* BS4+ Fix. TODO: remove after upgrade to BS4+ */
 body .modal.fade,
 body .popover.fade{
   animation: modal-fade-out 0.325s ease-in 0s forwards !important;

ckanext/canada/assets/public/webassets.yml

@@ -18,11 +18,6 @@ check_all:
     - check_all.js
   output: canada_public/%(version)s_check_all.js
 
-geomap_zoom:
-  contents:
-    - geomapzoom.js
-  output: canada_public/%(version)s_geomapzoom.js
-
 i18n:
   contents:
     - i18n.js

ckanext/canada/auth.py

@@ -1,40 +1,46 @@
 from ckan.types import Context, DataDict, AuthResult
 
-from ckan.plugins.toolkit import config
+from ckan.plugins.toolkit import config, h
 from ckan.authz import has_user_permission_for_group_or_org
 
 
-def _is_reporting_user(context: Context):
+# type_ignore_reason: underscored method
+def _is_reporting_user(context: Context):  # type: ignore
     if not context.get('user') or not config.get('ckanext.canada.reporting_user'):
         return False
     return context.get('user') == config.get('ckanext.canada.reporting_user')
 
 
+def _registry_org_perms(context: Context, data_dict: DataDict) -> AuthResult:
+    try:
+        if h.is_registry_domain():
+            return {'success': bool(context.get('user'))}
+    except RuntimeError:
+        pass
+    return {'success': True}
+
+
 def view_org_members(context: Context, data_dict: DataDict) -> AuthResult:
     user = context.get('user')
     can_view = has_user_permission_for_group_or_org(
         data_dict.get('id'), user, 'manage_group')
     return {'success': can_view}
 
 
-def registry_jobs_running(context: Context, data_dict: DataDict) -> AuthResult:
-    return {'success': _is_reporting_user(context)}
-
-
 def group_list(context: Context, data_dict: DataDict) -> AuthResult:
-    return {'success': bool(context.get('user'))}
+    return _registry_org_perms(context, data_dict)
 
 
 def group_show(context: Context, data_dict: DataDict) -> AuthResult:
-    return {'success': bool(context.get('user'))}
+    return _registry_org_perms(context, data_dict)
 
 
 def organization_list(context: Context, data_dict: DataDict) -> AuthResult:
-    return {'success': bool(context.get('user'))}
+    return _registry_org_perms(context, data_dict)
 
 
 def organization_show(context: Context, data_dict: DataDict) -> AuthResult:
-    return {'success': bool(context.get('user'))}
+    return _registry_org_perms(context, data_dict)
 
 
 def recently_changed_packages_activity_list(
@@ -44,21 +50,3 @@ def recently_changed_packages_activity_list(
     Legacy, anyone can view.
     """
     return {'success': True}
-
-
-def portal_sync_info(context: Context, data_dict: DataDict) -> AuthResult:
-    """
-    Registry users have to be logged in.
-
-    Anyone on public Portal can access.
-    """
-    # TODO: remove during PortalUpdater removal/rework
-    return {'success': True}
-
-
-def list_out_of_sync_packages(context: Context,
-                              data_dict: DataDict) -> AuthResult:
-    """
-    Only sysadmins can list the out of sync packages.
-    """
-    return {'success': False}