bfg-common 1.2.189 → 1.2.190

package/assets/localization/local_be.json

@@ -1503,7 +1503,7 @@
   "srIov": "SR-IOV",
   "stackedGraph": "Складзены графік",
   "standardSwitch": "Стандартны перамыкач",
-  "standardSwitchInvalidMessage": "Выберыце існуючы стандартны перамыкач.",
+  "standardSwitchInvalidMessage": "Выберыце перамыкач",
   "standbyAdapters": "Рэзервовыя адаптары",
   "start": "Пачаць",
   "startAndStopManually": "Запускаць і спыняць уручную",
@@ -2139,6 +2139,5 @@
   "fieldShouldNotBeEmpty": "Поле не павінна быць пустым.",
   "port": "Порт",
   "iscsiTargetName": "Мэтавая назва iSCSI",
-  "inheritAuthenticationSettingsFromParent": "Успадкаваць налады аўтэнтыфікацыі ад бацькоўскага",
-  "editGeneral": "Рэдагаваць агульныя"
+  "inheritAuthenticationSettingsFromParent": "Успадкаваць налады аўтэнтыфікацыі ад бацькоўскага"
 }

package/assets/localization/local_en.json

@@ -1503,7 +1503,7 @@
   "srIov": "SR-IOV",
   "stackedGraph": "Stacked Graph",
   "standardSwitch": "Standard switch",
-  "standardSwitchInvalidMessage": "Select an existing standard switch.",
+  "standardSwitchInvalidMessage": "Select switch",
   "standbyAdapters": "Standby adapters",
   "start": "Start",
   "startAndStopManually": "Start and stop manually",
@@ -2142,6 +2142,5 @@
   "fieldShouldNotBeEmpty": "Field should not be empty.",
   "port": "Port",
   "iscsiTargetName": "iSCSI Target Name",
-  "inheritAuthenticationSettingsFromParent": "Inherit authentication settings from parent",
-  "editGeneral": "Edit General"
+  "inheritAuthenticationSettingsFromParent": "Inherit authentication settings from parent"
 }

package/assets/localization/local_hy.json

@@ -1503,7 +1503,7 @@
   "srIov": "SR-IOV",
   "stackedGraph": "Կուտակված գրաֆիկ",
   "standardSwitch": "Ստանդարտ անջատիչ",
-  "standardSwitchInvalidMessage": "Ընտրեք գոյություն ունեցող ստանդարտ անջատիչ:",
+  "standardSwitchInvalidMessage": "Ընտրեք անջատիչ",
   "standbyAdapters": "Պահուստային ադապտերներ",
   "start": "Սկսել",
   "startAndStopManually": "Սկսել և դադարեցնել ձեռքով",
@@ -2142,6 +2142,5 @@
   "fieldShouldNotBeEmpty": "Դաշտը չպետք է դատարկ լինի:",
   "port": "Պորտ",
   "iscsiTargetName": "iSCSI թիրախի անունը",
-  "inheritAuthenticationSettingsFromParent": "Նույնականացման կարգավորումները ժառանգել ծնողից",
-  "editGeneral": "Խմբագրել Ընդհանուր"
+  "inheritAuthenticationSettingsFromParent": "Նույնականացման կարգավորումները ժառանգել ծնողից"
 }

package/assets/localization/local_kk.json

@@ -1503,7 +1503,7 @@
   "srIov": "SR-IOV",
   "stackedGraph": "Бүктелген кесте",
   "standardSwitch": "Стандартты қосқыш",
-  "standardSwitchInvalidMessage": "Бар стандартты қосқышты таңдаңыз.",
+  "standardSwitchInvalidMessage": "Ауыстырғышты таңдаңыз",
   "standbyAdapters": "Резервтік адаптерлер",
   "start": "Бастау",
   "startAndStopManually": "Қолмен бастау және тоқтату",
@@ -2142,6 +2142,5 @@
   "fieldShouldNotBeEmpty": "Өріс бос болмауы керек.",
   "port": "Порт",
   "iscsiTargetName": "iSCSI мақсатты атауы",
