Merge pull request #1012 from aziontech/revert-1011-dev

Revert "DEPLOY 2024.04.19"

.vscode/extensions.json

@@ -1,3 +1,3 @@
 {
-  "recommendations": ["Vue.volar", "Vue.vscode-typescript-vue-plugin"],
+  "recommendations": ["Vue.volar", "Vue.vscode-typescript-vue-plugin"]
 }

index.html

@@ -9,6 +9,28 @@
       rel="icon"
       href="/favicon.ico"
     />
+    <!-- Font preloads -->
+    <link
+      rel="preload"
+      href="https://fonts.azion.com/roboto/roboto-regular.woff"
+      as="font"
+      type="font/woff"
+      crossorigin
+    />
+    <link
+      rel="preload"
+      href="https://fonts.azion.com/roboto-mono/roboto-mono-regular.ttf"
+      as="font"
+      type="font/woff"
+      crossorigin
+    />
+    <link
+      rel="preload"
+      href="https://fonts.azion.com/roboto/roboto-black.woff"
+      as="font"
+      type="font/woff"
+      crossorigin
+    />
     <meta
       name="viewport"
       content="width=device-width, initial-scale=1.0"
@@ -52,4 +74,3 @@
     </noscript>
   </body>
 </html>
-

package.json

@@ -1,6 +1,6 @@
 {
   "name": "azion-platform-kit",
-  "version": "1.13.0",
+  "version": "1.12.0",
   "private": true,
   "type": "module",
   "repository": {
@@ -69,7 +69,7 @@
     "sass": "^1.68.0",
     "start-server-and-test": "^2.0.0",
     "tailwindcss": "^3.3.3",
-    "vite": "^4.5.3",
+    "vite": "^4.5.2",
     "vitest": "^0.33.0",
     "vitest-sonar-reporter": "^1.0.0"
   }

src/App.vue

@@ -1,5 +1,4 @@
 <script setup>
-  import DynamicDialog from 'primevue/dynamicdialog'
   import { computed, inject, watch } from 'vue'
   import { RouterView, useRoute } from 'vue-router'
   import ShellBlock from '@/templates/shell-block'
@@ -8,7 +7,6 @@
   import { themeSelect } from '@/helpers'
   import '@modules/real-time-metrics/helpers/convert-date'
   import '@/helpers/store-handler'
-
   /** @type {import('@/plugins/analytics/AnalyticsTrackerAdapter').AnalyticsTrackerAdapter} */
   const tracker = inject('tracker')
 
@@ -41,7 +39,6 @@
 
 <template>
   <div class="flex flex-col">
-    <DynamicDialog />
     <ShellBlock
       v-slot:default="{ customClass }"
       :isLogged="isLogged"

src/assets/icons/azionicons.scss

@@ -108,36 +108,3 @@
 .ai.ai-edge-orchestrator::before {
   content: '\ea31';
 }
-.ai.ai-nextjs::before {
-  content: '\ea32';
-}
-.ai.ai-vue::before {
-  content: '\ea33';
-}
-.ai.ai-redis::before {
-  content: '\ea34';
-}
-.ai.ai-vite::before {
-  content: '\ea35';
-}
-.ai.ai-gatsby::before {
-  content: '\ea36';
-}
-.ai.ai-hexo::before {
-  content: '\ea37';
-}
-.ai.ai-eleventy::before {
-  content: '\ea38';
-}
-.ai.ai-react::before {
-  content: '\ea39';
-}
-.ai.ai-remix::before {
-  content: '\ea40';
-}
-.ai.ai-angular::before {
-  content: '\ea41';
-}
-.ai.ai-astro::before {
-  content: '\ea42';
-}

src/assets/themes/scss/themes/azion-dark/extended-components/_datatable.scss

@@ -48,10 +48,6 @@
       }
     }
   }
