Bug 1886397: Move object-enum to console shared

Signed-off-by: Ido Rosenzwig <irosenzw@redhat.com>
openshift · Oct 8, 2020 · 5b4922b · 5b4922b
1 parent 2ef1ec1
commit 5b4922b
Show file tree

Hide file tree

Showing 30 changed files with 30 additions and 29 deletions.
diff --git a/...evirt-plugin/src/constants/object-enum.ts → ...nsole-shared/src/constants/object-enum.ts b/...evirt-plugin/src/constants/object-enum.ts → ...nsole-shared/src/constants/object-enum.ts
diff --git a/frontend/packages/kubevirt-plugin/src/components/modals/disk-modal/storage-ui-source.ts b/frontend/packages/kubevirt-plugin/src/components/modals/disk-modal/storage-ui-source.ts
@@ -1,5 +1,6 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum, VolumeType } from '../../../constants';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
+import { VolumeType } from '../../../constants';
 import { DataVolumeSourceType, DiskType } from '../../../constants/vm/storage';
 import { getStringEnumValues } from '../../../utils/types';
 import { BinaryUnit } from '../../form/size-unit-utils';

diff --git a/frontend/packages/kubevirt-plugin/src/constants/index.ts b/frontend/packages/kubevirt-plugin/src/constants/index.ts
@@ -2,4 +2,3 @@ export * from './vm';
 export * from './vm-templates';
 export * from './cdi';
 export * from './namespace';
