bfg-common 1.3.352 → 1.3.354

package/components/common/diagramMain/Diagram.vue

@@ -11,7 +11,7 @@
       @click.capture="onClickDiagram"
     >
       <common-diagram-main-switch
-        :networks-count="networksCount"
+        :networks-count="props.networksCount"
         :main-rect-height="props.mainRectHeight"
         :main-switch-line="props.mainSwitchLine"
         :selected-main-line="props.selectedMainLine"
@@ -19,7 +19,7 @@
         :is-selected-linked-with-adapter="isSelectedLinkedWithAdapter"
       />
       <common-diagram-main-adapter
-        :networks-count="networksCount"
+        :networks-count="props.networksCount"
         :adapters-with-positions="props.adaptersWithPositions"
         :selected-main-line="props.selectedMainLine"
         :selected-port="props.selectedPort"
@@ -92,6 +92,7 @@ const props = defineProps<{
   selectedNetwork: string
   selectedSwitchLineY: UI_I_SwitchLine
   isDarkMode: boolean
+  networksCount: number
 }>()
 
 const emits = defineEmits<{
@@ -182,15 +183,6 @@ const isSelectedLinkedWithAdapter = computed<boolean>(() => {
   return false
 })
 
-const networksCount = computed<number>(
-  () =>
-    props.networksWithPositions.filter(
-      (networkWithPositions: UI_I_NetworksWithPositions) =>
-        networkWithPositions.activeAdapters.length > 0 &&
-        networkWithPositions.state.state !== 3
-    ).length
-)
-
 const onClickDiagram = (ev: MouseEvent) => emits('click-diagram', ev)
 const onToggleAdapters = () => emits('toggle-adapters')
 const onSelectAdapter = (adapterId: string) =>

package/components/common/diagramMain/DiagramMain.vue

@@ -26,6 +26,7 @@
         :selected-network="selectedNetwork"
         :selected-switch-line-y="selectedSwitchLineY"
         :is-dark-mode="props.isDarkMode"
+        :networks-count="networksCount"
         @click-diagram="onClickDiagram"
         @toggle-adapters="onToggleAdapters"
         @select-adapter="onSelectAdapter"
@@ -619,6 +620,15 @@ const adaptersWithPositions = computed<UI_I_AdaptersWithPositions>(() => {
   return countAdaptersPositions()
 })
 
+const networksCount = computed<number>(
+  () =>
+    networksWithPositions.value.filter(
+      (networkWithPositions: UI_I_NetworksWithPositions) =>
+        networkWithPositions.activeAdapters.length > 0 &&
+        networkWithPositions.state.state !== 3
+    ).length
+)
+
 watch(
   () => props.diagramData?.networks,
   (newValue: UI_I_Network[] | null) => {
@@ -630,14 +640,24 @@ watch(
       onSelectAdapter(selectedAdapter.value.adapterId)
       return
     }
+
     if (selectedPort.value.portId !== '-1') {
       onSelectPort(selectedPort.value.networkId, selectedPort.value.portId)
       return
     }
+
     if (selectedNetwork.value !== '-1') {
       onSelectNetwork(selectedNetwork.value)
       return
     }
+
+    if (selectedMainLine.value && networksCount.value === 0) {
+      selectedMainLine.value = false
+      return
+    }
+
+    if (selectedMainLine.value) return
+
     resetSelection()
   },
   { deep: true }

package/components/common/diagramMain/network/NoNetwork.vue

@@ -6,14 +6,12 @@
       shape-rendering="geometricprecision"
       x="16.5"
       y="17.5"
-      fill="#fff"
-      stroke="#888"
+      class="panel"
     ></rect>
     <path
       d="M 313.5 17.5 H 333.5 V 55.5 H 313.5 "
       shape-rendering="geometricprecision"
-      fill="#fff"
-      stroke="#888"
+      class="panel"
     ></path>
     <text
       dy="14px"
@@ -40,6 +38,11 @@ const localization = computed<UI_I_Localization>(() => useLocal())
   .diagram__heading {
     fill: #c1cdd4;
   }
+
+  .panel {
+    fill: #1b2a32;
+    stroke: #adbbc4;
+  }
 }
 
 .diagram {
@@ -50,4 +53,9 @@ const localization = computed<UI_I_Localization>(() => useLocal())
     line-height: 1.2rem;
   }
 }
+
+.panel {
+  fill: #fff;
+  stroke: #888;
+}
 </style>

package/components/common/wizards/datastore/add/sharedStorm/deviceSelection/DeviceSelection.vue

@@ -230,7 +230,7 @@ const dataTable = computed<API_UI_I_DataTable<
 
 /*  Select host */
 // const hostData = ref<UI_I_SelectHostOptions[] | null>(null)
-const selectedHost = ref<string>('')
+const selectedHost = ref<string>(props.hostId || '')
 const hostOptions = computed<UI_I_SelectHostOptions[]>(() =>
   hostsOptionsFunc(localization.value, props.datacenterHosts)
 ) //  <!-- TODO  Нам сейчас он не нужен. Мы монтируем nfs только на один хост ( procurator )-->
@@ -277,7 +277,7 @@ const validationTextForSphere = (): string => {
   }
 
   if (props.datastoreType === 'shared-storm') {
-    return !selectedHost.value && !props.hostId
+    return !selectedHost.value
       ? 'selectHostToContinueAlert'
       : 'selectDiskToContinueAlert'
   }
@@ -321,7 +321,7 @@ const submit = async (): Promise<void> => {
 
   const valid = validation.touch()
   const isShowAlertDanger =
-    mode === 'procurator' || props.hostId
+    mode === 'procurator'
       ? !selectedLunDisk.value.length
       : validatePropertiesForSphere()
 

package/package.json

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