From e3b961e662137a70697a8941cb4f6e54fee9c5a7 Mon Sep 17 00:00:00 2001
From: peterpaulo-azion <peterson.silva@azion.com>
Date: Wed, 5 Feb 2025 15:43:50 -0300
Subject: [PATCH 1/3] Revert "[UXE-5459] feat: enhance edge node list view with
 fetch table block (#2124)"

This reverts commit a24b106957a4c4c896e33ebc6b54e8cefc083543.
---
 .../v4/list-edge-node-service.js              |  1 -
 .../v4/make-edge-node-list-base-url.test.js   | 22 -------------------
 src/views/EdgeNode/ListView.vue               |  7 ++----
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 src/tests/services/edge-node-services/v4/make-edge-node-list-base-url.test.js

diff --git a/src/services/edge-node-services/v4/list-edge-node-service.js b/src/services/edge-node-services/v4/list-edge-node-service.js
index 27d2a14be..540ea648d 100644
--- a/src/services/edge-node-services/v4/list-edge-node-service.js
+++ b/src/services/edge-node-services/v4/list-edge-node-service.js
@@ -45,7 +45,6 @@ const adapt = (httpResponse) => {
 
   return {
     body: parsedEdgeNodes,
-    count: httpResponse.body.count,
     statusCode: httpResponse.statusCode
   }
 }
diff --git a/src/tests/services/edge-node-services/v4/make-edge-node-list-base-url.test.js b/src/tests/services/edge-node-services/v4/make-edge-node-list-base-url.test.js
deleted file mode 100644
index ecb1324f2..000000000
--- a/src/tests/services/edge-node-services/v4/make-edge-node-list-base-url.test.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { makeEdgeNodeBaseUrl } from '@/services/edge-node-services/v4/make-edge-node-base-url'
-import { assert, describe, it } from 'vitest'
-
-const makeSut = () => {
-  const sut = makeEdgeNodeBaseUrl
-
-  return {
-    sut
-  }
-}
-
-describe('EdgeNodeServices', () => {
-  it('should return the API base url to edge node service', () => {
-    const { sut } = makeSut()
-    const version = 'v4'
-    const correctApiUrl = `${version}/edge_orchestrator/edge_nodes`
-
-    const baseUrl = sut()
-
-    assert.strictEqual(baseUrl, correctApiUrl)
-  })
-})
diff --git a/src/views/EdgeNode/ListView.vue b/src/views/EdgeNode/ListView.vue
index a111ed884..4035ece8a 100644
--- a/src/views/EdgeNode/ListView.vue
+++ b/src/views/EdgeNode/ListView.vue
@@ -1,7 +1,7 @@
 <script setup>
   import ContentBlock from '@/templates/content-block'
   import EmptyEdgeNode from '@/templates/empty-results-block/empty-edge-node'
-  import FetchListTableBlock from '@/templates/list-table-block/with-fetch-ordering-and-pagination.vue'
+  import ListTableBlock from '@/templates/list-table-block'
   import { columnBuilder } from '@/templates/list-table-block/columns/column-builder'
   import PageHeadingBlock from '@/templates/page-heading-block'
   import Authorize from '@/views/EdgeNode/Dialog/Authorize'
@@ -75,8 +75,6 @@
       }
     }
   ]
-
-  const EDGE_NODE_API_FIELDS = ['id', 'name', 'hash_id', 'status']
 </script>
 <template>
   <ContentBlock>
@@ -84,9 +82,8 @@
       <PageHeadingBlock pageTitle="Edge Nodes"></PageHeadingBlock>
     </template>
     <template #content>
-      <FetchListTableBlock
+      <ListTableBlock
         v-if="hasContentToList"
-        :apiFields="EDGE_NODE_API_FIELDS"
         :listService="listEdgeNodeService"
         :columns="getColumns"
         editPagePath="edge-node/edit"

