ethyca-fides 2.65.3b2__py2.py3-none-any.whl → 2.66.0rc0__py2.py3-none-any.whl

fides/api/task/manual/manual_task_graph_task.py

@@ -7,6 +7,7 @@ from fides.api.common_exceptions import AwaitingAsyncTaskCallback
 from fides.api.models.attachment import AttachmentType
 from fides.api.models.manual_task import (
     ManualTask,
+    ManualTaskConfig,
     ManualTaskConfigurationType,
     ManualTaskEntityType,
     ManualTaskFieldType,
@@ -66,6 +67,13 @@ class ManualTaskGraphTask(GraphTask):
             self.log_end(ActionType.access)
             return []
 
+        if not self.resources.request.policy.get_rules_for_action(
+            action_type=ActionType.access
+        ):
+            # TODO: This will be changed with Manual Task Dependencies Implementation.
+            self.log_end(ActionType.access)
+            return []
+
         # Check/create manual task instances for ACCESS configs only
         self._ensure_manual_task_instances(
             db,
@@ -82,13 +90,6 @@ class ManualTaskGraphTask(GraphTask):
             ManualTaskConfigurationType.access_privacy_request,
         )
 
-        if not self.resources.request.policy.get_rules_for_action(
-            action_type=ActionType.access
-        ):
-            # TODO: This will be changed with Manual Task Dependencies Implementation.
-            self.log_end(ActionType.access)
-            return []
-
         if submitted_data is not None:
             result: List[Row] = [submitted_data] if submitted_data else []
             self.request_task.access_data = result
@@ -118,28 +119,30 @@ class ManualTaskGraphTask(GraphTask):
 
         for manual_task in manual_tasks:
             # ------------------------------------------------------------------
-            # Short-circuit: if instances already exist for this task & entity
-            # (no matter what config version they were created for) we should reuse
-            # them instead of creating a brand-new one that would result in
-            # duplicates when configurations are versioned after the privacy
-            # request has started.
+            # Check if instances already exist for this task & entity with the SAME config type
+            # This prevents duplicates when configurations are versioned after the privacy
+            # request has started, while allowing different config types (access vs erasure)
+            # to have separate instances.
             # ------------------------------------------------------------------
             existing_task_instance = (
                 db.query(ManualTaskInstance)
+                .join(ManualTaskInstance.config)  # Join to access config information
                 .filter(
                     ManualTaskInstance.task_id == manual_task.id,
                     ManualTaskInstance.entity_id == privacy_request.id,
                     ManualTaskInstance.entity_type
                     == ManualTaskEntityType.privacy_request,
+                    # Only check for instances of the same config type
+                    ManualTaskConfig.config_type == allowed_config_type,
                 )
                 .first()
             )
             if existing_task_instance:
-                # An instance already exists for this privacy request – no need
+                # An instance already exists for this privacy request and config type – no need
                 # to create another one tied to a newer config version.
                 continue
 
-            # Check each active config for instances (now we know none exist yet)
+            # Check each active config for instances (now we know none exist yet for this config type)
             for config in manual_task.configs:
                 if not config.is_current or config.config_type != allowed_config_type:
                     # Skip configs that are not current or not relevant for this request type
@@ -288,6 +291,21 @@ class ManualTaskGraphTask(GraphTask):
             self.log_end(ActionType.erasure)
             return 0
 
+        # Check if any manual tasks have ERASURE configs
+        has_erasure_configs = [
+            config
+            for manual_task in manual_tasks
+            for config in manual_task.configs
+            if config.is_current
+            and config.config_type
+            == ManualTaskConfigurationType.erasure_privacy_request
+        ]
+
+        if not has_erasure_configs:
+            # No erasure configs - complete immediately
+            self.log_end(ActionType.erasure)
+            return 0
+
         # Create ManualTaskInstances for ERASURE configs only
         self._ensure_manual_task_instances(
             db,

fides/api/task/manual/manual_task_utils.py

@@ -217,7 +217,7 @@ def create_manual_task_instances_for_privacy_request(
                             ManualTaskConfigurationType.access_privacy_request,
                             ManualTaskConfigurationType.erasure_privacy_request,
                         ]
-                    ).filter(ManualTaskConfig.is_current.is_(True))
+                    )
                 )
             elif has_access_rules:
                 # Only access rules - only include access configurations

fides/ui-build/static/admin/404.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link data-next-font="" rel="preconnect" href="/" crossorigin="anonymous"/><link rel="preload" href="/_next/static/css/4383759407e86f7a.css" as="style"/><link rel="stylesheet" href="/_next/static/css/4383759407e86f7a.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-42372ed130431b0a.js"></script><script src="/_next/static/chunks/webpack-c97e8d65bd9739ff.js" defer=""></script><script src="/_next/static/chunks/framework-c92fc3344e6fd165.js" defer=""></script><script src="/_next/static/chunks/main-090643377c8254e6.js" defer=""></script><script src="/_next/static/chunks/pages/_app-5de7e675bc2f3bd1.js" defer=""></script><script src="/_next/static/chunks/pages/404-beb4bf835acb4386.js" defer=""></script><script src="/_next/static/zKPvcJ5_1YpLm35m0Fl47/_buildManifest.js" defer=""></script><script src="/_next/static/zKPvcJ5_1YpLm35m0Fl47/_ssgManifest.js" defer=""></script><style>.data-ant-cssinjs-cache-path{content:"";}</style></head><body><div id="__next"><div style="height:100%;display:flex"></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{}},"page":"/404","query":{},"buildId":"zKPvcJ5_1YpLm35m0Fl47","nextExport":true,"autoExport":true,"isFallback":false,"scriptLoader":[]}</script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link data-next-font="" rel="preconnect" href="/" crossorigin="anonymous"/><link rel="preload" href="/_next/static/css/2cadb5f62dcd7c2b.css" as="style"/><link rel="stylesheet" href="/_next/static/css/2cadb5f62dcd7c2b.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-42372ed130431b0a.js"></script><script src="/_next/static/chunks/webpack-ff0cd6bff75588da.js" defer=""></script><script src="/_next/static/chunks/framework-c92fc3344e6fd165.js" defer=""></script><script src="/_next/static/chunks/main-090643377c8254e6.js" defer=""></script><script src="/_next/static/chunks/pages/_app-8b3c5d3146ed7692.js" defer=""></script><script src="/_next/static/chunks/pages/404-aece2c920ea14514.js" defer=""></script><script src="/_next/static/wBqdsil8VpFrsdFaO2xpv/_buildManifest.js" defer=""></script><script src="/_next/static/wBqdsil8VpFrsdFaO2xpv/_ssgManifest.js" defer=""></script><style>.data-ant-cssinjs-cache-path{content:"";}</style></head><body><div id="__next"><div style="height:100%;display:flex"></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{}},"page":"/404","query":{},"buildId":"wBqdsil8VpFrsdFaO2xpv","nextExport":true,"autoExport":true,"isFallback":false,"scriptLoader":[]}</script></body></html>