bfg-common 1.4.138 → 1.4.140

package/components/common/wizards/vmNew/migrate/Migrate.vue

@@ -50,10 +50,7 @@
 
         <common-wizards-vm-new-migrate-select-network
           v-if="selectedStep.id === 4"
-          v-model:is-basic-network-mode="
-            dataFormLocal.selectNetwork.isShowNetworkBasic
-          "
-          v-model:network-data="dataFormLocal.selectNetwork.data"
+          v-model="form.network"
         />
 
         <common-wizards-vm-new-migrate-select-priority
@@ -93,7 +90,7 @@ import type { UI_I_VmSettings } from '~/lib/models/store/vm/interfaces'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vmNew/migrate/select/storage/configure/disk/table/lib/models/interfaces'
 import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
-import type { UI_I_CollectedDataFormLocal } from '~/components/common/wizards/vm/migrate/lib/models/interfaces'
+import type { UI_I_CollectedDataFormLocal } from '~/components/common/wizards/vmNew/migrate/lib/models/interfaces'
 import { constructDataReadyViewFunc } from '~/components/common/wizards/vmNew/migrate/lib/config/constructDataReady'
 import * as validation from '~/components/common/wizards/vmNew/migrate/lib/validations'
 
@@ -137,6 +134,10 @@ const form = ref<UI_I_MigrateFormLocal>({
     user: '',
     password: '',
   },
+  network: {
+    isBasicNetworkMode: true,
+    data: null,
+  },
   vMotion_priority: 'high',
 })
 
@@ -206,14 +207,9 @@ const dataReadyView = computed<UI_I_TableInfoItem>(() =>
   constructDataReadyViewFunc(props.vmName, form.value)
 )
 
