bfg-common 1.5.636 → 1.5.638

package/components/common/vm/actions/common/select/template/old/Old.vue

@@ -1,50 +1,50 @@
-<template>
-  <div class="select-template">
-    <atoms-alert
-      v-show="props.errors.length"
-      :items="props.errors"
-      status="alert-danger"
-      test-id="template-alert"
-      @remove="emits('remove')"
-    />
-
-    <p class="template-description">
-      {{ localization.vmWizard.selectTemplateForCreatingVm }}
-    </p>
-    <div class="tree-view-wrap">
-      <common-vm-actions-common-select-template-tree-view
-        :templates-tree="props.templatesTree"
-        @select-node="emits('select', $event)"
-      />
-    </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 props = defineProps<{
-  templatesTree: UI_I_TreeNode[]
-  errors: string[]
-}>()
-
-const emits = defineEmits<{
-  (event: 'remove'): void
-  (event: 'select', value: UI_I_TreeNode): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-
-<style scoped lang="scss">
-.tree-view-wrap {
-  position: relative;
-  border: 1px solid #000;
-  padding: 5px;
-  max-height: 300px;
-  min-height: 200px;
-  overflow: auto;
-  margin-bottom: 10px;
-}
-</style>
+<template>
+  <div class="select-template">
+    <atoms-alert
+      v-show="props.errors.length"
+      :items="props.errors"
+      status="alert-danger"
+      test-id="template-alert"
+      @remove="emits('remove')"
+    />
+
+    <p class="template-description">
+      {{ localization.vmWizard.selectTemplateForCreatingVm }}
+    </p>
+    <div class="tree-view-wrap">
+      <common-vm-actions-common-select-template-tree-view
+        :templates-tree="props.templatesTree"
+        @select-node="emits('select', $event)"
+      />
+    </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 props = defineProps<{
+  templatesTree: UI_I_TreeNode[]
+  errors: string[]
+}>()
+
+const emits = defineEmits<{
+  (event: 'remove'): void
+  (event: 'select', value: UI_I_TreeNode): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style scoped lang="scss">
+.tree-view-wrap {
+  position: relative;
+  border: 1px solid #000;
+  padding: 5px;
+  max-height: 300px;
+  min-height: 200px;
+  overflow: auto;
+  margin-bottom: 10px;
+}
+</style>

package/components/common/vm/actions/editSettings/new/Skeleton.vue

@@ -1,88 +1,88 @@
-<template>
-  <div class="skeleton-wrap">
-    <div class="tabs">
-      <ui-skeleton-item width="64px" height="16px" />
-      <ui-skeleton-item width="64px" height="16px" />
-    </div>
-    <div class="actions">
-      <ui-skeleton-item width="80px" height="16px" />
-      <ui-skeleton-item width="152px" height="32px" border-radius="6px" />
-    </div>
-    <div class="stack-block-wrap">
-      <div class="stack-block">
-        <div class="stack-label flex-1">
-          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
-          <ui-skeleton-item height="16px" />
-        </div>
-        <div class="stack-value flex-1">
-          <ui-skeleton-item width="102px" height="32px" border-radius="8px" />
-        </div>
-      </div>
-
-      <div v-for="item in 2" :key="item" class="stack-block">
-        <div class="stack-label flex-1">
-          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
-          <ui-skeleton-item height="16px" />
-        </div>
-        <div class="stack-value flex-1">
-          <ui-skeleton-item width="102px" height="32px" border-radius="8px" />
-          <ui-skeleton-item width="80px" height="32px" border-radius="8px" />
-        </div>
-      </div>
-
-      <div v-for="item in 5" :key="item" class="stack-block">
-        <div class="stack-label flex-1">
-          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
-          <ui-skeleton-item height="16px" />
-        </div>
-        <div class="stack-value flex-1">
-          <ui-skeleton-item width="196px" height="32px" border-radius="8px" />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts"></script>
-
-<style scoped lang="scss">
-.skeleton-wrap {
-  padding: 0 32px;
-
-  .tabs {
-    display: flex;
-    align-items: center;
-    gap: 32px;
-    padding: 8px 0 12px;
-    border-bottom: 1px solid var(--divider-color);
-  }
-
-  .actions {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 12px 0;
-  }
-
-  .stack-block-wrap {
-    display: grid;
-    grid-gap: 12px;
-
-    .stack-block {
-      display: flex;
-      align-items: center;
-      gap: 12px;
-      padding: 8px 12px;
-      background: var(--stack-block-bg-color);
-      border-radius: 6px;
-
-      .stack-label,
-      .stack-value {
-        display: flex;
-        align-items: center;
-        gap: 8px;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div class="skeleton-wrap">
+    <div class="tabs">
+      <ui-skeleton-item width="64px" height="16px" />
+      <ui-skeleton-item width="64px" height="16px" />
+    </div>
+    <div class="actions">
+      <ui-skeleton-item width="80px" height="16px" />
+      <ui-skeleton-item width="152px" height="32px" border-radius="6px" />
+    </div>
+    <div class="stack-block-wrap">
+      <div class="stack-block">
+        <div class="stack-label flex-1">
+          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
+          <ui-skeleton-item height="16px" />
+        </div>
+        <div class="stack-value flex-1">
+          <ui-skeleton-item width="102px" height="32px" border-radius="8px" />
+        </div>
+      </div>
+
+      <div v-for="item in 2" :key="item" class="stack-block">
+        <div class="stack-label flex-1">
+          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
+          <ui-skeleton-item height="16px" />
+        </div>
+        <div class="stack-value flex-1">
+          <ui-skeleton-item width="102px" height="32px" border-radius="8px" />
+          <ui-skeleton-item width="80px" height="32px" border-radius="8px" />
+        </div>
+      </div>
+
+      <div v-for="item in 5" :key="item" class="stack-block">
+        <div class="stack-label flex-1">
+          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
+          <ui-skeleton-item height="16px" />
+        </div>
+        <div class="stack-value flex-1">
+          <ui-skeleton-item width="196px" height="32px" border-radius="8px" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss">
+.skeleton-wrap {
+  padding: 0 32px;
+
+  .tabs {
+    display: flex;
+    align-items: center;
+    gap: 32px;
+    padding: 8px 0 12px;
+    border-bottom: 1px solid var(--divider-color);
+  }
+
+  .actions {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 12px 0;
+  }
+
+  .stack-block-wrap {
+    display: grid;
+    grid-gap: 12px;
+
+    .stack-block {
+      display: flex;
+      align-items: center;
+      gap: 12px;
+      padding: 8px 12px;
+      background: var(--stack-block-bg-color);
+      border-radius: 6px;
+
+      .stack-label,
+      .stack-value {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+      }
+    }
+  }
+}
+</style>

package/components/common/vm/actions/register/New.vue

@@ -5,6 +5,7 @@
     :is-loading="props.wizard.wizardLoader.status"
     :title="localization.common.registerVm"
     :texts="texts"
+    :has-changes="hasChanges"
     test-id="register-wizard"
     show
     @change-steps="emits('change-steps', $event)"
@@ -74,7 +75,7 @@
               test-id="computed-resource-alert"
               type="error"
               size="md"
-              class="subtitle-block__alert"
+              class="subtitle-block__alert mb-4"
             />
             <ui-wizard-subtitle
               :sub-title="
@@ -131,6 +132,7 @@ import type {
   UI_I_WizardTexts,
 } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
 import Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
+import { compare } from '~/node_modules/bfg-uikit/lib/utils/compare'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
@@ -208,8 +210,19 @@ const currentSubtitleSelectNameBlock = ref<string>(
     ? localization.value.vmWizard.specifyUniqueNameAndTargetLocationForVm
     : localization.value.common.specifyUniqueNameForVm
 )
+
+const initialCompare = compare(vmForm)
+const hasChanges = computed<boolean>(() => initialCompare.getDiff(vmForm.value))
 </script>
 
+<style>
+:root {
+  --select-name-border-color: #e9ebed;
+}
+:root.dark-theme {
+  --select-name-border-color: #e9ebed1f;
+}
+</style>
 <style scoped lang="scss">
 .subtitle-block {
   display: flex;
@@ -217,6 +230,9 @@ const currentSubtitleSelectNameBlock = ref<string>(
   border-bottom: 1px solid var(--wizard-line);
   padding-bottom: 12px;
 }
+:deep(.select-name .tree-view-wrap) {
+  border-color: var(--select-name-border-color);
+}
 .compute-resource-container {
   padding-bottom: 40px;
 

package/components/common/vm/actions/register/Register.vue

@@ -88,15 +88,23 @@ const currentComponent = computed(() =>
 const localization = computed<UI_I_Localization>(() => useLocal())
 const isSphere = computed<boolean>(() => props.project === 'sphere')
 
-const location = ref<UI_I_TreeNode | null>(props.dataCenter) // для сферы
+const location = ref<UI_I_TreeNode | null>(null) // для сферы
+watch(
+  () => props.dataCenter,
+  (newValue) => {
+    if (location.value || !newValue) return
 
+    location.value = newValue
+  },
+  { immediate: true, deep: true }
+)
 const wizard: Wizard = new Wizard(
-  stepsFunc(localization.value),
+  stepsFunc(localization.value, props.project),
   stepsSchemeInitial
 )
 if (isSphere.value) {
   wizard.changeScheme(1)
-  wizard.selectStepHard(1)
+  // wizard.selectStepHard(1)
 }
 
 const locationDescription = computed<string>(

package/components/common/vm/actions/register/lib/config/steps.ts

@@ -1,86 +1,94 @@
-import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
-import { UI_E_WIZARD_STATUS } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/enums'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-export const dynamicSteps = {
-  selectName: 0,
-  selectNameFolder: 1,
-  selectComputeResource: 2,
-  readyComplete: 3,
-}
-
-export const stepsFunc = (
-  localization: UI_I_Localization
-): UI_I_WizardStep[] => {
-  return [
-    // Procurator
-    {
-      id: dynamicSteps.selectName,
-      stepName: '',
-      title: localization.common.selectName,
-      subTitle: localization.common.specifyUniqueName,
-      status: UI_E_WIZARD_STATUS.SELECTED,
-      isValid: true,
-      testId: 'vm-select-name',
-      fields: {
-        name: {
-          field: '',
-          alert: '',
-        },
-      },
-    },
-    // Sphere
-    {
-      id: dynamicSteps.selectNameFolder,
-      stepName: '',
-      title: localization.vmWizard.selectNameFolder,
-      subTitle: localization.common.specifyUniqueNameTargetLocation,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'vm-select-name-folder',
-      fields: {
-        name: {
-          field: '',
-          alert: '',
-        },
-      },
-    },
-    // Sphere
-    {
-      id: dynamicSteps.selectComputeResource,
-      stepName: '',
-      title: localization.vmWizard.selectComputeResource,
-      subTitle: localization.common.selectDestinationComputeResourceOperation,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'vm-select-compute-resource',
-      fields: {
-        computeResource: {
-          field: '',
-          alert: '',
-        },
-      },
-    },
-    {
-      id: dynamicSteps.readyComplete,
-      stepName: '',
-      title: localization.vmWizard.readyComplete,
-      subTitle: localization.vmWizard.lastCreateSubtitle,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'vm-ready-complete',
-      fields: {},
-    },
-  ]
-}
-
-export const stepsSchemeInitial = [
-  // 0 Procurator
-  [dynamicSteps.selectName, dynamicSteps.readyComplete],
-  // 1 Sphere
-  [
-    dynamicSteps.selectNameFolder,
-    dynamicSteps.selectComputeResource,
-    dynamicSteps.readyComplete,
-  ],
-]
+import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import { UI_E_WIZARD_STATUS } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/enums'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+
+export const dynamicSteps = {
+  selectName: 0,
+  selectNameFolder: 1,
+  selectComputeResource: 2,
+  readyComplete: 3,
+}
+
+export const stepsFunc = (
+  localization: UI_I_Localization,
+  project: UI_T_Project
+): UI_I_WizardStep[] => {
+  return [
+    // Procurator
+    {
+      id: dynamicSteps.selectName,
+      stepName: '',
+      title: localization.common.selectName,
+      subTitle: localization.common.specifyUniqueName,
+      status:
+        project === 'procurator'
+          ? UI_E_WIZARD_STATUS.SELECTED
+          : UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'vm-select-name',
+      fields: {
+        name: {
+          field: '',
+          alert: '',
+        },
+      },
+    },
+    // Sphere
+    {
+      id: dynamicSteps.selectNameFolder,
+      stepName: '',
+      title: localization.vmWizard.selectNameFolder,
+      subTitle: localization.common.specifyUniqueNameTargetLocation,
+      status:
+        project === 'procurator'
+          ? UI_E_WIZARD_STATUS.INACTIVE
+          : UI_E_WIZARD_STATUS.SELECTED,
+      isValid: true,
+      testId: 'vm-select-name-folder',
+      fields: {
+        name: {
+          field: '',
+          alert: '',
+        },
+      },
+    },
+    // Sphere
+    {
+      id: dynamicSteps.selectComputeResource,
+      stepName: '',
+      title: localization.vmWizard.selectComputeResource,
+      subTitle: localization.common.selectDestinationComputeResourceOperation,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'vm-select-compute-resource',
+      fields: {
+        computeResource: {
+          field: '',
+          alert: '',
+        },
+      },
+    },
+    {
+      id: dynamicSteps.readyComplete,
+      stepName: '',
+      title: localization.vmWizard.readyComplete,
+      subTitle: localization.vmWizard.lastCreateSubtitle,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'vm-ready-complete',
+      fields: {},
+    },
+  ]
+}
+
+export const stepsSchemeInitial = [
+  // 0 Procurator
+  [dynamicSteps.selectName, dynamicSteps.readyComplete],
+  // 1 Sphere
+  [
+    dynamicSteps.selectNameFolder,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.readyComplete,
+  ],
+]

package/components/common/wizards/common/compatibility/Compatibility.vue

@@ -1,35 +1,35 @@
-<template>
-  <common-wizards-common-compatibility-new
-    v-if="isNewView"
-    :status="props.status"
-    :text="props.text"
-    :loading="props.loading"
-  />
-  <common-wizards-common-compatibility-old
-    v-else
-    :status="props.status"
-    :text="props.text"
-  />
-</template>
-
-<script lang="ts" setup>
-import type {
-  UI_T_CompatibilityStatus
-} from "~/components/common/wizards/common/compatibility/lib/models/types";
-
-const props = withDefaults(
-  defineProps<{
-    text: string
-    status: UI_T_CompatibilityStatus
-    loading?: boolean
-  }>(),
-  {
-    loading: false,
-  }
-)
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <common-wizards-common-compatibility-new
+    v-if="isNewView"
+    :status="props.status"
+    :text="props.text"
+    :loading="props.loading"
+  />
+  <common-wizards-common-compatibility-old
+    v-else
+    :status="props.status"
+    :text="props.text"
+  />
+</template>
+
+<script lang="ts" setup>
+import type {
+  UI_T_CompatibilityStatus
+} from "~/components/common/wizards/common/compatibility/lib/models/types";
+
+const props = withDefaults(
+  defineProps<{
+    text: string
+    status: UI_T_CompatibilityStatus
+    loading?: boolean
+  }>(),
+  {
+    loading: false,
+  }
+)
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+</script>
+
+<style lang="scss" scoped></style>