bfg-common 1.5.227 → 1.5.228

package/components/common/vm/actions/common/select/computeResource/ComputeResource.vue

@@ -1,134 +1,142 @@
-<template>
-  <common-vm-actions-common-select-compute-resource-new
-    v-if="isNewView"
-    v-model="selectedNode"
-    :data-center="props.dataCenter"
-    :compute-resource="props.computeResource"
-    :compute-resource-tree="props.computeResourceTree"
-    :errors="errors"
-    :compatibility-text="compatibilityText"
-    @get-compute-resource-tree="emits('get-compute-resource-tree', $event)"
-    @show-compute-resource-tree="emits('show-compute-resource-tree', $event)"
-    @select-compute-resource-tree="
-      emits('select-compute-resource-tree', $event)
-    "
-    @clear-compute-resource-tree="emits('clear-compute-resource-tree')"
-    @remove-validation-errors="onRemoveValidationErrors"
-  />
-  <common-vm-actions-common-select-compute-resource-old
-    v-else
-    v-model="selectedNode"
-    :data-center="props.dataCenter"
-    :compute-resource="props.computeResource"
-    :compute-resource-tree="props.computeResourceTree"
-    :errors="errors"
-    :compatibility-text="compatibilityText"
-    @get-compute-resource-tree="emits('get-compute-resource-tree', $event)"
-    @show-compute-resource-tree="emits('show-compute-resource-tree', $event)"
-    @select-compute-resource-tree="
-      emits('select-compute-resource-tree', $event)
-    "
-    @clear-compute-resource-tree="emits('clear-compute-resource-tree')"
-    @remove-validation-errors="onRemoveValidationErrors"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-
-const props = defineProps<{
-  computeResourceSubmit: null | Function
-  dataCenter: UI_I_TreeNode | null
-  computeResource: UI_I_TreeNode
-  computeResourceTree: UI_I_TreeNode[]
-}>()
-
-const emits = defineEmits<{
-  (event: 'submit', value: UI_I_TreeNode): void
-  (
-    event: 'get-compute-resource-tree',
-    value: { id: string | number; cb: () => void }
-  ): void
-  (event: 'show-compute-resource-tree', value: UI_I_TreeNode): void
-  (event: 'select-compute-resource-tree', value: UI_I_TreeNode): void
-  (event: 'clear-compute-resource-tree'): void
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-watch(
-  () => props.computeResourceSubmit,
-  (newValue: null | Function) => {
-    newValue && submit(newValue)
-  }
-)
-const submit = (cb: Function): void => {
-  if (
-    !selectedNode.value ||
-    // !compatibilityText.value[1] ||
-    !compatibilityText.value[0] ||
-    selectedNode.value.type === 'datacenter' ||
-    selectedNode.value.type === 'folder' ||
-    (selectedNode.value.type === 'cluster' && !selectedNode.value.nodes.length)
-  ) {
-    showValidationErrors(
-      localization.value.common.specifyValidClusterOrHostDestination
-    )
-    cb(false)
-    return
-  }
-
-  onRemoveValidationErrors()
-  emits('submit', selectedNode.value)
-  cb(true)
-}
-
-const errors = ref<string[]>([])
-const showValidationErrors = (text: string): void => {
-  errors.value = [text]
-}
-const onRemoveValidationErrors = (): void => {
-  errors.value = []
-}
-
-const selectedNode = defineModel<UI_I_TreeNode | null>('modelValue')
-
-const compatibilityText = computed<[boolean, string]>(() => {
-  let res: [boolean, string] = [
-    true,
-    localization.value.common.compatibilityChecksSucceeded,
-  ]
-
-  if (!selectedNode.value) res = [true, '']
-
-  if (
-    !['cluster', 'host', 'resource_pool'].includes(selectedNode.value?.type)
-  ) {
-    res = [false, localization.value.common.selectValidClusterOrHostDestination]
-  }
-  if (selectedNode.value?.type === 'cluster') {
-    const hasHost = !!selectedNode.value.nodes.length
-    if (!hasHost) {
-      res = [false, localization.value.common.clusterNotContainAnyHosts]
-    }
-  }
-
-  if (selectedNode.value?.type === 'host') {
-    if (selectedNode.value.state === 'Error') {
-      // TODO check Maintenance Mode
-      res = [
-        false,
-        localization.value.common.selectedHostDisconnectedMaintenanceMode,
-      ]
-    }
-  }
-
-  return res
-})
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <common-vm-actions-common-select-compute-resource-new
+    v-if="isNewView"
+    v-model="selectedNode"
+    :data-center="props.dataCenter"
+    :compute-resource="props.computeResource"
+    :compute-resource-tree="props.computeResourceTree"
+    :errors="errors"
+    :compatibility-text="compatibilityText"
+    @get-compute-resource-tree="emits('get-compute-resource-tree', $event)"
+    @show-compute-resource-tree="emits('show-compute-resource-tree', $event)"
+    @select-compute-resource-tree="
+      emits('select-compute-resource-tree', $event)
+    "
+    @clear-compute-resource-tree="emits('clear-compute-resource-tree')"
+    @remove-validation-errors="onRemoveValidationErrors"
+  />
+  <common-vm-actions-common-select-compute-resource-old
+    v-else
+    v-model="selectedNode"
+    :data-center="props.dataCenter"
+    :compute-resource="props.computeResource"
+    :compute-resource-tree="props.computeResourceTree"
+    :errors="errors"
+    :compatibility-text="compatibilityText"
+    @get-compute-resource-tree="emits('get-compute-resource-tree', $event)"
+    @show-compute-resource-tree="emits('show-compute-resource-tree', $event)"
+    @select-compute-resource-tree="
+      emits('select-compute-resource-tree', $event)
+    "
+    @clear-compute-resource-tree="emits('clear-compute-resource-tree')"
+    @remove-validation-errors="onRemoveValidationErrors"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const props = defineProps<{
+  computeResourceSubmit: null | Function
+  dataCenter: UI_I_TreeNode | null
+  computeResource: UI_I_TreeNode
+  computeResourceTree: UI_I_TreeNode[]
+}>()
+
+const emits = defineEmits<{
+  (event: 'submit', value: UI_I_TreeNode): void
+  (
+    event: 'get-compute-resource-tree',
+    value: { id: string | number; cb: () => void }
+  ): void
+  (event: 'show-compute-resource-tree', value: UI_I_TreeNode): void
+  (event: 'select-compute-resource-tree', value: UI_I_TreeNode): void
+  (event: 'clear-compute-resource-tree'): void
+  (event: 'has-errors', value: boolean): void
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+watch(
+  () => props.computeResourceSubmit,
+  (newValue: null | Function) => {
+    newValue && submit(newValue)
+  }
+)
+const submit = (cb: Function): void => {
+  if (
+    !selectedNode.value ||
+    // !compatibilityText.value[1] ||
+    !compatibilityText.value[0] ||
+    selectedNode.value.type === 'datacenter' ||
+    selectedNode.value.type === 'folder' ||
+    (selectedNode.value.type === 'cluster' && !selectedNode.value.nodes.length)
+  ) {
+    showValidationErrors(
+      localization.value.common.specifyValidClusterOrHostDestination
+    )
+    cb(false)
+    return
+  }
+
+  onRemoveValidationErrors()
+  emits('submit', selectedNode.value)
+  cb(true)
+}
+
+const errors = ref<string[]>([])
+const showValidationErrors = (text: string): void => {
+  errors.value = [text]
+}
+const onRemoveValidationErrors = (): void => {
+  errors.value = []
+}
+watch(
+  errors,
+  (newValue) => {
+    emits('has-errors', !newValue.length)
+  },
+  { immediate: true, deep: true }
+)
+
+const selectedNode = defineModel<UI_I_TreeNode | null>('modelValue')
+
+const compatibilityText = computed<[boolean, string]>(() => {
+  let res: [boolean, string] = [
+    true,
+    localization.value.common.compatibilityChecksSucceeded,
+  ]
+
+  if (!selectedNode.value) res = [true, '']
+
+  if (
+    !['cluster', 'host', 'resource_pool'].includes(selectedNode.value?.type)
+  ) {
+    res = [false, localization.value.common.selectValidClusterOrHostDestination]
+  }
+  if (selectedNode.value?.type === 'cluster') {
+    const hasHost = !!selectedNode.value.nodes.length
+    if (!hasHost) {
+      res = [false, localization.value.common.clusterNotContainAnyHosts]
+    }
+  }
+
+  if (selectedNode.value?.type === 'host') {
+    if (selectedNode.value.state === 'Error') {
+      // TODO check Maintenance Mode
+      res = [
+        false,
+        localization.value.common.selectedHostDisconnectedMaintenanceMode,
+      ]
+    }
+  }
+
+  return res
+})
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/vm/actions/common/select/computeResource/New.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="select-compute-resource">
+  <div class="select-compute-resource pb-4">
     <Teleport to="#compute-resource-alert-wrapper">
       <ui-alert
         v-show="props.errors.length"
@@ -7,7 +7,8 @@
         status="alert-danger"
         test-id="computed-resource-alert"
         class="errors-alert"
-        @remove="emits('remove-validation-errors')"
+        size="md"
+        @hide="emits('remove-validation-errors')"
       />
     </Teleport>
 
@@ -32,7 +33,7 @@
       <p class="compatibility">
         {{ localization.inventorySummary.compatibility }}
       </p>
-      <div class="compatibility-message flex-align-center">
+      <div class="compatibility-message flex-align-start">
         <ui-skeleton-item v-if="!selectedNode" width="160px" height="16px" />
         <template v-else-if="props.compatibilityText[1]">
           <ui-icon
@@ -40,6 +41,7 @@
             name="error"
             width="16"
             height="16"
+            class="icon-compatibility-alert"
           />
 
           <ui-icon
@@ -47,6 +49,7 @@
             name="success-fill"
             width="16"
             height="16"
+            class="icon-compatibility-alert"
           />
           <span class="compatibility-message-description">{{
             props.compatibilityText[1]
@@ -92,28 +95,43 @@ const localization = computed<UI_I_Localization>(() => useLocal())
   --select-compute-resource-border-color: #e9ebed;
   --select-compute-resource-location-bg-color: #ffffff;
   --select-compute-resource-compatibility-title-color: #4d5d69;
+  --select-compute-resource-compatibilityd-empty-escription-color: #4d5d69;
   --select-compute-resource-compatibility-description-color: #4d5d69;
 }
 :root.dark-theme {
   --select-compute-resource-border-color: #e9ebed1f;
-  --select-compute-resource-location-bg-color: transparent;
+  --select-compute-resource-location-bg-color: #1b2a371f;
   --select-compute-resource-compatibility-title-color: #e9eaec;
-  --select-compute-resource-compatibility-description-color: #9da6ad;
+  --select-compute-resource-compatibilityd-empty-escription-color: #9da6ad;
+  --select-compute-resource-compatibility-description-color: #e9eaec;
 }
 </style>
 <style scoped lang="scss">
 .select-compute-resource {
   .tree-view-wrap {
     height: 170px;
+    max-height: 240px;
     border-radius: 8px;
     border: 1px solid var(--select-compute-resource-border-color);
-    padding: 12px;
+    padding: 8px;
     background-color: var(--select-compute-resource-location-bg-color);
     margin: 16px 0 24px;
     overflow: auto;
 
     :deep(.tree-content) {
       padding: 0 !important;
+
+      .node-wrapper {
+        border-radius: 4px;
+
+        .node-name {
+          font-size: 12px;
+          margin-left: 8px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+      }
     }
   }
 
@@ -129,8 +147,12 @@ const localization = computed<UI_I_Localization>(() => useLocal())
       border: 1px solid var(--select-compute-resource-border-color);
       padding: 12px;
       background-color: var(--select-compute-resource-location-bg-color);
-      gap: 12px;
+      gap: 10px;
 
+      .icon-compatibility-alert {
+        min-width: 16px;
+        min-height: 16px;
+      }
       .compatibility-message-description {
         font-size: 13px;
         color: var(--select-compute-resource-compatibility-description-color);

package/components/common/vm/actions/common/select/computeResource/treeView/New.vue

@@ -1,44 +1,44 @@
-<template>
-  <div class="tree-view">
-    <ui-tree
-      :nodes="props.computeResourceTree"
-      :expand-all="false"
-      :is-loading="props.loading"
-      @toggle-node="onShowNodes"
-      @select-node="emits('select-node', $event)"
-    >
-      <template #content="{ node }">
-        <div class="flex-align-center">
-          <span :class="['node-icon', node.iconClassName]"></span>
-          <span class="node-name">{{ node.name }}</span>
-        </div>
-      </template>
-    </ui-tree>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-
-const props = defineProps<{
-  computeResourceTree: UI_I_TreeNode[]
-  loading: boolean
-}>()
-
-const emits = defineEmits<{
-  (
-    event: 'show-nodes',
-    value: {
-      node: UI_I_TreeNode
-      cb: () => void
-    }
-  ): void
-  (event: 'select-node', value: UI_I_TreeNode): void
-}>()
-
-const onShowNodes = (node: UI_I_TreeNode) => {
-  emits('show-nodes', { node, cb: (): void => {} })
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <div class="tree-view">
+    <ui-tree
+      :nodes="props.computeResourceTree"
+      :expand-all="false"
+      :is-loading="props.loading"
+      @toggle-node="onShowNodes"
+      @select-node="emits('select-node', $event)"
+    >
+      <template #content="{ node }">
+        <div class="flex-align-center">
+          <span :class="['node-icon', node.iconClassName]"></span>
+          <span class="node-name">{{ node.name }}</span>
+        </div>
+      </template>
+    </ui-tree>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const props = defineProps<{
+  computeResourceTree: UI_I_TreeNode[]
+  loading: boolean
+}>()
+
+const emits = defineEmits<{
+  (
+    event: 'show-nodes',
+    value: {
+      node: UI_I_TreeNode
+      cb: () => void
+    }
+  ): void
+  (event: 'select-node', value: UI_I_TreeNode): void
+}>()
+
+const onShowNodes = (node: UI_I_TreeNode) => {
+  emits('show-nodes', { node, cb: (): void => {} })
+}
+</script>
+
+<style scoped lang="scss"></style>