bfg-common 1.6.78 → 1.6.80

package/components/common/diagramMain/modals/remove/RemoveModalNew.vue

@@ -1,106 +1,157 @@
-<template>
-  <ui-popup
-    :v-if="props.show"
-    :title="title"
-    :message="text"
-    :texts="buttons"
-    icon-name="info-status"
-    size="sm"
-    @hide="onHideModal"
-    @submit="onRemove"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_ModalTexts } from '~/node_modules/bfg-uikit/components/ui/modal/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-// Props from up
-const props = withDefaults(
-  defineProps<{
-    show: boolean
-    modalName: string
-    viewName: string
-    title: string
-    type: string
-    id?: string
-    isShowLoader?: boolean
-    label?: string
-    switchName?: string
-    hostName?: string
-    networkType: string
-    project: UI_T_Project
-  }>(),
-  {
-    id: '',
-    isShowLoader: false,
-    label: '',
-    switchName: '',
-    hostName: '',
-  }
-)
-
-// Modal hiding
-const emits = defineEmits<{
-  (event: 'hide'): void
-  (event: 'remove', id: string, type: string): void
-}>()
-
-// UI_I_Localization
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const title = computed<string>(() => {
-  switch (props.type) {
-    case 'network':
-      return localization.value.common.confirmNetworkRemoval
-    case 'port':
-      return localization.value.common.confirmPortRemoval
-    case 'switch':
-      return localization.value.common.confirmSwitchRemoval
-    default:
-      return ''
-  }
-})
-
-const text = computed<string>(() => {
-  switch (props.type) {
-    case 'network':
-      return localization.value.common.confirmNetworkRemovalMessage
-        .replace('{networkName}', props.label)
-        .replace('{switchName}', props.switchName)
-    case 'port':
-      return localization.value.common.confirmPortRemovalMessage
-        .replace('{portName}', props.id)
-        .replace('{switchName}', props.switchName)
-    case 'switch':
-      return localization.value.common.confirmSwitchRemovalMessage
-        .replace('{switchName}', props.switchName)
-        .replace('{hostName}', props.hostName)
-    default:
-      return ''
-  }
-})
-
-const buttons = computed<UI_I_ModalTexts>(() => ({
-  button1: localization.value.common.cancel,
-  button2: localization.value.common.confirm,
-}))
-
-const isSphereProject = computed<boolean>(() => props.project === 'sphere')
-
-const onRemove = (): void => {
-  const type = isSphereProject.value
-    ? props.networkType
-      ? `${props.type}${props.networkType}`
-      : props.type
-    : props.type
-
-  emits('remove', props.id, type)
-}
-const onHideModal = (): void => {
-  emits('hide')
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <div>
+    <ui-popup
+      :v-if="props.show"
+      :title="title"
+      :message="text"
+      :texts="buttons"
+      icon-name="circle-warning"
+      size="sm"
+      @hide="onHideModal"
+      @submit="onRemove"
+    >
+      <template #content>
+        <div v-if="props.type === 'port'" class="message">
+          <span class="message-title">{{ title }}</span>
+          <span class="message-item">{{ text[0] }}</span>
+          <span class="message-item">{{ text[1] }}</span>
+        </div>
+      </template>
+    </ui-popup>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_ModalTexts } from '~/node_modules/bfg-uikit/components/ui/modal/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+// Props from up
+const props = withDefaults(
+  defineProps<{
+    show: boolean
+    modalName: string
+    viewName: string
+    title: string
+    type: string
+    id?: string
+    isShowLoader?: boolean
+    label?: string
+    switchName?: string
+    hostName?: string
+    networkType: string
+    project: UI_T_Project
+  }>(),
+  {
+    id: '',
+    isShowLoader: false,
+    label: '',
+    switchName: '',
+    hostName: '',
+  }
+)
+
+// Modal hiding
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'remove', id: string, type: string): void
+}>()
+
+// UI_I_Localization
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const title = computed<string>(() => {
+  switch (props.type) {
+    case 'network':
+      return localization.value.common.confirmNetworkRemoval
+    case 'port':
+      return localization.value.common.confirmPortRemoval
+    case 'switch':
+      return localization.value.common.confirmSwitchRemoval
+    default:
+      return ''
+  }
+})
+
+const text = computed<string | string[]>(() => {
+  switch (props.type) {
+    case 'network':
+      return localization.value.common.confirmNetworkRemovalMessage
+        .replace('{networkName}', props.label)
+        .replace('{switchName}', props.switchName)
+    case 'port':
+      return [
+        localization.value.common.confirmPortRemovalMessage1,
+        localization.value.common.confirmPortRemovalMessage2
+          .replace('{portName}', props.id)
+          .replace('{switchName}', props.switchName),
+      ]
+    case 'switch':
+      return localization.value.common.confirmSwitchRemovalMessage
+        .replace('{switchName}', props.switchName)
+        .replace('{hostName}', props.hostName)
+    default:
+      return ''
+  }
+})
+
+const buttons = computed<UI_I_ModalTexts>(() => ({
+  button1: localization.value.common.cancel,
+  button2: localization.value.common.remove,
+}))
+
+const isSphereProject = computed<boolean>(() => props.project === 'sphere')
+
+const onRemove = (): void => {
+  const type = isSphereProject.value
+    ? props.networkType
+      ? `${props.type}${props.networkType}`
+      : props.type
+    : props.type
+
+  emits('remove', props.id, type)
+}
+const onHideModal = (): void => {
+  emits('hide')
+}
+</script>
+
+<style scoped lang="scss">
+:deep(svg) {
+  path {
+    fill: #ea3223;
+  }
+}
+
+.message {
+  padding: 16px 32px;
+
+  &-title {
+    display: block;
+    font-weight: 500;
+    font-size: 20px;
+    line-height: 24px;
+    letter-spacing: 0;
+    text-align: center;
+    vertical-align: middle;
+    margin-bottom: 8px;
+    color: var(--title-form-first-color);
+  }
+
+  &-item {
+    display: block;
+    font-weight: 400;
+    font-size: 14px;
+    line-height: 18px;
+    letter-spacing: 0;
+    text-align: center;
+    vertical-align: middle;
+    color: #9da6ad;
+    margin-bottom: 12px;
+  }
+
+  span:last-of-type {
+    margin-bottom: 0;
+  }
+}
+</style>

