bfg-common 1.5.64 → 1.5.66

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

@@ -1,49 +1,36 @@
 <template>
-  <div class="select-compute-resource">
-    <atoms-alert
-      v-show="errors.length"
-      status="alert-danger"
-      test-id="computed-resource-alert"
-      :items="errors"
-      @remove="removeValidationErrors"
-    />
-
-    <div class="tree-view-wrap mt-1">
-      <common-vm-actions-common-select-compute-resource-tree-view
-        v-model="selectedNode"
-        :data-center="props.dataCenter"
-        :compute-resource="props.computeResource"
-        :compute-resource-tree="props.computeResourceTree"
-        @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', $event)
-        "
-      />
-    </div>
-
-    <div class="compatibility-wrap">
-      <p class="compatibility">
-        {{ localization.inventorySummary.compatibility }}
-      </p>
-      <div class="compatibility-message flex-align-center">
-        <template v-if="compatibilityText[1]">
-          <atoms-the-icon
-            v-show="!compatibilityText[0]"
-            width="20"
-            name="exclamation-circle"
-          />
-          <div v-show="compatibilityText[0]" class="icon-status-ok" />
-          <span>{{ compatibilityText[1] }}</span>
-        </template>
-      </div>
-    </div>
-  </div>
+  <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">
@@ -55,12 +42,10 @@ const props = defineProps<{
   dataCenter: UI_I_TreeNode | null
   computeResource: UI_I_TreeNode
   computeResourceTree: UI_I_TreeNode[]
-  modelValue: UI_I_TreeNode | null
 }>()
 
 const emits = defineEmits<{
   (event: 'submit', value: UI_I_TreeNode): void
-  (event: 'update:model-value', value: UI_I_TreeNode | null): void
   (
     event: 'get-compute-resource-tree',
     value: { id: string | number; cb: () => void }
@@ -70,6 +55,9 @@ const emits = defineEmits<{
   (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(
@@ -81,7 +69,8 @@ watch(
 const submit = (cb: Function): void => {
   if (
     !selectedNode.value ||
-    !compatibilityText.value[1] ||
+    // !compatibilityText.value[1] ||
+    !compatibilityText.value[0] ||
     selectedNode.value.type === 'datacenter' ||
     selectedNode.value.type === 'folder' ||
     (selectedNode.value.type === 'cluster' && !selectedNode.value.nodes.length)
@@ -93,7 +82,7 @@ const submit = (cb: Function): void => {
     return
   }
 
-  removeValidationErrors()
+  onRemoveValidationErrors()
   emits('submit', selectedNode.value)
   cb(true)
 }
@@ -102,11 +91,11 @@ const errors = ref<string[]>([])
 const showValidationErrors = (text: string): void => {
   errors.value = [text]
 }
-const removeValidationErrors = (): void => {
+const onRemoveValidationErrors = (): void => {
   errors.value = []
 }
 
-const selectedNode = defineModel<UI_I_TreeNode | null>('model')
+const selectedNode = defineModel<UI_I_TreeNode | null>('modelValue')
 
 const compatibilityText = computed<[boolean, string]>(() => {
   let res: [boolean, string] = [
@@ -131,7 +120,10 @@ const compatibilityText = computed<[boolean, string]>(() => {
   if (selectedNode.value?.type === 'host') {
     if (selectedNode.value.state === 'Error') {
       // TODO check Maintenance Mode
-      res = [false, localization.value.common.selectedHostDisconnectedMaintenanceMode]
+      res = [
+        false,
+        localization.value.common.selectedHostDisconnectedMaintenanceMode,
+      ]
     }
   }
 
@@ -139,26 +131,4 @@ const compatibilityText = computed<[boolean, string]>(() => {
 })
 </script>
 
-<style scoped lang="scss">
-.select-compute-resource {
-  .tree-view-wrap {
-    max-height: 300px;
-    min-height: 200px;
-    position: relative;
-    border: 1px solid #000;
-    padding: 5px 0 0 5px;
-    overflow: auto;
-  }
-
-  .compatibility-wrap {
-    padding-top: 10px;
-
-    .compatibility-message {
-      border: 1px solid #000;
-      padding-top: 5px;
-      padding-left: 5px;
-      overflow: auto;
-    }
-  }
-}
-</style>
+<style scoped lang="scss"></style>

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

@@ -0,0 +1,141 @@
+<template>
+  <div class="select-compute-resource">
+    <Teleport to="#compute-resource-alert-wrapper">
+      <ui-alert
+        v-show="props.errors.length"
+        status="alert-danger"
+        :messages="props.errors"
+        test-id="computed-resource-alert"
+        class="errors-alert"
+        @remove="emits('remove-validation-errors')"
+      />
+    </Teleport>
+
+    <div class="tree-view-wrap">
+      <common-vm-actions-common-select-compute-resource-tree-view
+        v-model="selectedNode"
+        :data-center="props.dataCenter"
+        :compute-resource="props.computeResource"
+        :compute-resource-tree="props.computeResourceTree"
+        @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')"
+      />
+    </div>
+
+    <div class="compatibility-wrap">
+      <p class="compatibility">
+        {{ localization.inventorySummary.compatibility }}
+      </p>
+      <div class="compatibility-message flex-align-center">
+        <ui-skeleton-item v-if="!selectedNode" width="160px" height="16px" />
+        <template v-else-if="props.compatibilityText[1]">
+          <ui-icon
+            v-show="!props.compatibilityText[0]"
+            name="error"
+            width="16"
+            height="16"
+          />
+
+          <ui-icon
+            v-show="props.compatibilityText[0]"
+            name="success-fill"
+            width="16"
+            height="16"
+          />
+          <span class="compatibility-message-description">{{
+            props.compatibilityText[1]
+          }}</span>
+        </template>
+      </div>
+    </div>
+  </div>
+</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 selectedNode = defineModel<UI_I_TreeNode>('modelValue', {
+  required: true,
+})
+
+const props = defineProps<{
+  dataCenter: UI_I_TreeNode | null
+  computeResource: UI_I_TreeNode
+  computeResourceTree: UI_I_TreeNode[]
+  errors: string[]
+  compatibilityText: [boolean, string]
+}>()
+
+const emits = defineEmits<{
+  (
+    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: 'remove-validation-errors'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style>
+:root {
+  --select-compute-resource-border-color: #e9ebed;
+  --select-compute-resource-location-bg-color: #ffffff;
+  --select-compute-resource-compatibility-title-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-compatibility-title-color: #e9eaec;
+  --select-compute-resource-compatibility-description-color: #9da6ad;
+}
+</style>
+<style scoped lang="scss">
+.select-compute-resource {
+  .tree-view-wrap {
+    height: 170px;
+    border-radius: 8px;
+    border: 1px solid var(--select-compute-resource-border-color);
+    padding: 12px;
+    background-color: var(--select-compute-resource-location-bg-color);
+    margin: 16px 0 24px;
+    overflow: auto;
+
+    :deep(.tree-content) {
+      padding: 0 !important;
+    }
+  }
+
+  .compatibility-wrap {
+    .compatibility {
+      font-size: 16px;
+      font-weight: 500;
+      color: var(--select-compute-resource-compatibility-title-color);
+      margin-bottom: 16px;
+    }
+    .compatibility-message {
+      border-radius: 8px;
+      border: 1px solid var(--select-compute-resource-border-color);
+      padding: 12px;
+      background-color: var(--select-compute-resource-location-bg-color);
+      gap: 12px;
+
+      .compatibility-message-description {
+        font-size: 13px;
+        color: var(--select-compute-resource-compatibility-description-color);
+      }
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,99 @@
+<template>
+  <div class="select-compute-resource">
+    <atoms-alert
+      v-show="props.errors.length"
+      status="alert-danger"
+      test-id="computed-resource-alert"
+      :items="props.errors"
+      @remove="emits('remove-validation-errors')"
+    />
+
+    <div class="tree-view-wrap mt-1">
+      <common-vm-actions-common-select-compute-resource-tree-view
+        v-model="selectedNode"
+        :data-center="props.dataCenter"
+        :compute-resource="props.computeResource"
+        :compute-resource-tree="props.computeResourceTree"
+        @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')"
+      />
+    </div>
+
+    <div class="compatibility-wrap">
+      <p class="compatibility">
+        {{ localization.inventorySummary.compatibility }}
+      </p>
+      <div class="compatibility-message flex-align-center">
+        <template v-if="props.compatibilityText[1]">
+          <atoms-the-icon
+            v-show="!props.compatibilityText[0]"
+            width="20"
+            name="exclamation-circle"
+          />
+          <div v-show="props.compatibilityText[0]" class="icon-status-ok" />
+          <span>{{ props.compatibilityText[1] }}</span>
+        </template>
+      </div>
+    </div>
+  </div>
+</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 selectedNode = defineModel<UI_I_TreeNode>('modelValue', {
+  required: true,
+})
+
+const props = defineProps<{
+  dataCenter: UI_I_TreeNode | null
+  computeResource: UI_I_TreeNode
+  computeResourceTree: UI_I_TreeNode[]
+  errors: string[]
+  compatibilityText: [boolean, string]
+}>()
+
+const emits = defineEmits<{
+  (
+    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: 'remove-validation-errors'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style scoped lang="scss">
+.select-compute-resource {
+  .tree-view-wrap {
+    max-height: 300px;
+    min-height: 200px;
+    position: relative;
+    border: 1px solid #000;
+    padding: 5px 0 0 5px;
+    overflow: auto;
+  }
+
+  .compatibility-wrap {
+    padding-top: 10px;
+
+    .compatibility-message {
+      border: 1px solid #000;
+      padding-top: 5px;
+      padding-left: 5px;
+      overflow: auto;
+    }
+  }
+}
+</style>

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

@@ -0,0 +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>

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

@@ -0,0 +1,48 @@
+<template>
+  <div class="tree-view">
+    <atoms-loader-pre-loader
+      v-show="props.loading"
+      id="loader"
+      class="absolute-center tree-view__loading"
+      :show="true"
+    />
+    <common-recursion-tree
+      :nodes="props.computeResourceTree"
+      class="recursion-tree"
+      @get-nodes="emits('show-nodes', $event)"
+      @select-node="emits('select-node', $event)"
+      @contextmenu.prevent
+    />
+  </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
+}>()
+</script>
+
+<style scoped lang="scss">
+.tree-view {
+  &__loading {
+    :deep(.spinner.spinner-inverse) {
+      position: static;
+      width: 45px;
+      height: 45px;
+      min-width: 45px;
+      min-height: 45px;
+    }
+  }
+}
+</style>

package/components/common/vm/actions/common/select/computeResource/{TreeView.vue → treeView/TreeView.vue}

@@ -1,39 +1,44 @@
 <template>
-  <div class="tree-view">
-    <atoms-loader-pre-loader
-      v-show="loading"
-      id="loader"
-      class="absolute-center tree-view__loading"
-      :show="true"
-    />
-    <common-recursion-tree
-      :nodes="props.computeResourceTree"
-      class="recursion-tree"
-      @get-nodes="onShowNodes($event)"
-      @select-node="onSelectNode"
-      @contextmenu.prevent
-    />
-  </div>
+  <common-vm-actions-common-select-compute-resource-tree-view-new
+    v-if="isNewView"
+    :compute-resource-tree="props.computeResourceTree"
+    :loading="loading"
+    @show-nodes="onShowNodes"
+    @select-node="onSelectNode"
+  />
+  <common-vm-actions-common-select-compute-resource-tree-view-old
+    v-else
+    :compute-resource-tree="props.computeResourceTree"
+    :loading="loading"
+    @show-nodes="onShowNodes"
+    @select-node="onSelectNode"
+  />
 </template>
 
 <script setup lang="ts">
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 
+const model = defineModel<UI_I_TreeNode>('modelValue', { required: true })
+
 const props = defineProps<{
   dataCenter: UI_I_TreeNode | null
   computeResource: UI_I_TreeNode
-  modelValue: UI_I_TreeNode | null
   computeResourceTree: UI_I_TreeNode[]
 }>()
 
 const emits = defineEmits<{
-  (event: 'update:modelValue', value: UI_I_TreeNode): void
-  (event: 'get-compute-resource-tree', value: { id: string | number, cb: () => void }): 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 loading = ref<boolean>(false)
 watch(
   () => props.dataCenter,
@@ -44,7 +49,7 @@ watch(
     emits('get-compute-resource-tree', {
       id: props.dataCenter.id,
       cb: () => {
-        let node = props.modelValue
+        let node = model.value
         let hasNode = checkHasNodeRecursion(
           props.computeResourceTree[0].nodes,
           node
@@ -65,7 +70,8 @@ watch(
         onSelectNode(node)
       },
     })
-  }
+  },
+  { immediate: true, deep: true }
 )
 const checkHasNodeRecursion = (
   nodes: UI_I_TreeNode[],
@@ -101,7 +107,7 @@ const onShowNodes = ({
 const onSelectNode = (node: UI_I_TreeNode): void => {
   emits('select-compute-resource-tree', node)
 
-  emits('update:modelValue', node)
+  model.value = node
 }
 
 onUnmounted(() => {
@@ -109,16 +115,4 @@ onUnmounted(() => {
 })
 </script>
 
-<style scoped lang="scss">
-.tree-view {
-  &__loading {
-    :deep(.spinner.spinner-inverse) {
-      position: static;
-      width: 45px;
-      height: 45px;
-      min-width: 45px;
-      min-height: 45px;
-    }
-  }
-}
-</style>
+<style scoped lang="scss"></style>