-const dataFormLocal = ref<UI_I_CollectedDataFormLocal>({
-  selectedComputeResource: null,
-  selectStorage: null,
-  selectNetwork: {
-    isShowNetworkBasic: true,
-    data: null,
-  },
-})
+// const dataFormLocal = ref<UI_I_CollectedDataFormLocal>({
+//   selectedComputeResource: null,
+// })
 const onFinish = (): void => {
   loading.value = true
   emits('finish', form.value)

package/components/common/wizards/vmNew/migrate/lib/models/interfaces.ts

@@ -1,11 +1,10 @@
 import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
 import type { UI_T_VmMigrateSelectStorageTab } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/types'
-import type { UI_I_SelectStorageReadyData } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/interfaces'
-import type { UI_I_ComputeResourceDataLocal } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/interfaces'
 import type { UI_T_VmMigrateType } from '~/components/common/wizards/vmNew/migrate/select/type/lib/models/types'
 import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/table/disk/lib/models/interfaces'
 import type { UI_T_SelectVMotionPriority } from '~/components/common/wizards/vmNew/migrate/select/priority/lib/models/types'
 import type { UI_I_ConnectEsxiServerForm } from '~/components/common/wizards/vmNew/migrate/select/targetServer/new/lib/models/interfaces'
+import type { UI_I_SelectNetworksFormLocal } from '~/components/common/wizards/vmNew/migrate/select/network/lib/models/interfaces'
 
 export interface UI_I_MigrateFormLocal {
   migrate_type: UI_T_VmMigrateType
@@ -18,6 +17,8 @@ export interface UI_I_MigrateFormLocal {
   }
   target_server: UI_I_ConnectEsxiServerForm
 
+  network: UI_I_SelectNetworksFormLocal
+
   vMotion_priority: UI_T_SelectVMotionPriority
 }
 
@@ -30,12 +31,3 @@ export interface UI_I_ChangeStepsSchemes {
 export interface UI_I_MigrateReadyBlockData extends UI_I_TableInfoItem {
   permissions: UI_T_VmMigrateSelectStorageTab[]
 }
-
-export interface UI_I_CollectedDataFormLocal {
-  selectedComputeResource: UI_I_ComputeResourceDataLocal
-  selectStorage: UI_I_SelectStorageReadyData
-  selectNetwork: {
-    isShowNetworkBasic: boolean
-    data: any // добавить интерфае потом
-  }
-}

package/components/common/wizards/vmNew/migrate/select/network/Network.vue

@@ -4,7 +4,7 @@
       {{ selectNetworkHeadline }}
     </div>
 
-    <common-wizards-vm-migrate-select-network-table-network
+    <common-wizards-vm-new-migrate-select-network-table-network
       v-model="selectedSourceNetwork"
       :key="uniqueKey"
       :networks="dataNetwork"
@@ -13,12 +13,12 @@
     />
 
     <div
-      v-if="isShowNetworkBasic && selectedSourceNetwork"
+      v-if="model.isBasicNetworkMode && selectedSourceNetwork"
       class="select-network__matcher-details"
     >
       <span> {{ networkDetailsHeadline }} </span>
 
-      <common-wizards-vm-migrate-select-network-table-use-at
+      <common-wizards-vm-new-migrate-select-network-table-use-at
         :networks="useAtTableData"
       />
     </div>
@@ -29,13 +29,13 @@
         data-id="migrate-network-advanced-button"
         @click="onClickSelectNetworkMode"
       >
-        <span v-if="!isShowNetworkBasic"> &#x226A; </span>
+        <span v-if="!model.isShowNetworkBasic"> &#x226A; </span>
         {{ buttonText }}
-        <span v-if="isShowNetworkBasic"> &#8811; </span>
+        <span v-if="model.isShowNetworkBasic"> &#8811; </span>
       </button>
     </div>
 
-    <common-wizards-vm-common-validation-compatibility
+    <common-wizards-vm-new-common-validation-compatibility
       :loading="false"
       status="Success"
       text="compatibilityChecksSucceeded"
@@ -45,28 +45,30 @@
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { UI_I_SelectNetworksFormLocal } from '~/components/common/wizards/vmNew/migrate/select/network/lib/models/interfaces'
 
-const isShowNetworkBasic = defineModel<boolean>('isBasicNetworkMode')
-const networkData = defineModel<any>('networkData')
-
+const model = defineModel<UI_I_SelectNetworksFormLocal>({ required: true })
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const selectedSourceNetwork = ref<string | null>(null)
 const uniqueKey = ref<number>(0)
 
 const buttonText = computed(
-  () => localization.value.common[isShowNetworkBasic.value ? 'advanced' : 'basic']
+  () =>
+    localization.value.common[
+      model.value.isBasicNetworkMode ? 'advanced' : 'basic'
+    ]
 )
 
 const tableType = computed<string>(() =>
-  isShowNetworkBasic.value ? 'basic' : 'advanced'
+  model.value.isBasicNetworkMode ? 'basic' : 'advanced'
 )
 
 const selectNetworkHeadline = computed<string>(() => {
   const { migrateNetworkingForAllAdapters, migrateNetworkingForEachAdapters } =
     localization.value.common
 
-  return isShowNetworkBasic.value
+  return model.value.isBasicNetworkMode
     ? migrateNetworkingForAllAdapters
     : migrateNetworkingForEachAdapters
 })
@@ -101,11 +103,11 @@ const useAtTableData = computed(() =>
 
 const onClickSelectNetworkMode = (): void => {
   uniqueKey.value++
-  isShowNetworkBasic.value = !isShowNetworkBasic.value
+  model.value.isBasicNetworkMode = !model.value.isBasicNetworkMode
   selectedSourceNetwork.value = ''
 }
 const onSelectNetwork = (data: any): void => {
-  networkData.value = data
+  model.value.data = data
 }
 </script>
 

package/components/common/wizards/vmNew/migrate/select/network/lib/models/interfaces.ts

@@ -0,0 +1,4 @@
+export interface UI_I_SelectNetworksFormLocal {
+  isBasicNetworkMode: boolean
+  data: any // добавить interface потом
+}

package/components/common/wizards/vmNew/migrate/select/network/table/network/Network.vue

@@ -24,6 +24,7 @@
             data-id="network-select"
             :disabled="item.data.disabled"
             @change="onSelect(item.data)"
+            @click.stop
           >
             <option
               v-for="option in item.data.option"

package/components/common/wizards/vmNew/migrate/select/storage/lib/models/interfaces.ts

@@ -1,14 +0,0 @@
-import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
-import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/table/disk/lib/models/interfaces'
-import type { UI_T_VmMigrateSelectStorageTab } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/types'
-
-export interface UI_I_SelectStorageDataLocal {
-  vmDiskFormat: 0 | 1 | 2 | 3
-  storage: UI_I_DatastoreTableItem | null
-}
-
-export interface UI_I_SelectStorageReadyData
-  extends UI_I_SelectStorageDataLocal {
-  tab: UI_T_VmMigrateSelectStorageTab
-  configureDisks: UI_I_StorageConfigurePerDiskItem[]
-}

package/components/common/wizards/vmNew/migrate/select/targetServer/new/New.vue

@@ -43,7 +43,7 @@
 
       <div class="clr-form-control clr-row">
         <label class="clr-control-label clr-col-md-4">
-          {{ localization.common.username }}
+          {{ localization.auth.username }}
         </label>
 
         <div
@@ -72,7 +72,7 @@
 
       <div class="nd-mt-0 clr-form-control clr-row">
         <label class="clr-control-label clr-col-md-4">
-          {{ localization.common.password }}
+          {{ localization.auth.password }}
         </label>
 
         <div
@@ -113,12 +113,12 @@
     </div>
 
     <button
-      class="btn btn-primary btn-sm mt-2 clr-col-md-2"
+      class="btn btn-primary btn-sm mt-2"
       :disabled="disabledSignInButton"
       data-id="sign-in-button"
       @click="onConnectServer"
     >
-      {{ localization.common.login }}
+      {{ localization.auth.login }}
     </button>
   </div>
 </template>
@@ -194,7 +194,9 @@ const onConnectServer = async (): Promise<void> => {
     )
 
     showValidationErrors([alertText], 'alert-success')
+    modelConnectServer.value = true
   } catch (error) {
+    modelConnectServer.value = false
     showValidationErrors([error as string], 'alert-danger')
   } finally {
     props.wizard.setLoader(false)
@@ -202,11 +204,11 @@ const onConnectServer = async (): Promise<void> => {
 }
 
 watch(
-    modelConnectServer,
-    (newValue: boolean | undefined) => {
-      props.wizard.setDisabledNextButton(!newValue)
-    },
-    { immediate: true }
+  modelConnectServer,
+  (newValue: boolean | undefined) => {
+    props.wizard.setDisabledNextButton(!newValue)
+  },
+  { immediate: true }
 )
 </script>
 
@@ -244,6 +246,9 @@ watch(
       }
     }
   }
+  button.btn-sm {
+    max-width: 20%;
+  }
 }
 .flex-align-center {
   &.input-action-wrapper {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.138",
+  "version": "1.4.140",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",