Deploy 2024-11-12

azion.config.cjs

@@ -243,6 +243,19 @@ const backRules = [
       rewrite: '/billing/graphql'
     }
   },
+  {
+    name: 'Route GraphQL Accounting Queries to Manager Origin',
+    description: 'Routes GraphQL Accounting queries to the Manager, updating the URI accordingly',
+    match: '^/graphql/accounting',
+    behavior: {
+      forwardCookies: true,
+      setOrigin: {
+        name: 'origin-manager',
+        type: 'single_origin'
+      },
+      rewrite: '/accounting/graphql'
+    }
+  },
   {
     name: 'Route Send Feedback',
     description: 'this route will send user feedback to jira',

azion/production/azion.json

@@ -152,6 +152,11 @@
         "id": 297983,
         "name": "Route Send Feedback",
         "phase": "request"
+      },
+      {
+        "id": 313139,
+        "name": "Route API Identity Providers",
+        "phase": "request"
       }
     ]
   },

azion/stage/azion.json

@@ -157,6 +157,11 @@
         "id": 312030,
         "name": "Route API Identity Providers",
         "phase": "request"
+      },
+      {
+        "id": 317377,
+        "name": "Route GraphQL Accounting Queries to Manager Origin",
+        "phase": "request"
       }
     ]
   },

cypress/e2e/domains/create-domain-edge-application.cy.js

@@ -4,8 +4,10 @@ import generateUniqueName from '../../support/utils'
 let domainName
 let edgeAppName
 let digitalCertificateName
