refactor(portainer): move to react [EE-3350] (#7915)

app/docker/views/containers/create/createContainerController.js

@@ -3,7 +3,7 @@ import _ from 'lodash-es';
 import { PorImageRegistryModel } from 'Docker/models/porImageRegistry';
 
 import * as envVarsUtils from '@/portainer/helpers/env-vars';
-import { FeatureId } from 'Portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 import { ContainerCapabilities, ContainerCapability } from '../../../models/containerCapabilities';
 import { AccessControlFormData } from '../../../../portainer/components/accessControlForm/porAccessControlFormModel';
 import { ContainerDetailsViewModel } from '../../../models/container';

app/docker/views/containers/edit/containerController.js

@@ -2,7 +2,7 @@ import moment from 'moment';
 import _ from 'lodash-es';
 import { PorImageRegistryModel } from 'Docker/models/porImageRegistry';
 import { confirmContainerDeletion } from '@/portainer/services/modal.service/prompt';
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 import { ResourceControlType } from '@/react/portainer/access-control/types';
 
 angular.module('portainer.docker').controller('ContainerController', [

app/docker/views/docker-features-configuration/docker-features-configuration.controller.js

@@ -1,4 +1,4 @@
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 export default class DockerFeaturesConfigurationController {
   /* @ngInject */

app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx

@@ -4,7 +4,7 @@ import _ from 'lodash';
 
 import { Environment } from '@/react/portainer/environments/types';
 import { AMTDevicesDatatable } from '@/edge/EdgeDevices/EdgeDevicesView/AMTDevicesDatatable/AMTDevicesDatatable';
-import { EnvironmentGroup } from '@/portainer/environment-groups/types';
+import { EnvironmentGroup } from '@/react/portainer/environments/environment-groups/types';
 
 import { PaginationControls } from '@@/PaginationControls';
 import {

app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/EdgeDevicesDatatableContainer.tsx

@@ -2,7 +2,7 @@ import { useState } from 'react';
 
 import { useEnvironmentList } from '@/react/portainer/environments/queries/useEnvironmentList';
 import { EdgeTypes, Environment } from '@/react/portainer/environments/types';
-import { useDebounce } from '@/portainer/hooks/useDebounce';
+import { useDebounce } from '@/react/hooks/useDebounce';
 
 import { useSearchBarState } from '@@/datatables/SearchBar';
 import {

app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesDatatable/columns/heartbeat.tsx

@@ -1,7 +1,8 @@
 import { CellProps, Column } from 'react-table';
 
 import { Environment } from '@/react/portainer/environments/types';
-import { EdgeIndicator } from '@/portainer/home/EnvironmentList/EnvironmentItem/EdgeIndicator';
+
+import { EdgeIndicator } from '@@/EdgeIndicator';
 
 export const heartbeat: Column<Environment> = {
   Header: 'Heartbeat',

app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesView.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 
 import { useSettings } from '@/react/portainer/settings/queries';
-import { useGroups } from '@/portainer/environment-groups/queries';
+import { useGroups } from '@/react/portainer/environments/environment-groups/queries';
 
 import { PageHeader } from '@@/PageHeader';
 import { ViewLoading } from '@@/ViewLoading';

app/index.js

@@ -6,8 +6,11 @@ import angular from 'angular';
 import { UI_ROUTER_REACT_HYBRID } from '@uirouter/react-hybrid';
 
 import './matomo-setup';
-import analyticsModule from './angulartics.matomo';
 
+import { Edition } from '@/react/portainer/feature-flags/enums';
+import { init as initFeatureService } from '@/react/portainer/feature-flags/feature-flags.service';
+
+import analyticsModule from './angulartics.matomo';
 import './agent';
 import { azureModule } from './azure';
 import './docker/__module';
@@ -17,8 +20,6 @@ import './portainer/__module';
 import { onStartupAngular } from './app';
 import { configApp } from './config';
 
-import { init as initFeatureService } from './portainer/feature-flags/feature-flags.service';
-import { Edition } from './portainer/feature-flags/enums';
 import { nomadModule } from './nomad';
 
 initFeatureService(Edition[process.env.PORTAINER_EDITION]);

app/kubernetes/custom-templates/kube-create-custom-template-view/kube-create-custom-template-view.controller.js

@@ -1,6 +1,6 @@
 import { AccessControlFormData } from '@/portainer/components/accessControlForm/porAccessControlFormModel';
 import { getTemplateVariables, intersectVariables } from '@/react/portainer/custom-templates/components/utils';
-import { isBE } from '@/portainer/feature-flags/feature-flags.service';
+import { isBE } from '@/react/portainer/feature-flags/feature-flags.service';
 import { editor, upload } from '@@/BoxSelector/common-options/build-methods';
 
 class KubeCreateCustomTemplateViewController {

app/kubernetes/custom-templates/kube-edit-custom-template-view/kube-edit-custom-template-view.controller.js

@@ -1,6 +1,6 @@
 import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel';
 import { AccessControlFormData } from '@/portainer/components/accessControlForm/porAccessControlFormModel';
-import { isBE } from '@/portainer/feature-flags/feature-flags.service';
+import { isBE } from '@/react/portainer/feature-flags/feature-flags.service';
 import { getTemplateVariables, intersectVariables } from '@/react/portainer/custom-templates/components/utils';
 
 class KubeEditCustomTemplateViewController {

app/kubernetes/views/configure/configureController.js

@@ -4,7 +4,7 @@ import { KubernetesStorageClass, KubernetesStorageClassAccessPolicies } from 'Ku
 import { KubernetesFormValidationReferences } from 'Kubernetes/models/application/formValues';
 import { KubernetesIngressClassTypes } from 'Kubernetes/ingress/constants';
 import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper';
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 import { getIngressControllerClassMap, updateIngressControllerClassMap } from '@/react/kubernetes/cluster/ingressClass/utils';
 

app/kubernetes/views/deploy/deployController.js

@@ -6,7 +6,7 @@ import uuidv4 from 'uuid/v4';
 import PortainerError from '@/portainer/error';
 import { KubernetesDeployManifestTypes, KubernetesDeployBuildMethods, KubernetesDeployRequestMethods, RepositoryMechanismTypes } from 'Kubernetes/models/deploy';
 import { renderTemplate } from '@/react/portainer/custom-templates/components/utils';
-import { isBE } from '@/portainer/feature-flags/feature-flags.service';
+import { isBE } from '@/react/portainer/feature-flags/feature-flags.service';
 import { compose, kubernetes } from '@@/BoxSelector/common-options/deployment-methods';
 import { editor, git, template, url } from '@@/BoxSelector/common-options/build-methods';
 

app/kubernetes/views/resource-pools/components/storage-class-switch/storage-class-switch.controller.js

@@ -1,4 +1,4 @@
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 class StorageClassSwitchController {
   /* @ngInject */

app/kubernetes/views/resource-pools/create/createResourcePoolController.js

@@ -6,7 +6,7 @@ import { KubernetesResourcePoolFormValues, KubernetesResourcePoolIngressClassHos
 import { KubernetesIngressConverter } from 'Kubernetes/ingress/converter';
 import { KubernetesFormValidationReferences } from 'Kubernetes/models/application/formValues';
 import { KubernetesIngressClassTypes } from 'Kubernetes/ingress/constants';
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 import { getIngressControllerClassMap, updateIngressControllerClassMap } from '@/react/kubernetes/cluster/ingressClass/utils';
 
 class KubernetesCreateResourcePoolController {

app/kubernetes/views/resource-pools/edit/resourcePoolController.js

@@ -12,7 +12,7 @@ import { KubernetesFormValidationReferences } from 'Kubernetes/models/applicatio
 import { KubernetesIngressClassTypes } from 'Kubernetes/ingress/constants';
 import KubernetesResourceQuotaConverter from 'Kubernetes/converters/resourceQuota';
 import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper';
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 import { updateIngressControllerClassMap, getIngressControllerClassMap } from '@/react/kubernetes/cluster/ingressClass/utils';
 
 class KubernetesResourcePoolController {

app/kubernetes/views/security-constraint/constraintController.js

@@ -1,5 +1,5 @@
 import angular from 'angular';
-import { FeatureId } from 'Portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 angular.module('portainer.kubernetes').controller('KubernetesSecurityConstraintController', [
   '$scope',

app/portainer/__module.js

@@ -1,9 +1,11 @@
 import _ from 'lodash-es';
 
+import featureFlagModule from '@/react/portainer/feature-flags';
+
 import './rbac';
+
 import componentsModule from './components';
 import settingsModule from './settings';
-import featureFlagModule from './feature-flags';
 import userActivityModule from './user-activity';
 import servicesModule from './services';
 import { reactModule } from './react';

app/portainer/components/BEFeatureIndicator/BEFeatureIndicator.controller.ts

@@ -1,4 +1,4 @@
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 import { getFeatureDetails } from '@@/BEFeatureIndicator/utils';
 

app/portainer/components/BoxSelector/utils.ts

@@ -1,4 +1,4 @@
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 import { BoxSelectorOption } from '@@/BoxSelector/types';
 import { IconProps } from '@@/Icon';

app/portainer/components/accessManagement/porAccessManagementController.js

@@ -2,7 +2,7 @@ import _ from 'lodash-es';
 import angular from 'angular';
 
 import { RoleTypes } from '@/portainer/rbac/models/role';
-import { isLimitedToBE } from '@/portainer/feature-flags/feature-flags.service';
+import { isLimitedToBE } from '@/react/portainer/feature-flags/feature-flags.service';
 
 class PorAccessManagementController {
   /* @ngInject */

app/portainer/components/datatables/registries-datatable/registriesDatatableController.js

@@ -1,4 +1,4 @@
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 import { PortainerEndpointTypes } from 'Portainer/models/endpoint/models';
 
 angular.module('portainer.docker').controller('RegistriesDatatableController', RegistriesDatatableController);

app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.controller.js

@@ -1,4 +1,4 @@
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 class GitFormAutoUpdateFieldsetController {
   /* @ngInject */

app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.controller.js

@@ -1,6 +1,6 @@
 import uuidv4 from 'uuid/v4';
 import { RepositoryMechanismTypes } from 'Kubernetes/models/deploy';
-import { FeatureId } from 'Portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 class StackRedeployGitFormController {
   /* @ngInject */
   constructor($async, $state, $compile, $scope, StackService, ModalService, Notifications, WebhookHelper, FormHelper) {

app/portainer/oauth/components/oauth-providers-selector/oauth-options.tsx

@@ -1,6 +1,6 @@
 import { Edit } from 'react-feather';
 
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 import Microsoft from '@/assets/ico/vendor/microsoft.svg?c';
 import Google from '@/assets/ico/vendor/google.svg?c';
 import Github from '@/assets/ico/vendor/github.svg?c';

app/portainer/oauth/components/oauth-settings/oauth-settings.controller.js

@@ -1,6 +1,6 @@
 import { baseHref } from '@/portainer/helpers/pathHelper';
-import { isLimitedToBE } from '@/portainer/feature-flags/feature-flags.service';
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { isLimitedToBE } from '@/react/portainer/feature-flags/feature-flags.service';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 import providers, { getProviderByUrl } from './providers';
 
 const MS_TENANT_ID_PLACEHOLDER = 'TENANT_ID';

app/portainer/rbac/components/access-viewer/access-viewer.controller.js

@@ -1,5 +1,5 @@
 import _ from 'lodash-es';
-import { isLimitedToBE } from '@/portainer/feature-flags/feature-flags.service';
+import { isLimitedToBE } from '@/react/portainer/feature-flags/feature-flags.service';
 
 import { getEnvironments } from '@/react/portainer/environments/environment.service';
 import AccessViewerPolicyModel from '../../models/access';

app/portainer/react/views/index.ts

@@ -1,6 +1,6 @@
 import angular from 'angular';
 
-import { HomeView } from '@/portainer/home';
+import { HomeView } from '@/react/portainer/HomeView';
 import { withCurrentUser } from '@/react-tools/withCurrentUser';
 import { r2a } from '@/react-tools/react2angular';
 import { withReactQuery } from '@/react-tools/withReactQuery';

app/portainer/services/axios.ts

@@ -3,7 +3,7 @@ import { loadProgressBar } from 'axios-progress-bar';
 
 import 'axios-progress-bar/dist/nprogress.css';
 import PortainerError from '@/portainer/error';
-import { get as localStorageGet } from '@/portainer/hooks/useLocalStorage';
+import { get as localStorageGet } from '@/react/hooks/useLocalStorage';
 
 import {
   portainerAgentManagerOperation,

app/portainer/services/notifications.ts

@@ -4,7 +4,7 @@ import sanitize from 'sanitize-html';
 import jwtDecode from 'jwt-decode';
 import { v4 as uuid } from 'uuid';
 
-import { get as localStorageGet } from '@/portainer/hooks/useLocalStorage';
+import { get as localStorageGet } from '@/react/hooks/useLocalStorage';
 import { notificationsStore } from '@/react/portainer/notifications/notifications-store';
 import { ToastNotification } from '@/react/portainer/notifications/types';
 

app/portainer/settings/authentication/ldap/ad-settings/ad-settings.controller.js

@@ -1,7 +1,7 @@
 import _ from 'lodash-es';
 
-import { FeatureId } from '@/portainer/feature-flags/enums';
-import { isLimitedToBE } from '@/portainer/feature-flags/feature-flags.service';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
+import { isLimitedToBE } from '@/react/portainer/feature-flags/feature-flags.service';
 
 export default class AdSettingsController {
   /* @ngInject */

app/portainer/settings/authentication/ldap/ldap-settings-custom/ldap-settings-custom.controller.js

@@ -1,4 +1,4 @@
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 export default class LdapSettingsCustomController {
   constructor() {

app/portainer/settings/authentication/ldap/ldap-settings-openldap/ldap-settings-openldap.controller.js

@@ -1,4 +1,4 @@
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 export default class LdapSettingsOpenLDAPController {
   /* @ngInject */

app/portainer/settings/authentication/ldap/ldap-settings/ldap-options.tsx

@@ -1,6 +1,6 @@
 import { Edit } from 'react-feather';
 
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 import Openldap from '@/assets/ico/vendor/openldap.svg?c';
 
 import { BadgeIcon } from '@@/BadgeIcon';

app/portainer/user-activity/activity-logs-view/activity-logs-view.controller.js

@@ -1,6 +1,6 @@
 import moment from 'moment';
 
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 export default class ActivityLogsViewController {
   /* @ngInject */
   constructor($async, $scope, Notifications) {

app/portainer/user-activity/auth-logs-view/auth-logs-view.controller.js

@@ -1,6 +1,6 @@
 import moment from 'moment';
 
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 export default class AuthLogsViewController {
   /* @ngInject */

app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateViewController.js

@@ -2,7 +2,7 @@ import _ from 'lodash';
 import { AccessControlFormData } from 'Portainer/components/accessControlForm/porAccessControlFormModel';
 import { TEMPLATE_NAME_VALIDATION_REGEX } from '@/constants';
 import { getTemplateVariables, intersectVariables } from '@/react/portainer/custom-templates/components/utils';
-import { isBE } from '@/portainer/feature-flags/feature-flags.service';
+import { isBE } from '@/react/portainer/feature-flags/feature-flags.service';
 
 class CreateCustomTemplateViewController {
   /* @ngInject */

app/portainer/views/custom-templates/custom-templates-view/customTemplatesViewController.js

@@ -2,7 +2,7 @@ import _ from 'lodash-es';
 import { AccessControlFormData } from 'Portainer/components/accessControlForm/porAccessControlFormModel';
 import { TEMPLATE_NAME_VALIDATION_REGEX } from '@/constants';
 import { renderTemplate } from '@/react/portainer/custom-templates/components/utils';
-import { isBE } from '@/portainer/feature-flags/feature-flags.service';
+import { isBE } from '@/react/portainer/feature-flags/feature-flags.service';
 
 class CustomTemplatesViewController {
   /* @ngInject */

app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateViewController.js

@@ -3,7 +3,7 @@ import { ResourceControlViewModel } from '@/react/portainer/access-control/model
 
 import { AccessControlFormData } from 'Portainer/components/accessControlForm/porAccessControlFormModel';
 import { getTemplateVariables, intersectVariables } from '@/react/portainer/custom-templates/components/utils';
-import { isBE } from '@/portainer/feature-flags/feature-flags.service';
+import { isBE } from '@/react/portainer/feature-flags/feature-flags.service';
 
 class EditCustomTemplateViewController {
   /* @ngInject */

app/portainer/views/endpoints/access/endpointAccessController.js

@@ -1,6 +1,6 @@
 import angular from 'angular';
 
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 class EndpointAccessController {
   /* @ngInject */

app/portainer/views/groups/access/groupAccessController.js

@@ -1,4 +1,4 @@
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 angular.module('portainer.app').controller('GroupAccessController', [
   '$scope',

app/portainer/views/settings/authentication/options.tsx

@@ -1,6 +1,6 @@
 import { ArrowDownCircle } from 'react-feather';
 
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 import Microsoft from '@/assets/ico/vendor/microsoft.svg?c';
 import Ldap from '@/assets/ico/ldap.svg?c';
 import OAuth from '@/assets/ico/oauth.svg?c';

app/portainer/views/settings/options.tsx

@@ -1,6 +1,6 @@
 import { DownloadCloud, UploadCloud } from 'react-feather';
 
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 import { BadgeIcon } from '@@/BadgeIcon';
 

app/portainer/views/settings/settingsController.js

@@ -1,6 +1,6 @@
 import angular from 'angular';
 
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 import { options } from './options';
 
 angular.module('portainer.app').controller('SettingsController', [

app/portainer/views/stacks/create/createStackController.js

@@ -4,8 +4,8 @@ import uuidv4 from 'uuid/v4';
 import { AccessControlFormData } from '@/portainer/components/accessControlForm/porAccessControlFormModel';
 import { STACK_NAME_VALIDATION_REGEX } from '@/constants';
 import { RepositoryMechanismTypes } from '@/kubernetes/models/deploy';
-import { FeatureId } from 'Portainer/feature-flags/enums';
-import { isBE } from '@/portainer/feature-flags/feature-flags.service';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
+import { isBE } from '@/react/portainer/feature-flags/feature-flags.service';
 import { renderTemplate } from '@/react/portainer/custom-templates/components/utils';
 
 angular

app/portainer/views/stacks/edit/stackController.js

@@ -1,6 +1,6 @@
 import { ResourceControlType } from '@/react/portainer/access-control/types';
 import { AccessControlFormData } from 'Portainer/components/accessControlForm/porAccessControlFormModel';
-import { FeatureId } from 'Portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 import { getEnvironments } from '@/react/portainer/environments/environment.service';
 import { StackStatus, StackType } from '@/react/docker/stacks/types';
 import { extractContainerNames } from '@/portainer/helpers/stackHelper';

app/react-tools/withCurrentUser.tsx

@@ -1,6 +1,6 @@
 import { ComponentType } from 'react';
 
-import { UserProvider } from '@/portainer/hooks/useUser';
+import { UserProvider } from '@/react/hooks/useUser';
 
 export function withCurrentUser<T>(
   WrappedComponent: ComponentType<T>

app/react/azure/DashboardView/DashboardView.test.tsx

@@ -1,5 +1,5 @@
 import { renderWithQueryClient, within } from '@/react-tools/test-utils';
-import { UserContext } from '@/portainer/hooks/useUser';
+import { UserContext } from '@/react/hooks/useUser';
 import { UserViewModel } from '@/portainer/models/user';
 import { server, rest } from '@/setup-tests/server';
 import {

app/react/azure/DashboardView/DashboardView.tsx

@@ -1,6 +1,6 @@
 import { Package } from 'react-feather';
 
-import { useEnvironmentId } from '@/portainer/hooks/useEnvironmentId';
+import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
 
 import { PageHeader } from '@@/PageHeader';
 import { DashboardItem } from '@@/DashboardItem';

app/react/azure/container-instances/CreateView/CreateContainerInstanceForm.test.tsx

@@ -1,6 +1,6 @@
 import userEvent from '@testing-library/user-event';
 
-import { UserContext } from '@/portainer/hooks/useUser';
+import { UserContext } from '@/react/hooks/useUser';
 import { UserViewModel } from '@/portainer/models/user';
 import { renderWithQueryClient } from '@/react-tools/test-utils';
 

app/react/azure/container-instances/CreateView/CreateContainerInstanceForm.tsx

@@ -3,9 +3,9 @@ import { useRouter } from '@uirouter/react';
 
 import { ContainerInstanceFormValues } from '@/react/azure/types';
 import * as notifications from '@/portainer/services/notifications';
-import { useUser } from '@/portainer/hooks/useUser';
+import { useUser } from '@/react/hooks/useUser';
 import { AccessControlForm } from '@/react/portainer/access-control/AccessControlForm';
-import { useEnvironmentId } from '@/portainer/hooks/useEnvironmentId';
+import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
 
 import { FormControl } from '@@/form-components/FormControl';
 import { Input, Select } from '@@/form-components/Input';

app/react/azure/container-instances/CreateView/useLoadFormState.ts

@@ -6,7 +6,7 @@ import {
   Subscription,
 } from '@/react/azure/types';
 import { parseAccessControlFormData } from '@/react/portainer/access-control/utils';
-import { useUser } from '@/portainer/hooks/useUser';
+import { useUser } from '@/react/hooks/useUser';
 import { useProvider } from '@/react/azure/queries/useProvider';
 import { useResourceGroups } from '@/react/azure/queries/useResourceGroups';
 import { useSubscriptions } from '@/react/azure/queries/useSubscriptions';

app/react/azure/container-instances/ItemView/ItemView.tsx

@@ -1,7 +1,7 @@
 import { useCurrentStateAndParams } from '@uirouter/react';
 import { useQueryClient } from 'react-query';
 
-import { useEnvironmentId } from '@/portainer/hooks/useEnvironmentId';
+import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
 import { AccessControlPanel } from '@/react/portainer/access-control/AccessControlPanel/AccessControlPanel';
 import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel';
 import { ResourceControlType } from '@/react/portainer/access-control/types';

app/react/azure/container-instances/ListView/ContainersDatatable.tsx

@@ -8,9 +8,9 @@ import {
 import { useRowSelectColumn } from '@lineup-lite/hooks';
 import { Box, Plus, Trash2 } from 'react-feather';
 
-import { useDebounce } from '@/portainer/hooks/useDebounce';
+import { useDebounce } from '@/react/hooks/useDebounce';
 import { ContainerGroup } from '@/react/azure/types';
-import { Authorized } from '@/portainer/hooks/useUser';
+import { Authorized } from '@/react/hooks/useUser';
 import { confirmDeletionAsync } from '@/portainer/services/modal.service/confirm';
 
 import { PaginationControls } from '@@/PaginationControls';

app/react/azure/container-instances/ListView/ListView.tsx

@@ -1,7 +1,7 @@
 import { useMutation, useQueryClient } from 'react-query';
 
 import { deleteContainerGroup } from '@/react/azure/services/container-groups.service';
-import { useEnvironmentId } from '@/portainer/hooks/useEnvironmentId';
+import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
 import { notifyError, notifySuccess } from '@/portainer/services/notifications';
 import { EnvironmentId } from '@/react/portainer/environments/types';
 import { promiseSequence } from '@/portainer/helpers/promise-utils';

app/react/components/BEFeatureIndicator/BEFeatureIndicator.stories.tsx

@@ -1,7 +1,7 @@
 import { Meta } from '@storybook/react';
 
-import { Edition, FeatureId } from '@/portainer/feature-flags/enums';
-import { init as initFeatureService } from '@/portainer/feature-flags/feature-flags.service';
+import { Edition, FeatureId } from '@/react/portainer/feature-flags/enums';
+import { init as initFeatureService } from '@/react/portainer/feature-flags/feature-flags.service';
 
 import { BEFeatureIndicator, Props } from './BEFeatureIndicator';
 

app/react/components/BEFeatureIndicator/BEFeatureIndicator.tsx

@@ -4,7 +4,7 @@ import { Briefcase } from 'react-feather';
 
 import './BEFeatureIndicator.css';
 
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 import { getFeatureDetails } from './utils';
 

app/react/components/BEFeatureIndicator/utils.ts

@@ -1,5 +1,5 @@
-import { FeatureId } from '@/portainer/feature-flags/enums';
-import { isLimitedToBE } from '@/portainer/feature-flags/feature-flags.service';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
+import { isLimitedToBE } from '@/react/portainer/feature-flags/feature-flags.service';
 
 const BE_URL = 'https://www.portainer.io/business-upsell?from=';
 

app/react/components/BoxSelector/BoxSelector.stories.tsx

@@ -1,8 +1,8 @@
 import { Meta } from '@storybook/react';
 import { useState } from 'react';
 
-import { init as initFeatureService } from '@/portainer/feature-flags/feature-flags.service';
-import { Edition, FeatureId } from '@/portainer/feature-flags/enums';
+import { init as initFeatureService } from '@/react/portainer/feature-flags/feature-flags.service';
+import { Edition, FeatureId } from '@/react/portainer/feature-flags/enums';
 
 import { BoxSelector } from './BoxSelector';
 import { BoxSelectorOption } from './types';

app/react/components/BoxSelector/BoxSelectorItem.stories.tsx

@@ -1,7 +1,7 @@
 import { Meta } from '@storybook/react';
 
-import { init as initFeatureService } from '@/portainer/feature-flags/feature-flags.service';
-import { Edition, FeatureId } from '@/portainer/feature-flags/enums';
+import { init as initFeatureService } from '@/react/portainer/feature-flags/feature-flags.service';
+import { Edition, FeatureId } from '@/react/portainer/feature-flags/enums';
 
 import { BoxSelectorItem } from './BoxSelectorItem';
 import { BoxSelectorOption } from './types';

app/react/components/BoxSelector/BoxSelectorItem.tsx

@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { isLimitedToBE } from '@/portainer/feature-flags/feature-flags.service';
+import { isLimitedToBE } from '@/react/portainer/feature-flags/feature-flags.service';
 import { Icon } from '@/react/components/Icon';
 
 import './BoxSelectorItem.css';

app/react/components/BoxSelector/LimitedToBeIndicator.tsx

@@ -1,7 +1,7 @@
 import ReactTooltip from 'react-tooltip';
 import { HelpCircle } from 'react-feather';
 
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 import { getFeatureDetails } from '@@/BEFeatureIndicator/utils';
 

app/react/components/BoxSelector/types.ts

@@ -1,4 +1,4 @@
-import type { FeatureId } from '@/portainer/feature-flags/enums';
+import type { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 import { IconProps } from '@@/Icon';
 

app/react/components/EdgeIndicator.test.tsx

@@ -12,12 +12,12 @@ test('when edge id is not set, should show unassociated label', async () => {
   expect(unassociatedLabel).toBeVisible();
 });
 
-// test('given edge id and last checkin is set, should show heartbeat', async () => {
-//   const { queryByLabelText } = await renderComponent('id', 1);
+test('given edge id and last checkin is set, should show heartbeat', async () => {
+  const { queryByLabelText } = await renderComponent('id', 1);
 
-//   expect(queryByLabelText('edge-heartbeat')).toBeVisible();
-//   expect(queryByLabelText('edge-last-checkin')).toBeVisible();
-// });
+  expect(queryByLabelText('edge-heartbeat')).toBeVisible();
+  expect(queryByLabelText('edge-last-checkin')).toBeVisible();
+});
 
 async function renderComponent(
   edgeId = '',

app/react/components/PageHeader/HeaderContainer.stories.tsx

@@ -1,7 +1,7 @@
 import { Meta, Story } from '@storybook/react';
 import { useMemo } from 'react';
 
-import { UserContext } from '@/portainer/hooks/useUser';
+import { UserContext } from '@/react/hooks/useUser';
 import { UserViewModel } from '@/portainer/models/user';
 
 import { HeaderContainer } from './HeaderContainer';

app/react/components/PageHeader/HeaderTitle.test.tsx

@@ -1,4 +1,4 @@
-import { UserContext } from '@/portainer/hooks/useUser';
+import { UserContext } from '@/react/hooks/useUser';
 import { UserViewModel } from '@/portainer/models/user';
 import { render } from '@/react-tools/test-utils';
 

app/react/components/PageHeader/NotificationsMenu.tsx

@@ -11,7 +11,7 @@ import { useEffect, useState } from 'react';
 import { useStore } from 'zustand';
 
 import { AutomationTestingProps } from '@/types';
-import { useUser } from '@/portainer/hooks/useUser';
+import { useUser } from '@/react/hooks/useUser';
 import { ToastNotification } from '@/react/portainer/notifications/types';
 
 import { Icon } from '@@/Icon';

app/react/components/PageHeader/PageHeader.stories.tsx

@@ -1,7 +1,7 @@
 import { Meta, Story } from '@storybook/react';
 import { useMemo } from 'react';
 
-import { UserContext } from '@/portainer/hooks/useUser';
+import { UserContext } from '@/react/hooks/useUser';
 import { UserViewModel } from '@/portainer/models/user';
 
 import { PageHeader } from './PageHeader';

app/react/components/PageHeader/PageHeader.test.tsx

@@ -1,4 +1,4 @@
-import { UserContext } from '@/portainer/hooks/useUser';
+import { UserContext } from '@/react/hooks/useUser';
 import { UserViewModel } from '@/portainer/models/user';
 import { render } from '@/react-tools/test-utils';
 

app/react/components/PageHeader/UserMenu.tsx

@@ -9,7 +9,7 @@ import clsx from 'clsx';
 import { User, ChevronDown } from 'react-feather';
 
 import { AutomationTestingProps } from '@/types';
-import { useUser } from '@/portainer/hooks/useUser';
+import { useUser } from '@/react/hooks/useUser';
 
 import styles from './HeaderTitle.module.css';
 

app/react/components/datatables/FilterSearchBar.tsx

@@ -1,6 +1,6 @@
 import { Search } from 'react-feather';
 
-import { useLocalStorage } from '@/portainer/hooks/useLocalStorage';
+import { useLocalStorage } from '@/react/hooks/useLocalStorage';
 
 interface Props {
   value: string;

app/react/components/datatables/SearchBar.tsx

@@ -2,7 +2,7 @@ import { Search } from 'react-feather';
 import { useEffect, useMemo, useState } from 'react';
 import _ from 'lodash';
 
-import { useLocalStorage } from '@/portainer/hooks/useLocalStorage';
+import { useLocalStorage } from '@/react/hooks/useLocalStorage';
 import { AutomationTestingProps } from '@/types';
 
 interface Props extends AutomationTestingProps {

app/react/components/datatables/useTableSettings.tsx

@@ -8,7 +8,7 @@ import {
   useState,
 } from 'react';
 
-import { useLocalStorage } from '@/portainer/hooks/useLocalStorage';
+import { useLocalStorage } from '@/react/hooks/useLocalStorage';
 
 interface TableSettingsContextInterface<T> {
   settings: T;

app/react/components/form-components/SwitchField/Switch.tsx

@@ -1,7 +1,7 @@
 import clsx from 'clsx';
 
-import { isLimitedToBE } from '@/portainer/feature-flags/feature-flags.service';
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { isLimitedToBE } from '@/react/portainer/feature-flags/feature-flags.service';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 import { BEFeatureIndicator } from '@@/BEFeatureIndicator';
 

app/react/components/form-components/SwitchField/SwitchField.tsx

@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { FeatureId } from '@/portainer/feature-flags/enums';
+import { FeatureId } from '@/react/portainer/feature-flags/enums';
 
 import { Tooltip } from '@@/Tip/Tooltip';
 

app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableActions.tsx

@@ -10,7 +10,7 @@ import {
 } from 'react-feather';
 
 import * as notifications from '@/portainer/services/notifications';
-import { useAuthorizations, Authorized } from '@/portainer/hooks/useUser';
+import { useAuthorizations, Authorized } from '@/react/hooks/useUser';
 import { confirmContainerDeletion } from '@/portainer/services/modal.service/prompt';
 import { setPortainerAgentTargetHeader } from '@/portainer/services/http-request.helper';
 import {

app/react/docker/containers/ListView/ContainersDatatable/columns/gpus.tsx

@@ -1,7 +1,7 @@
 import { CellProps, Column } from 'react-table';
 
 import type { DockerContainer } from '@/react/docker/containers/types';
-import { useEnvironmentId } from '@/portainer/hooks/useEnvironmentId';
+import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
 import { useContainerGpus } from '@/react/docker/containers/queries/gpus';
 
 export const gpus: Column<DockerContainer> = {

app/react/docker/containers/ListView/ContainersDatatable/columns/quick-actions.tsx

@@ -1,8 +1,8 @@
 import { CellProps, Column } from 'react-table';
 
-import { useAuthorizations } from '@/portainer/hooks/useUser';
+import { useAuthorizations } from '@/react/hooks/useUser';
 import { isOfflineEndpoint } from '@/portainer/helpers/endpointHelper';
-import { useCurrentEnvironment } from '@/portainer/hooks/useCurrentEnvironment';
+import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment';
 import { ContainerQuickActions } from '@/react/docker/containers/components/ContainerQuickActions';
 import { DockerContainer } from '@/react/docker/containers/types';
 

app/react/docker/containers/ListView/ContainersDatatable/datatable-store.ts

@@ -1,7 +1,7 @@
 import create from 'zustand';
 import { persist } from 'zustand/middleware';
 
-import { keyBuilder } from '@/portainer/hooks/useLocalStorage';
+import { keyBuilder } from '@/react/hooks/useLocalStorage';
 import {
   paginationSettings,
   sortableSettings,

app/react/docker/containers/components/ContainerQuickActions/ContainerQuickActions.tsx

@@ -1,7 +1,7 @@
 import clsx from 'clsx';
 
 import { ContainerStatus } from '@/react/docker/containers/types';
-import { Authorized } from '@/portainer/hooks/useUser';
+import { Authorized } from '@/react/hooks/useUser';
 
 import { Icon } from '@@/Icon';
 import { Link } from '@@/Link';

app/react/docker/networks/ItemView/ItemView.tsx

@@ -3,7 +3,7 @@ import { useRouter, useCurrentStateAndParams } from '@uirouter/react';
 import { useQueryClient } from 'react-query';
 import _ from 'lodash';
 
-import { useEnvironmentId } from '@/portainer/hooks/useEnvironmentId';
+import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
 import { confirmDeletionAsync } from '@/portainer/services/modal.service/confirm';
 import { AccessControlPanel } from '@/react/portainer/access-control/AccessControlPanel/AccessControlPanel';
 import { ResourceControlType } from '@/react/portainer/access-control/types';

app/react/docker/networks/ItemView/NetworkContainersTable.test.tsx

@@ -1,5 +1,5 @@
 import { renderWithQueryClient } from '@/react-tools/test-utils';
-import { UserContext } from '@/portainer/hooks/useUser';
+import { UserContext } from '@/react/hooks/useUser';
 import { UserViewModel } from '@/portainer/models/user';
 
 import { NetworkContainer } from '../types';

app/react/docker/networks/ItemView/NetworkContainersTable.tsx

@@ -1,4 +1,4 @@
-import { Authorized } from '@/portainer/hooks/useUser';
+import { Authorized } from '@/react/hooks/useUser';
 import { EnvironmentId } from '@/react/portainer/environments/types';
 import { Icon } from '@/react/components/Icon';
 

app/react/docker/networks/ItemView/NetworkDetailsTable.test.tsx

@@ -1,5 +1,5 @@
 import { render } from '@/react-tools/test-utils';
-import { UserContext } from '@/portainer/hooks/useUser';
+import { UserContext } from '@/react/hooks/useUser';
 import { UserViewModel } from '@/portainer/models/user';
 
 import { DockerNetwork } from '../types';

app/react/docker/networks/ItemView/NetworkDetailsTable.tsx

@@ -1,7 +1,7 @@
 import { Fragment } from 'react';
 
 import DockerNetworkHelper from '@/docker/helpers/networkHelper';
-import { Authorized } from '@/portainer/hooks/useUser';
+import { Authorized } from '@/react/hooks/useUser';
 
 import { Table, TableContainer, TableTitle } from '@@/datatables';
 import { DetailsTable } from '@@/DetailsTable';

app/react/hooks/useUIState.tsx

@@ -1,7 +1,7 @@
 import create from 'zustand';
 import { persist } from 'zustand/middleware';
 
-import { keyBuilder } from '@/portainer/hooks/useLocalStorage';
+import { keyBuilder } from '@/react/hooks/useLocalStorage';
 
 interface UIState {
   dismissedInfoPanels: Record<string, boolean>;

app/react/hooks/useUser.tsx

@@ -12,9 +12,8 @@ import {
 
 import { isAdmin } from '@/portainer/users/user.helpers';
 import { EnvironmentId } from '@/react/portainer/environments/types';
-
-import { getUser } from '../users/user.service';
-import { User, UserId } from '../users/types';
+import { getUser } from '@/portainer/users/user.service';
+import { User, UserId } from '@/portainer/users/types';
 
 import { useLocalStorage } from './useLocalStorage';
 

app/react/kubernetes/cluster/ingressClass/IngressClassDatatable/datatable-store.ts

@@ -1,7 +1,7 @@
 import create from 'zustand';
 import { persist } from 'zustand/middleware';
 
-import { keyBuilder } from '@/portainer/hooks/useLocalStorage';
+import { keyBuilder } from '@/react/hooks/useLocalStorage';
 import {
   paginationSettings,
   sortableSettings,

app/react/kubernetes/ingresses/CreateIngressView/CreateIngressView.tsx

@@ -2,7 +2,7 @@ import { useState, useEffect, useMemo, ReactNode } from 'react';
 import { useCurrentStateAndParams, useRouter } from '@uirouter/react';
 import { v4 as uuidv4 } from 'uuid';
 
-import { useEnvironmentId } from '@/portainer/hooks/useEnvironmentId';
+import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
 import { useConfigurations } from '@/react/kubernetes/configs/queries';
 import { useNamespaces } from '@/react/kubernetes/namespaces/queries';
 import { useServices } from '@/react/kubernetes/networks/services/queries';

app/react/kubernetes/ingresses/IngressDatatable/IngressDataTable.tsx

@@ -1,9 +1,9 @@
 import { Plus, Trash2 } from 'react-feather';
 import { useRouter } from '@uirouter/react';
 
-import { useEnvironmentId } from '@/portainer/hooks/useEnvironmentId';
+import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
 import { useNamespaces } from '@/react/kubernetes/namespaces/queries';
-import { useAuthorizations, Authorized } from '@/portainer/hooks/useUser';
+import { useAuthorizations, Authorized } from '@/react/hooks/useUser';
 import { confirmDeletionAsync } from '@/portainer/services/modal.service/confirm';
 
 import { Datatable } from '@@/datatables';

app/react/kubernetes/ingresses/IngressDatatable/columns/name.tsx

@@ -1,6 +1,6 @@
 import { CellProps, Column } from 'react-table';
 
-import { Authorized } from '@/portainer/hooks/useUser';
+import { Authorized } from '@/react/hooks/useUser';
 
 import { Link } from '@@/Link';
 

app/react/kubernetes/ingresses/IngressDatatable/datatable-store.ts

@@ -1,7 +1,7 @@
 import create from 'zustand';
 import { persist } from 'zustand/middleware';
 
-import { keyBuilder } from '@/portainer/hooks/useLocalStorage';
+import { keyBuilder } from '@/react/hooks/useLocalStorage';
 import {
   paginationSettings,
   sortableSettings,