Merge pull request #694 from aziontech/dev

DEPLOY 2024.02.07

.husky/pre-push

@@ -1,6 +1,7 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
+echo "checking build integrity"
 yarn build
 rm -rf dist
 rm -rf coverage

.nvmrc

@@ -1 +1 @@
-18.16.0
+20.11.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "azion-platform-kit",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "private": true,
   "type": "module",
   "repository": {
@@ -46,6 +46,7 @@
     "@commitlint/config-conventional": "^17.7.0",
     "@rushstack/eslint-patch": "^1.3.2",
     "@tailwindcss/typography": "^0.5.10",
+    "caniuse-lite": "^1.0.30001584",
     "@types/c3": "^0.7.11",
     "@vitejs/plugin-vue": "^4.2.3",
     "@vitejs/plugin-vue-jsx": "^3.0.1",

src/helpers/azion-documentation-catalog.js

@@ -16,6 +16,7 @@ export const documentationCatalog = {
   dataStreaming: () => openSearchResult('data streaming'),
   edgeFunctions: () => openSearchResult('edge functions'),
   edgeFirewall: () => openSearchResult('edge firewall'),
+  edgeFirewallRulesEngine: () => openSearchResult('edge firewall rules engine'),
   edgeApplication: () => openSearchResult('edge application'),
   edgeApplicationOrigins: () => openSearchResult('edge application origins'),
   edgeApplicationCacheSettings: () => openSearchResult('cache settings'),

src/helpers/metrics-playground-opener.js

@@ -1,3 +1,8 @@
+import { getEnvironmentFromUrl } from './get-environment-from-url'
+
 export const metricsPlaygroundOpener = () => {
-  window.open('https://azion.com', '_blank')
+  const environment = getEnvironmentFromUrl(window.location.href)
+  const subdomain = environment === 'prod' ? 'manager' : 'stage-manager'
+
+  window.open(`https://${subdomain}.azion.com/metrics/graphql`, '_blank')
 }

src/router/routes/edge-firewall-routes/index.js

@@ -1,7 +1,9 @@
 import * as Helpers from '@/helpers'
 import * as DomainServices from '@/services/domains-services'
-import * as EdgeFirewall from '@/services/edge-firewall-services'
-import * as EdgeFirewallFunctions from '@/services/edge-firewall-functions-services'
+import * as EdgeFirewallServices from '@/services/edge-firewall-services'
+import * as EdgeFirewallFunctionsServices from '@/services/edge-firewall-functions-services'
+import * as EdgeFirewallRulesEngineServices from '@/services/edge-firewall-rules-engine-services'
+import * as WafRulesServices from '@/services/waf-rules-services'
 
 /** @type {import('vue-router').RouteRecordRaw} */
 export const edgeFirewallRoutes = {
@@ -13,8 +15,8 @@ export const edgeFirewallRoutes = {
       name: 'list-edge-firewall',
       component: () => import('@views/EdgeFirewall/ListView.vue'),
       props: {
-        listEdgeFirewallService: EdgeFirewall.listEdgeFirewallService,
-        deleteEdgeFirewallService: EdgeFirewall.deleteEdgeFirewallService,
+        listEdgeFirewallService: EdgeFirewallServices.listEdgeFirewallService,
+        deleteEdgeFirewallService: EdgeFirewallServices.deleteEdgeFirewallService,
         documentationService: Helpers.documentationCatalog.edgeFirewall
       },
       meta: {
@@ -32,7 +34,7 @@ export const edgeFirewallRoutes = {
       component: () => import('@views/EdgeFirewall/CreateView.vue'),
       props: {
         listDomainsService: DomainServices.listDomainsService,
-        createEdgeFirewallService: EdgeFirewall.createEdgeFirewallService
+        createEdgeFirewallService: EdgeFirewallServices.createEdgeFirewallService
       },
       meta: {
         breadCrumbs: [
@@ -52,21 +54,38 @@ export const edgeFirewallRoutes = {
       name: 'edit-edge-firewall',
       component: () => import('@/views/EdgeFirewall/TabsView.vue'),
       props: {
+        listDomainsService: DomainServices.listDomainsService,
         edgeFirewallServices: {
-          createEdgeFirewallService: EdgeFirewall.createEdgeFirewallService,
-          loadEdgeFirewallService: EdgeFirewall.loadEdgeFirewallService,
-          editEdgeFirewallService: EdgeFirewall.editEdgeFirewallService,
+          createEdgeFirewallService: EdgeFirewallServices.createEdgeFirewallService,
+          loadEdgeFirewallService: EdgeFirewallServices.loadEdgeFirewallService,
+          editEdgeFirewallService: EdgeFirewallServices.editEdgeFirewallService,
 
-          listEdgeFunctionsService: EdgeFirewallFunctions.listEdgeFunctionsService,
-          listEdgeFirewallFunctionService: EdgeFirewallFunctions.listEdgeFirewallFunctionsService,
-          createFunctionService: EdgeFirewallFunctions.createFunctionService,
-          editFunctionService: EdgeFirewallFunctions.editFunctionService,
-          deleteFunctionService: EdgeFirewallFunctions.deleteFunctionService,
-          loadFunctionService: EdgeFirewallFunctions.loadFunctionService,
+          listEdgeFunctionsService: EdgeFirewallFunctionsServices.listEdgeFunctionsService,
+          listEdgeFirewallFunctionService:
+            EdgeFirewallFunctionsServices.listEdgeFirewallFunctionsService,
+          createFunctionService: EdgeFirewallFunctionsServices.createFunctionService,
+          editFunctionService: EdgeFirewallFunctionsServices.editFunctionService,
+          deleteFunctionService: EdgeFirewallFunctionsServices.deleteFunctionService,
+          loadFunctionService: EdgeFirewallFunctionsServices.loadFunctionService,
           documentationService: Helpers.documentationCatalog.edgeFirewall,
           updatedRedirect: 'list-edge-firewall'
         },
-        listDomainsService: DomainServices.listDomainsService
+        rulesEngineServices: {
+          listEdgeFirewallRulesEngineService:
+            EdgeFirewallRulesEngineServices.listEdgeFirewallRulesEngineService,
+          deleteEdgeFirewallRulesEngineService:
+            EdgeFirewallRulesEngineServices.deleteEdgeFirewallRulesEngineService,
+          createEdgeFirewallRulesEngineService:
+            EdgeFirewallRulesEngineServices.createEdgeFirewallRulesEngineService,
+          loadEdgeFirewallRulesEngineService:
+            EdgeFirewallRulesEngineServices.loadEdgeFirewallRulesEngineService,
+          editEdgeFirewallRulesEngineService:
+            EdgeFirewallRulesEngineServices.editEdgeFirewallRulesEngineService,
+
+          listFunctionsService: EdgeFirewallFunctionsServices.listFunctionsService,
+          listWafRulesService: WafRulesServices.listWafRulesService,
+          documentationService: Helpers.documentationCatalog.edgeFirewallRulesEngine
+        }
       },
       meta: {
         breadCrumbs: [

src/router/routes/metrics-routes/index.js

@@ -1,12 +1,13 @@
-import { metricsPlaygroundOpener } from '@/helpers'
+import { clipboardWrite, metricsPlaygroundOpener } from '@/helpers'
 
 /** @type {import('vue-router').RouteRecordRaw} */
 export const metricsRoutes = {
   path: '/real-time-metrics/:pageId?/:dashboardId?',
   name: 'real-time-metrics',
   component: () => import('@views/Metrics/MetricsView.vue'),
   props: {
-    playgroundOpener: metricsPlaygroundOpener
+    playgroundOpener: metricsPlaygroundOpener,
+    clipboardWrite
   },
   meta: {
     breadCrumbs: [

src/router/routes/waf-rules-routes/index.js

@@ -39,7 +39,7 @@ export const wafRulesRoutes = {
             to: '/waf'
           },
           {
-            label: 'New WAF Rules',
+            label: 'Create WAF Rule',
             to: '/waf/create'
           }
         ]
@@ -80,7 +80,7 @@ export const wafRulesRoutes = {
             to: '/waf'
           },
           {
-            label: 'Edit Waf Rules'
+            label: 'Edit WAF Rule'
           }
         ]
       }

src/services/account-settings-services/get-account-settings-service.js

@@ -13,7 +13,7 @@ export const getAccountSettingsService = async () => {
 const adapt = (response) => {
   return {
     accountName: response.name,
-    clientId: response.id,
+    clientId: response.client_id,
     companyName: response.company_name,
     uniqueIdentifier: response.unique_identifier,
     billingEmails: response.billing_emails,

src/services/data-streaming-services/create-data-streaming-service.js

@@ -127,11 +127,13 @@ const getHeaders = (listHeaders) => {
   const headers = {}
   if (listHeaders.length > 0) {
     listHeaders.forEach((element) => {
-      const [key, ...rest] = element.value.includes(':')
-        ? element.value.split(':')
-        : [element.value]
-      const headerKey = key.trim()
-      headers[headerKey] = rest.length > 0 ? rest.join(':').trim() : headerKey
+      if (element.value.trim().length > 0) {
+        const [key, ...rest] = element.value.includes(':')
+          ? element.value.split(':')
+          : [element.value]
+        const headerKey = key.trim()
+        headers[headerKey] = rest.length > 0 ? rest.join(':').trim() : headerKey
+      }
     })
   }
   return headers

src/services/data-streaming-services/edit-data-streaming-service.js

@@ -127,11 +127,13 @@ const getHeaders = (listHeaders) => {
   const headers = {}
   if (listHeaders.length > 0) {
     listHeaders.forEach((element) => {
-      const [key, ...rest] = element.value.includes(':')
-        ? element.value.split(':')
-        : [element.value]
-      const headerKey = key.trim()
-      headers[headerKey] = rest.length > 0 ? rest.join(':').trim() : headerKey
+      if (element.value.trim().length > 0) {
+        const [key, ...rest] = element.value.includes(':')
+          ? element.value.split(':')
+          : [element.value]
+        const headerKey = key.trim()
+        headers[headerKey] = rest.length > 0 ? rest.join(':').trim() : headerKey
+      }
     })
   }
   return headers

src/services/edge-application-origins-services/create-origin-service.js

@@ -39,18 +39,17 @@ const adapt = (payload) => {
 /**
  * @param {Object} errorSchema - The error schema.
  * @param {string} key - The error key of error schema.
- * @returns {string|undefined} The result message based on the status code.
+ * @returns {Object} An object containing the most specific error key and its message.
  */
 const extractErrorKey = (errorSchema, key) => {
-  if (Array.isArray(errorSchema[key])) {
-    if (typeof errorSchema[key][0] === 'object') {
-      const newError = errorSchema[key][0]
-      const errorKey = Object.keys(errorSchema[key][0])
-      return newError[errorKey]?.[0]
+  const errorValue = errorSchema[key]
+  if (Array.isArray(errorValue)) {
+    if (errorValue.length > 0 && typeof errorValue[0] === 'object') {
+      return extractErrorKey(errorValue[0], Object.keys(errorValue[0])[0])
     }
-    return errorSchema[key]?.[0]
+    return { key, message: errorValue[0] }
   }
-  return errorSchema[key]
+  return { key, message: errorValue }
 }
 
 /**
@@ -59,9 +58,12 @@ const extractErrorKey = (errorSchema, key) => {
  * @returns {string} The result message based on the status code.
  */
 const extractApiError = (httpResponse) => {
-  const errorKey = Object.keys(httpResponse.body)[0]
-  const apiError = extractErrorKey(httpResponse.body, errorKey)
-  return `${errorKey}: ${apiError}`
+  for (const key of Object.keys(httpResponse.body)) {
+    const { key: innerKey, message } = extractErrorKey(httpResponse.body, key)
+    if (message) {
+      return `${innerKey}: ${message}`
+    }
+  }
 }
 
 /**

src/services/edge-application-origins-services/edit-origin-service.js

@@ -14,18 +14,22 @@ export const editOriginService = async (payload) => {
 }
 
 const adapt = (payload) => {
-  const payloadAdapted = {
+  let payloadAdapted = {
     name: payload.name,
     host_header: payload.hostHeader,
     origin_type: payload.originType,
-    method: payload.method,
     is_origin_redirection_enabled: payload.isOriginRedirectionEnabled,
-    addresses: payload.addresses?.map((addressItem) => ({
-      address: addressItem.address,
-      weight: addressItem.weight,
-      server_role: addressItem.serverRole,
-      is_active: addressItem.isActive
-    })),
+    addresses: payload.addresses?.map((addressItem) => {
+      const address = {
+        address: addressItem.address,
+        server_role: addressItem.serverRole,
+        is_active: addressItem.isActive
+      }
+      if (addressItem.weight) {
+        address.weight = addressItem.weight
+      }
+      return address
+    }),
     origin_path: payload.originPath,
     origin_protocol_policy: payload.originProtocolPolicy,
     hmac_authentication: payload.hmacAuthentication,
@@ -36,19 +40,27 @@ const adapt = (payload) => {
     timeout_between_bytes: payload.timeoutBetweenBytes
   }
 
+  if (payload.method) {
+    payloadAdapted.method = payload.method
+  }
+
   return payloadAdapted
 }
 
 /**
  * @param {Object} errorSchema - The error schema.
  * @param {string} key - The error key of error schema.
- * @returns {string|undefined} The result message based on the status code.
+ * @returns {Object} An object containing the most specific error key and its message.
  */
 const extractErrorKey = (errorSchema, key) => {
-  if (Array.isArray(errorSchema[key])) {
-    return errorSchema[key]?.[0]
+  const errorValue = errorSchema[key]
+  if (Array.isArray(errorValue)) {
+    if (errorValue.length > 0 && typeof errorValue[0] === 'object') {
+      return extractErrorKey(errorValue[0], Object.keys(errorValue[0])[0])
+    }
+    return { key, message: errorValue[0] }
   }
-  return errorSchema[key]
+  return { key, message: errorValue }
 }
 
 /**
@@ -57,9 +69,12 @@ const extractErrorKey = (errorSchema, key) => {
  * @returns {string} The result message based on the status code.
  */
 const extractApiError = (httpResponse) => {
-  const errorKey = Object.keys(httpResponse.body)[0]
-  const apiError = extractErrorKey(httpResponse.body, errorKey)
-  return `${errorKey}: ${apiError}`
+  for (const key of Object.keys(httpResponse.body)) {
+    const { key: innerKey, message } = extractErrorKey(httpResponse.body, key)
+    if (message) {
+      return `${innerKey}: ${message}`
+    }
+  }
 }
 
 /**

src/services/edge-application-rules-engine-services/edit-rules-engine-service.js

@@ -24,10 +24,13 @@ export const editRulesEngineService = async ({ id, payload, reorder = false }) =
  * @returns {string}
  */
 const generateRulePhase = (payload) => {
-  const DEFAULT_RULE_PHASE = 'Default'
-  return payload.phase.content === DEFAULT_RULE_PHASE
-    ? 'request'
-    : payload.phase.content?.toLowerCase()
+  let rulePhase = payload.phase
+  if (payload.phase?.content) {
+    rulePhase = payload.phase?.content
+  }
+
+  const DEFAULT_RULE_PHASE = 'default'
+  return rulePhase === DEFAULT_RULE_PHASE ? 'request' : rulePhase.toLowerCase()
 }
 
 const adapt = (payload, reorder) => {

src/services/edge-application-services/create-edge-application-service.js

@@ -30,7 +30,7 @@ const adapt = (payload) => {
       : 0,
     cdn_cache_settings: payload.cdnCacheSettings,
     cdn_cache_settings_maximum_ttl: payload.cdnCacheSettingsMaximumTtl,
-    active: payload.active
+    debug_rules: payload.debugRules
   }
 }
 

src/services/edge-application-services/list-edge-applications-service.js

@@ -26,15 +26,6 @@ const adapt = (httpResponse) => {
       id: edgeApplication.id,
       name: edgeApplication.name,
       origins: originNames,
-      status: edgeApplication.active
-        ? {
-            content: 'Active',
-            severity: 'success'
-          }
-        : {
-            content: 'Inactive',
-            severity: 'danger'
-          },
       lastEditor: edgeApplication.last_editor,
       lastModify: dateFormat(edgeApplication.last_modified),
       lastModifyDate: edgeApplication.last_modified

src/services/edge-firewall-functions-services/index.js

@@ -4,12 +4,14 @@ import { createFunctionService } from './create-function-service'
 import { editFunctionService } from './edit-function-service'
 import { deleteFunctionService } from './delete-function-service'
 import { loadFunctionService } from './loader-function-service'
+import { listFunctionsService } from './list-functions-service'
 
 export {
   listEdgeFirewallFunctionsService,
   createFunctionService,
   editFunctionService,
   deleteFunctionService,
   listEdgeFunctionsService,
-  loadFunctionService
+  loadFunctionService,
+  listFunctionsService
 }