Merge pull request #9466 from glekner/kubevirt-missing-selectors

import remaining kubevirt selectors

frontend/packages/kubevirt-plugin/src/components/create-vm-wizard/error-components/utils.ts

@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import { joinGrammaticallyListOfItems } from '@console/shared/src';
+import { joinGrammaticallyListOfItems } from '../../../utils';
 import { iGetIn, toJS } from '../../../utils/immutable';
 import { getValidationNameByKey } from '../../../utils/validations/strings';
 import { getEmptyRequiredFields, getInvalidFields } from '../redux/validations/utils';

frontend/packages/kubevirt-plugin/src/components/create-vm-wizard/redux/validations/vm-settings-tab-validation.ts

@@ -1,10 +1,6 @@
 import * as _ from 'lodash';
-import {
-  asValidationObject,
-  ValidationErrorType,
-  ValidationObject,
-} from '@console/shared/src/utils/validation';
 import { ProvisionSource } from '../../../../constants/vm/provision-source';
+import { asValidationObject, ValidationErrorType, ValidationObject } from '../../../../selectors';
 import { UIValidation } from '../../../../types/ui/ui';
 import {
   iGet,

frontend/packages/kubevirt-plugin/src/components/form/size-unit-utils.tsx

@@ -1,5 +1,5 @@
 import { convertToBaseValue } from '@console/internal/components/utils';
-import { assureEndsWith } from '@console/shared/src';
+import { assureEndsWith } from '../../utils';
 import { getStringEnumValues } from '../../utils/types';
 
 export enum BinaryUnit {

frontend/packages/kubevirt-plugin/src/components/vm-disks/cd-row.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { TableData, TableRow } from '@console/internal/components/factory';
 import { LoadingInline } from '@console/internal/components/utils';
-import { DASH, dimensifyRow } from '@console/shared';
+import { DASH, dimensifyRow } from '../../utils';
 import { ValidationCell } from '../table/validation-cell';
 import { StorageSimpleData, StorageSimpleDataValidation } from './types';
 

frontend/packages/kubevirt-plugin/src/components/vm-disks/vm-cds.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { sortable } from '@patternfly/react-table';
 import { useTranslation } from 'react-i18next';
 import { RowFunction, Table } from '@console/internal/components/factory';
-import { dimensifyHeader } from '@console/shared';
+import { dimensifyHeader } from '../../utils';
 
 export type VMCDsTableProps = {
   data?: any[];

frontend/packages/kubevirt-plugin/src/hooks/storage-class-config-map.ts

@@ -2,11 +2,11 @@ import * as React from 'react';
 import { FirehoseResult } from '@console/internal/components/utils';
 import { ConfigMapModel } from '@console/internal/models';
 import { ConfigMapKind, k8sGet } from '@console/internal/module/k8s';
-import { joinGrammaticallyListOfItems } from '@console/shared/src';
 import {
   STORAGE_CLASS_CONFIG_MAP_NAME,
   STORAGE_CLASS_CONFIG_MAP_NAMESPACES,
 } from '../constants/sc';
+import { joinGrammaticallyListOfItems } from '../utils';
 
 type UseConfigMapResult = [ConfigMapKind, boolean, string];
 

frontend/packages/kubevirt-plugin/src/utils/index.ts

@@ -507,3 +507,11 @@ export const createUniqueNameResolver = (data: { name: string }[]) => {
     return `${name}-${nameCounts[name].next - 1}`;
   };
 };
+
+export const assureEndsWith = (sentence: string, appendix: string) => {
+  if (!sentence || !appendix || sentence.endsWith(appendix)) {
+    return sentence;
+  }
+
+  return `${sentence}${appendix}`;
+};