From 3c4581ea4c2bb08a4aedea261a9f9146f15cea10 Mon Sep 17 00:00:00 2001
From: peterpaulo-azion <peterson.silva@azion.com>
Date: Wed, 5 Feb 2025 15:45:23 -0300
Subject: [PATCH 2/3] Revert "Revert "[UXE-5459] feat: enhance edge node list
 view with fetch table block (#2124)""

This reverts commit e3b961e662137a70697a8941cb4f6e54fee9c5a7.
---
 .../v4/list-edge-node-service.js              |  1 +
 .../v4/make-edge-node-list-base-url.test.js   | 22 +++++++++++++++++++
 src/views/EdgeNode/ListView.vue               |  7 ++++--
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 src/tests/services/edge-node-services/v4/make-edge-node-list-base-url.test.js

diff --git a/src/services/edge-node-services/v4/list-edge-node-service.js b/src/services/edge-node-services/v4/list-edge-node-service.js
index 540ea648d..27d2a14be 100644
--- a/src/services/edge-node-services/v4/list-edge-node-service.js
+++ b/src/services/edge-node-services/v4/list-edge-node-service.js
@@ -45,6 +45,7 @@ const adapt = (httpResponse) => {
 
   return {
     body: parsedEdgeNodes,
+    count: httpResponse.body.count,
     statusCode: httpResponse.statusCode
   }
 }
diff --git a/src/tests/services/edge-node-services/v4/make-edge-node-list-base-url.test.js b/src/tests/services/edge-node-services/v4/make-edge-node-list-base-url.test.js
new file mode 100644
index 000000000..ecb1324f2
--- /dev/null
+++ b/src/tests/services/edge-node-services/v4/make-edge-node-list-base-url.test.js
@@ -0,0 +1,22 @@
+import { makeEdgeNodeBaseUrl } from '@/services/edge-node-services/v4/make-edge-node-base-url'
+import { assert, describe, it } from 'vitest'
+
+const makeSut = () => {
+  const sut = makeEdgeNodeBaseUrl
+
+  return {
+    sut
+  }
+}
+
+describe('EdgeNodeServices', () => {
+  it('should return the API base url to edge node service', () => {
+    const { sut } = makeSut()
+    const version = 'v4'
+    const correctApiUrl = `${version}/edge_orchestrator/edge_nodes`
+
+    const baseUrl = sut()
+
+    assert.strictEqual(baseUrl, correctApiUrl)
+  })
+})
diff --git a/src/views/EdgeNode/ListView.vue b/src/views/EdgeNode/ListView.vue
index 4035ece8a..a111ed884 100644
--- a/src/views/EdgeNode/ListView.vue
+++ b/src/views/EdgeNode/ListView.vue
@@ -1,7 +1,7 @@
 <script setup>
   import ContentBlock from '@/templates/content-block'
   import EmptyEdgeNode from '@/templates/empty-results-block/empty-edge-node'
-  import ListTableBlock from '@/templates/list-table-block'
+  import FetchListTableBlock from '@/templates/list-table-block/with-fetch-ordering-and-pagination.vue'
   import { columnBuilder } from '@/templates/list-table-block/columns/column-builder'
   import PageHeadingBlock from '@/templates/page-heading-block'
   import Authorize from '@/views/EdgeNode/Dialog/Authorize'
@@ -75,6 +75,8 @@
       }
     }
   ]
+
+  const EDGE_NODE_API_FIELDS = ['id', 'name', 'hash_id', 'status']
 </script>
 <template>
   <ContentBlock>
@@ -82,8 +84,9 @@
       <PageHeadingBlock pageTitle="Edge Nodes"></PageHeadingBlock>
     </template>
     <template #content>
-      <ListTableBlock
+      <FetchListTableBlock
         v-if="hasContentToList"
+        :apiFields="EDGE_NODE_API_FIELDS"
         :listService="listEdgeNodeService"
         :columns="getColumns"
         editPagePath="edge-node/edit"

From 5806ed4c65e3278d0a70854d5b52a938baac1004 Mon Sep 17 00:00:00 2001
From: peterpaulo-azion <peterson.silva@azion.com>
Date: Fri, 7 Feb 2025 09:52:21 -0300
Subject: [PATCH 3/3] fix: ensure default ordering is set when reloading list
 table

---
 .../list-table-block/with-fetch-ordering-and-pagination.vue   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/templates/list-table-block/with-fetch-ordering-and-pagination.vue b/src/templates/list-table-block/with-fetch-ordering-and-pagination.vue
index 9aa7bb8b8..49daf0f7b 100644
--- a/src/templates/list-table-block/with-fetch-ordering-and-pagination.vue
+++ b/src/templates/list-table-block/with-fetch-ordering-and-pagination.vue
@@ -625,6 +625,10 @@
   }
 
   const reload = async (query = {}) => {
+    if (!savedOrdering.value) {
+      savedOrdering.value = props.defaultOrderingFieldName
+    }
+
     const commonParams = {
       page: 1,
       pageSize: itemsByPage.value,