bfg-common 1.3.144 → 1.3.146

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/modals/Confirmation.vue

@@ -1,7 +1,7 @@
 <template>
   <atoms-modal
     show
-    width="580px"
+    :width="props.width"
     class="confirm-modal"
     :title="props.headline"
     :second-title="props.subTitle"
@@ -44,6 +44,7 @@ const props = withDefaults(
     testId?: string
     type?: 'confirm' | 'remove'
     variantTextButton?: 'ok' | 'confirm' | 'remove'
+    width: string
   }>(),
   {
     testId: 'common-confirmation',
@@ -52,6 +53,7 @@ const props = withDefaults(
     type: 'confirm',
     description: '',
     variantTextButton: 'ok',
+    width: '580px',
   }
 )
 const emits = defineEmits<{

package/components/common/pages/Tasks.vue

@@ -1,120 +1,120 @@
-<template>
-  <div class="tasks">
-    <common-headline
-      :headline="localization.taskConsole"
-      class="tasks__headline"
-    />
-
-    <div class="btn-group">
-      <button
-        id="task-previous-button"
-        class="btn btn-sm btn-link nav-link"
-        :disabled="pagination.page === 1"
-        @click="onClickButton('previous')"
-      >
-        {{ localization.previous }}
-      </button>
-
-      <button
-        id="task-next-button"
-        class="btn btn-sm btn-link nav-link"
-        :disabled="pagination.page === tasksList?.total_pages"
-        @click="onClickButton('next')"
-      >
-        {{ localization.next }}
-      </button>
-    </div>
-
-    <templates-tasks-table-view
-      :data-table="tasksList?.items || []"
-      :total-items="tasksList?.total_items || 0"
-      :total-pages="tasksList?.total_pages || 1"
-      :pagination="pagination"
-      :loading="isLoading"
-      @pagination="onUpdatePagination"
-      @sort="onSortTable"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type {
-  UI_I_Localization,
-} from '~/lib/models/interfaces'
-import type {
-  UI_I_Pagination,
-  UI_I_DataTableQuery,
-} from '~/lib/models/table/interfaces'
-import type { UI_I_Task } from '~/lib/models/store/tasks/interfaces'
-
-definePageMeta({
-  middleware: ['auth'],
-})
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store }: any = useNuxtApp()
-
-const pagination = ref<UI_I_Pagination>({
-  page: 1,
-  pageSize: 100,
-})
-const sort = ref<string | null>(null)
-
-const tasksList = computed<UI_I_Task>(() => $store.getters['tasks/getTaskList'])
-
-const onClickButton = (status: string): void => {
-  if (status === 'next') {
-    pagination.value.page += 1
-    return
-  }
-
-  pagination.value.page -= 1
-}
-
-const getTasks = async (): Promise<void> => {
-  pauseGlobalRefresh()
-
-  const payload: UI_I_DataTableQuery = {
-    ...pagination.value,
-    sortBy: sort.value || '',
-  }
-  await $store.dispatch('tasks/A_GET_TASKS', payload)
-}
-
-const onUpdatePagination = (event: UI_I_Pagination): void => {
-  pagination.value = event
-  getTasks()
-}
-
-const onSortTable = (event: string): void => {
-  sort.value = event
-  getTasks()
-}
-
-const isLoading = computed<boolean>(() =>
-  $store.getters['tasks/getLoading']('tasks')
-)
-const pauseGlobalRefresh = (): void => {
-  const tasksLastRequestType = $store.getters['tasks/getTasksLastRequestType']
-  $store.dispatch('main/A_PAUSE_GLOBAL_REFRESH', tasksLastRequestType)
-}
-onUnmounted(() => {
-  pauseGlobalRefresh()
-})
-</script>
-
-<style lang="scss">
-@import '~/node_modules/bfg-common/assets/scss/common/mixins';
-.tasks {
-  @include flex($dir: column);
-  height: 100%;
-  padding-left: 10px;
-  &__headline {
-    padding-left: 10px;
-    margin-bottom: 0.6rem;
-  }
-  .btn {
-    text-transform: uppercase;
-  }
-}
-</style>
+<template>
+  <div class="tasks">
+    <common-headline
+      :headline="localization.taskConsole"
+      class="tasks__headline"
+    />
+
+    <div class="btn-group">
+      <button
+        id="task-previous-button"
+        class="btn btn-sm btn-link nav-link"
+        :disabled="pagination.page === 1"
+        @click="onClickButton('previous')"
+      >
+        {{ localization.previous }}
+      </button>
+
+      <button
+        id="task-next-button"
+        class="btn btn-sm btn-link nav-link"
+        :disabled="pagination.page === tasksList?.total_pages"
+        @click="onClickButton('next')"
+      >
+        {{ localization.next }}
+      </button>
+    </div>
+
+    <templates-tasks-table-view
+      :data-table="tasksList?.items || []"
+      :total-items="tasksList?.total_items || 0"
+      :total-pages="tasksList?.total_pages || 1"
+      :pagination="pagination"
+      :loading="isLoading"
+      @pagination="onUpdatePagination"
+      @sort="onSortTable"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type {
+  UI_I_Localization,
+} from '~/lib/models/interfaces'
+import type {
+  UI_I_Pagination,
+  UI_I_DataTableQuery,
+} from '~/lib/models/table/interfaces'
+import type { UI_I_Task } from '~/lib/models/store/tasks/interfaces'
+
+definePageMeta({
+  middleware: ['auth'],
+})
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $store }: any = useNuxtApp()
+
+const pagination = ref<UI_I_Pagination>({
+  page: 1,
+  pageSize: 100,
+})
+const sort = ref<string | null>(null)
+
+const tasksList = computed<UI_I_Task>(() => $store.getters['tasks/getTaskList'])
+
+const onClickButton = (status: string): void => {
+  if (status === 'next') {
+    pagination.value.page += 1
+    return
+  }
+
+  pagination.value.page -= 1
+}
+
+const getTasks = async (): Promise<void> => {
+  pauseGlobalRefresh()
+
+  const payload: UI_I_DataTableQuery = {
+    ...pagination.value,
+    sortBy: sort.value || '',
+  }
+  await $store.dispatch('tasks/A_GET_TASKS', payload)
+}
+
+const onUpdatePagination = (event: UI_I_Pagination): void => {
+  pagination.value = event
+  getTasks()
+}
+
+const onSortTable = (event: string): void => {
+  sort.value = event
+  getTasks()
+}
+
+const isLoading = computed<boolean>(() =>
+  $store.getters['tasks/getLoading']('tasks')
+)
+const pauseGlobalRefresh = (): void => {
+  const tasksLastRequestType = $store.getters['tasks/getTasksLastRequestType']
+  $store.dispatch('main/A_PAUSE_GLOBAL_REFRESH', tasksLastRequestType)
+}
+onUnmounted(() => {
+  pauseGlobalRefresh()
+})
+</script>
+
+<style lang="scss">
+@import '~/node_modules/bfg-common/assets/scss/common/mixins';
+.tasks {
+  @include flex($dir: column);
+  height: 100%;
+  padding-left: 10px;
+  &__headline {
+    padding-left: 10px;
+    margin-bottom: 0.6rem;
+  }
+  .btn {
+    text-transform: uppercase;
+  }
+}
+</style>