From 2b4f5e00b375d387231fab450072278bc647a03b Mon Sep 17 00:00:00 2001 From: paulosf0 Date: Mon, 13 Jan 2025 15:16:12 -0300 Subject: [PATCH 1/3] feat: migrate to v4 --- src/router/routes/edge-firewall-routes/index.js | 4 ++-- .../FormFields/FormFieldsEdgeFirewallRulesEngine.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/router/routes/edge-firewall-routes/index.js b/src/router/routes/edge-firewall-routes/index.js index d0e6baa29..e9dc99c3d 100644 --- a/src/router/routes/edge-firewall-routes/index.js +++ b/src/router/routes/edge-firewall-routes/index.js @@ -10,7 +10,7 @@ import * as EdgeFunctionServiceV4 from '@/services/edge-functions-services/v4' import * as EdgeFirewallRulesEngineServicesV4 from '@/services/edge-firewall-rules-engine-services/v4' import * as WafRulesServices from '@/services/waf-rules-services' -import * as NetworkListsService from '@/services/network-lists-services' +import * as NetworkListsServiceV4 from '@/services/network-lists-services/v4' /** @type {import('vue-router').RouteRecordRaw} */ export const edgeFirewallRoutes = { @@ -62,7 +62,7 @@ export const edgeFirewallRoutes = { component: () => import('@/views/EdgeFirewall/TabsView.vue'), props: { listDomainsService: DomainServices.listDomainsService, - listNetworkListService: NetworkListsService.listNetworkListService, + listNetworkListService: NetworkListsServiceV4.listNetworkListService, edgeFirewallServices: { loadEdgeFirewallService: EdgeFirewallServicesV4.loadEdgeFirewallService, editEdgeFirewallService: EdgeFirewallServicesV4.editEdgeFirewallService, diff --git a/src/views/EdgeFirewallRulesEngine/FormFields/FormFieldsEdgeFirewallRulesEngine.vue b/src/views/EdgeFirewallRulesEngine/FormFields/FormFieldsEdgeFirewallRulesEngine.vue index abfb025ee..88de4697a 100644 --- a/src/views/EdgeFirewallRulesEngine/FormFields/FormFieldsEdgeFirewallRulesEngine.vue +++ b/src/views/EdgeFirewallRulesEngine/FormFields/FormFieldsEdgeFirewallRulesEngine.vue @@ -467,8 +467,8 @@ const setNetworkListOptions = async () => { try { loadingNetworkList.value = true - const result = await props.listNetworkListService() - networkListOptions.value = result + const { body } = await props.listNetworkListService({ pageSize: 100 }) + networkListOptions.value = body } catch (error) { toast.add({ closable: true, From 9b0405eab0efeda86ea1422dc0e2013fa8745b8c Mon Sep 17 00:00:00 2001 From: paulosf0 Date: Tue, 14 Jan 2025 09:35:45 -0300 Subject: [PATCH 2/3] feat: migrate network list to v4 --- .../waf-rules-services/list-network-list-service.js | 8 ++++---- .../waf-rules-services/list-network-list-service.test.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/services/waf-rules-services/list-network-list-service.js b/src/services/waf-rules-services/list-network-list-service.js index c9f70fc4d..931ef6eee 100644 --- a/src/services/waf-rules-services/list-network-list-service.js +++ b/src/services/waf-rules-services/list-network-list-service.js @@ -1,9 +1,9 @@ import { AxiosHttpClientAdapter, parseHttpResponse } from '../axios/AxiosHttpClientAdapter' -import { makeNetworkListBaseUrl } from '../network-lists-services/make-network-list-base-url' +import { makeNetworkListBaseUrl } from '../network-lists-services/v4/make-network-list-service' export const listNetworkListService = async () => { let httpResponse = await AxiosHttpClientAdapter.request({ - url: `${makeNetworkListBaseUrl()}?pagination=false&exclude_azion_lists=true`, + url: `${makeNetworkListBaseUrl()}?page_size=100`, method: 'GET' }) @@ -16,8 +16,8 @@ const adapt = (httpResponse) => { const networkList = isArray ? httpResponse.body.results.map((networkList) => { - const disabledIP = networkList.list_type === 'ip_cidr' - const disabledCountries = networkList.list_type === 'countries' + const disabledIP = networkList.type === 'ip_cidr' + const disabledCountries = networkList.type === 'countries' return { value: { id: networkList.id, diff --git a/src/tests/services/waf-rules-services/list-network-list-service.test.js b/src/tests/services/waf-rules-services/list-network-list-service.test.js index df4533bef..da0642a36 100644 --- a/src/tests/services/waf-rules-services/list-network-list-service.test.js +++ b/src/tests/services/waf-rules-services/list-network-list-service.test.js @@ -37,7 +37,7 @@ describe('WafRulesServices', () => { await sut() expect(requestSpy).toHaveBeenCalledWith({ - url: `v3/network_lists?pagination=false&exclude_azion_lists=true`, + url: `v4/workspace/network_lists?page_size=100`, method: 'GET' }) }) From bf43d4687821da6b35438d6fc40577ec48bb2569 Mon Sep 17 00:00:00 2001 From: paulosf0 Date: Tue, 14 Jan 2025 10:49:02 -0300 Subject: [PATCH 3/3] refactor: remove key value from networkList --- src/services/waf-rules-services/list-network-list-service.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/services/waf-rules-services/list-network-list-service.js b/src/services/waf-rules-services/list-network-list-service.js index 931ef6eee..da80b7c9b 100644 --- a/src/services/waf-rules-services/list-network-list-service.js +++ b/src/services/waf-rules-services/list-network-list-service.js @@ -21,7 +21,6 @@ const adapt = (httpResponse) => { return { value: { id: networkList.id, - value: networkList.value, disabledIP, disabledCountries },