bfg-common 1.4.731 → 1.4.734

package/components/common/pages/home/widgets/vms/VmsNew.vue

@@ -1,101 +1,101 @@
-<template>
-  <ui-widget>
-    <template v-if="props.loading">
-      <common-pages-home-widgets-skeleton-total-quantities-item />
-    </template>
-    <div v-else class="card-content">
-      <div class="card-content__title">
-        <h1>{{ localization.common.vms }}</h1>
-        <span>({{ props.vms.total }})</span>
-      </div>
-
-      <div class="card-content__container">
-        <template v-for="({ text, value, icon }, key) in itemsLocal" :key="key">
-          <div v-if="key > 0" class="divider"></div>
-
-          <div class="card-content-item">
-            <span :class="['icon', icon]"></span>
-            <div class="label">{{ localization.common[text] }}</div>
-            <div class="count">{{ value }}</div>
-          </div>
-        </template>
-      </div>
-    </div>
-  </ui-widget>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_Card,
-  UI_I_Vms,
-} from '~/components/common/pages/home/lib/models/interfaces'
-import { itemsFunc } from '~/components/common/pages/home/widgets/vms/lib/config/items'
-
-const props = defineProps<{
-  vms: UI_I_Vms
-  loading: boolean
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const itemsLocal = computed<UI_I_Card[]>(() => itemsFunc(props.vms))
-</script>
-
-<style lang="scss" scoped>
-@import 'assets/scss/common/mixins.scss';
-.card-content {
-  &__title {
-    @include flex($align: center);
-    color: var(--widget-text-first);
-    margin-bottom: 16px;
-    & > h1 {
-      font-size: 16px;
-      font-weight: 500;
-      line-height: 19.36px;
-    }
-    & > span {
-      font-size: 16px;
-      font-weight: 500;
-      margin-left: 5px;
-    }
-  }
-  &__container {
-    display: grid;
-    grid-template-columns: 1fr auto 1fr auto 1fr;
-    grid-column-gap: 12px;
-    padding: 24px 0;
-    box-sizing: border-box;
-  }
-  .divider {
-    width: 1px;
-    height: 100%;
-    background-color: var(--horizontal-line);
-  }
-
-  .card-content-item {
-    @include flex($align: center, $dir: column);
-
-    .icon {
-      width: 20px;
-      height: 20px;
-      margin-bottom: 8px;
-    }
-
-    .label {
-      color: #9da6ad;
-      font-size: 14px;
-      font-weight: 500;
-      line-height: 16.94px;
-      margin-bottom: 12px;
-    }
-
-    .count {
-      color: var(--widget-text-first);
-      font-size: 16px;
-      font-weight: 500;
-      line-height: 19.36px;
-    }
-  }
-}
-</style>
+<template>
+  <ui-widget>
+    <template v-if="props.loading">
+      <common-pages-home-widgets-skeleton-total-quantities-item />
+    </template>
+    <div v-else class="card-content">
+      <div class="card-content__title">
+        <h1>{{ localization.common.vms }}</h1>
+        <span>({{ props.vms.total }})</span>
+      </div>
+
+      <div class="card-content__container">
+        <template v-for="({ text, value, icon }, key) in itemsLocal" :key="key">
+          <div v-if="key > 0" class="divider"></div>
+
+          <div class="card-content-item">
+            <span :class="['icon', icon]"></span>
+            <div class="label">{{ localization.common[text] }}</div>
+            <div class="count">{{ value }}</div>
+          </div>
+        </template>
+      </div>
+    </div>
+  </ui-widget>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_Card,
+  UI_I_Vms,
+} from '~/components/common/pages/home/lib/models/interfaces'
+import { itemsFunc } from '~/components/common/pages/home/widgets/vms/lib/config/items'
+
+const props = defineProps<{
+  vms: UI_I_Vms
+  loading: boolean
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const itemsLocal = computed<UI_I_Card[]>(() => itemsFunc(props.vms))
+</script>
+
+<style lang="scss" scoped>
+@import 'assets/scss/common/mixins.scss';
+.card-content {
+  &__title {
+    @include flex($align: center);
+    color: var(--widget-text-first);
+    margin-bottom: 16px;
+    & > h1 {
+      font-size: 16px;
+      font-weight: 500;
+      line-height: 19.36px;
+    }
+    & > span {
+      font-size: 16px;
+      font-weight: 500;
+      margin-left: 5px;
+    }
+  }
+  &__container {
+    display: grid;
+    grid-template-columns: 1fr auto 1fr auto 1fr;
+    grid-column-gap: 12px;
+    padding: 24px 0;
+    box-sizing: border-box;
+  }
+  .divider {
+    width: 1px;
+    height: 100%;
+    background-color: var(--horizontal-line);
+  }
+
+  .card-content-item {
+    @include flex($align: center, $dir: column);
+
+    .icon {
+      width: 20px;
+      height: 20px;
+      margin-bottom: 8px;
+    }
+
+    .label {
+      color: #9da6ad;
+      font-size: 14px;
+      font-weight: 500;
+      line-height: 16.94px;
+      margin-bottom: 12px;
+    }
+
+    .count {
+      color: var(--widget-text-first);
+      font-size: 16px;
+      font-weight: 500;
+      line-height: 19.36px;
+    }
+  }
+}
+</style>

package/components/common/pages/home/widgets/vms/VmsOld.vue

@@ -1,35 +1,35 @@
-<template>
-  <div :class="classes">
-    <div class="entity-status">
-      <common-pages-home-card
-        :title="localization.common.vms"
-        :count="props.vms.total"
-        icon-name="vsphere-icon-vm"
-      >
-        <common-pages-home-status-content :items="props.vms" />
-      </common-pages-home-card>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_Vms } from '~/components/common/pages/home/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-const props = defineProps<{
-  vms: UI_I_Vms
-  project?: UI_T_Project
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const classes = computed<string>(() => {
-  let classes = 'clr-col-md-6 clr-col-sm-12'
-  if (props.project === 'procurator') {
-    classes = 'clr-col-md-12 clr-col-sm-12'
-  }
-  return classes
-})
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <div :class="classes">
+    <div class="entity-status">
+      <common-pages-home-card
+        :title="localization.common.vms"
+        :count="props.vms.total"
+        icon-name="vsphere-icon-vm"
+      >
+        <common-pages-home-status-content :items="props.vms" />
+      </common-pages-home-card>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_Vms } from '~/components/common/pages/home/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+const props = defineProps<{
+  vms: UI_I_Vms
+  project?: UI_T_Project
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const classes = computed<string>(() => {
+  let classes = 'clr-col-md-6 clr-col-sm-12'
+  if (props.project === 'procurator') {
+    classes = 'clr-col-md-12 clr-col-sm-12'
+  }
+  return classes
+})
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/pages/home/widgets/vms/lib/config/items.ts

