bfg-common 1.5.790 → 1.5.792

package/components/common/configure/advancedSystemSettings/tableView/old/Old.vue

@@ -14,7 +14,7 @@
     >
       <template #value="{ item }">
         <common-configure-advanced-system-settings-table-view-old-field
-          :item="item"
+          :data="item.data"
           @change="onChangeSetting($event, item.data.key)"
           @error-message="onUpdateInvalidFields($event, item.data.key)"
         />
@@ -38,6 +38,7 @@ import type {
   UI_I_Pagination,
 } from '~/lib/models/table/interfaces'
 import type { UI_I_AdvancedSystemSetting } from '~/store/inventory/modules/configure/advancedSystemSettings/lib/models/interfaces'
+import type { UI_I_AdvancedSystemSettingsEditData } from '~/components/common/configure/advancedSystemSettings/tableView/old/lib/models/interfaces'
 import * as table from '~/components/common/configure/advancedSystemSettings/tableView/old/lib/config/table'
 
 const settings = defineModel<API_UI_I_DataTable<UI_I_AdvancedSystemSetting[]>>(
@@ -57,7 +58,10 @@ const props = defineProps<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const onChangeSetting = (value: any, key: string): void => {
+const onChangeSetting = (
+  value: UI_I_AdvancedSystemSettingsEditData['value'],
+  key: string
+): void => {
   settings.value.items = settings.value.items.map((item) => {
     if (item.key === key) {
       item.value = value
@@ -70,7 +74,9 @@ const invalidFieldsLocal = ref<UI_I_ArbitraryObject<string>>({})
 const onUpdateInvalidFields = (value: string, key: string): void => {
   invalidFieldsLocal.value[key] = value
   if (invalidFields.value)
-    invalidFields.value = Object.values(invalidFieldsLocal.value).filter(error => error)
+    invalidFields.value = Object.values(invalidFieldsLocal.value).filter(
+      (error) => error
+    )
 }
 
 const paginationLocal = ref<UI_I_Pagination>({

package/components/common/configure/advancedSystemSettings/tableView/old/field/Field.vue

@@ -1,7 +1,7 @@
 <template>
   <atoms-tooltip-error :has-error="invalid">
     <template #elem>
-      <div v-if="props.item.data.type === 'number'">
+      <div v-if="props.data.type === 'number'">
         <input
           v-model="valueLocal"
           type="number"
@@ -9,7 +9,7 @@
           @input="onChangeSetting($event)"
         />
       </div>
-      <div v-if="props.item.data.type === 'string'">
+      <div v-if="props.data.type === 'string'">
         <input
           v-model="valueLocal"
           type="text"
@@ -17,7 +17,7 @@
           @input="onChangeSetting($event)"
         />
       </div>
-      <div v-if="props.item.data.type === 'boolean'" class="select">
+      <div v-if="props.data.type === 'boolean'" class="select">
         <select
           v-model="valueLocal"
           @change="onChangeSetting($event)"
@@ -27,21 +27,21 @@
           <option value="true">true</option>
         </select>
       </div>
-      <div v-if="props.item.data.type === 'select'" class="select">
-        <select
-          v-model="valueLocal"
-          @change="onChangeSetting($event)"
-          :class="{ 'has-error': invalid }"
-        >
-          <option
-            v-for="item2 in props.item.data.options"
-            :key="item2.key"
-            :value="item2.key"
-          >
-            {{ item2.value }}
-          </option>
-        </select>
-      </div>
+<!--      <div v-if="props.data.type === 'select'" class="select">-->
+<!--        <select-->
+<!--          v-model="valueLocal"-->
+<!--          @change="onChangeSetting($event)"-->
+<!--          :class="{ 'has-error': invalid }"-->
+<!--        >-->
+<!--          <option-->
+<!--            v-for="item2 in props.data.options"-->
+<!--            :key="item2.key"-->
+<!--            :value="item2.key"-->
+<!--          >-->
+<!--            {{ item2.value }}-->
+<!--          </option>-->
+<!--        </select>-->
+<!--      </div>-->
     </template>
     <template #content>
       {{ errorMessage }}
@@ -50,31 +50,35 @@
 </template>
 
 <script setup lang="ts">
+import type {
+  UI_I_AdvancedSystemSettingsEditData
+} from "~/components/common/configure/advancedSystemSettings/tableView/old/lib/models/interfaces";
 import { E_Format } from '~/components/common/configure/advancedSystemSettings/tableView/old/field/lib/models/enums'
 import { allRegExp } from '~/lib/config/regExp'
 
 const props = defineProps<{
-  item: any
+  data: UI_I_AdvancedSystemSettingsEditData
 }>()
 const emits = defineEmits<{
-  (event: 'change', value: any): void
+  (event: 'change', value: UI_I_AdvancedSystemSettingsEditData['value']): void
   (event: 'error-message', value: string): void
 }>()
 
-const valueLocal = ref<any>(props.item.data.value)
+const valueLocal = ref<UI_I_AdvancedSystemSettingsEditData['value']>(props.data.value)
 
 const invalid = ref<boolean>(false)
 const errorMessage = ref<string>('')
 
-const onChangeSetting = (event: any): void => {
+const onChangeSetting = (event: Event): void => {
   invalid.value = false
   errorMessage.value = ''
 
-  let value = event.target.value
-  if (props.item.data.type === 'boolean') value = !!value
-  if (props.item.data.type === 'number') value = +value
+  const target = event.target as HTMLInputElement
+  let value: UI_I_AdvancedSystemSettingsEditData['value'] = target.value
+  if (props.data.type === 'boolean') value = !!value
+  if (props.data.type === 'number') value = +value
 
-  const { validation } = props.item.data
+  const { validation } = props.data
   if (Object.hasOwn(validation, 'equal')) {
     invalid.value = !validation.equal.includes(value)
     errorMessage.value = invalid.value

package/components/common/configure/advancedSystemSettings/tableView/old/lib/config/table.ts

@@ -87,17 +87,15 @@ export const bodyItems = (
       type: item.type,
       value: item.value,
       validation: item.validation,
-      options: item.options,
-      invalid: false,
-      errorMessage: '',
+      // options: item.options,
     }
 
-    let valueText = item[tableItemKeys[1]]
-    if (item.type === 'select') {
-      valueText =
-        item.options.find((option) => option.key === valueText)?.value ||
-        valueText
-    }
+    // let valueText = item[tableItemKeys[1]]
+    // if (item.type === 'select') {
+    //   valueText =
+    //     item.options.find((option) => option.key === valueText)?.value ||
+    //     valueText
+    // }
     const cols = [
       {
         key: 'col0',
@@ -109,7 +107,7 @@ export const bodyItems = (
       },
       {
         key: isEdit ? 'value' : 'col1',
-        text: valueText,
+        text: item[tableItemKeys[1]],
         id: key,
         testId: `advanced-system-settings-table-item-${key}${
           isEdit ? '-edit' : ''

package/components/common/configure/advancedSystemSettings/tableView/old/lib/models/interfaces.ts

@@ -0,0 +1,10 @@
+import type {
+    UI_I_AdvancedSystemSetting
+} from "~/store/inventory/modules/configure/advancedSystemSettings/lib/models/interfaces";
+
+export interface UI_I_AdvancedSystemSettingsEditData {
+    key: UI_I_AdvancedSystemSetting['key'];
+    type: UI_I_AdvancedSystemSetting['type'];
+    value: UI_I_AdvancedSystemSetting['value'];
+    validation: UI_I_AdvancedSystemSetting['validation'];
+}

package/components/common/pages/backups/modals/restore/Old.vue

@@ -55,11 +55,11 @@
         />
 
         <common-pages-backups-modals-restore-disks
-          v-show="selectedStep.id === dynamicSteps.selectDisks"
+          v-if="selectedStep.id === dynamicSteps.selectDisks"
           v-model="model"
         />
         <common-pages-backups-modals-restore-disks
-          v-show="selectedStep.id === dynamicSteps.selectDisksForCopy"
+          v-if="selectedStep.id === dynamicSteps.selectDisksForCopy"
           v-model="model"
           is-copy
         />

package/components/common/pages/backups/modals/restore/Restore.vue

@@ -90,7 +90,35 @@ watch(
 )
 const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
 const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> => {
-  wizard.changeSteps(value, validationFunc)
+  wizard.changeSteps(value, validationFunc, finalValidationFunc)
+}
+
+const finalValidationFunc = async (
+  value: UI_I_WizardStep[]
+): Promise<UI_I_ValidationReturn> => {
+  let stepHasError = false
+
+  if (model.value.restore_code === 3) {
+    // Все это сделано для генерации имени вм, если она не заведена
+    const data = await $store.dispatch('backup/A_CHECK_VALIDATION', {
+      pvm: model.value.pvm,
+      start: true
+    })
+
+    model.value.pvm.name = data.vm_desc.name
+  }
+
+  // if (!data) {
+  //   stepHasError = wizard.setValidation(dynamicSteps.selectStorage, 'storage', {
+  //     fieldMessage: localization.value.common.selectStorage,
+  //     alertMessage: localization.value.common.selectValidDestinationStorage,
+  //   })
+  // }
+
+  return {
+    stepHasError,
+    newValue: value,
+  }
 }
 
 const storageSubmit = ref<null | Function>(null)
@@ -235,6 +263,7 @@ const getPvm = async (): Promise<void> => {
   })
 
   model.value.pvm = useDeepCopy($store.getters['backup/getPvm'])
+  model.value.pvm.network_devices = model.value.pvm.network_devices || [] // Обрабатываем если null, так не нужно в многих местах делать проверки
 
   loadingCount.value--
 }

package/components/common/pages/backups/modals/restore/lib/config/readyToCompleteOptions.ts

@@ -1,94 +1,96 @@
-import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
-import { restoreCodes } from '~/components/common/pages/backups/modals/restore/lib/config/restoreCodes'
-
-const getDisks = (
-  model: UI_I_RestoreForm,
-  localization: UI_I_Localization
-): UI_I_TableInfoItem[] => {
-  const result: UI_I_TableInfoItem[] = []
-
-  model.pvm.disk_devices.forEach((disk_device, i) => {
-    if (!disk_device.source) return
-
-    result.push({
-      label: `${localization.common.disk} ${i}`,
-      value: disk_device.source,
-      iconClassName: 'icon-vSphere-dsVmDisk',
-    })
-  })
-
-  return result
-}
-
-export const readyToCompleteOptions = (
-  model: UI_I_RestoreForm,
-  localization: UI_I_Localization,
-  selectedStorageName: string
-): UI_I_TableInfoItem[] => {
-  const result: UI_I_TableInfoItem[] = []
-
-  switch (model.restore_code) {
-    case restoreCodes.diskOnly:
-      result.push({
-        label: localization.common.backup,
-        value: model.backup,
-        iconClassName: 'icon-backup',
-      })
-      // Disks
-      result.push(...getDisks(model, localization))
-      break
-    case restoreCodes.existing:
-      result.push({
-        label: localization.common.backup,
-        value: model.backup,
-        iconClassName: 'icon-backup',
-      })
-      break
-    case restoreCodes.asNew:
-      result.push({
-        label: localization.common.vmName,
-        value: model.pvm.name,
-        iconClassName: 'vsphere-icon-vm',
-      })
-
-      // Datastores
-      result.push({
-        label: localization.common.datastore,
-        value: selectedStorageName,
-        iconClassName: 'vsphere-icon-datastore',
-      })
-
-      // Disks
-      result.push(...getDisks(model, localization))
-
-      // Disks for Copy
-      model.copy_disks.forEach((disk_device, i) => {
-        result.push({
-          // label: `${localization.common.disk} ${i}`,
-          label: localization.backup.diskCopyN.replace('{0}', i.toString()),
-          value: disk_device.source,
-          iconClassName: 'icon-vSphere-dsVmDisk',
-        })
-      })
-
-      // Networks
-      model.pvm.network_devices.forEach((network) => {
-        result.push({
-          label: localization.common.network,
-          value: network.network,
-          iconClassName: 'vsphere-icon-network',
-        })
-      })
-      break
-    // case 1:
-    //   result.push({
-    //     label: localization.value.common.vmName,
-    //     value: model.value.pvm.name,
-    //   })
-    //   break
-  }
-
-  return result
-}
+import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
+import { restoreCodes } from '~/components/common/pages/backups/modals/restore/lib/config/restoreCodes'
+
+const getDisks = (
+  model: UI_I_RestoreForm,
+  localization: UI_I_Localization
+): UI_I_TableInfoItem[] => {
+  const result: UI_I_TableInfoItem[] = []
+
+  model.pvm.disk_devices.forEach((disk_device, i) => {
+    if (!disk_device.source) return
+
+    result.push({
+      label: `${localization.common.disk} ${i}`,
+      value: disk_device.source,
+      iconClassName: 'icon-vSphere-dsVmDisk',
+    })
+  })
+
+  return result
+}
+
+export const readyToCompleteOptions = (
+  model: UI_I_RestoreForm,
+  localization: UI_I_Localization,
+  selectedStorageName: string
+): UI_I_TableInfoItem[] => {
+  const result: UI_I_TableInfoItem[] = []
+
+  switch (model.restore_code) {
+    case restoreCodes.diskOnly:
+      result.push({
+        label: localization.common.backup,
+        value: model.backup,
+        iconClassName: 'icon-backup',
+      })
+      // Disks
+      result.push(...getDisks(model, localization))
+      break
+    case restoreCodes.existing:
+      result.push({
+        label: localization.common.backup,
+        value: model.backup,
+        iconClassName: 'icon-backup',
+      })
+      // Disks
+      result.push(...getDisks(model, localization))
+      break
+    case restoreCodes.asNew:
+      result.push({
+        label: localization.common.vmName,
+        value: model.pvm.name,
+        iconClassName: 'vsphere-icon-vm',
+      })
+
+      // Datastores
+      result.push({
+        label: localization.common.datastore,
+        value: selectedStorageName,
+        iconClassName: 'vsphere-icon-datastore',
+      })
+
+      // Disks
+      result.push(...getDisks(model, localization))
+
+      // Disks for Copy
+      model.copy_disks.forEach((disk_device, i) => {
+        result.push({
+          // label: `${localization.common.disk} ${i}`,
+          label: localization.backup.diskCopyN.replace('{0}', i.toString()),
+          value: disk_device.source,
+          iconClassName: 'icon-vSphere-dsVmDisk',
+        })
+      })
+
+      // Networks
+      model.pvm.network_devices.forEach((network) => {
+        result.push({
+          label: localization.common.network,
+          value: network.network,
+          iconClassName: 'vsphere-icon-network',
+        })
+      })
+      break
+    // case 1:
+    //   result.push({
+    //     label: localization.value.common.vmName,
+    //     value: model.value.pvm.name,
+    //   })
+    //   break
+  }
+
+  return result
+}

package/components/common/pages/backups/modals/restore/lib/config/steps.ts

@@ -1,130 +1,134 @@
-import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
-import { UI_E_WIZARD_STATUS } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/enums'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-export const dynamicSteps = {
-  selectType: 0,
-  selectName: 1,
-  selectStorage: 2,
-  selectDisks: 3,
-  selectDisksForCopy: 4,
-  selectNetwork: 5,
-  readyComplete: 6,
-}
-
-export const stepsFunc = (
-  localization: UI_I_Localization
-): UI_I_WizardStep[] => {
-  return [
-    {
-      id: dynamicSteps.selectType,
-      stepName: '',
-      title: localization.backup.selectType,
-      subTitle: '',
-      status: UI_E_WIZARD_STATUS.SELECTED,
-      isValid: true,
-      fields: {},
-      testId: 'backup-restore-type',
-    },
-    {
-      id: dynamicSteps.selectName,
-      stepName: '',
-      title: localization.common.selectName,
-      subTitle: localization.backup.restoreBackupSelectNameSubtitle,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'backup-restore-select-name',
-      fields: {
-        name: {
-          field: '',
-          alert: '',
-        },
-      },
-    },
-    {
-      id: dynamicSteps.selectStorage,
-      stepName: '',
-      title: localization.common.selectStorage,
-      subTitle: localization.common.selectStorageConfigurationDiskFiles2,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'backup-restore-select-storage',
-      fields: {
-        storage: {
-          field: '',
-          alert: '',
-        },
-      },
-    },
-    {
-      id: dynamicSteps.selectDisks,
-      stepName: '',
-      title: localization.common.selectDisks,
-      subTitle: localization.common.selectDisksInvolvedBackup,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      fields: {
-        disk_devices: {
-          field: '',
-          alert: '',
-        },
-      },
-      testId: 'backup-restore-select-disks',
-    },
-    {
-      id: dynamicSteps.selectDisksForCopy,
-      stepName: '',
-      title: localization.common.selectDisksForCopy,
-      subTitle: localization.common.selectDisksInvolvedBackup,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      fields: {
-        disk_devices: {
-          field: '',
-          alert: '',
-        },
-      },
-      testId: 'backup-restore-select-disks-for-copy',
-    },
-    {
-      id: dynamicSteps.selectNetwork,
-      stepName: '',
-      title: localization.common.selectNetwork,
-      subTitle: localization.backup.restoreBackupSelectNetworkSubtitle,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'backup-restore-select-network',
-      fields: {},
-    },
-    {
-      id: dynamicSteps.readyComplete,
-      stepName: '',
-      title: localization.common.readyComplete,
-      subTitle: localization.backup.restoreBackupReviewSubtitle,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'backup-restore-ready-complete',
-      fields: {},
-    },
-  ]
-}
-
-export const stepsSchemeInitial = [
-  // [0, 1, 5], // disk only
-  [
-    dynamicSteps.selectType,
-    dynamicSteps.selectDisks,
-    dynamicSteps.readyComplete,
-  ], // disk only
-  // [dynamicSteps.selectType, dynamicSteps.readyComplete], // disk only
-  [dynamicSteps.selectType, dynamicSteps.readyComplete], // existing
-  [
-    dynamicSteps.selectType,
-    dynamicSteps.selectName,
-    dynamicSteps.selectStorage,
-    dynamicSteps.selectDisks,
-    dynamicSteps.selectDisksForCopy,
-    dynamicSteps.selectNetwork,
-    dynamicSteps.readyComplete,
-  ], // as new
-]
+import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import { UI_E_WIZARD_STATUS } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/enums'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+export const dynamicSteps = {
+  selectType: 0,
+  selectName: 1,
+  selectStorage: 2,
+  selectDisks: 3,
+  selectDisksForCopy: 4,
+  selectNetwork: 5,
+  readyComplete: 6,
+}
+
+export const stepsFunc = (
+  localization: UI_I_Localization
+): UI_I_WizardStep[] => {
+  return [
+    {
+      id: dynamicSteps.selectType,
+      stepName: '',
+      title: localization.backup.selectType,
+      subTitle: '',
+      status: UI_E_WIZARD_STATUS.SELECTED,
+      isValid: true,
+      fields: {},
+      testId: 'backup-restore-type',
+    },
+    {
+      id: dynamicSteps.selectName,
+      stepName: '',
+      title: localization.common.selectName,
+      subTitle: localization.backup.restoreBackupSelectNameSubtitle,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'backup-restore-select-name',
+      fields: {
+        name: {
+          field: '',
+          alert: '',
+        },
+      },
+    },
+    {
+      id: dynamicSteps.selectStorage,
+      stepName: '',
+      title: localization.common.selectStorage,
+      subTitle: localization.common.selectStorageConfigurationDiskFiles2,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'backup-restore-select-storage',
+      fields: {
+        storage: {
+          field: '',
+          alert: '',
+        },
+      },
+    },
+    {
+      id: dynamicSteps.selectDisks,
+      stepName: '',
+      title: localization.common.selectDisks,
+      subTitle: localization.common.selectDisksInvolvedBackup,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      fields: {
+        disk_devices: {
+          field: '',
+          alert: '',
+        },
+      },
+      testId: 'backup-restore-select-disks',
+    },
+    {
+      id: dynamicSteps.selectDisksForCopy,
+      stepName: '',
+      title: localization.common.selectDisksForCopy,
+      subTitle: localization.common.selectDisksInvolvedBackup,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      fields: {
+        disk_devices: {
+          field: '',
+          alert: '',
+        },
+      },
+      testId: 'backup-restore-select-disks-for-copy',
+    },
+    {
+      id: dynamicSteps.selectNetwork,
+      stepName: '',
+      title: localization.common.selectNetwork,
+      subTitle: localization.backup.restoreBackupSelectNetworkSubtitle,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'backup-restore-select-network',
+      fields: {},
+    },
+    {
+      id: dynamicSteps.readyComplete,
+      stepName: '',
+      title: localization.common.readyComplete,
+      subTitle: localization.backup.restoreBackupReviewSubtitle,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'backup-restore-ready-complete',
+      fields: {},
+    },
+  ]
+}
+
+export const stepsSchemeInitial = [
+  // [0, 1, 5], // disk only
+  [
+    dynamicSteps.selectType,
+    dynamicSteps.selectDisks,
+    dynamicSteps.readyComplete,
+  ], // disk only
+  // [dynamicSteps.selectType, dynamicSteps.readyComplete], // disk only
+  [
+    dynamicSteps.selectType,
+    dynamicSteps.selectDisks,
+    dynamicSteps.readyComplete,
+  ], // existing
+  [
+    dynamicSteps.selectType,
+    dynamicSteps.selectName,
+    dynamicSteps.selectStorage,
+    dynamicSteps.selectDisks,
+    dynamicSteps.selectDisksForCopy,
+    dynamicSteps.selectNetwork,
+    dynamicSteps.readyComplete,
+  ], // as new
+]

package/components/common/pages/backups/modals/restore/validation/validation.ts

@@ -20,10 +20,10 @@ export const checkNameValidation = async (
   let stepErrorMessage = ''
 
   if (!name) {
-    stepHasError = wizard.setValidation(dynamicSteps.selectName, 'name', {
-      fieldMessage: localization.common.fieldRequired,
-      alertMessage: localization.common.emptyNameValidationDescription,
-    })
+    // stepHasError = wizard.setValidation(dynamicSteps.selectName, 'name', {
+    //   fieldMessage: localization.common.fieldRequired,
+    //   alertMessage: localization.common.emptyNameValidationDescription,
+    // })
     return { stepHasError, newValue: value }
   }
 

package/package.json

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