@redacto.io/consent-sdk-react 9.2.0-beta.1 → 9.2.0-beta.2

package/dist/privacy-center.js

@@ -430,8 +430,8 @@ var translation_default = {
   selectProductsForRequestGeneric: "Select a product to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} purpose",
+  activePurposes_other: "{{count}} purposes",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -758,8 +758,8 @@ var translation_default2 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0989\u09A6\u09CD\u09A6\u09C7\u09B6\u09CD\u09AF",
+  activePurposes_other: "{{count}} \u0989\u09A6\u09CD\u09A6\u09C7\u09B6\u09CD\u09AF",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -1090,8 +1090,8 @@ var translation_default3 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0989\u09A6\u09CD\u09A6\u09C7\u09B6\u09CD\u09AF",
+  activePurposes_other: "{{count}} \u0989\u09A6\u09CD\u09A6\u09C7\u09B6\u09CD\u09AF",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -1422,8 +1422,8 @@ var translation_default4 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0909\u0926\u094D\u0926\u0947\u0936\u094D\u092F",
+  activePurposes_other: "{{count}} \u0909\u0926\u094D\u0926\u0947\u0936\u094D\u092F",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -1754,8 +1754,8 @@ var translation_default5 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0909\u0926\u094D\u0926\u0947\u0936\u094D\u092F",
+  activePurposes_other: "{{count}} \u0909\u0926\u094D\u0926\u0947\u0936\u094D\u092F",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -2086,8 +2086,8 @@ var translation_default6 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0909\u0926\u094D\u0926\u0947\u0936\u094D\u092F",
+  activePurposes_other: "{{count}} \u0909\u0926\u094D\u0926\u0947\u0936\u094D\u092F",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -2418,8 +2418,8 @@ var translation_default7 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0909\u0926\u094D\u0926\u0947\u0936",
+  activePurposes_other: "{{count}} \u0909\u0926\u094D\u0926\u0947\u0936",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -2750,8 +2750,8 @@ var translation_default8 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0AB9\u0AC7\u0AA4\u0AC1",
+  activePurposes_other: "{{count}} \u0AB9\u0AC7\u0AA4\u0AC1\u0A93",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -3085,8 +3085,8 @@ var translation_default9 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0909\u0926\u094D\u0926\u0947\u0936\u094D\u092F",
+  activePurposes_other: "{{count}} \u0909\u0926\u094D\u0926\u0947\u0936\u094D\u092F",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -3417,8 +3417,8 @@ var translation_default10 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0C89\u0CA6\u0CCD\u0CA6\u0CC7\u0CB6",
+  activePurposes_other: "{{count}} \u0C89\u0CA6\u0CCD\u0CA6\u0CC7\u0CB6\u0C97\u0CB3\u0CC1",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -3749,8 +3749,8 @@ var translation_default11 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0645\u0642\u0635\u062F",
+  activePurposes_other: "{{count}} \u0645\u0642\u0627\u0635\u062F",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -4081,8 +4081,8 @@ var translation_default12 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0909\u0926\u094D\u0926\u0947\u0936\u094D\u092F",
+  activePurposes_other: "{{count}} \u0909\u0926\u094D\u0926\u0947\u0936\u094D\u092F",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -4413,8 +4413,8 @@ var translation_default13 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0D09\u0D26\u0D4D\u0D26\u0D47\u0D36\u0D4D\u0D2F\u0D02",
+  activePurposes_other: "{{count}} \u0D09\u0D26\u0D4D\u0D26\u0D47\u0D36\u0D4D\u0D2F\u0D19\u0D4D\u0D19\u0D7E",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -4745,8 +4745,8 @@ var translation_default14 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \uABC4\uABE5\uABDF\uABD7\uABDD",
+  activePurposes_other: "{{count}} \uABC4\uABE5\uABDF\uABD7\uABDD",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -5077,8 +5077,8 @@ var translation_default15 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0909\u0926\u094D\u0926\u0947\u0936",
+  activePurposes_other: "{{count}} \u0909\u0926\u094D\u0926\u0947\u0936",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -5409,8 +5409,8 @@ var translation_default16 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0909\u0926\u094D\u0926\u0947\u0936\u094D\u092F",
+  activePurposes_other: "{{count}} \u0909\u0926\u094D\u0926\u0947\u0936\u094D\u092F",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -5741,8 +5741,8 @@ var translation_default17 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0B09\u0B26\u0B4D\u0B26\u0B47\u0B36\u0B4D\u0B5F",
+  activePurposes_other: "{{count}} \u0B09\u0B26\u0B4D\u0B26\u0B47\u0B36\u0B4D\u0B5F\u0B17\u0B41\u0B21\u0B3C\u0B3F\u0B15",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -6073,8 +6073,8 @@ var translation_default18 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0A2E\u0A15\u0A38\u0A26",
+  activePurposes_other: "{{count}} \u0A2E\u0A15\u0A38\u0A26",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -6405,8 +6405,8 @@ var translation_default19 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u092A\u094D\u0930\u092F\u094B\u091C\u0928\u092E\u094D",
+  activePurposes_other: "{{count}} \u092A\u094D\u0930\u092F\u094B\u091C\u0928\u093E\u0928\u093F",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -6737,8 +6737,8 @@ var translation_default20 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u1C6F\u1C77\u1C6E\u1C70\u1C5F\u1C5B",
+  activePurposes_other: "{{count}} \u1C6F\u1C77\u1C6E\u1C70\u1C5F\u1C5B",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -7069,8 +7069,8 @@ var translation_default21 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0645\u0642\u0635\u062F",
+  activePurposes_other: "{{count}} \u0645\u0642\u0635\u062F",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -7401,8 +7401,8 @@ var translation_default22 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0BA8\u0BCB\u0B95\u0BCD\u0B95\u0BAE\u0BCD",
+  activePurposes_other: "{{count}} \u0BA8\u0BCB\u0B95\u0BCD\u0B95\u0B99\u0BCD\u0B95\u0BB3\u0BCD",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -7733,8 +7733,8 @@ var translation_default23 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0C09\u0C26\u0C4D\u0C26\u0C47\u0C36\u0C4D\u0C2F\u0C02",
+  activePurposes_other: "{{count}} \u0C09\u0C26\u0C4D\u0C26\u0C47\u0C36\u0C4D\u0C2F\u0C3E\u0C32\u0C41",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -8065,8 +8065,8 @@ var translation_default24 = {
   selectProductsForRequestGeneric: "Select one or more products to continue",
   yourData: "Your data",
   actingOnBehalfOf: "Acting on behalf of {{nominator}}",
-  activePurposes_one: "{{count}} active purpose",
-  activePurposes_other: "{{count}} active purposes",
+  activePurposes_one: "{{count}} \u0645\u0642\u0635\u062F",
+  activePurposes_other: "{{count}} \u0645\u0642\u0627\u0635\u062F",
   autoSelected: "Auto-selected",
   noProductsAvailable: "No products available",
   noProductsAvailableDescription: "You have no consents to manage yet.",
@@ -8692,7 +8692,7 @@ var getFormData = async (organizationId, workspaceId, contact, _isPopup, useSess
     return null;
   }
 };
-var createCaseRequestUnsafe = async (organizationId, workspaceId, data, _isPopup, useSessionAuth, authContext, consentClient) => {
+var createCaseRequest = async (organizationId, workspaceId, data, _isPopup, useSessionAuth, authContext, consentClient) => {
   try {
     if (useSessionAuth) {
       return await createCaseRequestServer(organizationId, workspaceId, data, void 0, true, consentClient);
@@ -8713,31 +8713,20 @@ var createCaseRequestUnsafe = async (organizationId, workspaceId, data, _isPopup
     const shouldRetry = await handleClientAuthError(error, organizationId, workspaceId, authContext, consentClient);
     if (shouldRetry) {
       const newAuthToken = sessionStorage.getItem("access_token") || (authContext == null ? void 0 : authContext.accessToken) || "";
-      return await createCaseRequestServer(
-        organizationId,
-        workspaceId,
-        data,
-        newAuthToken,
-        false,
-        consentClient
-      );
+      try {
+        return await createCaseRequestServer(
+          organizationId,
+          workspaceId,
+          data,
+          newAuthToken,
+          false,
+          consentClient
+        );
+      } catch (retryError) {
+        console.error("Error creating case request after auth refresh:", retryError);
+        return null;
+      }
     }
-    console.error("Error creating case request:", error);
-    throw error;
-  }
-};
-var createCaseRequest = async (organizationId, workspaceId, data, isPopup, useSessionAuth, authContext, consentClient) => {
-  try {
-    return await createCaseRequestUnsafe(
-      organizationId,
-      workspaceId,
-      data,
-      isPopup,
-      useSessionAuth,
-      authContext,
-      consentClient
-    );
-  } catch (error) {
     console.error("Error creating case request:", error);
     return null;
   }
@@ -18668,7 +18657,7 @@ function ProductSelectionSection({
         children: [
           directGroups.map((group) => {
             const key = productGroupKey(group);
-            const activeCount = buildGroupPurposes(group).length;
+            const purposeCount = buildGroupPurposes(group).length;
             return /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
               ProductChip,
               {
@@ -18676,7 +18665,7 @@ function ProductSelectionSection({
                 isSelected: selectedProductKey === key || isSingleGroup,
                 isLocked: isSingleGroup,
                 onSelect,
-                activePurposesLabel: t("activePurposes", { count: activeCount })
+                activePurposesLabel: t("activePurposes", { count: purposeCount })
               },
               key
             );
@@ -18684,7 +18673,7 @@ function ProductSelectionSection({
           nominatedGroups.map((group) => {
             var _a2, _b2, _c, _d;
             const key = productGroupKey(group);
-            const activeCount = buildGroupPurposes(group).length;
+            const purposeCount = buildGroupPurposes(group).length;
             const nominatorLabel = (_d = (_c = (_a2 = group.nominator) == null ? void 0 : _a2.name) != null ? _c : (_b2 = group.nominator) == null ? void 0 : _b2.email) != null ? _d : "";
             return /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
               ProductChip,
@@ -18696,7 +18685,7 @@ function ProductSelectionSection({
                 nominationSuffix: t("nominationChipSuffix", {
                   nominator: nominatorLabel
                 }),
-                activePurposesLabel: t("activePurposes", { count: activeCount })
+                activePurposesLabel: t("activePurposes", { count: purposeCount })
               },
               key
             );
@@ -18999,227 +18988,14 @@ var import_react_i18next29 = require("react-i18next");
 var import_lucide_react15 = require("lucide-react");
 var import_jsx_runtime59 = require("react/jsx-runtime");
 var getVar20 = (varName) => `var(${varName})`;
-var SummaryCard = ({
-  children,
-  backgroundColor,
-  borderColor
-}) => /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
-  "div",
-  {
-    style: {
-      marginTop: pcStyles.mtMd.marginTop,
-      padding: pcStyles.pSm.padding,
-      ...backgroundColor === void 0 ? pcStyles.bgSecondary : { backgroundColor },
-      borderRadius: pcStyles.borderRadiusMd,
-      border: `1px solid ${borderColor != null ? borderColor : pcStyles.borderColor}`
-    },
-    children
-  }
-);
 function RequestSubmit({
   result,
   contact,
   onCreateRequest,
-  onRetry,
-  retryingGroupKeys,
   revokeConsentOnFulfilment,
   revokedPurposeNames
 }) {
   const { t } = (0, import_react_i18next29.useTranslation)();
-  const succeeded = result.succeeded;
-  const failed = result.failed;
-  const successCount = succeeded.length;
-  const hasFailures = failed.length > 0;
-  const isSingleCase = successCount === 1 && !hasFailures;
-  const renderCaseList = () => {
-    if (successCount === 0) {
-      return null;
-    }
-    if (isSingleCase) {
-      const only = succeeded[0];
-      return /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(SummaryCard, { children: [
-        only.product_name !== "" && /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
-          PCText,
-          {
-            size: "sm",
-            weight: "medium",
-            style: {
-              marginBottom: pcStyles.mbXs.marginBottom,
-              wordBreak: "break-word"
-            },
-            children: only.product_name
-          }
-        ),
-        /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(
-          PCText,
-          {
-            size: "base",
-            weight: "bold",
-            style: {
-              color: pcStyles.primary,
-              wordBreak: "break-word",
-              marginBottom: pcStyles.mbXs.marginBottom
-            },
-            className: "pc-text-responsive",
-            children: [
-              t("caseID"),
-              ": ",
-              only.case_id
-            ]
-          }
-        ),
-        /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(PCText, { size: "xs", weight: "medium", color: "secondary", children: [
-          t("saveThisID"),
-          "."
-        ] })
-      ] });
-    }
-    return /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(SummaryCard, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
-        PCText,
-        {
-          size: "sm",
-          weight: "semibold",
-          style: {
-            color: pcStyles.primary,
-            marginBottom: pcStyles.mbSm.marginBottom
-          },
-          children: t("casesCreatedCount", { count: successCount })
-        }
-      ),
-      /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
-        "ul",
-        {
-          style: {
-            margin: 0,
-            padding: 0,
-            listStyle: "none",
-            display: "flex",
-            flexDirection: "column",
-            gap: getVar20("--pc-spacing-xs")
-          },
-          children: succeeded.map((entry) => /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(
-            "li",
-            {
-              style: { wordBreak: "break-word" },
-              children: [
-                /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(PCText, { size: "sm", weight: "medium", children: entry.product_name }),
-                /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(
-                  PCText,
-                  {
-                    size: "sm",
-                    weight: "bold",
-                    style: { color: pcStyles.primary, wordBreak: "break-word" },
-                    children: [
-                      t("caseID"),
-                      ": ",
-                      entry.case_id
-                    ]
-                  }
-                )
-              ]
-            },
-            `${entry.group_key}:${entry.case_id}`
-          ))
-        }
-      ),
-      /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(
-        PCText,
-        {
-          size: "xs",
-          weight: "medium",
-          color: "secondary",
-          style: { marginTop: pcStyles.mtSm.marginTop },
-          children: [
-            t("saveThisID"),
-            "."
-          ]
-        }
-      )
-    ] });
-  };
-  const renderFailures = () => {
-    if (!hasFailures) {
-      return null;
-    }
-    return /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(
-      SummaryCard,
-      {
-        backgroundColor: pcStyles.warningBg,
-        borderColor: pcStyles.warningBorder,
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
-            PCText,
-            {
-              size: "sm",
-              weight: "semibold",
-              style: {
-                color: pcStyles.warningText,
-                marginBottom: pcStyles.mbSm.marginBottom
-              },
-              children: t("someRequestsFailed")
-            }
-          ),
-          /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
-            "ul",
-            {
-              style: {
-                margin: 0,
-                padding: 0,
-                listStyle: "none",
-                display: "flex",
-                flexDirection: "column",
-                gap: getVar20("--pc-spacing-sm")
-              },
-              children: failed.map((entry) => {
-                const isRetrying = (retryingGroupKeys == null ? void 0 : retryingGroupKeys.has(entry.group_key)) === true;
-                return /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(
-                  "li",
-                  {
-                    style: {
-                      display: "flex",
-                      alignItems: "flex-start",
-                      justifyContent: "space-between",
-                      gap: getVar20("--pc-spacing-sm"),
-                      flexWrap: "wrap"
-                    },
-                    children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(
-                        "div",
-                        {
-                          style: {
-                            minWidth: 0,
-                            flex: 1,
-                            wordBreak: "break-word"
-                          },
-                          children: [
-                            /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(PCText, { size: "sm", weight: "medium", children: entry.product_name }),
-                            /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(PCText, { size: "xs", weight: "medium", color: "secondary", children: entry.error })
-                          ]
-                        }
-                      ),
-                      onRetry !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
-                        PCButton,
-                        {
-                          variant: "outline",
-                          size: "sm",
-                          onClick: () => onRetry(entry.group_key),
-                          disabled: isRetrying,
-                          isLoading: isRetrying,
-                          children: isRetrying ? t("retrying") : t("retry")
-                        }
-                      )
-                    ]
-                  },
-                  entry.group_key
-                );
-              })
-            }
-          )
-        ]
-      }
-    );
-  };
   return /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)("div", { style: { marginTop: pcStyles.mtMd.marginTop, position: "relative" }, children: [
     /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
       "img",
@@ -19327,8 +19103,54 @@ function RequestSubmit({
                             ]
                           }
                         ),
-                        renderCaseList(),
-                        renderFailures(),
+                        /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(
+                          "div",
+                          {
+                            style: {
+                              marginTop: pcStyles.mtMd.marginTop,
+                              padding: pcStyles.pSm.padding,
+                              ...pcStyles.bgSecondary,
+                              borderRadius: pcStyles.borderRadiusMd,
+                              border: `1px solid ${pcStyles.borderColor}`
+                            },
+                            children: [
+                              result.product_name !== "" && /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
+                                PCText,
+                                {
+                                  size: "sm",
+                                  weight: "medium",
+                                  style: {
+                                    marginBottom: pcStyles.mbXs.marginBottom,
+                                    wordBreak: "break-word"
+                                  },
+                                  children: result.product_name
+                                }
+                              ),
+                              /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(
+                                PCText,
+                                {
+                                  size: "base",
+                                  weight: "bold",
+                                  style: {
+                                    color: pcStyles.primary,
+                                    wordBreak: "break-word",
+                                    marginBottom: pcStyles.mbXs.marginBottom
+                                  },
+                                  className: "pc-text-responsive",
+                                  children: [
+                                    t("caseID"),
+                                    ": ",
+                                    result.case_id
+                                  ]
+                                }
+                              ),
+                              /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(PCText, { size: "xs", weight: "medium", color: "secondary", children: [
+                                t("saveThisID"),
+                                "."
+                              ] })
+                            ]
+                          }
+                        ),
                         /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(
                           "div",
                           {
@@ -19485,12 +19307,12 @@ function RequestSubmit({
 var import_fi = require("react-icons/fi");
 var import_jsx_runtime60 = require("react/jsx-runtime");
 var getVar21 = (varName) => `var(${varName})`;
-var GROUPED_REQUEST_TYPES = /* @__PURE__ */ new Set([
+var PRODUCT_SCOPED_REQUEST_TYPES = /* @__PURE__ */ new Set([
   "ACCESS" /* ACCESS */,
   "erasure" /* ERASURE */,
   "CORRECTION" /* CORRECTION */
 ]);
-var isGroupedRequestType = (rt) => rt !== null && GROUPED_REQUEST_TYPES.has(rt);
+var isProductScopedRequestType = (rt) => rt !== null && PRODUCT_SCOPED_REQUEST_TYPES.has(rt);
 var extractCaseId = (response) => {
   var _a, _b, _c, _d;
   if (!response) {
@@ -19545,28 +19367,17 @@ function Form({
     additionalNote: "",
     confirmCheckBox: false
   });
-  const [erasurePurposes, setErasurePurposes] = (0, import_react39.useState)([]);
-  const [accessPurposes, setAccessPurposes] = (0, import_react39.useState)([]);
   const [selectedProductKey, setSelectedProductKey] = (0, import_react39.useState)(
     null
   );
-  const [purposesByGroupKey, setPurposesByGroupKey] = (0, import_react39.useState)(/* @__PURE__ */ new Map());
+  const [selectedPurposes, setSelectedPurposes] = (0, import_react39.useState)([]);
   const [selectedCorrectionElements, setSelectedCorrectionElements] = (0, import_react39.useState)([]);
-  const [uniqueDataElements, setUniqueDataElements] = (0, import_react39.useState)(
-    []
-  );
   const [correctionValues, setCorrectionValues] = (0, import_react39.useState)({});
-  const [correctionElementsByGroupKey, setCorrectionElementsByGroupKey] = (0, import_react39.useState)(/* @__PURE__ */ new Map());
-  const [correctionValuesByGroupKey, setCorrectionValuesByGroupKey] = (0, import_react39.useState)(/* @__PURE__ */ new Map());
-  const [batchResult, setBatchResult] = (0, import_react39.useState)(
+  const [submittedCase, setSubmittedCase] = (0, import_react39.useState)(
     null
   );
-  const [retryingGroupKeys, setRetryingGroupKeys] = (0, import_react39.useState)(
-    /* @__PURE__ */ new Set()
-  );
   const fileInputRef = (0, import_react39.useRef)(null);
   const englishDataRef = (0, import_react39.useRef)(null);
-  const selectionsToRestoreRef = (0, import_react39.useRef)(null);
   const [uploadedDocumentId, setUploadedDocumentId] = (0, import_react39.useState)([]);
   const [uploadedDocuments, setUploadedDocuments] = (0, import_react39.useState)([]);
   const [isDocumentUploading, setIsDocumentUploading] = (0, import_react39.useState)(false);
@@ -19590,127 +19401,30 @@ function Form({
       fileInputRef.current.value = "";
     }
   };
-  const useGroupedRender = (0, import_react39.useMemo)(
-    () => Array.isArray(data == null ? void 0 : data.direct_groups),
-    [data]
-  );
-  (0, import_react39.useEffect)(() => {
-    if (data && !useGroupedRender) {
-      console.warn(
-        "[consent-sdk] Backend response lacks direct_groups; falling back to legacy flat-purposes render. Update consent-server to Phase 1 to enable product-scoped DSAR."
-      );
-    }
-  }, [data, useGroupedRender]);
   const allGroups = (0, import_react39.useMemo)(() => {
     var _a2, _b2;
-    if (!useGroupedRender || !data) {
+    if (!data) {
       return [];
     }
     return [...(_a2 = data.direct_groups) != null ? _a2 : [], ...(_b2 = data.nominated_groups) != null ? _b2 : []];
-  }, [data, useGroupedRender]);
-  const totalGroups = (0, import_react39.useMemo)(
-    () => {
-      var _a2, _b2, _c2, _d2;
-      return ((_b2 = (_a2 = data == null ? void 0 : data.direct_groups) == null ? void 0 : _a2.length) != null ? _b2 : 0) + ((_d2 = (_c2 = data == null ? void 0 : data.nominated_groups) == null ? void 0 : _c2.length) != null ? _d2 : 0);
-    },
-    [data]
-  );
-  const skipProductStep = totalGroups === 1;
-  const selectedGroups = (0, import_react39.useMemo)(() => {
-    var _a2, _b2, _c2;
+  }, [data]);
+  const skipProductStep = allGroups.length === 1;
+  const selectedGroup = (0, import_react39.useMemo)(() => {
+    var _a2, _b2;
     if (selectedProductKey) {
-      const group = allGroups.find(
-        (g) => productGroupKey(g) === selectedProductKey
-      );
-      if (group) {
-        return [group];
-      }
+      return (_a2 = allGroups.find((g) => productGroupKey(g) === selectedProductKey)) != null ? _a2 : null;
     }
     if (skipProductStep) {
-      const onlyGroup = (_c2 = (_a2 = data == null ? void 0 : data.direct_groups) == null ? void 0 : _a2[0]) != null ? _c2 : (_b2 = data == null ? void 0 : data.nominated_groups) == null ? void 0 : _b2[0];
-      return onlyGroup ? [onlyGroup] : [];
+      return (_b2 = allGroups[0]) != null ? _b2 : null;
     }
-    return [];
-  }, [allGroups, selectedProductKey, skipProductStep, data]);
+    return null;
+  }, [allGroups, selectedProductKey, skipProductStep]);
   const handleProductSelect = (0, import_react39.useCallback)(
     (key, _group) => {
       setSelectedProductKey(key);
     },
     []
   );
-  const setPurposesForGroup = (0, import_react39.useCallback)(
-    (key, updated) => {
-      setPurposesByGroupKey((prev) => {
-        const next = new Map(prev);
-        next.set(key, updated);
-        return next;
-      });
-    },
-    []
-  );
-  const setCorrectionElementsForGroup = (0, import_react39.useCallback)(
-    (key, values) => {
-      setCorrectionElementsByGroupKey((prev) => {
-        const next = new Map(prev);
-        next.set(key, values);
-        return next;
-      });
-    },
-    []
-  );
-  const setCorrectionValuesForGroup = (0, import_react39.useCallback)(
-    (key, values) => {
-      setCorrectionValuesByGroupKey((prev) => {
-        const next = new Map(prev);
-        next.set(key, values);
-        return next;
-      });
-    },
-    []
-  );
-  (0, import_react39.useEffect)(() => {
-    if (data == null ? void 0 : data.purposes) {
-      if (!Array.isArray(data.purposes)) {
-        console.warn("Form data purposes is not an array:", data.purposes);
-        return;
-      }
-      const extractedPurposes = data.purposes.map((p) => p == null ? void 0 : p.purpose).filter((p) => p !== null && p !== void 0);
-      if (extractedPurposes.length === 0) {
-        console.warn("No valid purposes found in form data");
-        return;
-      }
-      const uniqueElements = /* @__PURE__ */ new Map();
-      extractedPurposes.forEach((purpose) => {
-        const validDataElements = Array.isArray(purpose.data_elements) ? purpose.data_elements.filter(
-          (element) => element !== null && element !== void 0 && element.uuid
-        ) : [];
-        validDataElements.forEach((element) => {
-          if (element.uuid && !uniqueElements.has(element.uuid)) {
-            uniqueElements.set(element.uuid, {
-              ...element,
-              purposeName: purpose.name
-            });
-          }
-        });
-      });
-      setUniqueDataElements(
-        Array.from(uniqueElements.values())
-      );
-      const processedPurposes = extractedPurposes.map((p) => {
-        const validDataElements = Array.isArray(p.data_elements) ? p.data_elements.filter((de) => de !== null && de !== void 0 && de.uuid).map((de) => ({
-          ...de,
-          selected: false
-        })) : [];
-        return {
-          ...p,
-          selected: false,
-          data_elements: validDataElements
-        };
-      }).filter((p) => p.data_elements.length > 0);
-      setAccessPurposes(processedPurposes);
-      setErasurePurposes(processedPurposes);
-    }
-  }, [data]);
   const fetchAndApplyTranslations = (0, import_react39.useCallback)(async (langValue) => {
     if (!organizationId || !workspaceId || !data) {
       return;
@@ -19735,28 +19449,6 @@ function Form({
         toast.info(t("translationNotAvailable"));
         return;
       }
-      const currentAccessSelections = /* @__PURE__ */ new Map();
-      const currentErasureSelections = /* @__PURE__ */ new Map();
-      accessPurposes.forEach((purpose) => {
-        const dataElementSelections = /* @__PURE__ */ new Map();
-        purpose.data_elements.forEach((de) => {
-          dataElementSelections.set(de.uuid, de.selected);
-        });
-        currentAccessSelections.set(purpose.uuid, {
-          purposeSelected: purpose.selected,
-          dataElementSelections
-        });
-      });
-      erasurePurposes.forEach((purpose) => {
-        const dataElementSelections = /* @__PURE__ */ new Map();
-        purpose.data_elements.forEach((de) => {
-          dataElementSelections.set(de.uuid, de.selected);
-        });
-        currentErasureSelections.set(purpose.uuid, {
-          purposeSelected: purpose.selected,
-          dataElementSelections
-        });
-      });
       if (!translatedFormData.purposes || !Array.isArray(translatedFormData.purposes) || translatedFormData.purposes.length === 0) {
         toast.info(t("translationNotAvailable"));
         return;
@@ -19771,119 +19463,51 @@ function Form({
         });
         setSelectedGrievances(updatedGrievanceSelections);
       }
-      selectionsToRestoreRef.current = {
-        access: currentAccessSelections,
-        erasure: currentErasureSelections
-      };
     } catch (error) {
       console.error("Error fetching translation:", error);
       toast.info(t("translationNotAvailable"));
     } finally {
       setIsTranslating(false);
     }
-  }, [organizationId, workspaceId, data, formData.contact, isPopup, isCaseManagementContext, authContext, consentClient, accessPurposes, erasurePurposes, selectedGrievances, t]);
+  }, [organizationId, workspaceId, data, formData.contact, isPopup, isCaseManagementContext, authContext, consentClient, selectedGrievances, t]);
   (0, import_react39.useEffect)(() => {
-    setSelectedCorrectionElements([]);
-    setCorrectionValues({});
+    if (!skipProductStep) {
+      setSelectedProductKey(null);
+    }
     setNominationData({ nominee_email: "", nominee_mobile: "" });
-    setSelectedProductKey(null);
-    setPurposesByGroupKey(/* @__PURE__ */ new Map());
-    setCorrectionElementsByGroupKey(/* @__PURE__ */ new Map());
-    setCorrectionValuesByGroupKey(/* @__PURE__ */ new Map());
-    if ((data == null ? void 0 : data.purposes) && Array.isArray(data.purposes)) {
-      const extractedPurposes = data.purposes.map((p) => p == null ? void 0 : p.purpose).filter((p) => p !== null && p !== void 0);
-      const processedPurposes = extractedPurposes.map((p) => {
-        const validDataElements = Array.isArray(p.data_elements) ? p.data_elements.filter((de) => de !== null && de !== void 0 && de.uuid).map((de) => ({
-          ...de,
-          selected: false
-        })) : [];
-        return {
-          ...p,
-          selected: false,
-          data_elements: validDataElements
-        };
-      }).filter((p) => p.data_elements.length > 0);
-      setAccessPurposes(processedPurposes);
-      setErasurePurposes(processedPurposes);
-      if (requestType === "grievance" /* GRIEVANCE */ && grievanceOptions.length > 0) {
-        const resetGrievances = grievanceOptions.reduce(
-          (acc, option) => {
-            acc[option.value] = false;
-            return acc;
-          },
-          {}
-        );
-        setSelectedGrievances(resetGrievances);
-      }
+    if (requestType === "grievance" /* GRIEVANCE */ && grievanceOptions.length > 0) {
+      const resetGrievances = grievanceOptions.reduce(
+        (acc, option) => {
+          acc[option.value] = false;
+          return acc;
+        },
+        {}
+      );
+      setSelectedGrievances(resetGrievances);
     }
-  }, [requestType, data, grievanceOptions]);
+  }, [requestType, grievanceOptions, skipProductStep]);
   (0, import_react39.useEffect)(() => {
-    var _a2, _b2, _c2;
     if (!skipProductStep) {
       return;
     }
-    const onlyGroup = (_c2 = (_a2 = data == null ? void 0 : data.direct_groups) == null ? void 0 : _a2[0]) != null ? _c2 : (_b2 = data == null ? void 0 : data.nominated_groups) == null ? void 0 : _b2[0];
+    const onlyGroup = allGroups[0];
     if (!onlyGroup) {
       return;
     }
     const key = productGroupKey(onlyGroup);
     setSelectedProductKey((prev) => prev === key ? prev : key);
-  }, [skipProductStep, data, requestType]);
-  (0, import_react39.useEffect)(() => {
-    setPurposesByGroupKey((prev) => {
-      const next = new Map(prev);
-      const selectedKeys = /* @__PURE__ */ new Set();
-      for (const group of selectedGroups) {
-        const key = productGroupKey(group);
-        selectedKeys.add(key);
-        if (!next.has(key)) {
-          next.set(key, buildGroupPurposes(group));
-        }
-      }
-      for (const existingKey of Array.from(next.keys())) {
-        if (!selectedKeys.has(existingKey)) {
-          next.delete(existingKey);
-        }
-      }
-      return next;
-    });
-  }, [selectedGroups]);
+  }, [skipProductStep, allGroups, requestType]);
   (0, import_react39.useEffect)(() => {
-    setCorrectionElementsByGroupKey((prev) => {
-      const next = new Map(prev);
-      const selectedKeys = /* @__PURE__ */ new Set();
-      for (const group of selectedGroups) {
-        const key = productGroupKey(group);
-        selectedKeys.add(key);
-        if (!next.has(key)) {
-          next.set(key, []);
-        }
-      }
-      for (const existingKey of Array.from(next.keys())) {
-        if (!selectedKeys.has(existingKey)) {
-          next.delete(existingKey);
-        }
-      }
-      return next;
-    });
-    setCorrectionValuesByGroupKey((prev) => {
-      const next = new Map(prev);
-      const selectedKeys = /* @__PURE__ */ new Set();
-      for (const group of selectedGroups) {
-        const key = productGroupKey(group);
-        selectedKeys.add(key);
-        if (!next.has(key)) {
-          next.set(key, {});
-        }
-      }
-      for (const existingKey of Array.from(next.keys())) {
-        if (!selectedKeys.has(existingKey)) {
-          next.delete(existingKey);
-        }
-      }
-      return next;
-    });
-  }, [selectedGroups]);
+    if (!selectedGroup || !isProductScopedRequestType(requestType)) {
+      setSelectedPurposes([]);
+      setSelectedCorrectionElements([]);
+      setCorrectionValues({});
+      return;
+    }
+    setSelectedPurposes(buildGroupPurposes(selectedGroup));
+    setSelectedCorrectionElements([]);
+    setCorrectionValues({});
+  }, [selectedGroup, requestType]);
   (0, import_react39.useEffect)(() => {
     const handleLanguageChanged = () => {
       const lang = i18n_default.language;
@@ -20002,56 +19626,22 @@ function Form({
     if (!isFormValid) {
       return;
     }
-    void handleSubmit(false);
+    void handleSubmit(requestType === "erasure" /* ERASURE */);
   };
   const handleSubmit = async (revokeConsent = false) => {
-    var _a2, _b2;
+    var _a2, _b2, _c2, _d2;
     if (!isFormValid) {
       return;
     }
-    if (useGroupedRender && isGroupedRequestType(requestType) && selectedGroups.length > 0) {
-      try {
-        setIsLoading(true);
-        const result = await submitBatchCases(revokeConsent);
-        if (result.succeeded.length > 0) {
-          queryClient.invalidateQueries({ queryKey: ["caseHistory"] });
-          setBatchResult(result);
-          setIsSubmitted(true);
-          if (result.failed.length === 0) {
-            toast.success(t("requestSubmittedSuccess"));
-          } else {
-            toast.error(t("requestSubmissionFailed"));
-          }
-          if (isPopup) {
-            onCreateRequest == null ? void 0 : onCreateRequest();
-          }
-        } else {
-          toast.error(t("requestSubmissionFailed"));
-        }
-      } catch (error) {
-        console.error("Error submitting batch request:", error);
-        toast.error(t("submissionFailed"));
-      } finally {
-        setIsLoading(false);
-        if (isPopup) {
-          onClose == null ? void 0 : onClose();
-        }
-      }
-      return;
-    }
+    const isProductScoped = isProductScopedRequestType(requestType);
+    const anchorGroup = isProductScoped ? selectedGroup : null;
     const requestDetails = {
       purposes: [],
       correction_data: [],
       grievance_types: []
     };
-    if (requestType === "ACCESS" /* ACCESS */) {
-      requestDetails.purposes = accessPurposes.filter((p) => p.selected || p.data_elements.some((de) => de.selected)).map((p) => ({
-        purpose_uuid: p.uuid,
-        data_element_uuids: p.data_elements.filter((de) => de.selected).map((de) => de.uuid)
-      }));
-    }
-    if (requestType === "erasure" /* ERASURE */) {
-      requestDetails.purposes = erasurePurposes.filter((p) => p.selected || p.data_elements.some((de) => de.selected)).map((p) => ({
+    if (requestType === "ACCESS" /* ACCESS */ || requestType === "erasure" /* ERASURE */) {
+      requestDetails.purposes = selectedPurposes.filter((p) => p.selected || p.data_elements.some((de) => de.selected)).map((p) => ({
         purpose_uuid: p.uuid,
         data_element_uuids: p.data_elements.filter((de) => de.selected).map((de) => de.uuid)
       }));
@@ -20059,11 +19649,11 @@ function Form({
     if (requestType === "CORRECTION" /* CORRECTION */) {
       requestDetails.correction_data = selectedCorrectionElements.map(
         (name) => {
-          var _a3, _b3;
+          var _a3, _b3, _c3, _d3;
           return {
             name: getEnglishDataElementName(name),
-            curr_value: ((_a3 = correctionValues[name]) == null ? void 0 : _a3.current) || "",
-            new_value: ((_b3 = correctionValues[name]) == null ? void 0 : _b3.updated) || ""
+            curr_value: (_b3 = (_a3 = correctionValues[name]) == null ? void 0 : _a3.current) != null ? _b3 : "",
+            new_value: (_d3 = (_c3 = correctionValues[name]) == null ? void 0 : _c3.updated) != null ? _d3 : ""
           };
         }
       );
@@ -20088,7 +19678,9 @@ function Form({
       request_details: requestDetails,
       time_period: requestType === "ACCESS" /* ACCESS */ ? parseInt(timePeriod || "30", 10) : 0,
       requestor_note: formData.additionalNote || "",
-      ...requestType === "erasure" /* ERASURE */ ? { revoke_consent_on_fulfilment: revokeConsent } : {}
+      ...requestType === "erasure" /* ERASURE */ ? { revoke_consent_on_fulfilment: revokeConsent } : {},
+      ...anchorGroup ? { product_uuid: anchorGroup.product_uuid } : {},
+      ...(anchorGroup == null ? void 0 : anchorGroup.nominator) ? { data_principal_uuid: anchorGroup.nominator.uuid } : {}
     };
     try {
       setIsLoading(true);
@@ -20106,25 +19698,17 @@ function Form({
       const caseId = (extracted == null ? void 0 : extracted.case_id) || (extracted == null ? void 0 : extracted.uuid) || null;
       if (caseId) {
         queryClient.invalidateQueries({ queryKey: ["caseHistory"] });
-        const productInfo = useGroupedRender && selectedGroups.length === 1 ? {
-          group_key: productGroupKey(selectedGroups[0]),
-          product_uuid: selectedGroups[0].product_uuid,
-          product_name: selectedGroups[0].product_name
-        } : { group_key: "", product_uuid: "", product_name: "" };
-        setBatchResult({
-          succeeded: [
-            {
-              ...productInfo,
-              case_id: caseId,
-              uuid: (_b2 = extracted == null ? void 0 : extracted.uuid) != null ? _b2 : caseId
-            }
-          ],
-          failed: []
+        setSubmittedCase({
+          case_id: caseId,
+          uuid: (_b2 = extracted == null ? void 0 : extracted.uuid) != null ? _b2 : caseId,
+          product_name: (_c2 = anchorGroup == null ? void 0 : anchorGroup.product_name) != null ? _c2 : "",
+          product_uuid: (_d2 = anchorGroup == null ? void 0 : anchorGroup.product_uuid) != null ? _d2 : ""
         });
         setIsSubmitted(true);
         toast.success(t("requestSubmittedSuccess"));
         if (isPopup) {
           onCreateRequest == null ? void 0 : onCreateRequest();
+          onClose == null ? void 0 : onClose();
         }
       } else {
         toast.error(t("requestSubmissionFailed"));
@@ -20135,251 +19719,49 @@ function Form({
       toast.error(message);
     } finally {
       setIsLoading(false);
-      if (isPopup) {
-        onClose == null ? void 0 : onClose();
-      }
     }
   };
-  const submitSingleProductCase = async (group, revokeConsent) => {
-    var _a2, _b2, _c2;
-    const groupKey = productGroupKey(group);
-    const groupPurposes = (_a2 = purposesByGroupKey.get(groupKey)) != null ? _a2 : [];
-    const purposesPayload = requestType === "CORRECTION" /* CORRECTION */ ? [] : groupPurposes.filter(
-      (p) => p.selected || p.data_elements.some((de) => de.selected)
-    ).map((p) => ({
-      purpose_uuid: p.uuid,
-      data_element_uuids: p.data_elements.filter((de) => de.selected).map((de) => de.uuid)
-    }));
-    const groupSelectedNames = requestType === "CORRECTION" /* CORRECTION */ ? (_b2 = correctionElementsByGroupKey.get(groupKey)) != null ? _b2 : [] : [];
-    const groupValues = requestType === "CORRECTION" /* CORRECTION */ ? (_c2 = correctionValuesByGroupKey.get(groupKey)) != null ? _c2 : {} : {};
-    const correctionPayload = requestType === "CORRECTION" /* CORRECTION */ ? groupSelectedNames.map((name) => {
-      var _a3, _b3, _c3, _d2;
-      return {
-        name: getEnglishDataElementName(name),
-        curr_value: (_b3 = (_a3 = groupValues[name]) == null ? void 0 : _a3.current) != null ? _b3 : "",
-        new_value: (_d2 = (_c3 = groupValues[name]) == null ? void 0 : _c3.updated) != null ? _d2 : ""
-      };
-    }) : [];
-    const payload = {
-      name: " ",
-      contact: formData.contact,
-      request_type: requestType == null ? void 0 : requestType.toLowerCase(),
-      uuid: formData.uuid,
-      supporting_docs_uuids: [...uploadedDocumentId],
-      request_details: {
-        purposes: purposesPayload,
-        correction_data: correctionPayload,
-        grievance_types: []
-      },
-      time_period: requestType === "ACCESS" /* ACCESS */ ? parseInt(timePeriod || "30", 10) : 0,
-      requestor_note: formData.additionalNote || "",
-      ...requestType === "erasure" /* ERASURE */ ? { revoke_consent_on_fulfilment: revokeConsent } : {},
-      product_uuid: group.product_uuid,
-      // Only set data_principal_uuid for nominee-driven cases. Direct
-      // cards default server-side to the JWT-derived requestor_uuid.
-      ...group.nominator ? { data_principal_uuid: group.nominator.uuid } : {}
-    };
-    return await createCaseRequestUnsafe(
-      organizationId || "",
-      workspaceId || "",
-      payload,
-      isPopup,
-      isCaseManagementContext,
-      authContext,
-      consentClient
-    );
-  };
-  const submitBatchCases = async (revokeConsent) => {
-    const submissions = selectedGroups.map(
-      (group) => submitSingleProductCase(group, revokeConsent).then(
-        (response) => ({ group, response })
-      )
-    );
-    const results = await Promise.allSettled(submissions);
-    const batchResult2 = { succeeded: [], failed: [] };
-    results.forEach((result, idx) => {
-      const group = selectedGroups[idx];
-      const groupKey = productGroupKey(group);
-      if (result.status === "fulfilled") {
-        const extracted = extractCaseId(result.value.response);
-        if (extracted && (extracted.case_id || extracted.uuid)) {
-          batchResult2.succeeded.push({
-            group_key: groupKey,
-            product_uuid: group.product_uuid,
-            product_name: group.product_name,
-            case_id: extracted.case_id || extracted.uuid,
-            uuid: extracted.uuid || extracted.case_id
-          });
-        } else {
-          batchResult2.failed.push({
-            group_key: groupKey,
-            product_uuid: group.product_uuid,
-            product_name: group.product_name,
-            error: t("requestSubmissionFailed")
-          });
-        }
-      } else {
-        const reason = result.reason;
-        const message = reason instanceof Error ? reason.message : typeof reason === "string" ? reason : t("submissionFailed");
-        batchResult2.failed.push({
-          group_key: groupKey,
-          product_uuid: group.product_uuid,
-          product_name: group.product_name,
-          error: message
-        });
-      }
-    });
-    return batchResult2;
-  };
-  const handleRetry = (0, import_react39.useCallback)(
-    async (groupKey) => {
-      if (groupKey === "") {
-        return;
-      }
-      const group = selectedGroups.find(
-        (g) => productGroupKey(g) === groupKey
-      );
-      if (!group) {
-        return;
-      }
-      setRetryingGroupKeys((prev) => {
-        const next = new Set(prev);
-        next.add(groupKey);
-        return next;
-      });
-      try {
-        const response = await submitSingleProductCase(group, false);
-        const extracted = extractCaseId(response);
-        if (extracted && (extracted.case_id || extracted.uuid)) {
-          queryClient.invalidateQueries({ queryKey: ["caseHistory"] });
-          setBatchResult((prev) => {
-            if (!prev) {
-              return prev;
-            }
-            return {
-              succeeded: [
-                ...prev.succeeded,
-                {
-                  group_key: groupKey,
-                  product_uuid: group.product_uuid,
-                  product_name: group.product_name,
-                  case_id: extracted.case_id || extracted.uuid,
-                  uuid: extracted.uuid || extracted.case_id
-                }
-              ],
-              failed: prev.failed.filter((f) => f.group_key !== groupKey)
-            };
-          });
-          toast.success(t("requestSubmittedSuccess"));
-        } else {
-          setBatchResult((prev) => {
-            if (!prev) {
-              return prev;
-            }
-            return {
-              succeeded: prev.succeeded,
-              failed: prev.failed.map(
-                (f) => f.group_key === groupKey ? { ...f, error: t("requestSubmissionFailed") } : f
-              )
-            };
-          });
-        }
-      } catch (error) {
-        const message = error instanceof Error ? error.message : t("submissionFailed");
-        setBatchResult((prev) => {
-          if (!prev) {
-            return prev;
-          }
-          return {
-            succeeded: prev.succeeded,
-            failed: prev.failed.map(
-              (f) => f.group_key === groupKey ? { ...f, error: message } : f
-            )
-          };
-        });
-      } finally {
-        setRetryingGroupKeys((prev) => {
-          const next = new Set(prev);
-          next.delete(groupKey);
-          return next;
-        });
-      }
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [
-      selectedGroups,
-      queryClient,
-      t
-      // submitSingleProductCase closes over many form-state values; we
-      // intentionally don't list it to avoid identity churn re-rendering
-      // RequestSubmit while a retry is in flight.
-    ]
-  );
   const isRequestDetailsValid = (0, import_react39.useCallback)(() => {
     if (!requestType) {
       return false;
     }
-    if (useGroupedRender && isGroupedRequestType(requestType)) {
-      if (selectedGroups.length === 0) {
+    if (isProductScopedRequestType(requestType)) {
+      if (allGroups.length === 0) {
         return false;
       }
-      if (requestType === "CORRECTION" /* CORRECTION */) {
-        return selectedGroups.every((group) => {
-          var _a2, _b2;
-          const key = productGroupKey(group);
-          const selected = (_a2 = correctionElementsByGroupKey.get(key)) != null ? _a2 : [];
-          const values = (_b2 = correctionValuesByGroupKey.get(key)) != null ? _b2 : {};
-          return selected.length > 0 && selected.every(
-            (name) => {
-              var _a3, _b3, _c2, _d2;
-              return ((_b3 = (_a3 = values[name]) == null ? void 0 : _a3.current) == null ? void 0 : _b3.trim()) && ((_d2 = (_c2 = values[name]) == null ? void 0 : _c2.updated) == null ? void 0 : _d2.trim());
-            }
-          );
-        });
+      if (!selectedGroup) {
+        return false;
       }
-      return selectedGroups.every((group) => {
-        var _a2;
-        const purposes = (_a2 = purposesByGroupKey.get(productGroupKey(group))) != null ? _a2 : [];
-        return purposes.some(
-          (p) => p.selected || p.data_elements.some((de) => de.selected)
-        );
-      });
-    }
-    switch (requestType) {
-      case "ACCESS" /* ACCESS */:
-        return accessPurposes.some(
-          (p) => p.selected || p.data_elements.some((de) => de.selected)
-        );
-      case "erasure" /* ERASURE */:
-        return erasurePurposes.some(
-          (p) => p.selected || p.data_elements.some((de) => de.selected)
-        );
-      case "grievance" /* GRIEVANCE */:
-        return Object.values(selectedGrievances).some(Boolean);
-      case "CORRECTION" /* CORRECTION */:
+      if (requestType === "CORRECTION" /* CORRECTION */) {
         return selectedCorrectionElements.length > 0 && selectedCorrectionElements.every(
           (name) => {
             var _a2, _b2, _c2, _d2;
             return ((_b2 = (_a2 = correctionValues[name]) == null ? void 0 : _a2.current) == null ? void 0 : _b2.trim()) && ((_d2 = (_c2 = correctionValues[name]) == null ? void 0 : _c2.updated) == null ? void 0 : _d2.trim());
           }
         );
+      }
+      return selectedPurposes.some(
+        (p) => p.selected || p.data_elements.some((de) => de.selected)
+      );
+    }
+    switch (requestType) {
+      case "grievance" /* GRIEVANCE */:
+        return Object.values(selectedGrievances).some(Boolean);
       case "nomination" /* NOMINATION */:
-        return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(nominationData.nominee_email.trim());
+        return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(
+          nominationData.nominee_email.trim()
+        );
       default:
         return false;
     }
   }, [
     requestType,
-    useGroupedRender,
-    selectedGroups,
-    purposesByGroupKey,
-    correctionElementsByGroupKey,
-    correctionValuesByGroupKey,
-    accessPurposes,
-    erasurePurposes,
-    selectedGrievances,
+    allGroups,
+    selectedGroup,
+    selectedPurposes,
     selectedCorrectionElements,
     correctionValues,
+    selectedGrievances,
     nominationData
   ]);
   const isFormValid = (0, import_react39.useMemo)(() => {
@@ -20540,14 +19922,12 @@ function Form({
       setIsVerifyingContact(false);
     }
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(import_jsx_runtime60.Fragment, { children: isSubmitted && batchResult && !isPopup ? /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(import_jsx_runtime60.Fragment, { children: isSubmitted && submittedCase && !isPopup ? /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
     RequestSubmit,
     {
-      result: batchResult,
+      result: submittedCase,
       contact: formData == null ? void 0 : formData.contact,
-      onCreateRequest,
-      onRetry: handleRetry,
-      retryingGroupKeys
+      onCreateRequest
     }
   ) : /* @__PURE__ */ (0, import_jsx_runtime60.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime60.jsxs)("div", { children: [
     !isPopup && /* @__PURE__ */ (0, import_jsx_runtime60.jsx)("p", { style: {
@@ -20746,7 +20126,7 @@ function Form({
                       ] }),
                       isRequestDetailsExpanded && /* @__PURE__ */ (0, import_jsx_runtime60.jsx)("div", { style: {
                         padding: getVar21("--pc-spacing-md")
-                      }, children: useGroupedRender && isGroupedRequestType(requestType) ? /* @__PURE__ */ (0, import_jsx_runtime60.jsxs)(
+                      }, children: isProductScopedRequestType(requestType) ? /* @__PURE__ */ (0, import_jsx_runtime60.jsxs)(
                         "div",
                         {
                           style: {
@@ -20766,16 +20146,12 @@ function Form({
                                 isTranslating
                               }
                             ),
-                            selectedGroups.length > 0 && (() => {
-                              var _a2, _b2, _c2, _d2, _e;
-                              const group = selectedGroups[0];
-                              const key = productGroupKey(group);
-                              const groupPurposes = (_a2 = purposesByGroupKey.get(key)) != null ? _a2 : [];
+                            selectedGroup && (() => {
+                              var _a2, _b2;
+                              const key = productGroupKey(selectedGroup);
                               const isCorrection = requestType === "CORRECTION" /* CORRECTION */;
-                              const groupDataElements = isCorrection ? buildGroupDataElements(group) : [];
-                              const groupCorrectionSelected = (_b2 = correctionElementsByGroupKey.get(key)) != null ? _b2 : [];
-                              const groupCorrectionValues = (_c2 = correctionValuesByGroupKey.get(key)) != null ? _c2 : {};
-                              const nominatorLabel = group.nominator ? (_e = (_d2 = group.nominator.name) != null ? _d2 : group.nominator.email) != null ? _e : "" : "";
+                              const groupDataElements = isCorrection ? buildGroupDataElements(selectedGroup) : [];
+                              const nominatorLabel = selectedGroup.nominator ? (_b2 = (_a2 = selectedGroup.nominator.name) != null ? _a2 : selectedGroup.nominator.email) != null ? _b2 : "" : "";
                               return /* @__PURE__ */ (0, import_jsx_runtime60.jsxs)(
                                 "div",
                                 {
@@ -20792,10 +20168,10 @@ function Form({
                                             weight: "semibold",
                                             color: "primary",
                                             className: "pc-product-purpose-panel-title",
-                                            children: group.product_name
+                                            children: selectedGroup.product_name
                                           }
                                         ),
-                                        group.nominator && /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
+                                        selectedGroup.nominator && /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
                                           PCText,
                                           {
                                             as: "span",
@@ -20829,17 +20205,17 @@ function Form({
                                           CorrectionDataSection,
                                           {
                                             dataElements: groupDataElements,
-                                            selected: groupCorrectionSelected,
-                                            setSelected: (values) => setCorrectionElementsForGroup(key, values),
-                                            correctionValues: groupCorrectionValues,
-                                            setCorrectionValues: (values) => setCorrectionValuesForGroup(key, values),
+                                            selected: selectedCorrectionElements,
+                                            setSelected: setSelectedCorrectionElements,
+                                            correctionValues,
+                                            setCorrectionValues,
                                             isTranslating
                                           }
                                         ) : /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
                                           PurposeSelectionSection,
                                           {
-                                            purposes: groupPurposes,
-                                            setPurposes: (updated) => setPurposesForGroup(key, updated),
+                                            purposes: selectedPurposes,
+                                            setPurposes: setSelectedPurposes,
                                             requestType,
                                             isTranslating
                                           }
@@ -20852,24 +20228,6 @@ function Form({
                             })()
                           ]
                         }
-                      ) : requestType === "ACCESS" /* ACCESS */ || requestType === "erasure" /* ERASURE */ ? /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
-                        PurposeSelectionSection,
-                        {
-                          purposes: requestType === "ACCESS" /* ACCESS */ ? accessPurposes : erasurePurposes,
-                          setPurposes: requestType === "ACCESS" /* ACCESS */ ? setAccessPurposes : setErasurePurposes,
-                          requestType,
-                          isTranslating
-                        }
-                      ) : requestType === "CORRECTION" /* CORRECTION */ ? /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
-                        CorrectionDataSection,
-                        {
-                          dataElements: uniqueDataElements,
-                          selected: selectedCorrectionElements,
-                          setSelected: setSelectedCorrectionElements,
-                          correctionValues,
-                          setCorrectionValues,
-                          isTranslating
-                        }
                       ) : requestType === "grievance" /* GRIEVANCE */ ? /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
                         GrievanceDataSection,
                         {