bfg-common 1.3.145 → 1.3.147

package/assets/localization/local_ru.json

@@ -758,7 +758,7 @@
   "iommu": "I/O MMU",
   "iommuUpper": "IOMMU",
   "ip_address": "IP-адреса",
-  "ipAddress": "Айпи адрес",
+  "ipAddress": "IP адрес",
   "iPAddressFQDN": "IP-адрес или полное доменное имя",
   "ipFourAddressEmpty": "IP-адрес пуст. Введите действительный IP-адрес.",
   "ipFourAddressInvalid": "IP-адрес недействителен. Введите действительный IP-адрес.",

package/components/common/diagramMain/DiagramMain.vue

@@ -201,6 +201,7 @@
         :standard-switches-initial="props.standardSwitchesInitial"
         :free-adapters="props.freeAdapters"
         :is-dark-mode="props.isDarkMode"
+        :selected-switch-id="selectedSwitchId"
         @check-network-label="onCheckNetworkLabel"
         @get-existing-standard-switches="onGetExistingStandardSwitches"
         @get-free-adapters="onGetFreeAdapters"
@@ -480,6 +481,8 @@ const onHideMigrateVmkernelAdapterModal = (): void => {
   isShowMigrateVmkernelAdapterModal.value = false
 }
 
+const selectedSwitchId = ref<string>('')
+
 const onShowModal = (
   value: string,
   properties: UI_I_ModalsInitialData
@@ -526,6 +529,7 @@ const onShowModal = (
       break
     case 'add-networking':
       isShowAddNetworkingModal.value = true
+      selectedSwitchId.value = properties.switch_name
       break
     case 'switch-view-settings':
       isShowSwitchViewSettingsModal.value = true

package/components/common/diagramMain/Header.vue

@@ -1,86 +1,96 @@
 <template>
-    <template v-if="!props.inPortlet">
-        <div class="diagram-header">
-            <div class="diagram-header-left">
-                <atoms-the-icon
-                        name="angle"
-                        :class="[
+  <template v-if="!props.inPortlet">
+    <div class="diagram-header">
+      <div class="diagram-header-left">
+        <atoms-the-icon
+          name="angle"
+          :class="[
             'diagram-header__arrow-icon',
             {
               open: props.isShowDiagram,
             },
           ]"
-                        @click="onToggleDiagram"
-                />
-                <a>
+          @click="onToggleDiagram"
+        />
+        <a>
           <span>
             {{ localization.standardSwitch }}:
             {{ props.diagramName }}
           </span>
-                </a>
-            </div>
-            <div v-if="props.isShowDiagram" class="diagram-header__btn-container">
-                <span class="vertical-separator"></span>
-                <button
-                        id="add-networking-button"
-                        type="button"
-                        @click="onShowModal('add-networking')"
-                >
-                    {{ localization.addNetworking }}
-                </button>
-                <button
-                        id="switch-edit-button"
-                        type="button"
-                        @click="onShowModal('switch-edit')"
-                >
-                    {{ localization.edit }}
-                </button>
-                <button
-                        id="switch-manage-physical-adapters-button"
-                        type="button"
-                        @click="onShowModal('switch-manage-physical-adapters')"
-                >
-                    {{ localization.managePhysicalAdapters }}
-                </button>
-                <div style="position: relative; transform: translate(62px, -11px)">
-                    <atoms-collapse-nav
-                            popup-class="diagram-main-actions__popup"
-                            :close-after-click="true"
-                            :items="switchMainNavigation"
-                            @change="onShowModal"
-                    />
-                </div>
-            </div>
+        </a>
+      </div>
+      <div v-if="props.isShowDiagram" class="diagram-header__btn-container">
+        <span class="vertical-separator"></span>
+        <button
+          id="add-networking-button"
+          type="button"
+          @click="onShowModal('add-networking', props.diagramName)"
+        >
+          {{ localization.addNetworking }}
+        </button>
+        <button
+          id="switch-edit-button"
+          type="button"
+          @click="onShowModal('switch-edit')"
+        >
+          {{ localization.edit }}
+        </button>
+        <button
+          id="switch-manage-physical-adapters-button"
+          type="button"
+          @click="onShowModal('switch-manage-physical-adapters')"
+        >
+          {{ localization.managePhysicalAdapters }}
+        </button>
+        <div class="diagram-main-actions-dots">
+          <atoms-collapse-nav
+            popup-class="diagram-main-actions__popup"
+            :close-after-click="true"
+            :items="switchMainNavigation"
+            @change="onShowModal"
+          />
         </div>
-        <hr class="horizontal-separator" />
-    </template>
+      </div>
+    </div>
+    <hr class="horizontal-separator" />
+  </template>
 </template>
 
 <script setup lang="ts">
 import { UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_I_NavigationItem } from '~/components/common/diagramMain/lib/models/interfaces'
+import {
+  UI_I_NavigationItem,
+  UI_I_ModalsInitialData,
+} from '~/components/common/diagramMain/lib/models/interfaces'
 import { switchMainNavigationFunc } from '~/components/common/diagramMain/modals/lib/config'
 
 const props = defineProps<{
-    inPortlet: boolean
-    isShowDiagram: boolean
-    diagramName: string
+  inPortlet: boolean
+  isShowDiagram: boolean
+  diagramName: string
 }>()
 
 const emits = defineEmits<{
-    (event: 'toggle-diagram'): void
-    (event: 'show-modal', modalName: string): void
+  (event: 'toggle-diagram'): void
+  (
+    event: 'show-modal',
+    modalName: string,
+    properties?: UI_I_ModalsInitialData
+  ): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const switchMainNavigation = computed<UI_I_NavigationItem[]>(() =>
-    switchMainNavigationFunc(localization.value)
+  switchMainNavigationFunc(localization.value)
 )
 
 const onToggleDiagram = () => emits('toggle-diagram')
 
-const onShowModal = (modalName: string) => emits('show-modal', modalName)
+const onShowModal = (modalName: string, diagramName?: string) =>
+  diagramName
+    ? emits('show-modal', modalName, { switch_name: diagramName })
+    : emits('show-modal', modalName)
 </script>
 
 <style scoped lang="scss">
@@ -171,6 +181,11 @@ const onShowModal = (modalName: string) => emits('show-modal', modalName)
   }
 }
 