-export * from './object-enum';
diff --git a/frontend/packages/kubevirt-plugin/src/constants/select-dropdown-object-enum.ts b/frontend/packages/kubevirt-plugin/src/constants/select-dropdown-object-enum.ts
@@ -1,4 +1,4 @@
-import { ObjectEnum } from './object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 
 export type SelectDropdownData = {
   description?: string;

diff --git a/frontend/packages/kubevirt-plugin/src/constants/status-enum.ts b/frontend/packages/kubevirt-plugin/src/constants/status-enum.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members,no-underscore-dangle */
-import { ObjectEnum } from './object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import { StatusSimpleLabel } from './status-constants';
 import { StatusGroup } from './status-group';
 

diff --git a/frontend/packages/kubevirt-plugin/src/constants/status-group.ts b/frontend/packages/kubevirt-plugin/src/constants/status-group.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from './object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 
 export class StatusGroup extends ObjectEnum<string> {
   static readonly RHV = new StatusGroup('RHV', 'RHV', 'Red Hat Virtualization');

diff --git a/frontend/packages/kubevirt-plugin/src/constants/v2v-import/ovirt/ovirt-disk-bus.ts b/frontend/packages/kubevirt-plugin/src/constants/v2v-import/ovirt/ovirt-disk-bus.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '../../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import { DiskBus } from '../../vm/storage';
 
 export class OvirtDiskBus extends ObjectEnum<string> {

diff --git a/.../packages/kubevirt-plugin/src/constants/v2v-import/ovirt/ovirt-network-interface-model.ts b/.../packages/kubevirt-plugin/src/constants/v2v-import/ovirt/ovirt-network-interface-model.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '../../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import { NetworkInterfaceModel } from '../../vm/network';
 
 export class OvirtNetworkInterfaceModel extends ObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/constants/v2v-import/ovirt/v2v-vm-import-status.ts b/frontend/packages/kubevirt-plugin/src/constants/v2v-import/ovirt/v2v-vm-import-status.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '../../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import { StatusEnum } from '../../status-enum';
 import { StatusSimpleLabel } from '../../status-constants';
 import { StatusGroup } from '../../status-group';

diff --git a/frontend/packages/kubevirt-plugin/src/constants/v2v-import/ovirt/vm-import-type.ts b/frontend/packages/kubevirt-plugin/src/constants/v2v-import/ovirt/vm-import-type.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '../../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 
 export class VMImportType extends ObjectEnum<string> {
   static readonly OVIRT = new VMImportType('ovirt');

diff --git a/frontend/packages/kubevirt-plugin/src/constants/v2v-import/vmware/vmware-firmware.ts b/frontend/packages/kubevirt-plugin/src/constants/v2v-import/vmware/vmware-firmware.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '../../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 
 export class VMwareFirmware extends ObjectEnum<string> {
   static readonly BIOS = new VMwareFirmware('bios', true);

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/console-type.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/console-type.ts
@@ -1,6 +1,6 @@
 /* eslint-disable lines-between-class-members */
 import { AccessConsoles } from '@patternfly/react-console/dist/js';
-import { ObjectEnum } from '../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 
 const {
   VNC_CONSOLE_TYPE,

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/default-os-selection.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/default-os-selection.ts
@@ -1,6 +1,6 @@
 import { TemplateKind } from '@console/internal/module/k8s';
 import { getName } from '@console/shared/src';
-import { ObjectEnum } from '../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 
 export class OSSelection extends ObjectEnum<string> {
   static readonly FEDORA = new OSSelection(

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/network/network-interface-model.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/network/network-interface-model.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '../../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import { READABLE_VIRTIO } from '../constants';
 import { NIC_MODEL_E1000E_DESC, DISK_TYPE_VIRTIO_DESC } from '../../../utils/strings';
 import { SelectDropdownObjectEnum, SelectDropdownData } from '../../select-dropdown-object-enum';

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/network/network-interface-type.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/network/network-interface-type.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '../../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import { SelectDropdownObjectEnum } from '../../select-dropdown-object-enum';
 import {
   NIC_TYPE_BRIDGE_DESC,

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/network/network-type.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/network/network-type.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '../../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import { NetworkInterfaceType } from './network-interface-type';
 
 export class NetworkType extends ObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/provision-source.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/provision-source.ts
@@ -1,6 +1,6 @@
 /* eslint-disable lines-between-class-members */
 import { getName, getNamespace, K8sEntityMap } from '@console/shared/src';
-import { ObjectEnum } from '../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import {
   asVM,
   getDataVolumeTemplates,

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/storage/access-mode.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/storage/access-mode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '../../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 
 export class AccessMode extends ObjectEnum<string> {
   static readonly READ_WRITE_ONCE = new AccessMode('ReadWriteOnce', 'Single User (RWO)');

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/storage/data-volume-source-type.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/storage/data-volume-source-type.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '../../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 
 export class DataVolumeSourceType extends ObjectEnum<string> {
   static readonly BLANK = new DataVolumeSourceType('blank');

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/storage/disk-bus.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/storage/disk-bus.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '../../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import { SelectDropdownObjectEnum } from '../../select-dropdown-object-enum';
 import {
   DISK_TYPE_SATA_DESC,

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/storage/disk-type.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/storage/disk-type.ts
@@ -1,6 +1,6 @@
 /* eslint-disable lines-between-class-members */
 import * as _ from 'lodash';
-import { ObjectEnum } from '../../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import { DiskBus } from './disk-bus';
 
 export class DiskType extends ObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/storage/volume-mode.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/storage/volume-mode.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '../../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 
 export class VolumeMode extends ObjectEnum<string> {
   static readonly BLOCK = new VolumeMode('Block');

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/storage/volume-type.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/storage/volume-type.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members */
-import { ObjectEnum } from '../../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 
 interface VolumeMetadata {
   isEnvType?: boolean;

diff --git a/frontend/packages/kubevirt-plugin/src/constants/vm/vm-status.ts b/frontend/packages/kubevirt-plugin/src/constants/vm/vm-status.ts
@@ -1,5 +1,5 @@
 /* eslint-disable lines-between-class-members,no-underscore-dangle */
-import { ObjectEnum } from '../object-enum';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import { V2VVMImportStatus } from '../v2v-import/ovirt/v2v-vm-import-status';
 import { StatusEnum, StatusMetadata } from '../status-enum';
 import { getStringEnumValues } from '../../utils/types';

diff --git a/frontend/packages/kubevirt-plugin/src/k8s/wrapper/common/__tests__/mocks/smoothie-wrapper.ts b/frontend/packages/kubevirt-plugin/src/k8s/wrapper/common/__tests__/mocks/smoothie-wrapper.ts
@@ -1,4 +1,4 @@
-import { ObjectEnum } from '../../../../../constants';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import { ObjectWithTypePropertyWrapper } from '../../object-with-type-property-wrapper';
 
 export type Smoothie = {

diff --git a/.../kubevirt-plugin/src/k8s/wrapper/common/k8s-resource-object-with-type-property-wrapper.ts b/.../kubevirt-plugin/src/k8s/wrapper/common/k8s-resource-object-with-type-property-wrapper.ts
@@ -1,4 +1,5 @@
 /* eslint-disable lines-between-class-members */
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import {
   getName,
   hasLabel,
@@ -9,7 +10,6 @@ import {
 import { K8sKind, K8sResourceKind } from '@console/internal/module/k8s/types';
 import { K8sResourceKindMethods } from '../types/types';
 import { ObjectWithTypePropertyWrapper } from './object-with-type-property-wrapper';
-import { ObjectEnum } from '../../../constants';
 import { clearMetadata, clearRuntimeMetadata, initK8sObject, K8sInitAddon } from './util/k8s-mixin';
 
 export abstract class K8sResourceObjectWithTypePropertyWrapper<

diff --git a/...tend/packages/kubevirt-plugin/src/k8s/wrapper/common/object-with-type-property-wrapper.ts b/...tend/packages/kubevirt-plugin/src/k8s/wrapper/common/object-with-type-property-wrapper.ts
@@ -1,5 +1,5 @@
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import * as _ from 'lodash';
-import { ObjectEnum } from '../../../constants';
 import { omitEmpty } from '../../../utils/common';
 import { Wrapper } from './wrapper';
 

diff --git a/frontend/packages/kubevirt-plugin/src/statuses/pod-deployment/constants.ts b/frontend/packages/kubevirt-plugin/src/statuses/pod-deployment/constants.ts
@@ -1,4 +1,4 @@
-import { ObjectEnum } from '../../constants';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import { DeploymentStatus } from '../deployment';
 
 export class PodDeploymentStatus extends ObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/statuses/v2v/constants.ts b/frontend/packages/kubevirt-plugin/src/statuses/v2v/constants.ts
@@ -1,4 +1,4 @@
-import { ObjectEnum } from '../../constants';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 
 // phases constants conform v2vvmware_controller.go
 export class V2VProviderStatus extends ObjectEnum<string> {

diff --git a/frontend/packages/kubevirt-plugin/src/utils/validations/template/template-validations.ts b/frontend/packages/kubevirt-plugin/src/utils/validations/template/template-validations.ts
@@ -1,7 +1,8 @@
 /* eslint-disable lines-between-class-members */
 import * as _ from 'lodash';
+import { ObjectEnum } from '@console/shared/src/constants/object-enum';
 import { ValidationErrorType } from '@console/shared/src';
-import { ObjectEnum, DiskBus, DiskType } from '../../../constants';
+import { DiskBus, DiskType } from '../../../constants';
 import { CommonTemplatesValidation } from '../../../types/template';
 import {
   IntervalValidationResult,