package/components/common/diagramMain/modals/viewSettings/viewSettingsModal/ViewSettingsModalNew.vue

@@ -1,50 +1,58 @@
-<template>
-  <div class="view-settings-modal__container">
-    <ui-modal
-      v-if="props.show"
-      :width="props.width"
-      :title="props.title"
-      :subtitle="props.secondTitle"
-      @hide="emits('hide')"
-    >
-      <template #content>
-        <common-diagram-main-modals-view-settings-info
-          :show="true"
-          :height="props.infoHeight"
-          :view-name="props.viewName"
-          :modal-tabs="props.modalTabs"
-          :full-mode="false"
-          :view-settings-fields="props.viewSettingsFields"
-        />
-      </template>
-      <template #footer>
-        <div style="height: 32px"></div>
-      </template>
-    </ui-modal>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_PortViewSettingsNewModalProps } from '~/components/common/diagramMain/modals/viewSettings/viewSettingsModal/lib/models/interfaces'
-
-const props = withDefaults(defineProps<UI_I_PortViewSettingsNewModalProps>(), {
-  initialData: () => ({}),
-  title: '',
-  width: '560px',
-  height: '553px',
-  modalTabs: () => [],
-  infoHeight: '390px',
-  secondTitle: '',
-})
-
-const emits = defineEmits<{
-  (event: 'hide'): void
-}>()
-</script>
-
-<style scoped lang="scss">
-:deep(.modal-body) {
-  max-height: unset;
-  overflow-y: unset;
-}
-</style>
+<template>
+  <div class="view-settings-modal__container">
+    <ui-modal
+      v-if="props.show"
+      :width="props.width"
+      :title="props.title"
+      :subtitle="props.secondTitle"
+      @hide="emits('hide')"
+    >
+      <template #content>
+        <common-diagram-main-modals-view-settings-info
+          :show="true"
+          :height="props.infoHeight"
+          :view-name="props.viewName"
+          :modal-tabs="props.modalTabs"
+          :full-mode="false"
+          :view-settings-fields="props.viewSettingsFields"
+        />
+      </template>
+      <template #footer>
+        <div style="height: 32px"></div>
+      </template>
+    </ui-modal>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_PortViewSettingsNewModalProps } from '~/components/common/diagramMain/modals/viewSettings/viewSettingsModal/lib/models/interfaces'
+
+const props = withDefaults(defineProps<UI_I_PortViewSettingsNewModalProps>(), {
+  initialData: () => ({}),
+  title: '',
+  width: '560px',
+  height: '553px',
+  modalTabs: () => [],
+  infoHeight: '390px',
+  secondTitle: '',
+})
+
+const emits = defineEmits<{
+  (event: 'hide'): void
+}>()
+</script>
+
+<style scoped lang="scss">
+:deep(.modal-body) {
+  max-height: unset;
+  overflow-y: unset;
+
+  .info-container {
+    padding-top: 0;
+  }
+  .table-fixed-height {
+    scrollbar-gutter: stable;
+    padding-right: 18px;
+  }
+}
+</style>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.6.78",
+  "version": "1.6.80",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -18,7 +18,7 @@
     "@vueuse/core": "10.1.2",
     "@vueuse/nuxt": "10.1.2",
     "bfg-nuxt-3-graph": "1.0.28",
-    "bfg-uikit": "1.1.32",
+    "bfg-uikit": "1.1.33",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-myrules": "file:./eslint",
     "nuxt": "3.11.2",

package/components/common/certificate/lib/config/tabsPannel.ts

@@ -1,22 +0,0 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
-
-export const certificateTabsFunc = (
-  localization: UI_I_Localization
-): UI_I_CollapseNavItem[] => {
-  return [
-    {
-      text: localization.common.renew,
-      value: 'renew',
-      disabled: false,
-      testId: 'certificate-renew',
-    },
-    {
-      text: localization.common.certificateRefreshTitle,
-      value: 'refreshCaCertificates',
-      disabled: true,
-      testId: 'certificate-refresh',
-      development: true,
-    },
-  ]
-}