-
-  .p-datatable-wrapper {
-    overscroll-behavior: revert !important;
-  }
 }
 
 .p-overlaypanel:has(.hidden-columns-panel) {

src/assets/themes/scss/themes/azion-light/extended-components/_datatable.scss

@@ -50,10 +50,6 @@
       }
     }
   }
-
-  .p-datatable-wrapper {
-    overscroll-behavior: revert !important;
-  }
 }
 
 .p-overlaypanel:has(.hidden-columns-panel) {

src/helpers/azion-documentation-window-opener.js

@@ -5,31 +5,6 @@ export const AZION_API_DOCUMENTATION = 'https://api.azion.com/'
 export const AZION_CONTACT_SUPPORT = 'https://tickets.azion.com/en/support/home'
 export const GOOGLE_AUTHENTICATOR_DOCUMENTATION =
   'https://support.google.com/accounts/answer/1066447'
-export const AZION_SITE = 'https://www.azion.com/'
-export const AZION_BLOG = 'https://www.azion.com/en/blog/'
-export const AZION_DISCORD = 'https://discord.com/invite/Yp9N7RMVZy'
-export const AZION_GITHUB = 'https://github.com/aziontech/azion-platform-kit'
-export const AZION_X = 'https://x.com/aziontech'
-
-export const openAzionSite = () => {
-  window.open(AZION_SITE, '_blank')
-}
-
-export const openAzionBlog = () => {
-  window.open(AZION_BLOG, '_blank')
-}
-
-export const openAzionDiscord = () => {
-  window.open(AZION_DISCORD, '_blank')
-}
-
-export const openAzionGithub = () => {
-  window.open(AZION_GITHUB, '_blank')
-}
-
-export const openAzionX = () => {
-  window.open(AZION_X, '_blank')
-}
 
 export const openSearchResult = (searchText) => {
   window.open(`${AZION_SEARCH_RESULT}/?q=${searchText}&filter=doc`)

src/helpers/index.js

@@ -4,15 +4,9 @@ import {
   openContactSupport,
   openDocumentation,
   openGoogleAuthenticatorAppDocumentation,
-  openSearchResult,
-  openAzionSite,
-  openAzionBlog,
-  openAzionDiscord,
-  openAzionGithub,
-  openAzionX
+  openSearchResult
 } from './azion-documentation-window-opener'
 import { azionPrivacyPolicyWindowOpener } from './azion-privacy-policy-opener'
-import { azionOnboardingWindowOpener } from './azion-onboarding-window-opener'
 import { azionTermsAndServicesWindowOpener } from './azion-terms-and-services-opener'
 import { capitalizeFirstLetter } from './capitalize-first-letter'
 import { clipboardWrite } from './clipboard'
@@ -24,15 +18,10 @@ import { metricsPlaygroundOpener } from './metrics-playground-opener'
 import { parseCamelToSnake, parseSnakeToCamel } from './parse-api-body'
 import { themeSelect } from './theme-select'
 import { convertValueToDate, convertDateToLocalTimezone } from './convert-date'
-import { getScriptRunnerImage } from './get-script-runner-image'
-import { windowOpen } from './window-open'
-import { getVulcanPresets } from './get-vulcan-presets'
-import { goToClassicInterface } from './go-to-classic-interface'
 
 export {
   InviteSession,
   azionPrivacyPolicyWindowOpener,
-  azionOnboardingWindowOpener,
   azionTermsAndServicesWindowOpener,
   capitalizeFirstLetter,
   clipboardWrite,
@@ -47,18 +36,9 @@ export {
   openDocumentation,
   openGoogleAuthenticatorAppDocumentation,
   openSearchResult,
-  openAzionSite,
-  openAzionBlog,
-  openAzionDiscord,
-  openAzionGithub,
-  openAzionX,
   parseCamelToSnake,
   parseSnakeToCamel,
   themeSelect,
   convertValueToDate,
-  convertDateToLocalTimezone,
-  getScriptRunnerImage,
-  windowOpen,
-  getVulcanPresets,
-  goToClassicInterface
+  convertDateToLocalTimezone
 }

src/main.js

@@ -20,7 +20,6 @@ import Tooltip from 'primevue/tooltip'
 import ToastService from 'primevue/toastservice'
 import { install as VueMonacoEditorPlugin } from '@guolao/vue-monaco-editor'
 import * as HelpCenterServices from '@/services/help-center-services'
-import DialogService from 'primevue/dialogservice'
 
 import TrackerPlugin from '@/plugins/AnalyticsTrackerAdapterPlugin'
 
@@ -37,7 +36,6 @@ app.directive('tooltip', Tooltip)
 app.use(ToastService)
 app.use(pinia)
 app.use(router)
-app.use(DialogService)
 app.use(TrackerPlugin)
 app.use(VueMonacoEditorPlugin, {
   paths: {

src/modules/real-time-metrics/filters/load-dataset-available-filters.js

@@ -1,9 +1,11 @@
-import { loadRealTimeMetricsData } from '@/services/real-time-metrics-services'
 import { FILTERS_RULES } from '@modules/real-time-metrics/constants'
+import BeholderService from '@services/real-time-metrics-services/fetch-metrics-data-from-beholder'
+import Axios from 'axios'
 import ParserObjectField from './parser-object-field'
+
 import { capitalizeFirstLetter } from '@/helpers'
 
-let abortController = null
+let cancelRequest = null
 
 /**
  * A function to generate a GraphQL query for input fields of a given dataset.
@@ -65,23 +67,23 @@ const verifyWhitelistFields = ({ name, type: { name: typeName } }) => {
  * @return {Promise<Array<Object>>} An array of objects representing the available filters.
  */
 export default async function LoadDatasetAvailableFilters(dataset) {
-  if (abortController) abortController.abort()
-  abortController = new AbortController()
+  if (cancelRequest) cancelRequest.cancel()
+  const ReportsRequestToken = Axios.CancelToken
+  cancelRequest = ReportsRequestToken.source()
 
   const datasetsQuery = inputListByDatasetQuery(dataset)
 
   const graphqlQuery = {
     query: datasetsQuery
   }
 
+  const beholderService = new BeholderService({ cancelRequest })
+
   let data = []
 
   try {
-    const { __type: type } = await loadRealTimeMetricsData({
-      query: graphqlQuery,
-      signal: abortController.signal
-    })
-    data = type
+    const type = await beholderService.gql(graphqlQuery)
+    data = type.__type
   } catch {
     return []
   }

src/modules/real-time-metrics/filters/load-info-available-filters.js

@@ -1,7 +1,8 @@
-import { loadRealTimeMetricsData } from '@/services/real-time-metrics-services'
+import BeholderService from '@services/real-time-metrics-services/fetch-metrics-data-from-beholder'
+import Axios from 'axios'
 import { capitalizeFirstLetter } from '@/helpers'
 
-let abortController = null
+let cancelRequest = null
 
 /**
  * Checks if the given name is an alias and returns the corresponding value from the aliasMapping object.
@@ -43,17 +44,16 @@ const datasetListQuery = `query {
  * @return {Object} The processed available filters information.
  */
 export default async function LoadInfoAvailableFilters() {
-  if (abortController) abortController.abort()
-  abortController = new AbortController()
+  if (cancelRequest) cancelRequest.cancel()
+  const ReportsRequestToken = Axios.CancelToken
+  cancelRequest = ReportsRequestToken.source()
 
   const graphqlQuery = { query: datasetListQuery }
 
-  const { __type: type } = await loadRealTimeMetricsData({
-    query: graphqlQuery,
-    signal: abortController.signal
-  })
+  const beholderService = new BeholderService({ cancelRequest })
+  const { __type } = await beholderService.gql(graphqlQuery)
 
-  const availableFilters = type.fields
+  const availableFilters = __type.fields
   const newAvailableFilters = {}
 
   availableFilters.forEach((item) => {