bfg-common 1.5.573 → 1.5.574

package/components/common/vm/actions/common/select/os/Os.vue

@@ -4,12 +4,15 @@
     v-model:machine-type="machineType"
     v-model:guest-os-family="guestOsFamily"
     v-model:guest-os-version="guestOsVersion"
+    v-model:profile="profile"
     :api-error-machine-type="apiErrorMachineType"
     :machine-type-options="machineTypeOptions"
     :api-error-guest-os-family="apiErrorGuestOsFamily"
     :os-options="osOptions"
     :api-error-guest-os-version="apiErrorGuestOsVersion"
     :versions-options="versionsOptions"
+    :api-error-profile="apiErrorProfile"
+    :profile-options="profileOptions"
     @change-os="onChangeOs"
     @remove-error-by-title="onRemoveValidationError"
   />
@@ -18,12 +21,15 @@
     v-model:machine-type="machineType"
     v-model:guest-os-family="guestOsFamily"
     v-model:guest-os-version="guestOsVersion"
+    v-model:profile="profile"
     :api-error-machine-type="apiErrorMachineType"
     :machine-type-options="machineTypeOptions"
     :api-error-guest-os-family="apiErrorGuestOsFamily"
     :os-options="osOptions"
     :api-error-guest-os-version="apiErrorGuestOsVersion"
     :versions-options="versionsOptions"
+    :api-error-profile="apiErrorProfile"
+    :profile-options="profileOptions"
     @change-os="onChangeOs"
     @remove-error-by-title="onRemoveValidationError"
   />
@@ -32,6 +38,7 @@
 <script setup lang="ts">
 import type {
   UI_I_ArbitraryObject,
+  UI_I_Localization,
 } from '~/lib/models/interfaces'
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
@@ -45,6 +52,9 @@ const guestOsFamily = defineModel<UI_I_OptionItem | null>('guest-os-family', {
 const guestOsVersion = defineModel<UI_I_OptionItem | null>('guest-os-version', {
   required: true,
 })
+// const profile = defineModel<UI_I_OptionItem | null>('profile', {
+//   required: true,
+// })
 
 const props = defineProps<{
   familiesOptions: UI_I_OptionItem[]
@@ -59,6 +69,8 @@ const emits = defineEmits<{
 const { $store }: any = useNuxtApp()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
+const localization = computed<UI_I_Localization>(() => useLocal())
+
 const machineTypeOptions = ref<UI_I_OptionItem[]>(props.machineTypesOptions)
 watch(
   () => props.machineTypesOptions,
@@ -107,6 +119,12 @@ watch(
   { immediate: true }
 )
 
+// TODO получать из пропсов
+const profileOptions = ref<UI_I_OptionItem[]>([
+  { text: localization.value.vmWizard.standard, value: 'standard' },
+])
+const profile = ref<UI_I_OptionItem>(profileOptions.value[0]) // TODO получать из defineModel
+
 const apiErrorMachineType = computed<string>(() => {
   return (
     props.errorValidationFields?.find(
@@ -131,6 +149,13 @@ const apiErrorGuestOsVersion = computed<string>(() => {
   )
 })
 
+const apiErrorProfile = computed<string>(() => {
+  return (
+    props.errorValidationFields?.find((message) => message.field === 'profile')
+      ?.error_message || ''
+  )
+})
+
 const onRemoveValidationError = (type: string): void => {
   emits('remove-error-by-title', type)
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.573",
+  "version": "1.5.574",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -17,6 +17,8 @@
     "@vueuse/nuxt": "10.1.2",
     "eslint-config-prettier": "^8.5.0",
     "nuxt": "3.11.2",
+    "@nuxt/kit": "3.11.2",
+    "@nuxt/schema": "3.11.2",
     "prettier": "2.7.1",
     "sass": "^1.54.9",
     "sass-loader": "^10.3.1",

package/store/tasks/mappers/recentTasks.ts

@@ -45,6 +45,10 @@ export const recentTasks = (
           execution = '--'
           queuedFor = 0
           startTime = Date.now() / 1000 + ''
+          // Обрабатываем данные когда задачка в работе
+        } else if (task.status === 1) {
+          completion = '--'
+          execution = '--'
         }
 
         const { upd_operations } = task.extra