+.diagram-main-actions-dots {
+  position: relative;
+  transform: translate(62px, -11px);
+}
+
 .horizontal-separator {
   margin: 5px 10px 10px;
   border-left: 0;

package/components/common/wizards/network/add/Add.vue

@@ -32,6 +32,7 @@
         :standard-switches-initial="props.standardSwitchesInitial"
         :messages-fields="selectedStep.fields"
         :alert-messages="alertMessages[1]"
+        :selected-switch-id="props.selectedSwitchId"
         @hide-alert="onHideAlert"
         @change-target-device="onChangeTargetDevice"
       />
@@ -156,12 +157,14 @@ const props = withDefaults(
     freeAdapters: UI_I_Adapter[]
     project?: UI_T_Project
     isDarkMode?: boolean
+    selectedSwitchId?: string
   }>(),
   {
     standardSwitchesInitial: () => [],
     freeAdapters: () => [],
     project: 'procurator',
     isDarkMode: false,
+    selectedSwitchId: '',
   }
 )
 

package/components/common/wizards/network/add/steps/SelectedTargetDevice.vue

@@ -298,14 +298,20 @@ import { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interface
 import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import { validateMtuTargetDeviceLocal } from '~/components/common/wizards/network/add/validations/validations'
 
-const props = defineProps<{
-  targetDevice: UI_I_TargetDevice
-  connectionType: string
-  standardSwitchesInitial: UI_I_Switch[]
-  alertMessages: string[]
-  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
-  wizard: Wizard
-}>()
+const props = withDefaults(
+  defineProps<{
+    targetDevice: UI_I_TargetDevice
+    connectionType: string
+    standardSwitchesInitial: UI_I_Switch[]
+    alertMessages: string[]
+    messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+    wizard: Wizard
+    selectedSwitchId?: string
+  }>(),
+  {
+    selectedSwitchId: '',
+  }
+)
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -374,17 +380,10 @@ const onSelectNetwork = (_selectedNetworkId: string): void => {
   fields.value.network = ''
 }
 
-watch(
-  () => props.standardSwitchesInitial,
-  (newStandardSwitchesInitial: UI_I_Switch[]) => {
-    !fields.value.standardSwitch &&
-      (fields.value.standardSwitch =
-        newStandardSwitchesInitial?.sort((prev, next) =>
-          prev.name.localeCompare(next.name || '')
-        )[0]?.name || '')
-  },
-  { deep: true, immediate: true }
-)
+onMounted(() => {
+  !fields.value.standardSwitch &&
+    (fields.value.standardSwitch = props.selectedSwitchId)
+})
 
 const onHideAlert = (): void => {
   emits('hide-alert', 1)

package/package.json

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