Merge pull request #15708 from logonoff/CONSOLE-4840-s2e17-dwights-speech

CONSOLE-4858: Fix 53 cycles

Author: openshift-merge-bot[bot]

frontend/packages/console-app/src/actions/creators/cronjob-factory.ts

@@ -1,5 +1,6 @@
 import i18next from 'i18next';
-import { history, resourceObjPath } from '@console/internal/components/utils';
+import { resourceObjPath } from '@console/internal/components/utils/resource-link';
+import { history } from '@console/internal/components/utils/router';
 import { JobModel } from '@console/internal/models';
 import {
   K8sKind,

frontend/packages/console-app/src/actions/hooks/useBindingActions.ts

@@ -7,7 +7,8 @@ import { Action, K8sVerb } from '@console/dynamic-plugin-sdk';
 import { k8sPatchResource } from '@console/dynamic-plugin-sdk/src/utils/k8s';
 import { useDeepCompareMemoize } from '@console/dynamic-plugin-sdk/src/utils/k8s/hooks/useDeepCompareMemoize';
 import * as UIActions from '@console/internal/actions/ui';
-import { asAccessReview, resourceObjPath } from '@console/internal/components/utils';
+import { asAccessReview } from '@console/internal/components/utils/rbac';
+import { resourceObjPath } from '@console/internal/components/utils/resource-link';
 import {
   RoleBindingKind,
   ClusterRoleBindingKind,

frontend/packages/console-app/src/actions/hooks/useBuildsActions.ts

@@ -7,7 +7,8 @@ import { useOverlay } from '@console/dynamic-plugin-sdk/src/app/modal-support/us
 import { k8sPatchResource } from '@console/dynamic-plugin-sdk/src/utils/k8s';
 import { useDeepCompareMemoize } from '@console/dynamic-plugin-sdk/src/utils/k8s/hooks/useDeepCompareMemoize';
 import { ErrorModal } from '@console/internal/components/modals/error-modal';
-import { asAccessReview, resourceObjPath } from '@console/internal/components/utils';
+import { asAccessReview } from '@console/internal/components/utils/rbac';
+import { resourceObjPath } from '@console/internal/components/utils/resource-link';
 import { K8sResourceKind, referenceFor } from '@console/internal/module/k8s';
 import { cloneBuild } from '@console/internal/module/k8s/builds';
 import { useK8sModel } from '@console/shared/src/hooks/useK8sModel';

frontend/packages/console-app/src/actions/hooks/useCommonActions.ts

@@ -10,7 +10,8 @@ import {
   tolerationsModal,
 } from '@console/internal/components/modals';
 import { useConfigureCountModal } from '@console/internal/components/modals/configure-count-modal';
-import { resourceObjPath, asAccessReview } from '@console/internal/components/utils';
+import { asAccessReview } from '@console/internal/components/utils/rbac';
+import { resourceObjPath } from '@console/internal/components/utils/resource-link';
 import { referenceFor, K8sModel, K8sResourceKind } from '@console/internal/module/k8s';
 import { CommonActionCreator, ActionObject } from './types';
 

frontend/packages/console-app/src/actions/hooks/useDeploymentActions.ts

@@ -6,7 +6,9 @@ import { useDeepCompareMemoize } from '@console/dynamic-plugin-sdk/src/utils/k8s
 import { k8sPatchResource } from '@console/dynamic-plugin-sdk/src/utils/k8s/k8s-resource';
 import { configureUpdateStrategyModal } from '@console/internal/components/modals';
 import { ErrorModal } from '@console/internal/components/modals/error-modal';
-import { togglePaused, asAccessReview, resourceObjPath } from '@console/internal/components/utils';
+import { asAccessReview } from '@console/internal/components/utils/rbac';
+import { resourceObjPath } from '@console/internal/components/utils/resource-link';
+import { togglePaused } from '@console/internal/components/utils/workload-pause';
 import { DeploymentConfigModel } from '@console/internal/models';
 import {
   K8sResourceKind,

frontend/packages/console-app/src/actions/hooks/useGroupActions.ts

@@ -5,7 +5,7 @@ import { useNavigate } from 'react-router-dom-v5-compat';
 import { Action } from '@console/dynamic-plugin-sdk';
 import { useOverlay } from '@console/dynamic-plugin-sdk/src/app/modal-support/useOverlay';
 import * as UIActions from '@console/internal/actions/ui';
-import { asAccessReview } from '@console/internal/components/utils';
+import { asAccessReview } from '@console/internal/components/utils/rbac';
 import { GroupModel } from '@console/internal/models';
 import { GroupKind } from '@console/internal/module/k8s';
 import AddGroupUsersModal from '../../components/modals/add-group-users-modal';

frontend/packages/console-app/src/actions/hooks/useJobActions.ts

@@ -6,7 +6,7 @@ import {
   useConfigureCountModal,
   configureJobParallelismModal,
 } from '@console/internal/components/modals/configure-count-modal';
-import { asAccessReview } from '@console/internal/components/utils';
+import { asAccessReview } from '@console/internal/components/utils/rbac';
 import { JobModel } from '@console/internal/models';
 import { JobKind } from '@console/internal/module/k8s';
 import { JobActionCreator } from './types';

frontend/packages/console-app/src/actions/hooks/useMachineSetActions.ts

@@ -5,7 +5,7 @@ import { useOverlay } from '@console/dynamic-plugin-sdk/src/app/modal-support/us
 import { useDeepCompareMemoize } from '@console/dynamic-plugin-sdk/src/utils/k8s/hooks/useDeepCompareMemoize';
 import { ConfigureCountModal } from '@console/internal/components/modals/configure-count-modal';
 import { ConfigureMachineAutoscalerModal } from '@console/internal/components/modals/configure-machine-autoscaler-modal';
-import { asAccessReview } from '@console/internal/components/utils';
+import { asAccessReview } from '@console/internal/components/utils/rbac';
 import { MachineSetModel } from '@console/internal/models';
 import { MachineSetKind } from '@console/internal/module/k8s';
 import { MachineSetActionCreator } from './types';

frontend/packages/console-app/src/actions/hooks/usePDBActions.ts

@@ -3,8 +3,8 @@ import * as _ from 'lodash';
 import { useTranslation } from 'react-i18next';
 import { Action } from '@console/dynamic-plugin-sdk';
 import { useDeepCompareMemoize } from '@console/dynamic-plugin-sdk/src/utils/k8s/hooks/useDeepCompareMemoize';
-import { asAccessReview } from '@console/internal/components/utils';
 import { useK8sWatchResource } from '@console/internal/components/utils/k8s-watch-hook';
+import { asAccessReview } from '@console/internal/components/utils/rbac';
 import { K8sPodControllerKind, K8sModel, referenceFor } from '@console/internal/module/k8s';
 import { deletePDBModal } from '../../components/pdb/modals';
 import { PodDisruptionBudgetKind } from '../../components/pdb/types';

frontend/packages/console-app/src/actions/hooks/usePVCActions.ts

@@ -4,7 +4,7 @@ import { Action } from '@console/dynamic-plugin-sdk';
 import { useDeepCompareMemoize } from '@console/dynamic-plugin-sdk/src/utils/k8s/hooks/useDeepCompareMemoize';
 import { clonePVCModal, expandPVCModal } from '@console/internal/components/modals';
 import deletePVCModal from '@console/internal/components/modals/delete-pvc-modal';
-import { asAccessReview } from '@console/internal/components/utils';
+import { asAccessReview } from '@console/internal/components/utils/rbac';
 import { VolumeSnapshotModel, PersistentVolumeClaimModel } from '@console/internal/models';
 import { PersistentVolumeClaimKind } from '@console/internal/module/k8s';
 import { PVCActionCreator } from './types';