bfg-common 1.6.77 → 1.6.79

package/components/common/wizards/vm/migrate/vmOrigin/New.vue

@@ -1,12 +1,17 @@
 <template>
-  <div class="tooltip-info">
-    <span class="tooltip-info__title">{{ localization.common.vmOrigin }}</span>
+  <div :class="['tooltip-info', { isOpen: isShowTooltipLocal }]">
+    <span
+      class="tooltip-info__title"
+      @click.stop="isShowTooltipLocal = !isShowTooltipLocal"
+    >
+      {{ localization.common.vmOrigin }}
+    </span>
     <ui-icon
       id="vm-origin-info-trigger"
-      :class="['tooltip-info__icon pointer', { active: isShowTooltipLocal }]"
+      class="tooltip-info__icon pointer"
       name="info"
-      width="20"
-      height="20"
+      width="16"
+      height="16"
       @click.stop="isShowTooltipLocal = !isShowTooltipLocal"
     />
     <ui-popup-window
@@ -40,7 +45,7 @@
                 :key="item2.name"
                 class="flex items-center mt-2"
               >
-                <span :class="item2.iconName"></span>
+                <span :class="['icon-row', item2.iconName]"></span>
                 <span class="item-name">{{ item2.name }}</span>
               </div>
             </div>
@@ -67,22 +72,29 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 @import 'assets/scss/common/mixins.scss';
 .tooltip-info {
   @include flex($align: center);
+  column-gap: 8px;
+  &:hover {
+    .tooltip-info__title,
+    .tooltip-info__icon {
+      color: var(--close-icon);
+      cursor: pointer;
+    }
+  }
+  &.isOpen {
+    .tooltip-info__title,
+    .tooltip-info__icon {
+      color: var(--btn-primary-fill-bg-color);
+    }
+  }
   &__title {
     font-family: 'Inter', sans-serif;
-    color: var(--title-form-first-color);
+    color: #9da6ad; // for dark and light mode
     font-weight: 500;
     font-size: 12px;
     white-space: nowrap;
-    margin-right: 4px;
   }
   &__icon {
     color: var(--form-icon-color);
-    &:hover {
-      color: var(--close-icon);
-    }
-    &.active {
-      color: var(--btn-primary-fill-bg-color);
-    }
   }
 
   .common-widget-info {
@@ -99,14 +111,22 @@ const localization = computed<UI_I_Localization>(() => useLocal())
     &__content {
       .item-row {
         margin-top: 12px;
+        &:first-child {
+          margin-top: 20px;
+        }
       }
       .title-row {
         font-family: 'Inter', sans-serif;
-        color: var(--title-form-second-color);
+        color: #9da6ad; // for dark and light mode
         font-weight: 500;
         font-size: 13px;
+        line-height: 18px;
         margin-bottom: 8px;
       }
+      .icon-row {
+        width: 20px;
+        height: 20px;
+      }
 
       .item-name {
         font-family: 'Inter', sans-serif;

package/lib/models/store/tasks/enums.ts

@@ -3,6 +3,9 @@ export enum UI_E_RecentTaskStatus {
   'running',
   'completed',
   'failed',
+  'canceled',
+  'retrying',
+  'warning',
 }
 
 export enum UI_E_IconNameByRecentTaskStatus {

package/lib/models/store/tasks/types.ts

@@ -1,8 +1,9 @@
 export type UI_T_TasksStateLoading = 'tasks' | 'recentTasks'
 export type UI_T_TaskStatus =
-    0 | // queued
-    1 | // running
-    2 | // completed
-    3 | // failed
-    4 | // canceled
-    5 // retrying
+  | 0 // queued
+  | 1 // running
+  | 2 // completed
+  | 3 // failed
+  | 4 // canceled
+  | 5 // retrying
+  | 6 // warning

package/package.json

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

package/plugins/directives.ts

@@ -1,5 +1,5 @@
 import type { DirectiveBinding } from '@vue/runtime-core'
-import type {UI_I_Localization} from "~/lib/models/interfaces";
+import type { UI_I_Localization } from '~/lib/models/interfaces'
 
 export default defineNuxtPlugin((nuxtApp) => {
   nuxtApp.vueApp.directive('development', {
@@ -22,8 +22,7 @@ function applyDevelopmentState(el: HTMLElement, isDevelopment: boolean) {
 
   el.setAttribute('title', localization.value.common.inDevelopment)
   el.setAttribute('disabled', 'true')
-  el.style.opacity = '0.6'
-  el.style.cursor = 'not-allowed'
+  el.classList.add('in-development')
 
   // Оборачиваем, чтобы не навешивать несколько обработчиков
   const preventClick = (e: MouseEvent) => {
@@ -40,8 +39,7 @@ function applyDevelopmentState(el: HTMLElement, isDevelopment: boolean) {
 
 function cleanupDevelopment(el: HTMLElement) {
   el.removeAttribute('title')
-  el.style.opacity = ''
-  el.style.cursor = ''
+  el.classList.remove('in-development')
 
   const handler = (el as any)._developmentClickHandler
   if (handler) {

package/public/spice-console/application/agent.js

@@ -70,6 +70,7 @@ wdi.Agent = $.spcExtend(wdi.EventObject.prototype, {
 
 	setResolution: function(width, height) {
 		//TODO move this to a setting
+    // SC-2122
 		if(width < 800) {
 			width = 800;
 		}
@@ -80,23 +81,23 @@ wdi.Agent = $.spcExtend(wdi.EventObject.prototype, {
 
 		//adapt resolution, TODO: this needs to be refractored
 		var packetData = {
-            type: wdi.AgentMessageTypes.VD_AGENT_MONITORS_CONFIG,
-            opaque: 0,
-            data: new wdi.VDAgentMonitorsConfig({
-                num_of_monitors: 1,
-                flags: 0,
-                data: new wdi.VDAgentMonConfig({
-                    width: width,
-                    height: height,
-                    // Custom code
-                    // depth: 64,
-                    depth: 32, // SC-2122
-                    // Custom code end
-                    x: 0,
-                    y: 0
-                })
-            })
-        };
+      type: wdi.AgentMessageTypes.VD_AGENT_MONITORS_CONFIG,
+      opaque: 0,
+      data: new wdi.VDAgentMonitorsConfig({
+        num_of_monitors: 1,
+        flags: 0,
+        data: new wdi.VDAgentMonConfig({
+          width: width,
+          height: height,
+          // Custom code
+          // depth: 64,
+          depth: 32,
+          // Custom code end
+          x: 0,
+          y: 0,
+        }),
+      }),
+    }
 		this.sendAgentPacket(packetData);
 	},
 

package/store/tasks/actions.ts

@@ -18,6 +18,7 @@ import type {
 } from '~/lib/models/store/tasks/interfaces'
 import type { UI_I_TasksState } from '~/store/tasks/lib/models/interfaces'
 import type { UI_I_RefreshStack } from '~/store/main/lib/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
 import { tasksConstructor } from '~/store/tasks/mappers/tasks'
 import { recentTasks } from '~/store/tasks/mappers/recentTasks'
 
@@ -28,9 +29,13 @@ export default {
       state: UI_I_TasksState
       dispatch: <T>(arg0: string, arg1: T, arg2: UI_I_CommitOptions) => void
     },
-    payload: UI_I_DataTableQuery
+    payload: {
+      data: UI_I_DataTableQuery
+      project: UI_T_Project
+    }
   ): Promise<API_UI_I_Error | void> {
-    const { page, pageSize, sortBy, filter } = payload
+    const { data, project } = payload
+    const { page, pageSize, sortBy, filter } = data
 
     const query: UI_I_TableQuery = {
       page_size: pageSize,
@@ -38,7 +43,21 @@ export default {
     }
 
     if (sortBy) query.sortBy = sortBy
-    if (filter) query.filter = filter
+    if (filter) {
+      if (project === 'procurator') {
+        query.filter = filter
+      } else {
+        const filters = filter.split(',')
+        filters.forEach((item) => {
+          const [field, value] = item.split('.')
+
+          if (field && value) {
+            // @ts-ignore
+            query[field] = value
+          }
+        })
+      }
+    }
 
     const queryJson: string = JSON.stringify({ type: 'tasks', ...query })
     const lastQuery: string = context.state.taskQuery || ''
@@ -63,7 +82,9 @@ export default {
           value: true,
         })
       },
-      onResponse({ response }: API_UI_I_Response<API_UI_I_Task<string> | null>) {
+      onResponse({
+        response,
+      }: API_UI_I_Response<API_UI_I_Task<string> | null>) {
         const tasks = tasksConstructor(response._data)
 
         context.commit('M_SET_TASKS_LIST', tasks)
@@ -140,10 +161,7 @@ export default {
     payload: string
   ): Promise<void> {
     // Скрываем кнопку cancel
-    context.commit(
-      'M_HIDE_CANCEL_RECENT_TASK_BY_ID',
-      payload
-    )
+    context.commit('M_HIDE_CANCEL_RECENT_TASK_BY_ID', payload)
     const { error } = await useMyFetch<
       API_UI_I_RecentTask<string>,
       API_UI_I_Error

package/store/tasks/mappers/recentTasks.ts

@@ -82,6 +82,7 @@ export const recentTasks = (
             statusIcon = 'error-outline'
             break
           case 5:
+          case 6:
             statusIcon = 'warning-outline'
             break
         }

package/components/common/diagramMain/modals/editSettings/tabs/SwitchProperties.vue

@@ -1,164 +0,0 @@
-<template>
-  <div class="wizard-content__container">
-    <div class="wizard-content">
-      <atoms-alert
-        v-if="isShowErrorMessage"
-        :items="validationMessagesArray"
-        status="alert-danger"
-        test-id="switch-properties-alert"
-        @remove="onHideErrorMessageAlert"
-      />
-      <form id="switch-properties-form">
-        <div class="horizontal-flex-container">
-          <label class="property-label-group" for="network-label">
-            {{ localization.common.numberOfPorts }}
-          </label>
-          <div class="margin-left-property-value-group">
-            <div class="property-value-group">
-              <fieldset>
-                {{ props.initialData.num_ports }}
-              </fieldset>
-            </div>
-          </div>
-        </div>
-        <div class="horizontal-flex-container">
-          <label class="property-label-group">
-            {{ localization.common.mtuBytes }}
-          </label>
-          <div class="margin-left-property-value-group">
-            <div class="property-value-group tooltip-field-container">
-              <fieldset>
-                <atoms-tooltip-error :has-error="!!props.errorMessages.mtu">
-                  <template #elem>
-                    <input
-                      id="mtu"
-                      v-model="fieldsValues.mtu"
-                      :class="[
-                        'tooltip-field',
-                        {
-                          'danger-not-valid': props.errorMessages.mtu,
-                        },
-                      ]"
-                      data-id="mtu-input"
-                      type="number"
-                      name="mtu"
-                      @click.stop
-                    />
-                  </template>
-                  <template #content>
-                    {{ props.errorMessages.mtu }}
-                  </template>
-                </atoms-tooltip-error>
-              </fieldset>
-            </div>
-          </div>
-        </div>
-      </form>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_SwitchPropertiesFields,
-  UI_I_EditSettingsErrorMessage,
-  UI_I_ModalsInitialData,
-} from '~/components/common/diagramMain/lib/models/interfaces'
-import type { UI_T_PortPropertiesFieldName } from '~/components/common/diagramMain/lib/models/types'
-import { validationMessagesArrayFunc } from '~/components/common/diagramMain/modals/lib/utils'
-
-// Props from up
-const props = withDefaults(
-  defineProps<{
-    isShowErrorMessageAlert: boolean
-    errorMessages: UI_I_EditSettingsErrorMessage
-    initialData?: UI_I_ModalsInitialData
-    hasErrorMessages?: boolean
-  }>(),
-  {
-    initialData: () => ({}),
-    hasErrorMessages: undefined,
-  }
-)
-
-// Validation
-const emits = defineEmits<{
-  (
-    event: 'change-error-messages',
-    errorMessage: string,
-    fieldName: keyof UI_I_EditSettingsErrorMessage
-  ): void
-  (event: 'hide-error-message-alert'): void
-  (
-    event: 'change-edit-properties-data',
-    switchPropertiesData: UI_I_SwitchPropertiesFields
-  ): void
-}>()
-
-const validationMessagesArray = computed(() =>
-  validationMessagesArrayFunc(['mtu'], props.errorMessages)
-)
-
-// UI_I_Localization
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-// For showing component validation errors on the top of modal
-const isShowErrorMessage = computed<boolean>(
-  () => props.isShowErrorMessageAlert && props.hasErrorMessages
-)
-
-const fieldsValues = ref<UI_I_SwitchPropertiesFields>({
-  mtu: props.initialData.mtu || 0,
-  num_ports: props.initialData.num_ports || '',
-})
-
-const onHideErrorMessageAlert = () => emits('hide-error-message-alert')
-const onChangeData = (data: UI_I_SwitchPropertiesFields) =>
-  emits('change-edit-properties-data', data)
-
-const changeErrorMessage = (
-  errorMessage: string,
-  fieldName: keyof UI_I_EditSettingsErrorMessage
-) => emits('change-error-messages', errorMessage, fieldName)
-
-const messageTexts = (local: UI_I_Localization) => ({
-  mtu: local.common.mtuInvalidMessage,
-})
-
-const setMessageOnChangedField = (
-  values: number,
-  name: UI_T_PortPropertiesFieldName,
-  text: string
-) => {
-  if (values < 1280 || values > 65535) {
-    changeErrorMessage(text, name)
-    return
-  }
-  changeErrorMessage('', name)
-}
-
-watch(
-  fieldsValues,
-  (newValues: UI_I_SwitchPropertiesFields) => {
-    setMessageOnChangedField(
-      newValues.mtu,
-      'mtu',
-      messageTexts(localization.value).mtu
-    )
-    onChangeData(newValues)
-    !props.hasErrorMessages && onHideErrorMessageAlert()
-  },
-  {
-    deep: true,
-  }
-)
-
-onMounted(() => {
-  onChangeData(fieldsValues.value)
-})
-
-onUnmounted(() => {
-  onHideErrorMessageAlert()
-})
-</script>