-  "inheritAuthenticationSettingsFromParent": "Аутентификация параметрлерін ата-анадан мұраға алу",
-  "editGeneral": "Жалпы өңдеу"
+  "inheritAuthenticationSettingsFromParent": "Аутентификация параметрлерін ата-анадан мұраға алу"
 }

package/assets/localization/local_ru.json

@@ -1503,7 +1503,7 @@
   "srIov": "SR-IOV",
   "stackedGraph": "Сложенный график",
   "standardSwitch": "Стандартный коммутатор",
-  "standardSwitchInvalidMessage": "Выберите существующий стандартный коммутатор.",
+  "standardSwitchInvalidMessage": "Выберите коммутатор",
   "standbyAdapters": "Резервные адаптеры",
   "start": "Начать",
   "startAndStopManually": "Запускать и останавливать вручную",
@@ -2142,6 +2142,5 @@
   "fieldShouldNotBeEmpty": "Поле не должно быть пустым.",
   "port": "Порт",
   "iscsiTargetName": "Имя цели iSCSI",
-  "inheritAuthenticationSettingsFromParent": "Наследовать настройки аутентификации от родителя",
-  "editGeneral": "Изменить общее"
+  "inheritAuthenticationSettingsFromParent": "Наследовать настройки аутентификации от родителя"
 }

package/assets/localization/local_zh.json

@@ -1503,7 +1503,7 @@
   "srIov": "SR-IOV",
   "stackedGraph": "堆叠图",
   "standardSwitch": "标准开关",
-  "standardSwitchInvalidMessage": "选择现有的标准交换机。",
+  "standardSwitchInvalidMessage": "选择开关",
   "standbyAdapters": "待机适配器",
   "start": "開始",
   "startAndStopManually": "手動啟動和停止",
@@ -2142,6 +2142,5 @@
   "fieldShouldNotBeEmpty": "字段不应为空。",
   "port": "港口",
   "iscsiTargetName": "iSCSI 目标名称",
-  "inheritAuthenticationSettingsFromParent": "从父级继承身份验证设置",
-  "editGeneral": "编辑常规"
+  "inheritAuthenticationSettingsFromParent": "从父级继承身份验证设置"
 }

package/components/atoms/table/simpleTable/SimpleTable.vue

@@ -28,9 +28,7 @@
         <tr
           v-for="(item, key) in presentBodyItems"
           :key="key"
-          :class="{
-            selected: props.selectedRowKey === key || selectedRowKey === key,
-          }"
+          :class="{ selected: selectedRowKey === key }"
           @click="selectRow(key, item)"
         >
           <td
@@ -73,9 +71,8 @@ const props = withDefaults(
     bodyItems: UI_I_TableBodyItem[][]
     editable?: boolean
     testId?: string
-    selectedRowKey?: number
   }>(),
