bfg-common 1.6.67 → 1.6.68

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>