+let firewallName
 const createEdgeApplicationCase = () => {
   edgeAppName = generateUniqueName('EdgeApp')
+  firewallName = generateUniqueName('EdgeFirewall')
   // Arrange
   cy.get(selectors.edgeApplication.mainSettings.nameInput).type(edgeAppName)
   cy.get(selectors.edgeApplication.mainSettings.addressInput).type(`${edgeAppName}.edge.app`)
@@ -17,6 +19,14 @@ const createEdgeApplicationCase = () => {
   cy.verifyToast('success', 'Your edge application has been created')
 }
 
+const createEdgeFirewallCase = () => {
+  cy.get(selectors.edgeFirewall.nameInput).clear()
+  cy.get(selectors.edgeFirewall.nameInput).type(firewallName)
+  cy.intercept('GET', '/api/v3/edge_firewall*').as('getEdgeFirewallApi')
+  cy.get(selectors.domains.edgeFirewallActionBar).find(selectors.form.actionsSubmitButton).click()
+  cy.wait('@getEdgeFirewallApi')
+}
+
 const createDigitalCertificateCase = () => {
   digitalCertificateName = generateUniqueName('digitalCertificate')
   cy.get(selectors.digitalCertificates.digitalCertificateName).type(digitalCertificateName)
@@ -60,8 +70,10 @@ describe('Domains spec', { tags: ['@dev3'] }, () => {
     cy.get(selectors.domains.edgeApplicationField).click()
     cy.get(selectors.domains.createEdgeApplicationButton).click()
     createEdgeApplicationCase()
-    cy.get(selectors.domains.cnamesField).type(`${domainName}.edge.app`)
-
+    cy.get(selectors.domains.edgeFirewallField).click()
+    cy.get(selectors.domains.createEdgeFirewallButton).click()
+    createEdgeFirewallCase()
+    cy.get(selectors.domains.cnameAccessOnlyField).click()
     cy.get(selectors.domains.digitalCertificateDropdown).click()
     cy.get(selectors.domains.createDigitalCertificateButton).click()
     createDigitalCertificateCase()

cypress/support/selectors/product-selectors/domains.js

@@ -4,19 +4,23 @@ export default {
   edgeApplicationField: '[data-testid="domains-form__edge-application-field__dropdown"]',
   edgeApplicationDropdownFilter:
     '[data-testid="domains-form__edge-application-field__dropdown-filter-input"]',
+  edgeFirewallField: '[data-testid="domains-form__edge-firewall-field__dropdown"]',
   mtlsTrustedCADropdownFilter:
     '[data-testid="domains-form__mtls-trusted-certificate-field__dropdown-filter-input"]',
   edgeApplicationOption: '#edgeApplication_0',
   edgeCertificateOption: '#edgeCertificate_0',
   cnamesField: '[data-testid="domains-form__cnames-field__textarea"]',
   createEdgeApplicationButton: '[data-testid="domains-form__create-edge-application-button"]',
+  createEdgeFirewallButton: '[data-testid="domains-form__create-edge-firewall-button"]',
   edgeApplicationDrawer: '.p-sidebar-content',
   dialogTitle: '[data-testid="domains-view__copy-domain-dialog__header-title"]',
   domainField: '[data-testid="domains-dialog__domain-field__input"]',
   digitalCertificateDropdownFilter:
     '[data-testid="domains-form__edge-certificate-field__dropdown-filter-input"]',
   createDigitalCertificateButton: '[data-testid="domains-form__create-digital-certificate-button"]',
   digitalCertificateActionBar: '[data-testid="digital-certificates-drawer__action-bar"]',
+  edgeFirewallActionBar: '[data-testid="edge-firewall-drawer__action-bar"]',
+  cnameAccessOnlyField: '[data-testid="domains-form__cname-access-only-field"]',
   copyDomainButton: '[data-testid="domains-dialog__copy-domain__button"]',
   confirmButton: '[data-testid="domains-dialog__confirm__button"]',
   pageTitle: (entityName) => `[data-testid="page_title_${entityName}"]`,

src/helpers/convert-array-objects-to-camel-case.js

@@ -0,0 +1,22 @@
+import { parseSnakeToCamel } from './parse-api-body'
+
+/**
+ * Converts all properties of an array of objects from snake_case to camelCase, including nested objects
+ * @param {Array<Object>} arrayOfObjects - Array containing objects with properties in snake_case
+ * @returns {Array<Object>} - New array with objects containing properties in camelCase
+ */
+export const convertArrayObjectsToCamelCase = (arrayOfObjects) => {
+  return arrayOfObjects.map((object) => {
+    const convertedObject = {}
+    for (const key in object) {
+      const camelKey = key.replace(/_([a-z])/g, (match) => match[1].toUpperCase())
+      convertedObject[camelKey] =
+        typeof object[key] === 'object' && object[key] !== null
+          ? Array.isArray(object[key])
+            ? convertArrayObjectsToCamelCase(object[key])
+            : parseSnakeToCamel(object[key])
+          : object[key]
+    }
+    return convertedObject
+  })
+}

src/helpers/make-list-service-query-params.js

@@ -0,0 +1,19 @@
+/**
+ * Creates URLSearchParams object for list service queries
+ * @param {Object} params - Query parameters
+ * @param {string} params.fields - Fields to return
+ * @param {string} params.ordering - Field to order by
+ * @param {number} params.page - Page number
+ * @param {number} params.pageSize - Items per page
+ * @returns {URLSearchParams} URLSearchParams object
+ */
+export const makeListServiceQueryParams = ({ fields, ordering, page, pageSize, search }) => {
+  const searchParams = new URLSearchParams()
+
+  if (fields) searchParams.append('fields', fields)
+  if (ordering) searchParams.append('ordering', ordering)
+  if (page) searchParams.append('page', page.toString())
+  if (pageSize) searchParams.append('page_size', pageSize.toString())
+  if (search) searchParams.append('search', search)
+  return searchParams
+}

src/helpers/payment-history.js

@@ -0,0 +1,11 @@
+const getLastDayMonth = () => {
+  const today = new Date()
+  const year = today.getFullYear()
+  const month = today.getMonth()
+
+  const dateFinal = new Date(year, month + 1, 0)
+
+  return dateFinal.toISOString().split('T')[0]
+}
+
+export { getLastDayMonth }

src/modules/real-time-metrics/constants/services-operator-in.js

@@ -1,15 +1,15 @@
 import {
   searchEdgeFunctionsService,
-  searchDomainsService,
   searchEdgeDnsService,
   searchBotCategoryService,
   searchChallengeSolvedService,
   searchClassifiedService,
-  searchActionService
+  searchActionService,
+  searchWorkloadsService
 } from '@/services/real-time-metrics-services'
 
 const MAP_SERVICE_OPERATION = {
-  configurationIdIn: searchDomainsService,
+  configurationIdIn: searchWorkloadsService,
   zoneIdIn: searchEdgeDnsService,
   edgeFunctionIdIn: searchEdgeFunctionsService,
   botCategoryIn: searchBotCategoryService,

src/router/hooks/afterEachRoute.js

@@ -6,7 +6,7 @@ import { inject } from 'vue'
 /** @type {import('vue-router').NavigationHookAfter} */
 export default function afterEachRoute(to, from, failure) {
   const loadingStore = useLoadingStore()
-  const { hasActiveUserId } = useAccountStore()
+  const { hasActiveUserId, userId } = useAccountStore()
   loadingStore.finishLoading()
 
   if (failure || !hasActiveUserId) return
@@ -17,4 +17,5 @@ export default function afterEachRoute(to, from, failure) {
       url: to.fullPath
     })
     .track()
+  tracker.identify(userId)
 }

src/router/hooks/beforeEachRoute.js

@@ -6,7 +6,8 @@ import {
   billingGuard,
   redirectGuard,
   redirectToManagerGuard,
-  ssoManagementGuard
+  ssoManagementGuard,
+  domainsLimitGuard
 } from '@/router/hooks/guards'
 import { useHelpCenterStore } from '@/stores/help-center'
 import { useRouter } from 'vue-router'
@@ -24,6 +25,7 @@ export default async function beforeEachRoute(guardDependency) {
     billingGuard,
     redirectGuard,
     ssoManagementGuard,
+    domainsLimitGuard,
     redirectToManagerGuard
   ]
 

src/router/hooks/guards/SSOManagementGuard.js

@@ -4,4 +4,4 @@ export function ssoManagementGuard({ to, accountStore }) {
   if (to.fullPath.includes('identity-providers') && !accountStore.hasAccessToSSOManagement) {
     return '/'
   }
-}
+}

src/router/hooks/guards/billingGuard.js

@@ -1,32 +1,19 @@
 import { billingRoutes } from '@/router/routes/billing-routes'
-import { getStaticUrlsByEnvironment } from '@/helpers'
 
 const BILLING_REDIRECT_OPTIONS = {
   path: `${billingRoutes.path}/payment`,
   query: { paymentSession: 'true' }
 }
 
-const billingUrl = getStaticUrlsByEnvironment('billing')
-
 /** @type {import('vue-router').NavigationGuardWithThis} */
 export async function billingGuard({ to, accountStore }) {
-  const {
-    hasActiveUserId,
-    redirectToExternalBillingNeeded,
-    billingAccessPermitted,
-    paymentReviewPending
-  } = accountStore
+  const { hasActiveUserId, billingAccessPermitted, paymentReviewPending } = accountStore
 
   const isPrivateRoute = !to.meta.isPublic
   const isCurrentRouteBilling = to.fullPath.includes(billingRoutes.path)
 
   if (isPrivateRoute && hasActiveUserId) {
     if (isCurrentRouteBilling) {
-      if (redirectToExternalBillingNeeded) {
-        window.open(billingUrl, '_blank')
-        return false
-      }
-
       if (!billingAccessPermitted) {
         return '/'
       }

src/router/hooks/guards/domainsLimitGuard.js

@@ -0,0 +1,24 @@
+import { listWorkloadsService } from '@/services/workloads-services'
+/** @type {import('vue-router').NavigationGuardWithThis} */
+
+export async function domainsLimitGuard({ to, accountStore }) {
+  const { hasActiveUserId } = accountStore
+  if (!hasActiveUserId) {
+    return true
+  }
+
+  const isCreateOrEditDataStream =
+    to.name === 'create-data-stream' || to.name === 'edit-data-stream'
+  if (isCreateOrEditDataStream) {
+    const workloads = await listWorkloadsService({
+      fields: 'id',
+      ordering: 'id',
+      page: 1,
+      pageSize: 1
+    })
+    const isMaxDomainsReached = workloads.count >= 3000
+    if (isMaxDomainsReached) {
+      return '/'
+    }
+  }
+}

src/router/hooks/guards/index.js

@@ -6,7 +6,7 @@ import { billingGuard } from './billingGuard'
 import { redirectGuard } from './redirectGuard'
 import { redirectToManagerGuard } from './redirectToManagerGuard'
 import { ssoManagementGuard } from './SSOManagementGuard'
-
+import { domainsLimitGuard } from './domainsLimitGuard'
 export {
   logoutGuard,
   loadingGuard,
@@ -15,5 +15,6 @@ export {
   billingGuard,
   redirectGuard,
   redirectToManagerGuard,
-  ssoManagementGuard
+  ssoManagementGuard,
+  domainsLimitGuard
 }

src/router/index.js

@@ -13,6 +13,7 @@ import { edgeApplicationRoutes } from '@routes/edge-application-routes'
 import { edgeFirewallRoutes } from '@routes/edge-firewall-routes'
 import { edgeFunctionsRoutes } from '@routes/edge-functions-routes'
 import { edgeNodeRoutes } from '@routes/edge-node-routes'
+import { resellerManagementRoutes } from '@routes/reseller-management-routes'
 import { edgePulseRoutes } from '@routes/edge-pulse-routes'
 import { edgeServicesRoutes } from '@routes/edge-services-routes'
 import { errorRoutes } from '@routes/error-routes'
@@ -44,7 +45,8 @@ import beforeEachRoute from './hooks/beforeEachRoute'
 import { useAccountStore } from '@/stores/account'
 import { identityProvidersRoutes } from '@routes/identity-providers-routes'
 import { loadContractServicePlan } from '@/services/contract-services'
-
+import { groupManagementRoutes } from '@routes/group-management-routes'
+import { clientManagementRoutes } from '@routes/client-management-routes'
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
   routes: [
@@ -85,7 +87,10 @@ const router = createRouter({
     billingRoutes,
     importGithubRoutes,
     azionAiRoutes,
-    compareWithAzionRoutes
+    compareWithAzionRoutes,
+    resellerManagementRoutes,
+    groupManagementRoutes,
+    clientManagementRoutes
   ].concat(errorRoutes)
 })
 

src/router/routes/client-management-routes/index.js

@@ -0,0 +1,20 @@
+/** @type {import('vue-router').RouteRecordRaw} */
+export const clientManagementRoutes = {
+  path: '/client/management',
+  name: 'client-management',
+  children: [
+    {
+      path: '',
+      name: 'client-management',
+      component: () => import('@views/ClientManagement/ListView.vue'),
+      meta: {
+        breadCrumbs: [
+          {
+            label: 'Client Management',
+            to: '/client/management'
+          }
+        ]
+      }
+    }
+  ]
+}

src/router/routes/group-management-routes/index.js

@@ -0,0 +1,20 @@
+/** @type {import('vue-router').RouteRecordRaw} */
+export const groupManagementRoutes = {
+  path: '/group/management',
+  name: 'group-management',
+  children: [
+    {
+      path: '',
+      name: 'group-management',
+      component: () => import('@views/GroupManagement/ListView.vue'),
+      meta: {
+        breadCrumbs: [
+          {
+            label: 'Group Management',
+            to: '/group/management'
+          }
+        ]
+      }
+    }
+  ]
+}

src/router/routes/reseller-management-routes/index.js

@@ -0,0 +1,20 @@
+/** @type {import('vue-router').RouteRecordRaw} */
+export const resellerManagementRoutes = {
+  path: '/reseller/management',
+  name: 'reseller-management',
+  children: [
+    {
+      path: '',
+      name: 'reseller-management',
+      component: () => import('@views/ResellerManagement/ListView.vue'),
+      meta: {
+        breadCrumbs: [
+          {
+            label: 'Reseller Management',
+            to: '/reseller/management'
+          }
+        ]
+      }
+    }
+  ]
+}

src/services/accounts-management-services/index.js

@@ -0,0 +1,3 @@
+import { listAccountsService } from './list-accounts-service'
+
+export { listAccountsService }