From 6d8b26ff8e36bb9f7703a3ce49900e69bac47e12 Mon Sep 17 00:00:00 2001
From: Phil Bastian <phil.bastian@particular.net>
Date: Tue, 20 Oct 2026 13:21:58 +0800
Subject: [PATCH 1/8] functionality to call removeAmendments

---
 src/Frontend/src/assets/main.css              |  3 --
 .../src/stores/LicenseDetailsStore.ts         | 30 ++++++++++++++++++-
 .../licenseDetails/LicenseDetails.vue         | 29 ++++++++++++++----
 3 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/src/Frontend/src/assets/main.css b/src/Frontend/src/assets/main.css
index 8d749df20..35ec15b28 100644
--- a/src/Frontend/src/assets/main.css
+++ b/src/Frontend/src/assets/main.css
@@ -245,7 +245,6 @@ pre {
 }
 
 .btn-default {
-  padding: 8px 16px;
   color: #333;
   background-color: #fff;
   border-color: #ccc;
@@ -266,7 +265,6 @@ pre {
 }
 
 .btn.btn-primary {
-  padding: 8px 16px;
   background-color: var(--sp-blue);
   border-color: #0686aa;
   color: #fff;
@@ -416,7 +414,6 @@ span.metadata.metadata-link i.fa {
 
 .btn.btn-retry-dismiss {
   border-radius: 4px;
-  padding: 8px 16px;
 }
 
 .btn.btn-xs {
diff --git a/src/Frontend/src/stores/LicenseDetailsStore.ts b/src/Frontend/src/stores/LicenseDetailsStore.ts
index 561e5c055..bc58d6868 100644
--- a/src/Frontend/src/stores/LicenseDetailsStore.ts
+++ b/src/Frontend/src/stores/LicenseDetailsStore.ts
@@ -222,13 +222,32 @@ export const useLicenseDetailsStore = defineStore("LicenseDetailsStore", () => {
       useShowToast(TYPE.SUCCESS, "Saved", "", false, { timeout: 1000 });
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
-      useShowToast(TYPE.ERROR, "Error", "Failed to save changes to endpoint metadata.");
+      useShowToast(TYPE.ERROR, "Error", "Failed to save changes to endpoint metadata");
       logger.error("Failed to save changes to endpoint metadata.", err);
     } finally {
       saving.value = false;
     }
   }
 
+  async function removeAmendments() {
+    saving.value = true;
+    try {
+      const response = await serviceControlClient.postToServiceControl("license/removeAmendments");
+      if (!response.ok) {
+        const text = await response.text();
+        throw new Error(`Remove Amendments Failed: ${response.status} ${response.statusText} - ${text}`);
+      }
+      await refresh();
+      useShowToast(TYPE.SUCCESS, "Amendments Removed", "", false, { timeout: 1000 });
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (err: any) {
+      useShowToast(TYPE.ERROR, "Error", "Failed to remove endpoint metadata amendments");
+      logger.error("Failed to remove endpoint metadata amendments.", err);
+    } finally {
+      saving.value = false;
+    }
+  }
+
   const compare = (q1: Queue, q2: Queue) => {
     const name1 = q1.details?.name;
     const name2 = q2.details?.name;
@@ -252,6 +271,14 @@ export const useLicenseDetailsStore = defineStore("LicenseDetailsStore", () => {
     validId,
     hasLicenseDetails,
     hasChanges,
+    hasAmendments: computed(
+      () =>
+        !hasChanges.value &&
+        (endpoints.value.some((endpoint) => endpoint.queues.some((queue) => queue.originalLocation !== endpoint.clientId)) ||
+          infrastructureQueues.value.some((queue) => queue.originalLocation !== "infrastructure") ||
+          excludedQueues.value.some((queue) => queue.originalLocation !== "excluded") ||
+          unassignedQueues.value.some((queue) => queue.originalLocation != null))
+    ),
     saving,
     error,
     uploadEndpointMetadata,
@@ -267,6 +294,7 @@ export const useLicenseDetailsStore = defineStore("LicenseDetailsStore", () => {
     reclassifyEndpoint,
     discardChanges,
     saveChanges,
+    removeAmendments,
   };
 });
 
diff --git a/src/Frontend/src/views/throughputreport/licenseDetails/LicenseDetails.vue b/src/Frontend/src/views/throughputreport/licenseDetails/LicenseDetails.vue
index 8393e6d7f..b0c49e6e0 100644
--- a/src/Frontend/src/views/throughputreport/licenseDetails/LicenseDetails.vue
+++ b/src/Frontend/src/views/throughputreport/licenseDetails/LicenseDetails.vue
@@ -3,7 +3,7 @@ import routeLinks from "@/router/routeLinks";
 import isRouteSelected from "@/composables/isRouteSelected";
 import { useLicenseDetailsStore } from "@/stores/LicenseDetailsStore";
 import { storeToRefs } from "pinia";
-import { computed } from "vue";
+import { computed, ref } from "vue";
 import DataView from "@/components/DataView.vue";
 import ColumnHeader from "@/components/ColumnHeader.vue";
 import ExclamationMark from "@/components/ExclamationMark.vue";
@@ -17,11 +17,14 @@ import DetailsItem from "@/components/DetailsItem.vue";
 import ExternalLink from "@/components/ExternalLink.vue";
 import { EndpointClassification } from "@/resources/LicenseDetails.ts";
 import ActionButton from "@/components/ActionButton.vue";
+import ConfirmDialog from "@/components/ConfirmDialog.vue";
 
 const isLicenseDetailsSupported = useIsLicenseDetailsSupported();
 
 const licenseDetailsStore = useLicenseDetailsStore();
-const { endpoints, endpointSizes, serviceEndDate, validId, hasLicenseDetails, error, infrastructureQueues, excludedQueues, unassignedQueues, hasChanges, saving } = storeToRefs(licenseDetailsStore);
+const { endpoints, endpointSizes, serviceEndDate, validId, hasLicenseDetails, error, infrastructureQueues, excludedQueues, unassignedQueues, hasChanges, hasAmendments, saving } = storeToRefs(licenseDetailsStore);
+
+const confirmReset = ref(false);
 
 const sizes = computed(() =>
   endpoints.value
@@ -43,6 +46,11 @@ const licensedCounts = computed(() => sizes.value.licensed);
 const currentCounts = computed(() => sizes.value.current);
 const allSizes = computed(() => [...new Set([...licensedCounts.value.keys(), ...currentCounts.value.keys()])].sort((a, b) => endpointSizes.value.findIndex((size) => size.name === a) - endpointSizes.value.findIndex((size) => size.name === b)));
 const estimateUrlParams = computed(() => [...currentCounts.value.entries().map(([endpointSize, count]) => `${endpointSize}=${count}`)].join("&"));
+
+async function removeAmendments() {
+  confirmReset.value = false;
+  await licenseDetailsStore.removeAmendments();
+}
 </script>
 
 <template>
@@ -102,9 +110,10 @@ const estimateUrlParams = computed(() => [...currentCounts.value.entries().map((
             </DataView>
           </div>
         </div>
-        <!-- awaiting update to the pricing page to support this functionality -->
-        <div v-if="false">
-          <ExternalLink :href="`https://particular.net/pricing?${estimateUrlParams}`" class="btn btn-primary" show-icon>Estimate Renewal Price</ExternalLink>
+        <div class="action-buttons">
+          <ActionButton v-if="hasAmendments" variant="danger" @click="confirmReset = true" :disabled="saving">Remove Amendments</ActionButton>
+          <!-- awaiting update to the pricing page to support this functionality -->
+          <ExternalLink v-if="true" :href="`https://particular.net/pricing?${estimateUrlParams}`" class="btn btn-primary" show-icon>Estimate Renewal Price</ExternalLink>
         </div>
       </div>
       <div>
@@ -147,6 +156,14 @@ const estimateUrlParams = computed(() => [...currentCounts.value.entries().map((
       </div>
     </ConditionalRender>
   </ConditionalRender>
+
+  <ConfirmDialog
+    v-if="confirmReset"
+    heading="Confirm Remove Endpoint Amendments"
+    body="Are you sure you want to remove all endpoint and queue assignment amendments made since uploading the latest license metadata file?"
+    @cancel="confirmReset = false"
+    @confirm="removeAmendments"
+  />
 </template>
 
 <style scoped>
@@ -199,7 +216,7 @@ const estimateUrlParams = computed(() => [...currentCounts.value.entries().map((
   align-items: end;
 }
 
-.tab-row .action-buttons {
+.action-buttons {
   display: flex;
   gap: 0.25rem;
   flex-wrap: wrap;

From bf6e5438cf4520fe8c2f46db390f1444c4f3f496 Mon Sep 17 00:00:00 2001
From: Phil Bastian <phil.bastian@particular.net>
Date: Wed, 21 Oct 2026 07:04:00 +0800
Subject: [PATCH 2/8] include warning about incomplete amendments

---
 .../src/views/ThroughputReportView.vue        | 63 ++++++++++++++-----
 1 file changed, 47 insertions(+), 16 deletions(-)

diff --git a/src/Frontend/src/views/ThroughputReportView.vue b/src/Frontend/src/views/ThroughputReportView.vue
index da157a91d..d0947d8d1 100644
--- a/src/Frontend/src/views/ThroughputReportView.vue
+++ b/src/Frontend/src/views/ThroughputReportView.vue
@@ -5,36 +5,54 @@ import { useShowToast } from "@/composables/toast";
 import { TYPE } from "vue-toastification";
 import ServiceControlAvailable from "@/components/ServiceControlAvailable.vue";
 import ThroughputSupported from "@/views/throughputreport/ThroughputSupported.vue";
-import ConfirmDialog from "@/components/ConfirmDialog.vue";
-import FAIcon from "@/components/FAIcon.vue";
 import { faDownload } from "@fortawesome/free-solid-svg-icons";
 import { computedAsync } from "@vueuse/core";
 import useIsThroughputSupported from "./throughputreport/isThroughputSupported";
-
-const showWarning = ref<boolean>(false);
+import ActionButton from "@/components/ActionButton.vue";
+import { useLicenseDetailsStore } from "@/stores/LicenseDetailsStore";
+import { storeToRefs } from "pinia";
+import ModalDialog from "@/components/ModalDialog.vue";
 
 const isThroughputSupported = useIsThroughputSupported();
 const throughputClient = createThroughputClient();
+const licenseDetailsStore = useLicenseDetailsStore();
+const { hasLicenseDetails, hasAmendments, unassignedQueues } = storeToRefs(licenseDetailsStore);
 
 const reportState = computedAsync(async () => (isThroughputSupported.value ? await throughputClient.reportAvailable() : null), null);
+const reportWarnings = ref<string[]>([]);
+const generating = ref(false);
 
 async function generateReport() {
-  const results = await throughputClient.queues();
-  const hasNonUserIndicatorEndpoint = results.find((value) => !value.user_indicator);
+  generating.value = true;
+  try {
+    const results = await throughputClient.queues();
+    const hasNonUserIndicatorEndpoint = results.find((value) => !value.user_indicator);
 
-  if (hasNonUserIndicatorEndpoint) {
-    showWarning.value = true;
-  } else {
-    await downloadReport();
+    if (hasNonUserIndicatorEndpoint) reportWarnings.value.push("Not all endpoints/queues have an Endpoint Type set.");
+    if (hasLicenseDetails.value && unassignedQueues.value.length > 0) {
+      if (hasAmendments.value)
+        reportWarnings.value.push("Amendments have been made to the license details, but some queues remain unassigned. Amending the license details to fully represent your current system will assist with expediting your license renewal.");
+      else reportWarnings.value.push("Some queues remain unassigned on the license details tab. Amending the license details to fully represent your current system will assist with expediting your license renewal.");
+    }
+    if (!reportWarnings.value.length) {
+      await downloadReport();
+    }
+  } finally {
+    generating.value = false;
   }
 }
 
 async function downloadReport() {
-  showWarning.value = false;
-  const fileName = await throughputClient.downloadReport();
+  generating.value = true;
+  reportWarnings.value = [];
+  try {
+    const fileName = await throughputClient.downloadReport();
 
-  if (fileName !== "") {
-    useShowToast(TYPE.INFO, "Report Downloaded", `Please email '${fileName}' to your account manager.`, true);
+    if (fileName !== "") {
+      useShowToast(TYPE.INFO, "Report Downloaded", `Please email '${fileName}' to your Particular account manager.`, true);
+    }
+  } finally {
+    generating.value = false;
   }
 }
 </script>
@@ -49,9 +67,22 @@ async function downloadReport() {
           </div>
           <div class="col-sm-6 text-end">
             <span class="reason" v-if="!reportState?.report_can_be_generated">{{ reportState?.reason }}</span>
-            <button type="button" aria-label="Download Report" class="btn btn-primary actions" @click="generateReport()" :disabled="!reportState?.report_can_be_generated"><FAIcon :icon="faDownload" /> Download Report</button>
+            <ActionButton aria-label="Download Report" variant="primary" class="action" @click="generateReport()" :disabled="generating || !reportState?.report_can_be_generated" :icon="faDownload" :loading="generating">Download Report</ActionButton>
             <Teleport to="#modalDisplay">
-              <ConfirmDialog v-if="showWarning" heading="Not all endpoints/queues have an Endpoint Type set" body="Are you sure you want to continue?" @cancel="showWarning = false" @confirm="downloadReport" />
+              <ModalDialog v-if="reportWarnings.length" id="download-report" title="Download Report" @close="reportWarnings = []" @confirm="downloadReport">
+                <template #modalBody>
+                  <ul>
+                    <li v-for="warning in reportWarnings" :key="warning">
+                      {{ warning }}
+                    </li>
+                  </ul>
+                  <p>Are you sure you want to continue?</p>
+                </template>
+                <template #modalFooter>
+                  <ActionButton variant="primary" aria-label="Yes" @click="downloadReport">Yes</ActionButton>
+                  <ActionButton aria-label="No" @click="reportWarnings = []">No</ActionButton>
+                </template>
+              </ModalDialog>
             </Teleport>
           </div>
         </div>

From daf6cbc4d9a549b746eb530b653f2d4020a9215c Mon Sep 17 00:00:00 2001
From: Phil Bastian <phil.bastian@particular.net>
Date: Wed, 21 Oct 2026 07:51:06 +0800
Subject: [PATCH 3/8] add warning about incomplete amendments when downloading
 usage report

---
 src/Frontend/src/views/ThroughputReportView.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Frontend/src/views/ThroughputReportView.vue b/src/Frontend/src/views/ThroughputReportView.vue
index d0947d8d1..e25512a36 100644
--- a/src/Frontend/src/views/ThroughputReportView.vue
+++ b/src/Frontend/src/views/ThroughputReportView.vue
@@ -30,9 +30,8 @@ async function generateReport() {
 
     if (hasNonUserIndicatorEndpoint) reportWarnings.value.push("Not all endpoints/queues have an Endpoint Type set.");
     if (hasLicenseDetails.value && unassignedQueues.value.length > 0) {
-      if (hasAmendments.value)
-        reportWarnings.value.push("Amendments have been made to the license details, but some queues remain unassigned. Amending the license details to fully represent your current system will assist with expediting your license renewal.");
-      else reportWarnings.value.push("Some queues remain unassigned on the license details tab. Amending the license details to fully represent your current system will assist with expediting your license renewal.");
+      if (hasAmendments.value) reportWarnings.value.push("Amendments have been made to the license details, but some queues remain unassigned.");
+      else reportWarnings.value.push("Some queues remain unassigned on the license details tab.");
     }
     if (!reportWarnings.value.length) {
       await downloadReport();
@@ -71,11 +70,13 @@ async function downloadReport() {
             <Teleport to="#modalDisplay">
               <ModalDialog v-if="reportWarnings.length" id="download-report" title="Download Report" @close="reportWarnings = []" @confirm="downloadReport">
                 <template #modalBody>
+                  <span>Please check the following:</span>
                   <ul>
                     <li v-for="warning in reportWarnings" :key="warning">
                       {{ warning }}
                     </li>
                   </ul>
+                  <p>None of the above items are required, however providing as much information as possible about your current system as part of the usage report will assist in expediting your license renewal.</p>
                   <p>Are you sure you want to continue?</p>
                 </template>
                 <template #modalFooter>

From a1cf679940673b26cd368de756f410f4b53f113a Mon Sep 17 00:00:00 2001
From: Phil Bastian <phil.bastian@particular.net>
Date: Wed, 21 Oct 2026 08:02:04 +0800
Subject: [PATCH 4/8] rehide unsupported button

---
 .../views/throughputreport/licenseDetails/LicenseDetails.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Frontend/src/views/throughputreport/licenseDetails/LicenseDetails.vue b/src/Frontend/src/views/throughputreport/licenseDetails/LicenseDetails.vue
index b0c49e6e0..0f566da73 100644
--- a/src/Frontend/src/views/throughputreport/licenseDetails/LicenseDetails.vue
+++ b/src/Frontend/src/views/throughputreport/licenseDetails/LicenseDetails.vue
@@ -113,7 +113,7 @@ async function removeAmendments() {
         <div class="action-buttons">
           <ActionButton v-if="hasAmendments" variant="danger" @click="confirmReset = true" :disabled="saving">Remove Amendments</ActionButton>
           <!-- awaiting update to the pricing page to support this functionality -->
-          <ExternalLink v-if="true" :href="`https://particular.net/pricing?${estimateUrlParams}`" class="btn btn-primary" show-icon>Estimate Renewal Price</ExternalLink>
+          <ExternalLink v-if="false" :href="`https://particular.net/pricing?${estimateUrlParams}`" class="btn btn-primary" show-icon>Estimate Renewal Price</ExternalLink>
         </div>
       </div>
       <div>

From 323f70c23a14e2d93557325a9467d637eb226d97 Mon Sep 17 00:00:00 2001
From: Phil Bastian <phil.bastian@particular.net>
Date: Wed, 21 Oct 2026 09:38:15 +0800
Subject: [PATCH 5/8] fix updated text in test

---
 src/Frontend/src/views/ThroughputReportView.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Frontend/src/views/ThroughputReportView.spec.ts b/src/Frontend/src/views/ThroughputReportView.spec.ts
index 2f215b3bb..c080910b9 100644
--- a/src/Frontend/src/views/ThroughputReportView.spec.ts
+++ b/src/Frontend/src/views/ThroughputReportView.spec.ts
@@ -116,7 +116,7 @@ describe("EndpointsView tests", () => {
       const use = userEvent.setup();
 
       await use.click(screen.getByRole("button", { name: /Download Report/i }));
-      expect(screen.getByText("Not all endpoints/queues have an Endpoint Type set")).toBeInTheDocument();
+      expect(screen.getByText("Not all endpoints/queues have an Endpoint Type set.")).toBeInTheDocument();
     });
   });
 });

From d990d55638054122aa056b3311c10f2faec3eb3e Mon Sep 17 00:00:00 2001
From: Phil Bastian <phil.bastian@particular.net>
Date: Wed, 21 Oct 2026 10:01:37 +0800
Subject: [PATCH 6/8] functionality guard

---
 .../src/stores/LicenseDetailsStore.ts         | 28 +++++++++++++++++++
 .../licenseDetails/EndpointHeader.vue         |  4 ++-
 .../licenseDetails/LicenseDetails.vue         |  6 ++--
 .../licenseDetails/QueueData.vue              |  7 +++--
 .../isLicenseDetailAmendmentSupported.ts      |  9 ++++++
 5 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 src/Frontend/src/views/throughputreport/licenseDetails/isLicenseDetailAmendmentSupported.ts

diff --git a/src/Frontend/src/stores/LicenseDetailsStore.ts b/src/Frontend/src/stores/LicenseDetailsStore.ts
index bc58d6868..780847707 100644
--- a/src/Frontend/src/stores/LicenseDetailsStore.ts
+++ b/src/Frontend/src/stores/LicenseDetailsStore.ts
@@ -7,9 +7,11 @@ import serviceControlClient from "@/components/serviceControlClient";
 import useIsLicenseDetailsSupported from "@/views/throughputreport/licenseDetails/isLicenseDetailsSupported";
 import { useShowToast } from "@/composables/toast";
 import { TYPE } from "vue-toastification";
+import useIsLicenseDetailAmendmentSupported from "@/views/throughputreport/licenseDetails/isLicenseDetailAmendmentSupported";
 
 export const useLicenseDetailsStore = defineStore("LicenseDetailsStore", () => {
   const isLicenseDetailsSupported = useIsLicenseDetailsSupported();
+  const isLicenseDetailAmendmentSupported = useIsLicenseDetailAmendmentSupported();
 
   const endpointSizes = ref<EndpointSize[]>([]);
   const endpoints = ref<Endpoint[]>([]);
@@ -42,36 +44,48 @@ export const useLicenseDetailsStore = defineStore("LicenseDetailsStore", () => {
   }
 
   function excludeQueue(queue: Queue) {
+    if (!isLicenseDetailAmendmentSupported) return;
+
     excludedQueues.value.push(queue);
     unassignedQueues.value = unassignedQueues.value.filter((unassigned) => unassigned !== queue);
     hasChanges.value = true;
   }
 
   function unexcludeQueue(queue: Queue) {
+    if (!isLicenseDetailAmendmentSupported) return;
+
     excludedQueues.value = excludedQueues.value.filter((assigned) => assigned !== queue);
     returnToUnassigned(queue);
     hasChanges.value = true;
   }
 
   function markQueueAsInfrastructure(queue: Queue) {
+    if (!isLicenseDetailAmendmentSupported) return;
+
     infrastructureQueues.value.push(queue);
     unassignedQueues.value = unassignedQueues.value.filter((unassigned) => unassigned !== queue);
     hasChanges.value = true;
   }
 
   function unmarkQueueAsInfrastructure(queue: Queue) {
+    if (!isLicenseDetailAmendmentSupported) return;
+
     infrastructureQueues.value = infrastructureQueues.value.filter((assigned) => assigned !== queue);
     returnToUnassigned(queue);
     hasChanges.value = true;
   }
 
   function returnToUnassigned(queue: Queue) {
+    if (!isLicenseDetailAmendmentSupported) return;
+
     if (queue.details) unassignedQueues.value.push(queue);
     else unmappedQueues.value.push(queue);
     hasChanges.value = true;
   }
 
   function createEndpointFromQueue(queue: Queue) {
+    if (!isLicenseDetailAmendmentSupported) return;
+
     //max endpoint name length of 80 - take from the end to reduce chance of clashes
     let name = queue.details.name.substring(queue.details.name.length - 80);
     while (endpoints.value.find((endpoint) => endpoint.name === name)) {
@@ -85,12 +99,16 @@ export const useLicenseDetailsStore = defineStore("LicenseDetailsStore", () => {
   }
 
   function addQueueToEndpoint(queue: Queue, endpoint: Endpoint) {
+    if (!isLicenseDetailAmendmentSupported) return;
+
     endpoint.queues.push(queue);
     unassignedQueues.value = unassignedQueues.value.filter((unassigned) => unassigned !== queue);
     hasChanges.value = true;
   }
 
   function removeQueueFromEndpoint(queue: Queue, endpoint: Endpoint) {
+    if (!isLicenseDetailAmendmentSupported) return;
+
     endpoint.queues = endpoint.queues.filter((assigned) => assigned !== queue);
     //TODO
     //endpoint.excludeThroughput = endpoint.excludeThroughput.filter((et) => !queue.matches(et));
@@ -98,18 +116,24 @@ export const useLicenseDetailsStore = defineStore("LicenseDetailsStore", () => {
   }
 
   function removeEndpoint(endpoint: Endpoint) {
+    if (!isLicenseDetailAmendmentSupported) return;
+
     endpoints.value = endpoints.value.filter((e) => e !== endpoint);
     endpoint.queues.forEach((queue) => returnToUnassigned(queue));
     removedEndpoints.value.push(endpoint.clientId);
   }
 
   function renameEndpoint(endpoint: Endpoint, name: string) {
+    if (!isLicenseDetailAmendmentSupported) return;
+
     endpoint.name = name;
     endpoint.amended = true;
     hasChanges.value = true;
   }
 
   function reclassifyEndpoint(endpoint: Endpoint, classification: EndpointClassification) {
+    if (!isLicenseDetailAmendmentSupported) return;
+
     endpoint.classification = classification;
     endpoint.amended = true;
     hasChanges.value = true;
@@ -194,6 +218,8 @@ export const useLicenseDetailsStore = defineStore("LicenseDetailsStore", () => {
   }
 
   async function saveChanges() {
+    if (!isLicenseDetailAmendmentSupported) return;
+
     saving.value = true;
     function toApiQueue(queue: Queue) {
       return { name_hash: queue.nameHash, scope_hash: queue.scopeHash, original_location: queue.originalLocation };
@@ -230,6 +256,8 @@ export const useLicenseDetailsStore = defineStore("LicenseDetailsStore", () => {
   }
 
   async function removeAmendments() {
+    if (!isLicenseDetailAmendmentSupported) return;
+
     saving.value = true;
     try {
       const response = await serviceControlClient.postToServiceControl("license/removeAmendments");
diff --git a/src/Frontend/src/views/throughputreport/licenseDetails/EndpointHeader.vue b/src/Frontend/src/views/throughputreport/licenseDetails/EndpointHeader.vue
index 248dabfa8..ea9b22a62 100644
--- a/src/Frontend/src/views/throughputreport/licenseDetails/EndpointHeader.vue
+++ b/src/Frontend/src/views/throughputreport/licenseDetails/EndpointHeader.vue
@@ -7,11 +7,13 @@ import EndpointName from "./EndpointName.vue";
 import ActionButton from "@/components/ActionButton.vue";
 import { useLicenseDetailsStore } from "@/stores/LicenseDetailsStore";
 import { faCircleChevronUp } from "@fortawesome/free-solid-svg-icons";
+import useIsLicenseDetailAmendmentSupported from "./isLicenseDetailAmendmentSupported.ts";
 
 const props = defineProps<{ endpoint: Endpoint }>();
 const emit = defineEmits(["collapse"]);
 
 const licenseDetailsStore = useLicenseDetailsStore();
+const isLicenseDetailAmendmentSupported = useIsLicenseDetailAmendmentSupported();
 
 const endpointClassificationStyle = computed(() => {
   switch (props.endpoint.classification) {
@@ -53,7 +55,7 @@ watch(
       <FAIcon :icon="faCircleChevronUp" class="collapse-button" size="lg" tabindex="0" title="collapse" @click="emit('collapse')" />
       <strong v-tippy="endpoint.name">{{ endpoint.name }}</strong>
     </div>
-    <div class="header-buttons">
+    <div class="header-buttons" v-if="isLicenseDetailAmendmentSupported">
       <div>
         <label :for="`${endpoint.clientId}classification`">Classification:</label>
         <select :id="`${endpoint.clientId}classification`" @change="(e) => reclassifyEndpoint(Number((e.target as HTMLSelectElement).value))" :value="endpoint.classification" class="form-select">
diff --git a/src/Frontend/src/views/throughputreport/licenseDetails/LicenseDetails.vue b/src/Frontend/src/views/throughputreport/licenseDetails/LicenseDetails.vue
index 0f566da73..2fc880460 100644
--- a/src/Frontend/src/views/throughputreport/licenseDetails/LicenseDetails.vue
+++ b/src/Frontend/src/views/throughputreport/licenseDetails/LicenseDetails.vue
@@ -18,8 +18,10 @@ import ExternalLink from "@/components/ExternalLink.vue";
 import { EndpointClassification } from "@/resources/LicenseDetails.ts";
 import ActionButton from "@/components/ActionButton.vue";
 import ConfirmDialog from "@/components/ConfirmDialog.vue";
+import useIsLicenseDetailAmendmentSupported from "./isLicenseDetailAmendmentSupported.ts";
 
 const isLicenseDetailsSupported = useIsLicenseDetailsSupported();
+const isLicenseDetailAmendmentSupported = useIsLicenseDetailAmendmentSupported();
 
 const licenseDetailsStore = useLicenseDetailsStore();
 const { endpoints, endpointSizes, serviceEndDate, validId, hasLicenseDetails, error, infrastructureQueues, excludedQueues, unassignedQueues, hasChanges, hasAmendments, saving } = storeToRefs(licenseDetailsStore);
@@ -111,7 +113,7 @@ async function removeAmendments() {
           </div>
         </div>
         <div class="action-buttons">
-          <ActionButton v-if="hasAmendments" variant="danger" @click="confirmReset = true" :disabled="saving">Remove Amendments</ActionButton>
+          <ActionButton v-if="isLicenseDetailAmendmentSupported && hasAmendments" variant="danger" @click="confirmReset = true" :disabled="saving">Remove Amendments</ActionButton>
           <!-- awaiting update to the pricing page to support this functionality -->
           <ExternalLink v-if="false" :href="`https://particular.net/pricing?${estimateUrlParams}`" class="btn btn-primary" show-icon>Estimate Renewal Price</ExternalLink>
         </div>
@@ -150,7 +152,7 @@ async function removeAmendments() {
               <ActionButton variant="primary" v-if="hasChanges" :disabled="saving" :loading="saving" @click="licenseDetailsStore.saveChanges">Save Changes</ActionButton>
             </div>
           </div>
-          <div class="mt-1">✏️ before a queue name indicates that the queue location differs from what was licensed</div>
+          <div class="mt-1" v-if="isLicenseDetailAmendmentSupported">✏️ before a queue name indicates that the queue location differs from what was licensed</div>
         </div>
         <RouterView />
       </div>
diff --git a/src/Frontend/src/views/throughputreport/licenseDetails/QueueData.vue b/src/Frontend/src/views/throughputreport/licenseDetails/QueueData.vue
index aa10a7975..4db937b9c 100644
--- a/src/Frontend/src/views/throughputreport/licenseDetails/QueueData.vue
+++ b/src/Frontend/src/views/throughputreport/licenseDetails/QueueData.vue
@@ -3,6 +3,9 @@ import DataView from "@/components/DataView.vue";
 import InlineThroughputGraph from "../queues/InlineThroughputGraph.vue";
 import QueueName from "./QueueName.vue";
 import type { Queue } from "@/resources/LicenseDetails";
+import useIsLicenseDetailAmendmentSupported from "./isLicenseDetailAmendmentSupported.ts";
+
+const isLicenseDetailAmendmentSupported = useIsLicenseDetailAmendmentSupported();
 
 defineProps<{ queues: Queue[]; currentLocation?: string }>();
 </script>
@@ -15,7 +18,7 @@ defineProps<{ queues: Queue[]; currentLocation?: string }>();
           <tr>
             <th class="queue-name">Queue Name</th>
             <th class="text-end">Throughput</th>
-            <th v-if="$slots.actions"></th>
+            <th v-if="isLicenseDetailAmendmentSupported && $slots.actions"></th>
           </tr>
         </thead>
         <tbody>
@@ -29,7 +32,7 @@ defineProps<{ queues: Queue[]; currentLocation?: string }>();
                 {{ queue.details?.average_monthly_throughput?.toLocaleString() }}
               </div>
             </td>
-            <td v-if="$slots.actions" class="actions">
+            <td v-if="isLicenseDetailAmendmentSupported && $slots.actions" class="actions">
               <slot name="actions" :queue="queue" />
             </td>
           </tr>
diff --git a/src/Frontend/src/views/throughputreport/licenseDetails/isLicenseDetailAmendmentSupported.ts b/src/Frontend/src/views/throughputreport/licenseDetails/isLicenseDetailAmendmentSupported.ts
new file mode 100644
index 000000000..d91c05497
--- /dev/null
+++ b/src/Frontend/src/views/throughputreport/licenseDetails/isLicenseDetailAmendmentSupported.ts
@@ -0,0 +1,9 @@
+import useEnvironmentAndVersionsAutoRefresh from "@/composables/useEnvironmentAndVersionsAutoRefresh";
+
+export const minimumSCVersionForLicenseDetailAmendment = "6.22.0";
+
+export default function useIsLicenseDetailAmendmentSupported() {
+  return false;
+  const { store: environmentStore } = useEnvironmentAndVersionsAutoRefresh();
+  return environmentStore.serviceControlIsGreaterThan(minimumSCVersionForLicenseDetailAmendment);
+}

From 2a350dd68bbf640d5a5620a601c4f14b03a60660 Mon Sep 17 00:00:00 2001
From: Phil Bastian <phil.bastian@particular.net>
Date: Wed, 21 Oct 2026 10:04:50 +0800
Subject: [PATCH 7/8] reenable version check

---
 .../licenseDetails/isLicenseDetailAmendmentSupported.ts          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Frontend/src/views/throughputreport/licenseDetails/isLicenseDetailAmendmentSupported.ts b/src/Frontend/src/views/throughputreport/licenseDetails/isLicenseDetailAmendmentSupported.ts
index d91c05497..67fb6bc62 100644
--- a/src/Frontend/src/views/throughputreport/licenseDetails/isLicenseDetailAmendmentSupported.ts
+++ b/src/Frontend/src/views/throughputreport/licenseDetails/isLicenseDetailAmendmentSupported.ts
@@ -3,7 +3,6 @@ import useEnvironmentAndVersionsAutoRefresh from "@/composables/useEnvironmentAn
 export const minimumSCVersionForLicenseDetailAmendment = "6.22.0";
 
 export default function useIsLicenseDetailAmendmentSupported() {
-  return false;
   const { store: environmentStore } = useEnvironmentAndVersionsAutoRefresh();
   return environmentStore.serviceControlIsGreaterThan(minimumSCVersionForLicenseDetailAmendment);
 }

From 19165c03bbf8d417099a2b24e13ad5f387bbe97d Mon Sep 17 00:00:00 2001
From: Phil Bastian <phil.bastian@particular.net>
Date: Wed, 21 Oct 2026 10:26:03 +0800
Subject: [PATCH 8/8] update expected text in test

---
 src/Frontend/src/views/ThroughputReportView.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Frontend/src/views/ThroughputReportView.spec.ts b/src/Frontend/src/views/ThroughputReportView.spec.ts
index c080910b9..deb67e598 100644
--- a/src/Frontend/src/views/ThroughputReportView.spec.ts
+++ b/src/Frontend/src/views/ThroughputReportView.spec.ts
@@ -104,7 +104,7 @@ describe("EndpointsView tests", () => {
       const use = userEvent.setup();
 
       await use.click(screen.getByRole("button", { name: /Download Report/i }));
-      expect(screen.queryAllByText(new RegExp(`Please email '${fileName}' to your account manager`)).length).toBeGreaterThanOrEqual(1);
+      expect(screen.queryAllByText(new RegExp(`Please email '${fileName}' to your Particular account manager.`)).length).toBeGreaterThanOrEqual(1);
     });
 
     test("and there are warnings, dialog is displayed", async () => {