fix: subscription, machine_type

Author: kei5uke

docs/.vitepress/theme/components/price-estimator/LabModal.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, computed, onMounted } from "vue"
 import { priceEstimatorStore } from "./stores/priceEstimatorStore"
-import type { MachineFlavor } from "./types"
+import type { MachineType } from "./types"
 
 const emit = defineEmits<{
   close: []
@@ -40,7 +40,7 @@ const save = () => {
   priceEstimatorStore.addLab({
     name: formData.value.name,
     subscription: formData.value.subscription,
-    machineFlavor: formData.value.machineFlavor,
+    machineType: formData.value.machineFlavor,
     machineSubscription: formData.value.machineSubscription,
     hddSize: Number(formData.value.hddSize),
     nvmeSize: Number(formData.value.nvmeSize),

docs/.vitepress/theme/components/price-estimator/MachineModal.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, computed, onMounted } from "vue"
-import type { ComputeUnit, PriceListItem, GpuModel, MachineFlavor, MachineFormData } from "./types"
+import type { ComputeUnit, PriceListItem, GpuModel, MachineType, MachineFormData } from "./types"
 import { priceEstimatorStore } from "./stores/priceEstimatorStore"
 
 const props = defineProps({
@@ -74,11 +74,11 @@ const getGpuPriceMonth = computed((): string | number => {
   return yearlyGpu ? Number(yearlyGpu / 12).toFixed(2) : 0
 })
 
-const getFlavors = computed((): MachineFlavor[] => {
+const getFlavors = computed((): MachineType[] => {
   if (!formData.value.subscription) {
     return []
   }
-  return priceEstimatorStore.catalogue.machinePrices.filter((item: MachineFlavor) => item)
+  return priceEstimatorStore.catalogue.machinePrices.filter((item: MachineType) => item)
 })
 
 const getGpus = computed(() => {
@@ -102,7 +102,7 @@ const save = () => {
 
   const name = formData.value.name
   const machinetitle = priceEstimatorStore.catalogue.machinePrices
-    .filter((item: MachineFlavor) => item["value"] === formData.value.flavor)[0]
+    .filter((item: MachineType) => item["value"] === formData.value.flavor)[0]
     ["title"].split(" - ")[1]
     .split(" / ")
   const core_count = parseInt(machinetitle[0].split(" ")[0])

docs/.vitepress/theme/components/price-estimator/api/pricesApi.js

@@ -5,7 +5,7 @@ const price_list_url = "https://assets.hdc.ntnu.no/assets/prices/v5/hunt-cloud-p
 
 const gpu_models_url = "https://assets.hdc.ntnu.no/assets/js/gpus.json"
 
-const machine_flavors_url = "https://assets.hdc.ntnu.no/assets/js/flavors.json"
+const machine_types_url = "https://assets.hdc.ntnu.no/assets/js/flavors.json"
 
 export default {
   async getPriceList() {
@@ -27,12 +27,12 @@ export default {
       return []
     }
   },
-  async getMachineFlavors() {
+  async getMachineTypes() {
     try {
-      const response = await axios.get(machine_flavors_url)
+      const response = await axios.get(machine_types_url)
       return response.data
     } catch (error) {
-      console.error("Error fetching machine flavors:", error)
+      console.error("Error fetching machine types:", error)
       return []
     }
   },

docs/.vitepress/theme/components/price-estimator/stores/priceEstimatorStore.ts

@@ -7,7 +7,7 @@ import {
   type StorageType,
   type PriceListItem,
   type GpuModel,
-  type MachineFlavor,
+  type MachineType,
   type Catalogue,
   type SubscriptionType,
   storageTypes,
@@ -27,7 +27,7 @@ export const priceEstimatorStore = reactive({
     computePrices: [] as PriceListItem[],
     storagePrices: [] as PriceListItem[],
     gpuPrices: [] as PriceListItem[],
-    machinePrices: [] as MachineFlavor[],
+    machinePrices: [] as MachineType[],
     availableGpus: [] as GpuModel[],
     labPrices: [] as PriceListItem[],
   } as Catalogue,
@@ -111,7 +111,7 @@ export const priceEstimatorStore = reactive({
       this.catalogue.availableGpus = gpus
     })
 
-    const machinesPromise = pricesApi.getMachineFlavors().then((machine: MachineFlavor[]) => {
+    const machinesPromise = pricesApi.getMachineTypes().then((machine: MachineType[]) => {
       this.catalogue.machinePrices = machine
     })
 
@@ -140,7 +140,7 @@ export const priceEstimatorStore = reactive({
   },
 
   /* Lab helpers */
-  addLab(payload: { name: string; subscription: string; machineFlavor: string; machineSubscription: string; hddSize: number; nvmeSize: number }) {
+  addLab(payload: { name: string; subscription: string; machineType: string; machineSubscription: string; hddSize: number; nvmeSize: number }) {
     const newLab: LabCard = {
       id: this.labs.length,
       title: payload.name,
@@ -150,18 +150,18 @@ export const priceEstimatorStore = reactive({
     }
 
     // Add compute
-    const machineInfo = this.catalogue.machinePrices.find((item: MachineFlavor) => item["value"] === payload.machineFlavor)
+    const machineInfo = this.catalogue.machinePrices.find((item: MachineType) => item["value"] === payload.machineType)
 
     if (machineInfo) {
-      const prices = this.getComputePriceFromCatalogue(payload.machineFlavor, payload.machineSubscription)
+      const prices = this.getComputePriceFromCatalogue(payload.machineType, payload.machineSubscription)
 
       const machineTitle = machineInfo["title"].split(" - ")[1].split(" / ")
       const coreCount = parseInt(machineTitle[0].split(" ")[0])
       const ram = parseInt(machineTitle[1].split(" ")[0])
       const unit: ComputeUnit = {
         id: 0,
         name: "machine-1",
-        machine_type: payload.machineFlavor,
+        machine_type: payload.machineType,
         core_count: coreCount,
         ram,
         subscription: payload.machineSubscription as SubscriptionType,
@@ -644,10 +644,10 @@ export const priceEstimatorStore = reactive({
               for (const comp of labData.compute) {
                 this.addComputeToLab(newLabId, {
                   name: comp.name,
-                  machine_type: comp.flavor,
+                  machine_type: comp.machine_type,
                   core_count: comp.core_count,
                   ram: comp.ram,
-                  subscription: comp.type,
+                  subscription: comp.subscription,
                   gpu: comp.gpu,
                 })
               }

docs/.vitepress/theme/components/price-estimator/types/index.ts

@@ -48,7 +48,7 @@ export interface GpuModel {
   vram: number
 }
 
-export interface MachineFlavor {
+export interface MachineType {
   title: string
   value: string
   header?: string
@@ -60,7 +60,7 @@ export interface Catalogue {
   storagePrices: PriceListItem[]
   gpuPrices: PriceListItem[]
   availableGpus: GpuModel[]
-  machinePrices: MachineFlavor[]
+  machinePrices: MachineType[]
   labPrices: PriceListItem[]
 }