-  { testId: 'ui-simple-table', selectedRowKey: -1 }
+  { testId: 'ui-simple-table' }
 )
 const emits = defineEmits<{
   (event: 'select', value1: number, value2: UI_I_TableBodyItem[]): void

package/components/atoms/wizard/Wizard.vue

@@ -284,8 +284,8 @@ const onPreviousStep = (): void => {
 watch(
   () => props.selectedScheme,
   (newValue: number[]) => {
-    steps.value = props.steps.filter((step: UI_I_WizardStep) =>
-      newValue.includes(step.id)
+    steps.value = props.steps.filter((_step: UI_I_WizardStep, index: number) =>
+      newValue.includes(index)
     )
   },
   { deep: true, immediate: true }
@@ -293,8 +293,8 @@ watch(
 watch(
   () => props.steps,
   (newValue: UI_I_WizardStep[]) => {
-    steps.value = newValue.filter((step: UI_I_WizardStep) =>
-      props.selectedScheme.includes(step.id)
+    steps.value = newValue.filter((_step: UI_I_WizardStep, index: number) =>
+      props.selectedScheme.includes(index)
     )
   },
   { deep: true, immediate: true }

package/components/atoms/wizard/models/interfaces.ts

@@ -42,7 +42,6 @@ export interface UI_I_ValidationReturn {
   newValue: UI_I_WizardStep[]
 }
 
-export interface UI_I_AsyncCheckReturn {
-  isValid: boolean
-  message: string
-}
+// export interface UI_I_WizardSlot {
+//   selectedStep: UI_I_WizardStep
+// }

package/components/atoms/wizard/utils/utils.ts

@@ -15,7 +15,6 @@ export default class Wizard {
   private _stepsScheme: Ref<number[][]>
   private _selectedSchemeId: Ref<number>
   private _wizardLoader: Ref<UI_I_Loader>
-  private _waitingStepId: Ref<number>
   selectedScheme: ComputedRef<number[]>
   alertMessages: ComputedRef<string[][]>
 
@@ -29,7 +28,6 @@ export default class Wizard {
       status: false,
       messages: [],
     })
-    this._waitingStepId = ref<number>(-1)
     this.selectedScheme = computed<number[]>(
       () => this._stepsScheme.value[this._selectedSchemeId.value]
     )
@@ -68,32 +66,13 @@ export default class Wizard {
     return this._selectedSchemeId.value
   }
 
-  set waitingStepId(id: number) {
-    this._waitingStepId.value = id
-  }
-
-  get waitingStepId(): number {
-    return this._waitingStepId.value
-  }
-
   get wizardLoader(): UI_I_Loader {
     return this._wizardLoader.value
   }
 
-  get nextAvailableStep(): number {
-    const currentStepIndex = this.selectedScheme.value.indexOf(
-      this.selectedStepId
-    )
-    return this.selectedScheme.value[currentStepIndex + 1]
-  }
-
   setLoader(status: boolean, messages?: string[]): void {
     this._wizardLoader.value.status = status
 
-    if (!messages && this._wizardLoader.value.messages.length > 0) {
-      this._wizardLoader.value.messages = []
-      return
-    }
     if (!messages) return
 
     messages.length > 0 && (this._wizardLoader.value.messages = messages)
@@ -143,25 +122,15 @@ export default class Wizard {
 
     if (!invalidStep) return
 
+    invalidStep.isValid = false
     invalidStep.fields[field].field = message
 
-    if (message) {
-      invalidStep.isValid = false
-
-      if (this.isSelected(invalidStep.status)) {
-        invalidStep.status = UI_E_WIZARD_STATUS.INVALID_SELECTED
-        return
-      }
-
-      invalidStep.status = UI_E_WIZARD_STATUS.INVALID
-    } else {
-      invalidStep.isValid = true
-      if (this.isSelected(invalidStep.status)) {
-        invalidStep.status = UI_E_WIZARD_STATUS.SELECTED
-      } else {
-        invalidStep.status = UI_E_WIZARD_STATUS.COMPLETED
-      }
+    if (this.isSelected(invalidStep.status)) {
+      invalidStep.status = UI_E_WIZARD_STATUS.INVALID_SELECTED
+      return
     }
+
+    invalidStep.status = UI_E_WIZARD_STATUS.INVALID
   }
 
   setAlertMessage(stepId: number, field: string, message: string): void {
@@ -184,6 +153,18 @@ export default class Wizard {
     )
   }
 
+  hideAlertMessagesByStepId(stepId: number): UI_I_WizardStep[] {
+    const modifiedStep: UI_I_WizardStep = this.steps[stepId]
+
+    for (const field in modifiedStep.fields) {
+      modifiedStep.fields[field].alert = ''
+    }
+
+    return (this.steps = this.steps.map((step: UI_I_WizardStep) =>
+      step.id === stepId ? modifiedStep : step
+    ))
+  }
+
   private removeValidationError(
     stepId: number,
     field: string,
@@ -224,18 +205,6 @@ export default class Wizard {
     )
   }
 
-  hideAlertMessagesByStepId(stepId: number): UI_I_WizardStep[] {
-    const modifiedStep: UI_I_WizardStep = this.steps[stepId]
-
-    for (const field in modifiedStep.fields) {
-      modifiedStep.fields[field].alert = ''
-    }
-
-    return (this.steps = this.steps.map((step: UI_I_WizardStep) =>
-      step.id === stepId ? modifiedStep : step
-    ))
-  }
-
   changeStep(value: UI_I_WizardStep[]): void {
     this.steps = this.steps.map(
       (step: UI_I_WizardStep): UI_I_WizardStep => ({
@@ -273,12 +242,7 @@ export default class Wizard {
 
   async changeSteps(
     value: UI_I_WizardStep[],
-    validationFunc?: (
-      value: UI_I_WizardStep[],
-      currentStep: UI_I_WizardStep,
-      nextStep: UI_I_WizardStep
-    ) => Promise<UI_I_ValidationReturn>,
-    finalValidationFunc?: (
+    validationFunc: (
       value: UI_I_WizardStep[],
       currentStep: UI_I_WizardStep,
       nextStep: UI_I_WizardStep
@@ -316,32 +280,6 @@ export default class Wizard {
 
         validation.stepHasError && this.goToFirstInvalidStep()
 
-        return
-      } else if (this.isLastStep() && finalValidationFunc) {
-        const finalValidation: UI_I_ValidationReturn =
-          await finalValidationFunc(value, currentStep, nextStep)
-
-        if (
-          finalValidation.stepHasError ||
-          finalValidation.stepShouldStop?.ifFromAnyStep ||
-          finalValidation.stepShouldStop?.ifOnCurrentStep
-        ) {
-          finalValidation.stepShouldStop?.ifFromAnyStep &&
-            currentStep.id < finalValidation.stepShouldStop?.stoppageStepId &&
-            this.selectStepHard(finalValidation.stepShouldStop?.stoppageStepId)
-
-          finalValidation.stepShouldStop?.ifOnCurrentStep &&
-            this.selectStepHard(finalValidation.stepShouldStop?.stoppageStepId)
-
-          finalValidation.stepHasError && this.goToFirstInvalidStep()
-
-          return
-        } else {
-          currentStep.status = UI_E_WIZARD_STATUS.COMPLETED
-        }
-
-        this.changeStep(finalValidation.newValue)
-
         return
       } else {
         currentStep.status = UI_E_WIZARD_STATUS.COMPLETED
@@ -357,8 +295,9 @@ export default class Wizard {
 
   selectStepHard(stepId: number): void {
     const newSteps = this.steps.map((st: UI_I_WizardStep) => {
+      console.log(st.id, stepId)
       if (st.id < stepId) return { ...st, status: UI_E_WIZARD_STATUS.COMPLETED }
-
+      console.log(st.id, stepId)
       if (st.id === stepId)
         return { ...st, status: UI_E_WIZARD_STATUS.SELECTED }
 
@@ -373,11 +312,7 @@ export default class Wizard {
     currentStepId: number,
     nextStepId: number
   ): boolean {
-    return (
-      nextStepId > step &&
-      currentStepId <= step &&
-      this.selectedScheme.value.includes(step)
-    )
+    return nextStepId > step && currentStepId <= step
   }
 
   setValidation(
@@ -396,11 +331,6 @@ export default class Wizard {
     return true
   }
 
-  removeValidationLocal(stepId: number, field: string): void {
-    this.setValidationError(stepId, field, '')
-    this.setAlertMessage(stepId, field, '')
-  }
-
   removeValidation(
     stepId: number,
     field: string,
@@ -412,7 +342,6 @@ export default class Wizard {
       true,
       value
     )
-
     newValue = this.removeAlertMessage(stepId, field, newValue)
     return newValue
   }
@@ -454,15 +383,11 @@ export default class Wizard {
   }
 
   activeStepId(): number {
-    const activeStep = this.steps.find(
-      (step: UI_I_WizardStep) => step.status === UI_E_WIZARD_STATUS.ACTIVE
-    )?.id
-
-    const invalidStep = this.steps.find(
-      (step: UI_I_WizardStep) => step.status === UI_E_WIZARD_STATUS.INVALID
-    )?.id
-
-    return activeStep || invalidStep || 0
+    return (
+      this.steps.find(
+        (step: UI_I_WizardStep) => step.status === UI_E_WIZARD_STATUS.ACTIVE
+      )?.id || 0
+    )
   }
 
   wasCompleted(): boolean {
@@ -476,10 +401,6 @@ export default class Wizard {
     )
   }
 
-  isSelectedScheme(schemeId: number): boolean {
-    return schemeId === this.selectedSchemeId
-  }
-
   getStepIdByFieldName(fieldName: string): number {
     return this.steps.find((step) => step.fields[fieldName])?.id || -1
   }