@@ -1,20 +1,20 @@
-import type {UI_I_Card, UI_I_Vms} from "~/components/common/pages/home/lib/models/interfaces";
-
-export const itemsFunc = (vms: UI_I_Vms): UI_I_Card[] => [
-  {
-    value: vms.powered_on,
-    text: 'powered_on',
-    icon: 'vsphere-icon-vm-on',
-  },
-  {
-    value: vms.powered_off,
-    text: 'powered_off',
-    icon: 'icon-vm-power-off',
-  },
-
-  {
-    value: vms.suspended,
-    text: 'suspended',
-    icon: 'vsphere-icon-vm-suspended',
-  },
+import type {UI_I_Card, UI_I_Vms} from "~/components/common/pages/home/lib/models/interfaces";
+
+export const itemsFunc = (vms: UI_I_Vms): UI_I_Card[] => [
+  {
+    value: vms.powered_on,
+    text: 'powered_on',
+    icon: 'vsphere-icon-vm-on',
+  },
+  {
+    value: vms.powered_off,
+    text: 'powered_off',
+    icon: 'icon-vm-power-off',
+  },
+
+  {
+    value: vms.suspended,
+    text: 'suspended',
+    icon: 'vsphere-icon-vm-suspended',
+  },
 ]

package/components/common/pages/tasks/Tasks.vue

@@ -74,11 +74,20 @@ onUnmounted(() => {
 })
 </script>
 
+<style>
+:root {
+  --main-bg-color: #fafafa;
+}
+:root.dark-theme {
+  --main-bg-color: #213444;
+}
+</style>
 <style lang="scss" scoped>
 .tasks {
   display: flex; // TODO надо удалить потом (clr style)
   flex-direction: column; // TODO надо удалить потом (clr style)
   height: inherit;
+  background-color: var(--main-bg-color);
   padding: 10px 16px 30px;
   &__headline {
     font-family: Inter, sans-serif;

package/components/common/pages/tasks/table/Table.vue

@@ -228,7 +228,6 @@ const onSelectNodeOfTree = (
   }
   .chip-icon {
     min-width: 14px;
-    margin-right: 6px;
   }
   .icon {
     margin-right: 4px;

package/components/common/pages/tasks/table/errorInfo/ErrorInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="error-info">
     <ui-icon
-      :id="`resent-task-error-info-icon-${props.id}`"
+      :id="`task-error-info-icon-${props.id}`"
       name="info"
       width="16px"
       height="16px"
@@ -13,7 +13,7 @@
       width="232px"
       top
       left
-      :elem-id="`resent-task-error-info-icon-${props.id}`"
+      :elem-id="`task-error-info-icon-${props.id}`"
     >
       <div class="common-widget-info">
         <div class="headline justify-between flex-align-center">
@@ -39,7 +39,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_Localization } from '~/node_modules/bfg-common/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
 
 const props = defineProps<{
   id: string
@@ -58,13 +58,13 @@ const isShowInfo = ref<boolean>(false)
   margin-left: 8px;
 
   .info-icon {
-    color: #9da6ad;
+    color: var(--form-icon-color);
 
     &:hover {
-      color: #4d5d69;
+      color: var(--close-icon);
     }
     &.show {
-      color: #008fd6;
+      color: var(--switch-bg-checked-reverse);
     }
   }
 
@@ -79,6 +79,10 @@ const isShowInfo = ref<boolean>(false)
       margin-left: 8px;
     }
 
+    .hide-icon {
+      color: var(--alert-icon);
+    }
+
     .common-widget-info-description {
       font-size: 13px;
       line-height: 15.73px;

package/components/common/pages/tasks/table/expandDetails/ExpandDetails.vue

@@ -18,6 +18,7 @@
         <ui-chip
           :test-id="normalizedTaskDetails[2].data.testId"
           :color="normalizedTaskDetails[2].data.chipColor"
+          size="sm"
           rounded
         >
           <ui-icon
@@ -126,15 +127,18 @@ const onSelectNodeOfTree = (data: any): void => {
   line-height: 14.52px;
 }
 .expand-details {
+  display: grid;
+  grid-template-columns: auto 1fr;
+  column-gap: 24px;
+  row-gap: 8px;
   &__row {
-    display: grid;
-    grid-template-columns: 110px 1fr;
-    column-gap: 12px;
-    margin-bottom: 8px;
+    display: contents;
+    height: 18px;
   }
   &__label {
     @extend %properties;
     color: #9da6ad;
+    text-transform: capitalize;
   }
   &__value {
     @extend %properties;
@@ -158,10 +162,6 @@ const onSelectNodeOfTree = (data: any): void => {
     @include flex($align: center);
     .ui-chip {
       width: max-content;
-      :deep(.ui-chip__label) {
-        // TODO надо удалить потом (clr style)
-        grid-gap: 4px;
-      }
     }
   }
 }