From 9391898d2de18c9bf7cf1136215302c1753d118b Mon Sep 17 00:00:00 2001
From: Bobby <31723128+kris6673@users.noreply.github.com>
Date: Mon, 19 Oct 2026 13:22:09 +0200
Subject: [PATCH] feat(gdap): add "Active without Auto Extend" filter to
 relationships table

Adds a preset filter on the GDAP Relationships page that shows active
relationships with auto-extend disabled (autoExtendDuration = PT0S),
so relationships that will expire unless renewed are easy to find.
Documents the filter on the relationships docs page.
---
 .../gdap-management/relationships/README.md       | 15 ++++++++-------
 .../gdap-management/relationships/index.jsx       |  8 ++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/docs/user-documentation/tenant/gdap-management/relationships/README.md b/docs/user-documentation/tenant/gdap-management/relationships/README.md
index 02b75cd729..6b7d6b3556 100644
--- a/docs/user-documentation/tenant/gdap-management/relationships/README.md
+++ b/docs/user-documentation/tenant/gdap-management/relationships/README.md
@@ -1,15 +1,16 @@
 # Relationships
 
-This page lists every delegated admin relationship attached to your Microsoft partner tenant. It shows the status of each relationship, the customer it belongs to, when it was created and activated, when it expires, and the roles it grants. Preset filters are available for the **Active**, **Approval Pending**, **Terminating**, and **Terminated** statuses.
+This page lists every delegated admin relationship attached to your Microsoft partner tenant. It shows the status of each relationship, the customer it belongs to, when it was created and activated, when it expires, and the roles it grants. Preset filters are available for the **Active**, **Approval Pending**, **Terminating**, and **Terminated** statuses, plus **Active without Auto Extend** for active relationships that will expire unless renewed.
 
 ## Filters
 
-| Filter           | Shows                                                                     |
-| ---------------- | ------------------------------------------------------------------------- |
-| Active           | Relationships that are currently active.                                  |
-| Approval Pending | Relationships awaiting the customer's approval before they become active. |
-| Terminating      | Relationships that are in the process of being terminated.                |
-| Terminated       | Relationships that have already been terminated.                          |
+| Filter                     | Shows                                                                                |
+| -------------------------- | ------------------------------------------------------------------------------------ |
+| Active                     | Relationships that are currently active.                                             |
+| Approval Pending           | Relationships awaiting the customer's approval before they become active.            |
+| Terminating                | Relationships that are in the process of being terminated.                           |
+| Terminated                 | Relationships that have already been terminated.                                     |
+| Active without Auto Extend | Active relationships that will not renew automatically and expire at their end date. |
 
 ## Table Details
 
diff --git a/frontend/src/pages/tenant/gdap-management/relationships/index.jsx b/frontend/src/pages/tenant/gdap-management/relationships/index.jsx
index 0f772c44c8..2eee802e7c 100644
--- a/frontend/src/pages/tenant/gdap-management/relationships/index.jsx
+++ b/frontend/src/pages/tenant/gdap-management/relationships/index.jsx
@@ -38,6 +38,14 @@ const filters = [
     value: [{ id: "status", value: "terminated" }],
     type: "column",
   },
+  {
+    filterName: "Active without Auto Extend",
+    value: [
+      { id: "status", value: "active" },
+      { id: "autoExtendDuration", value: "PT0S", filterFn: "equals" },
+    ],
+    type: "column",
+  },
 ];
 
 const offCanvas = {