From bf8ccbcec6cc2d7c83eaf03387227f35e8b24fcf Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Thu, 18 Dec 2025 13:45:26 +0200 Subject: [PATCH] Revert "feat(frontend): import CE code to EE" (#1557) --- .eslintrc.yml | 14 ++-- .../host-browser/hostBrowserController.js | 2 +- .../volume-browser/volumeBrowserController.js | 2 +- app/azure/index.ts | 6 +- app/azure/react/views/index.ts | 16 ++-- app/docker/__module.js | 4 +- ...r-image-registry-rate-limits.controller.js | 2 +- .../por-image-registry.controller.js | 2 +- .../log-viewer/logViewerController.js | 2 +- .../networkMacvlanFormController.js | 2 +- app/docker/helpers/imageHelper.js | 2 +- app/docker/helpers/logHelper/constants.ts | 2 +- app/docker/models/config.ts | 6 +- app/docker/models/containerDetails.ts | 8 +- app/docker/models/containerStats.ts | 4 +- app/docker/models/image.ts | 2 +- app/docker/models/imageLayer.ts | 2 +- app/docker/models/network.ts | 6 +- app/docker/models/secret.ts | 6 +- app/docker/models/service.ts | 4 +- app/docker/models/task.ts | 2 +- app/docker/models/volume.ts | 6 +- app/docker/react/components/containers.ts | 8 +- app/docker/react/components/index.ts | 34 ++++----- app/docker/react/components/networks.ts | 6 +- app/docker/react/components/services.ts | 14 ++-- app/docker/react/components/swarm.ts | 6 +- app/docker/react/components/volumes.ts | 8 +- app/docker/react/views/configs.ts | 10 +-- app/docker/react/views/containers.ts | 26 +++---- app/docker/react/views/images.ts | 8 +- app/docker/react/views/index.ts | 12 +-- app/docker/react/views/stacks.ts | 10 +-- app/docker/services/buildService.js | 2 +- app/docker/services/configService.js | 10 +-- app/docker/services/containerService.js | 16 ++-- app/docker/services/execService.js | 2 +- app/docker/services/imageService.js | 24 +++--- app/docker/services/networkService.js | 10 +-- app/docker/services/nodeService.js | 6 +- app/docker/services/pluginService.js | 6 +- app/docker/services/secretService.js | 8 +- app/docker/services/serviceService.js | 12 +-- app/docker/services/swarmService.js | 2 +- app/docker/services/systemService.js | 6 +- app/docker/services/taskService.js | 6 +- app/docker/services/volumeService.js | 8 +- .../configs/create/createConfigController.js | 2 +- .../views/configs/edit/configController.js | 2 +- .../console/containerConsoleController.js | 4 +- .../containers/edit/containerController.js | 12 +-- ...ocker-features-configuration.controller.js | 2 +- .../images/build/buildImageController.js | 4 +- .../views/images/edit/imageController.js | 4 +- .../views/networks/networksController.js | 4 +- .../views/secrets/edit/secretController.js | 2 +- app/docker/views/secrets/secretsController.js | 2 +- .../create/createServiceController.js | 2 +- .../views/services/edit/serviceController.js | 16 ++-- .../views/volumes/edit/volumeController.js | 4 +- app/docker/views/volumes/volumesController.js | 2 +- app/edge/__module.js | 2 +- app/edge/react/components/index.ts | 18 ++--- app/edge/react/views/edge-stacks.ts | 12 +-- app/edge/react/views/groups.ts | 12 +-- app/edge/react/views/index.ts | 10 +-- app/edge/react/views/jobs.ts | 12 +-- app/index.js | 4 +- app/kubernetes/__module.js | 4 +- app/kubernetes/converters/application.js | 2 +- app/kubernetes/converters/configMap.js | 2 +- app/kubernetes/converters/daemonSet.js | 2 +- app/kubernetes/converters/deployment.js | 2 +- app/kubernetes/converters/resourceQuota.js | 2 +- app/kubernetes/converters/secret.js | 2 +- app/kubernetes/converters/statefulSet.js | 2 +- app/kubernetes/filters/applicationFilters.js | 2 +- app/kubernetes/helpers/application/index.js | 4 +- app/kubernetes/helpers/namespaceHelper.js | 2 +- .../helpers/resourceReservationHelper.js | 2 +- .../models/application/formValues.js | 2 +- .../models/application/models/Application.ts | 4 +- .../models/application/models/appConstants.ts | 4 +- app/kubernetes/node/converter.js | 2 +- .../react/components/clusterManagement.ts | 12 +-- app/kubernetes/react/components/index.ts | 74 +++++++++---------- app/kubernetes/react/components/namespaces.ts | 8 +- .../react/components/registries.tsx | 4 +- app/kubernetes/react/views/index.ts | 54 +++++++------- app/kubernetes/rest/serviceAccount.js | 2 +- app/kubernetes/services/applicationService.js | 4 +- .../services/resourcePoolService.js | 2 +- .../create/createApplicationController.js | 20 ++--- .../views/applications/logs/logsController.js | 2 +- .../applications/stats/statsController.js | 4 +- .../cluster/node/stats/statsController.js | 6 +- .../create/createConfigMapController.js | 4 +- .../configmap/edit/configMapController.js | 4 +- .../configurationsController.js | 2 +- .../secret/create/createSecretController.js | 4 +- .../secret/edit/secretController.js | 4 +- .../views/configurations/validation.js | 4 +- .../views/deploy/deployController.js | 20 ++--- .../constraintController.js | 2 +- .../views/stacks/logs/logsController.js | 2 +- .../summary/resources/applicationResources.js | 2 +- .../views/volumes/edit/volumeController.js | 4 +- app/portainer/__module.js | 2 +- .../BEFeatureIndicator.controller.ts | 4 +- app/portainer/components/BoxSelector/index.ts | 4 +- app/portainer/components/BoxSelector/utils.ts | 6 +- .../porAccessControlFormController.js | 2 +- .../porAccessControlFormModel.js | 2 +- .../porAccessManagementController.js | 4 +- .../porEndpointSecurityController.js | 2 +- .../git-form-auth-fieldset.controller.ts | 16 ++-- ...it-form-auto-update-fieldset.controller.ts | 8 +- .../forms/git-form/git-form-ref-field.ts | 8 +- .../forms/git-form/git-form.controller.ts | 14 ++-- ...rnetes-redeploy-app-git-form.controller.js | 12 +-- .../product-item/productItem.html | 4 +- .../theme/theme-settings.controller.js | 8 +- .../components/tls-fieldset/index.ts | 4 +- app/portainer/filters/index.js | 2 +- .../helpers/resourceControlHelper.js | 2 +- app/portainer/helpers/stackHelper.js | 4 +- app/portainer/helpers/strings.ts | 2 +- app/portainer/helpers/webhookHelper.ts | 2 +- .../open-amt/open-amt.service.ts | 6 +- .../license-management/license.service.ts | 2 +- .../oauth-provider-selector.controller.js | 2 +- .../oauth-settings.controller.js | 12 +-- .../components/oauth-settings/providers.js | 4 +- .../access-viewer/access-viewer.controller.js | 6 +- .../react/components/access-control.ts | 18 ++--- app/portainer/react/components/account.ts | 14 ++-- .../react/components/activity-logs.ts | 8 +- .../components/custom-templates/index.ts | 8 +- .../custom-templates/variables-field.ts | 2 +- .../react/components/environments.ts | 8 +- .../react/components/file-upload-field.ts | 4 +- app/portainer/react/components/git-form.ts | 20 ++--- app/portainer/react/components/index.ts | 68 ++++++++--------- app/portainer/react/components/rbac.ts | 8 +- app/portainer/react/components/registries.ts | 14 ++-- app/portainer/react/components/settings.ts | 26 +++---- .../react/components/switch-field.ts | 4 +- app/portainer/react/components/users.ts | 10 +-- app/portainer/react/views/activity-logs.ts | 8 +- app/portainer/react/views/env-groups.ts | 10 +-- app/portainer/react/views/index.ts | 24 +++--- app/portainer/react/views/registries.ts | 12 +-- app/portainer/react/views/sidebar.ts | 12 +-- app/portainer/react/views/teams.ts | 12 +-- app/portainer/react/views/templates.ts | 14 ++-- app/portainer/react/views/update-schedules.ts | 10 +-- app/portainer/react/views/users.ts | 10 +-- app/portainer/react/views/wizard.ts | 12 +-- .../views/create/createRegistryController.js | 4 +- .../views/edit/registryController.js | 2 +- app/portainer/services/angularToReact.ts | 10 +-- .../services/api/dockerhubService.js | 4 +- app/portainer/services/api/registryService.js | 4 +- app/portainer/services/api/stackService.js | 4 +- app/portainer/services/api/statusService.js | 2 +- app/portainer/services/api/templateService.js | 2 +- app/portainer/services/api/userService.js | 6 +- app/portainer/services/authentication.js | 2 +- app/portainer/services/axios.ts | 2 +- .../dockerMaxApiVersionInterceptor.ts | 2 +- app/portainer/services/endpointProvider.ts | 6 +- app/portainer/services/formValidator.js | 2 +- app/portainer/services/nameValidator.js | 2 +- app/portainer/services/notifications.ts | 6 +- .../services/registryGitlabService.js | 2 +- .../services/registryModalService.js | 2 +- app/portainer/services/types.ts | 2 +- .../ad-settings/ad-settings.controller.js | 4 +- .../ldap-settings-custom.controller.js | 2 +- .../ldap-settings-openldap.controller.js | 2 +- .../ldap-settings/ldap-settings.controller.js | 4 +- app/portainer/tags/queries.ts | 4 +- .../auth-logs-view.controller.js | 2 +- app/portainer/user-activity/index.js | 2 +- .../user-activity/user-activity.rest.js | 2 +- app/portainer/users/queries.ts | 7 +- .../users/queries/useLoadCurrentUser.ts | 4 +- app/portainer/users/queries/useUser.ts | 4 +- app/portainer/users/types.ts | 4 +- app/portainer/users/user.helpers.ts | 4 +- app/portainer/users/user.service.ts | 4 +- .../views/account/accountController.js | 6 +- app/portainer/views/auth/auth.html | 4 +- app/portainer/views/auth/authController.js | 4 +- .../access/endpointAccessController.js | 2 +- .../endpoints/edit/endpointController.js | 16 ++-- .../groups/access/groupAccessController.js | 2 +- .../views/groups/edit/groupController.js | 4 +- app/portainer/views/init/admin/initAdmin.html | 4 +- .../views/init/admin/initAdminController.js | 6 +- app/portainer/views/logout/logout.html | 4 +- .../views/logout/logoutController.js | 2 +- .../settingsAuthenticationController.js | 8 +- .../stacks/create/createStackController.js | 22 +++--- .../views/stacks/stacksController.js | 2 +- .../views/users/edit/userController.js | 6 +- app/react-tools/react-query.ts | 2 +- app/react-tools/test-mocks.ts | 8 +- app/react-tools/withCurrentUser.tsx | 2 +- app/react-tools/withFormValidation.ts | 6 +- .../DashboardView/DashboardView.test.tsx | 12 +-- .../azure/DashboardView/DashboardView.tsx | 10 +-- .../CreateContainerInstanceForm.test.tsx | 10 +-- .../CreateContainerInstanceForm.tsx | 18 ++--- .../CreateContainerInstanceForm.validation.ts | 2 +- .../CreateView/CreateView.tsx | 4 +- .../CreateView/PortsMappingField.tsx | 12 +-- .../CreateView/useCreateInstanceMutation.tsx | 12 +-- .../CreateView/useLoadFormState.ts | 14 ++-- .../container-instances/CreateView/utils.ts | 2 +- .../container-instances/ItemView/ItemView.tsx | 26 +++---- .../ListView/ContainersDatatable.tsx | 14 ++-- .../container-instances/ListView/ListView.tsx | 19 ++--- .../ListView/columns/helper.ts | 2 +- .../ListView/columns/name.tsx | 4 +- .../ListView/columns/ownership.tsx | 8 +- .../ListView/columns/ports.tsx | 8 +- app/react/azure/queries/query-keys.ts | 2 +- app/react/azure/queries/useContainerGroup.ts | 6 +- app/react/azure/queries/useContainerGroups.ts | 6 +- app/react/azure/queries/useProvider.ts | 6 +- app/react/azure/queries/useResourceGroup.ts | 6 +- app/react/azure/queries/useResourceGroups.ts | 6 +- app/react/azure/queries/useSubscription.ts | 6 +- app/react/azure/queries/useSubscriptions.ts | 6 +- app/react/azure/queries/utils.ts | 2 +- .../services/container-groups.service.ts | 4 +- app/react/azure/types.ts | 4 +- app/react/common/api/listQueryParams.ts | 4 +- app/react/common/api/sort.types.ts | 2 +- .../common/stacks/CreateView/NameField.tsx | 8 +- .../stacks/common/confirm-stack-update.ts | 6 +- .../createKubernetesStackFromFileContent.ts | 4 +- .../createKubernetesStackFromGit.ts | 6 +- .../createKubernetesStackFromUrl.ts | 4 +- .../createStandaloneStackFromFile.ts | 6 +- .../createStandaloneStackFromFileContent.ts | 6 +- .../createStandaloneStackFromGit.ts | 8 +- .../createSwarmStackFromFile.ts | 6 +- .../createSwarmStackFromFileContent.ts | 6 +- .../useCreateStack/createSwarmStackFromGit.ts | 8 +- .../queries/useCreateStack/useCreateStack.ts | 14 ++-- .../queries/useDeleteStackByNameMutation.ts | 6 +- .../stacks/queries/useDeleteStackMutation.ts | 6 +- app/react/common/stacks/queries/useStack.ts | 4 +- .../common/stacks/queries/useStackFile.ts | 4 +- app/react/common/stacks/queries/useStacks.ts | 6 +- app/react/common/stacks/types.ts | 8 +- app/react/components/Alert/Alert.tsx | 2 +- .../BEFeatureIndicator.stories.tsx | 4 +- .../BEFeatureIndicator/BEFeatureIndicator.tsx | 4 +- .../BEFeatureIndicator/BEOverlay.tsx | 4 +- .../components/BEFeatureIndicator/utils.ts | 4 +- app/react/components/BETeaserButton.tsx | 8 +- app/react/components/Badge/Badge.tsx | 2 +- app/react/components/Badge/ExternalBadge.tsx | 2 +- app/react/components/Badge/SystemBadge.tsx | 2 +- app/react/components/Badge/UnusedBadge.tsx | 2 +- app/react/components/BadgeIcon/BadgeIcon.tsx | 2 +- .../Blocklist/BlocklistItem.stories.tsx | 4 +- .../components/BoxSelector/BoxOption.tsx | 2 +- .../BoxSelector/BoxSelector.stories.tsx | 6 +- .../components/BoxSelector/BoxSelector.tsx | 2 +- .../BoxSelector/BoxSelectorItem.stories.tsx | 8 +- .../BoxSelector/BoxSelectorItem.tsx | 6 +- .../LimitedToBeBoxSelectorIndicator.tsx | 4 +- app/react/components/BoxSelector/LogoIcon.tsx | 2 +- .../common-options/build-methods.tsx | 4 +- .../common-options/deployment-methods.tsx | 4 +- app/react/components/BoxSelector/types.ts | 4 +- app/react/components/Code/Code.tsx | 6 +- .../components/CodeEditor/CodeEditor.tsx | 4 +- .../components/CodeEditor/DiffViewer.tsx | 2 +- .../components/CodeEditor/FileNameHeader.tsx | 4 +- .../CodeEditor/ShortcutsTooltip.tsx | 4 +- .../DashboardItem/DashboardItem.stories.tsx | 4 +- .../DashboardItem/DashboardItem.tsx | 8 +- app/react/components/DateTimeField.tsx | 8 +- app/react/components/EdgeIndicator.test.tsx | 2 +- app/react/components/EdgeIndicator.tsx | 8 +- .../components/EnvironmentStatusBadge.tsx | 2 +- .../components/EnvironmentStatusBadgeItem.tsx | 2 +- .../ExpandableMessageByLines.test.tsx | 2 +- .../components/ExpandableMessageByLines.tsx | 2 +- app/react/components/ExternalLink.tsx | 2 +- app/react/components/HelpLink/HelpLink.tsx | 2 +- .../ImageConfigFieldset/AdvancedForm.tsx | 6 +- .../ImageConfigFieldset.test.tsx | 4 +- .../ImageConfigFieldset.tsx | 2 +- .../ImageConfigFieldset/InputSearch.tsx | 6 +- .../ImageConfigFieldset/RateLimits.tsx | 20 ++--- .../ImageConfigFieldset/SimpleForm.tsx | 24 +++--- .../ImageConfigFieldset/getImageConfig.ts | 8 +- .../components/ImageConfigFieldset/types.ts | 2 +- .../components/ImageConfigFieldset/utils.ts | 2 +- .../components/InlineLoader/InlineLoader.tsx | 2 +- .../components/InsightsBox/InsightsBox.tsx | 2 +- .../components/InsightsBox/insights-store.ts | 2 +- app/react/components/NavTabs/NavTabs.test.tsx | 2 +- app/react/components/NavTabs/NavTabs.tsx | 2 +- app/react/components/Note/Note.tsx | 4 +- .../PageHeader/Breadcrumbs/Breadcrumbs.tsx | 2 +- .../components/PageHeader/ContextHelp.tsx | 2 +- .../PageHeader/HeaderContainer.stories.tsx | 4 +- .../PageHeader/HeaderTitle.test.tsx | 8 +- .../components/PageHeader/HeaderTitle.tsx | 4 +- .../PageHeader/NotificationsMenu.tsx | 12 +-- .../PageHeader/PageHeader.stories.tsx | 4 +- .../components/PageHeader/PageHeader.test.tsx | 8 +- .../components/PageHeader/PageHeader.tsx | 2 +- app/react/components/PageHeader/UserMenu.tsx | 6 +- .../PaginationControls/PageInput.tsx | 4 +- app/react/components/PasswordCheckHint.tsx | 4 +- app/react/components/StatsItem.tsx | 2 +- app/react/components/StatusBadge.tsx | 2 +- .../components/Stepper/Stepper.stories.tsx | 2 +- app/react/components/Svg.tsx | 62 ++++++++-------- .../components/TLSFieldset/TLSFieldset.tsx | 8 +- app/react/components/TagButton/TagButton.tsx | 2 +- .../TagSelector/TagSelector.stories.tsx | 2 +- .../TagSelector/TagSelector.test.tsx | 8 +- .../components/TagSelector/TagSelector.tsx | 12 +-- .../TeamsSelector/TeamsSelector.mocks.ts | 2 +- .../TeamsSelector/TeamsSelector.tsx | 4 +- .../TerminalTooltip/TerminalTooltip.tsx | 4 +- app/react/components/Tip/TextTip/TextTip.tsx | 2 +- .../TooltipWithChildren.tsx | 4 +- .../UsersSelector/UsersSelector.mocks.ts | 2 +- .../UsersSelector/UsersSelector.tsx | 4 +- app/react/components/WebEditorForm.tsx | 2 +- app/react/components/Widget/WidgetIcon.tsx | 2 +- app/react/components/Widget/WidgetTabs.tsx | 4 +- .../components/buttons/AddButton.test.tsx | 2 +- app/react/components/buttons/AddButton.tsx | 4 +- app/react/components/buttons/Button.tsx | 4 +- .../buttons/CopyButton/CopyButton.tsx | 4 +- app/react/components/buttons/DeleteButton.tsx | 4 +- .../components/buttons/LoadingButton.tsx | 2 +- app/react/components/buttons/MenuButton.tsx | 4 +- .../components/datatables/ActionsMenu.tsx | 2 +- .../datatables/ColumnVisibilityMenu.tsx | 2 +- app/react/components/datatables/Datatable.tsx | 4 +- .../datatables/DatatableContent.tsx | 2 +- .../components/datatables/DatatableFooter.tsx | 2 +- .../components/datatables/DatatableHeader.tsx | 4 +- app/react/components/datatables/Filter.tsx | 4 +- .../components/datatables/NestedDatatable.tsx | 2 +- .../datatables/QuickActionsSettings.tsx | 4 +- app/react/components/datatables/SearchBar.tsx | 8 +- .../datatables/SelectedRowsCount.tsx | 2 +- app/react/components/datatables/Table.tsx | 2 +- .../components/datatables/TableContainer.tsx | 2 +- .../TableSettingsMenuAutoRefresh.tsx | 4 +- .../components/datatables/TableTitle.tsx | 2 +- .../components/datatables/buildNameColumn.tsx | 2 +- .../extend-options/withColumnFilters.ts | 2 +- .../components/datatables/select-column.tsx | 2 +- app/react/components/datatables/types.ts | 2 +- .../AutocompleteSelect/AutocompleteSelect.tsx | 6 +- .../ButtonSelector/ButtonSelector.tsx | 6 +- .../AdvancedMode.tsx | 8 +- .../EnvironmentVariablesPanel.tsx | 4 +- .../SimpleMode.tsx | 12 +-- .../StackEnvironmentVariablesPanel.tsx | 4 +- .../FileUpload/FileUploadField.tsx | 6 +- .../FileUpload/FileUploadForm.tsx | 6 +- .../form-components/FormActions.tsx | 4 +- .../FormControl/FormControl.tsx | 4 +- .../components/form-components/FormError.tsx | 2 +- .../FormSection/FormSection.tsx | 2 +- .../form-components/Input/Input.tsx | 2 +- .../form-components/Input/InputLabeled.tsx | 2 +- .../form-components/Input/Select.tsx | 2 +- .../form-components/Input/Textarea.tsx | 2 +- .../form-components/InputList/InputList.tsx | 8 +- .../form-components/PortainerSelect.tsx | 4 +- .../form-components/ReactSelect.test.tsx | 2 +- .../form-components/ReactSelect.tsx | 2 +- .../form-components/Slider/Slider.tsx | 2 +- .../form-components/SwitchField/Switch.tsx | 8 +- .../SwitchField/SwitchField.tsx | 6 +- app/react/components/modals/Dialog.tsx | 2 +- app/react/components/modals/SwitchPrompt.tsx | 4 +- app/react/components/modals/types.ts | 2 +- app/react/components/modals/utils.ts | 2 +- app/react/components/ui-router.test.tsx | 2 +- .../docker/DashboardView/ClusterAgentInfo.tsx | 6 +- .../DashboardView/ClusterVisualizerLink.tsx | 4 +- .../docker/DashboardView/ContainerStatus.tsx | 2 +- .../docker/DashboardView/DashboardView.tsx | 14 ++-- .../EnvironmentInfo.DockerInfo.tsx | 8 +- .../DashboardView/EnvironmentInfo.GpuInfo.tsx | 2 +- .../EnvironmentInfo.SnapshotStats.tsx | 6 +- .../EnvironmentInfo.TagsInfo.tsx | 4 +- .../docker/DashboardView/EnvironmentInfo.tsx | 12 +-- .../docker/DashboardView/ImagesTotalSize.tsx | 4 +- .../DashboardView/NonAgentSwarmInfo.tsx | 10 +-- .../docker/DashboardView/useDashboard.ts | 4 +- app/react/docker/agent/NodeSelector.tsx | 6 +- app/react/docker/agent/queries/build-url.ts | 2 +- .../docker/agent/queries/useAgentNodes.ts | 4 +- .../docker/agent/queries/useApiVersion.ts | 4 +- .../components/FilesTable/FilesTable.tsx | 14 ++-- .../FilesTable/columns/ActionsCell.tsx | 4 +- .../FilesTable/columns/NameCell.tsx | 6 +- .../components/FilesTable/columns/index.ts | 2 +- .../components/ImageStatus/ImageStatus.tsx | 10 +-- .../ImageStatus/PublishedPortLink.tsx | 2 +- .../docker/components/ImageStatus/helpers.ts | 6 +- .../ImageStatus/useImageNotification.ts | 8 +- .../TableColumnHeaderImageUpToDate.tsx | 18 ++--- .../datatable/createOwnershipColumn.tsx | 4 +- .../ConfigsDatatable.test.tsx | 14 ++-- .../ConfigsDatatable/ConfigsDatatable.tsx | 12 +-- .../DeleteConfigButton.test.tsx | 12 +-- .../ConfigsDatatable/DeleteConfigButton.tsx | 14 ++-- .../ListView/ConfigsDatatable/columns.tsx | 6 +- .../ListView/ConfigsDatatable/store.ts | 2 +- .../docker/configs/ListView/ListView.test.tsx | 14 ++-- .../docker/configs/ListView/ListView.tsx | 2 +- app/react/docker/configs/model.ts | 4 +- app/react/docker/configs/queries/build-url.ts | 4 +- .../docker/configs/queries/query-keys.ts | 4 +- app/react/docker/configs/queries/useConfig.ts | 4 +- .../docker/configs/queries/useConfigs.ts | 6 +- .../queries/useCreateConfigMutation.ts | 4 +- .../queries/useDeleteConfigMutation.ts | 4 +- app/react/docker/configs/types.ts | 2 +- .../CreateView/BaseForm/BaseForm.tsx | 33 ++++----- .../CreateView/BaseForm/NameField.tsx | 4 +- .../CreateView/BaseForm/PortsMappingField.tsx | 12 +-- .../CreateView/BaseForm/toViewModel.ts | 8 +- .../CreateView/BaseForm/validation.ts | 4 +- .../CapabilitiesTab/CapabilitiesTab.tsx | 4 +- .../CreateView/CapabilitiesTab/toRequest.ts | 2 +- .../CreateView/CapabilitiesTab/toViewModel.ts | 2 +- .../CreateView/CommandsTab/CommandsTab.tsx | 4 +- .../CommandsTab/ConsoleSettings.tsx | 4 +- .../CreateView/CommandsTab/LoggerConfig.tsx | 20 ++--- .../CommandsTab/OverridableInput.tsx | 4 +- .../CreateView/CommandsTab/toRequest.ts | 2 +- .../CreateView/CommandsTab/toViewModel.tsx | 2 +- .../containers/CreateView/CreateView.tsx | 28 +++---- .../CreateView/EnvVarsTab/EnvVarsTab.tsx | 4 +- .../containers/CreateView/EnvVarsTab/index.ts | 2 +- .../CreateView/EnvVarsTab/toRequest.ts | 4 +- .../CreateView/EnvVarsTab/toViewModel.ts | 2 +- .../containers/CreateView/InnerForm.tsx | 10 +-- .../containers/CreateView/LabelsTab/Item.tsx | 6 +- .../CreateView/LabelsTab/LabelsTab.tsx | 4 +- .../NetworkTab/ContainerSelector.tsx | 4 +- .../CreateView/NetworkTab/HostnameField.tsx | 4 +- .../NetworkTab/HostsFileEntries.tsx | 11 +-- .../CreateView/NetworkTab/NetworkTab.tsx | 8 +- .../CreateView/NetworkTab/toViewModel.test.ts | 2 +- .../CreateView/NetworkTab/toViewModel.ts | 2 +- .../CreateView/ResourcesTab/DevicesField.tsx | 6 +- .../ResourcesTab/EditResourceForm.tsx | 16 ++-- .../ResourcesTab/GpuFieldset/GpuFieldset.tsx | 8 +- .../ResourcesTab/ResourcesFieldset.tsx | 14 ++-- .../CreateView/ResourcesTab/ResourcesTab.tsx | 10 +-- .../ResourcesTab/RuntimeSection.tsx | 6 +- .../ResourcesTab/RuntimeSelector.tsx | 6 +- .../CreateView/ResourcesTab/SysctlsField.tsx | 6 +- .../RestartPolicyTab/RestartPolicyTab.tsx | 4 +- .../containers/CreateView/VolumesTab/Item.tsx | 12 +-- .../CreateView/VolumesTab/VolumeSelector.tsx | 8 +- .../CreateView/VolumesTab/VolumesTab.tsx | 8 +- .../docker/containers/CreateView/toRequest.ts | 4 +- .../CreateView/useCreateMutation.tsx | 20 ++--- .../containers/CreateView/useInitialValues.ts | 34 ++++----- .../containers/InspectView/InspectView.tsx | 14 ++-- .../ItemView/ConfirmRecreationModal.tsx | 8 +- .../ConnectNetworkForm.tsx | 10 +-- .../ContainerNetworksDatatable.tsx | 10 +-- .../ContainerNetworksDatatable/actions.tsx | 10 +-- .../ContainerNetworksDatatable/columns.tsx | 4 +- .../containers/ItemView/HealthStatus.tsx | 6 +- .../ContainersDatatable.tsx | 20 ++--- .../ContainersDatatableActions.tsx | 16 ++-- .../ContainersDatatableSettings.tsx | 4 +- .../ContainersDatatable/RowContext.ts | 4 +- .../ContainersDatatable/columns/created.tsx | 2 +- .../ContainersDatatable/columns/gpus.tsx | 6 +- .../ContainersDatatable/columns/image.tsx | 2 +- .../ContainersDatatable/columns/index.tsx | 4 +- .../ContainersDatatable/columns/name.tsx | 4 +- .../ContainersDatatable/columns/ports.tsx | 4 +- .../columns/quick-actions.tsx | 8 +- .../ContainersDatatable/columns/state.tsx | 6 +- .../ContainersDatatable/datatable-store.ts | 2 +- .../ListView/ContainersDatatable/types.ts | 2 +- .../docker/containers/ListView/ListView.tsx | 8 +- .../docker/containers/LogView/LogView.tsx | 8 +- .../StatsView/ProcessesDatatable.tsx | 8 +- .../common/confirm-container-delete-modal.ts | 6 +- .../ContainerQuickActions.tsx | 8 +- .../containers/components/NetworkSelector.tsx | 14 ++-- .../docker/containers/containers.service.ts | 6 +- app/react/docker/containers/queries/gpus.tsx | 4 +- .../docker/containers/queries/query-keys.ts | 2 +- .../docker/containers/queries/useContainer.ts | 10 +-- .../containers/queries/useContainerInspect.ts | 4 +- .../queries/useContainerResizeTTYMutation.ts | 4 +- .../containers/queries/useContainerStats.ts | 4 +- .../containers/queries/useContainerTop.ts | 4 +- .../containers/queries/useContainers.ts | 6 +- .../queries/useCreateExecMutation.ts | 4 +- .../containers/queries/useUpdateContainer.ts | 4 +- app/react/docker/containers/types.ts | 2 +- app/react/docker/containers/types/response.ts | 4 +- app/react/docker/containers/utils.ts | 6 +- app/react/docker/events/EventsDatatables.tsx | 8 +- app/react/docker/events/ListView.tsx | 4 +- .../host/BrowseView/AgentHostBrowser.tsx | 6 +- app/react/docker/host/SetupView/GpusList.tsx | 10 +-- .../images/ItemView/DockerfileDetails.tsx | 8 +- .../images/ItemView/RegistrySelectPrompt.tsx | 8 +- .../ImagesDatatable/ImagesDatatable.test.tsx | 14 ++-- .../ImagesDatatable/ImagesDatatable.tsx | 18 ++--- .../ImportExportButtons.test.tsx | 16 ++-- .../ImagesDatatable/ImportExportButtons.tsx | 8 +- .../ImagesDatatable/RemoveButtonMenu.tsx | 18 ++--- .../ImagesDatatable/columns/created.tsx | 2 +- .../ImagesDatatable/columns/helper.ts | 2 +- .../ListView/ImagesDatatable/columns/id.tsx | 12 +-- .../ListView/ImagesDatatable/columns/size.tsx | 2 +- .../ListView/ImagesDatatable/columns/tags.tsx | 4 +- .../docker/images/ListView/ListView.test.tsx | 6 +- app/react/docker/images/ListView/ListView.tsx | 2 +- .../ListView/PullImageFormWidget.Form.tsx | 6 +- .../ListView/PullImageFormWidget.test.tsx | 14 ++-- .../images/ListView/PullImageFormWidget.tsx | 10 +-- .../ListView/PullImageFormWidget.types.tsx | 2 +- .../PullImageFormWidget.validation.ts | 2 +- .../images/common/ConfirmExportModal.tsx | 6 +- app/react/docker/images/queries/queryKeys.ts | 2 +- .../images/queries/useBuildImageMutation.ts | 4 +- .../images/queries/useDeleteImageMutation.ts | 6 +- .../queries/useExportImageMutation.test.ts | 4 +- .../images/queries/useExportImageMutation.ts | 6 +- app/react/docker/images/queries/useImages.ts | 4 +- .../images/queries/usePullImageMutation.ts | 10 +-- .../images/queries/usePushImageMutation.ts | 6 +- app/react/docker/images/utils.ts | 4 +- .../MacvlanNodesSelector.tsx | 14 ++-- .../MacvlanNodesSelector/useColumns.ts | 2 +- .../networks/CreateView/macvlanOptions.tsx | 2 +- .../docker/networks/ItemView/ItemView.tsx | 16 ++-- .../ItemView/NetworkContainersTable.test.tsx | 10 +-- .../ItemView/NetworkContainersTable.tsx | 16 ++-- .../ItemView/NetworkDetailsTable.test.tsx | 8 +- .../networks/ItemView/NetworkDetailsTable.tsx | 10 +-- .../networks/ItemView/NetworkOptionsTable.tsx | 4 +- .../networks/ListView/NestedNetworksTable.tsx | 4 +- .../networks/ListView/NetworksDatatable.tsx | 20 ++--- .../docker/networks/ListView/columns/index.ts | 4 +- .../docker/networks/ListView/columns/name.tsx | 6 +- app/react/docker/networks/ListView/types.ts | 2 +- .../docker/networks/queries/queryKeys.ts | 2 +- .../queries/useConnectContainerMutation.ts | 6 +- .../queries/useCreateNetworkMutation.ts | 4 +- .../queries/useDeleteNetworkMutation.ts | 6 +- .../queries/useDisconnectContainerMutation.ts | 6 +- .../docker/networks/queries/useNetwork.ts | 6 +- .../docker/networks/queries/useNetworks.ts | 4 +- app/react/docker/networks/types.ts | 4 +- .../proxy/queries/buildDockerProxyUrl.ts | 2 +- .../docker/proxy/queries/images/queryKeys.ts | 2 +- .../proxy/queries/images/useDownloadImages.ts | 4 +- .../docker/proxy/queries/images/useImage.ts | 4 +- .../proxy/queries/images/useImageHistory.ts | 4 +- .../docker/proxy/queries/images/useImages.ts | 4 +- .../queries/images/useRemoveImageMutation.ts | 6 +- .../queries/images/useTagImageMutation.ts | 6 +- .../queries/images/useUploadImageMutation.ts | 4 +- .../docker/proxy/queries/nodes/query-keys.ts | 2 +- .../docker/proxy/queries/nodes/useNode.ts | 4 +- .../docker/proxy/queries/nodes/useNodes.ts | 4 +- .../queries/nodes/useUpdateNodeMutation.ts | 4 +- app/react/docker/proxy/queries/query-keys.ts | 2 +- .../secrets/useCreateSecretMutation.ts | 4 +- .../secrets/useRemoveSecretMutation.ts | 4 +- .../docker/proxy/queries/secrets/useSecret.ts | 6 +- .../proxy/queries/secrets/useSecrets.ts | 4 +- .../docker/proxy/queries/tasks/query-keys.ts | 2 +- .../docker/proxy/queries/tasks/useTasks.ts | 4 +- .../queries/useCommitContainerMutation.ts | 4 +- app/react/docker/proxy/queries/useEvents.ts | 4 +- .../proxy/queries/useExecResizeTTYMutation.ts | 4 +- app/react/docker/proxy/queries/useInfo.ts | 4 +- .../docker/proxy/queries/useIsSwarmAgent.ts | 6 +- app/react/docker/proxy/queries/usePing.ts | 4 +- app/react/docker/proxy/queries/usePlugins.ts | 4 +- app/react/docker/proxy/queries/useSwarm.ts | 4 +- app/react/docker/proxy/queries/useVersion.ts | 4 +- app/react/docker/proxy/queries/utils.ts | 4 +- .../docker/queries/utils/buildDockerUrl.ts | 2 +- app/react/docker/queries/utils/container.ts | 6 +- app/react/docker/queries/utils/root.ts | 2 +- .../secrets/ListView/SecretsDatatable.tsx | 22 +++--- .../PortMappingField/PortsMappingField.tsx | 14 ++-- .../PortMappingField/RangeOrNumberField.tsx | 6 +- .../ItemView/ServiceWidget.stories.tsx | 2 +- .../services/ItemView/ServiceWidget.tsx | 8 +- .../TasksDatatable/TasksDatatable.tsx | 12 +-- .../TasksDatatable/columns/actions.tsx | 10 +-- .../ItemView/TasksDatatable/columns/node.tsx | 4 +- .../TasksDatatable/columns/status.tsx | 6 +- .../ItemView/TasksDatatable/columns/task.tsx | 6 +- .../TasksDatatable/columns/updated.tsx | 2 +- .../services/ItemView/TasksDatatable/types.ts | 4 +- .../ServicesDatatable/ServicesDatatable.tsx | 24 +++--- .../ServicesDatatable/TableActions.tsx | 12 +-- .../ServicesDatatable/TableSettings.tsx | 8 +- .../TasksDatatable/TasksDatatable.tsx | 14 ++-- .../TasksDatatable/task-column.tsx | 10 +-- .../ServicesDatatable/columns/helper.ts | 2 +- .../ServicesDatatable/columns/image.tsx | 12 +-- .../ServicesDatatable/columns/index.ts | 10 +-- .../ServicesDatatable/columns/ports.tsx | 6 +- .../columns/schedulingMode/ScaleForm.tsx | 12 +-- .../schedulingMode/ScaleServiceButton.tsx | 6 +- .../schedulingMode/constraint-helper.ts | 2 +- .../columns/schedulingMode/schedulingMode.tsx | 8 +- .../ListView/ServicesDatatable/types.ts | 2 +- .../useForceUpdateServicesMutation.ts | 8 +- .../useRemoveServicesMutation.ts | 8 +- .../services/common/TaskTableQuickActions.tsx | 6 +- .../services/common/update-service-modal.ts | 6 +- .../docker/services/queries/build-url.ts | 2 +- .../docker/services/queries/query-keys.ts | 2 +- .../queries/useCreateServiceMutation.ts | 6 +- .../docker/services/queries/useService.ts | 12 +-- .../docker/services/queries/useServiceLogs.ts | 8 +- .../docker/services/queries/useServices.ts | 10 +-- .../queries/useUpdateServiceMutation.ts | 6 +- .../docker/services/webhooks/getWebhooks.ts | 4 +- .../docker/services/webhooks/removeWebhook.ts | 6 +- app/react/docker/services/webhooks/types.ts | 4 +- app/react/docker/snapshots/types/index.ts | 2 +- app/react/docker/stacks/ItemView/ItemView.tsx | 20 ++--- .../ItemView/StackContainersDatatable.tsx | 24 +++--- .../docker/stacks/ItemView/StackDetails.tsx | 12 +-- .../StackEditorTab/StackEditorTab.test.tsx | 27 +++---- .../StackEditorTab/StackEditorTab.tsx | 15 ++-- .../StackEditorTab/StackEditorTab.types.ts | 2 +- .../StackEditorTab.validation.ts | 2 +- .../StackEditorTabInner.test.tsx | 18 ++--- .../StackEditorTab/StackEditorTabInner.tsx | 20 ++--- .../StackEditorTab/WebhookFieldset.tsx | 12 +-- .../useVersionedStackFile.test.tsx | 4 +- .../StackEditorTab/useVersionedStackFile.tsx | 4 +- .../StackInfoTab/AssociateStackForm.test.tsx | 16 ++-- .../StackInfoTab/AssociateStackForm.tsx | 20 ++--- .../ItemView/StackInfoTab/StackActions.tsx | 21 +++--- .../StackDuplicationForm/EnvSelector.test.tsx | 8 +- .../StackDuplicationForm/EnvSelector.tsx | 12 +-- .../StackDuplicationForm.test.tsx | 12 +-- .../StackDuplicationForm.tsx | 21 +++--- .../StackDuplicationForm.validation.ts | 4 +- .../StackDuplicationFormInner.test.tsx | 8 +- .../StackDuplicationFormInner.tsx | 10 +-- .../useDuplicateStackMutation.test.tsx | 2 +- .../useDuplicateStackMutation.ts | 6 +- .../useMigrateStackMutation.test.tsx | 2 +- .../useMigrateStackMutation.ts | 6 +- .../StackInfoTab/StackInfoTab.test.tsx | 12 +-- .../ItemView/StackInfoTab/StackInfoTab.tsx | 10 +-- .../StackRedeployGitForm/ActionsSection.tsx | 4 +- .../AdvancedConfigurationSection.tsx | 16 ++-- .../StackRedeployGitForm/InnerForm.tsx | 18 ++--- .../StackRedeployGitForm/OptionsSection.tsx | 6 +- .../StackRedeployGitForm.test.tsx | 55 +++++++------- .../StackRedeployGitForm.tsx | 21 ++---- .../TLSVerificationField.tsx | 4 +- .../StackRedeployGitForm/types.ts | 7 +- .../useValidationSchema.ts | 10 +-- ...sociateStackToEnvironmentMutation.test.tsx | 8 +- .../useAssociateStackToEnvironmentMutation.ts | 14 ++-- .../StackInfoTab/useStartStackMutation.ts | 6 +- .../StackInfoTab/useStopStackMutation.ts | 6 +- .../ItemView/useComposeStackContainers.ts | 4 +- .../stacks/ItemView/useSwarmStackServices.ts | 26 +++---- .../StacksDatatable/StacksDatatable.tsx | 16 ++-- .../ListView/StacksDatatable/TableActions.tsx | 6 +- .../StacksDatatable/TableSettingsMenus.tsx | 10 +-- .../columns/StackImageStatus.tsx | 8 +- .../StacksDatatable/columns/control.tsx | 6 +- .../columns/getStackImagesStatus.ts | 4 +- .../columns/image-notification.tsx | 6 +- .../ListView/StacksDatatable/columns/index.ts | 6 +- .../ListView/StacksDatatable/columns/name.tsx | 12 +-- .../stacks/ListView/StacksDatatable/store.ts | 4 +- app/react/docker/stacks/useUpdateStack.ts | 10 +-- .../stacks/view-models/external-stack.ts | 4 +- app/react/docker/stacks/view-models/stack.ts | 10 +-- .../NodesDatatable/NodesDatatable.tsx | 16 ++-- .../NodesDatatable/columns/availability.tsx | 2 +- .../NodesDatatable/columns/column-helper.ts | 2 +- .../SwarmView/NodesDatatable/columns/index.ts | 2 +- .../SwarmView/NodesDatatable/columns/name.tsx | 4 +- .../NodesDatatable/columns/status.tsx | 2 +- .../swarm/SwarmView/NodesDatatable/types.ts | 2 +- app/react/docker/tasks/queries/query-keys.ts | 2 +- app/react/docker/tasks/queries/useTask.ts | 10 +-- app/react/docker/tasks/queries/useTaskLogs.ts | 6 +- app/react/docker/types.ts | 2 +- .../volumes/BrowseView/AgentVolumeBrowser.tsx | 6 +- .../VolumesDatatable/TableActions.tsx | 6 +- .../VolumesDatatable/VolumesDatatable.tsx | 16 ++-- .../VolumesDatatable/columns/index.ts | 8 +- .../VolumesDatatable/columns/name.tsx | 14 ++-- .../ListView/VolumesDatatable/tableMeta.ts | 2 +- app/react/docker/volumes/ListView/types.ts | 2 +- app/react/docker/volumes/queries/build-url.ts | 4 +- .../docker/volumes/queries/query-keys.ts | 2 +- .../docker/volumes/queries/useCreateVolume.ts | 4 +- .../queries/useCreateVolumeMutation.ts | 4 +- .../queries/useRemoveVolumeMutation.ts | 4 +- app/react/docker/volumes/queries/useVolume.ts | 4 +- .../docker/volumes/queries/useVolumes.ts | 6 +- .../AssociatedEdgeEnvironmentsSelector.tsx | 11 +-- ...ssociatedEdgeGroupEnvironmentsSelector.tsx | 6 +- .../components/EdgeAsyncIntervalsForm.tsx | 4 +- .../components/EdgeCheckInIntervalField.tsx | 4 +- .../EdgeEnvironmentsAssociationTable.tsx | 16 ++-- .../components/EdgeGroupAssociationTable.tsx | 18 ++--- .../EdgeScriptSettingsFieldset.tsx | 12 +-- .../components/EdgeScriptForm/OsSelector.tsx | 6 +- .../components/EdgeScriptForm/ScriptTabs.tsx | 10 +-- .../edge/components/EdgeScriptForm/scripts.ts | 2 +- .../edge/components/EdgeScriptForm/types.ts | 4 +- .../associationTableColumnHelper.tsx | 2 +- .../edge/components/useIntervalOptions.ts | 2 +- .../AssignmentDialog/AssignmentDialog.tsx | 18 ++--- .../Selectors/CreatableSelector.tsx | 4 +- .../Selectors/EdgeGroupSelector.tsx | 6 +- .../Selectors/GroupSelector.tsx | 10 +-- .../Selectors/TagSelector.tsx | 4 +- .../AssignmentDialog/createPayload.tsx | 2 +- .../Datatable/AssignmentDialog/types.ts | 6 +- .../Datatable/AssignmentDialog/utils.ts | 2 +- .../WaitingRoomView/Datatable/Datatable.tsx | 6 +- .../WaitingRoomView/Datatable/Filter.tsx | 10 +-- .../Datatable/TableActions.tsx | 18 ++--- .../WaitingRoomView/Datatable/filter-store.ts | 2 +- .../Datatable/useEnvironments.ts | 12 +-- .../WaitingRoomView/WaitingRoomView.tsx | 12 +-- .../edge-devices/WaitingRoomView/queries.ts | 21 +++--- .../edge-devices/WaitingRoomView/types.ts | 2 +- .../edge-devices/open-amt/useAMTDevices.tsx | 6 +- .../open-amt/useActivateDevicesMutation.ts | 8 +- .../useExecuteAMTDeviceActionMutation.tsx | 6 +- .../edge-groups/CreateView/CreateView.tsx | 6 +- .../edge/edge-groups/ItemView/ItemView.tsx | 8 +- .../ListView/EdgeGroupsDatatable.tsx | 6 +- .../edge/edge-groups/ListView/ListView.tsx | 2 +- .../edge-groups/ListView/TableActions.tsx | 6 +- .../edge-groups/ListView/columns/name.tsx | 4 +- .../ListView/useDeleteEdgeGroupMutation.ts | 6 +- .../EdgeGroupForm/DynamicGroupFieldset.tsx | 10 +-- .../EdgeGroupForm/EdgeGroupForm.tsx | 6 +- .../components/EdgeGroupForm/NameField.tsx | 4 +- .../EdgeGroupForm/StaticGroupFieldset.tsx | 8 +- .../EdgeGroupForm/group-type-options.tsx | 2 +- .../components/EdgeGroupForm/tag-options.tsx | 2 +- .../components/EdgeGroupForm/types.tsx | 4 +- .../queries/useCreateEdgeGroupMutation.ts | 8 +- .../edge/edge-groups/queries/useEdgeGroup.ts | 6 +- .../edge/edge-groups/queries/useEdgeGroups.ts | 4 +- .../queries/useUpdateEdgeGroupMutation.ts | 8 +- app/react/edge/edge-groups/types.ts | 4 +- .../CreateView/CreateEdgeJobForm.tsx | 18 ++--- .../edge/edge-jobs/CreateView/CreateView.tsx | 4 +- app/react/edge/edge-jobs/CreateView/types.ts | 4 +- .../edge-jobs/CreateView/useValidation.ts | 2 +- .../edge/edge-jobs/ItemView/ItemView.tsx | 10 +-- .../ResultsDatatable/ResultsDatatable.tsx | 10 +-- .../ItemView/ResultsDatatable/columns.tsx | 4 +- .../ResultsDatatable/datatable-store.ts | 2 +- .../UpdateEdgeJobForm/UpdateEdgeJobForm.tsx | 12 +-- .../ItemView/UpdateEdgeJobForm/types.ts | 4 +- .../edge-jobs/ListView/EdgeJobsDatatable.tsx | 6 +- .../edge/edge-jobs/ListView/ListView.tsx | 4 +- .../edge/edge-jobs/ListView/TableActions.tsx | 6 +- app/react/edge/edge-jobs/ListView/columns.ts | 4 +- .../ListView/useDeleteEdgeJobsMutation.ts | 6 +- .../EdgeJobForm/AdvancedCronFieldset.tsx | 4 +- .../EdgeJobForm/BasicCronFieldset.tsx | 2 +- .../EdgeJobForm/JobConfigurationFieldset.tsx | 4 +- .../components/EdgeJobForm/NameField.tsx | 4 +- .../EdgeJobForm/RecurringFieldset.tsx | 4 +- .../EdgeJobForm/ScheduledDateFieldset.tsx | 2 +- .../components/EdgeJobForm/TimeTip.tsx | 2 +- .../edge-jobs/queries/jobResults/build-url.ts | 2 +- .../jobResults/useClearLogsMutation.ts | 6 +- .../jobResults/useCollectLogsMutation.ts | 6 +- .../jobResults/useDownloadLogsMutation.ts | 6 +- .../queries/jobResults/useJobResults.ts | 6 +- .../createJobFromFile.ts | 6 +- .../createJobFromFileContent.ts | 6 +- .../useCreateEdgeJobMutation.ts | 6 +- .../edge/edge-jobs/queries/useEdgeJob.ts | 4 +- .../edge/edge-jobs/queries/useEdgeJobFile.ts | 4 +- .../edge/edge-jobs/queries/useEdgeJobs.ts | 2 +- .../queries/useUpdateEdgeJobMutation.tsx | 6 +- app/react/edge/edge-jobs/types.ts | 2 +- .../edge-stacks/CreateView/CreateForm.tsx | 22 +++--- .../CreateView/CreateForm.validation.ts | 20 ++--- .../edge-stacks/CreateView/CreateView.tsx | 2 +- .../CreateView/DeploymentOptions.tsx | 2 +- .../CreateView/DockerComposeForm.tsx | 18 ++--- .../CreateView/DockerContentField.tsx | 6 +- .../edge/edge-stacks/CreateView/InnerForm.tsx | 10 +-- .../CreateView/KubeManifestForm.tsx | 20 ++--- .../edge/edge-stacks/CreateView/NameField.tsx | 8 +- .../AppTemplateFieldset.test.tsx | 8 +- .../TemplateFieldset/AppTemplateFieldset.tsx | 8 +- .../CustomTemplateFieldset.tsx | 10 +-- .../TemplateFieldset/TemplateFieldset.tsx | 6 +- .../TemplateSelector.test.tsx | 12 +-- .../TemplateFieldset/TemplateSelector.tsx | 16 ++-- .../CreateView/TemplateFieldset/types.ts | 4 +- .../TemplateFieldset/validation.tsx | 8 +- .../edge-stacks/CreateView/WebhookSwitch.tsx | 4 +- .../CreateView/tests/app-templates.test.tsx | 6 +- .../tests/custom-templates.test.tsx | 6 +- .../CreateView/tests/utils.test.tsx | 12 +-- .../edge/edge-stacks/CreateView/types.ts | 6 +- .../edge/edge-stacks/CreateView/useCreate.tsx | 12 +-- .../CreateView/useRenderAppTemplate.tsx | 8 +- .../CreateView/useRenderCustomTemplate.tsx | 12 +-- .../CreateView/useTemplateParams.tsx | 2 +- .../EditEdgeStackForm/ComposeForm.tsx | 6 +- .../EditEdgeStackForm/EditEdgeStackForm.tsx | 2 +- .../EditEdgeStackForm/GitForm/GitForm.tsx | 52 ++++++------- .../GitForm/useUpdateEdgeStackGitMutation.ts | 14 ++-- .../EditEdgeStackForm/KubernetesForm.tsx | 4 +- .../EditEdgeStackForm/NonGitStackForm.tsx | 32 ++++---- .../PrivateRegistryFieldsetWrapper.tsx | 8 +- .../ItemView/EditEdgeStackForm/types.ts | 9 +-- .../useAllowKubeToSelectCompose.ts | 4 +- .../EditEdgeStackForm/useEdgeGroupHasType.ts | 6 +- .../useStaggerUpdateStatus.ts | 4 +- .../useUpdateEdgeStackMutation.ts | 14 ++-- .../EnvironmentsDatatable/ActionStatus.tsx | 2 +- .../EnvironmentActions.tsx | 8 +- .../EnvironmentsDatatable.tsx | 18 ++--- .../EnvironmentsDatatable/LogsActions.tsx | 8 +- .../EnvironmentsDatatable/columns.tsx | 18 ++--- .../ItemView/EnvironmentsDatatable/types.ts | 2 +- .../useCollectLogsMutation.ts | 6 +- .../useDeleteLogsMutation.ts | 6 +- .../useDownloadLogsMutation.ts | 6 +- .../EnvironmentsDatatable/useLogsStatus.ts | 6 +- .../edge/edge-stacks/ItemView/ItemView.tsx | 12 +-- .../EdgeStacksDatatable/DeploymentCounter.tsx | 4 +- .../EdgeStacksDatatable.tsx | 6 +- .../EdgeStacksDatatable/EdgeStacksStatus.tsx | 4 +- .../EdgeStacksDatatable/TableActions.tsx | 6 +- .../TableSettingsMenus.tsx | 6 +- .../ListView/EdgeStacksDatatable/columns.tsx | 12 +-- .../ListView/EdgeStacksDatatable/store.ts | 2 +- .../useDeleteEdgeStacksMutation.ts | 6 +- .../edge/edge-stacks/ListView/ListView.tsx | 2 +- .../components/EdgeGroupsSelector.tsx | 12 +-- .../EdgeStackDeploymentTypeSelector.tsx | 8 +- .../edge-stacks/components/PrePullToggle.tsx | 2 +- .../PrivateRegistryFieldset.test.tsx | 4 +- .../components/PrivateRegistryFieldset.tsx | 16 ++-- .../components/RetryDeployToggle.tsx | 2 +- .../components/StaggerFieldset.tsx | 12 +-- .../components/StaggerParallelFieldset.tsx | 4 +- .../useCreateEdgeStack/createStackFromFile.ts | 8 +- .../createStackFromFileContent.ts | 8 +- .../useCreateEdgeStack/createStackFromGit.ts | 10 +-- .../useCreateEdgeStack/useCreateEdgeStack.ts | 12 +-- .../edge/edge-stacks/queries/useEdgeStack.ts | 4 +- .../edge-stacks/queries/useEdgeStackFile.ts | 2 +- .../edge/edge-stacks/queries/useEdgeStacks.ts | 4 +- .../edge-stacks/queries/useParseRegistries.ts | 4 +- app/react/edge/edge-stacks/types.ts | 8 +- app/react/edge/edge-stacks/utils.test.ts | 2 +- app/react/edge/edge-stacks/utils.ts | 2 +- app/react/hooks/current-environment-store.ts | 2 +- app/react/hooks/useCurrentEnvironment.ts | 2 +- app/react/hooks/useEnvironmentId.ts | 2 +- app/react/hooks/useInfoPanelState.tsx | 2 +- .../hooks/useIsDeploymentOptionHidden.ts | 2 +- app/react/hooks/useLimitToBE.tsx | 2 +- app/react/hooks/useUIState.tsx | 2 +- app/react/hooks/useUser.tsx | 8 +- .../DeployView/StackName/StackName.tsx | 12 +-- .../StackName/StackNameLabelInsight.tsx | 6 +- .../annotations/AnnotationsBeTeaser.tsx | 6 +- .../annotations/AnnotationsForm.tsx | 6 +- .../kubernetes/annotations/validation.ts | 2 +- .../applications/ConsoleView/ConsoleView.tsx | 16 ++-- .../DataAccessPolicyFormSection.tsx | 6 +- .../CreateView/UpdateIngressPrompt.tsx | 6 +- .../application-services/KubeServicesForm.tsx | 6 +- .../PublishingExplaination.tsx | 4 +- .../cluster-ip/ClusterIpServiceForm.tsx | 12 +-- .../cluster-ip/ClusterIpServicesForm.tsx | 6 +- .../components/ContainerPortInput.tsx | 2 +- .../components/ServicePortInput.tsx | 2 +- .../components/ServiceTabLabel.tsx | 4 +- .../ingress/AppIngressPathForm.tsx | 12 +-- .../ingress/AppIngressPathsForm.tsx | 16 ++-- .../kubeServicesValidation.ts | 2 +- .../load-balancer/LoadBalancerServiceForm.tsx | 14 ++-- .../LoadBalancerServicesForm.tsx | 16 ++-- .../node-port/NodePortServiceForm.tsx | 14 ++-- .../node-port/NodePortServicesForm.tsx | 6 +- .../CreateView/application-services/utils.ts | 2 +- .../AppYAMLEditor/ApplicationYAMLEditor.tsx | 6 +- .../AppYAMLEditor/useApplicationYAML.ts | 2 +- .../ApplicationContainersDatatable.tsx | 12 +-- .../columns/actions.tsx | 6 +- .../columns/creationDate.tsx | 2 +- .../columns/name.tsx | 6 +- .../columns/node.tsx | 4 +- .../columns/status.tsx | 6 +- .../ApplicationContainersDatatable/types.ts | 2 +- .../DetailsView/ApplicationDetailsView.tsx | 12 +-- .../ApplicationAutoScalingTable.tsx | 8 +- .../ApplicationDetailsWidget.tsx | 12 +-- .../ApplicationEnvVarsTable.test.tsx | 6 +- .../ApplicationEnvVarsTable.tsx | 6 +- .../ApplicationIngressesTable.tsx | 10 +-- .../ApplicationPersistentDataTable.tsx | 10 +-- .../ApplicationServicesTable.tsx | 8 +- .../ApplicationVolumeConfigsTable.test.tsx | 4 +- .../ApplicationVolumeConfigsTable.tsx | 4 +- .../PlacementsTable.tsx | 4 +- .../RedeployApplicationButton.tsx | 19 ++--- .../RestartApplicationButton.tsx | 4 +- .../RollbackApplicationButton.tsx | 23 +++--- .../ApplicationEventsDatatable.tsx | 6 +- .../DetailsView/ApplicationSummaryWidget.tsx | 29 ++++---- .../PlacementsDatatable.tsx | 10 +-- .../PlacementsDatatableSubRow.tsx | 4 +- .../PlacementsDatatable/columns/index.tsx | 2 +- .../PlacementsDatatable/columns/status.tsx | 2 +- .../usePlacementTableData.tsx | 8 +- .../applications/DetailsView/types.ts | 2 +- .../useApplicationEventsTableData.tsx | 4 +- .../ApplicationsDatatable.test.tsx | 20 ++--- .../ApplicationsDatatable.tsx | 28 +++---- .../ConfigurationDetails.tsx | 2 +- .../ApplicationsDatatable/EdgeStackBadge.tsx | 2 +- .../ApplicationsDatatable/HelmInsightsBox.tsx | 2 +- .../ApplicationsDatatable/InnerTable.test.tsx | 6 +- .../ApplicationsDatatable/InnerTable.tsx | 2 +- .../ApplicationsDatatable/PublishedPorts.tsx | 4 +- .../SensitiveDetails.tsx | 4 +- .../ListView/ApplicationsDatatable/SubRow.tsx | 2 +- .../ApplicationsDatatable/columns.name.tsx | 10 +-- .../ApplicationsDatatable/columns.status.tsx | 4 +- .../ApplicationsDatatable/columns.tsx | 12 +-- .../ApplicationsDatatable/useColumns.tsx | 2 +- .../ApplicationsStacksDatatable.tsx | 20 ++--- .../NamespaceFilter.tsx | 8 +- .../ApplicationsStacksDatatable/SubRows.tsx | 8 +- .../ApplicationsStacksDatatable/columns.tsx | 10 +-- .../ListView/ApplicationsView.tsx | 6 +- .../ListView/useKubeAppsTableStore.ts | 6 +- .../AppDeploymentTypeFormSection.tsx | 8 +- .../ApplicationSummarySection.tsx | 4 +- .../ApplicationSummarySection/utils.ts | 2 +- .../AutoScalingFormSection.tsx | 14 ++-- .../autoScalingValidation.ts | 2 +- .../ConfigMapsFormSection.tsx | 12 +-- .../ConfigurationItem.tsx | 14 ++-- .../ConfigurationKey.tsx | 8 +- .../SecretsFormSection.tsx | 12 +-- .../components/EditYamlFormSection.tsx | 10 +-- .../EnvironmentVariablesFormSection.tsx | 6 +- .../kubeEnvVarValidationSchema.ts | 4 +- .../NameFormSection/NameFormSection.tsx | 4 +- .../NamespaceSelector/NamespaceSelector.tsx | 8 +- .../PersistedFolderItem.tsx | 18 ++--- .../PersistedFoldersFormSection.tsx | 14 ++-- .../persistedFoldersValidation.ts | 4 +- .../PersistedFoldersFormSection/types.ts | 2 +- .../PlacementFormSection.tsx | 10 +-- .../PlacementFormSection/PlacementItem.tsx | 8 +- .../PlacementTypeBoxSelector.tsx | 2 +- .../ReplicationFormSection.tsx | 6 +- .../replicationValidation.ts | 2 +- .../ResourceReservationFormSection.tsx | 12 +-- .../resourceReservationValidation.ts | 4 +- .../applications/queries/getPods.ts | 4 +- .../applications/queries/query-keys.ts | 2 +- .../queries/useAppStackFile.test.tsx | 4 +- .../applications/queries/useAppStackFile.ts | 6 +- .../applications/queries/useApplication.ts | 8 +- .../useApplicationHorizontalPodAutoscaler.ts | 6 +- .../queries/useApplicationPods.ts | 4 +- .../queries/useApplicationRevisionList.ts | 6 +- .../queries/useApplicationServices.ts | 4 +- .../applications/queries/useApplications.ts | 6 +- .../queries/useDeleteApplicationsMutation.ts | 17 ++--- .../queries/useHorizontalPodAutoScaler.ts | 6 +- .../queries/usePatchApplicationMutation.ts | 6 +- .../queries/useRedeployApplicationMutation.ts | 6 +- app/react/kubernetes/applications/types.ts | 2 +- .../kubernetes/applications/useCronJobs.ts | 6 +- app/react/kubernetes/applications/useJobs.ts | 6 +- app/react/kubernetes/applications/utils.ts | 2 +- app/react/kubernetes/axiosError.ts | 2 +- .../ClusterResourceReservation.test.tsx | 12 +-- .../ClusterResourceReservation.tsx | 4 +- .../cluster/ClusterView/ClusterView.tsx | 6 +- .../queries/useClusterResourceLimitsQuery.ts | 6 +- .../useClusterResourceReservationQuery.ts | 6 +- .../queries/useClusterResourceUsageQuery.ts | 10 +-- .../useClusterResourceReservationData.tsx | 8 +- .../ConfigureForm/ConfigureForm.tsx | 24 +++--- .../ConfigureForm/EnableMetricsInput.tsx | 10 +-- .../ConfigureView/ConfigureForm/RBACAlert.tsx | 2 +- .../StorageAccessModeSelector.tsx | 2 +- .../ConfigureForm/StorageClassDatatable.tsx | 4 +- .../handleSubmitConfigureCluster.ts | 9 +-- .../useConfigureClusterMutation.ts | 8 +- .../ConfigureForm/useStorageClasses.ts | 6 +- .../ConfigureView/ConfigureForm/validation.ts | 2 +- .../cluster/ConfigureView/ConfigureView.tsx | 8 +- .../NodesDatatable/NodesDatatable.tsx | 14 ++-- .../NodesDatatable/columns/actions.tsx | 4 +- .../NodesDatatable/columns/conditions.tsx | 4 +- .../HomeView/NodesDatatable/columns/cpu.tsx | 2 +- .../NodesDatatable/columns/memory.tsx | 2 +- .../HomeView/NodesDatatable/columns/name.tsx | 6 +- .../NodesDatatable/columns/status.tsx | 2 +- .../KubectlShell/KubectlShellView.test.tsx | 12 +-- .../cluster/KubectlShell/KubectlShellView.tsx | 14 ++-- .../cluster/NodeView/ConfirmUpdateNode.tsx | 6 +- .../NodeApplicationsDatatable.tsx | 14 ++-- .../columns.helper.tsx | 2 +- .../columns.name.tsx | 12 +-- .../NodeApplicationsDatatable/columns.tsx | 8 +- .../NodeApplicationsDatatable/types.ts | 2 +- .../NodeView/NodeDetails/NodeDetails.test.tsx | 18 ++--- .../NodeView/NodeDetails/NodeDetails.tsx | 18 ++--- .../NodeView/NodeDetails/NodeLabels.tsx | 14 ++-- .../NodeDetails/NodeResourceReservation.tsx | 12 +-- .../NodeView/NodeDetails/NodeSummary.tsx | 14 ++-- .../NodeView/NodeDetails/NodeTaints.tsx | 14 ++-- .../NodeView/NodeDetails/validation.ts | 2 +- .../cluster/NodeView/NodeView.test.tsx | 12 +-- .../kubernetes/cluster/NodeView/NodeView.tsx | 12 +-- .../NodeView/NodeYamlInspector.test.tsx | 8 +- .../cluster/NodeView/NodeYamlInspector.tsx | 2 +- .../RegistryAccessView/AccessTable.test.tsx | 4 +- .../RegistryAccessView/AccessTable.tsx | 8 +- .../RegistryAccessView/NamespacesSelector.tsx | 2 +- .../IngressClassDatatable.tsx | 18 ++--- .../IngressClassDatatableAngular.tsx | 18 ++--- .../IngressClassDatatable/RowContext.tsx | 4 +- .../columns/availability.tsx | 4 +- .../IngressClassDatatable/columns/name.tsx | 2 +- .../IngressClassDatatable/types.ts | 2 +- .../useIngressControllerClassMap.ts | 8 +- .../ingressClass/ingressClass.service.ts | 4 +- .../useIngressControllerClassMap.ts | 6 +- .../cluster/kubernetesEndpoint.service.ts | 6 +- app/react/kubernetes/cluster/nodeUtils.ts | 2 +- .../cluster/queries/useDrainNodeMutation.ts | 6 +- .../cluster/queries/useNodeQuery.ts | 6 +- .../cluster/queries/useNodesQuery.ts | 6 +- .../cluster/queries/useUpdateNodeMutation.ts | 6 +- .../kubernetes/cluster/useIsRBACEnabled.ts | 6 +- .../components/CreateFromManifestButton.tsx | 6 +- .../EventsDatatable/EventsDatatable.test.tsx | 12 +-- .../EventsDatatable/EventsDatatable.tsx | 12 +-- .../ResourceEventsDatatable.tsx | 6 +- .../EventsDatatable/columns/date.tsx | 2 +- .../EventsDatatable/columns/eventType.tsx | 6 +- .../EventsDatatable/columns/helper.ts | 2 +- .../EventsDatatable/columns/kind.tsx | 4 +- .../IntegratedAppsDatatable.tsx | 12 +-- .../IntegratedAppsDatatable/columns.name.tsx | 2 +- .../IntegratedAppsDatatable/columns.tsx | 2 +- .../IntegratedAppsDatatable/types.ts | 2 +- .../components/ResourceReservation.tsx | 10 +-- .../components/ResourceUsageItem.tsx | 4 +- .../kubernetes/components/YAMLInspector.tsx | 14 ++-- .../components/YamlInspector.test.tsx | 16 ++-- .../kubernetes/configs/CreateView/options.tsx | 4 +- .../ConfigMapsDatatable.tsx | 30 ++++---- .../ConfigMapsDatatable/columns/created.tsx | 2 +- .../ConfigMapsDatatable/columns/name.tsx | 10 +-- .../ConfigMapsDatatable/columns/namespace.tsx | 4 +- .../ListView/ConfigmapsAndSecretsView.tsx | 4 +- .../SecretsDatatable/SecretsDatatable.tsx | 30 ++++---- .../SecretsDatatable/columns/created.tsx | 2 +- .../SecretsDatatable/columns/name.tsx | 10 +-- .../SecretsDatatable/columns/namespace.tsx | 4 +- .../configs/RestrictedSecretBadge.tsx | 4 +- .../kubernetes/configs/configmap.service.ts | 12 +-- .../kubernetes/configs/queries/query-keys.ts | 2 +- .../configs/queries/useConfigMap.ts | 4 +- .../configs/queries/useConfigMaps.ts | 6 +- .../queries/useConfigmapsForCluster.ts | 6 +- .../configs/queries/useDeleteConfigMaps.ts | 12 +-- .../configs/queries/useDeleteSecrets.ts | 12 +-- .../configs/queries/useK8sConfigMaps.ts | 6 +- .../configs/queries/useK8sSecrets.ts | 6 +- .../kubernetes/configs/queries/useSecrets.ts | 6 +- .../configs/queries/useSecretsForCluster.ts | 6 +- .../queries/useUpdateK8sConfigMapMutation.ts | 6 +- .../kubernetes/dashboard/DashboardView.tsx | 10 +-- .../kubernetes/dashboard/EnvironmentInfo.tsx | 10 +-- .../queries/getApplicationsCountQuery.ts | 6 +- .../queries/getConfigMapsCountQuery.ts | 6 +- .../queries/getIngressesCountQuery.ts | 6 +- .../queries/getNamespacesCountQuery.ts | 6 +- .../dashboard/queries/getSecretsCountQuery.ts | 6 +- .../queries/getServicesCountQuery.ts | 6 +- .../dashboard/queries/getVolumesCountQuery.ts | 6 +- .../datatables/DefaultDatatableSettings.tsx | 4 +- .../datatables/SystemResourceDescription.tsx | 4 +- .../datatables/SystemResourcesSettings.tsx | 6 +- .../default-kube-datatable-store.ts | 4 +- .../ChartActions/ChartActions.tsx | 2 +- .../ChartActions/RollbackButton.test.tsx | 14 ++-- .../ChartActions/RollbackButton.tsx | 12 +-- .../ChartActions/UninstallButton.tsx | 6 +- .../ChartActions/UpgradeButton.test.tsx | 8 +- .../ChartActions/UpgradeButton.tsx | 14 ++-- .../ChartActions/UpgradeHelmModal.tsx | 24 +++--- .../HelmApplicationView.test.tsx | 16 ++-- .../HelmApplicationView.tsx | 16 ++-- .../HelmRevisionItem.test.tsx | 4 +- .../HelmApplicationView/HelmRevisionItem.tsx | 8 +- .../HelmApplicationView/HelmRevisionList.tsx | 2 +- .../HelmRevisionListSheet.tsx | 4 +- .../helm/HelmApplicationView/HelmSummary.tsx | 8 +- .../ReleaseDetails/DiffControl.test.tsx | 2 +- .../ReleaseDetails/DiffControl.tsx | 8 +- .../ReleaseDetails/DiffViewSection.tsx | 8 +- .../HelmEventsDatatable.test.tsx | 16 ++-- .../ReleaseDetails/HelmEventsDatatable.tsx | 16 ++-- .../ReleaseDetails/ManifestDetails.tsx | 2 +- .../ReleaseDetails/ReleaseTabs.tsx | 10 +-- .../ResourcesTable/DescribeModal.test.tsx | 4 +- .../ResourcesTable/DescribeModal.tsx | 12 +-- .../ResourcesTable/ResourcesTable.test.tsx | 10 +-- .../ResourcesTable/ResourcesTable.tsx | 16 ++-- .../ResourcesTable/columns/actions.tsx | 4 +- .../ResourcesTable/columns/name.tsx | 2 +- .../ResourcesTable/columns/resourceType.tsx | 2 +- .../ResourcesTable/columns/status.tsx | 4 +- .../queries/useDescribeResource.ts | 6 +- .../ReleaseDetails/ResourcesTable/types.ts | 2 +- .../ResourcesTable/useResourceRows.ts | 4 +- .../ReleaseDetails/ValuesDetails.tsx | 2 +- .../ReleaseDetails/useHelmReleaseToCompare.ts | 2 +- .../helm/HelmTemplates/HelmIcon.tsx | 4 +- .../helm/HelmTemplates/HelmTemplates.tsx | 4 +- .../HelmTemplates/HelmTemplatesList.test.tsx | 12 +-- .../helm/HelmTemplates/HelmTemplatesList.tsx | 6 +- .../HelmTemplates/HelmTemplatesListItem.tsx | 2 +- .../HelmTemplatesSelectedItem.test.tsx | 8 +- .../HelmTemplatesSelectedItem.tsx | 8 +- .../components/HelmRegistrySelect.test.tsx | 20 ++--- .../helm/components/HelmRegistrySelect.tsx | 14 ++-- .../helm/components/HelmValuesInput.tsx | 6 +- .../ManifestPreviewFormSection.test.tsx | 14 ++-- .../components/ManifestPreviewFormSection.tsx | 22 +++--- .../helm/helmChartSourceQueries/query-keys.ts | 4 +- .../useHelmChartList.ts | 4 +- .../useHelmChartValues.ts | 4 +- .../useHelmRepoVersions.ts | 4 +- .../useHelmRepositories.ts | 10 +-- .../helm/helmReleaseQueries/query-keys.ts | 4 +- .../helm/helmReleaseQueries/useHelmDryRun.ts | 4 +- .../helm/helmReleaseQueries/useHelmHistory.ts | 6 +- .../helm/helmReleaseQueries/useHelmRelease.ts | 6 +- .../useHelmRollbackMutation.ts | 8 +- .../useUninstallHelmAppMutation.ts | 8 +- .../useUpdateHelmReleaseMutation.ts | 8 +- .../helm/install/HelmInstallForm.test.tsx | 10 +-- .../helm/install/HelmInstallForm.tsx | 10 +-- .../helm/install/HelmInstallInnerForm.tsx | 10 +-- .../helm/install/HelmInstallView.tsx | 16 ++-- .../CreateIngressView/CreateIngressView.tsx | 25 +++---- .../CreateIngressView/IngressForm.tsx | 28 +++---- .../ingresses/CreateIngressView/types.ts | 2 +- .../ingresses/CreateIngressView/utils.ts | 2 +- .../IngressDatatable/IngressDatatable.tsx | 22 +++--- .../IngressDatatable/columns/created.tsx | 4 +- .../IngressDatatable/columns/ingressRules.tsx | 4 +- .../IngressDatatable/columns/name.tsx | 6 +- .../IngressDatatable/columns/namespace.tsx | 4 +- .../ingresses/IngressDatatable/index.tsx | 2 +- app/react/kubernetes/ingresses/queries.ts | 4 +- app/react/kubernetes/ingresses/service.ts | 4 +- app/react/kubernetes/ingresses/types.ts | 4 +- app/react/kubernetes/metrics/metrics.ts | 4 +- .../kubernetes/metrics/queries/query-keys.ts | 6 +- .../queries/useMetricsForApplications.ts | 4 +- .../queries/useNamespaceMetricsQuery.ts | 4 +- .../metrics/queries/useNodeMetricsQuery.ts | 4 +- .../ClusterRoleBindingsDatatable.tsx | 23 +++--- .../columns/created.tsx | 2 +- .../columns/name.tsx | 2 +- .../columns/subjectNamespace.tsx | 4 +- .../queries/query-keys.ts | 2 +- .../queries/useClusterRoleBindings.ts | 6 +- .../useDeleteClusterRoleBindingsMutation.ts | 6 +- .../ClusterRolesDatatable.tsx | 23 +++--- .../ClusterRolesDatatable/columns/created.tsx | 2 +- .../ClusterRolesDatatable/columns/name.tsx | 4 +- .../queries/query-keys.ts | 2 +- .../queries/useClusterRoles.ts | 6 +- .../queries/useDeleteClusterRolesMutation.ts | 6 +- .../ClusterRolesView/ClusterRolesView.tsx | 6 +- .../CronJobsDatatable/CronJobsDatatable.tsx | 31 ++++---- .../CronJobsExecutionsInnerDatatable.tsx | 8 +- .../CronJobsDatatable/columns/expand.tsx | 2 +- .../CronJobsDatatable/columns/name.tsx | 2 +- .../CronJobsDatatable/columns/namespace.tsx | 4 +- .../CronJobsDatatable/queries/query-keys.ts | 2 +- .../CronJobsDatatable/queries/useCronJobs.ts | 6 +- .../queries/useDeleteCronJobsMutation.ts | 6 +- .../JobsView/JobsDatatable/JobsDatatable.tsx | 29 ++++---- .../JobsDatatable/columns/actions.tsx | 4 +- .../JobsView/JobsDatatable/columns/name.tsx | 2 +- .../JobsDatatable/columns/namespace.tsx | 4 +- .../JobsDatatable/columns/started.tsx | 2 +- .../JobsView/JobsDatatable/columns/status.tsx | 2 +- .../JobsDatatable/queries/query-keys.ts | 2 +- .../queries/useDeleteJobsMutation.ts | 6 +- .../JobsView/JobsDatatable/queries/useJobs.ts | 6 +- .../more-resources/JobsView/JobsView.tsx | 6 +- .../RoleBindingsDatatable.tsx | 25 +++---- .../RoleBindingsDatatable/columns/created.tsx | 2 +- .../RoleBindingsDatatable/columns/name.tsx | 2 +- .../columns/namespace.tsx | 4 +- .../columns/roleKind.tsx | 2 +- .../columns/subjectNamespace.tsx | 4 +- .../queries/query-keys.ts | 2 +- .../queries/useDeleteRoleBindingsMutation.ts | 6 +- .../queries/useRoleBindings.ts | 6 +- .../RolesDatatable/RolesDatatable.tsx | 25 +++---- .../RolesDatatable/columns/created.tsx | 2 +- .../RolesView/RolesDatatable/columns/name.tsx | 4 +- .../RolesDatatable/columns/namespace.tsx | 4 +- .../RolesDatatable/queries/query-keys.ts | 2 +- .../queries/useDeleteRolesMutation.ts | 6 +- .../RolesDatatable/queries/useRoles.ts | 6 +- .../more-resources/RolesView/RolesView.tsx | 6 +- .../ServiceAccountsDatatable.tsx | 23 +++--- .../columns/created.tsx | 2 +- .../ServiceAccountsDatatable/columns/name.tsx | 2 +- .../columns/namespace.tsx | 4 +- .../queries/query-keys.ts | 2 +- .../useDeleteServiceAccountsMutation.ts | 6 +- .../queries/useGetAllServiceAccountsQuery.ts | 6 +- .../ServiceAccountsView.tsx | 4 +- .../AccessDatatable/AccessDatatable.tsx | 25 +++---- .../namespaces/AccessView/AccessView.tsx | 4 +- .../CreateAccessInnerForm.tsx | 26 +++---- .../CreateAccessWidget/CreateAccessWidget.tsx | 29 ++++---- .../NamespaceAccessUsersSelector.tsx | 2 +- .../AccessView/NamespaceDetailsWidget.tsx | 2 +- .../createAccessConfigMapPayload.ts | 4 +- .../AccessView/parseNamespaceAccesses.ts | 8 +- .../kubernetes/namespaces/AccessView/types.ts | 2 +- .../CreateView/CreateNamespaceForm.tsx | 12 +-- .../CreateView/CreateNamespaceView.tsx | 8 +- .../kubernetes/namespaces/CreateView/types.ts | 2 +- .../ItemView/ConfirmUpdateNamespace.tsx | 6 +- .../ItemView/NamespaceAppsDatatable.tsx | 10 +-- .../namespaces/ItemView/NamespaceView.tsx | 12 +-- .../ItemView/UpdateNamespaceForm.tsx | 16 ++-- .../namespaces/ItemView/columns.tsx | 8 +- .../ItemView/createUpdateRegistriesPayload.ts | 2 +- .../kubernetes/namespaces/ItemView/types.ts | 2 +- .../ItemView/useNamespaceFormValues.ts | 6 +- .../ListView/NamespacesDatatable.tsx | 21 +++--- .../namespaces/ListView/NamespacesView.tsx | 2 +- .../namespaces/ListView/columns/actions.tsx | 8 +- .../ListView/columns/useColumns.tsx | 16 ++-- .../LoadBalancerFormSection.tsx | 8 +- .../NamespaceForm/NamespaceInnerForm.tsx | 18 ++--- .../NamespaceForm/NamespaceSummary.tsx | 4 +- .../RegistriesFormSection.tsx | 14 ++-- .../RegistriesSelector.tsx | 8 +- .../registriesValidationSchema.ts | 2 +- .../NamespaceResourceReservation.tsx | 2 +- .../ResourceQuotaFormSection.tsx | 18 ++--- .../useNamespaceResourceReservationData.ts | 8 +- .../useResourceQuotaUsed.ts | 4 +- .../StorageQuotaFormSection.tsx | 6 +- .../StorageQuotaItem.tsx | 12 +-- .../ToggleSystemNamespaceButton.tsx | 8 +- .../components/NamespaceYamlEditor.tsx | 6 +- .../namespaces/getSelfSubjectAccessReview.ts | 4 +- .../hooks/useNamespaceAccessRedirect.ts | 2 +- .../namespaces/queries/queryKeys.ts | 2 +- .../queries/useCreateNamespaceMutation.ts | 8 +- .../namespaces/queries/useDeleteNamespaces.ts | 4 +- .../queries/useIsSystemNamespace.ts | 2 +- .../namespaces/queries/useNamespaceQuery.ts | 6 +- .../namespaces/queries/useNamespaceYAML.ts | 6 +- .../namespaces/queries/useNamespacesQuery.ts | 6 +- .../queries/useResourceLimitsQuery.ts | 6 +- .../queries/useToggleSystemNamespace.ts | 6 +- .../queries/useUpdateNamespaceMutation.ts | 10 +-- app/react/kubernetes/namespaces/types.ts | 2 +- app/react/kubernetes/queries/useEvents.ts | 8 +- .../ServicesDatatable.test.tsx | 14 ++-- .../ServicesDatatable/ServicesDatatable.tsx | 29 ++++---- .../columns/ExternalIPLink.tsx | 2 +- .../ServicesDatatable/columns/application.tsx | 4 +- .../ServicesDatatable/columns/created.tsx | 2 +- .../ServicesDatatable/columns/name.tsx | 6 +- .../ServicesDatatable/columns/namespace.tsx | 4 +- .../ServicesDatatable/columns/ports.tsx | 2 +- .../ServicesDatatable/columns/type.tsx | 2 +- .../ServicesDatatable/datatable-store.ts | 9 +-- .../services/ServicesView/ServicesView.tsx | 2 +- app/react/kubernetes/services/service.ts | 8 +- .../services/useNamespaceServices.ts | 6 +- .../volumes/ItemView/ConfirmRedeployModal.tsx | 4 +- .../volumes/ListView/StorageDatatable.tsx | 18 ++--- .../volumes/ListView/VolumesDatatable.tsx | 12 +-- .../volumes/ListView/VolumesView.tsx | 4 +- .../volumes/ListView/columns.name.tsx | 10 +-- .../kubernetes/volumes/ListView/columns.tsx | 4 +- .../kubernetes/volumes/ListView/types.ts | 4 +- .../kubernetes/volumes/queries/query-keys.ts | 2 +- .../volumes/queries/useDeleteVolumes.ts | 15 ++-- .../volumes/queries/useVolumesQuery.ts | 10 +-- .../HomeView/BackupFailedPanel.test.tsx | 8 +- .../portainer/HomeView/BackupFailedPanel.tsx | 12 +-- .../portainer/HomeView/EdgeLoadingSpinner.tsx | 2 +- .../EnvironmentList/AMTButton/AMTButton.tsx | 12 +-- .../AMTButton/AssociateAMTDialog.tsx | 22 +++--- .../EnvironmentItem/AgentDetails.tsx | 12 +-- .../EnvironmentItem/EditButtons.tsx | 8 +- .../EnvironmentItem/EngineVersion.tsx | 8 +- .../EnvironmentBrowseButtons.tsx | 12 +-- .../EnvironmentItem/EnvironmentIcon.tsx | 20 ++--- .../EnvironmentItem.stories.tsx | 4 +- .../EnvironmentItem/EnvironmentItem.test.tsx | 18 ++--- .../EnvironmentItem/EnvironmentItem.tsx | 18 ++--- .../EnvironmentItem/EnvironmentStats.tsx | 4 +- .../EnvironmentStatsDocker.tsx | 10 +-- .../EnvironmentStatsKubernetes.tsx | 10 +-- .../EnvironmentItem/EnvironmentTypeTag.tsx | 4 +- .../EnvironmentList/EnvironmentList.test.tsx | 12 +-- .../EnvironmentList/EnvironmentList.tsx | 26 +++---- .../EnvironmentListFilters.tsx | 2 +- .../EnvironmentList/HomepageFilter.tsx | 4 +- .../KubeconfigButton/KubeconfigButton.tsx | 10 +-- .../KubeconfigButton/KubeconfigPrompt.tsx | 22 +++--- .../KubeconfigButton/kubeconfig.service.ts | 4 +- .../NoEnvironmentsInfoPanel.tsx | 6 +- .../EnvironmentList/SortbySelector.tsx | 4 +- .../HomeView/EnvironmentList/UpdateBadge.tsx | 4 +- app/react/portainer/HomeView/HomeView.tsx | 18 ++--- .../HomeView/LicenseNodePanel.test.tsx | 4 +- .../portainer/HomeView/LicenseNodePanel.tsx | 4 +- app/react/portainer/HomeView/MotdPanel.tsx | 4 +- app/react/portainer/HomeView/home.service.ts | 2 +- .../AccessControlForm.stories.tsx | 8 +- .../AccessControlForm.test.tsx | 16 ++-- .../AccessControlForm/AccessControlForm.tsx | 6 +- .../AccessControlPaneDetails.test.tsx | 12 +-- .../AccessControlPanel/AccessControlPanel.tsx | 17 ++--- .../AccessControlPanelDetails.tsx | 20 ++--- .../AccessControlPanelForm.tsx | 16 ++-- .../AccessDatatable/AccessDatatable.tsx | 18 ++--- .../AccessDatatable/RemoveAccessButton.tsx | 2 +- .../AccessDatatable/columns/role.tsx | 6 +- .../AccessDatatable/columns/useColumns.ts | 2 +- .../AccessManagement/AccessDatatable/types.ts | 2 +- .../PorAccessManagementUsersSelector.tsx | 2 +- .../EditDetails/AccessTypeSelector.tsx | 2 +- .../EditDetails/EditDetails.tsx | 6 +- .../access-control/EditDetails/TeamsField.tsx | 8 +- .../access-control/EditDetails/UsersField.tsx | 8 +- .../EditDetails/useLoadState.ts | 8 +- .../access-control/EditDetails/useOptions.tsx | 10 +-- .../PorAccessControlForm/TeamsSelector.tsx | 4 +- .../PorAccessControlForm/UsersSelector.tsx | 4 +- .../access-control/access-control.service.ts | 2 +- app/react/portainer/access-control/types.ts | 4 +- app/react/portainer/access-control/utils.ts | 4 +- .../AccessTokensDatatable.tsx | 6 +- .../AccessTokensDatatable/TableActions.tsx | 6 +- .../AccessTokensDatatable/columns.ts | 2 +- .../useDeleteAccessTokensMutation.ts | 8 +- .../ApplicationSettingsForm.tsx | 14 ++-- .../ApplicationSettingsWidget.tsx | 2 +- .../HelmRepositoryDatatable.tsx | 16 ++-- .../HelmRepositoryDatatableActions.tsx | 6 +- .../HelmRepositoryDatatable/columns/url.tsx | 2 +- .../helm-repositories.service.ts | 12 +-- .../account/AccountView/theme-options.tsx | 2 +- .../CreateUserAccessToken.test.tsx | 8 +- .../CreateUserAccessToken.tsx | 8 +- .../CreateUserAccessTokenInnerForm.tsx | 6 +- .../DisplayUserAccessToken.tsx | 8 +- .../useCreateUserAccessTokenMutation.ts | 6 +- .../access-tokens/queries/build-url.ts | 2 +- .../access-tokens/queries/query-keys.ts | 4 +- .../access-tokens/queries/useAccessTokens.ts | 4 +- .../git-credentials.service.ts | 6 +- .../useCreateGitCredentialsMutation.ts | 13 ++-- .../account/git-credentials/types.ts | 2 +- .../CreateHelmRepositoriesView.tsx | 4 +- .../CreateHelmRespositoriesForm.tsx | 2 +- .../CreateHelmRepositoryForm.validation.ts | 2 +- .../components/HelmRepositoryForm.tsx | 8 +- .../account/useUpdateUserMutation.tsx | 10 +-- .../common/PortainerTunnelAddrField.tsx | 4 +- .../portainer/common/PortainerUrlField.tsx | 6 +- .../components/CommonFields.tsx | 4 +- ...ustomTemplatesVariablesDefinitionField.tsx | 11 +-- .../CustomTemplatesVariablesField.tsx | 6 +- .../VariableFieldItem.tsx | 4 +- .../components/PlatformSelector.tsx | 4 +- .../components/TemplateTypeSelector.tsx | 6 +- .../AutomaticEdgeEnvCreation.tsx | 28 +++---- .../EdgeAutoCreateScriptView.tsx | 4 +- .../ItemView/ConfirmDisassociateModel.tsx | 6 +- .../environments/ItemView/EdgeKeyDisplay.tsx | 8 +- .../environments/ItemView/tls-options.tsx | 2 +- .../ListView/EnvironmentsDatatable.tsx | 12 +-- .../environments/ListView/ListView.tsx | 8 +- .../environments/ListView/columns/actions.tsx | 6 +- .../environments/ListView/columns/name.tsx | 4 +- .../environments/ListView/columns/type.tsx | 4 +- .../environments/ListView/columns/url.tsx | 12 +-- .../portainer/environments/ListView/types.ts | 2 +- .../ListView/useDeleteEnvironmentsMutation.ts | 11 +-- .../environments/TagsView/TagsDatatable.tsx | 10 +-- .../TimeWindowPicker/TimePickerInput.tsx | 4 +- .../TimeWindowPicker/TimeWindowPicker.tsx | 4 +- .../TimeWindowPickerInputGroup.tsx | 6 +- .../EnvironmentGroupsDatatable.tsx | 6 +- .../TableActions.tsx | 6 +- .../EnvironmentGroupsDatatable/columns.tsx | 6 +- .../useDeleteEnvironmentGroupsMutation.ts | 6 +- .../environment-groups/ListView/ListView.tsx | 2 +- .../components/GroupAssociationTable.tsx | 12 +-- .../environment-groups.service.ts | 2 +- .../environment-groups/queries.ts | 2 +- .../queries/useCreateGroupMutation.ts | 6 +- .../queries/useEnvironmentGroups.ts | 2 +- .../environments/environment-groups/types.ts | 2 +- .../environment.service/create.ts | 8 +- .../environments/environment.service/edge.ts | 2 +- .../environments/environment.service/index.ts | 12 +-- .../environment.service/registries.ts | 8 +- .../environments/queries/useAgentDetails.ts | 4 +- .../queries/useDeleteEnvironmentsMutation.ts | 6 +- .../environments/queries/useEnvironment.ts | 2 +- .../queries/useEnvironmentList.ts | 4 +- .../queries/useEnvironmentRegistries.ts | 2 +- .../queries/useUpdateEnvironmentMutation.ts | 8 +- .../useUpdateEnvironmentsRelationsMutation.ts | 14 ++-- app/react/portainer/environments/types.ts | 4 +- .../CreateView/CreateView.tsx | 16 ++-- .../update-schedules/ItemView/ItemView.tsx | 20 ++--- .../update-schedules/ListView/ListView.tsx | 16 ++-- .../ListView/columns/created.tsx | 2 +- .../ListView/columns/index.ts | 2 +- .../ListView/columns/scheduled-time.tsx | 4 +- .../ListView/datatable-store.ts | 2 +- .../common/ActiveSchedulesNotice.tsx | 6 +- .../update-schedules/common/BetaAlert.tsx | 4 +- .../common/EdgeGroupsField.tsx | 8 +- .../update-schedules/common/NameField.tsx | 4 +- .../common/RollbackOptions.tsx | 4 +- .../common/ScheduleTypeSelector.tsx | 4 +- .../common/ScheduledTimeField.tsx | 6 +- .../common/UpdateScheduleDetailsFieldset.tsx | 6 +- .../update-schedules/common/VersionSelect.tsx | 6 +- .../update-schedules/common/types.ts | 2 +- .../common/useEnvironments.ts | 4 +- .../update-schedules/common/utils.ts | 2 +- .../update-schedules/common/validation.ts | 4 +- .../update-schedules/queries/create.ts | 4 +- .../update-schedules/queries/list.ts | 2 +- .../update-schedules/queries/query-keys.ts | 2 +- .../queries/useActiveSchedules.ts | 4 +- .../update-schedules/queries/useItem.ts | 2 +- .../queries/usePreviousVersions.ts | 4 +- .../queries/useRemoveMutation.ts | 6 +- .../queries/useSupportedAgentVersions.ts | 6 +- .../queries/useUpdateMutation.ts | 4 +- .../environments/update-schedules/types.ts | 6 +- .../environments/utils/get-platform-icon.ts | 6 +- .../portainer/environments/utils/index.ts | 8 +- .../EnvironmentSelector.tsx | 2 +- .../EnvironmentTypeSelectView.tsx | 8 +- .../environment-types.ts | 16 ++-- .../EnvironmentsCreationView.tsx | 18 ++--- .../WizardAzure/WizardAzure.tsx | 18 ++--- .../WizardDocker/APITab/APIForm.tsx | 14 ++-- .../APITab/APIForm.validation.tsx | 2 +- .../WizardDocker/APITab/APITab.tsx | 2 +- .../WizardDocker/APITab/DeploymentScripts.tsx | 10 +-- .../WizardDocker/APITab/types.ts | 4 +- .../WizardDocker/AgentTab/AgentTab.tsx | 2 +- .../AgentTab/DeploymentScripts.tsx | 10 +-- .../WizardDocker/SocketTab/SocketForm.tsx | 14 ++-- .../WizardDocker/SocketTab/SocketTab.tsx | 2 +- .../WizardDocker/SocketTab/types.ts | 2 +- .../WizardDocker/WizardDocker.tsx | 16 ++-- .../WizardEndpointsList.tsx | 14 ++-- .../WizardKubernetes/AgentPanel.tsx | 2 +- .../WizardKubernetes/DeploymentScripts.tsx | 16 ++-- .../WizardKubernetes/KubeConfigTeaserForm.tsx | 14 ++-- .../WizardKubernetes.test.tsx | 4 +- .../WizardKubernetes/WizardKubernetes.tsx | 18 ++--- .../WizardPodman/AgentTab/AgentTab.tsx | 2 +- .../AgentTab/DeploymentScripts.tsx | 10 +-- .../SocketTab/DeploymentScripts.tsx | 10 +-- .../WizardPodman/SocketTab/SocketForm.tsx | 14 ++-- .../WizardPodman/SocketTab/SocketTab.tsx | 4 +- .../WizardPodman/SocketTab/types.ts | 2 +- .../WizardPodman/WizardPodman.tsx | 16 ++-- .../shared/AgentForm/AgentForm.tsx | 10 +-- .../shared/AgentForm/AgentForm.validation.tsx | 2 +- .../shared/AgentForm/EnvironmentUrlField.tsx | 4 +- .../EdgeAgentForm/EdgeAgentFieldset.tsx | 6 +- .../EdgeAgentForm/EdgeAgentForm.tsx | 20 ++--- .../EdgeAgentForm/EdgeAgentForm.validation.ts | 6 +- .../EdgeAgentTab/EdgeAgentForm/types.ts | 4 +- .../shared/EdgeAgentTab/EdgeAgentTab.tsx | 12 +-- .../shared/MetadataFieldset/GroupsField.tsx | 8 +- .../MetadataFieldset/MetadataFieldset.tsx | 6 +- .../shared/MetadataFieldset/validation.ts | 2 +- .../shared/MoreSettingsSection.tsx | 2 +- .../shared/NameField.tsx | 10 +-- .../environments/wizard/HomeView/HomeView.tsx | 12 +-- .../useFetchOrCreateLocalEnvironment.ts | 6 +- .../wizard/components/Option/Option.tsx | 6 +- .../limited-feature.directive.ts | 2 +- .../portainer/gitops/AdditionalFilesField.tsx | 8 +- .../gitops/AuthFieldset/AuthFieldset.test.tsx | 6 +- .../gitops/AuthFieldset/AuthFieldset.tsx | 8 +- .../AuthFieldset/CredentialSelector.tsx | 10 +-- .../AuthFieldset/CredentialsSection.tsx | 8 +- .../gitops/AuthFieldset/NewCredentialForm.tsx | 8 +- .../AutoUpdateFieldset/AutoUpdateFieldset.tsx | 6 +- .../AutoUpdateFieldset/AutoUpdateSettings.tsx | 12 +-- .../ForceDeploymentSwitch.tsx | 4 +- .../AutoUpdateFieldset/IntervalField.tsx | 6 +- .../AutoUpdateFieldset/WebhookSettings.tsx | 8 +- .../ComposePathField/ComposePathField.tsx | 8 +- .../gitops/ComposePathField/PathSelector.tsx | 4 +- .../portainer/gitops/GitForm.stories.tsx | 4 +- app/react/portainer/gitops/GitForm.tsx | 16 ++-- .../portainer/gitops/GitFormUrlField.test.tsx | 14 ++-- .../portainer/gitops/GitFormUrlField.tsx | 14 ++-- .../portainer/gitops/RefField/RefField.tsx | 10 +-- .../portainer/gitops/RefField/RefSelector.tsx | 6 +- .../RelativePathFieldset.tsx | 16 ++-- .../gitops/RelativePathFieldset/utils.ts | 2 +- .../portainer/gitops/TimeWindowDisplay.tsx | 4 +- app/react/portainer/gitops/gitops.service.ts | 2 +- app/react/portainer/gitops/index.ts | 8 +- .../portainer/gitops/queries/useCheckRepo.ts | 2 +- .../portainer/gitops/queries/useGitRefs.ts | 2 +- .../portainer/gitops/queries/useSearch.ts | 2 +- .../gitops/queries/useUpdateGitStack.ts | 8 +- .../queries/useUpdateGitStackSettings.ts | 8 +- app/react/portainer/gitops/types.ts | 2 +- app/react/portainer/gitops/utils.ts | 2 +- .../init/InitAdminView/restore-options.tsx | 4 +- .../licenses/license.service.test.ts | 2 +- .../portainer/licenses/license.service.ts | 2 +- .../portainer/licenses/use-license.service.ts | 4 +- .../ActivityLogsView/ActivityLogsTable.tsx | 8 +- .../ActivityLogsView/ActivityLogsView.tsx | 6 +- .../logs/ActivityLogsView/FilterBar.tsx | 6 +- .../logs/ActivityLogsView/useActivityLogs.ts | 2 +- .../ActivityLogsView/useExportMutation.ts | 2 +- .../AuthenticationLogsTable.tsx | 2 +- .../logs/AuthenticationLogsView/columns.tsx | 8 +- .../logs/components/DateRangePicker.tsx | 2 +- .../notifications/NotificationsView.tsx | 20 ++--- .../portainer/notifications/columns/time.tsx | 2 +- .../notifications/notifications-store.ts | 4 +- .../GitlabProjectsTable.tsx | 10 +-- .../RegistryFormDockerhub.stories.tsx | 2 +- .../RegistryFormDockerhub.test.tsx | 2 +- .../RegistryFormDockerhub.tsx | 10 +-- .../RegistryTestConnection.test.tsx | 4 +- .../TestConnection/RegistryTestConnection.tsx | 4 +- .../useCheckRegistryConnectionMutation.ts | 2 +- .../registries/CreateView/options.tsx | 2 +- .../registries/ListView/ListView.tsx | 4 +- .../RegistriesDatatable/AddButton.tsx | 4 +- .../RegistriesDatatable/DeleteButton.tsx | 6 +- .../RegistriesDatatable.tsx | 6 +- .../columns/DefaultRegistryAction.tsx | 14 ++-- .../columns/DefaultRegistryDomain.tsx | 2 +- .../columns/DefaultRegistryName.tsx | 2 +- .../RegistriesDatatable/columns/actions.tsx | 10 +-- .../RegistriesDatatable/columns/name.tsx | 4 +- .../useDeleteRegistriesMutation.ts | 6 +- .../EnvironmentRegistriesDatatable.tsx | 14 ++-- .../columns/actions.tsx | 16 ++-- .../columns/name.tsx | 6 +- .../environments/ListView/ListView.tsx | 2 +- .../registries/queries/useRegistries.ts | 4 +- .../registries/queries/useRegistry.ts | 4 +- .../portainer/registries/registry.service.ts | 2 +- .../TagsDatatable/TagsDatatable.test.tsx | 6 +- .../ItemView/TagsDatatable/TagsDatatable.tsx | 10 +-- .../TagsDatatable/columns/actions.tsx | 8 +- .../TagsDatatable/columns/useColumns.ts | 6 +- .../ListView/RepositoriesDatatable.tsx | 4 +- .../repositories/ListView/columns.tsx | 2 +- .../ListView/useRepositoryTags.ts | 4 +- .../repositories/queries/getRegistryBlobs.ts | 2 +- .../repositories/queries/manifest.service.ts | 4 +- .../repositories/queries/queryKeys.ts | 2 +- .../repositories/queries/useTagDetails.ts | 4 +- .../portainer/registries/utils/constants.tsx | 12 +-- .../InternalAuth/InternalAuth.tsx | 8 +- .../PasswordLengthSlider.tsx | 2 +- .../InternalAuth/SaveAuthSettingsButton.tsx | 4 +- .../InternalAuth/options.tsx | 8 +- .../LDAPAuth/LDAPGroupsTable.tsx | 4 +- .../LDAPAuth/LDAPUsersTable.tsx | 4 +- .../OAuth/AuthStyleField.tsx | 8 +- .../AuthenticationView/ldap-options.tsx | 4 +- .../AuthenticationView/oauth-options.tsx | 8 +- .../AutoEnvCreationSettingsForm.tsx | 8 +- .../AutomaticEdgeEnvCreation.tsx | 2 +- .../EnableWaitingRoomSwitch.tsx | 10 +-- .../DeploymentSyncOptions.tsx | 16 ++-- .../DeploymentSyncOptions/validation.ts | 2 +- .../EdgeComputeSettings.tsx | 18 ++--- .../EdgeComputeSettings.validation.ts | 6 +- .../EdgeComputeSettingsView.tsx | 2 +- .../SettingsOpenAMT/SettingsOpenAMT.tsx | 18 ++--- .../ApplicationSettingsPanel.tsx | 14 ++-- .../EnableTelemetryField.tsx | 2 +- .../ApplicationSettingsPanel/LogoFieldset.tsx | 6 +- .../ScreenBannerFieldset.tsx | 8 +- .../TemplatesUrlSection.tsx | 8 +- .../ApplicationSettingsPanel/validation.ts | 2 +- .../BackupSettingsView/BackupFileForm.tsx | 4 +- .../BackupSettingsView/BackupS3Form.tsx | 16 ++-- .../BackupSettingsPanel.tsx | 6 +- .../BackupSettingsView/SecurityFieldset.tsx | 8 +- .../BackupSettingsView/backup-options.tsx | 4 +- .../queries/useBackupS3Settings.ts | 4 +- .../queries/useDownloadBackupMutation.ts | 4 +- .../queries/useExportS3BackupMutation.ts | 4 +- .../useUpdateBackupS3SettingsMutation.ts | 4 +- .../ExperimentalFeatures.tsx | 4 +- .../ExperimentalFeaturesForm.tsx | 10 +-- .../settings/SettingsView/HelmCertPanel.tsx | 16 ++-- .../HiddenContainersPanel/AddLabelForm.tsx | 6 +- .../HiddenContainersPanel.tsx | 6 +- .../HiddenContainersTable.tsx | 4 +- .../DeploymentOptionsSection.tsx | 8 +- .../KubeSettingsPanel/HelmSection.tsx | 10 +-- .../KubeSettingsPanel/KubeConfigSection.tsx | 6 +- .../KubeNoteMinimumCharacters.tsx | 10 +-- .../KubeSettingsPanel/KubeSettingsPanel.tsx | 10 +-- .../KubeSettingsPanel/validation.ts | 4 +- .../SSLSettingsPanel/SSLSettingsPanel.tsx | 16 ++-- .../SettingsView/SettingsView.test.tsx | 8 +- .../settings/SettingsView/SettingsView.tsx | 4 +- .../useUpdateSSLConfigMutation.tsx | 4 +- .../queries/useExperimentalSettings.ts | 4 +- .../useExperimentalSettingsMutation.ts | 4 +- .../settings/queries/usePublicSettings.ts | 2 +- .../settings/queries/useSSLSettings.ts | 2 +- .../portainer/settings/queries/useSettings.ts | 2 +- .../portainer/settings/settings.service.ts | 2 +- app/react/portainer/settings/types.ts | 2 +- app/react/portainer/system/useNodesCount.ts | 4 +- app/react/portainer/system/useSystemInfo.ts | 4 +- app/react/portainer/system/useSystemStatus.ts | 2 +- .../portainer/system/useSystemVersion.ts | 2 +- .../system/useUpgradeEditionMutation.ts | 4 +- .../app-templates/AppTemplatesList.tsx | 10 +-- .../AppTemplatesListItem.test.tsx | 2 +- .../app-templates/AppTemplatesListItem.tsx | 6 +- .../app-templates/AppTemplatesView.tsx | 12 +-- .../DeployFormWidget/AdvancedSettings.tsx | 4 +- .../ContainerDeployForm.tsx | 30 ++++---- .../createContainerConfig.ts | 8 +- .../ContainerDeployForm/types.ts | 8 +- .../ContainerDeployForm/useCreate.ts | 6 +- .../useCreateLocalVolumes.ts | 4 +- .../ContainerDeployForm/useValidation.ts | 14 ++-- .../DeployFormWidget/DeployFormWidget.tsx | 8 +- .../DeployFormWidget/EnvVarsFieldset.tsx | 6 +- .../StackDeployForm/StackDeployForm.tsx | 28 +++---- .../DeployFormWidget/StackDeployForm/types.ts | 2 +- .../StackDeployForm/useIsDeployable.ts | 6 +- .../StackDeployForm/useValidation.ts | 6 +- .../templates/app-templates/Filters.tsx | 2 +- .../TemplateListSort/TemplateListSort.tsx | 4 +- .../queries/useAppTemplateFile.ts | 2 +- .../app-templates/queries/useAppTemplates.ts | 12 +-- .../templates/app-templates/types.ts | 2 +- .../templates/components/DeployWidget.tsx | 6 +- .../templates/components/TemplateItem.tsx | 16 ++-- .../templates/components/TemplateNote.tsx | 2 +- .../CreateView/CreateForm.tsx | 16 ++-- .../CreateView/CreateView.tsx | 12 +-- .../CreateView/EdgeSettingsFieldset.tsx | 14 ++-- .../EdgeSettingsFieldset.validation.ts | 8 +- .../custom-templates/CreateView/InnerForm.tsx | 34 ++++----- .../custom-templates/CreateView/types.ts | 14 ++-- .../CreateView/useInitialValues.ts | 6 +- .../CreateView/useValidation.tsx | 24 +++--- .../custom-templates/EditView/EditForm.tsx | 14 ++-- .../custom-templates/EditView/EditView.tsx | 6 +- .../custom-templates/EditView/InnerForm.tsx | 36 ++++----- .../custom-templates/EditView/types.ts | 12 +-- .../EditView/useInitialValues.ts | 8 +- .../EditView/useValidation.tsx | 20 ++--- .../ListView/CustomTemplatesList.tsx | 14 ++-- .../ListView/CustomTemplatesListItem.tsx | 10 +-- .../custom-templates/ListView/ListView.tsx | 10 +-- .../DeployForm.tsx | 38 +++++----- .../StackFromCustomTemplateFormWidget.tsx | 10 +-- .../TemplateLoadError.tsx | 10 +-- .../types.ts | 4 +- .../useIsDeployable.ts | 6 +- .../useValidation.ts | 10 +-- .../ListView/useViewParams.tsx | 4 +- .../queries/useCreateTemplateMutation.ts | 24 +++--- .../queries/useCustomTemplate.ts | 4 +- .../queries/useCustomTemplateFile.ts | 4 +- .../queries/useCustomTemplates.ts | 6 +- .../queries/useDeleteTemplateMutation.ts | 4 +- .../queries/useUpdateTemplateMutation.ts | 12 +-- .../templates/custom-templates/types.ts | 6 +- .../portainer/users/ListView/ListView.tsx | 2 +- .../ListView/NewUserForm/AdminSwitch.tsx | 2 +- .../NewUserForm/ConfirmPasswordField.tsx | 6 +- .../ListView/NewUserForm/NewUserForm.tsx | 14 ++-- .../ListView/NewUserForm/PasswordField.tsx | 4 +- .../users/ListView/NewUserForm/TeamsField.tsx | 6 +- .../ListView/NewUserForm/TeamsFieldset.tsx | 8 +- .../ListView/NewUserForm/UsernameField.tsx | 8 +- .../ListView/NewUserForm/useValidation.tsx | 6 +- .../UsersDatatable/UsersDatatable.tsx | 22 +++--- .../ListView/UsersDatatable/columns/name.tsx | 4 +- .../ListView/UsersDatatable/columns/role.tsx | 6 +- .../users/ListView/UsersDatatable/types.ts | 2 +- .../EffectiveAccessViewerDatatable.tsx | 6 +- .../users/RolesView/AccessViewer/columns.tsx | 6 +- .../users/RolesView/AccessViewer/model.ts | 4 +- .../users/RolesView/RbacRolesDatatable.tsx | 10 +-- .../portainer/users/RolesView/useRbacRoles.ts | 2 +- .../users/queries/useCreateUserMutation.ts | 10 +-- .../users/queries/useDeleteUserMutation.ts | 10 +-- .../users/teams/ItemView/Details.tsx | 6 +- .../users/teams/ItemView/ItemView.tsx | 10 +-- .../TeamAssociationSelector.stories.tsx | 8 +- .../TeamAssociationSelector.test.tsx | 6 +- .../TeamAssociationSelector.tsx | 2 +- .../TeamMembersList/RowContext.tsx | 6 +- .../TeamMembersList.stories.tsx | 10 +-- .../TeamMembersList/TeamMembersList.test.tsx | 6 +- .../TeamMembersList/TeamMembersList.tsx | 14 ++-- .../TeamMembersList/columns/helper.ts | 2 +- .../TeamMembersList/columns/name-column.tsx | 8 +- .../columns/team-role-column.tsx | 14 ++-- .../UsersList/RowContext.tsx | 4 +- .../UsersList/UsersList.stories.tsx | 8 +- .../UsersList/UsersList.test.tsx | 6 +- .../UsersList/UsersList.tsx | 14 ++-- .../UsersList/name-column.tsx | 8 +- .../CreateTeamForm/CreateTeamForm.mocks.ts | 4 +- .../CreateTeamForm/CreateTeamForm.test.tsx | 2 +- .../CreateTeamForm/CreateTeamForm.tsx | 18 ++--- .../CreateTeamForm.validation.ts | 2 +- .../teams/ListView/CreateTeamForm/types.ts | 2 +- .../users/teams/ListView/ListView.tsx | 6 +- .../TeamsDatatable/TeamsDatatable.tsx | 16 ++-- .../teams/queries/useAddMemberMutation.ts | 8 +- .../users/teams/queries/useAddTeamMutation.ts | 6 +- .../teams/queries/useDeleteTeamMutation.ts | 4 +- .../teams/queries/useRemoveMemberMutation.ts | 8 +- .../portainer/users/teams/queries/useTeam.ts | 4 +- .../users/teams/queries/useTeamMemberships.ts | 4 +- .../portainer/users/teams/queries/useTeams.ts | 4 +- .../teams/queries/useUpdateRoleMutation.ts | 6 +- app/react/portainer/users/teams/types.ts | 2 +- app/react/portainer/webhooks/createWebhook.ts | 2 +- app/react/portainer/webhooks/useWebhooks.ts | 2 +- .../AzureSidebar/AzureSidebar.test.tsx | 6 +- .../sidebar/AzureSidebar/AzureSidebar.tsx | 2 +- app/react/sidebar/DockerSidebar.tsx | 8 +- app/react/sidebar/EnvironmentSidebar.tsx | 10 +-- app/react/sidebar/Footer/BuildInfoModal.tsx | 10 +-- app/react/sidebar/Footer/Footer.test.tsx | 6 +- app/react/sidebar/Footer/Footer.tsx | 2 +- .../sidebar/Footer/UpdateNotifications.tsx | 6 +- app/react/sidebar/Header.test.tsx | 4 +- app/react/sidebar/Header.tsx | 4 +- .../KubectlShellButton.test.tsx | 2 +- .../KubernetesSidebar/KubectlShellButton.tsx | 6 +- .../KubernetesSidebar/KubernetesSidebar.tsx | 6 +- app/react/sidebar/SettingsSidebar.tsx | 4 +- app/react/sidebar/Sidebar.tsx | 6 +- app/react/sidebar/SidebarItem/Head.tsx | 4 +- app/react/sidebar/SidebarItem/SidebarItem.tsx | 4 +- .../sidebar/SidebarItem/SidebarParent.tsx | 8 +- .../UpgradeBEBanner/GetLicenseDialog.tsx | 4 +- .../sidebar/UpgradeBEBanner/LoadingDialog.tsx | 6 +- .../UpgradeBEBanner/NonAdminUpgradeDialog.tsx | 6 +- .../UpgradeBEBanner/UpgradeBEBanner.tsx | 12 +-- .../sidebar/UpgradeBEBanner/UpgradeDialog.tsx | 2 +- .../UpgradeBEBanner/UploadLicenseDialog.tsx | 14 ++-- app/react/sidebar/items/DashboardLink.tsx | 4 +- app/react/sidebar/items/VolumesLink.tsx | 4 +- app/react/sidebar/types.ts | 2 +- app/react/sidebar/useSidebarState.tsx | 2 +- app/react/test-utils/withTestQuery.tsx | 2 +- app/react/test-utils/withUserProvider.tsx | 4 +- app/setup-tests/mock-localizeDate.ts | 2 +- app/setup-tests/server-handlers.ts | 14 ++-- app/setup-tests/setup-handlers/settings.ts | 2 +- app/setup-tests/setup-handlers/users.ts | 6 +- package.json | 3 +- tsconfig.json | 4 +- webpack/webpack.common.js | 8 ++ 1849 files changed, 6494 insertions(+), 6602 deletions(-) diff --git a/.eslintrc.yml b/.eslintrc.yml index 824c81f24..36ca1d37d 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -37,8 +37,8 @@ rules: { pathGroups: [ - { pattern: '@@CE/**', group: 'internal', position: 'after' }, - { pattern: '@CE/**', group: 'internal' }, + { pattern: '@@/**', group: 'internal', position: 'after' }, + { pattern: '@/**', group: 'internal' }, { pattern: '{Kubernetes,Portainer,Agent,Azure,Docker}/**', group: 'internal' }, ], groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index'], @@ -49,15 +49,15 @@ rules: - error - patterns: - group: - - '@CE/react/test-utils/*' + - '@/react/test-utils/*' message: 'These utils are just for test files' settings: 'import/resolver': alias: map: - - ['@@CE', './app/react/components'] - - ['@CE', './app'] + - ['@@', './app/react/components'] + - ['@', './app'] extensions: ['.js', '.ts', '.tsx'] typescript: true node: true @@ -92,7 +92,7 @@ overrides: [ 'error', { - pathGroups: [{ pattern: '@@CE/**', group: 'internal', position: 'after' }, { pattern: '@CE/**', group: 'internal' }], + pathGroups: [{ pattern: '@@/**', group: 'internal', position: 'after' }, { pattern: '@/**', group: 'internal' }], groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index'], 'newlines-between': 'always', }, @@ -124,7 +124,7 @@ overrides: - error - patterns: - group: - - '@CE/react/test-utils/*' + - '@/react/test-utils/*' message: 'These utils are just for test files' overrides: # allow props spreading for hoc files - files: diff --git a/app/agent/components/host-browser/hostBrowserController.js b/app/agent/components/host-browser/hostBrowserController.js index 47ca571c8..4d5ddaae9 100644 --- a/app/agent/components/host-browser/hostBrowserController.js +++ b/app/agent/components/host-browser/hostBrowserController.js @@ -1,5 +1,5 @@ import _ from 'lodash-es'; -import { confirmDelete } from '@@CE/modals/confirm'; +import { confirmDelete } from '@@/modals/confirm'; const ROOT_PATH = '/host'; diff --git a/app/agent/components/volume-browser/volumeBrowserController.js b/app/agent/components/volume-browser/volumeBrowserController.js index e14842a1d..c0f30734e 100644 --- a/app/agent/components/volume-browser/volumeBrowserController.js +++ b/app/agent/components/volume-browser/volumeBrowserController.js @@ -1,5 +1,5 @@ import _ from 'lodash-es'; -import { confirmDelete } from '@@CE/modals/confirm'; +import { confirmDelete } from '@@/modals/confirm'; export class VolumeBrowserController { /* @ngInject */ diff --git a/app/azure/index.ts b/app/azure/index.ts index bb8b45aa9..0034565ca 100644 --- a/app/azure/index.ts +++ b/app/azure/index.ts @@ -1,9 +1,9 @@ import angular from 'angular'; import { StateRegistry, StateService } from '@uirouter/angularjs'; -import { Environment } from '@CE/react/portainer/environments/types'; -import { notifyError } from '@CE/portainer/services/notifications'; -import { StateManager } from '@CE/portainer/services/types'; +import { Environment } from '@/react/portainer/environments/types'; +import { notifyError } from '@/portainer/services/notifications'; +import { StateManager } from '@/portainer/services/types'; import { reactModule } from './react'; diff --git a/app/azure/react/views/index.ts b/app/azure/react/views/index.ts index 5624d8ed2..44c9f8197 100644 --- a/app/azure/react/views/index.ts +++ b/app/azure/react/views/index.ts @@ -1,13 +1,13 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { CreateView } from '@CE/react/azure/container-instances/CreateView'; -import { ItemView } from '@CE/react/azure/container-instances/ItemView'; -import { ListView } from '@CE/react/azure/container-instances/ListView'; -import { DashboardView } from '@CE/react/azure/DashboardView'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; +import { r2a } from '@/react-tools/react2angular'; +import { CreateView } from '@/react/azure/container-instances/CreateView'; +import { ItemView } from '@/react/azure/container-instances/ItemView'; +import { ListView } from '@/react/azure/container-instances/ListView'; +import { DashboardView } from '@/react/azure/DashboardView'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; export const viewsModule = angular .module('portainer.azure.react.views', []) diff --git a/app/docker/__module.js b/app/docker/__module.js index 51e7b0e1b..7b9e4073f 100644 --- a/app/docker/__module.js +++ b/app/docker/__module.js @@ -2,7 +2,7 @@ import angular from 'angular'; import { PortainerEndpointTypes } from 'Portainer/models/endpoint/models'; -import { EnvironmentStatus } from '@CE/react/portainer/environments/types'; +import { EnvironmentStatus } from '@/react/portainer/environments/types'; import { reactModule } from './react'; @@ -431,7 +431,7 @@ angular.module('portainer.docker', ['portainer.app', reactModule]).config([ url: '/:id?nodeName', views: { 'content@': { - templateUrl: './views/containers/edit/container.html', + templateUrl: '~@/docker/views/containers/edit/container.html', controller: 'ContainerController', }, }, diff --git a/app/docker/components/imageRegistry/por-image-registry-rate-limits.controller.js b/app/docker/components/imageRegistry/por-image-registry-rate-limits.controller.js index ecfe1b20a..05c80ec63 100644 --- a/app/docker/components/imageRegistry/por-image-registry-rate-limits.controller.js +++ b/app/docker/components/imageRegistry/por-image-registry-rate-limits.controller.js @@ -1,4 +1,4 @@ -import { isAgentEnvironment, isLocalEnvironment } from '@CE/react/portainer/environments/utils'; +import { isAgentEnvironment, isLocalEnvironment } from '@/react/portainer/environments/utils'; export default class porImageRegistryContainerController { /* @ngInject */ diff --git a/app/docker/components/imageRegistry/por-image-registry.controller.js b/app/docker/components/imageRegistry/por-image-registry.controller.js index 31c20bfb6..8d4a9c6ef 100644 --- a/app/docker/components/imageRegistry/por-image-registry.controller.js +++ b/app/docker/components/imageRegistry/por-image-registry.controller.js @@ -1,7 +1,7 @@ import angular from 'angular'; import _ from 'lodash-es'; import { DockerHubViewModel } from 'Portainer/models/dockerhub'; -import { RegistryTypes } from '@CE/portainer/models/registryTypes'; +import { RegistryTypes } from '@/portainer/models/registryTypes'; class porImageRegistryController { /* @ngInject */ diff --git a/app/docker/components/log-viewer/logViewerController.js b/app/docker/components/log-viewer/logViewerController.js index 5bd6522c9..632187e47 100644 --- a/app/docker/components/log-viewer/logViewerController.js +++ b/app/docker/components/log-viewer/logViewerController.js @@ -1,6 +1,6 @@ import moment from 'moment'; -import { concatLogsToString, NEW_LINE_BREAKER } from '@CE/docker/helpers/logHelper'; +import { concatLogsToString, NEW_LINE_BREAKER } from '@/docker/helpers/logHelper'; angular.module('portainer.docker').controller('LogViewerController', [ '$scope', diff --git a/app/docker/components/network-macvlan-form/networkMacvlanFormController.js b/app/docker/components/network-macvlan-form/networkMacvlanFormController.js index cadbae9e2..3080095fa 100644 --- a/app/docker/components/network-macvlan-form/networkMacvlanFormController.js +++ b/app/docker/components/network-macvlan-form/networkMacvlanFormController.js @@ -1,4 +1,4 @@ -import { getOptions } from '@CE/react/docker/networks/CreateView/macvlanOptions'; +import { getOptions } from '@/react/docker/networks/CreateView/macvlanOptions'; angular.module('portainer.docker').controller('NetworkMacvlanFormController', [ '$q', diff --git a/app/docker/helpers/imageHelper.js b/app/docker/helpers/imageHelper.js index 866b2fa3a..3ce3d4a45 100644 --- a/app/docker/helpers/imageHelper.js +++ b/app/docker/helpers/imageHelper.js @@ -1,4 +1,4 @@ -import { buildImageFullURIFromModel, imageContainsURL, fullURIIntoRepoAndTag } from '@CE/react/docker/images/utils'; +import { buildImageFullURIFromModel, imageContainsURL, fullURIIntoRepoAndTag } from '@/react/docker/images/utils'; angular.module('portainer.docker').factory('ImageHelper', ImageHelperFactory); function ImageHelperFactory() { diff --git a/app/docker/helpers/logHelper/constants.ts b/app/docker/helpers/logHelper/constants.ts index 0ef79208a..c0e22d21a 100644 --- a/app/docker/helpers/logHelper/constants.ts +++ b/app/docker/helpers/logHelper/constants.ts @@ -1,3 +1,3 @@ -import { BROWSER_OS_PLATFORM } from '@CE/react/constants'; +import { BROWSER_OS_PLATFORM } from '@/react/constants'; export const NEW_LINE_BREAKER = BROWSER_OS_PLATFORM === 'win' ? '\r\n' : '\n'; diff --git a/app/docker/models/config.ts b/app/docker/models/config.ts index 47eb648f1..32ceb9c19 100644 --- a/app/docker/models/config.ts +++ b/app/docker/models/config.ts @@ -1,8 +1,8 @@ import { Config } from 'docker-types/generated/1.44'; -import { IResource } from '@CE/react/docker/components/datatable/createOwnershipColumn'; -import { PortainerResponse } from '@CE/react/docker/types'; -import { ResourceControlViewModel } from '@CE/react/portainer/access-control/models/ResourceControlViewModel'; +import { IResource } from '@/react/docker/components/datatable/createOwnershipColumn'; +import { PortainerResponse } from '@/react/docker/types'; +import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; export class ConfigViewModel implements IResource { Id: string; diff --git a/app/docker/models/containerDetails.ts b/app/docker/models/containerDetails.ts index 145d729de..e0f50ddbf 100644 --- a/app/docker/models/containerDetails.ts +++ b/app/docker/models/containerDetails.ts @@ -1,7 +1,7 @@ -import { IResource } from '@CE/react/docker/components/datatable/createOwnershipColumn'; -import { ContainerDetailsResponse } from '@CE/react/docker/containers/queries/useContainer'; -import { PortainerResponse } from '@CE/react/docker/types'; -import { ResourceControlViewModel } from '@CE/react/portainer/access-control/models/ResourceControlViewModel'; +import { IResource } from '@/react/docker/components/datatable/createOwnershipColumn'; +import { ContainerDetailsResponse } from '@/react/docker/containers/queries/useContainer'; +import { PortainerResponse } from '@/react/docker/types'; +import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; export class ContainerDetailsViewModel implements IResource, Pick, 'IsPortainer'> diff --git a/app/docker/models/containerStats.ts b/app/docker/models/containerStats.ts index f1ac52471..5f0d9cf6d 100644 --- a/app/docker/models/containerStats.ts +++ b/app/docker/models/containerStats.ts @@ -1,7 +1,7 @@ import { values } from 'lodash'; -import { ContainerStats } from '@CE/react/docker/containers/queries/useContainerStats'; -import { ValueOf } from '@CE/types'; +import { ContainerStats } from '@/react/docker/containers/queries/useContainerStats'; +import { ValueOf } from '@/types'; /** * This type is arbitrary and only defined based on what we use / observed from the API responses. diff --git a/app/docker/models/image.ts b/app/docker/models/image.ts index 33d72cbcf..862352742 100644 --- a/app/docker/models/image.ts +++ b/app/docker/models/image.ts @@ -1,6 +1,6 @@ import { ImageSummary } from 'docker-types/generated/1.44'; -import { PortainerResponse } from '@CE/react/docker/types'; +import { PortainerResponse } from '@/react/docker/types'; export type ImageId = ImageSummary['Id']; export type ImageName = string; diff --git a/app/docker/models/imageLayer.ts b/app/docker/models/imageLayer.ts index 90df88d4d..956ed364d 100644 --- a/app/docker/models/imageLayer.ts +++ b/app/docker/models/imageLayer.ts @@ -1,4 +1,4 @@ -import { ImageLayer } from '@CE/react/docker/proxy/queries/images/useImageHistory'; +import { ImageLayer } from '@/react/docker/proxy/queries/images/useImageHistory'; export class ImageLayerViewModel implements ImageLayer { Id: ImageLayer['Id']; diff --git a/app/docker/models/network.ts b/app/docker/models/network.ts index 0ac04abfe..b17c16b74 100644 --- a/app/docker/models/network.ts +++ b/app/docker/models/network.ts @@ -1,8 +1,8 @@ import { IPAM, Network, NetworkContainer } from 'docker-types/generated/1.44'; -import { ResourceControlViewModel } from '@CE/react/portainer/access-control/models/ResourceControlViewModel'; -import { IResource } from '@CE/react/docker/components/datatable/createOwnershipColumn'; -import { PortainerResponse } from '@CE/react/docker/types'; +import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; +import { IResource } from '@/react/docker/components/datatable/createOwnershipColumn'; +import { PortainerResponse } from '@/react/docker/types'; // TODO later: aggregate NetworkViewModel and DockerNetwork types // diff --git a/app/docker/models/secret.ts b/app/docker/models/secret.ts index 6b4738d9b..d7e78100e 100644 --- a/app/docker/models/secret.ts +++ b/app/docker/models/secret.ts @@ -1,8 +1,8 @@ import { Secret } from 'docker-types/generated/1.44'; -import { ResourceControlViewModel } from '@CE/react/portainer/access-control/models/ResourceControlViewModel'; -import { PortainerResponse } from '@CE/react/docker/types'; -import { IResource } from '@CE/react/docker/components/datatable/createOwnershipColumn'; +import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; +import { PortainerResponse } from '@/react/docker/types'; +import { IResource } from '@/react/docker/components/datatable/createOwnershipColumn'; export class SecretViewModel implements IResource { Id: string; diff --git a/app/docker/models/service.ts b/app/docker/models/service.ts index 030317ef1..1d5cb8e69 100644 --- a/app/docker/models/service.ts +++ b/app/docker/models/service.ts @@ -8,8 +8,8 @@ import { TaskSpec, } from 'docker-types/generated/1.44'; -import { ResourceControlViewModel } from '@CE/react/portainer/access-control/models/ResourceControlViewModel'; -import { PortainerResponse } from '@CE/react/docker/types'; +import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; +import { PortainerResponse } from '@/react/docker/types'; import { TaskViewModel } from './task'; diff --git a/app/docker/models/task.ts b/app/docker/models/task.ts index 24ac9150a..aff4cfd4c 100644 --- a/app/docker/models/task.ts +++ b/app/docker/models/task.ts @@ -1,6 +1,6 @@ import { Task } from 'docker-types/generated/1.44'; -import { DeepPick } from '@CE/types/deepPick'; +import { DeepPick } from '@/types/deepPick'; export class TaskViewModel { Id: NonNullable; diff --git a/app/docker/models/volume.ts b/app/docker/models/volume.ts index 50fcd10a0..7fc34312e 100644 --- a/app/docker/models/volume.ts +++ b/app/docker/models/volume.ts @@ -1,8 +1,8 @@ import { Volume } from 'docker-types/generated/1.44'; -import { ResourceControlViewModel } from '@CE/react/portainer/access-control/models/ResourceControlViewModel'; -import { IResource } from '@CE/react/docker/components/datatable/createOwnershipColumn'; -import { PortainerResponse } from '@CE/react/docker/types'; +import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; +import { IResource } from '@/react/docker/components/datatable/createOwnershipColumn'; +import { PortainerResponse } from '@/react/docker/types'; export class VolumeViewModel implements IResource { Id: string; diff --git a/app/docker/react/components/containers.ts b/app/docker/react/components/containers.ts index 484bfa5b4..e4fd64690 100644 --- a/app/docker/react/components/containers.ts +++ b/app/docker/react/components/containers.ts @@ -1,9 +1,9 @@ import angular from 'angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { r2a } from '@CE/react-tools/react2angular'; -import { ContainerNetworksDatatable } from '@CE/react/docker/containers/ItemView/ContainerNetworksDatatable'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { r2a } from '@/react-tools/react2angular'; +import { ContainerNetworksDatatable } from '@/react/docker/containers/ItemView/ContainerNetworksDatatable'; const ngModule = angular .module('portainer.docker.react.components.containers', []) diff --git a/app/docker/react/components/index.ts b/app/docker/react/components/index.ts index 969e21bf7..3d5349699 100644 --- a/app/docker/react/components/index.ts +++ b/app/docker/react/components/index.ts @@ -1,22 +1,22 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withControlledInput } from '@CE/react-tools/withControlledInput'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { DockerfileDetails } from '@CE/react/docker/images/ItemView/DockerfileDetails'; -import { HealthStatus } from '@CE/react/docker/containers/ItemView/HealthStatus'; -import { GpusList } from '@CE/react/docker/host/SetupView/GpusList'; -import { InsightsBox } from '@CE/react/components/InsightsBox'; -import { BetaAlert } from '@CE/react/portainer/environments/update-schedules/common/BetaAlert'; -import { EventsDatatable } from '@CE/react/docker/events/EventsDatatables'; -import { AgentHostBrowser } from '@CE/react/docker/host/BrowseView/AgentHostBrowser'; -import { AgentVolumeBrowser } from '@CE/react/docker/volumes/BrowseView/AgentVolumeBrowser'; -import { ProcessesDatatable } from '@CE/react/docker/containers/StatsView/ProcessesDatatable'; -import { SecretsDatatable } from '@CE/react/docker/secrets/ListView/SecretsDatatable'; -import { StacksDatatable } from '@CE/react/docker/stacks/ListView/StacksDatatable'; -import { NetworksDatatable } from '@CE/react/docker/networks/ListView/NetworksDatatable'; +import { r2a } from '@/react-tools/react2angular'; +import { withControlledInput } from '@/react-tools/withControlledInput'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { DockerfileDetails } from '@/react/docker/images/ItemView/DockerfileDetails'; +import { HealthStatus } from '@/react/docker/containers/ItemView/HealthStatus'; +import { GpusList } from '@/react/docker/host/SetupView/GpusList'; +import { InsightsBox } from '@/react/components/InsightsBox'; +import { BetaAlert } from '@/react/portainer/environments/update-schedules/common/BetaAlert'; +import { EventsDatatable } from '@/react/docker/events/EventsDatatables'; +import { AgentHostBrowser } from '@/react/docker/host/BrowseView/AgentHostBrowser'; +import { AgentVolumeBrowser } from '@/react/docker/volumes/BrowseView/AgentVolumeBrowser'; +import { ProcessesDatatable } from '@/react/docker/containers/StatsView/ProcessesDatatable'; +import { SecretsDatatable } from '@/react/docker/secrets/ListView/SecretsDatatable'; +import { StacksDatatable } from '@/react/docker/stacks/ListView/StacksDatatable'; +import { NetworksDatatable } from '@/react/docker/networks/ListView/NetworksDatatable'; import { containersModule } from './containers'; import { servicesModule } from './services'; diff --git a/app/docker/react/components/networks.ts b/app/docker/react/components/networks.ts index 05fb4d1d0..eb6b4e72c 100644 --- a/app/docker/react/components/networks.ts +++ b/app/docker/react/components/networks.ts @@ -1,8 +1,8 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { MacvlanNodesSelector } from '@CE/react/docker/networks/CreateView/MacvlanNodesSelector/MacvlanNodesSelector'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; +import { r2a } from '@/react-tools/react2angular'; +import { MacvlanNodesSelector } from '@/react/docker/networks/CreateView/MacvlanNodesSelector/MacvlanNodesSelector'; +import { withUIRouter } from '@/react-tools/withUIRouter'; export const networksModule = angular .module('portainer.docker.react.components.networks', []) diff --git a/app/docker/react/components/services.ts b/app/docker/react/components/services.ts index 9a6cb6a68..d5abd06d4 100644 --- a/app/docker/react/components/services.ts +++ b/app/docker/react/components/services.ts @@ -1,17 +1,17 @@ import angular from 'angular'; import { SchemaOf } from 'yup'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { ServicesDatatable } from '@CE/react/docker/services/ListView/ServicesDatatable'; -import { TasksDatatable } from '@CE/react/docker/services/ItemView/TasksDatatable'; +import { r2a } from '@/react-tools/react2angular'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { ServicesDatatable } from '@/react/docker/services/ListView/ServicesDatatable'; +import { TasksDatatable } from '@/react/docker/services/ItemView/TasksDatatable'; import { PortsMappingField, portsMappingUtils, PortsMappingValues, -} from '@CE/react/docker/services/ItemView/PortMappingField'; -import { withFormValidation } from '@CE/react-tools/withFormValidation'; +} from '@/react/docker/services/ItemView/PortMappingField'; +import { withFormValidation } from '@/react-tools/withFormValidation'; const ngModule = angular .module('portainer.docker.react.components.services', []) diff --git a/app/docker/react/components/swarm.ts b/app/docker/react/components/swarm.ts index c85b1f6a3..b96f9a6f8 100644 --- a/app/docker/react/components/swarm.ts +++ b/app/docker/react/components/swarm.ts @@ -1,8 +1,8 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { NodesDatatable } from '@CE/react/docker/swarm/SwarmView/NodesDatatable'; +import { r2a } from '@/react-tools/react2angular'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { NodesDatatable } from '@/react/docker/swarm/SwarmView/NodesDatatable'; export const swarmModule = angular .module('portainer.docker.react.components.swarm', []) diff --git a/app/docker/react/components/volumes.ts b/app/docker/react/components/volumes.ts index cabcdd08c..994e9ec7b 100644 --- a/app/docker/react/components/volumes.ts +++ b/app/docker/react/components/volumes.ts @@ -1,9 +1,9 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { VolumesDatatable } from '@CE/react/docker/volumes/ListView/VolumesDatatable'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; +import { r2a } from '@/react-tools/react2angular'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { VolumesDatatable } from '@/react/docker/volumes/ListView/VolumesDatatable'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; export const volumesModule = angular .module('portainer.docker.react.components.volumes', []) diff --git a/app/docker/react/views/configs.ts b/app/docker/react/views/configs.ts index a556e8945..17ef0c0ee 100644 --- a/app/docker/react/views/configs.ts +++ b/app/docker/react/views/configs.ts @@ -1,10 +1,10 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { ListView } from '@CE/react/docker/configs/ListView/ListView'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { ListView } from '@/react/docker/configs/ListView/ListView'; export const configsModule = angular .module('portainer.docker.react.views.configs', []) diff --git a/app/docker/react/views/containers.ts b/app/docker/react/views/containers.ts index 62f7a38a1..9780c0719 100644 --- a/app/docker/react/views/containers.ts +++ b/app/docker/react/views/containers.ts @@ -1,14 +1,14 @@ import { StateRegistry } from '@uirouter/angularjs'; import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { ListView } from '@CE/react/docker/containers/ListView'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { LogView } from '@CE/react/docker/containers/LogView'; -import { CreateView } from '@CE/react/docker/containers/CreateView'; -import { InspectView } from '@CE/react/docker/containers/InspectView/InspectView'; +import { r2a } from '@/react-tools/react2angular'; +import { ListView } from '@/react/docker/containers/ListView'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { LogView } from '@/react/docker/containers/LogView'; +import { CreateView } from '@/react/docker/containers/CreateView'; +import { InspectView } from '@/react/docker/containers/InspectView/InspectView'; export const containersModule = angular .module('portainer.docker.react.views.containers', []) @@ -53,7 +53,7 @@ function config($stateRegistryProvider: StateRegistry) { url: '/:id?nodeName', views: { 'content@': { - templateUrl: '~@CE/docker/views/containers/edit/container.html', + templateUrl: '~@/docker/views/containers/edit/container.html', controller: 'ContainerController', }, }, @@ -64,7 +64,7 @@ function config($stateRegistryProvider: StateRegistry) { url: '/attach', views: { 'content@': { - templateUrl: '~@CE/docker/views/containers/console/attach.html', + templateUrl: '~@/docker/views/containers/console/attach.html', controller: 'ContainerConsoleController', }, }, @@ -75,7 +75,7 @@ function config($stateRegistryProvider: StateRegistry) { url: '/exec', views: { 'content@': { - templateUrl: '~@CE/docker/views/containers/console/exec.html', + templateUrl: '~@/docker/views/containers/console/exec.html', controller: 'ContainerConsoleController', }, }, @@ -109,7 +109,7 @@ function config($stateRegistryProvider: StateRegistry) { url: '/logs', views: { 'content@': { - templateUrl: '~@CE/docker/views/containers/logs/containerlogs.html', + templateUrl: '~@/docker/views/containers/logs/containerlogs.html', controller: 'ContainerLogsController', }, }, @@ -120,7 +120,7 @@ function config($stateRegistryProvider: StateRegistry) { url: '/stats', views: { 'content@': { - templateUrl: '~@CE/docker/views/containers/stats/containerstats.html', + templateUrl: '~@/docker/views/containers/stats/containerstats.html', controller: 'ContainerStatsController', }, }, diff --git a/app/docker/react/views/images.ts b/app/docker/react/views/images.ts index 80603fae8..c486c111a 100644 --- a/app/docker/react/views/images.ts +++ b/app/docker/react/views/images.ts @@ -1,9 +1,9 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { ListView } from '@CE/react/docker/images/ListView/ListView'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { ListView } from '@/react/docker/images/ListView/ListView'; export const imagesModule = angular .module('portainer.docker.react.views.images', []) diff --git a/app/docker/react/views/index.ts b/app/docker/react/views/index.ts index a9b449324..07da95a7f 100644 --- a/app/docker/react/views/index.ts +++ b/app/docker/react/views/index.ts @@ -1,11 +1,11 @@ import angular from 'angular'; -import { ItemView as NetworksItemView } from '@CE/react/docker/networks/ItemView'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { DashboardView } from '@CE/react/docker/DashboardView/DashboardView'; -import { ListView } from '@CE/react/docker/events/ListView'; +import { ItemView as NetworksItemView } from '@/react/docker/networks/ItemView'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { DashboardView } from '@/react/docker/DashboardView/DashboardView'; +import { ListView } from '@/react/docker/events/ListView'; import { containersModule } from './containers'; import { configsModule } from './configs'; diff --git a/app/docker/react/views/stacks.ts b/app/docker/react/views/stacks.ts index 746914f65..713c8c2ad 100644 --- a/app/docker/react/views/stacks.ts +++ b/app/docker/react/views/stacks.ts @@ -1,10 +1,10 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { ItemView } from '@CE/react/docker/stacks/ItemView/ItemView'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { ItemView } from '@/react/docker/stacks/ItemView/ItemView'; export const stacksModule = angular .module('portainer.docker.stacks', []) diff --git a/app/docker/services/buildService.js b/app/docker/services/buildService.js index 278c97d5e..7cf41a940 100644 --- a/app/docker/services/buildService.js +++ b/app/docker/services/buildService.js @@ -3,7 +3,7 @@ import { buildImageFromDockerfileContentAndFiles, buildImageFromURL, buildImageFromUpload, -} from '@CE/react/docker/images/queries/useBuildImageMutation'; +} from '@/react/docker/images/queries/useBuildImageMutation'; import { ImageBuildModel } from '../models/build'; diff --git a/app/docker/services/configService.js b/app/docker/services/configService.js index 89647137e..215841d29 100644 --- a/app/docker/services/configService.js +++ b/app/docker/services/configService.js @@ -1,9 +1,9 @@ -import { getConfig } from '@CE/react/docker/configs/queries/useConfig'; -import { getConfigs } from '@CE/react/docker/configs/queries/useConfigs'; +import { getConfig } from '@/react/docker/configs/queries/useConfig'; +import { getConfigs } from '@/react/docker/configs/queries/useConfigs'; -import { deleteConfig } from '@CE/react/docker/configs/queries/useDeleteConfigMutation'; -import { createConfig } from '@CE/react/docker/configs/queries/useCreateConfigMutation'; -import { ConfigViewModel } from '@CE/react/docker/configs/model'; +import { deleteConfig } from '@/react/docker/configs/queries/useDeleteConfigMutation'; +import { createConfig } from '@/react/docker/configs/queries/useCreateConfigMutation'; +import { ConfigViewModel } from '@/react/docker/configs/model'; angular.module('portainer.docker').factory('ConfigService', ConfigServiceFactory); diff --git a/app/docker/services/containerService.js b/app/docker/services/containerService.js index b9dcda99e..2e284be3d 100644 --- a/app/docker/services/containerService.js +++ b/app/docker/services/containerService.js @@ -10,14 +10,14 @@ import { stopContainer, recreateContainer, getContainerLogs, -} from '@CE/react/docker/containers/containers.service'; -import { getContainers } from '@CE/react/docker/containers/queries/useContainers'; -import { getContainer } from '@CE/react/docker/containers/queries/useContainer'; -import { resizeTTY } from '@CE/react/docker/containers/queries/useContainerResizeTTYMutation'; -import { updateContainer } from '@CE/react/docker/containers/queries/useUpdateContainer'; -import { createExec } from '@CE/react/docker/containers/queries/useCreateExecMutation'; -import { containerStats } from '@CE/react/docker/containers/queries/useContainerStats'; -import { getContainerTop } from '@CE/react/docker/containers/queries/useContainerTop'; +} from '@/react/docker/containers/containers.service'; +import { getContainers } from '@/react/docker/containers/queries/useContainers'; +import { getContainer } from '@/react/docker/containers/queries/useContainer'; +import { resizeTTY } from '@/react/docker/containers/queries/useContainerResizeTTYMutation'; +import { updateContainer } from '@/react/docker/containers/queries/useUpdateContainer'; +import { createExec } from '@/react/docker/containers/queries/useCreateExecMutation'; +import { containerStats } from '@/react/docker/containers/queries/useContainerStats'; +import { getContainerTop } from '@/react/docker/containers/queries/useContainerTop'; import { ContainerDetailsViewModel } from '../models/containerDetails'; import { ContainerStatsViewModel } from '../models/containerStats'; diff --git a/app/docker/services/execService.js b/app/docker/services/execService.js index def35fc37..8bc6cd405 100644 --- a/app/docker/services/execService.js +++ b/app/docker/services/execService.js @@ -1,4 +1,4 @@ -import { resizeTTY } from '@CE/react/docker/proxy/queries/useExecResizeTTYMutation'; +import { resizeTTY } from '@/react/docker/proxy/queries/useExecResizeTTYMutation'; angular.module('portainer.docker').factory('ExecService', ExecServiceFactory); diff --git a/app/docker/services/imageService.js b/app/docker/services/imageService.js index baf175a82..94ffe5c73 100644 --- a/app/docker/services/imageService.js +++ b/app/docker/services/imageService.js @@ -1,17 +1,17 @@ import { groupBy } from 'lodash'; -import { getUniqueTagListFromImages } from '@CE/react/docker/images/utils'; -import { getImage } from '@CE/react/docker/proxy/queries/images/useImage'; -import { parseAxiosError } from '@CE/portainer/services/axios'; -import { getImages } from '@CE/react/docker/proxy/queries/images/useImages'; -import { getContainers } from '@CE/react/docker/containers/queries/useContainers'; -import { getImageHistory } from '@CE/react/docker/proxy/queries/images/useImageHistory'; -import { pullImage } from '@CE/react/docker/images/queries/usePullImageMutation'; -import { pushImage } from '@CE/react/docker/images/queries/usePushImageMutation'; -import { removeImage } from '@CE/react/docker/proxy/queries/images/useRemoveImageMutation'; -import { tagImage } from '@CE/react/docker/proxy/queries/images/useTagImageMutation'; -import { downloadImages } from '@CE/react/docker/proxy/queries/images/useDownloadImages'; -import { uploadImages } from '@CE/react/docker/proxy/queries/images/useUploadImageMutation'; +import { getUniqueTagListFromImages } from '@/react/docker/images/utils'; +import { getImage } from '@/react/docker/proxy/queries/images/useImage'; +import { parseAxiosError } from '@/portainer/services/axios'; +import { getImages } from '@/react/docker/proxy/queries/images/useImages'; +import { getContainers } from '@/react/docker/containers/queries/useContainers'; +import { getImageHistory } from '@/react/docker/proxy/queries/images/useImageHistory'; +import { pullImage } from '@/react/docker/images/queries/usePullImageMutation'; +import { pushImage } from '@/react/docker/images/queries/usePushImageMutation'; +import { removeImage } from '@/react/docker/proxy/queries/images/useRemoveImageMutation'; +import { tagImage } from '@/react/docker/proxy/queries/images/useTagImageMutation'; +import { downloadImages } from '@/react/docker/proxy/queries/images/useDownloadImages'; +import { uploadImages } from '@/react/docker/proxy/queries/images/useUploadImageMutation'; import { ImageViewModel } from '../models/image'; import { ImageDetailsViewModel } from '../models/imageDetails'; diff --git a/app/docker/services/networkService.js b/app/docker/services/networkService.js index fe4e714dc..dc407d404 100644 --- a/app/docker/services/networkService.js +++ b/app/docker/services/networkService.js @@ -1,8 +1,8 @@ -import { createNetwork } from '@CE/react/docker/networks/queries/useCreateNetworkMutation'; -import { getNetwork } from '@CE/react/docker/networks/queries/useNetwork'; -import { getNetworks } from '@CE/react/docker/networks/queries/useNetworks'; -import { deleteNetwork } from '@CE/react/docker/networks/queries/useDeleteNetworkMutation'; -import { connectContainer } from '@CE/react/docker/networks/queries/useConnectContainerMutation'; +import { createNetwork } from '@/react/docker/networks/queries/useCreateNetworkMutation'; +import { getNetwork } from '@/react/docker/networks/queries/useNetwork'; +import { getNetworks } from '@/react/docker/networks/queries/useNetworks'; +import { deleteNetwork } from '@/react/docker/networks/queries/useDeleteNetworkMutation'; +import { connectContainer } from '@/react/docker/networks/queries/useConnectContainerMutation'; import { NetworkViewModel } from '../models/network'; diff --git a/app/docker/services/nodeService.js b/app/docker/services/nodeService.js index f55101af1..201045eef 100644 --- a/app/docker/services/nodeService.js +++ b/app/docker/services/nodeService.js @@ -1,6 +1,6 @@ -import { getNode } from '@CE/react/docker/proxy/queries/nodes/useNode'; -import { getNodes } from '@CE/react/docker/proxy/queries/nodes/useNodes'; -import { updateNode } from '@CE/react/docker/proxy/queries/nodes/useUpdateNodeMutation'; +import { getNode } from '@/react/docker/proxy/queries/nodes/useNode'; +import { getNodes } from '@/react/docker/proxy/queries/nodes/useNodes'; +import { updateNode } from '@/react/docker/proxy/queries/nodes/useUpdateNodeMutation'; import { NodeViewModel } from '../models/node'; diff --git a/app/docker/services/pluginService.js b/app/docker/services/pluginService.js index 0e1213ab3..e1df43a14 100644 --- a/app/docker/services/pluginService.js +++ b/app/docker/services/pluginService.js @@ -1,6 +1,6 @@ -import { isFulfilled } from '@CE/portainer/helpers/promise-utils'; -import { getInfo } from '@CE/react/docker/proxy/queries/useInfo'; -import { aggregateData, getPlugins } from '@CE/react/docker/proxy/queries/usePlugins'; +import { isFulfilled } from '@/portainer/helpers/promise-utils'; +import { getInfo } from '@/react/docker/proxy/queries/useInfo'; +import { aggregateData, getPlugins } from '@/react/docker/proxy/queries/usePlugins'; angular.module('portainer.docker').factory('PluginService', PluginServiceFactory); diff --git a/app/docker/services/secretService.js b/app/docker/services/secretService.js index 93762d6c6..48b72c6be 100644 --- a/app/docker/services/secretService.js +++ b/app/docker/services/secretService.js @@ -1,7 +1,7 @@ -import { getSecret } from '@CE/react/docker/proxy/queries/secrets/useSecret'; -import { getSecrets } from '@CE/react/docker/proxy/queries/secrets/useSecrets'; -import { removeSecret } from '@CE/react/docker/proxy/queries/secrets/useRemoveSecretMutation'; -import { createSecret } from '@CE/react/docker/proxy/queries/secrets/useCreateSecretMutation'; +import { getSecret } from '@/react/docker/proxy/queries/secrets/useSecret'; +import { getSecrets } from '@/react/docker/proxy/queries/secrets/useSecrets'; +import { removeSecret } from '@/react/docker/proxy/queries/secrets/useRemoveSecretMutation'; +import { createSecret } from '@/react/docker/proxy/queries/secrets/useCreateSecretMutation'; import { SecretViewModel } from '../models/secret'; diff --git a/app/docker/services/serviceService.js b/app/docker/services/serviceService.js index f801b0620..a3146b7d7 100644 --- a/app/docker/services/serviceService.js +++ b/app/docker/services/serviceService.js @@ -1,9 +1,9 @@ -import { removeService } from '@CE/react/docker/services/ListView/ServicesDatatable/useRemoveServicesMutation'; -import { createService } from '@CE/react/docker/services/queries/useCreateServiceMutation'; -import { getService } from '@CE/react/docker/services/queries/useService'; -import { getServices } from '@CE/react/docker/services/queries/useServices'; -import { updateService } from '@CE/react/docker/services/queries/useUpdateServiceMutation'; -import { getServiceLogs } from '@CE/react/docker/services/queries/useServiceLogs'; +import { removeService } from '@/react/docker/services/ListView/ServicesDatatable/useRemoveServicesMutation'; +import { createService } from '@/react/docker/services/queries/useCreateServiceMutation'; +import { getService } from '@/react/docker/services/queries/useService'; +import { getServices } from '@/react/docker/services/queries/useServices'; +import { updateService } from '@/react/docker/services/queries/useUpdateServiceMutation'; +import { getServiceLogs } from '@/react/docker/services/queries/useServiceLogs'; import { ServiceViewModel } from '../models/service'; import { formatLogs } from '../helpers/logHelper'; diff --git a/app/docker/services/swarmService.js b/app/docker/services/swarmService.js index bef71dc9d..b6269b32c 100644 --- a/app/docker/services/swarmService.js +++ b/app/docker/services/swarmService.js @@ -1,4 +1,4 @@ -import { getSwarm } from '@CE/react/docker/proxy/queries/useSwarm'; +import { getSwarm } from '@/react/docker/proxy/queries/useSwarm'; angular.module('portainer.docker').factory('SwarmService', SwarmServiceFactory); diff --git a/app/docker/services/systemService.js b/app/docker/services/systemService.js index 4647e7ea2..9c945527d 100644 --- a/app/docker/services/systemService.js +++ b/app/docker/services/systemService.js @@ -1,6 +1,6 @@ -import { ping } from '@CE/react/docker/proxy/queries/usePing'; -import { getInfo } from '@CE/react/docker/proxy/queries/useInfo'; -import { getVersion } from '@CE/react/docker/proxy/queries/useVersion'; +import { ping } from '@/react/docker/proxy/queries/usePing'; +import { getInfo } from '@/react/docker/proxy/queries/useInfo'; +import { getVersion } from '@/react/docker/proxy/queries/useVersion'; angular.module('portainer.docker').factory('SystemService', SystemServiceFactory); diff --git a/app/docker/services/taskService.js b/app/docker/services/taskService.js index bf1f67f6e..f779a11f7 100644 --- a/app/docker/services/taskService.js +++ b/app/docker/services/taskService.js @@ -1,6 +1,6 @@ -import { getTask } from '@CE/react/docker/tasks/queries/useTask'; -import { getTasks } from '@CE/react/docker/proxy/queries/tasks/useTasks'; -import { getTaskLogs } from '@CE/react/docker/tasks/queries/useTaskLogs'; +import { getTask } from '@/react/docker/tasks/queries/useTask'; +import { getTasks } from '@/react/docker/proxy/queries/tasks/useTasks'; +import { getTaskLogs } from '@/react/docker/tasks/queries/useTaskLogs'; import { TaskViewModel } from '../models/task'; import { formatLogs } from '../helpers/logHelper'; diff --git a/app/docker/services/volumeService.js b/app/docker/services/volumeService.js index afdcd12ca..475b32dfd 100644 --- a/app/docker/services/volumeService.js +++ b/app/docker/services/volumeService.js @@ -1,7 +1,7 @@ -import { getVolumes } from '@CE/react/docker/volumes/queries/useVolumes'; -import { getVolume } from '@CE/react/docker/volumes/queries/useVolume'; -import { removeVolume } from '@CE/react/docker/volumes/queries/useRemoveVolumeMutation'; -import { createVolume } from '@CE/react/docker/volumes/queries/useCreateVolumeMutation'; +import { getVolumes } from '@/react/docker/volumes/queries/useVolumes'; +import { getVolume } from '@/react/docker/volumes/queries/useVolume'; +import { removeVolume } from '@/react/docker/volumes/queries/useRemoveVolumeMutation'; +import { createVolume } from '@/react/docker/volumes/queries/useCreateVolumeMutation'; import { VolumeViewModel } from '../models/volume'; diff --git a/app/docker/views/configs/create/createConfigController.js b/app/docker/views/configs/create/createConfigController.js index 7960f0ded..ce1abc3f7 100644 --- a/app/docker/views/configs/create/createConfigController.js +++ b/app/docker/views/configs/create/createConfigController.js @@ -1,7 +1,7 @@ import _ from 'lodash-es'; import angular from 'angular'; import { AccessControlFormData } from 'Portainer/components/accessControlForm/porAccessControlFormModel'; -import { confirmWebEditorDiscard } from '@@CE/modals/confirm'; +import { confirmWebEditorDiscard } from '@@/modals/confirm'; class CreateConfigController { /* @ngInject */ diff --git a/app/docker/views/configs/edit/configController.js b/app/docker/views/configs/edit/configController.js index c1c94d089..9d8fc398a 100644 --- a/app/docker/views/configs/edit/configController.js +++ b/app/docker/views/configs/edit/configController.js @@ -1,4 +1,4 @@ -import { ResourceControlType } from '@CE/react/portainer/access-control/types'; +import { ResourceControlType } from '@/react/portainer/access-control/types'; angular.module('portainer.docker').controller('ConfigController', [ '$scope', diff --git a/app/docker/views/containers/console/containerConsoleController.js b/app/docker/views/containers/console/containerConsoleController.js index 88e9fcf4f..5cc792b08 100644 --- a/app/docker/views/containers/console/containerConsoleController.js +++ b/app/docker/views/containers/console/containerConsoleController.js @@ -1,6 +1,6 @@ import { Terminal } from 'xterm'; -import { baseHref } from '@CE/portainer/helpers/pathHelper'; -import { commandStringToArray } from '@CE/docker/helpers/containers'; +import { baseHref } from '@/portainer/helpers/pathHelper'; +import { commandStringToArray } from '@/docker/helpers/containers'; angular.module('portainer.docker').controller('ContainerConsoleController', [ '$scope', diff --git a/app/docker/views/containers/edit/containerController.js b/app/docker/views/containers/edit/containerController.js index 7cf65c28a..f1ff8f27c 100644 --- a/app/docker/views/containers/edit/containerController.js +++ b/app/docker/views/containers/edit/containerController.js @@ -1,12 +1,12 @@ import moment from 'moment'; import _ from 'lodash-es'; import { PorImageRegistryModel } from 'Docker/models/porImageRegistry'; -import { confirmContainerDeletion } from '@CE/react/docker/containers/common/confirm-container-delete-modal'; -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; -import { ResourceControlType } from '@CE/react/portainer/access-control/types'; -import { confirmContainerRecreation } from '@CE/react/docker/containers/ItemView/ConfirmRecreationModal'; -import { commitContainer } from '@CE/react/docker/proxy/queries/useCommitContainerMutation'; -import { ContainerEngine } from '@CE/react/portainer/environments/types'; +import { confirmContainerDeletion } from '@/react/docker/containers/common/confirm-container-delete-modal'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; +import { ResourceControlType } from '@/react/portainer/access-control/types'; +import { confirmContainerRecreation } from '@/react/docker/containers/ItemView/ConfirmRecreationModal'; +import { commitContainer } from '@/react/docker/proxy/queries/useCommitContainerMutation'; +import { ContainerEngine } from '@/react/portainer/environments/types'; angular.module('portainer.docker').controller('ContainerController', [ '$q', diff --git a/app/docker/views/docker-features-configuration/docker-features-configuration.controller.js b/app/docker/views/docker-features-configuration/docker-features-configuration.controller.js index 64e3741de..9db6919d1 100644 --- a/app/docker/views/docker-features-configuration/docker-features-configuration.controller.js +++ b/app/docker/views/docker-features-configuration/docker-features-configuration.controller.js @@ -1,4 +1,4 @@ -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; export default class DockerFeaturesConfigurationController { /* @ngInject */ diff --git a/app/docker/views/images/build/buildImageController.js b/app/docker/views/images/build/buildImageController.js index 6fbb64bdd..553b15049 100644 --- a/app/docker/views/images/build/buildImageController.js +++ b/app/docker/views/images/build/buildImageController.js @@ -1,5 +1,5 @@ -import { confirmWebEditorDiscard } from '@@CE/modals/confirm'; -import { editor, upload, url } from '@@CE/BoxSelector/common-options/build-methods'; +import { confirmWebEditorDiscard } from '@@/modals/confirm'; +import { editor, upload, url } from '@@/BoxSelector/common-options/build-methods'; angular.module('portainer.docker').controller('BuildImageController', BuildImageController); diff --git a/app/docker/views/images/edit/imageController.js b/app/docker/views/images/edit/imageController.js index 27868d618..898fe3920 100644 --- a/app/docker/views/images/edit/imageController.js +++ b/app/docker/views/images/edit/imageController.js @@ -1,7 +1,7 @@ import _ from 'lodash-es'; import { PorImageRegistryModel } from 'Docker/models/porImageRegistry'; -import { confirmImageExport } from '@CE/react/docker/images/common/ConfirmExportModal'; -import { confirmDelete } from '@@CE/modals/confirm'; +import { confirmImageExport } from '@/react/docker/images/common/ConfirmExportModal'; +import { confirmDelete } from '@@/modals/confirm'; angular.module('portainer.docker').controller('ImageController', [ '$async', diff --git a/app/docker/views/networks/networksController.js b/app/docker/views/networks/networksController.js index 341584231..5b191bfea 100644 --- a/app/docker/views/networks/networksController.js +++ b/app/docker/views/networks/networksController.js @@ -1,6 +1,6 @@ import _ from 'lodash-es'; -import DockerNetworkHelper from '@CE/docker/helpers/networkHelper'; -import { processItemsInBatches } from '@CE/react/common/processItemsInBatches'; +import DockerNetworkHelper from '@/docker/helpers/networkHelper'; +import { processItemsInBatches } from '@/react/common/processItemsInBatches'; angular.module('portainer.docker').controller('NetworksController', [ '$q', diff --git a/app/docker/views/secrets/edit/secretController.js b/app/docker/views/secrets/edit/secretController.js index f779e5218..cc527f466 100644 --- a/app/docker/views/secrets/edit/secretController.js +++ b/app/docker/views/secrets/edit/secretController.js @@ -1,4 +1,4 @@ -import { ResourceControlType } from '@CE/react/portainer/access-control/types'; +import { ResourceControlType } from '@/react/portainer/access-control/types'; angular.module('portainer.docker').controller('SecretController', SecretController); diff --git a/app/docker/views/secrets/secretsController.js b/app/docker/views/secrets/secretsController.js index 5f3d51ff0..f1d0696ec 100644 --- a/app/docker/views/secrets/secretsController.js +++ b/app/docker/views/secrets/secretsController.js @@ -1,4 +1,4 @@ -import { processItemsInBatches } from '@CE/react/common/processItemsInBatches'; +import { processItemsInBatches } from '@/react/common/processItemsInBatches'; angular.module('portainer.docker').controller('SecretsController', [ '$scope', diff --git a/app/docker/views/services/create/createServiceController.js b/app/docker/views/services/create/createServiceController.js index 30ec83e65..ea7ed4f08 100644 --- a/app/docker/views/services/create/createServiceController.js +++ b/app/docker/views/services/create/createServiceController.js @@ -1,6 +1,6 @@ import _ from 'lodash-es'; -import * as envVarsUtils from '@CE/react/components/form-components/EnvironmentVariablesFieldset/utils'; +import * as envVarsUtils from '@/react/components/form-components/EnvironmentVariablesFieldset/utils'; import { PorImageRegistryModel } from 'Docker/models/porImageRegistry'; import { AccessControlFormData } from '../../../../portainer/components/accessControlForm/porAccessControlFormModel'; diff --git a/app/docker/views/services/edit/serviceController.js b/app/docker/views/services/edit/serviceController.js index 00536dd07..d9f1fa42b 100644 --- a/app/docker/views/services/edit/serviceController.js +++ b/app/docker/views/services/edit/serviceController.js @@ -18,15 +18,15 @@ require('./includes/updateconfig.html'); import _ from 'lodash-es'; -import * as envVarsUtils from '@CE/react/components/form-components/EnvironmentVariablesFieldset/utils'; -import { ResourceControlType } from '@CE/react/portainer/access-control/types'; -import { confirmServiceForceUpdate } from '@CE/react/docker/services/common/update-service-modal'; -import { convertServiceToConfig } from '@CE/react/docker/services/common/convertServiceToConfig'; -import { portsMappingUtils } from '@CE/react/docker/services/ItemView/PortMappingField'; +import * as envVarsUtils from '@/react/components/form-components/EnvironmentVariablesFieldset/utils'; import { PorImageRegistryModel } from 'Docker/models/porImageRegistry'; -import { confirm, confirmDelete } from '@@CE/modals/confirm'; -import { ModalType } from '@@CE/modals'; -import { buildConfirmButton } from '@@CE/modals/utils'; +import { ResourceControlType } from '@/react/portainer/access-control/types'; +import { confirmServiceForceUpdate } from '@/react/docker/services/common/update-service-modal'; +import { confirm, confirmDelete } from '@@/modals/confirm'; +import { ModalType } from '@@/modals'; +import { buildConfirmButton } from '@@/modals/utils'; +import { convertServiceToConfig } from '@/react/docker/services/common/convertServiceToConfig'; +import { portsMappingUtils } from '@/react/docker/services/ItemView/PortMappingField'; angular.module('portainer.docker').controller('ServiceController', [ '$q', diff --git a/app/docker/views/volumes/edit/volumeController.js b/app/docker/views/volumes/edit/volumeController.js index adba0ed5e..84ced2639 100644 --- a/app/docker/views/volumes/edit/volumeController.js +++ b/app/docker/views/volumes/edit/volumeController.js @@ -1,5 +1,5 @@ -import { ResourceControlType } from '@CE/react/portainer/access-control/types'; -import { confirmDelete } from '@@CE/modals/confirm'; +import { ResourceControlType } from '@/react/portainer/access-control/types'; +import { confirmDelete } from '@@/modals/confirm'; angular.module('portainer.docker').controller('VolumeController', [ '$scope', diff --git a/app/docker/views/volumes/volumesController.js b/app/docker/views/volumes/volumesController.js index eacf028eb..b37a012c6 100644 --- a/app/docker/views/volumes/volumesController.js +++ b/app/docker/views/volumes/volumesController.js @@ -1,4 +1,4 @@ -import { processItemsInBatches } from '@CE/react/common/processItemsInBatches'; +import { processItemsInBatches } from '@/react/common/processItemsInBatches'; angular.module('portainer.docker').controller('VolumesController', [ '$q', diff --git a/app/edge/__module.js b/app/edge/__module.js index a754a2349..b5666a7cb 100644 --- a/app/edge/__module.js +++ b/app/edge/__module.js @@ -1,6 +1,6 @@ import angular from 'angular'; -import { AccessHeaders } from '@CE/portainer/authorization-guard'; +import { AccessHeaders } from '@/portainer/authorization-guard'; import { reactModule } from './react'; angular diff --git a/app/edge/react/components/index.ts b/app/edge/react/components/index.ts index ec083df87..1902af60a 100644 --- a/app/edge/react/components/index.ts +++ b/app/edge/react/components/index.ts @@ -1,14 +1,14 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { AssociatedEdgeEnvironmentsSelector } from '@CE/react/edge/components/AssociatedEdgeEnvironmentsSelector'; -import { EdgeAsyncIntervalsForm } from '@CE/react/edge/components/EdgeAsyncIntervalsForm'; -import { EdgeCheckinIntervalField } from '@CE/react/edge/components/EdgeCheckInIntervalField'; -import { EdgeScriptForm } from '@CE/react/edge/components/EdgeScriptForm'; -import { EdgeGroupsSelector } from '@CE/react/edge/edge-stacks/components/EdgeGroupsSelector'; -import { AssociatedEdgeGroupEnvironmentsSelector } from '@CE/react/edge/components/AssociatedEdgeGroupEnvironmentsSelector'; +import { r2a } from '@/react-tools/react2angular'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { AssociatedEdgeEnvironmentsSelector } from '@/react/edge/components/AssociatedEdgeEnvironmentsSelector'; +import { EdgeAsyncIntervalsForm } from '@/react/edge/components/EdgeAsyncIntervalsForm'; +import { EdgeCheckinIntervalField } from '@/react/edge/components/EdgeCheckInIntervalField'; +import { EdgeScriptForm } from '@/react/edge/components/EdgeScriptForm'; +import { EdgeGroupsSelector } from '@/react/edge/edge-stacks/components/EdgeGroupsSelector'; +import { AssociatedEdgeGroupEnvironmentsSelector } from '@/react/edge/components/AssociatedEdgeGroupEnvironmentsSelector'; const ngModule = angular .module('portainer.edge.react.components', []) diff --git a/app/edge/react/views/edge-stacks.ts b/app/edge/react/views/edge-stacks.ts index f03636146..41cbeed7b 100644 --- a/app/edge/react/views/edge-stacks.ts +++ b/app/edge/react/views/edge-stacks.ts @@ -1,11 +1,11 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { CreateView } from '@CE/react/edge/edge-stacks/CreateView/CreateView'; -import { ItemView } from '@CE/react/edge/edge-stacks/ItemView/ItemView'; -import { ListView } from '@CE/react/edge/edge-stacks/ListView'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { CreateView } from '@/react/edge/edge-stacks/CreateView/CreateView'; +import { ItemView } from '@/react/edge/edge-stacks/ItemView/ItemView'; +import { ListView } from '@/react/edge/edge-stacks/ListView'; export const stacksModule = angular .module('portainer.edge.react.views.stacks', []) diff --git a/app/edge/react/views/groups.ts b/app/edge/react/views/groups.ts index 0420affa8..deb51b0f0 100644 --- a/app/edge/react/views/groups.ts +++ b/app/edge/react/views/groups.ts @@ -1,11 +1,11 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { ListView } from '@CE/react/edge/edge-groups/ListView'; -import { CreateView } from '@CE/react/edge/edge-groups/CreateView/CreateView'; -import { ItemView } from '@CE/react/edge/edge-groups/ItemView/ItemView'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { ListView } from '@/react/edge/edge-groups/ListView'; +import { CreateView } from '@/react/edge/edge-groups/CreateView/CreateView'; +import { ItemView } from '@/react/edge/edge-groups/ItemView/ItemView'; export const groupsModule = angular .module('portainer.edge.react.views.groups', []) diff --git a/app/edge/react/views/index.ts b/app/edge/react/views/index.ts index 6f8b2dbf9..9b35040eb 100644 --- a/app/edge/react/views/index.ts +++ b/app/edge/react/views/index.ts @@ -1,10 +1,10 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { WaitingRoomView } from '@CE/react/edge/edge-devices/WaitingRoomView'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { WaitingRoomView } from '@/react/edge/edge-devices/WaitingRoomView'; import { templatesModule } from './templates'; import { jobsModule } from './jobs'; diff --git a/app/edge/react/views/jobs.ts b/app/edge/react/views/jobs.ts index 2a48b0984..1b3aa26ee 100644 --- a/app/edge/react/views/jobs.ts +++ b/app/edge/react/views/jobs.ts @@ -1,11 +1,11 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { ListView } from '@CE/react/edge/edge-jobs/ListView'; -import { CreateView } from '@CE/react/edge/edge-jobs/CreateView/CreateView'; -import { ItemView } from '@CE/react/edge/edge-jobs/ItemView/ItemView'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { ListView } from '@/react/edge/edge-jobs/ListView'; +import { CreateView } from '@/react/edge/edge-jobs/CreateView/CreateView'; +import { ItemView } from '@/react/edge/edge-jobs/ItemView/ItemView'; export const jobsModule = angular .module('portainer.edge.react.views.jobs', []) diff --git a/app/index.js b/app/index.js index 3f7b9cf58..b9d95450c 100644 --- a/app/index.js +++ b/app/index.js @@ -5,8 +5,8 @@ import './i18n'; import angular from 'angular'; import { UI_ROUTER_REACT_HYBRID } from '@uirouter/react-hybrid'; -import { Edition } from '@CE/react/portainer/feature-flags/enums'; -import { init as initFeatureService } from '@CE/react/portainer/feature-flags/feature-flags.service'; +import { Edition } from '@/react/portainer/feature-flags/enums'; +import { init as initFeatureService } from '@/react/portainer/feature-flags/feature-flags.service'; import './agent'; import { azureModule } from './azure'; diff --git a/app/kubernetes/__module.js b/app/kubernetes/__module.js index 6ebe4515d..3c3a91b6f 100644 --- a/app/kubernetes/__module.js +++ b/app/kubernetes/__module.js @@ -1,6 +1,6 @@ -import { EnvironmentStatus } from '@CE/react/portainer/environments/types'; +import { EnvironmentStatus } from '@/react/portainer/environments/types'; -import { updateAxiosAdapter } from '@CE/portainer/services/axios'; +import { updateAxiosAdapter } from '@/portainer/services/axios'; import { PortainerEndpointTypes } from 'Portainer/models/endpoint/models'; import { CACHE_REFRESH_EVENT, CACHE_DURATION } from '../portainer/services/http-request.helper'; import { cache } from '../portainer/services/axios'; diff --git a/app/kubernetes/converters/application.js b/app/kubernetes/converters/application.js index 6f5e27591..c4e9af92f 100644 --- a/app/kubernetes/converters/application.js +++ b/app/kubernetes/converters/application.js @@ -29,7 +29,7 @@ import PortainerError from 'Portainer/error'; import { KubernetesIngressHelper } from 'Kubernetes/ingress/helper'; import KubernetesCommonHelper from 'Kubernetes/helpers/commonHelper'; import { KubernetesConfigurationKinds } from 'Kubernetes/models/configuration/models'; -import { parseCPU } from '@CE/react/kubernetes/utils'; +import { parseCPU } from '@/react/kubernetes/utils'; function _apiPortsToPublishedPorts(pList, pRefs) { const ports = _.map(pList, (item) => { diff --git a/app/kubernetes/converters/configMap.js b/app/kubernetes/converters/configMap.js index 3cda0e92d..7c86df603 100644 --- a/app/kubernetes/converters/configMap.js +++ b/app/kubernetes/converters/configMap.js @@ -2,7 +2,7 @@ import _ from 'lodash-es'; import { KubernetesConfigMap, KubernetesPortainerAccessConfigMap } from 'Kubernetes/models/config-map/models'; import { KubernetesConfigMapCreatePayload, KubernetesConfigMapUpdatePayload } from 'Kubernetes/models/config-map/payloads'; import { KubernetesConfigurationFormValuesEntry } from 'Kubernetes/models/configuration/formvalues'; -import { ConfigurationOwnerUsernameLabel } from '@CE/react/kubernetes/configs/constants'; +import { ConfigurationOwnerUsernameLabel } from '@/react/kubernetes/configs/constants'; class KubernetesConfigMapConverter { static apiToPortainerAccessConfigMap(data) { const res = new KubernetesPortainerAccessConfigMap(); diff --git a/app/kubernetes/converters/daemonSet.js b/app/kubernetes/converters/daemonSet.js index 5575c759d..2770e7bde 100644 --- a/app/kubernetes/converters/daemonSet.js +++ b/app/kubernetes/converters/daemonSet.js @@ -10,7 +10,7 @@ import { import KubernetesApplicationHelper from 'Kubernetes/helpers/application'; import KubernetesResourceReservationHelper from 'Kubernetes/helpers/resourceReservationHelper'; import KubernetesCommonHelper from 'Kubernetes/helpers/commonHelper'; -import { buildImageFullURIFromModel } from '@CE/react/docker/images/utils'; +import { buildImageFullURIFromModel } from '@/react/docker/images/utils'; class KubernetesDaemonSetConverter { /** diff --git a/app/kubernetes/converters/deployment.js b/app/kubernetes/converters/deployment.js index 31add3995..5b391cd01 100644 --- a/app/kubernetes/converters/deployment.js +++ b/app/kubernetes/converters/deployment.js @@ -11,7 +11,7 @@ import { import KubernetesApplicationHelper from 'Kubernetes/helpers/application'; import KubernetesResourceReservationHelper from 'Kubernetes/helpers/resourceReservationHelper'; import KubernetesCommonHelper from 'Kubernetes/helpers/commonHelper'; -import { buildImageFullURIFromModel } from '@CE/react/docker/images/utils'; +import { buildImageFullURIFromModel } from '@/react/docker/images/utils'; class KubernetesDeploymentConverter { /** diff --git a/app/kubernetes/converters/resourceQuota.js b/app/kubernetes/converters/resourceQuota.js index a9b23bb48..393350b19 100644 --- a/app/kubernetes/converters/resourceQuota.js +++ b/app/kubernetes/converters/resourceQuota.js @@ -15,7 +15,7 @@ import { KubernetesPortainerResourcePoolNameLabel, KubernetesPortainerResourcePo import KubernetesResourceReservationHelper from 'Kubernetes/helpers/resourceReservationHelper'; import KubernetesCommonHelper from 'Kubernetes/helpers/commonHelper'; import { KubernetesResourcePoolFormValues } from 'Kubernetes/models/resource-pool/formValues'; -import { parseCPU } from '@CE/react/kubernetes/utils'; +import { parseCPU } from '@/react/kubernetes/utils'; class KubernetesResourceQuotaConverter { static apiToResourceQuota(data, yaml) { diff --git a/app/kubernetes/converters/secret.js b/app/kubernetes/converters/secret.js index 881b7437e..af8290edb 100644 --- a/app/kubernetes/converters/secret.js +++ b/app/kubernetes/converters/secret.js @@ -2,7 +2,7 @@ import _ from 'lodash-es'; import { KubernetesSecretCreatePayload, KubernetesSecretUpdatePayload } from 'Kubernetes/models/secret/payloads'; import { KubernetesApplicationSecret } from 'Kubernetes/models/secret/models'; import { KubernetesPortainerConfigurationDataAnnotation } from 'Kubernetes/models/configuration/models'; -import { ConfigurationOwnerUsernameLabel } from '@CE/react/kubernetes/configs/constants'; +import { ConfigurationOwnerUsernameLabel } from '@/react/kubernetes/configs/constants'; import { KubernetesConfigurationFormValuesEntry } from 'Kubernetes/models/configuration/formvalues'; import { KubernetesSecretTypeOptions } from 'Kubernetes/models/configuration/models'; class KubernetesSecretConverter { diff --git a/app/kubernetes/converters/statefulSet.js b/app/kubernetes/converters/statefulSet.js index 617fadeba..a7c342fd5 100644 --- a/app/kubernetes/converters/statefulSet.js +++ b/app/kubernetes/converters/statefulSet.js @@ -12,7 +12,7 @@ import { import KubernetesApplicationHelper from 'Kubernetes/helpers/application'; import KubernetesResourceReservationHelper from 'Kubernetes/helpers/resourceReservationHelper'; import KubernetesCommonHelper from 'Kubernetes/helpers/commonHelper'; -import { buildImageFullURIFromModel } from '@CE/react/docker/images/utils'; +import { buildImageFullURIFromModel } from '@/react/docker/images/utils'; import KubernetesPersistentVolumeClaimConverter from './persistentVolumeClaim'; class KubernetesStatefulSetConverter { diff --git a/app/kubernetes/filters/applicationFilters.js b/app/kubernetes/filters/applicationFilters.js index 0affe5e18..c6c354394 100644 --- a/app/kubernetes/filters/applicationFilters.js +++ b/app/kubernetes/filters/applicationFilters.js @@ -1,4 +1,4 @@ -import { cpuHumanValue } from '@CE/react/kubernetes/applications/utils/cpuHumanValue'; +import { cpuHumanValue } from '@/react/kubernetes/applications/utils/cpuHumanValue'; import { nodeAffinityValues } from './application'; angular diff --git a/app/kubernetes/helpers/application/index.js b/app/kubernetes/helpers/application/index.js index d2ad11e7f..987560d76 100644 --- a/app/kubernetes/helpers/application/index.js +++ b/app/kubernetes/helpers/application/index.js @@ -21,7 +21,7 @@ import { KubernetesApplicationVolumePersistentPayload, KubernetesApplicationVolumeSecretPayload, } from 'Kubernetes/models/application/payloads'; -import { generatedApplicationConfigVolumeName } from '@CE/react/kubernetes/volumes/utils'; +import { generatedApplicationConfigVolumeName } from '@/react/kubernetes/volumes/utils'; import { HelmApplication } from 'Kubernetes/models/application/models'; import { KubernetesApplicationDeploymentTypes, KubernetesApplicationTypes } from 'Kubernetes/models/application/models/appConstants'; import { KubernetesPodAffinity, KubernetesPodNodeAffinityNodeSelectorRequirementOperators } from 'Kubernetes/pod/models'; @@ -31,7 +31,7 @@ import { KubernetesPodNodeAffinityPayload, KubernetesPreferredSchedulingTermPayload, } from 'Kubernetes/pod/payloads/affinities'; -import { PodKubernetesInstanceLabel, PodManagedByLabel } from '@CE/react/kubernetes/applications/constants'; +import { PodKubernetesInstanceLabel, PodManagedByLabel } from '@/react/kubernetes/applications/constants'; class KubernetesApplicationHelper { /* #region UTILITY FUNCTIONS */ diff --git a/app/kubernetes/helpers/namespaceHelper.js b/app/kubernetes/helpers/namespaceHelper.js index 9f8c28c33..fb67a36a6 100644 --- a/app/kubernetes/helpers/namespaceHelper.js +++ b/app/kubernetes/helpers/namespaceHelper.js @@ -2,7 +2,7 @@ import _ from 'lodash-es'; import { KUBERNETES_DEFAULT_SYSTEM_NAMESPACES } from 'Kubernetes/models/namespace/models'; import { isSystem } from 'Kubernetes/store/namespace'; -import { isDefaultNamespace } from '@CE/react/kubernetes/namespaces/isDefaultNamespace'; +import { isDefaultNamespace } from '@/react/kubernetes/namespaces/isDefaultNamespace'; export default class KubernetesNamespaceHelper { /** diff --git a/app/kubernetes/helpers/resourceReservationHelper.js b/app/kubernetes/helpers/resourceReservationHelper.js index 27b353c0c..fd9c6588e 100644 --- a/app/kubernetes/helpers/resourceReservationHelper.js +++ b/app/kubernetes/helpers/resourceReservationHelper.js @@ -1,7 +1,7 @@ import _ from 'lodash-es'; import filesizeParser from 'filesize-parser'; import { KubernetesResourceReservation } from 'Kubernetes/models/resource-reservation/models'; -import { parseCPU } from '@CE/react/kubernetes/utils'; +import { parseCPU } from '@/react/kubernetes/utils'; class KubernetesResourceReservationHelper { static computeResourceReservation(pods) { diff --git a/app/kubernetes/models/application/formValues.js b/app/kubernetes/models/application/formValues.js index 4b6d21d4c..b1cac46bc 100644 --- a/app/kubernetes/models/application/formValues.js +++ b/app/kubernetes/models/application/formValues.js @@ -1,4 +1,4 @@ -import { PorImageRegistryModel } from '@CE/docker/models/porImageRegistry'; +import { PorImageRegistryModel } from '@/docker/models/porImageRegistry'; import { KubernetesApplicationTypes, KubernetesApplicationDeploymentTypes, KubernetesApplicationDataAccessPolicies } from 'Kubernetes/models/application/models/appConstants'; /** diff --git a/app/kubernetes/models/application/models/Application.ts b/app/kubernetes/models/application/models/Application.ts index fdc078a5a..c8e8aa28c 100644 --- a/app/kubernetes/models/application/models/Application.ts +++ b/app/kubernetes/models/application/models/Application.ts @@ -1,10 +1,10 @@ -import { ServiceType } from '@CE/react/kubernetes/applications/CreateView/application-services/types'; +import { ServiceType } from '@/react/kubernetes/applications/CreateView/application-services/types'; import { AppType, DeploymentType, AppDataAccessPolicy, AppKind, -} from '@CE/react/kubernetes/applications/types'; +} from '@/react/kubernetes/applications/types'; import { ConfigurationVolume } from './ConfigurationVolume'; import { PersistedFolder } from './PersistedFolder'; diff --git a/app/kubernetes/models/application/models/appConstants.ts b/app/kubernetes/models/application/models/appConstants.ts index d340277e0..658fc30c2 100644 --- a/app/kubernetes/models/application/models/appConstants.ts +++ b/app/kubernetes/models/application/models/appConstants.ts @@ -2,8 +2,8 @@ import { AppType, AppDataAccessPolicy, DeploymentType, -} from '@CE/react/kubernetes/applications/types'; -import { ServiceType } from '@CE/react/kubernetes/services/types'; +} from '@/react/kubernetes/applications/types'; +import { ServiceType } from '@/react/kubernetes/services/types'; // The following constants are used by angular views and can be removed once they are no longer referenced export const KubernetesApplicationTypes: Record = { diff --git a/app/kubernetes/node/converter.js b/app/kubernetes/node/converter.js index 64ac09a48..b014e926c 100644 --- a/app/kubernetes/node/converter.js +++ b/app/kubernetes/node/converter.js @@ -4,7 +4,7 @@ import * as JsonPatch from 'fast-json-patch'; import { KubernetesNode, KubernetesNodeDetails, KubernetesNodeTaint, KubernetesNodeAvailabilities, KubernetesPortainerNodeDrainLabel } from 'Kubernetes/node/models'; import { KubernetesNodeFormValues, KubernetesNodeTaintFormValues, KubernetesNodeLabelFormValues } from 'Kubernetes/node/formValues'; import { KubernetesNodeCreatePayload, KubernetesNodeTaintPayload } from 'Kubernetes/node/payload'; -import { parseCPU } from '@CE/react/kubernetes/utils'; +import { parseCPU } from '@/react/kubernetes/utils'; class KubernetesNodeConverter { static apiToNode(data, res) { diff --git a/app/kubernetes/react/components/clusterManagement.ts b/app/kubernetes/react/components/clusterManagement.ts index 0e49e2948..48c1084e3 100644 --- a/app/kubernetes/react/components/clusterManagement.ts +++ b/app/kubernetes/react/components/clusterManagement.ts @@ -1,11 +1,11 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { NodeApplicationsDatatable } from '@CE/react/kubernetes/cluster/NodeView/NodeApplicationsDatatable/NodeApplicationsDatatable'; -import { ResourceEventsDatatable } from '@CE/react/kubernetes/components/EventsDatatable/ResourceEventsDatatable'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; +import { r2a } from '@/react-tools/react2angular'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { NodeApplicationsDatatable } from '@/react/kubernetes/cluster/NodeView/NodeApplicationsDatatable/NodeApplicationsDatatable'; +import { ResourceEventsDatatable } from '@/react/kubernetes/components/EventsDatatable/ResourceEventsDatatable'; +import { withReactQuery } from '@/react-tools/withReactQuery'; export const clusterManagementModule = angular .module('portainer.kubernetes.react.components.clusterManagement', []) diff --git a/app/kubernetes/react/components/index.ts b/app/kubernetes/react/components/index.ts index d648b2831..3d25e105e 100644 --- a/app/kubernetes/react/components/index.ts +++ b/app/kubernetes/react/components/index.ts @@ -1,64 +1,64 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { IngressClassDatatableAngular } from '@CE/react/kubernetes/cluster/ingressClass/IngressClassDatatable/IngressClassDatatableAngular'; -import { NamespacesSelector } from '@CE/react/kubernetes/cluster/RegistryAccessView/NamespacesSelector'; -import { NamespaceAccessUsersSelector } from '@CE/react/kubernetes/namespaces/AccessView/NamespaceAccessUsersSelector'; -import { KubeServicesForm } from '@CE/react/kubernetes/applications/CreateView/application-services/KubeServicesForm'; -import { kubeServicesValidation } from '@CE/react/kubernetes/applications/CreateView/application-services/kubeServicesValidation'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; +import { r2a } from '@/react-tools/react2angular'; +import { IngressClassDatatableAngular } from '@/react/kubernetes/cluster/ingressClass/IngressClassDatatable/IngressClassDatatableAngular'; +import { NamespacesSelector } from '@/react/kubernetes/cluster/RegistryAccessView/NamespacesSelector'; +import { NamespaceAccessUsersSelector } from '@/react/kubernetes/namespaces/AccessView/NamespaceAccessUsersSelector'; +import { KubeServicesForm } from '@/react/kubernetes/applications/CreateView/application-services/KubeServicesForm'; +import { kubeServicesValidation } from '@/react/kubernetes/applications/CreateView/application-services/kubeServicesValidation'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; import { ApplicationSummaryWidget, ApplicationDetailsWidget, ApplicationEventsDatatable, -} from '@CE/react/kubernetes/applications/DetailsView'; -import { ApplicationContainersDatatable } from '@CE/react/kubernetes/applications/DetailsView/ApplicationContainersDatatable'; +} from '@/react/kubernetes/applications/DetailsView'; +import { ApplicationContainersDatatable } from '@/react/kubernetes/applications/DetailsView/ApplicationContainersDatatable'; import { PlacementFormSection, placementValidation, -} from '@CE/react/kubernetes/applications/components/PlacementFormSection'; -import { ApplicationSummarySection } from '@CE/react/kubernetes/applications/components/ApplicationSummarySection'; -import { withFormValidation } from '@CE/react-tools/withFormValidation'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { YAMLInspector } from '@CE/react/kubernetes/components/YAMLInspector'; -import { NodesDatatable } from '@CE/react/kubernetes/cluster/HomeView/NodesDatatable'; -import { StackName } from '@CE/react/kubernetes/DeployView/StackName/StackName'; -import { StackNameLabelInsight } from '@CE/react/kubernetes/DeployView/StackName/StackNameLabelInsight'; -import { SecretsFormSection } from '@CE/react/kubernetes/applications/components/ConfigurationsFormSection/SecretsFormSection'; -import { configurationsValidationSchema } from '@CE/react/kubernetes/applications/components/ConfigurationsFormSection/configurationValidationSchema'; -import { ConfigMapsFormSection } from '@CE/react/kubernetes/applications/components/ConfigurationsFormSection/ConfigMapsFormSection'; -import { PersistedFoldersFormSection } from '@CE/react/kubernetes/applications/components/PersistedFoldersFormSection'; -import { DataAccessPolicyFormSection } from '@CE/react/kubernetes/applications/CreateView/DataAccessPolicyFormSection'; -import { persistedFoldersValidation } from '@CE/react/kubernetes/applications/components/PersistedFoldersFormSection/persistedFoldersValidation'; +} from '@/react/kubernetes/applications/components/PlacementFormSection'; +import { ApplicationSummarySection } from '@/react/kubernetes/applications/components/ApplicationSummarySection'; +import { withFormValidation } from '@/react-tools/withFormValidation'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { YAMLInspector } from '@/react/kubernetes/components/YAMLInspector'; +import { NodesDatatable } from '@/react/kubernetes/cluster/HomeView/NodesDatatable'; +import { StackName } from '@/react/kubernetes/DeployView/StackName/StackName'; +import { StackNameLabelInsight } from '@/react/kubernetes/DeployView/StackName/StackNameLabelInsight'; +import { SecretsFormSection } from '@/react/kubernetes/applications/components/ConfigurationsFormSection/SecretsFormSection'; +import { configurationsValidationSchema } from '@/react/kubernetes/applications/components/ConfigurationsFormSection/configurationValidationSchema'; +import { ConfigMapsFormSection } from '@/react/kubernetes/applications/components/ConfigurationsFormSection/ConfigMapsFormSection'; +import { PersistedFoldersFormSection } from '@/react/kubernetes/applications/components/PersistedFoldersFormSection'; +import { DataAccessPolicyFormSection } from '@/react/kubernetes/applications/CreateView/DataAccessPolicyFormSection'; +import { persistedFoldersValidation } from '@/react/kubernetes/applications/components/PersistedFoldersFormSection/persistedFoldersValidation'; import { ResourceReservationFormSection, resourceReservationValidation, -} from '@CE/react/kubernetes/applications/components/ResourceReservationFormSection'; +} from '@/react/kubernetes/applications/components/ResourceReservationFormSection'; import { ReplicationFormSection, replicationValidation, -} from '@CE/react/kubernetes/applications/components/ReplicationFormSection'; +} from '@/react/kubernetes/applications/components/ReplicationFormSection'; import { AutoScalingFormSection, autoScalingValidation, -} from '@CE/react/kubernetes/applications/components/AutoScalingFormSection'; -import { withControlledInput } from '@CE/react-tools/withControlledInput'; +} from '@/react/kubernetes/applications/components/AutoScalingFormSection'; +import { withControlledInput } from '@/react-tools/withControlledInput'; import { NamespaceSelector, namespaceSelectorValidation, -} from '@CE/react/kubernetes/applications/components/NamespaceSelector'; -import { EditYamlFormSection } from '@CE/react/kubernetes/applications/components/EditYamlFormSection'; +} from '@/react/kubernetes/applications/components/NamespaceSelector'; +import { EditYamlFormSection } from '@/react/kubernetes/applications/components/EditYamlFormSection'; import { NameFormSection, appNameValidation, -} from '@CE/react/kubernetes/applications/components/NameFormSection'; -import { deploymentTypeValidation } from '@CE/react/kubernetes/applications/components/AppDeploymentTypeFormSection/deploymentTypeValidation'; -import { AppDeploymentTypeFormSection } from '@CE/react/kubernetes/applications/components/AppDeploymentTypeFormSection/AppDeploymentTypeFormSection'; -import { EnvironmentVariablesFormSection } from '@CE/react/kubernetes/applications/components/EnvironmentVariablesFormSection/EnvironmentVariablesFormSection'; -import { kubeEnvVarValidationSchema } from '@CE/react/kubernetes/applications/components/EnvironmentVariablesFormSection/kubeEnvVarValidationSchema'; -import { IntegratedAppsDatatable } from '@CE/react/kubernetes/components/IntegratedAppsDatatable/IntegratedAppsDatatable'; -import { HelmTemplates } from '@CE/react/kubernetes/helm/HelmTemplates/HelmTemplates'; +} from '@/react/kubernetes/applications/components/NameFormSection'; +import { deploymentTypeValidation } from '@/react/kubernetes/applications/components/AppDeploymentTypeFormSection/deploymentTypeValidation'; +import { AppDeploymentTypeFormSection } from '@/react/kubernetes/applications/components/AppDeploymentTypeFormSection/AppDeploymentTypeFormSection'; +import { EnvironmentVariablesFormSection } from '@/react/kubernetes/applications/components/EnvironmentVariablesFormSection/EnvironmentVariablesFormSection'; +import { kubeEnvVarValidationSchema } from '@/react/kubernetes/applications/components/EnvironmentVariablesFormSection/kubeEnvVarValidationSchema'; +import { IntegratedAppsDatatable } from '@/react/kubernetes/components/IntegratedAppsDatatable/IntegratedAppsDatatable'; +import { HelmTemplates } from '@/react/kubernetes/helm/HelmTemplates/HelmTemplates'; import { namespacesModule } from './namespaces'; import { clusterManagementModule } from './clusterManagement'; diff --git a/app/kubernetes/react/components/namespaces.ts b/app/kubernetes/react/components/namespaces.ts index 4112b2db7..c00b7b9b1 100644 --- a/app/kubernetes/react/components/namespaces.ts +++ b/app/kubernetes/react/components/namespaces.ts @@ -1,9 +1,9 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { NamespacesDatatable } from '@CE/react/kubernetes/namespaces/ListView/NamespacesDatatable'; +import { r2a } from '@/react-tools/react2angular'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { NamespacesDatatable } from '@/react/kubernetes/namespaces/ListView/NamespacesDatatable'; export const namespacesModule = angular .module('portainer.kubernetes.react.components.namespaces', []) diff --git a/app/kubernetes/react/components/registries.tsx b/app/kubernetes/react/components/registries.tsx index 453d25fa2..4b28686ca 100644 --- a/app/kubernetes/react/components/registries.tsx +++ b/app/kubernetes/react/components/registries.tsx @@ -1,7 +1,7 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { AccessTable } from '@CE/react/kubernetes/cluster/RegistryAccessView/AccessTable'; +import { r2a } from '@/react-tools/react2angular'; +import { AccessTable } from '@/react/kubernetes/cluster/RegistryAccessView/AccessTable'; export const registriesModule = angular .module('portainer.kubernetes.react.components.registries', []) diff --git a/app/kubernetes/react/views/index.ts b/app/kubernetes/react/views/index.ts index 7d6e7f288..5a92e22ff 100644 --- a/app/kubernetes/react/views/index.ts +++ b/app/kubernetes/react/views/index.ts @@ -1,32 +1,32 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { IngressesDatatableView } from '@CE/react/kubernetes/ingresses/IngressDatatable'; -import { CreateIngressView } from '@CE/react/kubernetes/ingresses/CreateIngressView'; -import { DashboardView } from '@CE/react/kubernetes/dashboard/DashboardView'; -import { ServicesView } from '@CE/react/kubernetes/services/ServicesView'; -import { ConsoleView } from '@CE/react/kubernetes/applications/ConsoleView'; -import { ConfigmapsAndSecretsView } from '@CE/react/kubernetes/configs/ListView/ConfigmapsAndSecretsView'; -import { CreateNamespaceView } from '@CE/react/kubernetes/namespaces/CreateView/CreateNamespaceView'; -import { ApplicationsView } from '@CE/react/kubernetes/applications/ListView/ApplicationsView'; -import { ApplicationDetailsView } from '@CE/react/kubernetes/applications/DetailsView/ApplicationDetailsView'; -import { ConfigureView } from '@CE/react/kubernetes/cluster/ConfigureView'; -import { NamespacesView } from '@CE/react/kubernetes/namespaces/ListView/NamespacesView'; -import { ServiceAccountsView } from '@CE/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsView'; -import { ClusterRolesView } from '@CE/react/kubernetes/more-resources/ClusterRolesView'; -import { RolesView } from '@CE/react/kubernetes/more-resources/RolesView'; -import { VolumesView } from '@CE/react/kubernetes/volumes/ListView/VolumesView'; -import { NamespaceView } from '@CE/react/kubernetes/namespaces/ItemView/NamespaceView'; -import { AccessView } from '@CE/react/kubernetes/namespaces/AccessView/AccessView'; -import { JobsView } from '@CE/react/kubernetes/more-resources/JobsView/JobsView'; -import { ClusterView } from '@CE/react/kubernetes/cluster/ClusterView'; -import { HelmApplicationView } from '@CE/react/kubernetes/helm/HelmApplicationView'; -import { HelmInstallView } from '@CE/react/kubernetes/helm/install/HelmInstallView'; -import { NodeView } from '@CE/react/kubernetes/cluster/NodeView/NodeView'; -import { KubectlShellView } from '@CE/react/kubernetes/cluster/KubectlShell/KubectlShellView'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { IngressesDatatableView } from '@/react/kubernetes/ingresses/IngressDatatable'; +import { CreateIngressView } from '@/react/kubernetes/ingresses/CreateIngressView'; +import { DashboardView } from '@/react/kubernetes/dashboard/DashboardView'; +import { ServicesView } from '@/react/kubernetes/services/ServicesView'; +import { ConsoleView } from '@/react/kubernetes/applications/ConsoleView'; +import { ConfigmapsAndSecretsView } from '@/react/kubernetes/configs/ListView/ConfigmapsAndSecretsView'; +import { CreateNamespaceView } from '@/react/kubernetes/namespaces/CreateView/CreateNamespaceView'; +import { ApplicationsView } from '@/react/kubernetes/applications/ListView/ApplicationsView'; +import { ApplicationDetailsView } from '@/react/kubernetes/applications/DetailsView/ApplicationDetailsView'; +import { ConfigureView } from '@/react/kubernetes/cluster/ConfigureView'; +import { NamespacesView } from '@/react/kubernetes/namespaces/ListView/NamespacesView'; +import { ServiceAccountsView } from '@/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsView'; +import { ClusterRolesView } from '@/react/kubernetes/more-resources/ClusterRolesView'; +import { RolesView } from '@/react/kubernetes/more-resources/RolesView'; +import { VolumesView } from '@/react/kubernetes/volumes/ListView/VolumesView'; +import { NamespaceView } from '@/react/kubernetes/namespaces/ItemView/NamespaceView'; +import { AccessView } from '@/react/kubernetes/namespaces/AccessView/AccessView'; +import { JobsView } from '@/react/kubernetes/more-resources/JobsView/JobsView'; +import { ClusterView } from '@/react/kubernetes/cluster/ClusterView'; +import { HelmApplicationView } from '@/react/kubernetes/helm/HelmApplicationView'; +import { HelmInstallView } from '@/react/kubernetes/helm/install/HelmInstallView'; +import { NodeView } from '@/react/kubernetes/cluster/NodeView/NodeView'; +import { KubectlShellView } from '@/react/kubernetes/cluster/KubectlShell/KubectlShellView'; export const viewsModule = angular .module('portainer.kubernetes.react.views', []) diff --git a/app/kubernetes/rest/serviceAccount.js b/app/kubernetes/rest/serviceAccount.js index 189060bfe..0b26c7f3f 100644 --- a/app/kubernetes/rest/serviceAccount.js +++ b/app/kubernetes/rest/serviceAccount.js @@ -1,4 +1,4 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; export async function getServiceAccounts(environmentId, namespaceId) { try { diff --git a/app/kubernetes/services/applicationService.js b/app/kubernetes/services/applicationService.js index e9aba6f71..6866ec469 100644 --- a/app/kubernetes/services/applicationService.js +++ b/app/kubernetes/services/applicationService.js @@ -10,9 +10,9 @@ import KubernetesServiceHelper from 'Kubernetes/helpers/serviceHelper'; import { KubernetesHorizontalPodAutoScalerHelper } from 'Kubernetes/horizontal-pod-auto-scaler/helper'; import { KubernetesHorizontalPodAutoScalerConverter } from 'Kubernetes/horizontal-pod-auto-scaler/converter'; import KubernetesPodConverter from 'Kubernetes/pod/converter'; -import { notifyError } from '@CE/portainer/services/notifications'; +import { notifyError } from '@/portainer/services/notifications'; import { KubernetesIngressConverter } from 'Kubernetes/ingress/converter'; -import { generateNewIngressesFromFormPaths } from '@CE/react/kubernetes/applications/CreateView/application-services/utils'; +import { generateNewIngressesFromFormPaths } from '@/react/kubernetes/applications/CreateView/application-services/utils'; import { KubernetesPod } from '../pod/models'; class KubernetesApplicationService { diff --git a/app/kubernetes/services/resourcePoolService.js b/app/kubernetes/services/resourcePoolService.js index 75ad08735..d829afa0b 100644 --- a/app/kubernetes/services/resourcePoolService.js +++ b/app/kubernetes/services/resourcePoolService.js @@ -3,7 +3,7 @@ import _ from 'lodash-es'; import angular from 'angular'; import KubernetesResourcePoolConverter from 'Kubernetes/converters/resourcePool'; import KubernetesResourceQuotaHelper from 'Kubernetes/helpers/resourceQuotaHelper'; -import { getNamespaces } from '@CE/react/kubernetes/namespaces/queries/useNamespacesQuery'; +import { getNamespaces } from '@/react/kubernetes/namespaces/queries/useNamespacesQuery'; /* @ngInject */ export function KubernetesResourcePoolService( diff --git a/app/kubernetes/views/applications/create/createApplicationController.js b/app/kubernetes/views/applications/create/createApplicationController.js index 7382c0d79..0343127a4 100644 --- a/app/kubernetes/views/applications/create/createApplicationController.js +++ b/app/kubernetes/views/applications/create/createApplicationController.js @@ -2,10 +2,10 @@ import angular from 'angular'; import _ from 'lodash-es'; import filesizeParser from 'filesize-parser'; import * as JsonPatch from 'fast-json-patch'; -import { RegistryTypes } from '@CE/portainer/models/registryTypes'; -import { getServices } from '@CE/react/kubernetes/services/useNamespaceServices'; +import { RegistryTypes } from '@/portainer/models/registryTypes'; +import { getServices } from '@/react/kubernetes/services/useNamespaceServices'; import { KubernetesConfigurationKinds } from 'Kubernetes/models/configuration/models'; -import { getGlobalDeploymentOptions } from '@CE/react/portainer/settings/settings.service'; +import { getGlobalDeploymentOptions } from '@/react/portainer/settings/settings.service'; import { KubernetesApplicationDataAccessPolicies, @@ -23,13 +23,13 @@ import KubernetesApplicationHelper from 'Kubernetes/helpers/application/index'; import KubernetesVolumeHelper from 'Kubernetes/helpers/volumeHelper'; import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper'; import { KubernetesNodeHelper } from 'Kubernetes/node/helper'; -import { updateIngress, getIngresses } from '@CE/react/kubernetes/ingresses/service'; -import { confirmUpdateAppIngress } from '@CE/react/kubernetes/applications/CreateView/UpdateIngressPrompt'; -import { KUBE_STACK_NAME_VALIDATION_REGEX } from '@CE/react/kubernetes/DeployView/StackName/constants'; -import { isVolumeUsed } from '@CE/react/kubernetes/volumes/utils'; -import { confirm, confirmUpdate, confirmWebEditorDiscard } from '@@CE/modals/confirm'; -import { buildConfirmButton } from '@@CE/modals/utils'; -import { ModalType } from '@@CE/modals'; +import { updateIngress, getIngresses } from '@/react/kubernetes/ingresses/service'; +import { confirmUpdateAppIngress } from '@/react/kubernetes/applications/CreateView/UpdateIngressPrompt'; +import { KUBE_STACK_NAME_VALIDATION_REGEX } from '@/react/kubernetes/DeployView/StackName/constants'; +import { isVolumeUsed } from '@/react/kubernetes/volumes/utils'; +import { confirm, confirmUpdate, confirmWebEditorDiscard } from '@@/modals/confirm'; +import { buildConfirmButton } from '@@/modals/utils'; +import { ModalType } from '@@/modals'; class KubernetesCreateApplicationController { /* #region CONSTRUCTOR */ diff --git a/app/kubernetes/views/applications/logs/logsController.js b/app/kubernetes/views/applications/logs/logsController.js index 2b28d2459..37cae6cad 100644 --- a/app/kubernetes/views/applications/logs/logsController.js +++ b/app/kubernetes/views/applications/logs/logsController.js @@ -1,6 +1,6 @@ import angular from 'angular'; -import { concatLogsToString, formatLogs } from '@CE/docker/helpers/logHelper'; +import { concatLogsToString, formatLogs } from '@/docker/helpers/logHelper'; class KubernetesApplicationLogsController { /* @ngInject */ diff --git a/app/kubernetes/views/applications/stats/statsController.js b/app/kubernetes/views/applications/stats/statsController.js index 4eb17582a..f4cfb2df0 100644 --- a/app/kubernetes/views/applications/stats/statsController.js +++ b/app/kubernetes/views/applications/stats/statsController.js @@ -3,8 +3,8 @@ import moment from 'moment'; import _ from 'lodash-es'; import filesizeParser from 'filesize-parser'; import KubernetesPodConverter from 'Kubernetes/pod/converter'; -import { getMetricsForPod } from '@CE/react/kubernetes/metrics/metrics.ts'; -import { parseCPU } from '@CE/react/kubernetes/utils'; +import { getMetricsForPod } from '@/react/kubernetes/metrics/metrics.ts'; +import { parseCPU } from '@/react/kubernetes/utils'; class KubernetesApplicationStatsController { /* @ngInject */ diff --git a/app/kubernetes/views/cluster/node/stats/statsController.js b/app/kubernetes/views/cluster/node/stats/statsController.js index d0d55f262..714295162 100644 --- a/app/kubernetes/views/cluster/node/stats/statsController.js +++ b/app/kubernetes/views/cluster/node/stats/statsController.js @@ -1,9 +1,9 @@ import angular from 'angular'; import moment from 'moment'; import filesizeParser from 'filesize-parser'; -import { PORTAINER_FADEOUT } from '@CE/constants'; -import { getMetricsForNode } from '@CE/react/kubernetes/metrics/queries/useNodeMetricsQuery'; -import { parseCPU } from '@CE/react/kubernetes/utils'; +import { PORTAINER_FADEOUT } from '@/constants'; +import { getMetricsForNode } from '@/react/kubernetes/metrics/queries/useNodeMetricsQuery'; +import { parseCPU } from '@/react/kubernetes/utils'; class KubernetesNodeStatsController { /* @ngInject */ diff --git a/app/kubernetes/views/configurations/configmap/create/createConfigMapController.js b/app/kubernetes/views/configurations/configmap/create/createConfigMapController.js index 3ecbeb4fa..7d8d0ccb4 100644 --- a/app/kubernetes/views/configurations/configmap/create/createConfigMapController.js +++ b/app/kubernetes/views/configurations/configmap/create/createConfigMapController.js @@ -5,9 +5,9 @@ import { KubernetesConfigurationKinds } from 'Kubernetes/models/configuration/mo import KubernetesConfigurationHelper from 'Kubernetes/helpers/configurationHelper'; import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper'; import { getServiceAccounts } from 'Kubernetes/rest/serviceAccount'; -import { typeOptions } from '@CE/react/kubernetes/configs/CreateView/options'; +import { typeOptions } from '@/react/kubernetes/configs/CreateView/options'; -import { confirmWebEditorDiscard } from '@@CE/modals/confirm'; +import { confirmWebEditorDiscard } from '@@/modals/confirm'; import { isConfigurationFormValid } from '../../validation'; class KubernetesCreateConfigMapController { diff --git a/app/kubernetes/views/configurations/configmap/edit/configMapController.js b/app/kubernetes/views/configurations/configmap/edit/configMapController.js index a05a1ac34..d32db7dc2 100644 --- a/app/kubernetes/views/configurations/configmap/edit/configMapController.js +++ b/app/kubernetes/views/configurations/configmap/edit/configMapController.js @@ -7,9 +7,9 @@ import KubernetesConfigurationHelper from 'Kubernetes/helpers/configurationHelpe import KubernetesConfigurationConverter from 'Kubernetes/converters/configuration'; import KubernetesEventHelper from 'Kubernetes/helpers/eventHelper'; import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper'; -import { pluralize } from '@CE/portainer/helpers/strings'; +import { pluralize } from '@/portainer/helpers/strings'; -import { confirmUpdate, confirmWebEditorDiscard } from '@@CE/modals/confirm'; +import { confirmUpdate, confirmWebEditorDiscard } from '@@/modals/confirm'; import { isConfigurationFormValid } from '../../validation'; class KubernetesConfigMapController { diff --git a/app/kubernetes/views/configurations/configurationsController.js b/app/kubernetes/views/configurations/configurationsController.js index 40404499d..0e645fd36 100644 --- a/app/kubernetes/views/configurations/configurationsController.js +++ b/app/kubernetes/views/configurations/configurationsController.js @@ -1,5 +1,5 @@ import angular from 'angular'; -import { confirmDelete } from '@@CE/modals/confirm'; +import { confirmDelete } from '@@/modals/confirm'; import KubernetesConfigurationHelper from 'Kubernetes/helpers/configurationHelper'; class KubernetesConfigurationsController { diff --git a/app/kubernetes/views/configurations/secret/create/createSecretController.js b/app/kubernetes/views/configurations/secret/create/createSecretController.js index bca90eb29..32edf3a53 100644 --- a/app/kubernetes/views/configurations/secret/create/createSecretController.js +++ b/app/kubernetes/views/configurations/secret/create/createSecretController.js @@ -5,9 +5,9 @@ import { KubernetesConfigurationKinds, KubernetesSecretTypeOptions } from 'Kuber import KubernetesConfigurationHelper from 'Kubernetes/helpers/configurationHelper'; import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper'; import { getServiceAccounts } from 'Kubernetes/rest/serviceAccount'; -import { typeOptions } from '@CE/react/kubernetes/configs/CreateView/options'; +import { typeOptions } from '@/react/kubernetes/configs/CreateView/options'; -import { confirmWebEditorDiscard } from '@@CE/modals/confirm'; +import { confirmWebEditorDiscard } from '@@/modals/confirm'; import { isConfigurationFormValid } from '../../validation'; class KubernetesCreateSecretController { diff --git a/app/kubernetes/views/configurations/secret/edit/secretController.js b/app/kubernetes/views/configurations/secret/edit/secretController.js index e2933cf0e..41a0bda96 100644 --- a/app/kubernetes/views/configurations/secret/edit/secretController.js +++ b/app/kubernetes/views/configurations/secret/edit/secretController.js @@ -8,9 +8,9 @@ import KubernetesConfigurationConverter from 'Kubernetes/converters/configuratio import KubernetesEventHelper from 'Kubernetes/helpers/eventHelper'; import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper'; -import { pluralize } from '@CE/portainer/helpers/strings'; +import { pluralize } from '@/portainer/helpers/strings'; -import { confirmUpdate, confirmWebEditorDiscard } from '@@CE/modals/confirm'; +import { confirmUpdate, confirmWebEditorDiscard } from '@@/modals/confirm'; import { isConfigurationFormValid } from '../../validation'; class KubernetesSecretController { diff --git a/app/kubernetes/views/configurations/validation.js b/app/kubernetes/views/configurations/validation.js index a618c332a..4702aa1d7 100644 --- a/app/kubernetes/views/configurations/validation.js +++ b/app/kubernetes/views/configurations/validation.js @@ -1,5 +1,5 @@ -import { KubernetesSecretTypeOptions } from '@CE/kubernetes/models/configuration/models'; -import { KubernetesConfigurationKinds } from '@CE/kubernetes/models/configuration/models'; +import { KubernetesSecretTypeOptions } from '@/kubernetes/models/configuration/models'; +import { KubernetesConfigurationKinds } from '@/kubernetes/models/configuration/models'; export function isConfigurationFormValid(alreadyExist, isDataValid, formValues) { const uniqueCheck = !alreadyExist && isDataValid; diff --git a/app/kubernetes/views/deploy/deployController.js b/app/kubernetes/views/deploy/deployController.js index 945424287..4813982ef 100644 --- a/app/kubernetes/views/deploy/deployController.js +++ b/app/kubernetes/views/deploy/deployController.js @@ -2,17 +2,17 @@ import angular from 'angular'; import _ from 'lodash-es'; import stripAnsi from 'strip-ansi'; -import PortainerError from '@CE/portainer/error'; +import PortainerError from '@/portainer/error'; import { KubernetesDeployManifestTypes, KubernetesDeployBuildMethods, KubernetesDeployRequestMethods, RepositoryMechanismTypes } from 'Kubernetes/models/deploy'; -import { isTemplateVariablesEnabled, renderTemplate } from '@CE/react/portainer/custom-templates/components/utils'; -import { getDeploymentOptions } from '@CE/react/portainer/environments/environment.service'; -import { parseAutoUpdateResponse, transformAutoUpdateViewModel } from '@CE/react/portainer/gitops/AutoUpdateFieldset/utils'; -import { baseStackWebhookUrl, createWebhookId } from '@CE/portainer/helpers/webhookHelper'; -import { getVariablesFieldDefaultValues } from '@CE/react/portainer/custom-templates/components/CustomTemplatesVariablesField'; -import { KUBE_STACK_NAME_VALIDATION_REGEX } from '@CE/react/kubernetes/DeployView/StackName/constants'; -import { confirmWebEditorDiscard } from '@@CE/modals/confirm'; -import { editor, git, customTemplate, url } from '@@CE/BoxSelector/common-options/build-methods'; -import { kubernetes } from '@@CE/BoxSelector/common-options/deployment-methods'; +import { isTemplateVariablesEnabled, renderTemplate } from '@/react/portainer/custom-templates/components/utils'; +import { getDeploymentOptions } from '@/react/portainer/environments/environment.service'; +import { parseAutoUpdateResponse, transformAutoUpdateViewModel } from '@/react/portainer/gitops/AutoUpdateFieldset/utils'; +import { baseStackWebhookUrl, createWebhookId } from '@/portainer/helpers/webhookHelper'; +import { getVariablesFieldDefaultValues } from '@/react/portainer/custom-templates/components/CustomTemplatesVariablesField'; +import { KUBE_STACK_NAME_VALIDATION_REGEX } from '@/react/kubernetes/DeployView/StackName/constants'; +import { confirmWebEditorDiscard } from '@@/modals/confirm'; +import { editor, git, customTemplate, url } from '@@/BoxSelector/common-options/build-methods'; +import { kubernetes } from '@@/BoxSelector/common-options/deployment-methods'; class KubernetesDeployController { /* @ngInject */ diff --git a/app/kubernetes/views/security-constraint/constraintController.js b/app/kubernetes/views/security-constraint/constraintController.js index 699dabc2e..d8a8b94cf 100644 --- a/app/kubernetes/views/security-constraint/constraintController.js +++ b/app/kubernetes/views/security-constraint/constraintController.js @@ -1,5 +1,5 @@ import angular from 'angular'; -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; angular.module('portainer.kubernetes').controller('KubernetesSecurityConstraintController', [ '$scope', diff --git a/app/kubernetes/views/stacks/logs/logsController.js b/app/kubernetes/views/stacks/logs/logsController.js index f0e39a450..d4e1b5ba7 100644 --- a/app/kubernetes/views/stacks/logs/logsController.js +++ b/app/kubernetes/views/stacks/logs/logsController.js @@ -1,7 +1,7 @@ import { filter, flatMap, map } from 'lodash'; import angular from 'angular'; import $allSettled from 'Portainer/services/allSettled'; -import { concatLogsToString, formatLogs } from '@CE/docker/helpers/logHelper'; +import { concatLogsToString, formatLogs } from '@/docker/helpers/logHelper'; const colors = ['red', 'orange', 'lime', 'green', 'darkgreen', 'cyan', 'turquoise', 'teal', 'deepskyblue', 'blue', 'darkblue', 'slateblue', 'magenta', 'darkviolet']; diff --git a/app/kubernetes/views/summary/resources/applicationResources.js b/app/kubernetes/views/summary/resources/applicationResources.js index a6913ca34..ad80c162a 100644 --- a/app/kubernetes/views/summary/resources/applicationResources.js +++ b/app/kubernetes/views/summary/resources/applicationResources.js @@ -9,7 +9,7 @@ import KubernetesApplicationConverter from 'Kubernetes/converters/application'; import KubernetesServiceConverter from 'Kubernetes/converters/service'; import { KubernetesIngressConverter } from 'Kubernetes/ingress/converter'; import KubernetesPersistentVolumeClaimConverter from 'Kubernetes/converters/persistentVolumeClaim'; -import { generateNewIngressesFromFormPaths } from '@CE/react/kubernetes/applications/CreateView/application-services/utils'; +import { generateNewIngressesFromFormPaths } from '@/react/kubernetes/applications/CreateView/application-services/utils'; const { CREATE, UPDATE, DELETE } = KubernetesResourceActions; diff --git a/app/kubernetes/views/volumes/edit/volumeController.js b/app/kubernetes/views/volumes/edit/volumeController.js index c4716b9d6..9fb855440 100644 --- a/app/kubernetes/views/volumes/edit/volumeController.js +++ b/app/kubernetes/views/volumes/edit/volumeController.js @@ -5,8 +5,8 @@ import KubernetesVolumeHelper from 'Kubernetes/helpers/volumeHelper'; import KubernetesEventHelper from 'Kubernetes/helpers/eventHelper'; import { KubernetesStorageClassAccessPolicies } from 'Kubernetes/models/storage-class/models'; import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper'; -import { confirmRedeploy } from '@CE/react/kubernetes/volumes/ItemView/ConfirmRedeployModal'; -import { isVolumeUsed } from '@CE/react/kubernetes/volumes/utils'; +import { confirmRedeploy } from '@/react/kubernetes/volumes/ItemView/ConfirmRedeployModal'; +import { isVolumeUsed } from '@/react/kubernetes/volumes/utils'; class KubernetesVolumeController { /* @ngInject */ diff --git a/app/portainer/__module.js b/app/portainer/__module.js index 60fd73541..7f51e6e70 100644 --- a/app/portainer/__module.js +++ b/app/portainer/__module.js @@ -1,4 +1,4 @@ -import featureFlagModule from '@CE/react/portainer/feature-flags'; +import featureFlagModule from '@/react/portainer/feature-flags'; import './rbac'; diff --git a/app/portainer/components/BEFeatureIndicator/BEFeatureIndicator.controller.ts b/app/portainer/components/BEFeatureIndicator/BEFeatureIndicator.controller.ts index fb593a32a..79f9b50ad 100644 --- a/app/portainer/components/BEFeatureIndicator/BEFeatureIndicator.controller.ts +++ b/app/portainer/components/BEFeatureIndicator/BEFeatureIndicator.controller.ts @@ -1,6 +1,6 @@ -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; -import { getFeatureDetails } from '@@CE/BEFeatureIndicator/utils'; +import { getFeatureDetails } from '@@/BEFeatureIndicator/utils'; export default class BeIndicatorController { limitedToBE?: boolean; diff --git a/app/portainer/components/BoxSelector/index.ts b/app/portainer/components/BoxSelector/index.ts index 2dbe66603..3e6385b98 100644 --- a/app/portainer/components/BoxSelector/index.ts +++ b/app/portainer/components/BoxSelector/index.ts @@ -1,8 +1,8 @@ import angular from 'angular'; -import { react2angular } from '@CE/react-tools/react2angular'; +import { react2angular } from '@/react-tools/react2angular'; -import { BoxSelector } from '@@CE/BoxSelector'; +import { BoxSelector } from '@@/BoxSelector'; import { BoxSelectorAngular } from './BoxSelectorAngular'; diff --git a/app/portainer/components/BoxSelector/utils.ts b/app/portainer/components/BoxSelector/utils.ts index c92a91d98..8a6afc491 100644 --- a/app/portainer/components/BoxSelector/utils.ts +++ b/app/portainer/components/BoxSelector/utils.ts @@ -1,7 +1,7 @@ -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; -import { BoxSelectorOption } from '@@CE/BoxSelector/types'; -import { IconProps } from '@@CE/Icon'; +import { BoxSelectorOption } from '@@/BoxSelector/types'; +import { IconProps } from '@@/Icon'; export function buildOption( id: BoxSelectorOption['id'], diff --git a/app/portainer/components/accessControlForm/porAccessControlFormController.js b/app/portainer/components/accessControlForm/porAccessControlFormController.js index c5fc350f8..d8d247ec9 100644 --- a/app/portainer/components/accessControlForm/porAccessControlFormController.js +++ b/app/portainer/components/accessControlForm/porAccessControlFormController.js @@ -1,5 +1,5 @@ import _ from 'lodash-es'; -import { ResourceControlOwnership as RCO } from '@CE/react/portainer/access-control/types'; +import { ResourceControlOwnership as RCO } from '@/react/portainer/access-control/types'; angular.module('portainer.app').controller('porAccessControlFormController', [ '$q', diff --git a/app/portainer/components/accessControlForm/porAccessControlFormModel.js b/app/portainer/components/accessControlForm/porAccessControlFormModel.js index 38efd6aa2..e4c77d961 100644 --- a/app/portainer/components/accessControlForm/porAccessControlFormModel.js +++ b/app/portainer/components/accessControlForm/porAccessControlFormModel.js @@ -1,4 +1,4 @@ -import { ResourceControlOwnership as RCO } from '@CE/react/portainer/access-control/types'; +import { ResourceControlOwnership as RCO } from '@/react/portainer/access-control/types'; /** * @deprecated use only for angularjs components. For react components use ./model.ts diff --git a/app/portainer/components/accessManagement/porAccessManagementController.js b/app/portainer/components/accessManagement/porAccessManagementController.js index 71ef4d916..096d86c34 100644 --- a/app/portainer/components/accessManagement/porAccessManagementController.js +++ b/app/portainer/components/accessManagement/porAccessManagementController.js @@ -1,8 +1,8 @@ import _ from 'lodash-es'; import angular from 'angular'; -import { RoleTypes } from '@CE/portainer/rbac/models/role'; -import { isLimitedToBE } from '@CE/react/portainer/feature-flags/feature-flags.service'; +import { RoleTypes } from '@/portainer/rbac/models/role'; +import { isLimitedToBE } from '@/react/portainer/feature-flags/feature-flags.service'; class PorAccessManagementController { /* @ngInject */ diff --git a/app/portainer/components/endpointSecurity/porEndpointSecurityController.js b/app/portainer/components/endpointSecurity/porEndpointSecurityController.js index 710bbc6ba..56d11a562 100644 --- a/app/portainer/components/endpointSecurity/porEndpointSecurityController.js +++ b/app/portainer/components/endpointSecurity/porEndpointSecurityController.js @@ -1,4 +1,4 @@ -import { tlsOptions } from '@CE/react/portainer/environments/ItemView/tls-options'; +import { tlsOptions } from '@/react/portainer/environments/ItemView/tls-options'; angular.module('portainer.app').controller('porEndpointSecurityController', [ '$scope', diff --git a/app/portainer/components/forms/git-form/git-form-auth-fieldset.controller.ts b/app/portainer/components/forms/git-form/git-form-auth-fieldset.controller.ts index a52089232..c60d7a2c0 100644 --- a/app/portainer/components/forms/git-form/git-form-auth-fieldset.controller.ts +++ b/app/portainer/components/forms/git-form/git-form-auth-fieldset.controller.ts @@ -1,15 +1,15 @@ import { IFormController } from 'angular'; import { FormikErrors } from 'formik'; -import { notifyError } from '@CE/portainer/services/notifications'; -import { IAuthenticationService } from '@CE/portainer/services/types'; -import { GitAuthModel } from '@CE/react/portainer/gitops/types'; -import { gitAuthValidation } from '@CE/react/portainer/gitops/AuthFieldset'; -import { GitCredential } from '@CE/react/portainer/account/git-credentials/types'; -import { getGitCredentials } from '@CE/react/portainer/account/git-credentials/git-credentials.service'; -import { isBE } from '@CE/react/portainer/feature-flags/feature-flags.service'; +import { notifyError } from '@/portainer/services/notifications'; +import { IAuthenticationService } from '@/portainer/services/types'; +import { GitAuthModel } from '@/react/portainer/gitops/types'; +import { gitAuthValidation } from '@/react/portainer/gitops/AuthFieldset'; +import { GitCredential } from '@/react/portainer/account/git-credentials/types'; +import { getGitCredentials } from '@/react/portainer/account/git-credentials/git-credentials.service'; +import { isBE } from '@/react/portainer/feature-flags/feature-flags.service'; -import { validateForm } from '@@CE/form-components/validate-form'; +import { validateForm } from '@@/form-components/validate-form'; export default class GitFormAuthFieldsetController { errors?: FormikErrors = {}; diff --git a/app/portainer/components/forms/git-form/git-form-auto-update-fieldset.controller.ts b/app/portainer/components/forms/git-form/git-form-auto-update-fieldset.controller.ts index 8f2ab6138..febb285d6 100644 --- a/app/portainer/components/forms/git-form/git-form-auto-update-fieldset.controller.ts +++ b/app/portainer/components/forms/git-form/git-form-auto-update-fieldset.controller.ts @@ -1,11 +1,11 @@ import { IFormController } from 'angular'; import { FormikErrors } from 'formik'; -import { IAuthenticationService } from '@CE/portainer/services/types'; -import { AutoUpdateModel } from '@CE/react/portainer/gitops/types'; -import { autoUpdateValidation } from '@CE/react/portainer/gitops/AutoUpdateFieldset/validation'; +import { IAuthenticationService } from '@/portainer/services/types'; +import { AutoUpdateModel } from '@/react/portainer/gitops/types'; +import { autoUpdateValidation } from '@/react/portainer/gitops/AutoUpdateFieldset/validation'; -import { validateForm } from '@@CE/form-components/validate-form'; +import { validateForm } from '@@/form-components/validate-form'; export default class GitFormAutoUpdateFieldsetController { errors?: FormikErrors = {}; diff --git a/app/portainer/components/forms/git-form/git-form-ref-field.ts b/app/portainer/components/forms/git-form/git-form-ref-field.ts index c504cb360..670c2d123 100644 --- a/app/portainer/components/forms/git-form/git-form-ref-field.ts +++ b/app/portainer/components/forms/git-form/git-form-ref-field.ts @@ -1,10 +1,10 @@ import { IComponentOptions, IFormController } from 'angular'; -import { GitFormModel } from '@CE/react/portainer/gitops/types'; -import { AsyncService } from '@CE/portainer/services/types'; -import { refFieldValidation } from '@CE/react/portainer/gitops/RefField/RefField'; +import { GitFormModel } from '@/react/portainer/gitops/types'; +import { AsyncService } from '@/portainer/services/types'; +import { refFieldValidation } from '@/react/portainer/gitops/RefField/RefField'; -import { validateForm } from '@@CE/form-components/validate-form'; +import { validateForm } from '@@/form-components/validate-form'; class GitFormRefFieldController { $async: AsyncService; diff --git a/app/portainer/components/forms/git-form/git-form.controller.ts b/app/portainer/components/forms/git-form/git-form.controller.ts index 220bf1b81..7033296d9 100644 --- a/app/portainer/components/forms/git-form/git-form.controller.ts +++ b/app/portainer/components/forms/git-form/git-form.controller.ts @@ -1,13 +1,13 @@ import { IFormController } from 'angular'; import { FormikErrors } from 'formik'; -import { DeployMethod, GitFormModel } from '@CE/react/portainer/gitops/types'; -import { validateGitForm } from '@CE/react/portainer/gitops/GitForm'; -import { notifyError } from '@CE/portainer/services/notifications'; -import { IAuthenticationService } from '@CE/portainer/services/types'; -import { getGitCredentials } from '@CE/react/portainer/account/git-credentials/git-credentials.service'; -import { GitCredential } from '@CE/react/portainer/account/git-credentials/types'; -import { isBE } from '@CE/react/portainer/feature-flags/feature-flags.service'; +import { DeployMethod, GitFormModel } from '@/react/portainer/gitops/types'; +import { validateGitForm } from '@/react/portainer/gitops/GitForm'; +import { notifyError } from '@/portainer/services/notifications'; +import { IAuthenticationService } from '@/portainer/services/types'; +import { getGitCredentials } from '@/react/portainer/account/git-credentials/git-credentials.service'; +import { GitCredential } from '@/react/portainer/account/git-credentials/types'; +import { isBE } from '@/react/portainer/feature-flags/feature-flags.service'; export default class GitFormController { errors?: FormikErrors; diff --git a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js index 8501bd0f7..5d30474ca 100644 --- a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js +++ b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js @@ -1,10 +1,10 @@ import { RepositoryMechanismTypes } from 'Kubernetes/models/deploy'; -import { parseAutoUpdateResponse } from '@CE/react/portainer/gitops/AutoUpdateFieldset/utils'; -import { baseStackWebhookUrl, createWebhookId } from '@CE/portainer/helpers/webhookHelper'; -import { confirmEnableTLSVerify } from '@CE/react/portainer/gitops/utils'; -import { confirm } from '@@CE/modals/confirm'; -import { buildConfirmButton } from '@@CE/modals/utils'; -import { ModalType } from '@@CE/modals'; +import { confirm } from '@@/modals/confirm'; +import { buildConfirmButton } from '@@/modals/utils'; +import { ModalType } from '@@/modals'; +import { parseAutoUpdateResponse } from '@/react/portainer/gitops/AutoUpdateFieldset/utils'; +import { baseStackWebhookUrl, createWebhookId } from '@/portainer/helpers/webhookHelper'; +import { confirmEnableTLSVerify } from '@/react/portainer/gitops/utils'; class KubernetesRedeployAppGitFormController { /* @ngInject */ diff --git a/app/portainer/components/product-list/product-item/productItem.html b/app/portainer/components/product-list/product-item/productItem.html index 2dbd09a11..9e48829a1 100644 --- a/app/portainer/components/product-list/product-item/productItem.html +++ b/app/portainer/components/product-list/product-item/productItem.html @@ -3,8 +3,8 @@
diff --git a/app/portainer/components/theme/theme-settings.controller.js b/app/portainer/components/theme/theme-settings.controller.js index d869ba855..bb614d768 100644 --- a/app/portainer/components/theme/theme-settings.controller.js +++ b/app/portainer/components/theme/theme-settings.controller.js @@ -1,7 +1,7 @@ -import { notifyError, notifySuccess } from '@CE/portainer/services/notifications'; -import { userQueryKeys } from '@CE/portainer/users/queries/queryKeys'; -import { queryClient } from '@CE/react-tools/react-query'; -import { options } from '@CE/react/portainer/account/AccountView/theme-options'; +import { notifyError, notifySuccess } from '@/portainer/services/notifications'; +import { userQueryKeys } from '@/portainer/users/queries/queryKeys'; +import { queryClient } from '@/react-tools/react-query'; +import { options } from '@/react/portainer/account/AccountView/theme-options'; export default class ThemeSettingsController { /* @ngInject */ diff --git a/app/portainer/components/tls-fieldset/index.ts b/app/portainer/components/tls-fieldset/index.ts index 53bf2d431..32ab1f820 100644 --- a/app/portainer/components/tls-fieldset/index.ts +++ b/app/portainer/components/tls-fieldset/index.ts @@ -3,8 +3,8 @@ import angular from 'angular'; import { TLSFieldset, tlsConfigValidation, -} from '@CE/react/components/TLSFieldset'; -import { withFormValidation } from '@CE/react-tools/withFormValidation'; +} from '@/react/components/TLSFieldset'; +import { withFormValidation } from '@/react-tools/withFormValidation'; export const ngModule = angular.module( 'portainer.app.components.tls-fieldset', diff --git a/app/portainer/filters/index.js b/app/portainer/filters/index.js index 2b6b0a7e6..d261caed6 100644 --- a/app/portainer/filters/index.js +++ b/app/portainer/filters/index.js @@ -1,7 +1,7 @@ import angular from 'angular'; import _ from 'lodash-es'; -import { ownershipIcon } from '@CE/react/docker/components/datatable/createOwnershipColumn'; +import { ownershipIcon } from '@/react/docker/components/datatable/createOwnershipColumn'; import { arrayToStr, endpointTypeName, diff --git a/app/portainer/helpers/resourceControlHelper.js b/app/portainer/helpers/resourceControlHelper.js index d6de8eb30..08382db2c 100644 --- a/app/portainer/helpers/resourceControlHelper.js +++ b/app/portainer/helpers/resourceControlHelper.js @@ -1,6 +1,6 @@ import _ from 'lodash-es'; import angular from 'angular'; -import { ResourceControlOwnership as RCO } from '@CE/react/portainer/access-control/types'; +import { ResourceControlOwnership as RCO } from '@/react/portainer/access-control/types'; import { ResourceControlOwnershipParameters } from '../models/resourceControl/resourceControlOwnershipParameters'; class ResourceControlHelper { diff --git a/app/portainer/helpers/stackHelper.js b/app/portainer/helpers/stackHelper.js index 0f2825ca8..7cd4297d3 100644 --- a/app/portainer/helpers/stackHelper.js +++ b/app/portainer/helpers/stackHelper.js @@ -1,6 +1,6 @@ import _ from 'lodash-es'; -import { ExternalStackViewModel } from '@CE/react/docker/stacks/view-models/external-stack'; -import { validateYAML } from '@CE/react/docker/stacks/ItemView/StackEditorTab/stackYamlValidation'; +import { ExternalStackViewModel } from '@/react/docker/stacks/view-models/external-stack'; +import { validateYAML } from '@/react/docker/stacks/ItemView/StackEditorTab/stackYamlValidation'; angular.module('portainer.app').factory('StackHelper', [ function StackHelperFactory() { diff --git a/app/portainer/helpers/strings.ts b/app/portainer/helpers/strings.ts index 5549fd810..fb8d69bc6 100644 --- a/app/portainer/helpers/strings.ts +++ b/app/portainer/helpers/strings.ts @@ -4,4 +4,4 @@ export { pluralize, addPlural, grammaticallyJoin, -} from '@CE/react/common/string-utils'; +} from '@/react/common/string-utils'; diff --git a/app/portainer/helpers/webhookHelper.ts b/app/portainer/helpers/webhookHelper.ts index db278c844..b0ff5f661 100644 --- a/app/portainer/helpers/webhookHelper.ts +++ b/app/portainer/helpers/webhookHelper.ts @@ -4,7 +4,7 @@ import { API_ENDPOINT_EDGE_STACKS, API_ENDPOINT_STACKS, API_ENDPOINT_WEBHOOKS, -} from '@CE/constants'; +} from '@/constants'; import { baseHref } from './pathHelper'; diff --git a/app/portainer/hostmanagement/open-amt/open-amt.service.ts b/app/portainer/hostmanagement/open-amt/open-amt.service.ts index 5cc503fa0..64591b46f 100644 --- a/app/portainer/hostmanagement/open-amt/open-amt.service.ts +++ b/app/portainer/hostmanagement/open-amt/open-amt.service.ts @@ -1,11 +1,11 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { OpenAMTConfiguration, AMTInformation, AuthorizationResponse, DeviceFeatures, -} from '@CE/react/edge/edge-devices/open-amt/types'; +} from '@/react/edge/edge-devices/open-amt/types'; const BASE_URL = '/open_amt'; diff --git a/app/portainer/license-management/license.service.ts b/app/portainer/license-management/license.service.ts index 448a9f12f..338506299 100644 --- a/app/portainer/license-management/license.service.ts +++ b/app/portainer/license-management/license.service.ts @@ -5,7 +5,7 @@ import { getLicenseInfo, unsubscribe, subscribe, -} from '@CE/react/portainer/licenses/license.service'; +} from '@/react/portainer/licenses/license.service'; /* @ngInject */ export function LicenseService() { diff --git a/app/portainer/oauth/components/oauth-providers-selector/oauth-provider-selector.controller.js b/app/portainer/oauth/components/oauth-providers-selector/oauth-provider-selector.controller.js index 6a7d2e9ee..f7dceabae 100644 --- a/app/portainer/oauth/components/oauth-providers-selector/oauth-provider-selector.controller.js +++ b/app/portainer/oauth/components/oauth-providers-selector/oauth-provider-selector.controller.js @@ -1,4 +1,4 @@ -import { options } from '@CE/react/portainer/settings/AuthenticationView/oauth-options'; +import { options } from '@/react/portainer/settings/AuthenticationView/oauth-options'; export default class OAuthProviderSelectorController { constructor() { diff --git a/app/portainer/oauth/components/oauth-settings/oauth-settings.controller.js b/app/portainer/oauth/components/oauth-settings/oauth-settings.controller.js index 1ef59f48b..4e23a3ccd 100644 --- a/app/portainer/oauth/components/oauth-settings/oauth-settings.controller.js +++ b/app/portainer/oauth/components/oauth-settings/oauth-settings.controller.js @@ -1,9 +1,9 @@ -import { baseHref } from '@CE/portainer/helpers/pathHelper'; -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; -import { isLimitedToBE } from '@CE/react/portainer/feature-flags/feature-flags.service'; -import { ModalType } from '@@CE/modals'; -import { confirm } from '@@CE/modals/confirm'; -import { buildConfirmButton } from '@@CE/modals/utils'; +import { baseHref } from '@/portainer/helpers/pathHelper'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; +import { isLimitedToBE } from '@/react/portainer/feature-flags/feature-flags.service'; +import { ModalType } from '@@/modals'; +import { confirm } from '@@/modals/confirm'; +import { buildConfirmButton } from '@@/modals/utils'; import providers, { getProviderByUrl } from './providers'; const MS_TENANT_ID_PLACEHOLDER = 'TENANT_ID'; diff --git a/app/portainer/oauth/components/oauth-settings/providers.js b/app/portainer/oauth/components/oauth-settings/providers.js index 00fc0eabb..124bf35f1 100644 --- a/app/portainer/oauth/components/oauth-settings/providers.js +++ b/app/portainer/oauth/components/oauth-settings/providers.js @@ -1,5 +1,5 @@ -import { baseHref } from '@CE/portainer/helpers/pathHelper'; -import { OAuthStyle } from '@CE/react/portainer/settings/types'; +import { baseHref } from '@/portainer/helpers/pathHelper'; +import { OAuthStyle } from '@/react/portainer/settings/types'; export default { microsoft: { diff --git a/app/portainer/rbac/components/access-viewer/access-viewer.controller.js b/app/portainer/rbac/components/access-viewer/access-viewer.controller.js index d7334108c..b231d6afb 100644 --- a/app/portainer/rbac/components/access-viewer/access-viewer.controller.js +++ b/app/portainer/rbac/components/access-viewer/access-viewer.controller.js @@ -1,8 +1,8 @@ import _ from 'lodash-es'; -import { isLimitedToBE } from '@CE/react/portainer/feature-flags/feature-flags.service'; +import { isLimitedToBE } from '@/react/portainer/feature-flags/feature-flags.service'; -import { getEnvironments } from '@CE/react/portainer/environments/environment.service'; -import { AccessViewerPolicyModel } from '@CE/react/portainer/users/RolesView/AccessViewer/model'; +import { getEnvironments } from '@/react/portainer/environments/environment.service'; +import { AccessViewerPolicyModel } from '@/react/portainer/users/RolesView/AccessViewer/model'; export default class AccessViewerController { /* @ngInject */ diff --git a/app/portainer/react/components/access-control.ts b/app/portainer/react/components/access-control.ts index 0659af3d2..bad17418c 100644 --- a/app/portainer/react/components/access-control.ts +++ b/app/portainer/react/components/access-control.ts @@ -1,14 +1,14 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { PorAccessControlFormTeamSelector } from '@CE/react/portainer/access-control/PorAccessControlForm/TeamsSelector'; -import { PorAccessControlFormUserSelector } from '@CE/react/portainer/access-control/PorAccessControlForm/UsersSelector'; -import { PorAccessManagementUsersSelector } from '@CE/react/portainer/access-control/AccessManagement/PorAccessManagementUsersSelector'; -import { AccessTypeSelector } from '@CE/react/portainer/access-control/EditDetails/AccessTypeSelector'; -import { AccessControlPanel } from '@CE/react/portainer/access-control'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { PorAccessControlFormTeamSelector } from '@/react/portainer/access-control/PorAccessControlForm/TeamsSelector'; +import { PorAccessControlFormUserSelector } from '@/react/portainer/access-control/PorAccessControlForm/UsersSelector'; +import { PorAccessManagementUsersSelector } from '@/react/portainer/access-control/AccessManagement/PorAccessManagementUsersSelector'; +import { AccessTypeSelector } from '@/react/portainer/access-control/EditDetails/AccessTypeSelector'; +import { AccessControlPanel } from '@/react/portainer/access-control'; export const accessControlModule = angular .module('portainer.app.react.components.access-control', []) diff --git a/app/portainer/react/components/account.ts b/app/portainer/react/components/account.ts index 0c6526285..ad96c99c0 100644 --- a/app/portainer/react/components/account.ts +++ b/app/portainer/react/components/account.ts @@ -1,12 +1,12 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { HelmRepositoryDatatable } from '@CE/react/portainer/account/AccountView/HelmRepositoryDatatable'; -import { AccessTokensDatatable } from '@CE/react/portainer/account/AccountView/AccessTokensDatatable'; -import { ApplicationSettingsWidget } from '@CE/react/portainer/account/AccountView/ApplicationSettings'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { HelmRepositoryDatatable } from '@/react/portainer/account/AccountView/HelmRepositoryDatatable'; +import { AccessTokensDatatable } from '@/react/portainer/account/AccountView/AccessTokensDatatable'; +import { ApplicationSettingsWidget } from '@/react/portainer/account/AccountView/ApplicationSettings'; export const accountModule = angular .module('portainer.app.react.components.account', []) diff --git a/app/portainer/react/components/activity-logs.ts b/app/portainer/react/components/activity-logs.ts index e102fd939..4c837255d 100644 --- a/app/portainer/react/components/activity-logs.ts +++ b/app/portainer/react/components/activity-logs.ts @@ -1,9 +1,9 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { AuthenticationLogsTable } from '@CE/react/portainer/logs/AuthenticationLogsView/AuthenticationLogsTable'; +import { r2a } from '@/react-tools/react2angular'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { AuthenticationLogsTable } from '@/react/portainer/logs/AuthenticationLogsView/AuthenticationLogsTable'; export const activityLogsModule = angular .module('portainer.app.react.components.activity-logs', []) diff --git a/app/portainer/react/components/custom-templates/index.ts b/app/portainer/react/components/custom-templates/index.ts index adbbe735b..46f817249 100644 --- a/app/portainer/react/components/custom-templates/index.ts +++ b/app/portainer/react/components/custom-templates/index.ts @@ -1,9 +1,9 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { CustomTemplatesVariablesDefinitionField } from '@CE/react/portainer/custom-templates/components/CustomTemplatesVariablesDefinitionField'; -import { CustomTemplatesVariablesField } from '@CE/react/portainer/custom-templates/components/CustomTemplatesVariablesField'; -import { withControlledInput } from '@CE/react-tools/withControlledInput'; +import { r2a } from '@/react-tools/react2angular'; +import { CustomTemplatesVariablesDefinitionField } from '@/react/portainer/custom-templates/components/CustomTemplatesVariablesDefinitionField'; +import { CustomTemplatesVariablesField } from '@/react/portainer/custom-templates/components/CustomTemplatesVariablesField'; +import { withControlledInput } from '@/react-tools/withControlledInput'; import { VariablesFieldAngular } from './variables-field'; diff --git a/app/portainer/react/components/custom-templates/variables-field.ts b/app/portainer/react/components/custom-templates/variables-field.ts index 735392233..30580417d 100644 --- a/app/portainer/react/components/custom-templates/variables-field.ts +++ b/app/portainer/react/components/custom-templates/variables-field.ts @@ -6,7 +6,7 @@ import { IOnChangesObject, } from 'angular'; -import { VariableDefinition } from '@CE/react/portainer/custom-templates/components/CustomTemplatesVariablesDefinitionField/CustomTemplatesVariablesDefinitionField'; +import { VariableDefinition } from '@/react/portainer/custom-templates/components/CustomTemplatesVariablesDefinitionField/CustomTemplatesVariablesDefinitionField'; class VariablesFieldController implements IComponentController { formCtrl!: IFormController; diff --git a/app/portainer/react/components/environments.ts b/app/portainer/react/components/environments.ts index 876a65e9e..4c5a95c7b 100644 --- a/app/portainer/react/components/environments.ts +++ b/app/portainer/react/components/environments.ts @@ -1,9 +1,9 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { EdgeKeyDisplay } from '@CE/react/portainer/environments/ItemView/EdgeKeyDisplay'; -import { KVMControl } from '@CE/react/portainer/environments/KvmView/KVMControl'; -import { TagsDatatable } from '@CE/react/portainer/environments/TagsView/TagsDatatable'; +import { r2a } from '@/react-tools/react2angular'; +import { EdgeKeyDisplay } from '@/react/portainer/environments/ItemView/EdgeKeyDisplay'; +import { KVMControl } from '@/react/portainer/environments/KvmView/KVMControl'; +import { TagsDatatable } from '@/react/portainer/environments/TagsView/TagsDatatable'; export const environmentsModule = angular .module('portainer.app.react.components.environments', []) diff --git a/app/portainer/react/components/file-upload-field.ts b/app/portainer/react/components/file-upload-field.ts index e2795b0d0..6b1be70a1 100644 --- a/app/portainer/react/components/file-upload-field.ts +++ b/app/portainer/react/components/file-upload-field.ts @@ -1,6 +1,6 @@ -import { r2a } from '@CE/react-tools/react2angular'; +import { r2a } from '@/react-tools/react2angular'; -import { FileUploadField } from '@@CE/form-components/FileUpload'; +import { FileUploadField } from '@@/form-components/FileUpload'; export const fileUploadField = r2a(FileUploadField, [ 'onChange', diff --git a/app/portainer/react/components/git-form.ts b/app/portainer/react/components/git-form.ts index 27a438519..af0c7d460 100644 --- a/app/portainer/react/components/git-form.ts +++ b/app/portainer/react/components/git-form.ts @@ -1,15 +1,15 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { AutoUpdateFieldset } from '@CE/react/portainer/gitops/AutoUpdateFieldset'; -import { GitForm } from '@CE/react/portainer/gitops/GitForm'; -import { AuthFieldset } from '@CE/react/portainer/gitops/AuthFieldset'; -import { InfoPanel } from '@CE/react/portainer/gitops/InfoPanel'; -import { RefField } from '@CE/react/portainer/gitops/RefField'; -import { TimeWindowDisplay } from '@CE/react/portainer/gitops/TimeWindowDisplay'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { AutoUpdateFieldset } from '@/react/portainer/gitops/AutoUpdateFieldset'; +import { GitForm } from '@/react/portainer/gitops/GitForm'; +import { AuthFieldset } from '@/react/portainer/gitops/AuthFieldset'; +import { InfoPanel } from '@/react/portainer/gitops/InfoPanel'; +import { RefField } from '@/react/portainer/gitops/RefField'; +import { TimeWindowDisplay } from '@/react/portainer/gitops/TimeWindowDisplay'; export const gitFormModule = angular .module('portainer.app.components.forms.git', []) diff --git a/app/portainer/react/components/index.ts b/app/portainer/react/components/index.ts index 9ae59a602..3a8ac3f95 100644 --- a/app/portainer/react/components/index.ts +++ b/app/portainer/react/components/index.ts @@ -1,45 +1,45 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { AnnotationsBeTeaser } from '@CE/react/kubernetes/annotations/AnnotationsBeTeaser'; -import { withFormValidation } from '@CE/react-tools/withFormValidation'; -import { GroupAssociationTable } from '@CE/react/portainer/environments/environment-groups/components/GroupAssociationTable'; -import { AssociatedEnvironmentsSelector } from '@CE/react/portainer/environments/environment-groups/components/AssociatedEnvironmentsSelector'; -import { withControlledInput } from '@CE/react-tools/withControlledInput'; -import { NamespacePortainerSelect } from '@CE/react/kubernetes/applications/components/NamespaceSelector/NamespaceSelector'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { AnnotationsBeTeaser } from '@/react/kubernetes/annotations/AnnotationsBeTeaser'; +import { withFormValidation } from '@/react-tools/withFormValidation'; +import { GroupAssociationTable } from '@/react/portainer/environments/environment-groups/components/GroupAssociationTable'; +import { AssociatedEnvironmentsSelector } from '@/react/portainer/environments/environment-groups/components/AssociatedEnvironmentsSelector'; +import { withControlledInput } from '@/react-tools/withControlledInput'; +import { NamespacePortainerSelect } from '@/react/kubernetes/applications/components/NamespaceSelector/NamespaceSelector'; import { EnvironmentVariablesFieldset, EnvironmentVariablesPanel, StackEnvironmentVariablesPanel, envVarValidation, -} from '@@CE/form-components/EnvironmentVariablesFieldset'; -import { Icon } from '@@CE/Icon'; -import { ReactQueryDevtoolsWrapper } from '@@CE/ReactQueryDevtoolsWrapper'; -import { PageHeader } from '@@CE/PageHeader'; -import { TagSelector } from '@@CE/TagSelector'; -import { Loading } from '@@CE/Widget/Loading'; -import { PasswordCheckHint } from '@@CE/PasswordCheckHint'; -import { Tooltip } from '@@CE/Tip/Tooltip'; -import { Badge } from '@@CE/Badge'; -import { TableColumnHeaderAngular } from '@@CE/datatables/TableHeaderCell'; -import { DashboardItem } from '@@CE/DashboardItem'; -import { SearchBar } from '@@CE/datatables/SearchBar'; -import { FallbackImage } from '@@CE/FallbackImage'; -import { BadgeIcon } from '@@CE/BadgeIcon'; -import { TeamsSelector } from '@@CE/TeamsSelector'; -import { TerminalTooltip } from '@@CE/TerminalTooltip'; -import { PortainerSelect } from '@@CE/form-components/PortainerSelect'; -import { Slider } from '@@CE/form-components/Slider'; -import { TagButton } from '@@CE/TagButton'; -import { BETeaserButton } from '@@CE/BETeaserButton'; -import { CodeEditor } from '@@CE/CodeEditor'; -import { HelpLink } from '@@CE/HelpLink'; -import { TextTip } from '@@CE/Tip/TextTip'; -import { InlineLoader } from '@@CE/InlineLoader/InlineLoader'; +} from '@@/form-components/EnvironmentVariablesFieldset'; +import { Icon } from '@@/Icon'; +import { ReactQueryDevtoolsWrapper } from '@@/ReactQueryDevtoolsWrapper'; +import { PageHeader } from '@@/PageHeader'; +import { TagSelector } from '@@/TagSelector'; +import { Loading } from '@@/Widget/Loading'; +import { PasswordCheckHint } from '@@/PasswordCheckHint'; +import { Tooltip } from '@@/Tip/Tooltip'; +import { Badge } from '@@/Badge'; +import { TableColumnHeaderAngular } from '@@/datatables/TableHeaderCell'; +import { DashboardItem } from '@@/DashboardItem'; +import { SearchBar } from '@@/datatables/SearchBar'; +import { FallbackImage } from '@@/FallbackImage'; +import { BadgeIcon } from '@@/BadgeIcon'; +import { TeamsSelector } from '@@/TeamsSelector'; +import { TerminalTooltip } from '@@/TerminalTooltip'; +import { PortainerSelect } from '@@/form-components/PortainerSelect'; +import { Slider } from '@@/form-components/Slider'; +import { TagButton } from '@@/TagButton'; +import { BETeaserButton } from '@@/BETeaserButton'; +import { CodeEditor } from '@@/CodeEditor'; +import { HelpLink } from '@@/HelpLink'; +import { TextTip } from '@@/Tip/TextTip'; +import { InlineLoader } from '@@/InlineLoader/InlineLoader'; import { fileUploadField } from './file-upload-field'; import { switchField } from './switch-field'; diff --git a/app/portainer/react/components/rbac.ts b/app/portainer/react/components/rbac.ts index fe7f5242f..5d93bfaaf 100644 --- a/app/portainer/react/components/rbac.ts +++ b/app/portainer/react/components/rbac.ts @@ -1,9 +1,9 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { AccessDatatable } from '@CE/react/portainer/access-control/AccessManagement/AccessDatatable/AccessDatatable'; +import { r2a } from '@/react-tools/react2angular'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { AccessDatatable } from '@/react/portainer/access-control/AccessManagement/AccessDatatable/AccessDatatable'; export const rbacModule = angular .module('portainer.app.react.components.rbac', []) diff --git a/app/portainer/react/components/registries.ts b/app/portainer/react/components/registries.ts index f421f2304..2ac733cfd 100644 --- a/app/portainer/react/components/registries.ts +++ b/app/portainer/react/components/registries.ts @@ -1,12 +1,12 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { RepositoriesDatatable } from '@CE/react/portainer/registries/repositories/ListView/RepositoriesDatatable'; -import { TagsDatatable } from '@CE/react/portainer/registries/repositories/ItemView/TagsDatatable/TagsDatatable'; -import { GitlabProjectTable } from '@CE/react/portainer/registries/CreateView/GitlabProjectsTable/GitlabProjectsTable'; -import { RegistryFormDockerhub } from '@CE/react/portainer/registries/CreateView/RegistryFormDockerhub/RegistryFormDockerhub'; +import { r2a } from '@/react-tools/react2angular'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { RepositoriesDatatable } from '@/react/portainer/registries/repositories/ListView/RepositoriesDatatable'; +import { TagsDatatable } from '@/react/portainer/registries/repositories/ItemView/TagsDatatable/TagsDatatable'; +import { GitlabProjectTable } from '@/react/portainer/registries/CreateView/GitlabProjectsTable/GitlabProjectsTable'; +import { RegistryFormDockerhub } from '@/react/portainer/registries/CreateView/RegistryFormDockerhub/RegistryFormDockerhub'; export const registriesModule = angular .module('portainer.app.react.components.registries', []) diff --git a/app/portainer/react/components/settings.ts b/app/portainer/react/components/settings.ts index 4d3ffba0c..478050dcd 100644 --- a/app/portainer/react/components/settings.ts +++ b/app/portainer/react/components/settings.ts @@ -1,18 +1,18 @@ import angular from 'angular'; -import { SettingsOpenAMT } from '@CE/react/portainer/settings/EdgeComputeView/SettingsOpenAMT'; -import { InternalAuth } from '@CE/react/portainer/settings/AuthenticationView/InternalAuth'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { LDAPUsersTable } from '@CE/react/portainer/settings/AuthenticationView/LDAPAuth/LDAPUsersTable'; -import { LDAPGroupsTable } from '@CE/react/portainer/settings/AuthenticationView/LDAPAuth/LDAPGroupsTable'; -import { ApplicationSettingsPanel } from '@CE/react/portainer/settings/SettingsView/ApplicationSettingsPanel'; -import { KubeSettingsPanel } from '@CE/react/portainer/settings/SettingsView/KubeSettingsPanel'; -import { HelmCertPanel } from '@CE/react/portainer/settings/SettingsView/HelmCertPanel'; -import { HiddenContainersPanel } from '@CE/react/portainer/settings/SettingsView/HiddenContainersPanel/HiddenContainersPanel'; -import { SSLSettingsPanelWrapper } from '@CE/react/portainer/settings/SettingsView/SSLSettingsPanel/SSLSettingsPanel'; -import { AuthStyleField } from '@CE/react/portainer/settings/AuthenticationView/OAuth'; +import { SettingsOpenAMT } from '@/react/portainer/settings/EdgeComputeView/SettingsOpenAMT'; +import { InternalAuth } from '@/react/portainer/settings/AuthenticationView/InternalAuth'; +import { r2a } from '@/react-tools/react2angular'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { LDAPUsersTable } from '@/react/portainer/settings/AuthenticationView/LDAPAuth/LDAPUsersTable'; +import { LDAPGroupsTable } from '@/react/portainer/settings/AuthenticationView/LDAPAuth/LDAPGroupsTable'; +import { ApplicationSettingsPanel } from '@/react/portainer/settings/SettingsView/ApplicationSettingsPanel'; +import { KubeSettingsPanel } from '@/react/portainer/settings/SettingsView/KubeSettingsPanel'; +import { HelmCertPanel } from '@/react/portainer/settings/SettingsView/HelmCertPanel'; +import { HiddenContainersPanel } from '@/react/portainer/settings/SettingsView/HiddenContainersPanel/HiddenContainersPanel'; +import { SSLSettingsPanelWrapper } from '@/react/portainer/settings/SettingsView/SSLSettingsPanel/SSLSettingsPanel'; +import { AuthStyleField } from '@/react/portainer/settings/AuthenticationView/OAuth'; export const settingsModule = angular .module('portainer.app.react.components.settings', []) diff --git a/app/portainer/react/components/switch-field.ts b/app/portainer/react/components/switch-field.ts index 46f4da65c..4f8b7213c 100644 --- a/app/portainer/react/components/switch-field.ts +++ b/app/portainer/react/components/switch-field.ts @@ -1,6 +1,6 @@ -import { r2a } from '@CE/react-tools/react2angular'; +import { r2a } from '@/react-tools/react2angular'; -import { SwitchField } from '@@CE/form-components/SwitchField'; +import { SwitchField } from '@@/form-components/SwitchField'; export const switchField = r2a(SwitchField, [ 'tooltip', diff --git a/app/portainer/react/components/users.ts b/app/portainer/react/components/users.ts index 784af4f00..ffb280bbe 100644 --- a/app/portainer/react/components/users.ts +++ b/app/portainer/react/components/users.ts @@ -1,10 +1,10 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { EffectiveAccessViewerDatatable } from '@CE/react/portainer/users/RolesView/AccessViewer/EffectiveAccessViewerDatatable'; -import { RbacRolesDatatable } from '@CE/react/portainer/users/RolesView/RbacRolesDatatable'; +import { r2a } from '@/react-tools/react2angular'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { EffectiveAccessViewerDatatable } from '@/react/portainer/users/RolesView/AccessViewer/EffectiveAccessViewerDatatable'; +import { RbacRolesDatatable } from '@/react/portainer/users/RolesView/RbacRolesDatatable'; export const usersModule = angular .module('portainer.app.react.components.users', []) diff --git a/app/portainer/react/views/activity-logs.ts b/app/portainer/react/views/activity-logs.ts index 3b364f7dd..e7427673a 100644 --- a/app/portainer/react/views/activity-logs.ts +++ b/app/portainer/react/views/activity-logs.ts @@ -1,9 +1,9 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { ActivityLogsView } from '@CE/react/portainer/logs/ActivityLogsView/ActivityLogsView'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; +import { r2a } from '@/react-tools/react2angular'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { ActivityLogsView } from '@/react/portainer/logs/ActivityLogsView/ActivityLogsView'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; export const activityLogsModule = angular .module('portainer.app.react.views.activity-logs', []) diff --git a/app/portainer/react/views/env-groups.ts b/app/portainer/react/views/env-groups.ts index e1d91d578..fcdeccd52 100644 --- a/app/portainer/react/views/env-groups.ts +++ b/app/portainer/react/views/env-groups.ts @@ -1,10 +1,10 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { ListView } from '@CE/react/portainer/environments/environment-groups/ListView'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { ListView } from '@/react/portainer/environments/environment-groups/ListView'; export const environmentGroupModule = angular .module('portainer.app.react.views.environment-groups', []) diff --git a/app/portainer/react/views/index.ts b/app/portainer/react/views/index.ts index 3873f19a7..d699f903d 100644 --- a/app/portainer/react/views/index.ts +++ b/app/portainer/react/views/index.ts @@ -1,17 +1,17 @@ import angular from 'angular'; -import { HomeView } from '@CE/react/portainer/HomeView'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { CreateUserAccessToken } from '@CE/react/portainer/account/CreateAccessTokenView'; -import { EdgeComputeSettingsView } from '@CE/react/portainer/settings/EdgeComputeView/EdgeComputeSettingsView'; -import { EdgeAutoCreateScriptView } from '@CE/react/portainer/environments/EdgeAutoCreateScriptView'; -import { ListView as EnvironmentsListView } from '@CE/react/portainer/environments/ListView'; -import { BackupSettingsPanel } from '@CE/react/portainer/settings/SettingsView/BackupSettingsView/BackupSettingsPanel'; -import { SettingsView } from '@CE/react/portainer/settings/SettingsView/SettingsView'; -import { CreateHelmRepositoriesView } from '@CE/react/portainer/account/helm-repositories/CreateHelmRepositoryView'; +import { HomeView } from '@/react/portainer/HomeView'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { r2a } from '@/react-tools/react2angular'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { CreateUserAccessToken } from '@/react/portainer/account/CreateAccessTokenView'; +import { EdgeComputeSettingsView } from '@/react/portainer/settings/EdgeComputeView/EdgeComputeSettingsView'; +import { EdgeAutoCreateScriptView } from '@/react/portainer/environments/EdgeAutoCreateScriptView'; +import { ListView as EnvironmentsListView } from '@/react/portainer/environments/ListView'; +import { BackupSettingsPanel } from '@/react/portainer/settings/SettingsView/BackupSettingsView/BackupSettingsPanel'; +import { SettingsView } from '@/react/portainer/settings/SettingsView/SettingsView'; +import { CreateHelmRepositoriesView } from '@/react/portainer/account/helm-repositories/CreateHelmRepositoryView'; import { wizardModule } from './wizard'; import { teamsModule } from './teams'; diff --git a/app/portainer/react/views/registries.ts b/app/portainer/react/views/registries.ts index aa7eb00b8..7b4cfdd2e 100644 --- a/app/portainer/react/views/registries.ts +++ b/app/portainer/react/views/registries.ts @@ -1,11 +1,11 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { ListView } from '@CE/react/portainer/registries/ListView'; -import { ListView as EnvironmentListView } from '@CE/react/portainer/registries/environments/ListView'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { ListView } from '@/react/portainer/registries/ListView'; +import { ListView as EnvironmentListView } from '@/react/portainer/registries/environments/ListView'; export const registriesModule = angular .module('portainer.app.react.views.registries', []) diff --git a/app/portainer/react/views/sidebar.ts b/app/portainer/react/views/sidebar.ts index 0b209273c..623e24446 100644 --- a/app/portainer/react/views/sidebar.ts +++ b/app/portainer/react/views/sidebar.ts @@ -1,11 +1,11 @@ import angular from 'angular'; -import { AngularSidebarService } from '@CE/react/sidebar/useSidebarState'; -import { Sidebar } from '@CE/react/sidebar/Sidebar'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; +import { AngularSidebarService } from '@/react/sidebar/useSidebarState'; +import { Sidebar } from '@/react/sidebar/Sidebar'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; export const sidebarModule = angular .module('portainer.app.sidebar', []) diff --git a/app/portainer/react/views/teams.ts b/app/portainer/react/views/teams.ts index 8f2927622..9d8c34c0c 100644 --- a/app/portainer/react/views/teams.ts +++ b/app/portainer/react/views/teams.ts @@ -1,12 +1,12 @@ import angular from 'angular'; import { StateRegistry } from '@uirouter/angularjs'; -import { ItemView, ListView } from '@CE/react/portainer/users/teams'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { AccessHeaders } from '@CE/portainer/authorization-guard'; +import { ItemView, ListView } from '@/react/portainer/users/teams'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { AccessHeaders } from '@/portainer/authorization-guard'; export const teamsModule = angular .module('portainer.app.teams', []) diff --git a/app/portainer/react/views/templates.ts b/app/portainer/react/views/templates.ts index 9811d84c6..5b79de9de 100644 --- a/app/portainer/react/views/templates.ts +++ b/app/portainer/react/views/templates.ts @@ -1,12 +1,12 @@ import angular from 'angular'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { CreateView } from '@CE/react/portainer/templates/custom-templates/CreateView'; -import { EditView } from '@CE/react/portainer/templates/custom-templates/EditView'; -import { AppTemplatesView } from '@CE/react/portainer/templates/app-templates/AppTemplatesView'; -import { ListView } from '@CE/react/portainer/templates/custom-templates/ListView/ListView'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { CreateView } from '@/react/portainer/templates/custom-templates/CreateView'; +import { EditView } from '@/react/portainer/templates/custom-templates/EditView'; +import { AppTemplatesView } from '@/react/portainer/templates/app-templates/AppTemplatesView'; +import { ListView } from '@/react/portainer/templates/custom-templates/ListView/ListView'; export const templatesModule = angular .module('portainer.app.react.views.templates', []) diff --git a/app/portainer/react/views/update-schedules.ts b/app/portainer/react/views/update-schedules.ts index a82143623..73c684d20 100644 --- a/app/portainer/react/views/update-schedules.ts +++ b/app/portainer/react/views/update-schedules.ts @@ -1,15 +1,15 @@ import angular from 'angular'; import { StateRegistry } from '@uirouter/angularjs'; -import { r2a } from '@CE/react-tools/react2angular'; +import { r2a } from '@/react-tools/react2angular'; import { ListView, CreateView, ItemView, -} from '@CE/react/portainer/environments/update-schedules'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; +} from '@/react/portainer/environments/update-schedules'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; export const updateSchedulesModule = angular .module('portainer.edge.updateSchedules', []) diff --git a/app/portainer/react/views/users.ts b/app/portainer/react/views/users.ts index f389c4236..22991e975 100644 --- a/app/portainer/react/views/users.ts +++ b/app/portainer/react/views/users.ts @@ -1,10 +1,10 @@ import angular from 'angular'; -import { ListView } from '@CE/react/portainer/users/ListView/ListView'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; +import { ListView } from '@/react/portainer/users/ListView/ListView'; +import { r2a } from '@/react-tools/react2angular'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; export const usersModule = angular .module('portainer.app.react.views.users', []) diff --git a/app/portainer/react/views/wizard.ts b/app/portainer/react/views/wizard.ts index ad52d7793..65b95495e 100644 --- a/app/portainer/react/views/wizard.ts +++ b/app/portainer/react/views/wizard.ts @@ -1,16 +1,16 @@ import angular from 'angular'; import { StateRegistry } from '@uirouter/angularjs'; -import { r2a } from '@CE/react-tools/react2angular'; +import { r2a } from '@/react-tools/react2angular'; import { EnvironmentCreationView, EnvironmentTypeSelectView, HomeView, -} from '@CE/react/portainer/environments/wizard'; -import { withCurrentUser } from '@CE/react-tools/withCurrentUser'; -import { withReactQuery } from '@CE/react-tools/withReactQuery'; -import { withUIRouter } from '@CE/react-tools/withUIRouter'; -import { AccessHeaders } from '@CE/portainer/authorization-guard'; +} from '@/react/portainer/environments/wizard'; +import { withCurrentUser } from '@/react-tools/withCurrentUser'; +import { withReactQuery } from '@/react-tools/withReactQuery'; +import { withUIRouter } from '@/react-tools/withUIRouter'; +import { AccessHeaders } from '@/portainer/authorization-guard'; export const wizardModule = angular .module('portainer.app.react.views.wizard', []) diff --git a/app/portainer/registry-management/views/create/createRegistryController.js b/app/portainer/registry-management/views/create/createRegistryController.js index 79f861e37..578dbcece 100644 --- a/app/portainer/registry-management/views/create/createRegistryController.js +++ b/app/portainer/registry-management/views/create/createRegistryController.js @@ -1,7 +1,7 @@ import _ from 'lodash'; import { RegistryTypes } from 'Portainer/models/registryTypes'; import { RegistryCreateFormValues } from 'Portainer/models/registry'; -import { options } from '@CE/react/portainer/registries/CreateView/options'; +import { options } from '@/react/portainer/registries/CreateView/options'; class CreateRegistryController { /* @ngInject */ @@ -146,7 +146,7 @@ class CreateRegistryController { /** * - * @param {import('@CE/react/portainer/registries/CreateView/RegistryFormDockerhub/RegistryFormDockerhub').RegistryFormDockerhubValues} model + * @param {import('@/react/portainer/registries/CreateView/RegistryFormDockerhub/RegistryFormDockerhub').RegistryFormDockerhubValues} model */ onSubmitDocker(model) { this.model = model; diff --git a/app/portainer/registry-management/views/edit/registryController.js b/app/portainer/registry-management/views/edit/registryController.js index 28faf63f1..97e3129ab 100644 --- a/app/portainer/registry-management/views/edit/registryController.js +++ b/app/portainer/registry-management/views/edit/registryController.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { RegistryTypes } from '@CE/portainer/models/registryTypes'; +import { RegistryTypes } from '@/portainer/models/registryTypes'; export default class RegistryController { /* @ngInject */ diff --git a/app/portainer/services/angularToReact.ts b/app/portainer/services/angularToReact.ts index 5a1cce35d..b6b08095b 100644 --- a/app/portainer/services/angularToReact.ts +++ b/app/portainer/services/angularToReact.ts @@ -1,4 +1,4 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { EndpointProviderInterface } from './endpointProvider'; @@ -62,19 +62,19 @@ export function AngularToReact( * * **New format** * ``` - * // file:: '@CE/react/.../useService.ts' + * // file:: '@/react/.../useService.ts' * // this function has `environmentId` as first parameter, which doesn't match the old AngularJS service signature * export async function getService(environmentId: EnvironmentId, serviceId: ServiceId) { * // axios.get() * } - * // file:: '@CE/react/.../useServices.ts' + * // file:: '@/react/.../useServices.ts' * // this function has `environmentId` as first parameter, which matches the old AngularJS service signature * export async function listServices(environmentId: EnvironmentId, serviceId: ServiceId) { * // axios.get() * } * // file:: AngularJS service.js - * import { getService } from '@CE/react/.../useService.ts'; - * import { listServices } from '@CE/react/.../useServices.ts'; + * import { getService } from '@/react/.../useService.ts'; + * import { listServices } from '@/react/.../useServices.ts'; * * // ngInject * function ServiceServiceFactory(AngularToReact) { diff --git a/app/portainer/services/api/dockerhubService.js b/app/portainer/services/api/dockerhubService.js index bb7e370b6..b49c7eb7c 100644 --- a/app/portainer/services/api/dockerhubService.js +++ b/app/portainer/services/api/dockerhubService.js @@ -1,5 +1,5 @@ -import { PortainerEndpointTypes } from '@CE/portainer/models/endpoint/models'; -import { isLocalEnvironment } from '@CE/react/portainer/environments/utils'; +import { PortainerEndpointTypes } from '@/portainer/models/endpoint/models'; +import { isLocalEnvironment } from '@/react/portainer/environments/utils'; angular.module('portainer.app').factory('DockerHubService', DockerHubService); diff --git a/app/portainer/services/api/registryService.js b/app/portainer/services/api/registryService.js index d55f19380..b18b08806 100644 --- a/app/portainer/services/api/registryService.js +++ b/app/portainer/services/api/registryService.js @@ -85,8 +85,8 @@ angular.module('portainer.app').factory('RegistryService', [ } /** - * @param {import('@CE/portainer/models/registry').RegistryCreateFormValues} model - * @param {Array} projects + * @param {import('@/portainer/models/registry').RegistryCreateFormValues} model + * @param {Array} projects */ function createGitlabRegistries(model, projects) { const promises = []; diff --git a/app/portainer/services/api/stackService.js b/app/portainer/services/api/stackService.js index 4329c837d..22a228c99 100644 --- a/app/portainer/services/api/stackService.js +++ b/app/portainer/services/api/stackService.js @@ -1,6 +1,6 @@ import _ from 'lodash-es'; -import { transformAutoUpdateViewModel } from '@CE/react/portainer/gitops/AutoUpdateFieldset/utils'; -import { StackViewModel } from '@CE/react/docker/stacks/view-models/stack'; +import { transformAutoUpdateViewModel } from '@/react/portainer/gitops/AutoUpdateFieldset/utils'; +import { StackViewModel } from '@/react/docker/stacks/view-models/stack'; angular.module('portainer.app').factory('StackService', [ '$q', diff --git a/app/portainer/services/api/statusService.js b/app/portainer/services/api/statusService.js index 9f0f67801..a91d71f18 100644 --- a/app/portainer/services/api/statusService.js +++ b/app/portainer/services/api/statusService.js @@ -1,4 +1,4 @@ -import { getSystemStatus } from '@CE/react/portainer/system/useSystemStatus'; +import { getSystemStatus } from '@/react/portainer/system/useSystemStatus'; import { StatusViewModel } from '../../models/status'; angular.module('portainer.app').factory('StatusService', StatusServiceFactory); diff --git a/app/portainer/services/api/templateService.js b/app/portainer/services/api/templateService.js index 6106414ab..96a5a792c 100644 --- a/app/portainer/services/api/templateService.js +++ b/app/portainer/services/api/templateService.js @@ -1,4 +1,4 @@ -import { TemplateViewModel } from '@CE/react/portainer/templates/app-templates/view-model'; +import { TemplateViewModel } from '@/react/portainer/templates/app-templates/view-model'; import { DockerHubViewModel } from 'Portainer/models/dockerhub'; angular.module('portainer.app').factory('TemplateService', TemplateServiceFactory); diff --git a/app/portainer/services/api/userService.js b/app/portainer/services/api/userService.js index 6df6cf762..1ee22a7b5 100644 --- a/app/portainer/services/api/userService.js +++ b/app/portainer/services/api/userService.js @@ -1,7 +1,7 @@ import _ from 'lodash-es'; -import { UserViewModel } from '@CE/portainer/models/user'; -import { getUsers } from '@CE/portainer/users/user.service'; -import { getUser } from '@CE/portainer/users/queries/useUser'; +import { UserViewModel } from '@/portainer/models/user'; +import { getUsers } from '@/portainer/users/user.service'; +import { getUser } from '@/portainer/users/queries/useUser'; import { TeamMembershipModel } from '../../models/teamMembership'; diff --git a/app/portainer/services/authentication.js b/app/portainer/services/authentication.js index 288021b90..3825aff27 100644 --- a/app/portainer/services/authentication.js +++ b/app/portainer/services/authentication.js @@ -1,4 +1,4 @@ -import { hasAuthorizations as useUserHasAuthorization } from '@CE/react/hooks/useUser'; +import { hasAuthorizations as useUserHasAuthorization } from '@/react/hooks/useUser'; import { getCurrentUser } from '../users/queries/useLoadCurrentUser'; import * as userHelpers from '../users/user.helpers'; import { clear as clearSessionStorage } from './session-storage'; diff --git a/app/portainer/services/axios.ts b/app/portainer/services/axios.ts index 2ae5fa55c..d5c8d5840 100644 --- a/app/portainer/services/axios.ts +++ b/app/portainer/services/axios.ts @@ -14,7 +14,7 @@ import { loadProgressBar } from 'axios-progress-bar'; import 'axios-progress-bar/dist/nprogress.css'; import qs from 'qs'; -import PortainerError from '@CE/portainer/error'; +import PortainerError from '@/portainer/error'; import { CACHE_DURATION, diff --git a/app/portainer/services/dockerMaxApiVersionInterceptor.ts b/app/portainer/services/dockerMaxApiVersionInterceptor.ts index db8768e3b..9a66aaedf 100644 --- a/app/portainer/services/dockerMaxApiVersionInterceptor.ts +++ b/app/portainer/services/dockerMaxApiVersionInterceptor.ts @@ -2,7 +2,7 @@ import { SystemVersion } from 'docker-types/generated/1.44'; import Axios, { InternalAxiosRequestConfig } from 'axios'; import { setupCache, buildMemoryStorage } from 'axios-cache-interceptor'; -import { buildDockerProxyUrl } from '@CE/react/docker/proxy/queries/buildDockerProxyUrl'; +import { buildDockerProxyUrl } from '@/react/docker/proxy/queries/buildDockerProxyUrl'; import { MAX_DOCKER_API_VERSION } from './dockerMaxApiVersion'; diff --git a/app/portainer/services/endpointProvider.ts b/app/portainer/services/endpointProvider.ts index 3735e12e4..34d661887 100644 --- a/app/portainer/services/endpointProvider.ts +++ b/app/portainer/services/endpointProvider.ts @@ -1,9 +1,9 @@ -import { ping } from '@CE/react/docker/proxy/queries/usePing'; -import { environmentStore } from '@CE/react/hooks/current-environment-store'; +import { ping } from '@/react/docker/proxy/queries/usePing'; +import { environmentStore } from '@/react/hooks/current-environment-store'; import { Environment, EnvironmentType, -} from '@CE/react/portainer/environments/types'; +} from '@/react/portainer/environments/types'; interface State { currentEndpoint: Environment | null; diff --git a/app/portainer/services/formValidator.js b/app/portainer/services/formValidator.js index 5599eb4cf..7cac12290 100644 --- a/app/portainer/services/formValidator.js +++ b/app/portainer/services/formValidator.js @@ -1,4 +1,4 @@ -import { ResourceControlOwnership as RCO } from '@CE/react/portainer/access-control/types'; +import { ResourceControlOwnership as RCO } from '@/react/portainer/access-control/types'; angular.module('portainer.app').factory('FormValidator', [ function FormValidatorFactory() { diff --git a/app/portainer/services/nameValidator.js b/app/portainer/services/nameValidator.js index ce660975f..bf3ca58d2 100644 --- a/app/portainer/services/nameValidator.js +++ b/app/portainer/services/nameValidator.js @@ -1,5 +1,5 @@ import angular from 'angular'; -import { getEnvironments } from '@CE/react/portainer/environments/environment.service'; +import { getEnvironments } from '@/react/portainer/environments/environment.service'; angular.module('portainer.app').factory('NameValidator', NameValidatorFactory); /* @ngInject */ diff --git a/app/portainer/services/notifications.ts b/app/portainer/services/notifications.ts index 39c9a55ee..bfbebd3f6 100644 --- a/app/portainer/services/notifications.ts +++ b/app/portainer/services/notifications.ts @@ -3,9 +3,9 @@ import toastr from 'toastr'; import sanitize from 'sanitize-html'; import { v4 as uuid } from 'uuid'; -import { get as localStorageGet } from '@CE/react/hooks/useLocalStorage'; -import { notificationsStore } from '@CE/react/portainer/notifications/notifications-store'; -import { ToastNotification } from '@CE/react/portainer/notifications/types'; +import { get as localStorageGet } from '@/react/hooks/useLocalStorage'; +import { notificationsStore } from '@/react/portainer/notifications/notifications-store'; +import { ToastNotification } from '@/react/portainer/notifications/types'; const { addNotification } = notificationsStore.getState(); diff --git a/app/portainer/services/registryGitlabService.js b/app/portainer/services/registryGitlabService.js index 1c070ed97..f6fb3065b 100644 --- a/app/portainer/services/registryGitlabService.js +++ b/app/portainer/services/registryGitlabService.js @@ -1,5 +1,5 @@ import _ from 'lodash-es'; -import { RegistryGitlabProject } from '@CE/react/portainer/registries/types/gitlabProject'; +import { RegistryGitlabProject } from '@/react/portainer/registries/types/gitlabProject'; import { RegistryRepositoryGitlabViewModel } from '../models/registryRepository'; angular.module('portainer.app').factory('RegistryGitlabService', [ diff --git a/app/portainer/services/registryModalService.js b/app/portainer/services/registryModalService.js index b8fa86913..de4caa87b 100644 --- a/app/portainer/services/registryModalService.js +++ b/app/portainer/services/registryModalService.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { selectRegistry } from '@CE/react/docker/images/ItemView/RegistrySelectPrompt'; +import { selectRegistry } from '@/react/docker/images/ItemView/RegistrySelectPrompt'; angular.module('portainer.app').factory('RegistryModalService', RegistryModalService); diff --git a/app/portainer/services/types.ts b/app/portainer/services/types.ts index 59ce3155e..dd18201e3 100644 --- a/app/portainer/services/types.ts +++ b/app/portainer/services/types.ts @@ -1,4 +1,4 @@ -import { Environment } from '@CE/react/portainer/environments/types'; +import { Environment } from '@/react/portainer/environments/types'; export interface StateManager { updateEndpointState(endpoint: Environment): Promise; diff --git a/app/portainer/settings/authentication/ldap/ad-settings/ad-settings.controller.js b/app/portainer/settings/authentication/ldap/ad-settings/ad-settings.controller.js index d6b8bcda4..502a71669 100644 --- a/app/portainer/settings/authentication/ldap/ad-settings/ad-settings.controller.js +++ b/app/portainer/settings/authentication/ldap/ad-settings/ad-settings.controller.js @@ -1,7 +1,7 @@ import _ from 'lodash-es'; -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; -import { isLimitedToBE } from '@CE/react/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 */ diff --git a/app/portainer/settings/authentication/ldap/ldap-settings-custom/ldap-settings-custom.controller.js b/app/portainer/settings/authentication/ldap/ldap-settings-custom/ldap-settings-custom.controller.js index b1eaf4e9d..59072ab22 100644 --- a/app/portainer/settings/authentication/ldap/ldap-settings-custom/ldap-settings-custom.controller.js +++ b/app/portainer/settings/authentication/ldap/ldap-settings-custom/ldap-settings-custom.controller.js @@ -1,4 +1,4 @@ -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; export default class LdapSettingsCustomController { constructor() { diff --git a/app/portainer/settings/authentication/ldap/ldap-settings-openldap/ldap-settings-openldap.controller.js b/app/portainer/settings/authentication/ldap/ldap-settings-openldap/ldap-settings-openldap.controller.js index 7b4ebd9ce..6fb83cabe 100644 --- a/app/portainer/settings/authentication/ldap/ldap-settings-openldap/ldap-settings-openldap.controller.js +++ b/app/portainer/settings/authentication/ldap/ldap-settings-openldap/ldap-settings-openldap.controller.js @@ -1,4 +1,4 @@ -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; export default class LdapSettingsOpenLDAPController { /* @ngInject */ diff --git a/app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.controller.js b/app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.controller.js index aa713243e..3d13509e1 100644 --- a/app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.controller.js +++ b/app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.controller.js @@ -1,5 +1,5 @@ -import { buildLdapSettingsModel, buildOpenLDAPSettingsModel } from '@CE/portainer/settings/authentication/ldap/ldap-settings.model'; -import { options } from '@CE/react/portainer/settings/AuthenticationView/ldap-options'; +import { buildLdapSettingsModel, buildOpenLDAPSettingsModel } from '@/portainer/settings/authentication/ldap/ldap-settings.model'; +import { options } from '@/react/portainer/settings/AuthenticationView/ldap-options'; const SERVER_TYPES = { CUSTOM: 0, diff --git a/app/portainer/tags/queries.ts b/app/portainer/tags/queries.ts index 3190ce271..fe4bac346 100644 --- a/app/portainer/tags/queries.ts +++ b/app/portainer/tags/queries.ts @@ -4,8 +4,8 @@ import { mutationOptions, withError, withInvalidate, -} from '@CE/react-tools/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +} from '@/react-tools/react-query'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { createTag, getTags } from './tags.service'; import { Tag, TagId } from './types'; diff --git a/app/portainer/user-activity/auth-logs-view/auth-logs-view.controller.js b/app/portainer/user-activity/auth-logs-view/auth-logs-view.controller.js index 31ccc5fc1..35744f4fa 100644 --- a/app/portainer/user-activity/auth-logs-view/auth-logs-view.controller.js +++ b/app/portainer/user-activity/auth-logs-view/auth-logs-view.controller.js @@ -1,6 +1,6 @@ import moment from 'moment'; -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; export default class AuthLogsViewController { /* @ngInject */ diff --git a/app/portainer/user-activity/index.js b/app/portainer/user-activity/index.js index 7ca992eda..0a04640e0 100644 --- a/app/portainer/user-activity/index.js +++ b/app/portainer/user-activity/index.js @@ -1,6 +1,6 @@ import angular from 'angular'; -import { NotificationsViewAngular } from '@CE/react/portainer/notifications/NotificationsView'; +import { NotificationsViewAngular } from '@/react/portainer/notifications/NotificationsView'; import { AccessHeaders } from '../authorization-guard'; import authLogsViewModule from './auth-logs-view'; import { UserActivityService } from './user-activity.service'; diff --git a/app/portainer/user-activity/user-activity.rest.js b/app/portainer/user-activity/user-activity.rest.js index 826393505..4ed527e81 100644 --- a/app/portainer/user-activity/user-activity.rest.js +++ b/app/portainer/user-activity/user-activity.rest.js @@ -1,4 +1,4 @@ -import { baseHref } from '@CE/portainer/helpers/pathHelper'; +import { baseHref } from '@/portainer/helpers/pathHelper'; /* @ngInject */ export function UserActivity($resource, $http) { diff --git a/app/portainer/users/queries.ts b/app/portainer/users/queries.ts index 5bf0474f7..96fd5f5eb 100644 --- a/app/portainer/users/queries.ts +++ b/app/portainer/users/queries.ts @@ -1,10 +1,7 @@ import { useQuery } from '@tanstack/react-query'; -import { - TeamRole, - TeamMembership, -} from '@CE/react/portainer/users/teams/types'; -import { useCurrentUser, useIsEdgeAdmin } from '@CE/react/hooks/useUser'; +import { TeamRole, TeamMembership } from '@/react/portainer/users/teams/types'; +import { useCurrentUser, useIsEdgeAdmin } from '@/react/hooks/useUser'; import { User, UserId } from './types'; import { getUserMemberships, getUsers } from './user.service'; diff --git a/app/portainer/users/queries/useLoadCurrentUser.ts b/app/portainer/users/queries/useLoadCurrentUser.ts index 169d6ab79..bd47fbee9 100644 --- a/app/portainer/users/queries/useLoadCurrentUser.ts +++ b/app/portainer/users/queries/useLoadCurrentUser.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { withError } from '@CE/react-tools/react-query'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { withError } from '@/react-tools/react-query'; import { buildUrl } from '../user.service'; import { User } from '../types'; diff --git a/app/portainer/users/queries/useUser.ts b/app/portainer/users/queries/useUser.ts index 289ea48ad..01e069829 100644 --- a/app/portainer/users/queries/useUser.ts +++ b/app/portainer/users/queries/useUser.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { withError } from '@CE/react-tools/react-query'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { withError } from '@/react-tools/react-query'; import { buildUrl } from '../user.service'; import { User, UserId } from '../types'; diff --git a/app/portainer/users/types.ts b/app/portainer/users/types.ts index 1a3e066df..b62fb75f5 100644 --- a/app/portainer/users/types.ts +++ b/app/portainer/users/types.ts @@ -1,5 +1,5 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { AuthorizationMap } from '@CE/react/portainer/users/RolesView/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { AuthorizationMap } from '@/react/portainer/users/RolesView/types'; import { type UserId } from './types/user-id'; diff --git a/app/portainer/users/user.helpers.ts b/app/portainer/users/user.helpers.ts index 40da1ecdb..c087d4d1e 100644 --- a/app/portainer/users/user.helpers.ts +++ b/app/portainer/users/user.helpers.ts @@ -1,5 +1,5 @@ -import { Environment } from '@CE/react/portainer/environments/types'; -import { isEdgeEnvironment } from '@CE/react/portainer/environments/utils'; +import { Environment } from '@/react/portainer/environments/types'; +import { isEdgeEnvironment } from '@/react/portainer/environments/utils'; import { Role, User } from './types'; diff --git a/app/portainer/users/user.service.ts b/app/portainer/users/user.service.ts index aacc9ae9c..de64058dd 100644 --- a/app/portainer/users/user.service.ts +++ b/app/portainer/users/user.service.ts @@ -1,5 +1,5 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { TeamMembership } from '@CE/react/portainer/users/teams/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { TeamMembership } from '@/react/portainer/users/teams/types'; import { User, UserId } from './types'; import { filterNonAdministratorUsers } from './user.helpers'; diff --git a/app/portainer/views/account/accountController.js b/app/portainer/views/account/accountController.js index 0c6236c8e..8982baac3 100644 --- a/app/portainer/views/account/accountController.js +++ b/app/portainer/views/account/accountController.js @@ -1,6 +1,6 @@ -import { confirmChangePassword } from '@@CE/modals/confirm'; -import { openDialog } from '@@CE/modals/Dialog'; -import { buildConfirmButton } from '@@CE/modals/utils'; +import { confirmChangePassword } from '@@/modals/confirm'; +import { openDialog } from '@@/modals/Dialog'; +import { buildConfirmButton } from '@@/modals/utils'; angular.module('portainer.app').controller('AccountController', [ '$scope', diff --git a/app/portainer/views/auth/auth.html b/app/portainer/views/auth/auth.html index 4de96378e..2504141a7 100644 --- a/app/portainer/views/auth/auth.html +++ b/app/portainer/views/auth/auth.html @@ -5,8 +5,8 @@
- - + +
diff --git a/app/portainer/views/auth/authController.js b/app/portainer/views/auth/authController.js index 5d3de6b46..b2800ed42 100644 --- a/app/portainer/views/auth/authController.js +++ b/app/portainer/views/auth/authController.js @@ -1,7 +1,7 @@ import angular from 'angular'; import uuidv4 from 'uuid/v4'; -import { getEnvironments } from '@CE/react/portainer/environments/environment.service'; -import { dispatchCacheRefreshEvent } from '@CE/portainer/services/http-request.helper'; +import { getEnvironments } from '@/react/portainer/environments/environment.service'; +import { dispatchCacheRefreshEvent } from '@/portainer/services/http-request.helper'; class AuthenticationController { /* @ngInject */ diff --git a/app/portainer/views/endpoints/access/endpointAccessController.js b/app/portainer/views/endpoints/access/endpointAccessController.js index f15c95cc6..0cdbbe70b 100644 --- a/app/portainer/views/endpoints/access/endpointAccessController.js +++ b/app/portainer/views/endpoints/access/endpointAccessController.js @@ -1,6 +1,6 @@ import angular from 'angular'; -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; class EndpointAccessController { /* @ngInject */ diff --git a/app/portainer/views/endpoints/edit/endpointController.js b/app/portainer/views/endpoints/edit/endpointController.js index b27407036..3658a6c13 100644 --- a/app/portainer/views/endpoints/edit/endpointController.js +++ b/app/portainer/views/endpoints/edit/endpointController.js @@ -1,16 +1,16 @@ import _ from 'lodash-es'; import uuidv4 from 'uuid/v4'; -import { PortainerEndpointTypes } from '@CE/portainer/models/endpoint/models'; -import EndpointHelper from '@CE/portainer/helpers/endpointHelper'; +import { PortainerEndpointTypes } from '@/portainer/models/endpoint/models'; +import EndpointHelper from '@/portainer/helpers/endpointHelper'; import { getAMTInfo } from 'Portainer/hostmanagement/open-amt/open-amt.service'; -import { isEdgeEnvironment, isDockerAPIEnvironment } from '@CE/react/portainer/environments/utils'; +import { confirmDestructive } from '@@/modals/confirm'; +import { isEdgeEnvironment, isDockerAPIEnvironment } from '@/react/portainer/environments/utils'; -import { commandsTabs } from '@CE/react/edge/components/EdgeScriptForm/scripts'; -import { confirmDisassociate } from '@CE/react/portainer/environments/ItemView/ConfirmDisassociateModel'; -import { getInfo } from '@CE/react/docker/proxy/queries/useInfo'; -import { buildConfirmButton } from '@@CE/modals/utils'; -import { confirmDestructive } from '@@CE/modals/confirm'; +import { commandsTabs } from '@/react/edge/components/EdgeScriptForm/scripts'; +import { confirmDisassociate } from '@/react/portainer/environments/ItemView/ConfirmDisassociateModel'; +import { buildConfirmButton } from '@@/modals/utils'; +import { getInfo } from '@/react/docker/proxy/queries/useInfo'; angular.module('portainer.app').controller('EndpointController', EndpointController); diff --git a/app/portainer/views/groups/access/groupAccessController.js b/app/portainer/views/groups/access/groupAccessController.js index 2ec645e86..8bd6d5954 100644 --- a/app/portainer/views/groups/access/groupAccessController.js +++ b/app/portainer/views/groups/access/groupAccessController.js @@ -1,4 +1,4 @@ -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; angular.module('portainer.app').controller('GroupAccessController', [ '$scope', diff --git a/app/portainer/views/groups/edit/groupController.js b/app/portainer/views/groups/edit/groupController.js index 22f50fd55..d683e7aae 100644 --- a/app/portainer/views/groups/edit/groupController.js +++ b/app/portainer/views/groups/edit/groupController.js @@ -1,5 +1,5 @@ -import { getEnvironments } from '@CE/react/portainer/environments/environment.service'; -import { notifyError, notifySuccess } from '@CE/portainer/services/notifications'; +import { getEnvironments } from '@/react/portainer/environments/environment.service'; +import { notifyError, notifySuccess } from '@/portainer/services/notifications'; angular.module('portainer.app').controller('GroupController', function GroupController($async, $q, $scope, $state, $transition$, GroupService, Notifications) { $scope.state = { diff --git a/app/portainer/views/init/admin/initAdmin.html b/app/portainer/views/init/admin/initAdmin.html index 4805fa993..4a1da2923 100644 --- a/app/portainer/views/init/admin/initAdmin.html +++ b/app/portainer/views/init/admin/initAdmin.html @@ -6,8 +6,8 @@
- - + +
diff --git a/app/portainer/views/init/admin/initAdminController.js b/app/portainer/views/init/admin/initAdminController.js index 23eee286c..e347f335f 100644 --- a/app/portainer/views/init/admin/initAdminController.js +++ b/app/portainer/views/init/admin/initAdminController.js @@ -1,6 +1,6 @@ -import { getEnvironments } from '@CE/react/portainer/environments/environment.service'; -import { restoreOptions } from '@CE/react/portainer/init/InitAdminView/restore-options'; -import { privacyPolicyUrl } from '@CE/react/portainer/settings/SettingsView/ApplicationSettingsPanel/EnableTelemetryField'; +import { getEnvironments } from '@/react/portainer/environments/environment.service'; +import { restoreOptions } from '@/react/portainer/init/InitAdminView/restore-options'; +import { privacyPolicyUrl } from '@/react/portainer/settings/SettingsView/ApplicationSettingsPanel/EnableTelemetryField'; angular.module('portainer.app').controller('InitAdminController', [ '$scope', diff --git a/app/portainer/views/logout/logout.html b/app/portainer/views/logout/logout.html index f3c4abd6c..95299d5d0 100644 --- a/app/portainer/views/logout/logout.html +++ b/app/portainer/views/logout/logout.html @@ -5,8 +5,8 @@
- - + +
diff --git a/app/portainer/views/logout/logoutController.js b/app/portainer/views/logout/logoutController.js index 83a9f782b..5369121d6 100644 --- a/app/portainer/views/logout/logoutController.js +++ b/app/portainer/views/logout/logoutController.js @@ -1,5 +1,5 @@ import angular from 'angular'; -import { dispatchCacheRefreshEvent } from '@CE/portainer/services/http-request.helper'; +import { dispatchCacheRefreshEvent } from '@/portainer/services/http-request.helper'; class LogoutController { /* @ngInject */ diff --git a/app/portainer/views/settings/authentication/settingsAuthenticationController.js b/app/portainer/views/settings/authentication/settingsAuthenticationController.js index 1984cf220..27cbf27d5 100644 --- a/app/portainer/views/settings/authentication/settingsAuthenticationController.js +++ b/app/portainer/views/settings/authentication/settingsAuthenticationController.js @@ -1,10 +1,10 @@ import angular from 'angular'; import _ from 'lodash-es'; -import { buildLdapSettingsModel, buildAdSettingsModel } from '@CE/portainer/settings/authentication/ldap/ldap-settings.model'; -import { options } from '@CE/react/portainer/settings/AuthenticationView/InternalAuth/options'; -import { SERVER_TYPES } from '@CE/react/portainer/settings/AuthenticationView/ldap-options'; -import { AuthenticationMethod } from '@CE/react/portainer/settings/types'; +import { buildLdapSettingsModel, buildAdSettingsModel } from '@/portainer/settings/authentication/ldap/ldap-settings.model'; +import { options } from '@/react/portainer/settings/AuthenticationView/InternalAuth/options'; +import { SERVER_TYPES } from '@/react/portainer/settings/AuthenticationView/ldap-options'; +import { AuthenticationMethod } from '@/react/portainer/settings/types'; angular.module('portainer.app').controller('SettingsAuthenticationController', SettingsAuthenticationController); diff --git a/app/portainer/views/stacks/create/createStackController.js b/app/portainer/views/stacks/create/createStackController.js index 7dd1e5c3e..118e2d23a 100644 --- a/app/portainer/views/stacks/create/createStackController.js +++ b/app/portainer/views/stacks/create/createStackController.js @@ -1,16 +1,16 @@ import angular from 'angular'; -import { AccessControlFormData } from '@CE/portainer/components/accessControlForm/porAccessControlFormModel'; -import { STACK_NAME_VALIDATION_REGEX } from '@CE/react/constants'; -import { RepositoryMechanismTypes } from '@CE/kubernetes/models/deploy'; -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; -import { isTemplateVariablesEnabled, renderTemplate } from '@CE/react/portainer/custom-templates/components/utils'; -import { parseAutoUpdateResponse, transformAutoUpdateViewModel } from '@CE/react/portainer/gitops/AutoUpdateFieldset/utils'; -import { baseStackWebhookUrl, createWebhookId } from '@CE/portainer/helpers/webhookHelper'; -import { getVariablesFieldDefaultValues } from '@CE/react/portainer/custom-templates/components/CustomTemplatesVariablesField'; -import { getDockerComposeSchema } from '@CE/react/hooks/useDockerComposeSchema/useDockerComposeSchema'; -import { confirmWebEditorDiscard } from '@@CE/modals/confirm'; -import { editor, upload, git, customTemplate } from '@@CE/BoxSelector/common-options/build-methods'; +import { AccessControlFormData } from '@/portainer/components/accessControlForm/porAccessControlFormModel'; +import { STACK_NAME_VALIDATION_REGEX } from '@/react/constants'; +import { RepositoryMechanismTypes } from '@/kubernetes/models/deploy'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; +import { isTemplateVariablesEnabled, renderTemplate } from '@/react/portainer/custom-templates/components/utils'; +import { editor, upload, git, customTemplate } from '@@/BoxSelector/common-options/build-methods'; +import { confirmWebEditorDiscard } from '@@/modals/confirm'; +import { parseAutoUpdateResponse, transformAutoUpdateViewModel } from '@/react/portainer/gitops/AutoUpdateFieldset/utils'; +import { baseStackWebhookUrl, createWebhookId } from '@/portainer/helpers/webhookHelper'; +import { getVariablesFieldDefaultValues } from '@/react/portainer/custom-templates/components/CustomTemplatesVariablesField'; +import { getDockerComposeSchema } from '@/react/hooks/useDockerComposeSchema/useDockerComposeSchema'; angular .module('portainer.app') diff --git a/app/portainer/views/stacks/stacksController.js b/app/portainer/views/stacks/stacksController.js index fb10977b7..287e81727 100644 --- a/app/portainer/views/stacks/stacksController.js +++ b/app/portainer/views/stacks/stacksController.js @@ -1,4 +1,4 @@ -import { processItemsInBatches } from '@CE/react/common/processItemsInBatches'; +import { processItemsInBatches } from '@/react/common/processItemsInBatches'; angular.module('portainer.app').controller('StacksController', StacksController); diff --git a/app/portainer/views/users/edit/userController.js b/app/portainer/views/users/edit/userController.js index ee6f206b2..e27667c8d 100644 --- a/app/portainer/views/users/edit/userController.js +++ b/app/portainer/views/users/edit/userController.js @@ -1,6 +1,6 @@ -import { ModalType } from '@@CE/modals'; -import { buildConfirmButton } from '@@CE/modals/utils'; -import { confirm, confirmChangePassword, confirmDelete } from '@@CE/modals/confirm'; +import { ModalType } from '@@/modals'; +import { buildConfirmButton } from '@@/modals/utils'; +import { confirm, confirmChangePassword, confirmDelete } from '@@/modals/confirm'; angular.module('portainer.app').controller('UserController', [ '$q', diff --git a/app/react-tools/react-query.ts b/app/react-tools/react-query.ts index 182549e56..336b72308 100644 --- a/app/react-tools/react-query.ts +++ b/app/react-tools/react-query.ts @@ -7,7 +7,7 @@ import { QueryOptions, } from '@tanstack/react-query'; -import { notifyError } from '@CE/portainer/services/notifications'; +import { notifyError } from '@/portainer/services/notifications'; /** * @deprecated for `useQuery` ONLY. Use `withGlobalError`. diff --git a/app/react-tools/test-mocks.ts b/app/react-tools/test-mocks.ts index 1392c2b48..1a8be5cfb 100644 --- a/app/react-tools/test-mocks.ts +++ b/app/react-tools/test-mocks.ts @@ -1,13 +1,13 @@ import _ from 'lodash'; import { QueryObserverResult } from '@tanstack/react-query'; -import { Team } from '@CE/react/portainer/users/teams/types'; -import { Role, User, UserId } from '@CE/portainer/users/types'; +import { Team } from '@/react/portainer/users/teams/types'; +import { Role, User, UserId } from '@/portainer/users/types'; import { ContainerEngine, Environment, -} from '@CE/react/portainer/environments/types'; -import { Stack, StackStatus, StackType } from '@CE/react/common/stacks/types'; +} from '@/react/portainer/environments/types'; +import { Stack, StackStatus, StackType } from '@/react/common/stacks/types'; export function createMockUser(overrides: Partial = {}) { return { diff --git a/app/react-tools/withCurrentUser.tsx b/app/react-tools/withCurrentUser.tsx index b6d7ed69d..41a48f1a7 100644 --- a/app/react-tools/withCurrentUser.tsx +++ b/app/react-tools/withCurrentUser.tsx @@ -1,6 +1,6 @@ import { ComponentType } from 'react'; -import { UserProvider } from '@CE/react/hooks/useUser'; +import { UserProvider } from '@/react/hooks/useUser'; import { withReactQuery } from './withReactQuery'; diff --git a/app/react-tools/withFormValidation.ts b/app/react-tools/withFormValidation.ts index eddbbd67f..90ab64289 100644 --- a/app/react-tools/withFormValidation.ts +++ b/app/react-tools/withFormValidation.ts @@ -4,10 +4,10 @@ import { SchemaOf, object } from 'yup'; import _ from 'lodash'; import { ComponentType } from 'react'; -import { PropNames, r2a } from '@CE/react-tools/react2angular'; +import { PropNames, r2a } from '@/react-tools/react2angular'; -import { validateForm } from '@@CE/form-components/validate-form'; -import { ArrayError } from '@@CE/form-components/InputList/InputList'; +import { validateForm } from '@@/form-components/validate-form'; +import { ArrayError } from '@@/form-components/InputList/InputList'; interface FormFieldProps { onChange(values: TValue): void; // update the values for the entire form object used in yup validation, not just one input. diff --git a/app/react/azure/DashboardView/DashboardView.test.tsx b/app/react/azure/DashboardView/DashboardView.test.tsx index 11e4a8bfe..649a8cdef 100644 --- a/app/react/azure/DashboardView/DashboardView.test.tsx +++ b/app/react/azure/DashboardView/DashboardView.test.tsx @@ -1,15 +1,15 @@ import { http, HttpResponse } from 'msw'; import { render, within } from '@testing-library/react'; -import { UserViewModel } from '@CE/portainer/models/user'; -import { server } from '@CE/setup-tests/server'; +import { UserViewModel } from '@/portainer/models/user'; +import { server } from '@/setup-tests/server'; import { createMockResourceGroups, createMockSubscriptions, -} from '@CE/react-tools/test-mocks'; -import { withUserProvider } from '@CE/react/test-utils/withUserProvider'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; +} from '@/react-tools/test-mocks'; +import { withUserProvider } from '@/react/test-utils/withUserProvider'; +import { withTestRouter } from '@/react/test-utils/withRouter'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; import { DashboardView } from './DashboardView'; diff --git a/app/react/azure/DashboardView/DashboardView.tsx b/app/react/azure/DashboardView/DashboardView.tsx index 5100a35ba..05ebc0a57 100644 --- a/app/react/azure/DashboardView/DashboardView.tsx +++ b/app/react/azure/DashboardView/DashboardView.tsx @@ -1,11 +1,11 @@ import { Package } from 'lucide-react'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import Subscription from '@CE/assets/ico/subscription.svg?c'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import Subscription from '@/assets/ico/subscription.svg?c'; -import { PageHeader } from '@@CE/PageHeader'; -import { DashboardItem } from '@@CE/DashboardItem'; -import { DashboardGrid } from '@@CE/DashboardItem/DashboardGrid'; +import { PageHeader } from '@@/PageHeader'; +import { DashboardItem } from '@@/DashboardItem'; +import { DashboardGrid } from '@@/DashboardItem/DashboardGrid'; import { useResourceGroups } from '../queries/useResourceGroups'; import { useSubscriptions } from '../queries/useSubscriptions'; diff --git a/app/react/azure/container-instances/CreateView/CreateContainerInstanceForm.test.tsx b/app/react/azure/container-instances/CreateView/CreateContainerInstanceForm.test.tsx index 369f095bb..761e2775e 100644 --- a/app/react/azure/container-instances/CreateView/CreateContainerInstanceForm.test.tsx +++ b/app/react/azure/container-instances/CreateView/CreateContainerInstanceForm.test.tsx @@ -2,11 +2,11 @@ import userEvent from '@testing-library/user-event'; import { HttpResponse, http } from 'msw'; import { render } from '@testing-library/react'; -import { UserViewModel } from '@CE/portainer/models/user'; -import { withUserProvider } from '@CE/react/test-utils/withUserProvider'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; -import { server } from '@CE/setup-tests/server'; +import { UserViewModel } from '@/portainer/models/user'; +import { withUserProvider } from '@/react/test-utils/withUserProvider'; +import { withTestRouter } from '@/react/test-utils/withRouter'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; +import { server } from '@/setup-tests/server'; import { CreateContainerInstanceForm } from './CreateContainerInstanceForm'; diff --git a/app/react/azure/container-instances/CreateView/CreateContainerInstanceForm.tsx b/app/react/azure/container-instances/CreateView/CreateContainerInstanceForm.tsx index d7b113453..bca2d1e81 100644 --- a/app/react/azure/container-instances/CreateView/CreateContainerInstanceForm.tsx +++ b/app/react/azure/container-instances/CreateView/CreateContainerInstanceForm.tsx @@ -2,16 +2,16 @@ import { Field, Form, Formik } from 'formik'; import { useRouter } from '@uirouter/react'; import { Plus } from 'lucide-react'; -import { ContainerInstanceFormValues } from '@CE/react/azure/types'; -import * as notifications from '@CE/portainer/services/notifications'; -import { useCurrentUser } from '@CE/react/hooks/useUser'; -import { AccessControlForm } from '@CE/react/portainer/access-control/AccessControlForm'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { ContainerInstanceFormValues } from '@/react/azure/types'; +import * as notifications from '@/portainer/services/notifications'; +import { useCurrentUser } from '@/react/hooks/useUser'; +import { AccessControlForm } from '@/react/portainer/access-control/AccessControlForm'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import { FormControl } from '@@CE/form-components/FormControl'; -import { Input, Select } from '@@CE/form-components/Input'; -import { FormSectionTitle } from '@@CE/form-components/FormSectionTitle'; -import { LoadingButton } from '@@CE/buttons/LoadingButton'; +import { FormControl } from '@@/form-components/FormControl'; +import { Input, Select } from '@@/form-components/Input'; +import { FormSectionTitle } from '@@/form-components/FormSectionTitle'; +import { LoadingButton } from '@@/buttons/LoadingButton'; import { validationSchema } from './CreateContainerInstanceForm.validation'; import { PortsMappingField } from './PortsMappingField'; diff --git a/app/react/azure/container-instances/CreateView/CreateContainerInstanceForm.validation.ts b/app/react/azure/container-instances/CreateView/CreateContainerInstanceForm.validation.ts index 8111c6522..80b624b1c 100644 --- a/app/react/azure/container-instances/CreateView/CreateContainerInstanceForm.validation.ts +++ b/app/react/azure/container-instances/CreateView/CreateContainerInstanceForm.validation.ts @@ -1,6 +1,6 @@ import { object, string, number, boolean } from 'yup'; -import { validationSchema as accessControlSchema } from '@CE/react/portainer/access-control/AccessControlForm/AccessControlForm.validation'; +import { validationSchema as accessControlSchema } from '@/react/portainer/access-control/AccessControlForm/AccessControlForm.validation'; import { validationSchema as portsSchema } from './PortsMappingField.validation'; diff --git a/app/react/azure/container-instances/CreateView/CreateView.tsx b/app/react/azure/container-instances/CreateView/CreateView.tsx index 44018806a..be1d66af5 100644 --- a/app/react/azure/container-instances/CreateView/CreateView.tsx +++ b/app/react/azure/container-instances/CreateView/CreateView.tsx @@ -1,5 +1,5 @@ -import { PageHeader } from '@@CE/PageHeader'; -import { Widget, WidgetBody } from '@@CE/Widget'; +import { PageHeader } from '@@/PageHeader'; +import { Widget, WidgetBody } from '@@/Widget'; import { CreateContainerInstanceForm } from './CreateContainerInstanceForm'; diff --git a/app/react/azure/container-instances/CreateView/PortsMappingField.tsx b/app/react/azure/container-instances/CreateView/PortsMappingField.tsx index 6bd03996d..c6e5fa220 100644 --- a/app/react/azure/container-instances/CreateView/PortsMappingField.tsx +++ b/app/react/azure/container-instances/CreateView/PortsMappingField.tsx @@ -1,12 +1,12 @@ import { FormikErrors } from 'formik'; import { ArrowRight } from 'lucide-react'; -import { ButtonSelector } from '@@CE/form-components/ButtonSelector/ButtonSelector'; -import { FormError } from '@@CE/form-components/FormError'; -import { InputGroup } from '@@CE/form-components/InputGroup'; -import { InputList } from '@@CE/form-components/InputList'; -import { ItemProps } from '@@CE/form-components/InputList/InputList'; -import { Icon } from '@@CE/Icon'; +import { ButtonSelector } from '@@/form-components/ButtonSelector/ButtonSelector'; +import { FormError } from '@@/form-components/FormError'; +import { InputGroup } from '@@/form-components/InputGroup'; +import { InputList } from '@@/form-components/InputList'; +import { ItemProps } from '@@/form-components/InputList/InputList'; +import { Icon } from '@@/Icon'; import styles from './PortsMappingField.module.css'; diff --git a/app/react/azure/container-instances/CreateView/useCreateInstanceMutation.tsx b/app/react/azure/container-instances/CreateView/useCreateInstanceMutation.tsx index 9abe88034..74c78f41d 100644 --- a/app/react/azure/container-instances/CreateView/useCreateInstanceMutation.tsx +++ b/app/react/azure/container-instances/CreateView/useCreateInstanceMutation.tsx @@ -1,15 +1,15 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { createContainerGroup } from '@CE/react/azure/services/container-groups.service'; -import { queryKeys } from '@CE/react/azure/queries/query-keys'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import PortainerError from '@CE/portainer/error'; +import { createContainerGroup } from '@/react/azure/services/container-groups.service'; +import { queryKeys } from '@/react/azure/queries/query-keys'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import PortainerError from '@/portainer/error'; import { ContainerGroup, ContainerInstanceFormValues, ResourceGroup, -} from '@CE/react/azure/types'; -import { applyResourceControl } from '@CE/react/portainer/access-control/access-control.service'; +} from '@/react/azure/types'; +import { applyResourceControl } from '@/react/portainer/access-control/access-control.service'; import { getSubscriptionResourceGroups } from './utils'; diff --git a/app/react/azure/container-instances/CreateView/useLoadFormState.ts b/app/react/azure/container-instances/CreateView/useLoadFormState.ts index 01c6b9be3..5f1501978 100644 --- a/app/react/azure/container-instances/CreateView/useLoadFormState.ts +++ b/app/react/azure/container-instances/CreateView/useLoadFormState.ts @@ -1,15 +1,15 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { ContainerInstanceFormValues, ProviderViewModel, ResourceGroup, Subscription, -} from '@CE/react/azure/types'; -import { parseAccessControlFormData } from '@CE/react/portainer/access-control/utils'; -import { useCurrentUser } from '@CE/react/hooks/useUser'; -import { useProvider } from '@CE/react/azure/queries/useProvider'; -import { useResourceGroups } from '@CE/react/azure/queries/useResourceGroups'; -import { useSubscriptions } from '@CE/react/azure/queries/useSubscriptions'; +} from '@/react/azure/types'; +import { parseAccessControlFormData } from '@/react/portainer/access-control/utils'; +import { useCurrentUser } 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'; import { getSubscriptionLocations, diff --git a/app/react/azure/container-instances/CreateView/utils.ts b/app/react/azure/container-instances/CreateView/utils.ts index 59952d835..ff5e27d91 100644 --- a/app/react/azure/container-instances/CreateView/utils.ts +++ b/app/react/azure/container-instances/CreateView/utils.ts @@ -1,4 +1,4 @@ -import { ProviderViewModel, ResourceGroup } from '@CE/react/azure/types'; +import { ProviderViewModel, ResourceGroup } from '@/react/azure/types'; export function getSubscriptionResourceGroups( subscriptionId?: string, diff --git a/app/react/azure/container-instances/ItemView/ItemView.tsx b/app/react/azure/container-instances/ItemView/ItemView.tsx index ad9f38e8a..6e5d02139 100644 --- a/app/react/azure/container-instances/ItemView/ItemView.tsx +++ b/app/react/azure/container-instances/ItemView/ItemView.tsx @@ -1,24 +1,24 @@ import { useCurrentStateAndParams } from '@uirouter/react'; import { useQueryClient } from '@tanstack/react-query'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { AccessControlPanel } from '@CE/react/portainer/access-control/AccessControlPanel/AccessControlPanel'; -import { ResourceControlViewModel } from '@CE/react/portainer/access-control/models/ResourceControlViewModel'; -import { ResourceControlType } from '@CE/react/portainer/access-control/types'; +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'; import { ContainerGroup, ResourceGroup, Subscription, -} from '@CE/react/azure/types'; -import { useContainerGroup } from '@CE/react/azure/queries/useContainerGroup'; -import { useResourceGroup } from '@CE/react/azure/queries/useResourceGroup'; -import { useSubscription } from '@CE/react/azure/queries/useSubscription'; +} from '@/react/azure/types'; +import { useContainerGroup } from '@/react/azure/queries/useContainerGroup'; +import { useResourceGroup } from '@/react/azure/queries/useResourceGroup'; +import { useSubscription } from '@/react/azure/queries/useSubscription'; -import { Input } from '@@CE/form-components/Input'; -import { Widget, WidgetBody } from '@@CE/Widget'; -import { PageHeader } from '@@CE/PageHeader'; -import { FormSectionTitle } from '@@CE/form-components/FormSectionTitle'; -import { FormControl } from '@@CE/form-components/FormControl'; +import { Input } from '@@/form-components/Input'; +import { Widget, WidgetBody } from '@@/Widget'; +import { PageHeader } from '@@/PageHeader'; +import { FormSectionTitle } from '@@/form-components/FormSectionTitle'; +import { FormControl } from '@@/form-components/FormControl'; import { PortsMappingField } from '../CreateView/PortsMappingField'; diff --git a/app/react/azure/container-instances/ListView/ContainersDatatable.tsx b/app/react/azure/container-instances/ListView/ContainersDatatable.tsx index fd3b306de..59f07de2d 100644 --- a/app/react/azure/container-instances/ListView/ContainersDatatable.tsx +++ b/app/react/azure/container-instances/ListView/ContainersDatatable.tsx @@ -1,13 +1,13 @@ import { Box } from 'lucide-react'; -import { ContainerGroup } from '@CE/react/azure/types'; -import { Authorized } from '@CE/react/hooks/useUser'; +import { ContainerGroup } from '@/react/azure/types'; +import { Authorized } from '@/react/hooks/useUser'; -import { Datatable } from '@@CE/datatables'; -import { AddButton } from '@@CE/buttons'; -import { createPersistedStore } from '@@CE/datatables/types'; -import { useTableState } from '@@CE/datatables/useTableState'; -import { DeleteButton } from '@@CE/buttons/DeleteButton'; +import { Datatable } from '@@/datatables'; +import { AddButton } from '@@/buttons'; +import { createPersistedStore } from '@@/datatables/types'; +import { useTableState } from '@@/datatables/useTableState'; +import { DeleteButton } from '@@/buttons/DeleteButton'; import { columns } from './columns'; diff --git a/app/react/azure/container-instances/ListView/ListView.tsx b/app/react/azure/container-instances/ListView/ListView.tsx index 0a4d19174..78ac058f4 100644 --- a/app/react/azure/container-instances/ListView/ListView.tsx +++ b/app/react/azure/container-instances/ListView/ListView.tsx @@ -1,17 +1,14 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { deleteContainerGroup } from '@CE/react/azure/services/container-groups.service'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { - notifyError, - notifySuccess, -} from '@CE/portainer/services/notifications'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { promiseSequence } from '@CE/portainer/helpers/promise-utils'; -import { useContainerGroups } from '@CE/react/azure/queries/useContainerGroups'; -import { useSubscriptions } from '@CE/react/azure/queries/useSubscriptions'; +import { deleteContainerGroup } from '@/react/azure/services/container-groups.service'; +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'; +import { useContainerGroups } from '@/react/azure/queries/useContainerGroups'; +import { useSubscriptions } from '@/react/azure/queries/useSubscriptions'; -import { PageHeader } from '@@CE/PageHeader'; +import { PageHeader } from '@@/PageHeader'; import { ContainersDatatable } from './ContainersDatatable'; diff --git a/app/react/azure/container-instances/ListView/columns/helper.ts b/app/react/azure/container-instances/ListView/columns/helper.ts index 75496bdff..0090f0767 100644 --- a/app/react/azure/container-instances/ListView/columns/helper.ts +++ b/app/react/azure/container-instances/ListView/columns/helper.ts @@ -1,5 +1,5 @@ import { createColumnHelper } from '@tanstack/react-table'; -import { ContainerGroup } from '@CE/react/azure/types'; +import { ContainerGroup } from '@/react/azure/types'; export const columnHelper = createColumnHelper(); diff --git a/app/react/azure/container-instances/ListView/columns/name.tsx b/app/react/azure/container-instances/ListView/columns/name.tsx index 5dee162f6..bb4ed33bf 100644 --- a/app/react/azure/container-instances/ListView/columns/name.tsx +++ b/app/react/azure/container-instances/ListView/columns/name.tsx @@ -1,8 +1,8 @@ import { CellContext } from '@tanstack/react-table'; -import { ContainerGroup } from '@CE/react/azure/types'; +import { ContainerGroup } from '@/react/azure/types'; -import { Link } from '@@CE/Link'; +import { Link } from '@@/Link'; import { columnHelper } from './helper'; diff --git a/app/react/azure/container-instances/ListView/columns/ownership.tsx b/app/react/azure/container-instances/ListView/columns/ownership.tsx index 81cd88c12..29843b32c 100644 --- a/app/react/azure/container-instances/ListView/columns/ownership.tsx +++ b/app/react/azure/container-instances/ListView/columns/ownership.tsx @@ -1,10 +1,10 @@ import clsx from 'clsx'; import { CellContext } from '@tanstack/react-table'; -import { ResourceControlOwnership } from '@CE/react/portainer/access-control/types'; -import { ContainerGroup } from '@CE/react/azure/types'; -import { determineOwnership } from '@CE/react/portainer/access-control/models/ResourceControlViewModel'; -import { ownershipIcon } from '@CE/react/docker/components/datatable/createOwnershipColumn'; +import { ResourceControlOwnership } from '@/react/portainer/access-control/types'; +import { ContainerGroup } from '@/react/azure/types'; +import { determineOwnership } from '@/react/portainer/access-control/models/ResourceControlViewModel'; +import { ownershipIcon } from '@/react/docker/components/datatable/createOwnershipColumn'; import { columnHelper } from './helper'; diff --git a/app/react/azure/container-instances/ListView/columns/ports.tsx b/app/react/azure/container-instances/ListView/columns/ports.tsx index d922d6fea..11d4d8408 100644 --- a/app/react/azure/container-instances/ListView/columns/ports.tsx +++ b/app/react/azure/container-instances/ListView/columns/ports.tsx @@ -1,11 +1,11 @@ import { ExternalLink } from 'lucide-react'; import { CellContext } from '@tanstack/react-table'; -import { ContainerGroup } from '@CE/react/azure/types'; -import { getPorts } from '@CE/react/azure/utils'; -import { getSchemeFromPort } from '@CE/react/common/network-utils'; +import { ContainerGroup } from '@/react/azure/types'; +import { getPorts } from '@/react/azure/utils'; +import { getSchemeFromPort } from '@/react/common/network-utils'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; import { columnHelper } from './helper'; diff --git a/app/react/azure/queries/query-keys.ts b/app/react/azure/queries/query-keys.ts index 5472c7039..bd5288078 100644 --- a/app/react/azure/queries/query-keys.ts +++ b/app/react/azure/queries/query-keys.ts @@ -1,4 +1,4 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; export const queryKeys = { subscriptions: (environmentId: EnvironmentId) => diff --git a/app/react/azure/queries/useContainerGroup.ts b/app/react/azure/queries/useContainerGroup.ts index 092fe6e28..7b82fa6e0 100644 --- a/app/react/azure/queries/useContainerGroup.ts +++ b/app/react/azure/queries/useContainerGroup.ts @@ -1,8 +1,8 @@ import { useQuery } from '@tanstack/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { withError } from '@CE/react-tools/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { withError } from '@/react-tools/react-query'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; import { ContainerGroup } from '../types'; diff --git a/app/react/azure/queries/useContainerGroups.ts b/app/react/azure/queries/useContainerGroups.ts index 1eb40fbf2..2c5ed4c00 100644 --- a/app/react/azure/queries/useContainerGroups.ts +++ b/app/react/azure/queries/useContainerGroups.ts @@ -2,9 +2,9 @@ import _ from 'lodash'; import { useMemo } from 'react'; import { useQueries } from '@tanstack/react-query'; -import { withError } from '@CE/react-tools/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { withError } from '@/react-tools/react-query'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { Subscription, ContainerGroup } from '../types'; diff --git a/app/react/azure/queries/useProvider.ts b/app/react/azure/queries/useProvider.ts index 7aad17fcc..27d34966b 100644 --- a/app/react/azure/queries/useProvider.ts +++ b/app/react/azure/queries/useProvider.ts @@ -1,9 +1,9 @@ import _ from 'lodash'; import { useQueries } from '@tanstack/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { withError } from '@CE/react-tools/react-query'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { withError } from '@/react-tools/react-query'; import { ProviderViewModel, Subscription } from '../types'; import { azureErrorParser } from '../services/utils'; diff --git a/app/react/azure/queries/useResourceGroup.ts b/app/react/azure/queries/useResourceGroup.ts index 2863db27f..80c9c2ec7 100644 --- a/app/react/azure/queries/useResourceGroup.ts +++ b/app/react/azure/queries/useResourceGroup.ts @@ -1,8 +1,8 @@ import { useQuery } from '@tanstack/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { withError } from '@CE/react-tools/react-query'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { withError } from '@/react-tools/react-query'; import { azureErrorParser } from '../services/utils'; import { ResourceGroup } from '../types'; diff --git a/app/react/azure/queries/useResourceGroups.ts b/app/react/azure/queries/useResourceGroups.ts index 7a33fa625..b37ddb202 100644 --- a/app/react/azure/queries/useResourceGroups.ts +++ b/app/react/azure/queries/useResourceGroups.ts @@ -1,9 +1,9 @@ import _ from 'lodash'; import { useQueries } from '@tanstack/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { withError } from '@CE/react-tools/react-query'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { withError } from '@/react-tools/react-query'; import { azureErrorParser } from '../services/utils'; import { Subscription, ResourceGroup } from '../types'; diff --git a/app/react/azure/queries/useSubscription.ts b/app/react/azure/queries/useSubscription.ts index f4308378d..7b8d7571e 100644 --- a/app/react/azure/queries/useSubscription.ts +++ b/app/react/azure/queries/useSubscription.ts @@ -1,8 +1,8 @@ import { useQuery } from '@tanstack/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { withError } from '@CE/react-tools/react-query'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { withError } from '@/react-tools/react-query'; import { Subscription } from '../types'; import { azureErrorParser } from '../services/utils'; diff --git a/app/react/azure/queries/useSubscriptions.ts b/app/react/azure/queries/useSubscriptions.ts index e9254ea15..e0124c09d 100644 --- a/app/react/azure/queries/useSubscriptions.ts +++ b/app/react/azure/queries/useSubscriptions.ts @@ -1,8 +1,8 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { withError } from '@CE/react-tools/react-query'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { withError } from '@/react-tools/react-query'; import { azureErrorParser } from '../services/utils'; import { Subscription } from '../types'; diff --git a/app/react/azure/queries/utils.ts b/app/react/azure/queries/utils.ts index c8cc27f2d..c16495d95 100644 --- a/app/react/azure/queries/utils.ts +++ b/app/react/azure/queries/utils.ts @@ -1,4 +1,4 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; export function buildSubscriptionsUrl( environmentId: EnvironmentId, diff --git a/app/react/azure/services/container-groups.service.ts b/app/react/azure/services/container-groups.service.ts index 16c1aca5f..a95ff480b 100644 --- a/app/react/azure/services/container-groups.service.ts +++ b/app/react/azure/services/container-groups.service.ts @@ -1,5 +1,5 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; import { buildContainerGroupUrl } from '../queries/utils'; import { ContainerGroup, ContainerInstanceFormValues } from '../types'; diff --git a/app/react/azure/types.ts b/app/react/azure/types.ts index 768917df1..38dae3436 100644 --- a/app/react/azure/types.ts +++ b/app/react/azure/types.ts @@ -1,5 +1,5 @@ -import { AccessControlFormData } from '@CE/react/portainer/access-control/types'; -import { PortainerResponse } from '@CE/react/docker/types'; +import { AccessControlFormData } from '@/react/portainer/access-control/types'; +import { PortainerResponse } from '@/react/docker/types'; import { PortMapping } from './container-instances/CreateView/PortsMappingField'; diff --git a/app/react/common/api/listQueryParams.ts b/app/react/common/api/listQueryParams.ts index 8fdec923b..dc2101c5b 100644 --- a/app/react/common/api/listQueryParams.ts +++ b/app/react/common/api/listQueryParams.ts @@ -1,5 +1,5 @@ -import { BasicTableSettings } from '@@CE/datatables/types'; -import { TableState } from '@@CE/datatables/useTableState'; +import { BasicTableSettings } from '@@/datatables/types'; +import { TableState } from '@@/datatables/useTableState'; import { PaginationQuery, diff --git a/app/react/common/api/sort.types.ts b/app/react/common/api/sort.types.ts index 5c9d82a77..bccfff1c8 100644 --- a/app/react/common/api/sort.types.ts +++ b/app/react/common/api/sort.types.ts @@ -1,6 +1,6 @@ import { compact } from 'lodash'; -import { SortableTableSettings } from '@@CE/datatables/types'; +import { SortableTableSettings } from '@@/datatables/types'; export type SortOptions = readonly string[]; export type SortType = T[number]; diff --git a/app/react/common/stacks/CreateView/NameField.tsx b/app/react/common/stacks/CreateView/NameField.tsx index c30b30352..262e6cbdb 100644 --- a/app/react/common/stacks/CreateView/NameField.tsx +++ b/app/react/common/stacks/CreateView/NameField.tsx @@ -2,11 +2,11 @@ import { FormikErrors } from 'formik'; import { SchemaOf, string } from 'yup'; import { useMemo } from 'react'; -import { STACK_NAME_VALIDATION_REGEX } from '@CE/react/constants'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { STACK_NAME_VALIDATION_REGEX } from '@/react/constants'; +import { EnvironmentId } from '@/react/portainer/environments/types'; -import { FormControl } from '@@CE/form-components/FormControl'; -import { Input } from '@@CE/form-components/Input'; +import { FormControl } from '@@/form-components/FormControl'; +import { Input } from '@@/form-components/Input'; import { useStacks } from '../queries/useStacks'; diff --git a/app/react/common/stacks/common/confirm-stack-update.ts b/app/react/common/stacks/common/confirm-stack-update.ts index 65a51c4af..5d67a67fa 100644 --- a/app/react/common/stacks/common/confirm-stack-update.ts +++ b/app/react/common/stacks/common/confirm-stack-update.ts @@ -1,6 +1,6 @@ -import { openSwitchPrompt } from '@@CE/modals/SwitchPrompt'; -import { ModalType } from '@@CE/modals'; -import { buildConfirmButton } from '@@CE/modals/utils'; +import { openSwitchPrompt } from '@@/modals/SwitchPrompt'; +import { ModalType } from '@@/modals'; +import { buildConfirmButton } from '@@/modals/utils'; export async function confirmStackUpdate( message: string, diff --git a/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromFileContent.ts b/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromFileContent.ts index d47841bd7..68122e097 100644 --- a/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromFileContent.ts +++ b/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromFileContent.ts @@ -1,5 +1,5 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { Stack } from '../../types'; diff --git a/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromGit.ts b/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromGit.ts index e3aaf7ff7..0a2ea2f7a 100644 --- a/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromGit.ts +++ b/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromGit.ts @@ -1,6 +1,6 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { AutoUpdateModel } from '@CE/react/portainer/gitops/types'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { AutoUpdateModel } from '@/react/portainer/gitops/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { Stack } from '../../types'; diff --git a/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromUrl.ts b/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromUrl.ts index 50fd38918..0df3baf65 100644 --- a/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromUrl.ts +++ b/app/react/common/stacks/queries/useCreateStack/createKubernetesStackFromUrl.ts @@ -1,5 +1,5 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { Stack } from '../../types'; diff --git a/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromFile.ts b/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromFile.ts index 01066f629..5f07b9062 100644 --- a/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromFile.ts +++ b/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromFile.ts @@ -1,9 +1,9 @@ import axios, { json2formData, parseAxiosError, -} from '@CE/portainer/services/axios'; -import { Pair } from '@CE/react/portainer/settings/types'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +} from '@/portainer/services/axios'; +import { Pair } from '@/react/portainer/settings/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { Stack } from '../../types'; diff --git a/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromFileContent.ts b/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromFileContent.ts index db9045a59..d53d7e089 100644 --- a/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromFileContent.ts +++ b/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromFileContent.ts @@ -1,6 +1,6 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { Pair } from '@CE/react/portainer/settings/types'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { Pair } from '@/react/portainer/settings/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { Stack } from '../../types'; diff --git a/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromGit.ts b/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromGit.ts index a3ebb7bdb..d006b9cf7 100644 --- a/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromGit.ts +++ b/app/react/common/stacks/queries/useCreateStack/createStandaloneStackFromGit.ts @@ -1,7 +1,7 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { Pair } from '@CE/react/portainer/settings/types'; -import { AutoUpdateModel } from '@CE/react/portainer/gitops/types'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { Pair } from '@/react/portainer/settings/types'; +import { AutoUpdateModel } from '@/react/portainer/gitops/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { Stack } from '../../types'; diff --git a/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromFile.ts b/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromFile.ts index eaa74fb6e..f581615be 100644 --- a/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromFile.ts +++ b/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromFile.ts @@ -1,9 +1,9 @@ import axios, { json2formData, parseAxiosError, -} from '@CE/portainer/services/axios'; -import { Pair } from '@CE/react/portainer/settings/types'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +} from '@/portainer/services/axios'; +import { Pair } from '@/react/portainer/settings/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { Stack } from '../../types'; diff --git a/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromFileContent.ts b/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromFileContent.ts index 08510aa55..373df3f1a 100644 --- a/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromFileContent.ts +++ b/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromFileContent.ts @@ -1,6 +1,6 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { Pair } from '@CE/react/portainer/settings/types'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { Pair } from '@/react/portainer/settings/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { Stack } from '../../types'; diff --git a/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromGit.ts b/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromGit.ts index 206dc6444..c373fd184 100644 --- a/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromGit.ts +++ b/app/react/common/stacks/queries/useCreateStack/createSwarmStackFromGit.ts @@ -1,7 +1,7 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { Pair } from '@CE/react/portainer/settings/types'; -import { AutoUpdateModel } from '@CE/react/portainer/gitops/types'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { Pair } from '@/react/portainer/settings/types'; +import { AutoUpdateModel } from '@/react/portainer/gitops/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { Stack } from '../../types'; diff --git a/app/react/common/stacks/queries/useCreateStack/useCreateStack.ts b/app/react/common/stacks/queries/useCreateStack/useCreateStack.ts index 88296af94..b06c79966 100644 --- a/app/react/common/stacks/queries/useCreateStack/useCreateStack.ts +++ b/app/react/common/stacks/queries/useCreateStack/useCreateStack.ts @@ -1,15 +1,15 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { Pair } from '@CE/react/portainer/settings/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { Pair } from '@/react/portainer/settings/types'; import { GitFormModel, RelativePathModel, -} from '@CE/react/portainer/gitops/types'; -import { applyResourceControl } from '@CE/react/portainer/access-control/access-control.service'; -import { AccessControlFormData } from '@CE/react/portainer/access-control/types'; -import PortainerError from '@CE/portainer/error'; -import { withError, withInvalidate } from '@CE/react-tools/react-query'; +} from '@/react/portainer/gitops/types'; +import { applyResourceControl } from '@/react/portainer/access-control/access-control.service'; +import { AccessControlFormData } from '@/react/portainer/access-control/types'; +import PortainerError from '@/portainer/error'; +import { withError, withInvalidate } from '@/react-tools/react-query'; import { queryKeys } from '../query-keys'; diff --git a/app/react/common/stacks/queries/useDeleteStackByNameMutation.ts b/app/react/common/stacks/queries/useDeleteStackByNameMutation.ts index b8b8d12ba..a8a7066e1 100644 --- a/app/react/common/stacks/queries/useDeleteStackByNameMutation.ts +++ b/app/react/common/stacks/queries/useDeleteStackByNameMutation.ts @@ -1,8 +1,8 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { withGlobalError } from '@CE/react-tools/react-query'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { withGlobalError } from '@/react-tools/react-query'; import { StackId } from '../types'; diff --git a/app/react/common/stacks/queries/useDeleteStackMutation.ts b/app/react/common/stacks/queries/useDeleteStackMutation.ts index 7bc15f755..8e4eb5b56 100644 --- a/app/react/common/stacks/queries/useDeleteStackMutation.ts +++ b/app/react/common/stacks/queries/useDeleteStackMutation.ts @@ -1,8 +1,8 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { withGlobalError } from '@CE/react-tools/react-query'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { withGlobalError } from '@/react-tools/react-query'; import { StackId } from '../types'; diff --git a/app/react/common/stacks/queries/useStack.ts b/app/react/common/stacks/queries/useStack.ts index 92422d899..ac7b3d89c 100644 --- a/app/react/common/stacks/queries/useStack.ts +++ b/app/react/common/stacks/queries/useStack.ts @@ -1,7 +1,7 @@ import { useQuery, UseQueryOptions } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { withGlobalError } from '@CE/react-tools/react-query'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { withGlobalError } from '@/react-tools/react-query'; import { Stack, StackId } from '../types'; diff --git a/app/react/common/stacks/queries/useStackFile.ts b/app/react/common/stacks/queries/useStackFile.ts index 7a10773f6..cb927cc6a 100644 --- a/app/react/common/stacks/queries/useStackFile.ts +++ b/app/react/common/stacks/queries/useStackFile.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { withGlobalError } from '@CE/react-tools/react-query'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { withGlobalError } from '@/react-tools/react-query'; import { StackFile, StackId } from '../types'; diff --git a/app/react/common/stacks/queries/useStacks.ts b/app/react/common/stacks/queries/useStacks.ts index 0cc189300..b72791ead 100644 --- a/app/react/common/stacks/queries/useStacks.ts +++ b/app/react/common/stacks/queries/useStacks.ts @@ -1,8 +1,8 @@ import { useQuery } from '@tanstack/react-query'; -import { withError } from '@CE/react-tools/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { Stack } from '@CE/react/common/stacks/types'; +import { withError } from '@/react-tools/react-query'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { Stack } from '@/react/common/stacks/types'; import { buildStackUrl } from './buildUrl'; import { queryKeys } from './query-keys'; diff --git a/app/react/common/stacks/types.ts b/app/react/common/stacks/types.ts index a07c97726..072cd7f31 100644 --- a/app/react/common/stacks/types.ts +++ b/app/react/common/stacks/types.ts @@ -1,11 +1,11 @@ -import { ResourceControlResponse } from '@CE/react/portainer/access-control/types'; -import { AuthTypeOption } from '@CE/react/portainer/account/git-credentials/types'; +import { ResourceControlResponse } from '@/react/portainer/access-control/types'; +import { AuthTypeOption } from '@/react/portainer/account/git-credentials/types'; import { AutoUpdateResponse, RepoConfigResponse, -} from '@CE/react/portainer/gitops/types'; +} from '@/react/portainer/gitops/types'; -import { EnvVar } from '@@CE/form-components/EnvironmentVariablesFieldset/types'; +import { EnvVar } from '@@/form-components/EnvironmentVariablesFieldset/types'; export type StackId = number; diff --git a/app/react/components/Alert/Alert.tsx b/app/react/components/Alert/Alert.tsx index 4ecc937a5..7941554cc 100644 --- a/app/react/components/Alert/Alert.tsx +++ b/app/react/components/Alert/Alert.tsx @@ -8,7 +8,7 @@ import { } from 'lucide-react'; import { PropsWithChildren, ReactNode } from 'react'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; type AlertType = 'success' | 'error' | 'info' | 'warn' | 'default'; diff --git a/app/react/components/BEFeatureIndicator/BEFeatureIndicator.stories.tsx b/app/react/components/BEFeatureIndicator/BEFeatureIndicator.stories.tsx index 946c74d2d..2df7cdc17 100644 --- a/app/react/components/BEFeatureIndicator/BEFeatureIndicator.stories.tsx +++ b/app/react/components/BEFeatureIndicator/BEFeatureIndicator.stories.tsx @@ -1,7 +1,7 @@ import { Meta } from '@storybook/react'; -import { Edition, FeatureId } from '@CE/react/portainer/feature-flags/enums'; -import { init as initFeatureService } from '@CE/react/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'; diff --git a/app/react/components/BEFeatureIndicator/BEFeatureIndicator.tsx b/app/react/components/BEFeatureIndicator/BEFeatureIndicator.tsx index 18c6ac180..47ff2e787 100644 --- a/app/react/components/BEFeatureIndicator/BEFeatureIndicator.tsx +++ b/app/react/components/BEFeatureIndicator/BEFeatureIndicator.tsx @@ -4,9 +4,9 @@ import { Briefcase } from 'lucide-react'; import './BEFeatureIndicator.css'; -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; import { getFeatureDetails } from './utils'; diff --git a/app/react/components/BEFeatureIndicator/BEOverlay.tsx b/app/react/components/BEFeatureIndicator/BEOverlay.tsx index c03b1771a..fcdddd980 100644 --- a/app/react/components/BEFeatureIndicator/BEOverlay.tsx +++ b/app/react/components/BEFeatureIndicator/BEOverlay.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; -import { isLimitedToBE } from '@CE/react/portainer/feature-flags/feature-flags.service'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; +import { isLimitedToBE } from '@/react/portainer/feature-flags/feature-flags.service'; import { BEFeatureIndicator } from './BEFeatureIndicator'; diff --git a/app/react/components/BEFeatureIndicator/utils.ts b/app/react/components/BEFeatureIndicator/utils.ts index 885de3852..2e210bd67 100644 --- a/app/react/components/BEFeatureIndicator/utils.ts +++ b/app/react/components/BEFeatureIndicator/utils.ts @@ -1,5 +1,5 @@ -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; -import { isLimitedToBE } from '@CE/react/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='; diff --git a/app/react/components/BETeaserButton.tsx b/app/react/components/BETeaserButton.tsx index dbfbe3c18..80c43a4fe 100644 --- a/app/react/components/BETeaserButton.tsx +++ b/app/react/components/BETeaserButton.tsx @@ -1,10 +1,10 @@ import { Briefcase } from 'lucide-react'; -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; -import { AutomationTestingProps } from '@CE/types'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; +import { AutomationTestingProps } from '@/types'; -import { Button } from '@@CE/buttons'; -import { TooltipWithChildren } from '@@CE/Tip/TooltipWithChildren'; +import { Button } from '@@/buttons'; +import { TooltipWithChildren } from '@@/Tip/TooltipWithChildren'; interface Props extends AutomationTestingProps { featureId: FeatureId; diff --git a/app/react/components/Badge/Badge.tsx b/app/react/components/Badge/Badge.tsx index c44c40525..f0a4fc55c 100644 --- a/app/react/components/Badge/Badge.tsx +++ b/app/react/components/Badge/Badge.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import { PropsWithChildren } from 'react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; export type BadgeType = | 'success' diff --git a/app/react/components/Badge/ExternalBadge.tsx b/app/react/components/Badge/ExternalBadge.tsx index 353c62526..e49afd07a 100644 --- a/app/react/components/Badge/ExternalBadge.tsx +++ b/app/react/components/Badge/ExternalBadge.tsx @@ -1,4 +1,4 @@ -import { Badge } from '@@CE/Badge'; +import { Badge } from '@@/Badge'; export function ExternalBadge({ className }: { className?: string }) { return ( diff --git a/app/react/components/Badge/SystemBadge.tsx b/app/react/components/Badge/SystemBadge.tsx index da5e95047..204d01bbd 100644 --- a/app/react/components/Badge/SystemBadge.tsx +++ b/app/react/components/Badge/SystemBadge.tsx @@ -1,4 +1,4 @@ -import { Badge } from '@@CE/Badge'; +import { Badge } from '@@/Badge'; export function SystemBadge({ className }: { className?: string }) { return ( diff --git a/app/react/components/Badge/UnusedBadge.tsx b/app/react/components/Badge/UnusedBadge.tsx index 599c93296..743f8e83b 100644 --- a/app/react/components/Badge/UnusedBadge.tsx +++ b/app/react/components/Badge/UnusedBadge.tsx @@ -1,4 +1,4 @@ -import { Badge } from '@@CE/Badge'; +import { Badge } from '@@/Badge'; export function UnusedBadge() { return Unused; diff --git a/app/react/components/BadgeIcon/BadgeIcon.tsx b/app/react/components/BadgeIcon/BadgeIcon.tsx index 5c2143635..da91ca3e7 100644 --- a/app/react/components/BadgeIcon/BadgeIcon.tsx +++ b/app/react/components/BadgeIcon/BadgeIcon.tsx @@ -1,6 +1,6 @@ import clsx from 'clsx'; -import { Icon, IconProps } from '@@CE/Icon'; +import { Icon, IconProps } from '@@/Icon'; export type BadgeSize = 'md' | 'lg' | 'xl' | '2xl' | '3xl'; diff --git a/app/react/components/Blocklist/BlocklistItem.stories.tsx b/app/react/components/Blocklist/BlocklistItem.stories.tsx index 34bc93b21..e38d1933e 100644 --- a/app/react/components/Blocklist/BlocklistItem.stories.tsx +++ b/app/react/components/Blocklist/BlocklistItem.stories.tsx @@ -1,8 +1,8 @@ import type { Meta, StoryObj } from '@storybook/react'; -import { localizeDate } from '@CE/react/common/date-utils'; +import { localizeDate } from '@/react/common/date-utils'; -import { Badge } from '@@CE/Badge'; +import { Badge } from '@@/Badge'; import { BlocklistItem } from './BlocklistItem'; diff --git a/app/react/components/BoxSelector/BoxOption.tsx b/app/react/components/BoxSelector/BoxOption.tsx index 88618d553..d3ca5de10 100644 --- a/app/react/components/BoxSelector/BoxOption.tsx +++ b/app/react/components/BoxSelector/BoxOption.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import { PropsWithChildren } from 'react'; import type { LucideIcon } from 'lucide-react'; -import { TooltipWithChildren } from '@@CE/Tip/TooltipWithChildren'; +import { TooltipWithChildren } from '@@/Tip/TooltipWithChildren'; import styles from './BoxOption.module.css'; import { BoxSelectorOption, Value } from './types'; diff --git a/app/react/components/BoxSelector/BoxSelector.stories.tsx b/app/react/components/BoxSelector/BoxSelector.stories.tsx index 1017f406a..fde02f495 100644 --- a/app/react/components/BoxSelector/BoxSelector.stories.tsx +++ b/app/react/components/BoxSelector/BoxSelector.stories.tsx @@ -2,9 +2,9 @@ import { Meta } from '@storybook/react'; import { useState } from 'react'; import { Anchor, Briefcase } from 'lucide-react'; -import Docker from '@CE/assets/ico/vendor/docker.svg?c'; -import { init as initFeatureService } from '@CE/react/portainer/feature-flags/feature-flags.service'; -import { Edition, FeatureId } from '@CE/react/portainer/feature-flags/enums'; +import Docker from '@/assets/ico/vendor/docker.svg?c'; +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'; diff --git a/app/react/components/BoxSelector/BoxSelector.tsx b/app/react/components/BoxSelector/BoxSelector.tsx index b7eb893d4..8eaab9d2d 100644 --- a/app/react/components/BoxSelector/BoxSelector.tsx +++ b/app/react/components/BoxSelector/BoxSelector.tsx @@ -1,4 +1,4 @@ -import { FormError } from '@@CE/form-components/FormError'; +import { FormError } from '@@/form-components/FormError'; import styles from './BoxSelector.module.css'; import { BoxSelectorItem } from './BoxSelectorItem'; diff --git a/app/react/components/BoxSelector/BoxSelectorItem.stories.tsx b/app/react/components/BoxSelector/BoxSelectorItem.stories.tsx index c480ef423..3b6c5e8a7 100644 --- a/app/react/components/BoxSelector/BoxSelectorItem.stories.tsx +++ b/app/react/components/BoxSelector/BoxSelectorItem.stories.tsx @@ -2,11 +2,11 @@ import { Meta } from '@storybook/react'; import { ReactNode } from 'react'; import { Briefcase } from 'lucide-react'; -import { init as initFeatureService } from '@CE/react/portainer/feature-flags/feature-flags.service'; -import { Edition, FeatureId } from '@CE/react/portainer/feature-flags/enums'; -import Docker from '@CE/assets/ico/vendor/docker.svg?c'; +import { init as initFeatureService } from '@/react/portainer/feature-flags/feature-flags.service'; +import { Edition, FeatureId } from '@/react/portainer/feature-flags/enums'; +import Docker from '@/assets/ico/vendor/docker.svg?c'; -import { IconProps } from '@@CE/Icon'; +import { IconProps } from '@@/Icon'; import { BoxSelectorItem } from './BoxSelectorItem'; import { BoxSelectorOption } from './types'; diff --git a/app/react/components/BoxSelector/BoxSelectorItem.tsx b/app/react/components/BoxSelector/BoxSelectorItem.tsx index 9039ffc8b..6a501f9fa 100644 --- a/app/react/components/BoxSelector/BoxSelectorItem.tsx +++ b/app/react/components/BoxSelector/BoxSelectorItem.tsx @@ -2,10 +2,10 @@ import clsx from 'clsx'; import { type LucideIcon, Check } from 'lucide-react'; import { Fragment } from 'react'; -import { Icon } from '@CE/react/components/Icon'; +import { Icon } from '@/react/components/Icon'; -import { BadgeIcon } from '@@CE/BadgeIcon'; -import { getFeatureDetails } from '@@CE/BEFeatureIndicator/utils'; +import { BadgeIcon } from '@@/BadgeIcon'; +import { getFeatureDetails } from '@@/BEFeatureIndicator/utils'; import styles from './BoxSelectorItem.module.css'; import { BoxSelectorOption, Value } from './types'; diff --git a/app/react/components/BoxSelector/LimitedToBeBoxSelectorIndicator.tsx b/app/react/components/BoxSelector/LimitedToBeBoxSelectorIndicator.tsx index fb8fcce16..1418e08b5 100644 --- a/app/react/components/BoxSelector/LimitedToBeBoxSelectorIndicator.tsx +++ b/app/react/components/BoxSelector/LimitedToBeBoxSelectorIndicator.tsx @@ -1,7 +1,7 @@ import { Briefcase } from 'lucide-react'; -import { Icon } from '@@CE/Icon'; -import { Tooltip } from '@@CE/Tip/Tooltip'; +import { Icon } from '@@/Icon'; +import { Tooltip } from '@@/Tip/Tooltip'; interface Props { url?: string; diff --git a/app/react/components/BoxSelector/LogoIcon.tsx b/app/react/components/BoxSelector/LogoIcon.tsx index e7aa512d6..494170b39 100644 --- a/app/react/components/BoxSelector/LogoIcon.tsx +++ b/app/react/components/BoxSelector/LogoIcon.tsx @@ -1,6 +1,6 @@ import clsx from 'clsx'; -import { Icon, IconProps } from '@@CE/Icon'; +import { Icon, IconProps } from '@@/Icon'; type Props = IconProps; diff --git a/app/react/components/BoxSelector/common-options/build-methods.tsx b/app/react/components/BoxSelector/common-options/build-methods.tsx index 7f6dc019f..9c6366a3c 100644 --- a/app/react/components/BoxSelector/common-options/build-methods.tsx +++ b/app/react/components/BoxSelector/common-options/build-methods.tsx @@ -1,7 +1,7 @@ import { Edit, FileText, Globe, UploadCloud } from 'lucide-react'; -import GitIcon from '@CE/assets/ico/git.svg?c'; -import Helm from '@CE/assets/ico/helm.svg?c'; +import GitIcon from '@/assets/ico/git.svg?c'; +import Helm from '@/assets/ico/helm.svg?c'; import { BoxSelectorOption } from '../types'; diff --git a/app/react/components/BoxSelector/common-options/deployment-methods.tsx b/app/react/components/BoxSelector/common-options/deployment-methods.tsx index fd4232b75..676ea7af9 100644 --- a/app/react/components/BoxSelector/common-options/deployment-methods.tsx +++ b/app/react/components/BoxSelector/common-options/deployment-methods.tsx @@ -1,5 +1,5 @@ -import Kubernetes from '@CE/assets/ico/vendor/kubernetes.svg?c'; -import DockerCompose from '@CE/assets/ico/vendor/docker-compose.svg?c'; +import Kubernetes from '@/assets/ico/vendor/kubernetes.svg?c'; +import DockerCompose from '@/assets/ico/vendor/docker-compose.svg?c'; import { BoxSelectorOption } from '../types'; diff --git a/app/react/components/BoxSelector/types.ts b/app/react/components/BoxSelector/types.ts index bb82b01b4..5da756276 100644 --- a/app/react/components/BoxSelector/types.ts +++ b/app/react/components/BoxSelector/types.ts @@ -1,8 +1,8 @@ import { ReactNode } from 'react'; -import type { FeatureId } from '@CE/react/portainer/feature-flags/enums'; +import type { FeatureId } from '@/react/portainer/feature-flags/enums'; -import { IconProps } from '@@CE/Icon'; +import { IconProps } from '@@/Icon'; export type Value = number | string | boolean; diff --git a/app/react/components/Code/Code.tsx b/app/react/components/Code/Code.tsx index 560759ba9..72db4adeb 100644 --- a/app/react/components/Code/Code.tsx +++ b/app/react/components/Code/Code.tsx @@ -1,8 +1,8 @@ import { Check, Copy } from 'lucide-react'; -import { Button } from '@@CE/buttons'; -import { useCopy } from '@@CE/buttons/CopyButton/useCopy'; -import { Icon } from '@@CE/Icon'; +import { Button } from '@@/buttons'; +import { useCopy } from '@@/buttons/CopyButton/useCopy'; +import { Icon } from '@@/Icon'; import styles from './Code.module.css'; diff --git a/app/react/components/CodeEditor/CodeEditor.tsx b/app/react/components/CodeEditor/CodeEditor.tsx index 0f933b66c..e42d46c57 100644 --- a/app/react/components/CodeEditor/CodeEditor.tsx +++ b/app/react/components/CodeEditor/CodeEditor.tsx @@ -5,9 +5,9 @@ import { tags as highlightTags } from '@lezer/highlight'; import type { JSONSchema7 } from 'json-schema'; import clsx from 'clsx'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { CopyButton } from '@@CE/buttons/CopyButton'; +import { CopyButton } from '@@/buttons/CopyButton'; import { useDebounce } from '../../hooks/useDebounce'; import { TextTip } from '../Tip/TextTip'; diff --git a/app/react/components/CodeEditor/DiffViewer.tsx b/app/react/components/CodeEditor/DiffViewer.tsx index e988ca585..9a66407af 100644 --- a/app/react/components/CodeEditor/DiffViewer.tsx +++ b/app/react/components/CodeEditor/DiffViewer.tsx @@ -1,7 +1,7 @@ import CodeMirrorMerge from 'react-codemirror-merge'; import clsx from 'clsx'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; import { FileNameHeader, FileNameHeaderRow } from './FileNameHeader'; import styles from './CodeEditor.module.css'; diff --git a/app/react/components/CodeEditor/FileNameHeader.tsx b/app/react/components/CodeEditor/FileNameHeader.tsx index c25cba22a..eb3418f2a 100644 --- a/app/react/components/CodeEditor/FileNameHeader.tsx +++ b/app/react/components/CodeEditor/FileNameHeader.tsx @@ -1,8 +1,8 @@ import clsx from 'clsx'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { CopyButton } from '@@CE/buttons/CopyButton'; +import { CopyButton } from '@@/buttons/CopyButton'; type FileNameHeaderProps = { fileName: string; diff --git a/app/react/components/CodeEditor/ShortcutsTooltip.tsx b/app/react/components/CodeEditor/ShortcutsTooltip.tsx index 87883e716..e04cda2c8 100644 --- a/app/react/components/CodeEditor/ShortcutsTooltip.tsx +++ b/app/react/components/CodeEditor/ShortcutsTooltip.tsx @@ -1,6 +1,6 @@ -import { BROWSER_OS_PLATFORM } from '@CE/react/constants'; +import { BROWSER_OS_PLATFORM } from '@/react/constants'; -import { Tooltip } from '@@CE/Tip/Tooltip'; +import { Tooltip } from '@@/Tip/Tooltip'; const otherEditorConfig = { tooltip: ( diff --git a/app/react/components/DashboardItem/DashboardItem.stories.tsx b/app/react/components/DashboardItem/DashboardItem.stories.tsx index c190cf8b8..5a55abe5e 100644 --- a/app/react/components/DashboardItem/DashboardItem.stories.tsx +++ b/app/react/components/DashboardItem/DashboardItem.stories.tsx @@ -1,8 +1,8 @@ import { Meta, Story } from '@storybook/react'; import { List } from 'lucide-react'; -import { Link } from '@@CE/Link'; -import { IconProps } from '@@CE/Icon'; +import { Link } from '@@/Link'; +import { IconProps } from '@@/Icon'; import { DashboardItem } from './DashboardItem'; diff --git a/app/react/components/DashboardItem/DashboardItem.tsx b/app/react/components/DashboardItem/DashboardItem.tsx index 12702f4bd..73b934ecc 100644 --- a/app/react/components/DashboardItem/DashboardItem.tsx +++ b/app/react/components/DashboardItem/DashboardItem.tsx @@ -2,11 +2,11 @@ import { ReactNode } from 'react'; import clsx from 'clsx'; import { Loader2 } from 'lucide-react'; -import { Icon, IconProps } from '@CE/react/components/Icon'; -import { pluralize } from '@CE/portainer/helpers/strings'; -import { AutomationTestingProps } from '@CE/types'; +import { Icon, IconProps } from '@/react/components/Icon'; +import { pluralize } from '@/portainer/helpers/strings'; +import { AutomationTestingProps } from '@/types'; -import { Link } from '@@CE/Link'; +import { Link } from '@@/Link'; interface Props extends IconProps, AutomationTestingProps { type: string; diff --git a/app/react/components/DateTimeField.tsx b/app/react/components/DateTimeField.tsx index 0e730fef8..d697f791e 100644 --- a/app/react/components/DateTimeField.tsx +++ b/app/react/components/DateTimeField.tsx @@ -1,11 +1,11 @@ import DateTimePicker from 'react-datetime-picker'; import { Calendar, X } from 'lucide-react'; -import { isoDate } from '@CE/portainer/filters/filters'; -import { AutomationTestingProps } from '@CE/types'; +import { isoDate } from '@/portainer/filters/filters'; +import { AutomationTestingProps } from '@/types'; -import { FormControl } from '@@CE/form-components/FormControl'; -import { Input } from '@@CE/form-components/Input'; +import { FormControl } from '@@/form-components/FormControl'; +import { Input } from '@@/form-components/Input'; import 'react-datetime-picker/dist/DateTimePicker.css'; import 'react-calendar/dist/Calendar.css'; diff --git a/app/react/components/EdgeIndicator.test.tsx b/app/react/components/EdgeIndicator.test.tsx index 4bff1a759..d39daae4a 100644 --- a/app/react/components/EdgeIndicator.test.tsx +++ b/app/react/components/EdgeIndicator.test.tsx @@ -1,6 +1,6 @@ import { render } from '@testing-library/react'; -import { createMockEnvironment } from '@CE/react-tools/test-mocks'; +import { createMockEnvironment } from '@/react-tools/test-mocks'; import { withTestQueryProvider } from '../test-utils/withTestQuery'; diff --git a/app/react/components/EdgeIndicator.tsx b/app/react/components/EdgeIndicator.tsx index 8bd2f00a4..195d95df0 100644 --- a/app/react/components/EdgeIndicator.tsx +++ b/app/react/components/EdgeIndicator.tsx @@ -1,9 +1,9 @@ import { Activity } from 'lucide-react'; -import { isoDateFromTimestamp } from '@CE/portainer/filters/filters'; -import { Environment } from '@CE/react/portainer/environments/types'; -import heartbeatup from '@CE/assets/ico/heartbeat-up.svg?c'; -import heartbeatdown from '@CE/assets/ico/heartbeat-down.svg?c'; +import { isoDateFromTimestamp } from '@/portainer/filters/filters'; +import { Environment } from '@/react/portainer/environments/types'; +import heartbeatup from '@/assets/ico/heartbeat-up.svg?c'; +import heartbeatdown from '@/assets/ico/heartbeat-down.svg?c'; import { EnvironmentStatusBadgeItem } from './EnvironmentStatusBadgeItem'; diff --git a/app/react/components/EnvironmentStatusBadge.tsx b/app/react/components/EnvironmentStatusBadge.tsx index 163aaf3ad..123c6c456 100644 --- a/app/react/components/EnvironmentStatusBadge.tsx +++ b/app/react/components/EnvironmentStatusBadge.tsx @@ -1,6 +1,6 @@ import { CheckCircle, XCircle } from 'lucide-react'; -import { EnvironmentStatus } from '@CE/react/portainer/environments/types'; +import { EnvironmentStatus } from '@/react/portainer/environments/types'; import { EnvironmentStatusBadgeItem } from './EnvironmentStatusBadgeItem'; diff --git a/app/react/components/EnvironmentStatusBadgeItem.tsx b/app/react/components/EnvironmentStatusBadgeItem.tsx index 2b25c28ad..ec63a5201 100644 --- a/app/react/components/EnvironmentStatusBadgeItem.tsx +++ b/app/react/components/EnvironmentStatusBadgeItem.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import { AriaAttributes, PropsWithChildren } from 'react'; -import { Icon, IconProps } from '@@CE/Icon'; +import { Icon, IconProps } from '@@/Icon'; export function EnvironmentStatusBadgeItem({ className, diff --git a/app/react/components/ExpandableMessageByLines.test.tsx b/app/react/components/ExpandableMessageByLines.test.tsx index ab083195c..d403fcb9c 100644 --- a/app/react/components/ExpandableMessageByLines.test.tsx +++ b/app/react/components/ExpandableMessageByLines.test.tsx @@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { vi } from 'vitest'; -import { ExpandableMessageByLines } from '@@CE/ExpandableMessageByLines'; +import { ExpandableMessageByLines } from '@@/ExpandableMessageByLines'; describe('ExpandableMessageByLines', () => { // Mock scrollHeight and clientHeight for testing truncation diff --git a/app/react/components/ExpandableMessageByLines.tsx b/app/react/components/ExpandableMessageByLines.tsx index 8fff249ee..36bf1035c 100644 --- a/app/react/components/ExpandableMessageByLines.tsx +++ b/app/react/components/ExpandableMessageByLines.tsx @@ -1,6 +1,6 @@ import { useRef, useState, useEffect, useCallback } from 'react'; -import { Button } from '@@CE/buttons'; +import { Button } from '@@/buttons'; // use enum so that the tailwind classes aren't interpolated type MaxLines = 2 | 5 | 10 | 20 | 50; diff --git a/app/react/components/ExternalLink.tsx b/app/react/components/ExternalLink.tsx index 0329960c6..1bd839cad 100644 --- a/app/react/components/ExternalLink.tsx +++ b/app/react/components/ExternalLink.tsx @@ -2,7 +2,7 @@ import { ArrowUpRight } from 'lucide-react'; import { PropsWithChildren } from 'react'; import clsx from 'clsx'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; interface Props { to: string; diff --git a/app/react/components/HelpLink/HelpLink.tsx b/app/react/components/HelpLink/HelpLink.tsx index d076cf752..8596baf4d 100644 --- a/app/react/components/HelpLink/HelpLink.tsx +++ b/app/react/components/HelpLink/HelpLink.tsx @@ -1,6 +1,6 @@ import { ReactNode } from 'react'; -import { useDocsUrl } from '@@CE/PageHeader/ContextHelp'; +import { useDocsUrl } from '@@/PageHeader/ContextHelp'; type HelpLinkProps = { docLink: string; diff --git a/app/react/components/ImageConfigFieldset/AdvancedForm.tsx b/app/react/components/ImageConfigFieldset/AdvancedForm.tsx index bed4cb8ed..a1a21754e 100644 --- a/app/react/components/ImageConfigFieldset/AdvancedForm.tsx +++ b/app/react/components/ImageConfigFieldset/AdvancedForm.tsx @@ -1,8 +1,8 @@ import { FormikErrors } from 'formik'; -import { FormControl } from '@@CE/form-components/FormControl'; -import { Input } from '@@CE/form-components/Input'; -import { TextTip } from '@@CE/Tip/TextTip'; +import { FormControl } from '@@/form-components/FormControl'; +import { Input } from '@@/form-components/Input'; +import { TextTip } from '@@/Tip/TextTip'; import { Values } from './types'; diff --git a/app/react/components/ImageConfigFieldset/ImageConfigFieldset.test.tsx b/app/react/components/ImageConfigFieldset/ImageConfigFieldset.test.tsx index 24d481cce..f8851f1cc 100644 --- a/app/react/components/ImageConfigFieldset/ImageConfigFieldset.test.tsx +++ b/app/react/components/ImageConfigFieldset/ImageConfigFieldset.test.tsx @@ -3,8 +3,8 @@ import { ComponentProps } from 'react'; import { HttpResponse } from 'msw'; import { render, fireEvent } from '@testing-library/react'; -import { http, server } from '@CE/setup-tests/server'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; +import { http, server } from '@/setup-tests/server'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; import { ImageConfigFieldset } from './ImageConfigFieldset'; import { Values } from './types'; diff --git a/app/react/components/ImageConfigFieldset/ImageConfigFieldset.tsx b/app/react/components/ImageConfigFieldset/ImageConfigFieldset.tsx index 422bbcdf6..bb0c383a4 100644 --- a/app/react/components/ImageConfigFieldset/ImageConfigFieldset.tsx +++ b/app/react/components/ImageConfigFieldset/ImageConfigFieldset.tsx @@ -2,7 +2,7 @@ import { Database, Globe } from 'lucide-react'; import { FormikErrors } from 'formik'; import { PropsWithChildren } from 'react'; -import { Button } from '@@CE/buttons'; +import { Button } from '@@/buttons'; import { SimpleForm } from './SimpleForm'; import { Values } from './types'; diff --git a/app/react/components/ImageConfigFieldset/InputSearch.tsx b/app/react/components/ImageConfigFieldset/InputSearch.tsx index f305fde84..fbda3cee1 100644 --- a/app/react/components/ImageConfigFieldset/InputSearch.tsx +++ b/app/react/components/ImageConfigFieldset/InputSearch.tsx @@ -1,9 +1,9 @@ import { useMemo } from 'react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { AutocompleteSelect } from '@@CE/form-components/AutocompleteSelect'; -import { Option } from '@@CE/form-components/PortainerSelect'; +import { AutocompleteSelect } from '@@/form-components/AutocompleteSelect'; +import { Option } from '@@/form-components/PortainerSelect'; export function InputSearch({ value, diff --git a/app/react/components/ImageConfigFieldset/RateLimits.tsx b/app/react/components/ImageConfigFieldset/RateLimits.tsx index b1b484279..d8d3875a5 100644 --- a/app/react/components/ImageConfigFieldset/RateLimits.tsx +++ b/app/react/components/ImageConfigFieldset/RateLimits.tsx @@ -1,23 +1,23 @@ import { useQuery } from '@tanstack/react-query'; import { useEffect } from 'react'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { useCurrentEnvironment } from '@CE/react/hooks/useCurrentEnvironment'; -import { useCurrentUser } from '@CE/react/hooks/useUser'; -import { buildUrl } from '@CE/react/portainer/environments/environment.service/utils'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment'; +import { useCurrentUser } from '@/react/hooks/useUser'; +import { buildUrl } from '@/react/portainer/environments/environment.service/utils'; import { Environment, EnvironmentType, -} from '@CE/react/portainer/environments/types'; +} from '@/react/portainer/environments/types'; import { isAgentEnvironment, isLocalEnvironment, -} from '@CE/react/portainer/environments/utils'; -import { RegistryId } from '@CE/react/portainer/registries/types/registry'; -import { useRegistry } from '@CE/react/portainer/registries/queries/useRegistry'; +} from '@/react/portainer/environments/utils'; +import { RegistryId } from '@/react/portainer/registries/types/registry'; +import { useRegistry } from '@/react/portainer/registries/queries/useRegistry'; -import { Link } from '@@CE/Link'; -import { TextTip } from '@@CE/Tip/TextTip'; +import { Link } from '@@/Link'; +import { TextTip } from '@@/Tip/TextTip'; import { getIsDockerHubRegistry } from './utils'; diff --git a/app/react/components/ImageConfigFieldset/SimpleForm.tsx b/app/react/components/ImageConfigFieldset/SimpleForm.tsx index e2936f577..94d0840ab 100644 --- a/app/react/components/ImageConfigFieldset/SimpleForm.tsx +++ b/app/react/components/ImageConfigFieldset/SimpleForm.tsx @@ -3,26 +3,26 @@ import _ from 'lodash'; import { useMemo } from 'react'; import { trimSHA, trimVersionTag } from 'Docker/filters/utils'; -import DockerIcon from '@CE/assets/ico/vendor/docker.svg?c'; -import { useImages } from '@CE/react/docker/proxy/queries/images/useImages'; +import DockerIcon from '@/assets/ico/vendor/docker.svg?c'; +import { useImages } from '@/react/docker/proxy/queries/images/useImages'; import { imageContainsURL, getUniqueTagListFromImages, -} from '@CE/react/docker/images/utils'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { useEnvironmentRegistries } from '@CE/react/portainer/environments/queries/useEnvironmentRegistries'; +} from '@/react/docker/images/utils'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { useEnvironmentRegistries } from '@/react/portainer/environments/queries/useEnvironmentRegistries'; import { Registry, RegistryId, RegistryTypes, -} from '@CE/react/portainer/registries/types/registry'; -import { useRegistry } from '@CE/react/portainer/registries/queries/useRegistry'; +} from '@/react/portainer/registries/types/registry'; +import { useRegistry } from '@/react/portainer/registries/queries/useRegistry'; -import { Button } from '@@CE/buttons'; -import { FormControl } from '@@CE/form-components/FormControl'; -import { InputGroup } from '@@CE/form-components/InputGroup'; -import { PortainerSelect } from '@@CE/form-components/PortainerSelect'; -import { Input } from '@@CE/form-components/Input'; +import { Button } from '@@/buttons'; +import { FormControl } from '@@/form-components/FormControl'; +import { InputGroup } from '@@/form-components/InputGroup'; +import { PortainerSelect } from '@@/form-components/PortainerSelect'; +import { Input } from '@@/form-components/Input'; import { Values } from './types'; import { InputSearch } from './InputSearch'; diff --git a/app/react/components/ImageConfigFieldset/getImageConfig.ts b/app/react/components/ImageConfigFieldset/getImageConfig.ts index 790d33103..e431c67cc 100644 --- a/app/react/components/ImageConfigFieldset/getImageConfig.ts +++ b/app/react/components/ImageConfigFieldset/getImageConfig.ts @@ -1,11 +1,11 @@ -import { imageContainsURL } from '@CE/react/docker/images/utils'; +import { imageContainsURL } from '@/react/docker/images/utils'; import { Registry, RegistryId, -} from '@CE/react/portainer/registries/types/registry'; -import { getURL } from '@CE/react/portainer/registries/utils/getUrl'; +} from '@/react/portainer/registries/types/registry'; +import { getURL } from '@/react/portainer/registries/utils/getUrl'; -import { ImageConfigValues } from '@@CE/ImageConfigFieldset'; +import { ImageConfigValues } from '@@/ImageConfigFieldset'; import { findBestMatchRegistry } from './findRegistryMatch'; diff --git a/app/react/components/ImageConfigFieldset/types.ts b/app/react/components/ImageConfigFieldset/types.ts index 8376c53f3..5fed9dbf5 100644 --- a/app/react/components/ImageConfigFieldset/types.ts +++ b/app/react/components/ImageConfigFieldset/types.ts @@ -1,4 +1,4 @@ -import { Registry } from '@CE/react/portainer/registries/types/registry'; +import { Registry } from '@/react/portainer/registries/types/registry'; export interface Values { useRegistry: boolean; diff --git a/app/react/components/ImageConfigFieldset/utils.ts b/app/react/components/ImageConfigFieldset/utils.ts index dd0ea1db3..8e056ec4c 100644 --- a/app/react/components/ImageConfigFieldset/utils.ts +++ b/app/react/components/ImageConfigFieldset/utils.ts @@ -1,7 +1,7 @@ import { Registry, RegistryTypes, -} from '@CE/react/portainer/registries/types/registry'; +} from '@/react/portainer/registries/types/registry'; export function getIsDockerHubRegistry(registry?: Registry | null) { return ( diff --git a/app/react/components/InlineLoader/InlineLoader.tsx b/app/react/components/InlineLoader/InlineLoader.tsx index 35526d76f..d91354de7 100644 --- a/app/react/components/InlineLoader/InlineLoader.tsx +++ b/app/react/components/InlineLoader/InlineLoader.tsx @@ -2,7 +2,7 @@ import { Loader2 } from 'lucide-react'; import { ReactNode } from 'react'; import clsx from 'clsx'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; type Size = 'xs' | 'sm' | 'md'; diff --git a/app/react/components/InsightsBox/InsightsBox.tsx b/app/react/components/InsightsBox/InsightsBox.tsx index a388e5123..81db52d11 100644 --- a/app/react/components/InsightsBox/InsightsBox.tsx +++ b/app/react/components/InsightsBox/InsightsBox.tsx @@ -3,7 +3,7 @@ import { Lightbulb, X } from 'lucide-react'; import { ReactNode } from 'react'; import { useStore } from 'zustand'; -import { Button } from '@@CE/buttons'; +import { Button } from '@@/buttons'; import { insightStore } from './insights-store'; diff --git a/app/react/components/InsightsBox/insights-store.ts b/app/react/components/InsightsBox/insights-store.ts index 7cd498c2c..a35881158 100644 --- a/app/react/components/InsightsBox/insights-store.ts +++ b/app/react/components/InsightsBox/insights-store.ts @@ -1,7 +1,7 @@ import { createStore } from 'zustand'; import { persist } from 'zustand/middleware'; -import { keyBuilder } from '@CE/react/hooks/useLocalStorage'; +import { keyBuilder } from '@/react/hooks/useLocalStorage'; interface InsightsStore { insightIDsClosed: string[]; diff --git a/app/react/components/NavTabs/NavTabs.test.tsx b/app/react/components/NavTabs/NavTabs.test.tsx index b29b1fed7..3427a770f 100644 --- a/app/react/components/NavTabs/NavTabs.test.tsx +++ b/app/react/components/NavTabs/NavTabs.test.tsx @@ -1,7 +1,7 @@ import userEvent from '@testing-library/user-event'; import { render } from '@testing-library/react'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; +import { withTestRouter } from '@/react/test-utils/withRouter'; import { NavTabs, Option } from './NavTabs'; diff --git a/app/react/components/NavTabs/NavTabs.tsx b/app/react/components/NavTabs/NavTabs.tsx index a2f5561ec..ffe4dd4e8 100644 --- a/app/react/components/NavTabs/NavTabs.tsx +++ b/app/react/components/NavTabs/NavTabs.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import { ComponentProps, ReactNode } from 'react'; -import { Button } from '@@CE/buttons'; +import { Button } from '@@/buttons'; import styles from './NavTabs.module.css'; diff --git a/app/react/components/Note/Note.tsx b/app/react/components/Note/Note.tsx index 93d74c5f1..e0998b658 100644 --- a/app/react/components/Note/Note.tsx +++ b/app/react/components/Note/Note.tsx @@ -2,8 +2,8 @@ import { useEffect, useState } from 'react'; import clsx from 'clsx'; import { ChevronUp, ChevronRight, Edit } from 'lucide-react'; -import { Button } from '@@CE/buttons'; -import { FormError } from '@@CE/form-components/FormError'; +import { Button } from '@@/buttons'; +import { FormError } from '@@/form-components/FormError'; export type Props = { onChange: (value: string) => void; diff --git a/app/react/components/PageHeader/Breadcrumbs/Breadcrumbs.tsx b/app/react/components/PageHeader/Breadcrumbs/Breadcrumbs.tsx index b8ff97acd..d1c7a7e26 100644 --- a/app/react/components/PageHeader/Breadcrumbs/Breadcrumbs.tsx +++ b/app/react/components/PageHeader/Breadcrumbs/Breadcrumbs.tsx @@ -1,6 +1,6 @@ import { Fragment } from 'react'; -import { Link } from '@@CE/Link'; +import { Link } from '@@/Link'; export interface Crumb { label: string; diff --git a/app/react/components/PageHeader/ContextHelp.tsx b/app/react/components/PageHeader/ContextHelp.tsx index 54de225d3..766a308c8 100644 --- a/app/react/components/PageHeader/ContextHelp.tsx +++ b/app/react/components/PageHeader/ContextHelp.tsx @@ -2,7 +2,7 @@ import { HelpCircle } from 'lucide-react'; import clsx from 'clsx'; import { useCurrentStateAndParams } from '@uirouter/react'; -import { useSystemVersion } from '@CE/react/portainer/system/useSystemVersion'; +import { useSystemVersion } from '@/react/portainer/system/useSystemVersion'; import headerStyles from './HeaderTitle.module.css'; diff --git a/app/react/components/PageHeader/HeaderContainer.stories.tsx b/app/react/components/PageHeader/HeaderContainer.stories.tsx index 2aca6ccce..94de49d52 100644 --- a/app/react/components/PageHeader/HeaderContainer.stories.tsx +++ b/app/react/components/PageHeader/HeaderContainer.stories.tsx @@ -1,8 +1,8 @@ import { Meta, Story } from '@storybook/react'; import { useMemo } from 'react'; -import { UserContext } from '@CE/react/hooks/useUser'; -import { UserViewModel } from '@CE/portainer/models/user'; +import { UserContext } from '@/react/hooks/useUser'; +import { UserViewModel } from '@/portainer/models/user'; import { HeaderContainer } from './HeaderContainer'; import { Breadcrumbs } from './Breadcrumbs'; diff --git a/app/react/components/PageHeader/HeaderTitle.test.tsx b/app/react/components/PageHeader/HeaderTitle.test.tsx index b5d372da9..490e9608c 100644 --- a/app/react/components/PageHeader/HeaderTitle.test.tsx +++ b/app/react/components/PageHeader/HeaderTitle.test.tsx @@ -1,9 +1,9 @@ import { render } from '@testing-library/react'; -import { UserViewModel } from '@CE/portainer/models/user'; -import { withUserProvider } from '@CE/react/test-utils/withUserProvider'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; +import { UserViewModel } from '@/portainer/models/user'; +import { withUserProvider } from '@/react/test-utils/withUserProvider'; +import { withTestRouter } from '@/react/test-utils/withRouter'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; import { HeaderContainer } from './HeaderContainer'; import { HeaderTitle } from './HeaderTitle'; diff --git a/app/react/components/PageHeader/HeaderTitle.tsx b/app/react/components/PageHeader/HeaderTitle.tsx index b7bfc1943..6b9d3577e 100644 --- a/app/react/components/PageHeader/HeaderTitle.tsx +++ b/app/react/components/PageHeader/HeaderTitle.tsx @@ -1,8 +1,8 @@ import { PropsWithChildren } from 'react'; -import { isBE } from '@CE/react/portainer/feature-flags/feature-flags.service'; +import { isBE } from '@/react/portainer/feature-flags/feature-flags.service'; -import { ContextHelp } from '@@CE/PageHeader/ContextHelp'; +import { ContextHelp } from '@@/PageHeader/ContextHelp'; import { useHeaderContext } from './HeaderContainer'; import { NotificationsMenu } from './NotificationsMenu'; diff --git a/app/react/components/PageHeader/NotificationsMenu.tsx b/app/react/components/PageHeader/NotificationsMenu.tsx index ebac527de..9e668e4b0 100644 --- a/app/react/components/PageHeader/NotificationsMenu.tsx +++ b/app/react/components/PageHeader/NotificationsMenu.tsx @@ -10,13 +10,13 @@ import Moment from 'moment'; import { useStore } from 'zustand'; import { AlertCircle, Bell, CheckCircle, Trash2 } from 'lucide-react'; -import { AutomationTestingProps } from '@CE/types'; -import { useUser } from '@CE/react/hooks/useUser'; -import { ToastNotification } from '@CE/react/portainer/notifications/types'; +import { AutomationTestingProps } from '@/types'; +import { useUser } from '@/react/hooks/useUser'; +import { ToastNotification } from '@/react/portainer/notifications/types'; -import { Icon } from '@@CE/Icon'; -import { Link } from '@@CE/Link'; -import { Button } from '@@CE/buttons'; +import { Icon } from '@@/Icon'; +import { Link } from '@@/Link'; +import { Button } from '@@/buttons'; import { notificationsStore } from '../../portainer/notifications/notifications-store'; diff --git a/app/react/components/PageHeader/PageHeader.stories.tsx b/app/react/components/PageHeader/PageHeader.stories.tsx index 217ce8e40..76d387b4e 100644 --- a/app/react/components/PageHeader/PageHeader.stories.tsx +++ b/app/react/components/PageHeader/PageHeader.stories.tsx @@ -1,8 +1,8 @@ import { Meta, Story } from '@storybook/react'; import { useMemo } from 'react'; -import { UserContext } from '@CE/react/hooks/useUser'; -import { UserViewModel } from '@CE/portainer/models/user'; +import { UserContext } from '@/react/hooks/useUser'; +import { UserViewModel } from '@/portainer/models/user'; import { PageHeader } from './PageHeader'; diff --git a/app/react/components/PageHeader/PageHeader.test.tsx b/app/react/components/PageHeader/PageHeader.test.tsx index 7241dc729..f6bd1f9d0 100644 --- a/app/react/components/PageHeader/PageHeader.test.tsx +++ b/app/react/components/PageHeader/PageHeader.test.tsx @@ -1,9 +1,9 @@ import { render } from '@testing-library/react'; -import { UserViewModel } from '@CE/portainer/models/user'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; -import { withUserProvider } from '@CE/react/test-utils/withUserProvider'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; +import { UserViewModel } from '@/portainer/models/user'; +import { withTestRouter } from '@/react/test-utils/withRouter'; +import { withUserProvider } from '@/react/test-utils/withUserProvider'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; import { PageHeader } from './PageHeader'; diff --git a/app/react/components/PageHeader/PageHeader.tsx b/app/react/components/PageHeader/PageHeader.tsx index 3fdf53055..a9f0b9e11 100644 --- a/app/react/components/PageHeader/PageHeader.tsx +++ b/app/react/components/PageHeader/PageHeader.tsx @@ -2,7 +2,7 @@ import { useRouter } from '@uirouter/react'; import { PropsWithChildren } from 'react'; import { RefreshCw } from 'lucide-react'; -import { dispatchCacheRefreshEvent } from '@CE/portainer/services/http-request.helper'; +import { dispatchCacheRefreshEvent } from '@/portainer/services/http-request.helper'; import { Button } from '../buttons'; diff --git a/app/react/components/PageHeader/UserMenu.tsx b/app/react/components/PageHeader/UserMenu.tsx index e0e6fe13b..2a814cb2e 100644 --- a/app/react/components/PageHeader/UserMenu.tsx +++ b/app/react/components/PageHeader/UserMenu.tsx @@ -8,9 +8,9 @@ import { UISrefProps, useSref } from '@uirouter/react'; import clsx from 'clsx'; import { User, ChevronDown } from 'lucide-react'; -import { queryClient } from '@CE/react-tools/react-query'; -import { AutomationTestingProps } from '@CE/types'; -import { useUser } from '@CE/react/hooks/useUser'; +import { queryClient } from '@/react-tools/react-query'; +import { AutomationTestingProps } from '@/types'; +import { useUser } from '@/react/hooks/useUser'; import styles from './HeaderTitle.module.css'; diff --git a/app/react/components/PaginationControls/PageInput.tsx b/app/react/components/PaginationControls/PageInput.tsx index 5d478d327..56d0e1e82 100644 --- a/app/react/components/PaginationControls/PageInput.tsx +++ b/app/react/components/PaginationControls/PageInput.tsx @@ -2,8 +2,8 @@ import { useFormik } from 'formik'; import { ChangeEvent, KeyboardEvent } from 'react'; import { object, number } from 'yup'; -import { Button } from '@@CE/buttons'; -import { Input } from '@@CE/form-components/Input'; +import { Button } from '@@/buttons'; +import { Input } from '@@/form-components/Input'; interface Values { page: number | ''; diff --git a/app/react/components/PasswordCheckHint.tsx b/app/react/components/PasswordCheckHint.tsx index b20fe715a..a1b5ab365 100644 --- a/app/react/components/PasswordCheckHint.tsx +++ b/app/react/components/PasswordCheckHint.tsx @@ -1,8 +1,8 @@ import { AlertTriangle, Check } from 'lucide-react'; -import { usePublicSettings } from '@CE/react/portainer/settings/queries'; +import { usePublicSettings } from '@/react/portainer/settings/queries'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; interface Props { passwordValid: boolean; diff --git a/app/react/components/StatsItem.tsx b/app/react/components/StatsItem.tsx index 42ca870d0..6e58535e2 100644 --- a/app/react/components/StatsItem.tsx +++ b/app/react/components/StatsItem.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import { PropsWithChildren } from 'react'; -import { Icon, IconProps } from '@CE/react/components/Icon'; +import { Icon, IconProps } from '@/react/components/Icon'; interface Props extends IconProps { value: string | number; diff --git a/app/react/components/StatusBadge.tsx b/app/react/components/StatusBadge.tsx index fa27d8acc..688fcd81f 100644 --- a/app/react/components/StatusBadge.tsx +++ b/app/react/components/StatusBadge.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import { AriaAttributes, PropsWithChildren } from 'react'; -import { Icon, IconProps } from '@@CE/Icon'; +import { Icon, IconProps } from '@@/Icon'; export type StatusBadgeType = | 'success' diff --git a/app/react/components/Stepper/Stepper.stories.tsx b/app/react/components/Stepper/Stepper.stories.tsx index 744ad4c1c..90d10145c 100644 --- a/app/react/components/Stepper/Stepper.stories.tsx +++ b/app/react/components/Stepper/Stepper.stories.tsx @@ -1,7 +1,7 @@ import { Meta } from '@storybook/react'; import { useState } from 'react'; -import { Button } from '@@CE/buttons'; +import { Button } from '@@/buttons'; import { Step, Stepper } from './Stepper'; diff --git a/app/react/components/Svg.tsx b/app/react/components/Svg.tsx index 98ea176e2..5c12aef30 100644 --- a/app/react/components/Svg.tsx +++ b/app/react/components/Svg.tsx @@ -1,37 +1,37 @@ // general icons -import dataflow from '@CE/assets/ico/dataflow-1.svg?c'; -import git from '@CE/assets/ico/git.svg?c'; -import kube from '@CE/assets/ico/kube.svg?c'; -import ldap from '@CE/assets/ico/ldap.svg?c'; -import linux from '@CE/assets/ico/linux.svg?c'; -import memory from '@CE/assets/ico/memory.svg?c'; -import restorewindow from '@CE/assets/ico/restore-window.svg?c'; -import route from '@CE/assets/ico/route.svg?c'; -import sort from '@CE/assets/ico/sort.svg?c'; -import subscription from '@CE/assets/ico/subscription.svg?c'; -import Placeholder from '@CE/assets/ico/placeholder.svg?c'; // Placeholder is used when an icon name cant be matched +import dataflow from '@/assets/ico/dataflow-1.svg?c'; +import git from '@/assets/ico/git.svg?c'; +import kube from '@/assets/ico/kube.svg?c'; +import ldap from '@/assets/ico/ldap.svg?c'; +import linux from '@/assets/ico/linux.svg?c'; +import memory from '@/assets/ico/memory.svg?c'; +import restorewindow from '@/assets/ico/restore-window.svg?c'; +import route from '@/assets/ico/route.svg?c'; +import sort from '@/assets/ico/sort.svg?c'; +import subscription from '@/assets/ico/subscription.svg?c'; +import Placeholder from '@/assets/ico/placeholder.svg?c'; // Placeholder is used when an icon name cant be matched // vendor icons -import aws from '@CE/assets/ico/vendor/aws.svg?c'; -import azure from '@CE/assets/ico/vendor/azure.svg?c'; -import civo from '@CE/assets/ico/vendor/civo.svg?c'; -import digitalocean from '@CE/assets/ico/vendor/digitalocean.svg?c'; -import docker from '@CE/assets/ico/vendor/docker.svg?c'; -import dockericon from '@CE/assets/ico/vendor/docker-icon.svg?c'; -import dockercompose from '@CE/assets/ico/vendor/docker-compose.svg?c'; -import ecr from '@CE/assets/ico/vendor/ecr.svg?c'; -import github from '@CE/assets/ico/vendor/github.svg?c'; -import gitlab from '@CE/assets/ico/vendor/gitlab.svg?c'; -import google from '@CE/assets/ico/vendor/google.svg?c'; -import googlecloud from '@CE/assets/ico/vendor/googlecloud.svg?c'; -import kubernetes from '@CE/assets/ico/vendor/kubernetes.svg?c'; -import helm from '@CE/assets/ico/vendor/helm.svg?c'; -import akamai from '@CE/assets/ico/vendor/akamai.svg?c'; -import microsoft from '@CE/assets/ico/vendor/microsoft.svg?c'; -import microsofticon from '@CE/assets/ico/vendor/microsoft-icon.svg?c'; -import openldap from '@CE/assets/ico/vendor/openldap.svg?c'; -import proget from '@CE/assets/ico/vendor/proget.svg?c'; -import quay from '@CE/assets/ico/vendor/quay.svg?c'; +import aws from '@/assets/ico/vendor/aws.svg?c'; +import azure from '@/assets/ico/vendor/azure.svg?c'; +import civo from '@/assets/ico/vendor/civo.svg?c'; +import digitalocean from '@/assets/ico/vendor/digitalocean.svg?c'; +import docker from '@/assets/ico/vendor/docker.svg?c'; +import dockericon from '@/assets/ico/vendor/docker-icon.svg?c'; +import dockercompose from '@/assets/ico/vendor/docker-compose.svg?c'; +import ecr from '@/assets/ico/vendor/ecr.svg?c'; +import github from '@/assets/ico/vendor/github.svg?c'; +import gitlab from '@/assets/ico/vendor/gitlab.svg?c'; +import google from '@/assets/ico/vendor/google.svg?c'; +import googlecloud from '@/assets/ico/vendor/googlecloud.svg?c'; +import kubernetes from '@/assets/ico/vendor/kubernetes.svg?c'; +import helm from '@/assets/ico/vendor/helm.svg?c'; +import akamai from '@/assets/ico/vendor/akamai.svg?c'; +import microsoft from '@/assets/ico/vendor/microsoft.svg?c'; +import microsofticon from '@/assets/ico/vendor/microsoft-icon.svg?c'; +import openldap from '@/assets/ico/vendor/openldap.svg?c'; +import proget from '@/assets/ico/vendor/proget.svg?c'; +import quay from '@/assets/ico/vendor/quay.svg?c'; const placeholder = Placeholder; diff --git a/app/react/components/TLSFieldset/TLSFieldset.tsx b/app/react/components/TLSFieldset/TLSFieldset.tsx index 4b59dd84a..d3d0019c0 100644 --- a/app/react/components/TLSFieldset/TLSFieldset.tsx +++ b/app/react/components/TLSFieldset/TLSFieldset.tsx @@ -1,10 +1,10 @@ import { FormikErrors } from 'formik'; import { SchemaOf, boolean, object } from 'yup'; -import { file, withFileSize } from '@@CE/form-components/yup-file-validation'; -import { FileUploadField } from '@@CE/form-components/FileUpload'; -import { SwitchField } from '@@CE/form-components/SwitchField'; -import { FormControl } from '@@CE/form-components/FormControl'; +import { file, withFileSize } from '@@/form-components/yup-file-validation'; +import { FileUploadField } from '@@/form-components/FileUpload'; +import { SwitchField } from '@@/form-components/SwitchField'; +import { FormControl } from '@@/form-components/FormControl'; import { TLSConfig } from './types'; diff --git a/app/react/components/TagButton/TagButton.tsx b/app/react/components/TagButton/TagButton.tsx index 63af3784f..e649e98c7 100644 --- a/app/react/components/TagButton/TagButton.tsx +++ b/app/react/components/TagButton/TagButton.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import { Trash2 } from 'lucide-react'; -import { Icon } from '@CE/react/components/Icon'; +import { Icon } from '@/react/components/Icon'; import styles from './TagButton.module.css'; diff --git a/app/react/components/TagSelector/TagSelector.stories.tsx b/app/react/components/TagSelector/TagSelector.stories.tsx index 5e226d77c..65f813820 100644 --- a/app/react/components/TagSelector/TagSelector.stories.tsx +++ b/app/react/components/TagSelector/TagSelector.stories.tsx @@ -1,7 +1,7 @@ import { Meta } from '@storybook/react'; import { useState } from 'react'; -import { TagId } from '@CE/portainer/tags/types'; +import { TagId } from '@/portainer/tags/types'; import { TagSelector } from './TagSelector'; diff --git a/app/react/components/TagSelector/TagSelector.test.tsx b/app/react/components/TagSelector/TagSelector.test.tsx index 2f9ef1f89..59eec5e81 100644 --- a/app/react/components/TagSelector/TagSelector.test.tsx +++ b/app/react/components/TagSelector/TagSelector.test.tsx @@ -2,10 +2,10 @@ import { http, HttpResponse } from 'msw'; import { Mock } from 'vitest'; import { render } from '@testing-library/react'; -import { Tag, TagId } from '@CE/portainer/tags/types'; -import { server } from '@CE/setup-tests/server'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; +import { Tag, TagId } from '@/portainer/tags/types'; +import { server } from '@/setup-tests/server'; +import { withTestRouter } from '@/react/test-utils/withRouter'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; import { TagSelector } from './TagSelector'; diff --git a/app/react/components/TagSelector/TagSelector.tsx b/app/react/components/TagSelector/TagSelector.tsx index be53e9490..80726e0a9 100644 --- a/app/react/components/TagSelector/TagSelector.tsx +++ b/app/react/components/TagSelector/TagSelector.tsx @@ -1,12 +1,12 @@ import _ from 'lodash'; -import { TagId } from '@CE/portainer/tags/types'; -import { useCreateTagMutation, useTags } from '@CE/portainer/tags/queries'; +import { TagId } from '@/portainer/tags/types'; +import { useCreateTagMutation, useTags } from '@/portainer/tags/queries'; -import { Creatable, Select } from '@@CE/form-components/ReactSelect'; -import { FormControl } from '@@CE/form-components/FormControl'; -import { Link } from '@@CE/Link'; -import { ArrayError } from '@@CE/form-components/InputList/InputList'; +import { Creatable, Select } from '@@/form-components/ReactSelect'; +import { FormControl } from '@@/form-components/FormControl'; +import { Link } from '@@/Link'; +import { ArrayError } from '@@/form-components/InputList/InputList'; import { TagButton } from '../TagButton'; diff --git a/app/react/components/TeamsSelector/TeamsSelector.mocks.ts b/app/react/components/TeamsSelector/TeamsSelector.mocks.ts index a7ecb072e..477c14522 100644 --- a/app/react/components/TeamsSelector/TeamsSelector.mocks.ts +++ b/app/react/components/TeamsSelector/TeamsSelector.mocks.ts @@ -1,4 +1,4 @@ -import { TeamViewModel } from '@CE/portainer/models/team'; +import { TeamViewModel } from '@/portainer/models/team'; export function createMockTeam(id: number, name: string): TeamViewModel { return { diff --git a/app/react/components/TeamsSelector/TeamsSelector.tsx b/app/react/components/TeamsSelector/TeamsSelector.tsx index d3601cce3..775811471 100644 --- a/app/react/components/TeamsSelector/TeamsSelector.tsx +++ b/app/react/components/TeamsSelector/TeamsSelector.tsx @@ -1,6 +1,6 @@ -import { Team, TeamId } from '@CE/react/portainer/users/teams/types'; +import { Team, TeamId } from '@/react/portainer/users/teams/types'; -import { PortainerSelect } from '@@CE/form-components/PortainerSelect'; +import { PortainerSelect } from '@@/form-components/PortainerSelect'; interface Props { name?: string; diff --git a/app/react/components/TerminalTooltip/TerminalTooltip.tsx b/app/react/components/TerminalTooltip/TerminalTooltip.tsx index 49ea41880..33745cdc9 100644 --- a/app/react/components/TerminalTooltip/TerminalTooltip.tsx +++ b/app/react/components/TerminalTooltip/TerminalTooltip.tsx @@ -1,6 +1,6 @@ -import { BROWSER_OS_PLATFORM } from '@CE/react/constants'; +import { BROWSER_OS_PLATFORM } from '@/react/constants'; -import { Tooltip } from '@@CE/Tip/Tooltip'; +import { Tooltip } from '@@/Tip/Tooltip'; const editorConfig = { mac: { diff --git a/app/react/components/Tip/TextTip/TextTip.tsx b/app/react/components/Tip/TextTip/TextTip.tsx index 006ca1d39..afcace5e6 100644 --- a/app/react/components/Tip/TextTip/TextTip.tsx +++ b/app/react/components/Tip/TextTip/TextTip.tsx @@ -2,7 +2,7 @@ import { ReactNode } from 'react'; import { AlertCircle } from 'lucide-react'; import clsx from 'clsx'; -import { Icon, IconMode } from '@@CE/Icon'; +import { Icon, IconMode } from '@@/Icon'; type Color = 'orange' | 'blue' | 'red' | 'green'; diff --git a/app/react/components/Tip/TooltipWithChildren/TooltipWithChildren.tsx b/app/react/components/Tip/TooltipWithChildren/TooltipWithChildren.tsx index 70aaf5bac..85cbb7ed6 100644 --- a/app/react/components/Tip/TooltipWithChildren/TooltipWithChildren.tsx +++ b/app/react/components/Tip/TooltipWithChildren/TooltipWithChildren.tsx @@ -5,9 +5,9 @@ import _ from 'lodash'; import 'tippy.js/dist/tippy.css'; -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; -import { getFeatureDetails } from '@@CE/BEFeatureIndicator/utils'; +import { getFeatureDetails } from '@@/BEFeatureIndicator/utils'; import styles from './TooltipWithChildren.module.css'; diff --git a/app/react/components/UsersSelector/UsersSelector.mocks.ts b/app/react/components/UsersSelector/UsersSelector.mocks.ts index 3a1792946..d7ae9abbc 100644 --- a/app/react/components/UsersSelector/UsersSelector.mocks.ts +++ b/app/react/components/UsersSelector/UsersSelector.mocks.ts @@ -1,4 +1,4 @@ -import { UserViewModel } from '@CE/portainer/models/user'; +import { UserViewModel } from '@/portainer/models/user'; export function createMockUser(id: number, username: string): UserViewModel { return { diff --git a/app/react/components/UsersSelector/UsersSelector.tsx b/app/react/components/UsersSelector/UsersSelector.tsx index 0c580a50b..99068c205 100644 --- a/app/react/components/UsersSelector/UsersSelector.tsx +++ b/app/react/components/UsersSelector/UsersSelector.tsx @@ -1,6 +1,6 @@ -import { User, UserId } from '@CE/portainer/users/types'; +import { User, UserId } from '@/portainer/users/types'; -import { Select } from '@@CE/form-components/ReactSelect'; +import { Select } from '@@/form-components/ReactSelect'; interface Props { name?: string; diff --git a/app/react/components/WebEditorForm.tsx b/app/react/components/WebEditorForm.tsx index c6576f69b..84c37c0df 100644 --- a/app/react/components/WebEditorForm.tsx +++ b/app/react/components/WebEditorForm.tsx @@ -8,7 +8,7 @@ import { import { useTransitionHook } from '@uirouter/react'; import { JSONSchema7 } from 'json-schema'; -import { CodeEditor } from '@@CE/CodeEditor'; +import { CodeEditor } from '@@/CodeEditor'; import { FormSectionTitle } from './form-components/FormSectionTitle'; import { FormError } from './form-components/FormError'; diff --git a/app/react/components/Widget/WidgetIcon.tsx b/app/react/components/Widget/WidgetIcon.tsx index a4ac698f5..0309d185e 100644 --- a/app/react/components/Widget/WidgetIcon.tsx +++ b/app/react/components/Widget/WidgetIcon.tsx @@ -1,6 +1,6 @@ import { ReactNode } from 'react'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; export function WidgetIcon({ icon }: { icon: ReactNode }) { return ( diff --git a/app/react/components/Widget/WidgetTabs.tsx b/app/react/components/Widget/WidgetTabs.tsx index ac9ebf063..3ff0a08b5 100644 --- a/app/react/components/Widget/WidgetTabs.tsx +++ b/app/react/components/Widget/WidgetTabs.tsx @@ -2,8 +2,8 @@ import { RawParams, useCurrentStateAndParams } from '@uirouter/react'; import clsx from 'clsx'; import { ReactNode } from 'react'; -import { Icon } from '@@CE/Icon'; -import { Link } from '@@CE/Link'; +import { Icon } from '@@/Icon'; +import { Link } from '@@/Link'; export interface Tab { name: ReactNode; diff --git a/app/react/components/buttons/AddButton.test.tsx b/app/react/components/buttons/AddButton.test.tsx index bfcb6bf35..12abb760b 100644 --- a/app/react/components/buttons/AddButton.test.tsx +++ b/app/react/components/buttons/AddButton.test.tsx @@ -1,7 +1,7 @@ import { UIView } from '@uirouter/react'; import { render } from '@testing-library/react'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; +import { withTestRouter } from '@/react/test-utils/withRouter'; import { AddButton } from './AddButton'; diff --git a/app/react/components/buttons/AddButton.tsx b/app/react/components/buttons/AddButton.tsx index 5b9490aab..9891839f8 100644 --- a/app/react/components/buttons/AddButton.tsx +++ b/app/react/components/buttons/AddButton.tsx @@ -1,9 +1,9 @@ import { Plus } from 'lucide-react'; import { ComponentProps, PropsWithChildren } from 'react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { Link } from '@@CE/Link'; +import { Link } from '@@/Link'; import { Button } from './Button'; diff --git a/app/react/components/buttons/Button.tsx b/app/react/components/buttons/Button.tsx index bbd7e0ff8..f53561a9c 100644 --- a/app/react/components/buttons/Button.tsx +++ b/app/react/components/buttons/Button.tsx @@ -8,9 +8,9 @@ import { } from 'react'; import clsx from 'clsx'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; import './Button.css'; type Type = 'submit' | 'button' | 'reset'; diff --git a/app/react/components/buttons/CopyButton/CopyButton.tsx b/app/react/components/buttons/CopyButton/CopyButton.tsx index 041b4b2ac..1be902990 100644 --- a/app/react/components/buttons/CopyButton/CopyButton.tsx +++ b/app/react/components/buttons/CopyButton/CopyButton.tsx @@ -2,9 +2,9 @@ import { ComponentProps, PropsWithChildren } from 'react'; import clsx from 'clsx'; import { Check, Copy } from 'lucide-react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; import { Button } from '../Button'; diff --git a/app/react/components/buttons/DeleteButton.tsx b/app/react/components/buttons/DeleteButton.tsx index 49a94b0c4..3b9edd839 100644 --- a/app/react/components/buttons/DeleteButton.tsx +++ b/app/react/components/buttons/DeleteButton.tsx @@ -1,9 +1,9 @@ import { Trash2 } from 'lucide-react'; import { ComponentProps, PropsWithChildren, ReactNode } from 'react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { confirmDelete } from '@@CE/modals/confirm'; +import { confirmDelete } from '@@/modals/confirm'; import { Button } from './Button'; import { LoadingButton } from './LoadingButton'; diff --git a/app/react/components/buttons/LoadingButton.tsx b/app/react/components/buttons/LoadingButton.tsx index 814477002..e45a54af0 100644 --- a/app/react/components/buttons/LoadingButton.tsx +++ b/app/react/components/buttons/LoadingButton.tsx @@ -1,7 +1,7 @@ import { PropsWithChildren, ReactNode } from 'react'; import { Loader2 } from 'lucide-react'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; import { type Props as ButtonProps, Button } from './Button'; diff --git a/app/react/components/buttons/MenuButton.tsx b/app/react/components/buttons/MenuButton.tsx index a0a1e88d4..d3e67fc7a 100644 --- a/app/react/components/buttons/MenuButton.tsx +++ b/app/react/components/buttons/MenuButton.tsx @@ -9,9 +9,9 @@ import { import clsx from 'clsx'; import { UISrefProps, useSref } from '@uirouter/react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; import { Props as ButtonProps, ButtonWithRef } from './Button'; diff --git a/app/react/components/datatables/ActionsMenu.tsx b/app/react/components/datatables/ActionsMenu.tsx index 9c079a0ad..51edd2410 100644 --- a/app/react/components/datatables/ActionsMenu.tsx +++ b/app/react/components/datatables/ActionsMenu.tsx @@ -3,7 +3,7 @@ import clsx from 'clsx'; import { Menu, MenuList, MenuButton } from '@reach/menu-button'; import { MoreVertical } from 'lucide-react'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; import styles from './ActionsMenu.module.css'; diff --git a/app/react/components/datatables/ColumnVisibilityMenu.tsx b/app/react/components/datatables/ColumnVisibilityMenu.tsx index 12bf335c1..af8a9053c 100644 --- a/app/react/components/datatables/ColumnVisibilityMenu.tsx +++ b/app/react/components/datatables/ColumnVisibilityMenu.tsx @@ -4,7 +4,7 @@ import { Menu, MenuButton, MenuList } from '@reach/menu-button'; import { Columns } from 'lucide-react'; import { Table } from '@tanstack/react-table'; -import { Checkbox } from '@@CE/form-components/Checkbox'; +import { Checkbox } from '@@/form-components/Checkbox'; interface Props { onChange: (value: string[]) => void; diff --git a/app/react/components/datatables/Datatable.tsx b/app/react/components/datatables/Datatable.tsx index 01b9449d7..e4c80051c 100644 --- a/app/react/components/datatables/Datatable.tsx +++ b/app/react/components/datatables/Datatable.tsx @@ -20,9 +20,9 @@ import { ReactNode, useMemo } from 'react'; import clsx from 'clsx'; import _ from 'lodash'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { IconProps } from '@@CE/Icon'; +import { IconProps } from '@@/Icon'; import { DatatableHeader } from './DatatableHeader'; import { DatatableFooter } from './DatatableFooter'; diff --git a/app/react/components/datatables/DatatableContent.tsx b/app/react/components/datatables/DatatableContent.tsx index 4180c4a36..7450782d6 100644 --- a/app/react/components/datatables/DatatableContent.tsx +++ b/app/react/components/datatables/DatatableContent.tsx @@ -1,6 +1,6 @@ import { Row, Table as TableInstance } from '@tanstack/react-table'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; import { Table } from './Table'; import { DefaultType } from './types'; diff --git a/app/react/components/datatables/DatatableFooter.tsx b/app/react/components/datatables/DatatableFooter.tsx index de87adafb..0907ae260 100644 --- a/app/react/components/datatables/DatatableFooter.tsx +++ b/app/react/components/datatables/DatatableFooter.tsx @@ -1,4 +1,4 @@ -import { PaginationControls } from '@@CE/PaginationControls'; +import { PaginationControls } from '@@/PaginationControls'; import { Table } from './Table'; import { SelectedRowsCount } from './SelectedRowsCount'; diff --git a/app/react/components/datatables/DatatableHeader.tsx b/app/react/components/datatables/DatatableHeader.tsx index 6b9e5ea2c..bc0f56763 100644 --- a/app/react/components/datatables/DatatableHeader.tsx +++ b/app/react/components/datatables/DatatableHeader.tsx @@ -1,8 +1,8 @@ import { ReactNode } from 'react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { IconProps } from '@@CE/Icon'; +import { IconProps } from '@@/Icon'; import { SearchBar } from './SearchBar'; import { Table } from './Table'; diff --git a/app/react/components/datatables/Filter.tsx b/app/react/components/datatables/Filter.tsx index 6b1d4c5a7..9b42ca1dc 100644 --- a/app/react/components/datatables/Filter.tsx +++ b/app/react/components/datatables/Filter.tsx @@ -5,9 +5,9 @@ import { Column, Row, TableMeta } from '@tanstack/react-table'; import { Check, Filter } from 'lucide-react'; import _ from 'lodash'; -import { getValueAsArrayOfStrings } from '@CE/portainer/helpers/array'; +import { getValueAsArrayOfStrings } from '@/portainer/helpers/array'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; import { DefaultType } from './types'; diff --git a/app/react/components/datatables/NestedDatatable.tsx b/app/react/components/datatables/NestedDatatable.tsx index f5f6e0bdc..17081e166 100644 --- a/app/react/components/datatables/NestedDatatable.tsx +++ b/app/react/components/datatables/NestedDatatable.tsx @@ -8,7 +8,7 @@ import { useReactTable, } from '@tanstack/react-table'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; import { defaultGetRowId } from './defaultGetRowId'; import { Table } from './Table'; diff --git a/app/react/components/datatables/QuickActionsSettings.tsx b/app/react/components/datatables/QuickActionsSettings.tsx index 60d3ffe23..73acca39e 100644 --- a/app/react/components/datatables/QuickActionsSettings.tsx +++ b/app/react/components/datatables/QuickActionsSettings.tsx @@ -1,9 +1,9 @@ import { SettableQuickActionsTableSettings, QuickAction, -} from '@CE/react/docker/containers/ListView/ContainersDatatable/types'; +} from '@/react/docker/containers/ListView/ContainersDatatable/types'; -import { Checkbox } from '@@CE/form-components/Checkbox'; +import { Checkbox } from '@@/form-components/Checkbox'; import { useTableSettings } from './useTableSettings'; diff --git a/app/react/components/datatables/SearchBar.tsx b/app/react/components/datatables/SearchBar.tsx index dc6ccd656..2042c6522 100644 --- a/app/react/components/datatables/SearchBar.tsx +++ b/app/react/components/datatables/SearchBar.tsx @@ -2,11 +2,11 @@ import { ReactNode } from 'react'; import { Search, X } from 'lucide-react'; import clsx from 'clsx'; -import { useLocalStorage } from '@CE/react/hooks/useLocalStorage'; -import { AutomationTestingProps } from '@CE/types'; -import { useDebounce } from '@CE/react/hooks/useDebounce'; +import { useLocalStorage } from '@/react/hooks/useLocalStorage'; +import { AutomationTestingProps } from '@/types'; +import { useDebounce } from '@/react/hooks/useDebounce'; -import { Button } from '@@CE/buttons'; +import { Button } from '@@/buttons'; interface Props extends AutomationTestingProps { value: string; diff --git a/app/react/components/datatables/SelectedRowsCount.tsx b/app/react/components/datatables/SelectedRowsCount.tsx index e5f3aeaa1..502869148 100644 --- a/app/react/components/datatables/SelectedRowsCount.tsx +++ b/app/react/components/datatables/SelectedRowsCount.tsx @@ -1,4 +1,4 @@ -import { addPlural } from '@CE/react/common/string-utils'; +import { addPlural } from '@/react/common/string-utils'; interface SelectedRowsCountProps { value: number; diff --git a/app/react/components/datatables/Table.tsx b/app/react/components/datatables/Table.tsx index 6f74b8e93..f0444aa2c 100644 --- a/app/react/components/datatables/Table.tsx +++ b/app/react/components/datatables/Table.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import { AriaAttributes, PropsWithChildren } from 'react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; import { TableContainer } from './TableContainer'; import { TableActions } from './TableActions'; diff --git a/app/react/components/datatables/TableContainer.tsx b/app/react/components/datatables/TableContainer.tsx index 38c144c41..537bd6f39 100644 --- a/app/react/components/datatables/TableContainer.tsx +++ b/app/react/components/datatables/TableContainer.tsx @@ -1,6 +1,6 @@ import { PropsWithChildren } from 'react'; -import { Widget, WidgetBody } from '@@CE/Widget'; +import { Widget, WidgetBody } from '@@/Widget'; interface Props { // workaround to remove the widget, ideally we should have a different component to wrap the table with a widget diff --git a/app/react/components/datatables/TableSettingsMenuAutoRefresh.tsx b/app/react/components/datatables/TableSettingsMenuAutoRefresh.tsx index d60c3f2da..a8206f5e2 100644 --- a/app/react/components/datatables/TableSettingsMenuAutoRefresh.tsx +++ b/app/react/components/datatables/TableSettingsMenuAutoRefresh.tsx @@ -2,8 +2,8 @@ import clsx from 'clsx'; import { useState } from 'react'; import { Check } from 'lucide-react'; -import { Checkbox } from '@@CE/form-components/Checkbox'; -import { Icon } from '@@CE/Icon'; +import { Checkbox } from '@@/form-components/Checkbox'; +import { Icon } from '@@/Icon'; import styles from './TableSettingsMenuAutoRefresh.module.css'; diff --git a/app/react/components/datatables/TableTitle.tsx b/app/react/components/datatables/TableTitle.tsx index 307451acd..feaf529bb 100644 --- a/app/react/components/datatables/TableTitle.tsx +++ b/app/react/components/datatables/TableTitle.tsx @@ -1,7 +1,7 @@ import { ComponentType, PropsWithChildren, ReactNode } from 'react'; import clsx from 'clsx'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; interface Props { icon?: ReactNode | ComponentType; diff --git a/app/react/components/datatables/buildNameColumn.tsx b/app/react/components/datatables/buildNameColumn.tsx index 24316f00e..c159b1587 100644 --- a/app/react/components/datatables/buildNameColumn.tsx +++ b/app/react/components/datatables/buildNameColumn.tsx @@ -1,7 +1,7 @@ import { ColumnDef, CellContext } from '@tanstack/react-table'; import { UISrefProps } from '@uirouter/react'; -import { Link } from '@@CE/Link'; +import { Link } from '@@/Link'; import { DefaultType } from './types'; import { defaultGetRowId } from './defaultGetRowId'; diff --git a/app/react/components/datatables/extend-options/withColumnFilters.ts b/app/react/components/datatables/extend-options/withColumnFilters.ts index 7ba407592..a55705bd5 100644 --- a/app/react/components/datatables/extend-options/withColumnFilters.ts +++ b/app/react/components/datatables/extend-options/withColumnFilters.ts @@ -1,6 +1,6 @@ import { ColumnFiltersState, TableOptions } from '@tanstack/react-table'; -import { applySetStateAction } from '@CE/react-tools/apply-set-state-action'; +import { applySetStateAction } from '@/react-tools/apply-set-state-action'; import { DefaultType } from '../types'; diff --git a/app/react/components/datatables/select-column.tsx b/app/react/components/datatables/select-column.tsx index a8b84650e..2e4a04272 100644 --- a/app/react/components/datatables/select-column.tsx +++ b/app/react/components/datatables/select-column.tsx @@ -1,6 +1,6 @@ import { ColumnDef, Row, Table } from '@tanstack/react-table'; -import { Checkbox } from '@@CE/form-components/Checkbox'; +import { Checkbox } from '@@/form-components/Checkbox'; function allRowsSelected(table: Table) { const { rows } = table.getCoreRowModel(); diff --git a/app/react/components/datatables/types.ts b/app/react/components/datatables/types.ts index 2ff1c329a..aecc23a18 100644 --- a/app/react/components/datatables/types.ts +++ b/app/react/components/datatables/types.ts @@ -2,7 +2,7 @@ import { createStore } from 'zustand'; import { persist } from 'zustand/middleware'; import { ColumnFiltersState } from '@tanstack/react-table'; -import { keyBuilder } from '@CE/react/hooks/useLocalStorage'; +import { keyBuilder } from '@/react/hooks/useLocalStorage'; export type DefaultType = object; diff --git a/app/react/components/form-components/AutocompleteSelect/AutocompleteSelect.tsx b/app/react/components/form-components/AutocompleteSelect/AutocompleteSelect.tsx index 14c6d4194..8586fe617 100644 --- a/app/react/components/form-components/AutocompleteSelect/AutocompleteSelect.tsx +++ b/app/react/components/form-components/AutocompleteSelect/AutocompleteSelect.tsx @@ -10,10 +10,10 @@ import { } from '@reach/combobox'; import clsx from 'clsx'; -import { useDebounce } from '@CE/react/hooks/useDebounce'; -import { AutomationTestingProps } from '@CE/types'; +import { useDebounce } from '@/react/hooks/useDebounce'; +import { AutomationTestingProps } from '@/types'; -import { Option } from '@@CE/form-components/PortainerSelect'; +import { Option } from '@@/form-components/PortainerSelect'; import styles from './AutocompleteSelect.module.css'; diff --git a/app/react/components/form-components/ButtonSelector/ButtonSelector.tsx b/app/react/components/form-components/ButtonSelector/ButtonSelector.tsx index 5f32192c7..3974fd892 100644 --- a/app/react/components/form-components/ButtonSelector/ButtonSelector.tsx +++ b/app/react/components/form-components/ButtonSelector/ButtonSelector.tsx @@ -1,10 +1,10 @@ import clsx from 'clsx'; import { ComponentProps, PropsWithChildren, ReactNode } from 'react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { ButtonGroup, Size } from '@@CE/buttons/ButtonGroup'; -import { Button } from '@@CE/buttons'; +import { ButtonGroup, Size } from '@@/buttons/ButtonGroup'; +import { Button } from '@@/buttons'; import styles from './ButtonSelector.module.css'; diff --git a/app/react/components/form-components/EnvironmentVariablesFieldset/AdvancedMode.tsx b/app/react/components/form-components/EnvironmentVariablesFieldset/AdvancedMode.tsx index 86c276d63..54bc3e691 100644 --- a/app/react/components/form-components/EnvironmentVariablesFieldset/AdvancedMode.tsx +++ b/app/react/components/form-components/EnvironmentVariablesFieldset/AdvancedMode.tsx @@ -1,10 +1,10 @@ import { List } from 'lucide-react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { CodeEditor } from '@@CE/CodeEditor'; -import { TextTip } from '@@CE/Tip/TextTip'; -import { Button } from '@@CE/buttons'; +import { CodeEditor } from '@@/CodeEditor'; +import { TextTip } from '@@/Tip/TextTip'; +import { Button } from '@@/buttons'; import { convertToArrayOfStrings, parseDotEnvFile } from './utils'; import { type Values } from './types'; diff --git a/app/react/components/form-components/EnvironmentVariablesFieldset/EnvironmentVariablesPanel.tsx b/app/react/components/form-components/EnvironmentVariablesFieldset/EnvironmentVariablesPanel.tsx index 129a3d8fe..74d8ba25b 100644 --- a/app/react/components/form-components/EnvironmentVariablesFieldset/EnvironmentVariablesPanel.tsx +++ b/app/react/components/form-components/EnvironmentVariablesFieldset/EnvironmentVariablesPanel.tsx @@ -1,7 +1,7 @@ import React, { ComponentProps } from 'react'; -import { FormSection } from '@@CE/form-components/FormSection'; -import { TextTip } from '@@CE/Tip/TextTip'; +import { FormSection } from '@@/form-components/FormSection'; +import { TextTip } from '@@/Tip/TextTip'; import { EnvironmentVariablesFieldset } from './EnvironmentVariablesFieldset'; diff --git a/app/react/components/form-components/EnvironmentVariablesFieldset/SimpleMode.tsx b/app/react/components/form-components/EnvironmentVariablesFieldset/SimpleMode.tsx index a7b621f54..08db41a2b 100644 --- a/app/react/components/form-components/EnvironmentVariablesFieldset/SimpleMode.tsx +++ b/app/react/components/form-components/EnvironmentVariablesFieldset/SimpleMode.tsx @@ -1,13 +1,13 @@ import { Edit, Plus } from 'lucide-react'; import { useState } from 'react'; -import { readFileAsText } from '@CE/portainer/services/fileUploadReact'; +import { readFileAsText } from '@/portainer/services/fileUploadReact'; -import { Button } from '@@CE/buttons'; -import { TextTip } from '@@CE/Tip/TextTip'; -import { FileUploadField } from '@@CE/form-components/FileUpload'; -import { InputList } from '@@CE/form-components/InputList'; -import { ArrayError } from '@@CE/form-components/InputList/InputList'; +import { Button } from '@@/buttons'; +import { TextTip } from '@@/Tip/TextTip'; +import { FileUploadField } from '@@/form-components/FileUpload'; +import { InputList } from '@@/form-components/InputList'; +import { ArrayError } from '@@/form-components/InputList/InputList'; import type { Values } from './types'; import { parseDotEnvFile } from './utils'; diff --git a/app/react/components/form-components/EnvironmentVariablesFieldset/StackEnvironmentVariablesPanel.tsx b/app/react/components/form-components/EnvironmentVariablesFieldset/StackEnvironmentVariablesPanel.tsx index d050d4b03..36c412718 100644 --- a/app/react/components/form-components/EnvironmentVariablesFieldset/StackEnvironmentVariablesPanel.tsx +++ b/app/react/components/form-components/EnvironmentVariablesFieldset/StackEnvironmentVariablesPanel.tsx @@ -1,7 +1,7 @@ import { ComponentProps } from 'react'; -import { Alert } from '@@CE/Alert'; -import { useDocsUrl } from '@@CE/PageHeader/ContextHelp'; +import { Alert } from '@@/Alert'; +import { useDocsUrl } from '@@/PageHeader/ContextHelp'; import { EnvironmentVariablesFieldset } from './EnvironmentVariablesFieldset'; import { EnvironmentVariablesPanel } from './EnvironmentVariablesPanel'; diff --git a/app/react/components/form-components/FileUpload/FileUploadField.tsx b/app/react/components/form-components/FileUpload/FileUploadField.tsx index 0d0148966..0122ee16b 100644 --- a/app/react/components/form-components/FileUpload/FileUploadField.tsx +++ b/app/react/components/form-components/FileUpload/FileUploadField.tsx @@ -1,10 +1,10 @@ import { ChangeEvent, ComponentProps, createRef } from 'react'; import { Upload, XCircle } from 'lucide-react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { Button } from '@@CE/buttons'; -import { Icon } from '@@CE/Icon'; +import { Button } from '@@/buttons'; +import { Icon } from '@@/Icon'; import styles from './FileUploadField.module.css'; diff --git a/app/react/components/form-components/FileUpload/FileUploadForm.tsx b/app/react/components/form-components/FileUpload/FileUploadForm.tsx index cf28188ae..50185abee 100644 --- a/app/react/components/form-components/FileUpload/FileUploadForm.tsx +++ b/app/react/components/form-components/FileUpload/FileUploadForm.tsx @@ -1,9 +1,9 @@ import { PropsWithChildren, ReactNode } from 'react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { FormSectionTitle } from '@@CE/form-components/FormSectionTitle'; -import { FileUploadField } from '@@CE/form-components/FileUpload/FileUploadField'; +import { FormSectionTitle } from '@@/form-components/FormSectionTitle'; +import { FileUploadField } from '@@/form-components/FileUpload/FileUploadField'; export interface Props { onChange(value?: File): void; diff --git a/app/react/components/form-components/FormActions.tsx b/app/react/components/form-components/FormActions.tsx index 3a090f045..9bfce6964 100644 --- a/app/react/components/form-components/FormActions.tsx +++ b/app/react/components/form-components/FormActions.tsx @@ -1,8 +1,8 @@ import { ComponentProps, PropsWithChildren } from 'react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { LoadingButton } from '@@CE/buttons'; +import { LoadingButton } from '@@/buttons'; import { FormSection } from './FormSection'; diff --git a/app/react/components/form-components/FormControl/FormControl.tsx b/app/react/components/form-components/FormControl/FormControl.tsx index 37394be71..7c7151dd6 100644 --- a/app/react/components/form-components/FormControl/FormControl.tsx +++ b/app/react/components/form-components/FormControl/FormControl.tsx @@ -1,8 +1,8 @@ import { PropsWithChildren, ReactNode } from 'react'; import clsx from 'clsx'; -import { Tooltip } from '@@CE/Tip/Tooltip'; -import { InlineLoader } from '@@CE/InlineLoader'; +import { Tooltip } from '@@/Tip/Tooltip'; +import { InlineLoader } from '@@/InlineLoader'; import { FormError } from '../FormError'; diff --git a/app/react/components/form-components/FormError.tsx b/app/react/components/form-components/FormError.tsx index e6dc3d71a..1b638a07a 100644 --- a/app/react/components/form-components/FormError.tsx +++ b/app/react/components/form-components/FormError.tsx @@ -2,7 +2,7 @@ import { PropsWithChildren } from 'react'; import clsx from 'clsx'; import { AlertTriangle } from 'lucide-react'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; interface Props { className?: string; diff --git a/app/react/components/form-components/FormSection/FormSection.tsx b/app/react/components/form-components/FormSection/FormSection.tsx index 3fd54a5cf..51dbab534 100644 --- a/app/react/components/form-components/FormSection/FormSection.tsx +++ b/app/react/components/form-components/FormSection/FormSection.tsx @@ -1,6 +1,6 @@ import { PropsWithChildren, ReactNode, useState } from 'react'; -import { CollapseExpandButton } from '@@CE/CollapseExpandButton'; +import { CollapseExpandButton } from '@@/CollapseExpandButton'; import { FormSectionTitle } from '../FormSectionTitle'; diff --git a/app/react/components/form-components/Input/Input.tsx b/app/react/components/form-components/Input/Input.tsx index 78f119a55..670c6a4aa 100644 --- a/app/react/components/form-components/Input/Input.tsx +++ b/app/react/components/form-components/Input/Input.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import { forwardRef, InputHTMLAttributes, Ref } from 'react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; export const InputWithRef = forwardRef< HTMLInputElement, diff --git a/app/react/components/form-components/Input/InputLabeled.tsx b/app/react/components/form-components/Input/InputLabeled.tsx index 1db1b5d78..23406f526 100644 --- a/app/react/components/form-components/Input/InputLabeled.tsx +++ b/app/react/components/form-components/Input/InputLabeled.tsx @@ -1,7 +1,7 @@ import { ComponentProps, InputHTMLAttributes } from 'react'; import clsx from 'clsx'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; import { InputGroup } from '../InputGroup'; diff --git a/app/react/components/form-components/Input/Select.tsx b/app/react/components/form-components/Input/Select.tsx index cc22cf032..1ba85fadf 100644 --- a/app/react/components/form-components/Input/Select.tsx +++ b/app/react/components/form-components/Input/Select.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import { SelectHTMLAttributes } from 'react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; export interface Option extends Partial { diff --git a/app/react/components/form-components/Input/Textarea.tsx b/app/react/components/form-components/Input/Textarea.tsx index 672b83b58..b532bbd69 100644 --- a/app/react/components/form-components/Input/Textarea.tsx +++ b/app/react/components/form-components/Input/Textarea.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import { TextareaHTMLAttributes } from 'react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; export function TextArea({ className, diff --git a/app/react/components/form-components/InputList/InputList.tsx b/app/react/components/form-components/InputList/InputList.tsx index e0e473cfa..6b6a4551c 100644 --- a/app/react/components/form-components/InputList/InputList.tsx +++ b/app/react/components/form-components/InputList/InputList.tsx @@ -3,11 +3,11 @@ import { FormikErrors } from 'formik'; import { ArrowDown, ArrowUp, Plus, RotateCw, Trash2 } from 'lucide-react'; import clsx from 'clsx'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { Button } from '@@CE/buttons'; -import { Tooltip } from '@@CE/Tip/Tooltip'; -import { TextTip } from '@@CE/Tip/TextTip'; +import { Button } from '@@/buttons'; +import { Tooltip } from '@@/Tip/Tooltip'; +import { TextTip } from '@@/Tip/TextTip'; import { Input } from '../Input'; import { FormError } from '../FormError'; diff --git a/app/react/components/form-components/PortainerSelect.tsx b/app/react/components/form-components/PortainerSelect.tsx index 58eb0fc46..483dae415 100644 --- a/app/react/components/form-components/PortainerSelect.tsx +++ b/app/react/components/form-components/PortainerSelect.tsx @@ -8,12 +8,12 @@ import { import _ from 'lodash'; import { FilterOptionOption } from 'react-select/dist/declarations/src/filters'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; import { Creatable, Select as ReactSelect, -} from '@@CE/form-components/ReactSelect'; +} from '@@/form-components/ReactSelect'; export interface Option { value: TValue; diff --git a/app/react/components/form-components/ReactSelect.test.tsx b/app/react/components/form-components/ReactSelect.test.tsx index 1b1e8d786..d5368b53e 100644 --- a/app/react/components/form-components/ReactSelect.test.tsx +++ b/app/react/components/form-components/ReactSelect.test.tsx @@ -2,7 +2,7 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { vi } from 'vitest'; -import selectEvent from '@CE/react/test-utils/react-select'; +import selectEvent from '@/react/test-utils/react-select'; import { Select } from './ReactSelect'; diff --git a/app/react/components/form-components/ReactSelect.tsx b/app/react/components/form-components/ReactSelect.tsx index 0e2b7e547..73d76ec6d 100644 --- a/app/react/components/form-components/ReactSelect.tsx +++ b/app/react/components/form-components/ReactSelect.tsx @@ -17,7 +17,7 @@ import { RefAttributes, useMemo, useCallback } from 'react'; import ReactSelectType from 'react-select/dist/declarations/src/Select'; import './ReactSelect.css'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; const PAGE_SIZE = 100; const MAX_OPTIONS_WITHOUT_PAGINATION = 1000; diff --git a/app/react/components/form-components/Slider/Slider.tsx b/app/react/components/form-components/Slider/Slider.tsx index 81627a468..8d75f5b57 100644 --- a/app/react/components/form-components/Slider/Slider.tsx +++ b/app/react/components/form-components/Slider/Slider.tsx @@ -2,7 +2,7 @@ import { ReactElement } from 'react'; import RcSlider from 'rc-slider'; import { HandleProps } from 'rc-slider/lib/Handles/Handle'; -import { SliderTooltip } from '@@CE/Tip/SliderTooltip'; +import { SliderTooltip } from '@@/Tip/SliderTooltip'; import styles from './Slider.module.css'; diff --git a/app/react/components/form-components/SwitchField/Switch.tsx b/app/react/components/form-components/SwitchField/Switch.tsx index 60f2cfe41..1a6ae26a2 100644 --- a/app/react/components/form-components/SwitchField/Switch.tsx +++ b/app/react/components/form-components/SwitchField/Switch.tsx @@ -1,10 +1,10 @@ import clsx from 'clsx'; -import { isLimitedToBE } from '@CE/react/portainer/feature-flags/feature-flags.service'; -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; -import { AutomationTestingProps } from '@CE/types'; +import { isLimitedToBE } from '@/react/portainer/feature-flags/feature-flags.service'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; +import { AutomationTestingProps } from '@/types'; -import { BEFeatureIndicator } from '@@CE/BEFeatureIndicator'; +import { BEFeatureIndicator } from '@@/BEFeatureIndicator'; import './Switch.css'; diff --git a/app/react/components/form-components/SwitchField/SwitchField.tsx b/app/react/components/form-components/SwitchField/SwitchField.tsx index cfa2e971d..935a651d6 100644 --- a/app/react/components/form-components/SwitchField/SwitchField.tsx +++ b/app/react/components/form-components/SwitchField/SwitchField.tsx @@ -2,10 +2,10 @@ import clsx from 'clsx'; import uuid from 'uuid'; import { ComponentProps, PropsWithChildren, ReactNode, useState } from 'react'; -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; -import { AutomationTestingProps } from '@CE/types'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; +import { AutomationTestingProps } from '@/types'; -import { Tooltip } from '@@CE/Tip/Tooltip'; +import { Tooltip } from '@@/Tip/Tooltip'; import styles from './SwitchField.module.css'; import { Switch } from './Switch'; diff --git a/app/react/components/modals/Dialog.tsx b/app/react/components/modals/Dialog.tsx index 42f41367b..d5552a935 100644 --- a/app/react/components/modals/Dialog.tsx +++ b/app/react/components/modals/Dialog.tsx @@ -1,6 +1,6 @@ import { ReactNode, useEffect, useState, useRef } from 'react'; -import { Button } from '@@CE/buttons'; +import { Button } from '@@/buttons'; import { ButtonOptions, ModalType } from './types'; import { openModal } from './open-modal'; diff --git a/app/react/components/modals/SwitchPrompt.tsx b/app/react/components/modals/SwitchPrompt.tsx index c6076cbf6..c00523aee 100644 --- a/app/react/components/modals/SwitchPrompt.tsx +++ b/app/react/components/modals/SwitchPrompt.tsx @@ -1,8 +1,8 @@ import { ReactNode, useState } from 'react'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { SwitchField } from '@@CE/form-components/SwitchField'; +import { SwitchField } from '@@/form-components/SwitchField'; import { ModalType, type ButtonOptions } from './types'; import { openModal } from './open-modal'; diff --git a/app/react/components/modals/types.ts b/app/react/components/modals/types.ts index c229c0a71..bdf3012c2 100644 --- a/app/react/components/modals/types.ts +++ b/app/react/components/modals/types.ts @@ -1,6 +1,6 @@ import { ComponentProps } from 'react'; -import { Button } from '@@CE/buttons'; +import { Button } from '@@/buttons'; export interface ButtonOptions { label: string; diff --git a/app/react/components/modals/utils.ts b/app/react/components/modals/utils.ts index 149a07384..00ac3b694 100644 --- a/app/react/components/modals/utils.ts +++ b/app/react/components/modals/utils.ts @@ -1,6 +1,6 @@ import { ComponentProps } from 'react'; -import { Button } from '@@CE/buttons'; +import { Button } from '@@/buttons'; import { ButtonOptions } from './types'; diff --git a/app/react/components/ui-router.test.tsx b/app/react/components/ui-router.test.tsx index 0d7511d3c..78e9cc388 100644 --- a/app/react/components/ui-router.test.tsx +++ b/app/react/components/ui-router.test.tsx @@ -1,7 +1,7 @@ import { UISref, UIView } from '@uirouter/react'; import { render, screen } from '@testing-library/react'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; +import { withTestRouter } from '@/react/test-utils/withRouter'; function RelativePathLink() { return ( diff --git a/app/react/docker/DashboardView/ClusterAgentInfo.tsx b/app/react/docker/DashboardView/ClusterAgentInfo.tsx index 6550c2409..5d647255d 100644 --- a/app/react/docker/DashboardView/ClusterAgentInfo.tsx +++ b/app/react/docker/DashboardView/ClusterAgentInfo.tsx @@ -1,9 +1,9 @@ import { GaugeIcon } from 'lucide-react'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import { Widget } from '@@CE/Widget'; -import { DetailsTable } from '@@CE/DetailsTable'; +import { Widget } from '@@/Widget'; +import { DetailsTable } from '@@/DetailsTable'; import { useAgentNodes } from '../agent/queries/useAgentNodes'; import { useApiVersion } from '../agent/queries/useApiVersion'; diff --git a/app/react/docker/DashboardView/ClusterVisualizerLink.tsx b/app/react/docker/DashboardView/ClusterVisualizerLink.tsx index b393492ad..219e774ec 100644 --- a/app/react/docker/DashboardView/ClusterVisualizerLink.tsx +++ b/app/react/docker/DashboardView/ClusterVisualizerLink.tsx @@ -1,7 +1,7 @@ import { TrelloIcon } from 'lucide-react'; -import { Link } from '@@CE/Link'; -import { Button } from '@@CE/buttons'; +import { Link } from '@@/Link'; +import { Button } from '@@/buttons'; export function ClusterVisualizerLink() { return ( diff --git a/app/react/docker/DashboardView/ContainerStatus.tsx b/app/react/docker/DashboardView/ContainerStatus.tsx index 0278f360c..2c22bd181 100644 --- a/app/react/docker/DashboardView/ContainerStatus.tsx +++ b/app/react/docker/DashboardView/ContainerStatus.tsx @@ -1,6 +1,6 @@ import { Heart, Power } from 'lucide-react'; -import { Icon } from '@CE/react/components/Icon'; +import { Icon } from '@/react/components/Icon'; interface Props { stats: { diff --git a/app/react/docker/DashboardView/DashboardView.tsx b/app/react/docker/DashboardView/DashboardView.tsx index be580590d..e8afb0dbf 100644 --- a/app/react/docker/DashboardView/DashboardView.tsx +++ b/app/react/docker/DashboardView/DashboardView.tsx @@ -8,14 +8,14 @@ import { ShuffleIcon, } from 'lucide-react'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { isAgentEnvironment } from '@CE/react/portainer/environments/utils'; -import { useCurrentEnvironment } from '@CE/react/hooks/useCurrentEnvironment'; -import { useIsEnvironmentAdmin } from '@CE/react/hooks/useUser'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { isAgentEnvironment } from '@/react/portainer/environments/utils'; +import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment'; +import { useIsEnvironmentAdmin } from '@/react/hooks/useUser'; -import { PageHeader } from '@@CE/PageHeader'; -import { DashboardGrid } from '@@CE/DashboardItem/DashboardGrid'; -import { DashboardItem } from '@@CE/DashboardItem'; +import { PageHeader } from '@@/PageHeader'; +import { DashboardGrid } from '@@/DashboardItem/DashboardGrid'; +import { DashboardItem } from '@@/DashboardItem'; import { useIsSwarm, useIsSwarmManager } from '../proxy/queries/useInfo'; diff --git a/app/react/docker/DashboardView/EnvironmentInfo.DockerInfo.tsx b/app/react/docker/DashboardView/EnvironmentInfo.DockerInfo.tsx index cada17571..7ea5183a3 100644 --- a/app/react/docker/DashboardView/EnvironmentInfo.DockerInfo.tsx +++ b/app/react/docker/DashboardView/EnvironmentInfo.DockerInfo.tsx @@ -1,10 +1,10 @@ import { ZapIcon } from 'lucide-react'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { getDockerEnvironmentType } from '@CE/react/portainer/environments/utils/getDockerEnvironmentType'; -import { useIsPodman } from '@CE/react/portainer/environments/queries/useIsPodman'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { getDockerEnvironmentType } from '@/react/portainer/environments/utils/getDockerEnvironmentType'; +import { useIsPodman } from '@/react/portainer/environments/queries/useIsPodman'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; import { useInfo } from '../proxy/queries/useInfo'; diff --git a/app/react/docker/DashboardView/EnvironmentInfo.GpuInfo.tsx b/app/react/docker/DashboardView/EnvironmentInfo.GpuInfo.tsx index a94bce810..fe4470889 100644 --- a/app/react/docker/DashboardView/EnvironmentInfo.GpuInfo.tsx +++ b/app/react/docker/DashboardView/EnvironmentInfo.GpuInfo.tsx @@ -1,4 +1,4 @@ -import { DetailsTable } from '@@CE/DetailsTable'; +import { DetailsTable } from '@@/DetailsTable'; import { DockerSnapshot } from '../snapshots/types'; diff --git a/app/react/docker/DashboardView/EnvironmentInfo.SnapshotStats.tsx b/app/react/docker/DashboardView/EnvironmentInfo.SnapshotStats.tsx index f4653ba9f..596637720 100644 --- a/app/react/docker/DashboardView/EnvironmentInfo.SnapshotStats.tsx +++ b/app/react/docker/DashboardView/EnvironmentInfo.SnapshotStats.tsx @@ -1,9 +1,9 @@ import { CpuIcon } from 'lucide-react'; -import { humanize } from '@CE/portainer/filters/filters'; -import memoryIcon from '@CE/assets/ico/memory.svg?c'; +import { humanize } from '@/portainer/filters/filters'; +import memoryIcon from '@/assets/ico/memory.svg?c'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; import { DockerSnapshot } from '../snapshots/types'; diff --git a/app/react/docker/DashboardView/EnvironmentInfo.TagsInfo.tsx b/app/react/docker/DashboardView/EnvironmentInfo.TagsInfo.tsx index e32cdca59..659d350a7 100644 --- a/app/react/docker/DashboardView/EnvironmentInfo.TagsInfo.tsx +++ b/app/react/docker/DashboardView/EnvironmentInfo.TagsInfo.tsx @@ -1,8 +1,8 @@ import _ from 'lodash'; -import { useTags } from '@CE/portainer/tags/queries'; +import { useTags } from '@/portainer/tags/queries'; -import { DetailsTable } from '@@CE/DetailsTable'; +import { DetailsTable } from '@@/DetailsTable'; export function TagsInfo({ ids }: { ids: number[] }) { const tagsQuery = useTags(); diff --git a/app/react/docker/DashboardView/EnvironmentInfo.tsx b/app/react/docker/DashboardView/EnvironmentInfo.tsx index 62b50fdc0..e3bab5d3c 100644 --- a/app/react/docker/DashboardView/EnvironmentInfo.tsx +++ b/app/react/docker/DashboardView/EnvironmentInfo.tsx @@ -1,15 +1,15 @@ import { GaugeIcon } from 'lucide-react'; -import { useCurrentEnvironment } from '@CE/react/hooks/useCurrentEnvironment'; -import { stripProtocol } from '@CE/portainer/filters/filters'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment'; +import { stripProtocol } from '@/portainer/filters/filters'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; import { isAgentEnvironment, isEdgeEnvironment, -} from '@CE/react/portainer/environments/utils'; +} from '@/react/portainer/environments/utils'; -import { DetailsTable } from '@@CE/DetailsTable'; -import { Widget } from '@@CE/Widget'; +import { DetailsTable } from '@@/DetailsTable'; +import { Widget } from '@@/Widget'; import { useIsSwarmManager } from '../proxy/queries/useInfo'; diff --git a/app/react/docker/DashboardView/ImagesTotalSize.tsx b/app/react/docker/DashboardView/ImagesTotalSize.tsx index 42b029d80..63f99db61 100644 --- a/app/react/docker/DashboardView/ImagesTotalSize.tsx +++ b/app/react/docker/DashboardView/ImagesTotalSize.tsx @@ -1,8 +1,8 @@ import clsx from 'clsx'; import { PieChart } from 'lucide-react'; -import { Icon } from '@CE/react/components/Icon'; -import { humanize } from '@CE/portainer/filters/filters'; +import { Icon } from '@/react/components/Icon'; +import { humanize } from '@/portainer/filters/filters'; interface Props { imagesTotalSize: number; diff --git a/app/react/docker/DashboardView/NonAgentSwarmInfo.tsx b/app/react/docker/DashboardView/NonAgentSwarmInfo.tsx index a06c4d8d9..553b16017 100644 --- a/app/react/docker/DashboardView/NonAgentSwarmInfo.tsx +++ b/app/react/docker/DashboardView/NonAgentSwarmInfo.tsx @@ -1,9 +1,9 @@ -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { useInfoPanelState } from '@CE/react/hooks/useInfoPanelState'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { useInfoPanelState } from '@/react/hooks/useInfoPanelState'; -import { InformationPanel } from '@@CE/InformationPanel'; -import { TextTip } from '@@CE/Tip/TextTip'; -import { HelpLink } from '@@CE/HelpLink'; +import { InformationPanel } from '@@/InformationPanel'; +import { TextTip } from '@@/Tip/TextTip'; +import { HelpLink } from '@@/HelpLink'; import { useInfo } from '../proxy/queries/useInfo'; diff --git a/app/react/docker/DashboardView/useDashboard.ts b/app/react/docker/DashboardView/useDashboard.ts index a6db206f9..dd5719e1f 100644 --- a/app/react/docker/DashboardView/useDashboard.ts +++ b/app/react/docker/DashboardView/useDashboard.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys } from '../queries/utils'; import { buildDockerUrl } from '../queries/utils/buildDockerUrl'; diff --git a/app/react/docker/agent/NodeSelector.tsx b/app/react/docker/agent/NodeSelector.tsx index e1f568127..46e6fbbc9 100644 --- a/app/react/docker/agent/NodeSelector.tsx +++ b/app/react/docker/agent/NodeSelector.tsx @@ -1,10 +1,10 @@ import { useEffect } from 'react'; import { FormikErrors } from 'formik'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import { Option, PortainerSelect } from '@@CE/form-components/PortainerSelect'; -import { FormControl } from '@@CE/form-components/FormControl'; +import { Option, PortainerSelect } from '@@/form-components/PortainerSelect'; +import { FormControl } from '@@/form-components/FormControl'; import { useApiVersion } from './queries/useApiVersion'; import { useAgentNodes } from './queries/useAgentNodes'; diff --git a/app/react/docker/agent/queries/build-url.ts b/app/react/docker/agent/queries/build-url.ts index 0ab344eb2..6121497fc 100644 --- a/app/react/docker/agent/queries/build-url.ts +++ b/app/react/docker/agent/queries/build-url.ts @@ -1,4 +1,4 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; export function buildAgentUrl( environmentId: EnvironmentId, diff --git a/app/react/docker/agent/queries/useAgentNodes.ts b/app/react/docker/agent/queries/useAgentNodes.ts index d3bf77576..4acae6a98 100644 --- a/app/react/docker/agent/queries/useAgentNodes.ts +++ b/app/react/docker/agent/queries/useAgentNodes.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildAgentUrl } from './build-url'; diff --git a/app/react/docker/agent/queries/useApiVersion.ts b/app/react/docker/agent/queries/useApiVersion.ts index d34bc284e..0c971e40a 100644 --- a/app/react/docker/agent/queries/useApiVersion.ts +++ b/app/react/docker/agent/queries/useApiVersion.ts @@ -3,8 +3,8 @@ import { useQuery } from '@tanstack/react-query'; import axios, { isAxiosError, parseAxiosError, -} from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +} from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/components/FilesTable/FilesTable.tsx b/app/react/docker/components/FilesTable/FilesTable.tsx index 864f55831..4ffbcbdfa 100644 --- a/app/react/docker/components/FilesTable/FilesTable.tsx +++ b/app/react/docker/components/FilesTable/FilesTable.tsx @@ -1,14 +1,14 @@ import { CornerLeftUp, File as FileIcon, Upload } from 'lucide-react'; import { useState } from 'react'; -import { Authorized } from '@CE/react/hooks/useUser'; +import { Authorized } from '@/react/hooks/useUser'; -import { Datatable } from '@@CE/datatables'; -import { BasicTableSettings } from '@@CE/datatables/types'; -import { Button } from '@@CE/buttons'; -import { TableState } from '@@CE/datatables/useTableState'; -import { withMeta } from '@@CE/datatables/extend-options/withMeta'; -import { mergeOptions } from '@@CE/datatables/extend-options/mergeOptions'; +import { Datatable } from '@@/datatables'; +import { BasicTableSettings } from '@@/datatables/types'; +import { Button } from '@@/buttons'; +import { TableState } from '@@/datatables/useTableState'; +import { withMeta } from '@@/datatables/extend-options/withMeta'; +import { mergeOptions } from '@@/datatables/extend-options/mergeOptions'; import { FileData } from './types'; import { columns } from './columns'; diff --git a/app/react/docker/components/FilesTable/columns/ActionsCell.tsx b/app/react/docker/components/FilesTable/columns/ActionsCell.tsx index bc9ad9b16..1e635c8ee 100644 --- a/app/react/docker/components/FilesTable/columns/ActionsCell.tsx +++ b/app/react/docker/components/FilesTable/columns/ActionsCell.tsx @@ -1,9 +1,9 @@ import { CellContext } from '@tanstack/react-table'; import { Download, Edit, Trash2 } from 'lucide-react'; -import { Authorized } from '@CE/react/hooks/useUser'; +import { Authorized } from '@/react/hooks/useUser'; -import { Button } from '@@CE/buttons'; +import { Button } from '@@/buttons'; import { FileData, isFilesTableMeta } from '../types'; diff --git a/app/react/docker/components/FilesTable/columns/NameCell.tsx b/app/react/docker/components/FilesTable/columns/NameCell.tsx index 8956bfba1..33742b33e 100644 --- a/app/react/docker/components/FilesTable/columns/NameCell.tsx +++ b/app/react/docker/components/FilesTable/columns/NameCell.tsx @@ -2,9 +2,9 @@ import { CellContext } from '@tanstack/react-table'; import { Check, File as FileIcon, Folder, X } from 'lucide-react'; import { Form, Formik } from 'formik'; -import { Icon } from '@@CE/Icon'; -import { Button } from '@@CE/buttons'; -import { Input } from '@@CE/form-components/Input'; +import { Icon } from '@@/Icon'; +import { Button } from '@@/buttons'; +import { Input } from '@@/form-components/Input'; import { FileData, isFilesTableMeta } from '../types'; diff --git a/app/react/docker/components/FilesTable/columns/index.ts b/app/react/docker/components/FilesTable/columns/index.ts index 9e6de9b92..79d6852e3 100644 --- a/app/react/docker/components/FilesTable/columns/index.ts +++ b/app/react/docker/components/FilesTable/columns/index.ts @@ -4,7 +4,7 @@ import { ColumnDefTemplate, } from '@tanstack/react-table'; -import { humanize, isoDateFromTimestamp } from '@CE/portainer/filters/filters'; +import { humanize, isoDateFromTimestamp } from '@/portainer/filters/filters'; import { FileData } from '../types'; diff --git a/app/react/docker/components/ImageStatus/ImageStatus.tsx b/app/react/docker/components/ImageStatus/ImageStatus.tsx index e8e0a27f5..1c36c13bb 100644 --- a/app/react/docker/components/ImageStatus/ImageStatus.tsx +++ b/app/react/docker/components/ImageStatus/ImageStatus.tsx @@ -1,11 +1,11 @@ import { Loader } from 'lucide-react'; -import { useEnvironment } from '@CE/react/portainer/environments/queries'; -import { statusIcon } from '@CE/react/docker/components/ImageStatus/helpers'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { isBE } from '@CE/react/portainer/feature-flags/feature-flags.service'; +import { useEnvironment } from '@/react/portainer/environments/queries'; +import { statusIcon } from '@/react/docker/components/ImageStatus/helpers'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { isBE } from '@/react/portainer/feature-flags/feature-flags.service'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; import { ResourceID, ResourceType } from './types'; import { useImageNotification } from './useImageNotification'; diff --git a/app/react/docker/components/ImageStatus/PublishedPortLink.tsx b/app/react/docker/components/ImageStatus/PublishedPortLink.tsx index d4de88f69..413aa1e10 100644 --- a/app/react/docker/components/ImageStatus/PublishedPortLink.tsx +++ b/app/react/docker/components/ImageStatus/PublishedPortLink.tsx @@ -1,6 +1,6 @@ import { ExternalLink } from 'lucide-react'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; type Props = { hostURL?: string; diff --git a/app/react/docker/components/ImageStatus/helpers.ts b/app/react/docker/components/ImageStatus/helpers.ts index f7dc8d140..e11e82a89 100644 --- a/app/react/docker/components/ImageStatus/helpers.ts +++ b/app/react/docker/components/ImageStatus/helpers.ts @@ -1,8 +1,8 @@ import { Loader } from 'lucide-react'; -import UpdatesAvailable from '@CE/assets/ico/icon_updates-available.svg?c'; -import UpToDate from '@CE/assets/ico/icon_up-to-date.svg?c'; -import UpdatesUnknown from '@CE/assets/ico/icon_updates-unknown.svg?c'; +import UpdatesAvailable from '@/assets/ico/icon_updates-available.svg?c'; +import UpToDate from '@/assets/ico/icon_up-to-date.svg?c'; +import UpdatesUnknown from '@/assets/ico/icon_updates-unknown.svg?c'; import { ImageStatus } from './types'; diff --git a/app/react/docker/components/ImageStatus/useImageNotification.ts b/app/react/docker/components/ImageStatus/useImageNotification.ts index 1f60b0815..b432ddbca 100644 --- a/app/react/docker/components/ImageStatus/useImageNotification.ts +++ b/app/react/docker/components/ImageStatus/useImageNotification.ts @@ -1,9 +1,9 @@ import { useQuery } from '@tanstack/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios from '@CE/portainer/services/axios'; -import { ServiceId } from '@CE/react/docker/services/types'; -import { ContainerId } from '@CE/react/docker/containers/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios from '@/portainer/services/axios'; +import { ServiceId } from '@/react/docker/services/types'; +import { ContainerId } from '@/react/docker/containers/types'; import { ImageStatus, ResourceID, ResourceType } from './types'; diff --git a/app/react/docker/components/datatable/TableColumnHeaderImageUpToDate.tsx b/app/react/docker/components/datatable/TableColumnHeaderImageUpToDate.tsx index fa63332d9..223b88b00 100644 --- a/app/react/docker/components/datatable/TableColumnHeaderImageUpToDate.tsx +++ b/app/react/docker/components/datatable/TableColumnHeaderImageUpToDate.tsx @@ -1,16 +1,16 @@ -import UpdatesAvailable from '@CE/assets/ico/icon_updates-available.svg?c'; -import UpToDate from '@CE/assets/ico/icon_up-to-date.svg?c'; -import UpdatesUnknown from '@CE/assets/ico/icon_updates-unknown.svg?c'; -import { useEnvironment } from '@CE/react/portainer/environments/queries'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { isBE } from '@CE/react/portainer/feature-flags/feature-flags.service'; +import UpdatesAvailable from '@/assets/ico/icon_updates-available.svg?c'; +import UpToDate from '@/assets/ico/icon_up-to-date.svg?c'; +import UpdatesUnknown from '@/assets/ico/icon_updates-unknown.svg?c'; +import { useEnvironment } from '@/react/portainer/environments/queries'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { isBE } from '@/react/portainer/feature-flags/feature-flags.service'; -import { Icon } from '@@CE/Icon'; -import { Tooltip } from '@@CE/Tip/Tooltip'; +import { Icon } from '@@/Icon'; +import { Tooltip } from '@@/Tip/Tooltip'; import { TableColumnHeaderAngular, TableColumnHeaderAngularProps, -} from '@@CE/datatables/TableHeaderCell'; +} from '@@/datatables/TableHeaderCell'; export function TableColumnHeaderImageUpToDate({ canSort, diff --git a/app/react/docker/components/datatable/createOwnershipColumn.tsx b/app/react/docker/components/datatable/createOwnershipColumn.tsx index da54d5d7a..feba754b9 100644 --- a/app/react/docker/components/datatable/createOwnershipColumn.tsx +++ b/app/react/docker/components/datatable/createOwnershipColumn.tsx @@ -1,9 +1,9 @@ import { CellContext, ColumnDef } from '@tanstack/react-table'; import { Eye, EyeOff, Users } from 'lucide-react'; -import { ResourceControlOwnership } from '@CE/react/portainer/access-control/types'; +import { ResourceControlOwnership } from '@/react/portainer/access-control/types'; -import { Icon } from '@@CE/Icon'; +import { Icon } from '@@/Icon'; export interface IResource { ResourceControl?: { diff --git a/app/react/docker/configs/ListView/ConfigsDatatable/ConfigsDatatable.test.tsx b/app/react/docker/configs/ListView/ConfigsDatatable/ConfigsDatatable.test.tsx index 8ab2a7ea3..47dafab15 100644 --- a/app/react/docker/configs/ListView/ConfigsDatatable/ConfigsDatatable.test.tsx +++ b/app/react/docker/configs/ListView/ConfigsDatatable/ConfigsDatatable.test.tsx @@ -2,12 +2,12 @@ import { render, screen, waitFor } from '@testing-library/react'; import { HttpResponse, http } from 'msw'; import { Config } from 'docker-types/generated/1.44'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; -import { withUserProvider } from '@CE/react/test-utils/withUserProvider'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; -import { server } from '@CE/setup-tests/server'; -import { Role, User } from '@CE/portainer/users/types'; -import { createMockUsers } from '@CE/react-tools/test-mocks'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; +import { withUserProvider } from '@/react/test-utils/withUserProvider'; +import { withTestRouter } from '@/react/test-utils/withRouter'; +import { server } from '@/setup-tests/server'; +import { Role, User } from '@/portainer/users/types'; +import { createMockUsers } from '@/react-tools/test-mocks'; import { ConfigsDatatable } from './ConfigsDatatable'; @@ -18,7 +18,7 @@ vi.mock('@uirouter/react', async (importOriginal: () => Promise) => ({ })), })); -vi.mock('@@CE/Link', () => ({ +vi.mock('@@/Link', () => ({ Link: ({ children, 'data-cy': dataCy, diff --git a/app/react/docker/configs/ListView/ConfigsDatatable/ConfigsDatatable.tsx b/app/react/docker/configs/ListView/ConfigsDatatable/ConfigsDatatable.tsx index a6d1e49aa..c826dbd05 100644 --- a/app/react/docker/configs/ListView/ConfigsDatatable/ConfigsDatatable.tsx +++ b/app/react/docker/configs/ListView/ConfigsDatatable/ConfigsDatatable.tsx @@ -1,12 +1,12 @@ import { Clipboard } from 'lucide-react'; -import { Authorized, useAuthorizations } from '@CE/react/hooks/useUser'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { Authorized, useAuthorizations } from '@/react/hooks/useUser'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import { Datatable, TableSettingsMenu } from '@@CE/datatables'; -import { TableSettingsMenuAutoRefresh } from '@@CE/datatables/TableSettingsMenuAutoRefresh'; -import { AddButton } from '@@CE/buttons'; -import { useTableState } from '@@CE/datatables/useTableState'; +import { Datatable, TableSettingsMenu } from '@@/datatables'; +import { TableSettingsMenuAutoRefresh } from '@@/datatables/TableSettingsMenuAutoRefresh'; +import { AddButton } from '@@/buttons'; +import { useTableState } from '@@/datatables/useTableState'; import { useConfigsList } from '../../queries/useConfigs'; import { ConfigViewModel } from '../../model'; diff --git a/app/react/docker/configs/ListView/ConfigsDatatable/DeleteConfigButton.test.tsx b/app/react/docker/configs/ListView/ConfigsDatatable/DeleteConfigButton.test.tsx index 4f18cb86a..29fcd74b3 100644 --- a/app/react/docker/configs/ListView/ConfigsDatatable/DeleteConfigButton.test.tsx +++ b/app/react/docker/configs/ListView/ConfigsDatatable/DeleteConfigButton.test.tsx @@ -2,12 +2,12 @@ import { render, screen, waitFor, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { HttpResponse, http } from 'msw'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; -import { withUserProvider } from '@CE/react/test-utils/withUserProvider'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; -import { server } from '@CE/setup-tests/server'; -import { Role } from '@CE/portainer/users/types'; -import { createMockUsers } from '@CE/react-tools/test-mocks'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; +import { withUserProvider } from '@/react/test-utils/withUserProvider'; +import { withTestRouter } from '@/react/test-utils/withRouter'; +import { server } from '@/setup-tests/server'; +import { Role } from '@/portainer/users/types'; +import { createMockUsers } from '@/react-tools/test-mocks'; import { ConfigViewModel } from '../../model'; diff --git a/app/react/docker/configs/ListView/ConfigsDatatable/DeleteConfigButton.tsx b/app/react/docker/configs/ListView/ConfigsDatatable/DeleteConfigButton.tsx index f5d13068d..ee8004f4d 100644 --- a/app/react/docker/configs/ListView/ConfigsDatatable/DeleteConfigButton.tsx +++ b/app/react/docker/configs/ListView/ConfigsDatatable/DeleteConfigButton.tsx @@ -1,13 +1,13 @@ import { useQueryClient, useMutation } from '@tanstack/react-query'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { promiseSequence } from '@CE/portainer/helpers/promise-utils'; -import { withGlobalError, withInvalidate } from '@CE/react-tools/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { notifySuccess } from '@CE/portainer/services/notifications'; -import { pluralize } from '@CE/portainer/helpers/strings'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { promiseSequence } from '@/portainer/helpers/promise-utils'; +import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { notifySuccess } from '@/portainer/services/notifications'; +import { pluralize } from '@/portainer/helpers/strings'; -import { DeleteButton } from '@@CE/buttons/DeleteButton'; +import { DeleteButton } from '@@/buttons/DeleteButton'; import { ConfigViewModel } from '../../model'; import { queryKeys } from '../../queries/query-keys'; diff --git a/app/react/docker/configs/ListView/ConfigsDatatable/columns.tsx b/app/react/docker/configs/ListView/ConfigsDatatable/columns.tsx index 84cf1bff1..86e3fb60c 100644 --- a/app/react/docker/configs/ListView/ConfigsDatatable/columns.tsx +++ b/app/react/docker/configs/ListView/ConfigsDatatable/columns.tsx @@ -1,9 +1,9 @@ import { createColumnHelper } from '@tanstack/react-table'; -import { isoDate } from '@CE/portainer/filters/filters'; -import { createOwnershipColumn } from '@CE/react/docker/components/datatable/createOwnershipColumn'; +import { isoDate } from '@/portainer/filters/filters'; +import { createOwnershipColumn } from '@/react/docker/components/datatable/createOwnershipColumn'; -import { buildNameColumnFromObject } from '@@CE/datatables/buildNameColumn'; +import { buildNameColumnFromObject } from '@@/datatables/buildNameColumn'; import { ConfigViewModel } from '../../model'; diff --git a/app/react/docker/configs/ListView/ConfigsDatatable/store.ts b/app/react/docker/configs/ListView/ConfigsDatatable/store.ts index af85ef214..95a649f89 100644 --- a/app/react/docker/configs/ListView/ConfigsDatatable/store.ts +++ b/app/react/docker/configs/ListView/ConfigsDatatable/store.ts @@ -2,7 +2,7 @@ import { createPersistedStore, refreshableSettings, TableSettingsWithRefreshable, -} from '@@CE/datatables/types'; +} from '@@/datatables/types'; export function createStore(storageKey: string) { return createPersistedStore( diff --git a/app/react/docker/configs/ListView/ListView.test.tsx b/app/react/docker/configs/ListView/ListView.test.tsx index ee59e1499..812007acc 100644 --- a/app/react/docker/configs/ListView/ListView.test.tsx +++ b/app/react/docker/configs/ListView/ListView.test.tsx @@ -1,12 +1,12 @@ import { render, screen, waitFor } from '@testing-library/react'; import { HttpResponse, http } from 'msw'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; -import { withUserProvider } from '@CE/react/test-utils/withUserProvider'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; -import { server } from '@CE/setup-tests/server'; -import { Role } from '@CE/portainer/users/types'; -import { createMockUsers } from '@CE/react-tools/test-mocks'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; +import { withUserProvider } from '@/react/test-utils/withUserProvider'; +import { withTestRouter } from '@/react/test-utils/withRouter'; +import { server } from '@/setup-tests/server'; +import { Role } from '@/portainer/users/types'; +import { createMockUsers } from '@/react-tools/test-mocks'; import { ListView } from './ListView'; @@ -17,7 +17,7 @@ vi.mock('@uirouter/react', async (importOriginal: () => Promise) => ({ })), })); -vi.mock('@@CE/Link', () => ({ +vi.mock('@@/Link', () => ({ Link: ({ children, 'data-cy': dataCy, diff --git a/app/react/docker/configs/ListView/ListView.tsx b/app/react/docker/configs/ListView/ListView.tsx index 02c7dcd12..ea7f64c45 100644 --- a/app/react/docker/configs/ListView/ListView.tsx +++ b/app/react/docker/configs/ListView/ListView.tsx @@ -1,4 +1,4 @@ -import { PageHeader } from '@@CE/PageHeader'; +import { PageHeader } from '@@/PageHeader'; import { ConfigsDatatable } from './ConfigsDatatable/ConfigsDatatable'; diff --git a/app/react/docker/configs/model.ts b/app/react/docker/configs/model.ts index 7f8b20111..96078f357 100644 --- a/app/react/docker/configs/model.ts +++ b/app/react/docker/configs/model.ts @@ -1,7 +1,7 @@ import { Config } from 'docker-types/generated/1.44'; -import { PortainerResponse } from '@CE/react/docker/types'; -import { ResourceControlViewModel } from '@CE/react/portainer/access-control/models/ResourceControlViewModel'; +import { PortainerResponse } from '@/react/docker/types'; +import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; import { IResource } from '../components/datatable/createOwnershipColumn'; diff --git a/app/react/docker/configs/queries/build-url.ts b/app/react/docker/configs/queries/build-url.ts index 6c2870bdf..5a14b51d7 100644 --- a/app/react/docker/configs/queries/build-url.ts +++ b/app/react/docker/configs/queries/build-url.ts @@ -1,5 +1,5 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { buildDockerProxyUrl } from '@CE/react/docker/proxy/queries/buildDockerProxyUrl'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { buildDockerProxyUrl } from '@/react/docker/proxy/queries/buildDockerProxyUrl'; export function buildUrl(environmentId: EnvironmentId, id = '', action = '') { return buildDockerProxyUrl(environmentId, 'configs', id, action); diff --git a/app/react/docker/configs/queries/query-keys.ts b/app/react/docker/configs/queries/query-keys.ts index 645b5545d..395ff8027 100644 --- a/app/react/docker/configs/queries/query-keys.ts +++ b/app/react/docker/configs/queries/query-keys.ts @@ -1,5 +1,5 @@ -import { queryKeys as proxyQueryKeys } from '@CE/react/docker/proxy/queries/query-keys'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { queryKeys as proxyQueryKeys } from '@/react/docker/proxy/queries/query-keys'; +import { EnvironmentId } from '@/react/portainer/environments/types'; export const queryKeys = { base: (environmentId: EnvironmentId) => diff --git a/app/react/docker/configs/queries/useConfig.ts b/app/react/docker/configs/queries/useConfig.ts index e41c1fe45..3736ecc27 100644 --- a/app/react/docker/configs/queries/useConfig.ts +++ b/app/react/docker/configs/queries/useConfig.ts @@ -1,7 +1,7 @@ import { Config } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { PortainerResponse } from '../../types'; diff --git a/app/react/docker/configs/queries/useConfigs.ts b/app/react/docker/configs/queries/useConfigs.ts index 9bf543b6a..deda95307 100644 --- a/app/react/docker/configs/queries/useConfigs.ts +++ b/app/react/docker/configs/queries/useConfigs.ts @@ -1,9 +1,9 @@ import { Config } from 'docker-types/generated/1.44'; import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { withGlobalError } from '@CE/react-tools/react-query'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { withGlobalError } from '@/react-tools/react-query'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/configs/queries/useCreateConfigMutation.ts b/app/react/docker/configs/queries/useCreateConfigMutation.ts index 8867f6175..a726c5b29 100644 --- a/app/react/docker/configs/queries/useCreateConfigMutation.ts +++ b/app/react/docker/configs/queries/useCreateConfigMutation.ts @@ -1,7 +1,7 @@ import { ConfigSpec } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; import { PortainerResponse } from '../../types'; diff --git a/app/react/docker/configs/queries/useDeleteConfigMutation.ts b/app/react/docker/configs/queries/useDeleteConfigMutation.ts index 4884d2cc2..582415b63 100644 --- a/app/react/docker/configs/queries/useDeleteConfigMutation.ts +++ b/app/react/docker/configs/queries/useDeleteConfigMutation.ts @@ -1,7 +1,7 @@ import { useMutation } from '@tanstack/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; import { buildUrl } from './build-url'; diff --git a/app/react/docker/configs/types.ts b/app/react/docker/configs/types.ts index 135e1c1cb..489fd3b4f 100644 --- a/app/react/docker/configs/types.ts +++ b/app/react/docker/configs/types.ts @@ -1,4 +1,4 @@ -import { ResourceControlViewModel } from '@CE/react/portainer/access-control/models/ResourceControlViewModel'; +import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; export type DockerConfig = { Id: string; diff --git a/app/react/docker/containers/CreateView/BaseForm/BaseForm.tsx b/app/react/docker/containers/CreateView/BaseForm/BaseForm.tsx index 6a7e4f6e0..33e00f9a8 100644 --- a/app/react/docker/containers/CreateView/BaseForm/BaseForm.tsx +++ b/app/react/docker/containers/CreateView/BaseForm/BaseForm.tsx @@ -1,24 +1,21 @@ import { useFormikContext } from 'formik'; -import { useCurrentEnvironment } from '@CE/react/hooks/useCurrentEnvironment'; -import { Authorized } from '@CE/react/hooks/useUser'; -import { AccessControlForm } from '@CE/react/portainer/access-control'; -import { AccessControlFormData } from '@CE/react/portainer/access-control/types'; -import { EnvironmentType } from '@CE/react/portainer/environments/types'; -import { NodeSelector } from '@CE/react/docker/agent/NodeSelector'; -import { useIsSwarm } from '@CE/react/docker/proxy/queries/useInfo'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { isAgentEnvironment } from '@CE/react/portainer/environments/utils'; -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; +import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment'; +import { Authorized } from '@/react/hooks/useUser'; +import { AccessControlForm } from '@/react/portainer/access-control'; +import { AccessControlFormData } from '@/react/portainer/access-control/types'; +import { EnvironmentType } from '@/react/portainer/environments/types'; +import { NodeSelector } from '@/react/docker/agent/NodeSelector'; +import { useIsSwarm } from '@/react/docker/proxy/queries/useInfo'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { isAgentEnvironment } from '@/react/portainer/environments/utils'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; -import { FormSection } from '@@CE/form-components/FormSection'; -import { SwitchField } from '@@CE/form-components/SwitchField'; -import { - ImageConfigFieldset, - ImageConfigValues, -} from '@@CE/ImageConfigFieldset'; -import { LoadingButton } from '@@CE/buttons'; -import { Widget } from '@@CE/Widget'; +import { FormSection } from '@@/form-components/FormSection'; +import { SwitchField } from '@@/form-components/SwitchField'; +import { ImageConfigFieldset, ImageConfigValues } from '@@/ImageConfigFieldset'; +import { LoadingButton } from '@@/buttons'; +import { Widget } from '@@/Widget'; import { PortsMappingField, diff --git a/app/react/docker/containers/CreateView/BaseForm/NameField.tsx b/app/react/docker/containers/CreateView/BaseForm/NameField.tsx index bde83ef8d..605e7be16 100644 --- a/app/react/docker/containers/CreateView/BaseForm/NameField.tsx +++ b/app/react/docker/containers/CreateView/BaseForm/NameField.tsx @@ -1,7 +1,7 @@ import { string } from 'yup'; -import { FormControl } from '@@CE/form-components/FormControl'; -import { Input } from '@@CE/form-components/Input'; +import { FormControl } from '@@/form-components/FormControl'; +import { Input } from '@@/form-components/Input'; export function NameField({ value, diff --git a/app/react/docker/containers/CreateView/BaseForm/PortsMappingField.tsx b/app/react/docker/containers/CreateView/BaseForm/PortsMappingField.tsx index 355cb8a9a..cbf33470a 100644 --- a/app/react/docker/containers/CreateView/BaseForm/PortsMappingField.tsx +++ b/app/react/docker/containers/CreateView/BaseForm/PortsMappingField.tsx @@ -1,12 +1,12 @@ import { FormikErrors } from 'formik'; import { ArrowRight } from 'lucide-react'; -import { ButtonSelector } from '@@CE/form-components/ButtonSelector/ButtonSelector'; -import { FormError } from '@@CE/form-components/FormError'; -import { InputList } from '@@CE/form-components/InputList'; -import { ItemProps } from '@@CE/form-components/InputList/InputList'; -import { Icon } from '@@CE/Icon'; -import { InputLabeled } from '@@CE/form-components/Input/InputLabeled'; +import { ButtonSelector } from '@@/form-components/ButtonSelector/ButtonSelector'; +import { FormError } from '@@/form-components/FormError'; +import { InputList } from '@@/form-components/InputList'; +import { ItemProps } from '@@/form-components/InputList/InputList'; +import { Icon } from '@@/Icon'; +import { InputLabeled } from '@@/form-components/Input/InputLabeled'; export type Protocol = 'tcp' | 'udp'; diff --git a/app/react/docker/containers/CreateView/BaseForm/toViewModel.ts b/app/react/docker/containers/CreateView/BaseForm/toViewModel.ts index 6959545c9..293783dba 100644 --- a/app/react/docker/containers/CreateView/BaseForm/toViewModel.ts +++ b/app/react/docker/containers/CreateView/BaseForm/toViewModel.ts @@ -1,8 +1,8 @@ -import { parseAccessControlFormData } from '@CE/react/portainer/access-control/utils'; -import { ResourceControlOwnership } from '@CE/react/portainer/access-control/types'; -import { UserId } from '@CE/portainer/users/types'; +import { parseAccessControlFormData } from '@/react/portainer/access-control/utils'; +import { ResourceControlOwnership } from '@/react/portainer/access-control/types'; +import { UserId } from '@/portainer/users/types'; -import { getDefaultImageConfig } from '@@CE/ImageConfigFieldset/getImageConfig'; +import { getDefaultImageConfig } from '@@/ImageConfigFieldset/getImageConfig'; import { ContainerDetailsResponse } from '../../queries/useContainer'; diff --git a/app/react/docker/containers/CreateView/BaseForm/validation.ts b/app/react/docker/containers/CreateView/BaseForm/validation.ts index 1e0965218..b110e207d 100644 --- a/app/react/docker/containers/CreateView/BaseForm/validation.ts +++ b/app/react/docker/containers/CreateView/BaseForm/validation.ts @@ -1,8 +1,8 @@ import { boolean, object, SchemaOf, string } from 'yup'; -import { validationSchema as accessControlSchema } from '@CE/react/portainer/access-control/AccessControlForm/AccessControlForm.validation'; +import { validationSchema as accessControlSchema } from '@/react/portainer/access-control/AccessControlForm/AccessControlForm.validation'; -import { imageConfigValidation } from '@@CE/ImageConfigFieldset'; +import { imageConfigValidation } from '@@/ImageConfigFieldset'; import { Values } from './BaseForm'; import { validationSchema as portsSchema } from './PortsMappingField.validation'; diff --git a/app/react/docker/containers/CreateView/CapabilitiesTab/CapabilitiesTab.tsx b/app/react/docker/containers/CreateView/CapabilitiesTab/CapabilitiesTab.tsx index ad095f5cc..a2745e862 100644 --- a/app/react/docker/containers/CreateView/CapabilitiesTab/CapabilitiesTab.tsx +++ b/app/react/docker/containers/CreateView/CapabilitiesTab/CapabilitiesTab.tsx @@ -1,5 +1,5 @@ -import { FormSection } from '@@CE/form-components/FormSection'; -import { SwitchField } from '@@CE/form-components/SwitchField'; +import { FormSection } from '@@/form-components/FormSection'; +import { SwitchField } from '@@/form-components/SwitchField'; import { capabilities } from './types'; diff --git a/app/react/docker/containers/CreateView/CapabilitiesTab/toRequest.ts b/app/react/docker/containers/CreateView/CapabilitiesTab/toRequest.ts index 46033471c..208e11eb7 100644 --- a/app/react/docker/containers/CreateView/CapabilitiesTab/toRequest.ts +++ b/app/react/docker/containers/CreateView/CapabilitiesTab/toRequest.ts @@ -1,4 +1,4 @@ -import { CreateContainerRequest } from '@CE/react/docker/containers/CreateView/types'; +import { CreateContainerRequest } from '@/react/docker/containers/CreateView/types'; import { capabilities } from './types'; import { Values } from './CapabilitiesTab'; diff --git a/app/react/docker/containers/CreateView/CapabilitiesTab/toViewModel.ts b/app/react/docker/containers/CreateView/CapabilitiesTab/toViewModel.ts index 6ceb407db..7548e9aeb 100644 --- a/app/react/docker/containers/CreateView/CapabilitiesTab/toViewModel.ts +++ b/app/react/docker/containers/CreateView/CapabilitiesTab/toViewModel.ts @@ -1,4 +1,4 @@ -import { ContainerDetailsJSON } from '@CE/react/docker/containers/queries/useContainer'; +import { ContainerDetailsJSON } from '@/react/docker/containers/queries/useContainer'; import { capabilities } from './types'; import { Values } from './CapabilitiesTab'; diff --git a/app/react/docker/containers/CreateView/CommandsTab/CommandsTab.tsx b/app/react/docker/containers/CreateView/CommandsTab/CommandsTab.tsx index 455f80dec..a722f2ea0 100644 --- a/app/react/docker/containers/CreateView/CommandsTab/CommandsTab.tsx +++ b/app/react/docker/containers/CreateView/CommandsTab/CommandsTab.tsx @@ -1,7 +1,7 @@ import { FormikErrors } from 'formik'; -import { FormControl } from '@@CE/form-components/FormControl'; -import { Input } from '@@CE/form-components/Input'; +import { FormControl } from '@@/form-components/FormControl'; +import { Input } from '@@/form-components/Input'; import { ConsoleSettings } from './ConsoleSettings'; import { LoggerConfig } from './LoggerConfig'; diff --git a/app/react/docker/containers/CreateView/CommandsTab/ConsoleSettings.tsx b/app/react/docker/containers/CreateView/CommandsTab/ConsoleSettings.tsx index 5d60f1cf2..bdc74f91a 100644 --- a/app/react/docker/containers/CreateView/CommandsTab/ConsoleSettings.tsx +++ b/app/react/docker/containers/CreateView/CommandsTab/ConsoleSettings.tsx @@ -2,9 +2,9 @@ import { ReactNode } from 'react'; import { mixed } from 'yup'; import { ContainerConfig } from 'docker-types/generated/1.44'; -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { FormControl } from '@@CE/form-components/FormControl'; +import { FormControl } from '@@/form-components/FormControl'; const consoleSettingTypes = ['tty', 'interactive', 'both', 'none'] as const; diff --git a/app/react/docker/containers/CreateView/CommandsTab/LoggerConfig.tsx b/app/react/docker/containers/CreateView/CommandsTab/LoggerConfig.tsx index 3dba4c44b..5235fa3af 100644 --- a/app/react/docker/containers/CreateView/CommandsTab/LoggerConfig.tsx +++ b/app/react/docker/containers/CreateView/CommandsTab/LoggerConfig.tsx @@ -2,17 +2,17 @@ import { FormikErrors } from 'formik'; import { array, object, SchemaOf, string } from 'yup'; import _ from 'lodash'; -import { useLoggingPlugins } from '@CE/react/docker/proxy/queries/usePlugins'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { useIsPodman } from '@CE/react/portainer/environments/queries/useIsPodman'; +import { useLoggingPlugins } from '@/react/docker/proxy/queries/usePlugins'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { useIsPodman } from '@/react/portainer/environments/queries/useIsPodman'; -import { FormControl } from '@@CE/form-components/FormControl'; -import { FormSection } from '@@CE/form-components/FormSection'; -import { InputGroup } from '@@CE/form-components/InputGroup'; -import { InputList, ItemProps } from '@@CE/form-components/InputList'; -import { PortainerSelect } from '@@CE/form-components/PortainerSelect'; -import { TextTip } from '@@CE/Tip/TextTip'; -import { FormError } from '@@CE/form-components/FormError'; +import { FormControl } from '@@/form-components/FormControl'; +import { FormSection } from '@@/form-components/FormSection'; +import { InputGroup } from '@@/form-components/InputGroup'; +import { InputList, ItemProps } from '@@/form-components/InputList'; +import { PortainerSelect } from '@@/form-components/PortainerSelect'; +import { TextTip } from '@@/Tip/TextTip'; +import { FormError } from '@@/form-components/FormError'; export interface LogConfig { type: string; diff --git a/app/react/docker/containers/CreateView/CommandsTab/OverridableInput.tsx b/app/react/docker/containers/CreateView/CommandsTab/OverridableInput.tsx index e7f997c1a..421847850 100644 --- a/app/react/docker/containers/CreateView/CommandsTab/OverridableInput.tsx +++ b/app/react/docker/containers/CreateView/CommandsTab/OverridableInput.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; -import { Button } from '@@CE/buttons'; -import { InputGroup } from '@@CE/form-components/InputGroup'; +import { Button } from '@@/buttons'; +import { InputGroup } from '@@/form-components/InputGroup'; export function OverridableInput({ value, diff --git a/app/react/docker/containers/CreateView/CommandsTab/toRequest.ts b/app/react/docker/containers/CreateView/CommandsTab/toRequest.ts index 523c9525c..7e22809be 100644 --- a/app/react/docker/containers/CreateView/CommandsTab/toRequest.ts +++ b/app/react/docker/containers/CreateView/CommandsTab/toRequest.ts @@ -1,4 +1,4 @@ -import { commandStringToArray } from '@CE/docker/helpers/containers'; +import { commandStringToArray } from '@/docker/helpers/containers'; import { CreateContainerRequest } from '../types'; diff --git a/app/react/docker/containers/CreateView/CommandsTab/toViewModel.tsx b/app/react/docker/containers/CreateView/CommandsTab/toViewModel.tsx index 3e9e05b16..b7df4d904 100644 --- a/app/react/docker/containers/CreateView/CommandsTab/toViewModel.tsx +++ b/app/react/docker/containers/CreateView/CommandsTab/toViewModel.tsx @@ -1,6 +1,6 @@ import { HostConfig } from 'docker-types/generated/1.44'; -import { commandArrayToString } from '@CE/docker/helpers/containers'; +import { commandArrayToString } from '@/docker/helpers/containers'; import { ContainerDetailsJSON } from '../../queries/useContainer'; diff --git a/app/react/docker/containers/CreateView/CreateView.tsx b/app/react/docker/containers/CreateView/CreateView.tsx index 0646ab0a2..ba335e771 100644 --- a/app/react/docker/containers/CreateView/CreateView.tsx +++ b/app/react/docker/containers/CreateView/CreateView.tsx @@ -2,21 +2,21 @@ import { Formik } from 'formik'; import { useRouter } from '@uirouter/react'; import { useEffect, useState } from 'react'; -import { useIsEdgeAdmin, useIsEnvironmentAdmin } from '@CE/react/hooks/useUser'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { useCurrentEnvironment } from '@CE/react/hooks/useCurrentEnvironment'; -import { useEnvironmentRegistries } from '@CE/react/portainer/environments/queries/useEnvironmentRegistries'; -import { Registry } from '@CE/react/portainer/registries/types/registry'; -import { notifySuccess } from '@CE/portainer/services/notifications'; -import { useDebouncedValue } from '@CE/react/hooks/useDebouncedValue'; +import { useIsEdgeAdmin, useIsEnvironmentAdmin } from '@/react/hooks/useUser'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment'; +import { useEnvironmentRegistries } from '@/react/portainer/environments/queries/useEnvironmentRegistries'; +import { Registry } from '@/react/portainer/registries/types/registry'; +import { notifySuccess } from '@/portainer/services/notifications'; +import { useDebouncedValue } from '@/react/hooks/useDebouncedValue'; -import { PageHeader } from '@@CE/PageHeader'; -import { ImageConfigValues } from '@@CE/ImageConfigFieldset'; -import { confirmDestructive } from '@@CE/modals/confirm'; -import { buildConfirmButton } from '@@CE/modals/utils'; -import { InformationPanel } from '@@CE/InformationPanel'; -import { TextTip } from '@@CE/Tip/TextTip'; -import { HelpLink } from '@@CE/HelpLink'; +import { PageHeader } from '@@/PageHeader'; +import { ImageConfigValues } from '@@/ImageConfigFieldset'; +import { confirmDestructive } from '@@/modals/confirm'; +import { buildConfirmButton } from '@@/modals/utils'; +import { InformationPanel } from '@@/InformationPanel'; +import { TextTip } from '@@/Tip/TextTip'; +import { HelpLink } from '@@/HelpLink'; import { useContainers } from '../queries/useContainers'; import { useSystemLimits, useIsWindows } from '../../proxy/queries/useInfo'; diff --git a/app/react/docker/containers/CreateView/EnvVarsTab/EnvVarsTab.tsx b/app/react/docker/containers/CreateView/EnvVarsTab/EnvVarsTab.tsx index 06ee3d4dc..c0c51d13b 100644 --- a/app/react/docker/containers/CreateView/EnvVarsTab/EnvVarsTab.tsx +++ b/app/react/docker/containers/CreateView/EnvVarsTab/EnvVarsTab.tsx @@ -1,8 +1,8 @@ import { EnvVarValues, EnvironmentVariablesPanel, -} from '@@CE/form-components/EnvironmentVariablesFieldset'; -import { ArrayError } from '@@CE/form-components/InputList/InputList'; +} from '@@/form-components/EnvironmentVariablesFieldset'; +import { ArrayError } from '@@/form-components/InputList/InputList'; export function EnvVarsTab({ values, diff --git a/app/react/docker/containers/CreateView/EnvVarsTab/index.ts b/app/react/docker/containers/CreateView/EnvVarsTab/index.ts index a46bbdc3a..cb1189bfc 100644 --- a/app/react/docker/containers/CreateView/EnvVarsTab/index.ts +++ b/app/react/docker/containers/CreateView/EnvVarsTab/index.ts @@ -1,4 +1,4 @@ -import { envVarValidation } from '@@CE/form-components/EnvironmentVariablesFieldset'; +import { envVarValidation } from '@@/form-components/EnvironmentVariablesFieldset'; import { toRequest } from './toRequest'; import { toViewModel, getDefaultViewModel } from './toViewModel'; diff --git a/app/react/docker/containers/CreateView/EnvVarsTab/toRequest.ts b/app/react/docker/containers/CreateView/EnvVarsTab/toRequest.ts index 732d3f92b..b159430db 100644 --- a/app/react/docker/containers/CreateView/EnvVarsTab/toRequest.ts +++ b/app/react/docker/containers/CreateView/EnvVarsTab/toRequest.ts @@ -1,5 +1,5 @@ -import { convertToArrayOfStrings } from '@@CE/form-components/EnvironmentVariablesFieldset/utils'; -import { EnvVarValues } from '@@CE/form-components/EnvironmentVariablesFieldset'; +import { convertToArrayOfStrings } from '@@/form-components/EnvironmentVariablesFieldset/utils'; +import { EnvVarValues } from '@@/form-components/EnvironmentVariablesFieldset'; import { CreateContainerRequest } from '../types'; diff --git a/app/react/docker/containers/CreateView/EnvVarsTab/toViewModel.ts b/app/react/docker/containers/CreateView/EnvVarsTab/toViewModel.ts index e388b07dc..63af6a12e 100644 --- a/app/react/docker/containers/CreateView/EnvVarsTab/toViewModel.ts +++ b/app/react/docker/containers/CreateView/EnvVarsTab/toViewModel.ts @@ -1,4 +1,4 @@ -import { parseArrayOfStrings } from '@@CE/form-components/EnvironmentVariablesFieldset/utils'; +import { parseArrayOfStrings } from '@@/form-components/EnvironmentVariablesFieldset/utils'; import { ContainerDetailsJSON } from '../../queries/useContainer'; diff --git a/app/react/docker/containers/CreateView/InnerForm.tsx b/app/react/docker/containers/CreateView/InnerForm.tsx index 6c3653f4d..9db388f18 100644 --- a/app/react/docker/containers/CreateView/InnerForm.tsx +++ b/app/react/docker/containers/CreateView/InnerForm.tsx @@ -2,12 +2,12 @@ import { useFormikContext, Form } from 'formik'; import { Settings } from 'lucide-react'; import { useState } from 'react'; -import { useCurrentEnvironment } from '@CE/react/hooks/useCurrentEnvironment'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { useIsEnvironmentAdmin } from '@CE/react/hooks/useUser'; +import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { useIsEnvironmentAdmin } from '@/react/hooks/useUser'; -import { NavTabs } from '@@CE/NavTabs'; -import { Widget } from '@@CE/Widget'; +import { NavTabs } from '@@/NavTabs'; +import { Widget } from '@@/Widget'; import { useApiVersion } from '../../proxy/queries/useVersion'; diff --git a/app/react/docker/containers/CreateView/LabelsTab/Item.tsx b/app/react/docker/containers/CreateView/LabelsTab/Item.tsx index 52afe424a..ec5ea41f7 100644 --- a/app/react/docker/containers/CreateView/LabelsTab/Item.tsx +++ b/app/react/docker/containers/CreateView/LabelsTab/Item.tsx @@ -1,6 +1,6 @@ -import { FormError } from '@@CE/form-components/FormError'; -import { InputGroup } from '@@CE/form-components/InputGroup'; -import { ItemProps } from '@@CE/form-components/InputList'; +import { FormError } from '@@/form-components/FormError'; +import { InputGroup } from '@@/form-components/InputGroup'; +import { ItemProps } from '@@/form-components/InputList'; import { Label } from './types'; diff --git a/app/react/docker/containers/CreateView/LabelsTab/LabelsTab.tsx b/app/react/docker/containers/CreateView/LabelsTab/LabelsTab.tsx index e879549dc..e79065f12 100644 --- a/app/react/docker/containers/CreateView/LabelsTab/LabelsTab.tsx +++ b/app/react/docker/containers/CreateView/LabelsTab/LabelsTab.tsx @@ -1,5 +1,5 @@ -import { InputList } from '@@CE/form-components/InputList'; -import { ArrayError } from '@@CE/form-components/InputList/InputList'; +import { InputList } from '@@/form-components/InputList'; +import { ArrayError } from '@@/form-components/InputList/InputList'; import { Item } from './Item'; import { Values } from './types'; diff --git a/app/react/docker/containers/CreateView/NetworkTab/ContainerSelector.tsx b/app/react/docker/containers/CreateView/NetworkTab/ContainerSelector.tsx index ad7a71f69..4fbae4842 100644 --- a/app/react/docker/containers/CreateView/NetworkTab/ContainerSelector.tsx +++ b/app/react/docker/containers/CreateView/NetworkTab/ContainerSelector.tsx @@ -1,6 +1,6 @@ -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import { Option, PortainerSelect } from '@@CE/form-components/PortainerSelect'; +import { Option, PortainerSelect } from '@@/form-components/PortainerSelect'; import { useContainers } from '../../queries/useContainers'; import { ContainerStatus } from '../../types'; diff --git a/app/react/docker/containers/CreateView/NetworkTab/HostnameField.tsx b/app/react/docker/containers/CreateView/NetworkTab/HostnameField.tsx index d334b5efd..f0186e77a 100644 --- a/app/react/docker/containers/CreateView/NetworkTab/HostnameField.tsx +++ b/app/react/docker/containers/CreateView/NetworkTab/HostnameField.tsx @@ -1,7 +1,7 @@ import { string } from 'yup'; -import { FormControl } from '@@CE/form-components/FormControl'; -import { Input } from '@@CE/form-components/Input'; +import { FormControl } from '@@/form-components/FormControl'; +import { Input } from '@@/form-components/Input'; export function HostnameField({ value, diff --git a/app/react/docker/containers/CreateView/NetworkTab/HostsFileEntries.tsx b/app/react/docker/containers/CreateView/NetworkTab/HostsFileEntries.tsx index 0612ae9be..963c1317a 100644 --- a/app/react/docker/containers/CreateView/NetworkTab/HostsFileEntries.tsx +++ b/app/react/docker/containers/CreateView/NetworkTab/HostsFileEntries.tsx @@ -1,12 +1,9 @@ import { array, string } from 'yup'; -import { FormError } from '@@CE/form-components/FormError'; -import { InputLabeled } from '@@CE/form-components/Input/InputLabeled'; -import { ItemProps } from '@@CE/form-components/InputList'; -import { - ArrayError, - InputList, -} from '@@CE/form-components/InputList/InputList'; +import { FormError } from '@@/form-components/FormError'; +import { InputLabeled } from '@@/form-components/Input/InputLabeled'; +import { ItemProps } from '@@/form-components/InputList'; +import { ArrayError, InputList } from '@@/form-components/InputList/InputList'; export const hostFileSchema = array( string().required('Entry is required') diff --git a/app/react/docker/containers/CreateView/NetworkTab/NetworkTab.tsx b/app/react/docker/containers/CreateView/NetworkTab/NetworkTab.tsx index b390d6fbc..c3654f069 100644 --- a/app/react/docker/containers/CreateView/NetworkTab/NetworkTab.tsx +++ b/app/react/docker/containers/CreateView/NetworkTab/NetworkTab.tsx @@ -1,10 +1,10 @@ import { FormikErrors } from 'formik'; -import { useIsPodman } from '@CE/react/portainer/environments/queries/useIsPodman'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { useIsPodman } from '@/react/portainer/environments/queries/useIsPodman'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import { FormControl } from '@@CE/form-components/FormControl'; -import { Input } from '@@CE/form-components/Input'; +import { FormControl } from '@@/form-components/FormControl'; +import { Input } from '@@/form-components/Input'; import { NetworkSelector } from '../../components/NetworkSelector'; diff --git a/app/react/docker/containers/CreateView/NetworkTab/toViewModel.test.ts b/app/react/docker/containers/CreateView/NetworkTab/toViewModel.test.ts index 56645336d..3cba1f7e8 100644 --- a/app/react/docker/containers/CreateView/NetworkTab/toViewModel.test.ts +++ b/app/react/docker/containers/CreateView/NetworkTab/toViewModel.test.ts @@ -1,6 +1,6 @@ import { describe, it, expect } from 'vitest'; -import { DockerNetwork } from '@CE/react/docker/networks/types'; +import { DockerNetwork } from '@/react/docker/networks/types'; import { ContainerListViewModel } from '../../types'; import { ContainerDetailsJSON } from '../../queries/useContainer'; diff --git a/app/react/docker/containers/CreateView/NetworkTab/toViewModel.ts b/app/react/docker/containers/CreateView/NetworkTab/toViewModel.ts index 16e8bb70d..7701e6e69 100644 --- a/app/react/docker/containers/CreateView/NetworkTab/toViewModel.ts +++ b/app/react/docker/containers/CreateView/NetworkTab/toViewModel.ts @@ -1,4 +1,4 @@ -import { DockerNetwork } from '@CE/react/docker/networks/types'; +import { DockerNetwork } from '@/react/docker/networks/types'; import { ContainerDetailsJSON } from '../../queries/useContainer'; import { ContainerListViewModel } from '../../types'; diff --git a/app/react/docker/containers/CreateView/ResourcesTab/DevicesField.tsx b/app/react/docker/containers/CreateView/ResourcesTab/DevicesField.tsx index f45bb0860..68ddef265 100644 --- a/app/react/docker/containers/CreateView/ResourcesTab/DevicesField.tsx +++ b/app/react/docker/containers/CreateView/ResourcesTab/DevicesField.tsx @@ -2,9 +2,9 @@ import { FormikErrors } from 'formik'; import { array, object, SchemaOf, string } from 'yup'; import { DeviceMapping } from 'docker-types/generated/1.44'; -import { FormError } from '@@CE/form-components/FormError'; -import { InputList, ItemProps } from '@@CE/form-components/InputList'; -import { InputLabeled } from '@@CE/form-components/Input/InputLabeled'; +import { FormError } from '@@/form-components/FormError'; +import { InputList, ItemProps } from '@@/form-components/InputList'; +import { InputLabeled } from '@@/form-components/Input/InputLabeled'; interface Device { pathOnHost: string; diff --git a/app/react/docker/containers/CreateView/ResourcesTab/EditResourceForm.tsx b/app/react/docker/containers/CreateView/ResourcesTab/EditResourceForm.tsx index 42b0b8c8d..a56d4493f 100644 --- a/app/react/docker/containers/CreateView/ResourcesTab/EditResourceForm.tsx +++ b/app/react/docker/containers/CreateView/ResourcesTab/EditResourceForm.tsx @@ -4,15 +4,15 @@ import { useCurrentStateAndParams } from '@uirouter/react'; import { useState } from 'react'; import { FormikHelpers } from 'formik/dist/types'; -import { invalidateContainer } from '@CE/react/docker/containers/queries/useContainer'; -import { notifySuccess } from '@CE/portainer/services/notifications'; -import { mutationOptions, withError } from '@CE/react-tools/react-query'; -import { useSystemLimits } from '@CE/react/docker/proxy/queries/useInfo'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { invalidateContainer } from '@/react/docker/containers/queries/useContainer'; +import { notifySuccess } from '@/portainer/services/notifications'; +import { mutationOptions, withError } from '@/react-tools/react-query'; +import { useSystemLimits } from '@/react/docker/proxy/queries/useInfo'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { EnvironmentId } from '@/react/portainer/environments/types'; -import { LoadingButton } from '@@CE/buttons'; -import { TextTip } from '@@CE/Tip/TextTip'; +import { LoadingButton } from '@@/buttons'; +import { TextTip } from '@@/Tip/TextTip'; import { updateContainer } from '../../queries/useUpdateContainer'; diff --git a/app/react/docker/containers/CreateView/ResourcesTab/GpuFieldset/GpuFieldset.tsx b/app/react/docker/containers/CreateView/ResourcesTab/GpuFieldset/GpuFieldset.tsx index 3361ba0bd..7d1a3ae31 100644 --- a/app/react/docker/containers/CreateView/ResourcesTab/GpuFieldset/GpuFieldset.tsx +++ b/app/react/docker/containers/CreateView/ResourcesTab/GpuFieldset/GpuFieldset.tsx @@ -7,10 +7,10 @@ import { } from 'react-select/dist/declarations/src/types'; import { OptionProps } from 'react-select/dist/declarations/src/components/Option'; -import { Select } from '@@CE/form-components/ReactSelect'; -import { Switch } from '@@CE/form-components/SwitchField/Switch'; -import { Tooltip } from '@@CE/Tip/Tooltip'; -import { TextTip } from '@@CE/Tip/TextTip'; +import { Select } from '@@/form-components/ReactSelect'; +import { Switch } from '@@/form-components/SwitchField/Switch'; +import { Tooltip } from '@@/Tip/Tooltip'; +import { TextTip } from '@@/Tip/TextTip'; import { Values } from './types'; diff --git a/app/react/docker/containers/CreateView/ResourcesTab/ResourcesFieldset.tsx b/app/react/docker/containers/CreateView/ResourcesTab/ResourcesFieldset.tsx index e62335da0..078d26eef 100644 --- a/app/react/docker/containers/CreateView/ResourcesTab/ResourcesFieldset.tsx +++ b/app/react/docker/containers/CreateView/ResourcesTab/ResourcesFieldset.tsx @@ -1,14 +1,14 @@ import { FormikErrors } from 'formik'; import { object, SchemaOf } from 'yup'; -import { useSystemLimits } from '@CE/react/docker/proxy/queries/useInfo'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { nanNumberSchema } from '@CE/react-tools/yup-schemas'; +import { useSystemLimits } from '@/react/docker/proxy/queries/useInfo'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { nanNumberSchema } from '@/react-tools/yup-schemas'; -import { FormControl } from '@@CE/form-components/FormControl'; -import { FormSection } from '@@CE/form-components/FormSection'; -import { Slider } from '@@CE/form-components/Slider'; -import { SliderWithInput } from '@@CE/form-components/Slider/SliderWithInput'; +import { FormControl } from '@@/form-components/FormControl'; +import { FormSection } from '@@/form-components/FormSection'; +import { Slider } from '@@/form-components/Slider'; +import { SliderWithInput } from '@@/form-components/Slider/SliderWithInput'; import { CreateContainerRequest } from '../types'; diff --git a/app/react/docker/containers/CreateView/ResourcesTab/ResourcesTab.tsx b/app/react/docker/containers/CreateView/ResourcesTab/ResourcesTab.tsx index 7e8b0dbeb..aae2b72d8 100644 --- a/app/react/docker/containers/CreateView/ResourcesTab/ResourcesTab.tsx +++ b/app/react/docker/containers/CreateView/ResourcesTab/ResourcesTab.tsx @@ -2,12 +2,12 @@ import _ from 'lodash'; import { FormikErrors } from 'formik'; import { ReactNode } from 'react'; -import { useIsStandAlone } from '@CE/react/docker/proxy/queries/useInfo'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { useCurrentEnvironment } from '@CE/react/hooks/useCurrentEnvironment'; +import { useIsStandAlone } from '@/react/docker/proxy/queries/useInfo'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment'; -import { FormControl } from '@@CE/form-components/FormControl'; -import { Input } from '@@CE/form-components/Input'; +import { FormControl } from '@@/form-components/FormControl'; +import { Input } from '@@/form-components/Input'; import { GpuFieldset, GpuFieldsetValues } from './GpuFieldset'; import { Values as RuntimeValues, RuntimeSection } from './RuntimeSection'; diff --git a/app/react/docker/containers/CreateView/ResourcesTab/RuntimeSection.tsx b/app/react/docker/containers/CreateView/ResourcesTab/RuntimeSection.tsx index fff890f9e..17a4250b8 100644 --- a/app/react/docker/containers/CreateView/ResourcesTab/RuntimeSection.tsx +++ b/app/react/docker/containers/CreateView/ResourcesTab/RuntimeSection.tsx @@ -1,8 +1,8 @@ import { bool, object, SchemaOf, string } from 'yup'; -import { FormControl } from '@@CE/form-components/FormControl'; -import { FormSection } from '@@CE/form-components/FormSection'; -import { SwitchField } from '@@CE/form-components/SwitchField'; +import { FormControl } from '@@/form-components/FormControl'; +import { FormSection } from '@@/form-components/FormSection'; +import { SwitchField } from '@@/form-components/SwitchField'; import { RuntimeSelector } from './RuntimeSelector'; diff --git a/app/react/docker/containers/CreateView/ResourcesTab/RuntimeSelector.tsx b/app/react/docker/containers/CreateView/ResourcesTab/RuntimeSelector.tsx index 1fbf48ceb..b536308ca 100644 --- a/app/react/docker/containers/CreateView/ResourcesTab/RuntimeSelector.tsx +++ b/app/react/docker/containers/CreateView/ResourcesTab/RuntimeSelector.tsx @@ -1,7 +1,7 @@ -import { useInfo } from '@CE/react/docker/proxy/queries/useInfo'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { useInfo } from '@/react/docker/proxy/queries/useInfo'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import { PortainerSelect } from '@@CE/form-components/PortainerSelect'; +import { PortainerSelect } from '@@/form-components/PortainerSelect'; export function RuntimeSelector({ value, diff --git a/app/react/docker/containers/CreateView/ResourcesTab/SysctlsField.tsx b/app/react/docker/containers/CreateView/ResourcesTab/SysctlsField.tsx index 5b2a21bb8..8180dafa0 100644 --- a/app/react/docker/containers/CreateView/ResourcesTab/SysctlsField.tsx +++ b/app/react/docker/containers/CreateView/ResourcesTab/SysctlsField.tsx @@ -1,9 +1,9 @@ import { FormikErrors } from 'formik'; import { array, object, SchemaOf, string } from 'yup'; -import { FormError } from '@@CE/form-components/FormError'; -import { InputList, ItemProps } from '@@CE/form-components/InputList'; -import { InputLabeled } from '@@CE/form-components/Input/InputLabeled'; +import { FormError } from '@@/form-components/FormError'; +import { InputList, ItemProps } from '@@/form-components/InputList'; +import { InputLabeled } from '@@/form-components/Input/InputLabeled'; interface Sysctls { name: string; diff --git a/app/react/docker/containers/CreateView/RestartPolicyTab/RestartPolicyTab.tsx b/app/react/docker/containers/CreateView/RestartPolicyTab/RestartPolicyTab.tsx index 41d380e8f..b4dae33f8 100644 --- a/app/react/docker/containers/CreateView/RestartPolicyTab/RestartPolicyTab.tsx +++ b/app/react/docker/containers/CreateView/RestartPolicyTab/RestartPolicyTab.tsx @@ -1,5 +1,5 @@ -import { ButtonSelector } from '@@CE/form-components/ButtonSelector/ButtonSelector'; -import { FormControl } from '@@CE/form-components/FormControl'; +import { ButtonSelector } from '@@/form-components/ButtonSelector/ButtonSelector'; +import { FormControl } from '@@/form-components/FormControl'; import { RestartPolicy } from './types'; diff --git a/app/react/docker/containers/CreateView/VolumesTab/Item.tsx b/app/react/docker/containers/CreateView/VolumesTab/Item.tsx index caf351231..22f3b2629 100644 --- a/app/react/docker/containers/CreateView/VolumesTab/Item.tsx +++ b/app/react/docker/containers/CreateView/VolumesTab/Item.tsx @@ -1,12 +1,12 @@ import _ from 'lodash'; import { ArrowRight } from 'lucide-react'; -import { Icon } from '@@CE/Icon'; -import { ButtonSelector } from '@@CE/form-components/ButtonSelector/ButtonSelector'; -import { FormError } from '@@CE/form-components/FormError'; -import { InputGroup } from '@@CE/form-components/InputGroup'; -import { ItemProps } from '@@CE/form-components/InputList'; -import { InputLabeled } from '@@CE/form-components/Input/InputLabeled'; +import { Icon } from '@@/Icon'; +import { ButtonSelector } from '@@/form-components/ButtonSelector/ButtonSelector'; +import { FormError } from '@@/form-components/FormError'; +import { InputGroup } from '@@/form-components/InputGroup'; +import { ItemProps } from '@@/form-components/InputList'; +import { InputLabeled } from '@@/form-components/Input/InputLabeled'; import { Volume } from './types'; import { useInputContext } from './context'; diff --git a/app/react/docker/containers/CreateView/VolumesTab/VolumeSelector.tsx b/app/react/docker/containers/CreateView/VolumesTab/VolumeSelector.tsx index 5b8a2d448..788a94b81 100644 --- a/app/react/docker/containers/CreateView/VolumesTab/VolumeSelector.tsx +++ b/app/react/docker/containers/CreateView/VolumesTab/VolumeSelector.tsx @@ -1,10 +1,10 @@ import { components, OptionProps } from 'react-select'; -import { truncate } from '@CE/portainer/filters/filters'; -import { useVolumes } from '@CE/react/docker/volumes/queries/useVolumes'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { truncate } from '@/portainer/filters/filters'; +import { useVolumes } from '@/react/docker/volumes/queries/useVolumes'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import { Select } from '@@CE/form-components/ReactSelect'; +import { Select } from '@@/form-components/ReactSelect'; export function VolumeSelector({ value, diff --git a/app/react/docker/containers/CreateView/VolumesTab/VolumesTab.tsx b/app/react/docker/containers/CreateView/VolumesTab/VolumesTab.tsx index 1d376bbbd..4d5ff34e4 100644 --- a/app/react/docker/containers/CreateView/VolumesTab/VolumesTab.tsx +++ b/app/react/docker/containers/CreateView/VolumesTab/VolumesTab.tsx @@ -1,10 +1,10 @@ import { useMemo } from 'react'; -import { useIsEnvironmentAdmin } from '@CE/react/hooks/useUser'; -import { useCurrentEnvironment } from '@CE/react/hooks/useCurrentEnvironment'; +import { useIsEnvironmentAdmin } from '@/react/hooks/useUser'; +import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment'; -import { InputList } from '@@CE/form-components/InputList'; -import { ArrayError } from '@@CE/form-components/InputList/InputList'; +import { InputList } from '@@/form-components/InputList'; +import { ArrayError } from '@@/form-components/InputList/InputList'; import { Values, Volume } from './types'; import { InputContext } from './context'; diff --git a/app/react/docker/containers/CreateView/toRequest.ts b/app/react/docker/containers/CreateView/toRequest.ts index 1416c68ac..71f4163c4 100644 --- a/app/react/docker/containers/CreateView/toRequest.ts +++ b/app/react/docker/containers/CreateView/toRequest.ts @@ -1,5 +1,5 @@ -import { Registry } from '@CE/react/portainer/registries/types/registry'; -import { buildImageFullURI } from '@CE/react/docker/images/utils'; +import { Registry } from '@/react/portainer/registries/types/registry'; +import { buildImageFullURI } from '@/react/docker/images/utils'; import { baseFormUtils } from './BaseForm'; import { capabilitiesTabUtils } from './CapabilitiesTab'; diff --git a/app/react/docker/containers/CreateView/useCreateMutation.tsx b/app/react/docker/containers/CreateView/useCreateMutation.tsx index 482ff0981..41dfbe2f6 100644 --- a/app/react/docker/containers/CreateView/useCreateMutation.tsx +++ b/app/react/docker/containers/CreateView/useCreateMutation.tsx @@ -1,29 +1,29 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; import { Environment, EnvironmentId, EnvironmentType, -} from '@CE/react/portainer/environments/types'; +} from '@/react/portainer/environments/types'; import { Registry, RegistryId, -} from '@CE/react/portainer/registries/types/registry'; -import { createWebhook } from '@CE/react/portainer/webhooks/createWebhook'; -import { WebhookType } from '@CE/react/portainer/webhooks/types'; +} from '@/react/portainer/registries/types/registry'; +import { createWebhook } from '@/react/portainer/webhooks/createWebhook'; +import { WebhookType } from '@/react/portainer/webhooks/types'; import { AccessControlFormData, ResourceControlResponse, -} from '@CE/react/portainer/access-control/types'; -import { applyResourceControl } from '@CE/react/portainer/access-control/access-control.service'; -import PortainerError from '@CE/portainer/error'; +} from '@/react/portainer/access-control/types'; +import { applyResourceControl } from '@/react/portainer/access-control/access-control.service'; +import PortainerError from '@/portainer/error'; import { mutationOptions, withError, withInvalidate, -} from '@CE/react-tools/react-query'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +} from '@/react-tools/react-query'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; import { pullImage } from '../../images/queries/usePullImageMutation'; import { diff --git a/app/react/docker/containers/CreateView/useInitialValues.ts b/app/react/docker/containers/CreateView/useInitialValues.ts index 44ceca1bd..7b143ae3b 100644 --- a/app/react/docker/containers/CreateView/useInitialValues.ts +++ b/app/react/docker/containers/CreateView/useInitialValues.ts @@ -1,47 +1,47 @@ import { useCurrentStateAndParams } from '@uirouter/react'; -import { useIsPodman } from '@CE/react/portainer/environments/queries/useIsPodman'; +import { useIsPodman } from '@/react/portainer/environments/queries/useIsPodman'; import { BaseFormValues, baseFormUtils, -} from '@CE/react/docker/containers/CreateView/BaseForm'; +} from '@/react/docker/containers/CreateView/BaseForm'; import { CapabilitiesTabValues, capabilitiesTabUtils, -} from '@CE/react/docker/containers/CreateView/CapabilitiesTab'; +} from '@/react/docker/containers/CreateView/CapabilitiesTab'; import { CommandsTabValues, commandsTabUtils, -} from '@CE/react/docker/containers/CreateView/CommandsTab'; +} from '@/react/docker/containers/CreateView/CommandsTab'; import { LabelsTabValues, labelsTabUtils, -} from '@CE/react/docker/containers/CreateView/LabelsTab'; +} from '@/react/docker/containers/CreateView/LabelsTab'; import { NetworkTabValues, networkTabUtils, -} from '@CE/react/docker/containers/CreateView/NetworkTab'; +} from '@/react/docker/containers/CreateView/NetworkTab'; import { ResourcesTabValues, resourcesTabUtils, -} from '@CE/react/docker/containers/CreateView/ResourcesTab'; +} from '@/react/docker/containers/CreateView/ResourcesTab'; import { RestartPolicy, restartPolicyTabUtils, -} from '@CE/react/docker/containers/CreateView/RestartPolicyTab'; +} from '@/react/docker/containers/CreateView/RestartPolicyTab'; import { VolumesTabValues, volumesTabUtils, -} from '@CE/react/docker/containers/CreateView/VolumesTab'; -import { envVarsTabUtils } from '@CE/react/docker/containers/CreateView/EnvVarsTab'; -import { UserId } from '@CE/portainer/users/types'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { useCurrentUser } from '@CE/react/hooks/useUser'; -import { useWebhooks } from '@CE/react/portainer/webhooks/useWebhooks'; -import { useEnvironmentRegistries } from '@CE/react/portainer/environments/queries/useEnvironmentRegistries'; +} from '@/react/docker/containers/CreateView/VolumesTab'; +import { envVarsTabUtils } from '@/react/docker/containers/CreateView/EnvVarsTab'; +import { UserId } from '@/portainer/users/types'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { useCurrentUser } from '@/react/hooks/useUser'; +import { useWebhooks } from '@/react/portainer/webhooks/useWebhooks'; +import { useEnvironmentRegistries } from '@/react/portainer/environments/queries/useEnvironmentRegistries'; -import { getImageConfig } from '@@CE/ImageConfigFieldset/getImageConfig'; -import { EnvVarValues } from '@@CE/form-components/EnvironmentVariablesFieldset'; +import { getImageConfig } from '@@/ImageConfigFieldset/getImageConfig'; +import { EnvVarValues } from '@@/form-components/EnvironmentVariablesFieldset'; import { useNetworksForSelector } from '../components/NetworkSelector'; import { useContainers } from '../queries/useContainers'; diff --git a/app/react/docker/containers/InspectView/InspectView.tsx b/app/react/docker/containers/InspectView/InspectView.tsx index 277d7e60b..df6b4d5ad 100644 --- a/app/react/docker/containers/InspectView/InspectView.tsx +++ b/app/react/docker/containers/InspectView/InspectView.tsx @@ -2,14 +2,14 @@ import { useCurrentStateAndParams } from '@uirouter/react'; import { Circle, Code as CodeIcon, File } from 'lucide-react'; import { useState } from 'react'; -import { trimContainerName } from '@CE/docker/filters/utils'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { trimContainerName } from '@/docker/filters/utils'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import { JsonTree } from '@@CE/JsonTree'; -import { PageHeader } from '@@CE/PageHeader'; -import { Widget } from '@@CE/Widget'; -import { ButtonSelector } from '@@CE/form-components/ButtonSelector/ButtonSelector'; -import { Code } from '@@CE/Code'; +import { JsonTree } from '@@/JsonTree'; +import { PageHeader } from '@@/PageHeader'; +import { Widget } from '@@/Widget'; +import { ButtonSelector } from '@@/form-components/ButtonSelector/ButtonSelector'; +import { Code } from '@@/Code'; import { useContainerInspect } from '../queries/useContainerInspect'; diff --git a/app/react/docker/containers/ItemView/ConfirmRecreationModal.tsx b/app/react/docker/containers/ItemView/ConfirmRecreationModal.tsx index 6b3884830..2024e15a2 100644 --- a/app/react/docker/containers/ItemView/ConfirmRecreationModal.tsx +++ b/app/react/docker/containers/ItemView/ConfirmRecreationModal.tsx @@ -1,9 +1,9 @@ import { useState } from 'react'; -import { Modal, OnSubmit, ModalType, openModal } from '@@CE/modals'; -import { Button } from '@@CE/buttons'; -import { SwitchField } from '@@CE/form-components/SwitchField'; -import { TextTip } from '@@CE/Tip/TextTip'; +import { Modal, OnSubmit, ModalType, openModal } from '@@/modals'; +import { Button } from '@@/buttons'; +import { SwitchField } from '@@/form-components/SwitchField'; +import { TextTip } from '@@/Tip/TextTip'; interface Props { onSubmit: OnSubmit<{ pullLatest: boolean }>; diff --git a/app/react/docker/containers/ItemView/ContainerNetworksDatatable/ConnectNetworkForm.tsx b/app/react/docker/containers/ItemView/ContainerNetworksDatatable/ConnectNetworkForm.tsx index c5d69c969..7560da2a4 100644 --- a/app/react/docker/containers/ItemView/ContainerNetworksDatatable/ConnectNetworkForm.tsx +++ b/app/react/docker/containers/ItemView/ContainerNetworksDatatable/ConnectNetworkForm.tsx @@ -2,12 +2,12 @@ import { Form, Formik } from 'formik'; import { SchemaOf, object, string } from 'yup'; import { useRouter } from '@uirouter/react'; -import { useAuthorizations } from '@CE/react/hooks/useUser'; -import { useConnectContainerMutation } from '@CE/react/docker/networks/queries/useConnectContainerMutation'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { useAuthorizations } from '@/react/hooks/useUser'; +import { useConnectContainerMutation } from '@/react/docker/networks/queries/useConnectContainerMutation'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import { FormControl } from '@@CE/form-components/FormControl'; -import { LoadingButton } from '@@CE/buttons'; +import { FormControl } from '@@/form-components/FormControl'; +import { LoadingButton } from '@@/buttons'; import { NetworkSelector } from '../../components/NetworkSelector'; diff --git a/app/react/docker/containers/ItemView/ContainerNetworksDatatable/ContainerNetworksDatatable.tsx b/app/react/docker/containers/ItemView/ContainerNetworksDatatable/ContainerNetworksDatatable.tsx index 799d5f4c4..d73d0c44f 100644 --- a/app/react/docker/containers/ItemView/ContainerNetworksDatatable/ContainerNetworksDatatable.tsx +++ b/app/react/docker/containers/ItemView/ContainerNetworksDatatable/ContainerNetworksDatatable.tsx @@ -2,11 +2,11 @@ import { useMemo } from 'react'; import { Network } from 'lucide-react'; import { EndpointSettings, NetworkSettings } from 'docker-types/generated/1.44'; -import { createPersistedStore } from '@@CE/datatables/types'; -import { useTableState } from '@@CE/datatables/useTableState'; -import { ExpandableDatatable } from '@@CE/datatables/ExpandableDatatable'; -import { withMeta } from '@@CE/datatables/extend-options/withMeta'; -import { mergeOptions } from '@@CE/datatables/extend-options/mergeOptions'; +import { createPersistedStore } from '@@/datatables/types'; +import { useTableState } from '@@/datatables/useTableState'; +import { ExpandableDatatable } from '@@/datatables/ExpandableDatatable'; +import { withMeta } from '@@/datatables/extend-options/withMeta'; +import { mergeOptions } from '@@/datatables/extend-options/mergeOptions'; import { ContainerListViewModel } from '../../types'; diff --git a/app/react/docker/containers/ItemView/ContainerNetworksDatatable/actions.tsx b/app/react/docker/containers/ItemView/ContainerNetworksDatatable/actions.tsx index 32db50291..795988b5e 100644 --- a/app/react/docker/containers/ItemView/ContainerNetworksDatatable/actions.tsx +++ b/app/react/docker/containers/ItemView/ContainerNetworksDatatable/actions.tsx @@ -1,12 +1,12 @@ import { CellContext } from '@tanstack/react-table'; import { useRouter } from '@uirouter/react'; -import { Authorized } from '@CE/react/hooks/useUser'; -import { useDisconnectContainer } from '@CE/react/docker/networks/queries/useDisconnectContainerMutation'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { notifySuccess } from '@CE/portainer/services/notifications'; +import { Authorized } from '@/react/hooks/useUser'; +import { useDisconnectContainer } from '@/react/docker/networks/queries/useDisconnectContainerMutation'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { notifySuccess } from '@/portainer/services/notifications'; -import { LoadingButton } from '@@CE/buttons'; +import { LoadingButton } from '@@/buttons'; import { TableNetwork, isContainerNetworkTableMeta } from './types'; import { columnHelper } from './helper'; diff --git a/app/react/docker/containers/ItemView/ContainerNetworksDatatable/columns.tsx b/app/react/docker/containers/ItemView/ContainerNetworksDatatable/columns.tsx index cc86e84c5..53358b542 100644 --- a/app/react/docker/containers/ItemView/ContainerNetworksDatatable/columns.tsx +++ b/app/react/docker/containers/ItemView/ContainerNetworksDatatable/columns.tsx @@ -1,5 +1,5 @@ -import { buildExpandColumn } from '@@CE/datatables/expand-column'; -import { buildNameColumnFromObject } from '@@CE/datatables/buildNameColumn'; +import { buildExpandColumn } from '@@/datatables/expand-column'; +import { buildNameColumnFromObject } from '@@/datatables/buildNameColumn'; import { TableNetwork } from './types'; import { columnHelper } from './helper'; diff --git a/app/react/docker/containers/ItemView/HealthStatus.tsx b/app/react/docker/containers/ItemView/HealthStatus.tsx index 1783126cc..347e1826d 100644 --- a/app/react/docker/containers/ItemView/HealthStatus.tsx +++ b/app/react/docker/containers/ItemView/HealthStatus.tsx @@ -1,9 +1,9 @@ import { ComponentProps } from 'react'; import { HeartPulse, Server } from 'lucide-react'; -import { TableContainer, TableTitle } from '@@CE/datatables'; -import { DetailsTable } from '@@CE/DetailsTable'; -import { Icon } from '@@CE/Icon'; +import { TableContainer, TableTitle } from '@@/datatables'; +import { DetailsTable } from '@@/DetailsTable'; +import { Icon } from '@@/Icon'; import { Health } from '../types/response'; diff --git a/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatable.tsx b/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatable.tsx index 994b6b677..1d9a6922c 100644 --- a/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatable.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatable.tsx @@ -1,22 +1,22 @@ import { Box } from 'lucide-react'; -import { ContainerListViewModel } from '@CE/react/docker/containers/types'; -import { useShowGPUsColumn } from '@CE/react/docker/containers/utils'; -import { Environment } from '@CE/react/portainer/environments/types'; +import { ContainerListViewModel } from '@/react/docker/containers/types'; +import { useShowGPUsColumn } from '@/react/docker/containers/utils'; +import { Environment } from '@/react/portainer/environments/types'; -import { Datatable, Table } from '@@CE/datatables'; +import { Datatable, Table } from '@@/datatables'; import { ColumnVisibilityMenu, getColumnVisibilityState, -} from '@@CE/datatables/ColumnVisibilityMenu'; +} from '@@/datatables/ColumnVisibilityMenu'; import { QuickActionsSettings, buildAction, -} from '@@CE/datatables/QuickActionsSettings'; -import { mergeOptions } from '@@CE/datatables/extend-options/mergeOptions'; -import { withColumnFilters } from '@@CE/datatables/extend-options/withColumnFilters'; -import { TableSettingsProvider } from '@@CE/datatables/useTableSettings'; -import { useTableState } from '@@CE/datatables/useTableState'; +} from '@@/datatables/QuickActionsSettings'; +import { mergeOptions } from '@@/datatables/extend-options/mergeOptions'; +import { withColumnFilters } from '@@/datatables/extend-options/withColumnFilters'; +import { TableSettingsProvider } from '@@/datatables/useTableSettings'; +import { useTableState } from '@@/datatables/useTableState'; import { useContainers } from '../../queries/useContainers'; diff --git a/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableActions.tsx b/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableActions.tsx index e2b212a02..fe6ea0470 100644 --- a/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableActions.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableActions.tsx @@ -1,15 +1,15 @@ import { useRouter } from '@uirouter/react'; import { Pause, Play, RefreshCw, Slash, Square, Trash2 } from 'lucide-react'; -import * as notifications from '@CE/portainer/services/notifications'; -import { useAuthorizations, Authorized } from '@CE/react/hooks/useUser'; -import { confirmContainerDeletion } from '@CE/react/docker/containers/common/confirm-container-delete-modal'; -import { setPortainerAgentTargetHeader } from '@CE/portainer/services/http-request.helper'; +import * as notifications from '@/portainer/services/notifications'; +import { useAuthorizations, Authorized } from '@/react/hooks/useUser'; +import { confirmContainerDeletion } from '@/react/docker/containers/common/confirm-container-delete-modal'; +import { setPortainerAgentTargetHeader } from '@/portainer/services/http-request.helper'; import { ContainerId, ContainerStatus, ContainerListViewModel, -} from '@CE/react/docker/containers/types'; +} from '@/react/docker/containers/types'; import { killContainer, pauseContainer, @@ -18,10 +18,10 @@ import { resumeContainer, startContainer, stopContainer, -} from '@CE/react/docker/containers/containers.service'; -import type { EnvironmentId } from '@CE/react/portainer/environments/types'; +} from '@/react/docker/containers/containers.service'; +import type { EnvironmentId } from '@/react/portainer/environments/types'; -import { ButtonGroup, Button, AddButton } from '@@CE/buttons'; +import { ButtonGroup, Button, AddButton } from '@@/buttons'; type ContainerServiceAction = ( endpointId: EnvironmentId, diff --git a/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableSettings.tsx b/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableSettings.tsx index 016a83f57..0146aaa49 100644 --- a/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableSettings.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableSettings.tsx @@ -1,5 +1,5 @@ -import { Checkbox } from '@@CE/form-components/Checkbox'; -import { TableSettingsMenuAutoRefresh } from '@@CE/datatables/TableSettingsMenuAutoRefresh'; +import { Checkbox } from '@@/form-components/Checkbox'; +import { TableSettingsMenuAutoRefresh } from '@@/datatables/TableSettingsMenuAutoRefresh'; import { TableSettings } from './types'; import { TRUNCATE_LENGTH } from './datatable-store'; diff --git a/app/react/docker/containers/ListView/ContainersDatatable/RowContext.ts b/app/react/docker/containers/ListView/ContainersDatatable/RowContext.ts index 541ab2f7d..66af35873 100644 --- a/app/react/docker/containers/ListView/ContainersDatatable/RowContext.ts +++ b/app/react/docker/containers/ListView/ContainersDatatable/RowContext.ts @@ -1,6 +1,6 @@ -import { Environment } from '@CE/react/portainer/environments/types'; +import { Environment } from '@/react/portainer/environments/types'; -import { createRowContext } from '@@CE/datatables/RowContext'; +import { createRowContext } from '@@/datatables/RowContext'; interface RowContextState { environment: Environment; diff --git a/app/react/docker/containers/ListView/ContainersDatatable/columns/created.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/created.tsx index 7260a5c63..025243bad 100644 --- a/app/react/docker/containers/ListView/ContainersDatatable/columns/created.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/created.tsx @@ -1,4 +1,4 @@ -import { isoDateFromTimestamp } from '@CE/portainer/filters/filters'; +import { isoDateFromTimestamp } from '@/portainer/filters/filters'; import { columnHelper } from './helper'; diff --git a/app/react/docker/containers/ListView/ContainersDatatable/columns/gpus.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/gpus.tsx index 02de4ec20..fbf83baa8 100644 --- a/app/react/docker/containers/ListView/ContainersDatatable/columns/gpus.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/gpus.tsx @@ -1,8 +1,8 @@ import { CellContext } from '@tanstack/react-table'; -import type { ContainerListViewModel } from '@CE/react/docker/containers/types'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { useContainerGpus } from '@CE/react/docker/containers/queries/gpus'; +import type { ContainerListViewModel } from '@/react/docker/containers/types'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { useContainerGpus } from '@/react/docker/containers/queries/gpus'; import { columnHelper } from './helper'; diff --git a/app/react/docker/containers/ListView/ContainersDatatable/columns/image.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/image.tsx index 0247e17a5..23971fb50 100644 --- a/app/react/docker/containers/ListView/ContainersDatatable/columns/image.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/image.tsx @@ -1,7 +1,7 @@ import { CellContext } from '@tanstack/react-table'; import { useSref } from '@uirouter/react'; -import type { ContainerListViewModel } from '@CE/react/docker/containers/types'; +import type { ContainerListViewModel } from '@/react/docker/containers/types'; import { columnHelper } from './helper'; diff --git a/app/react/docker/containers/ListView/ContainersDatatable/columns/index.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/index.tsx index 6eee4b1a8..ad84eda39 100644 --- a/app/react/docker/containers/ListView/ContainersDatatable/columns/index.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/index.tsx @@ -1,8 +1,8 @@ import _ from 'lodash'; import { useMemo } from 'react'; -import { createOwnershipColumn } from '@CE/react/docker/components/datatable/createOwnershipColumn'; -import { ContainerListViewModel } from '@CE/react/docker/containers/types'; +import { createOwnershipColumn } from '@/react/docker/components/datatable/createOwnershipColumn'; +import { ContainerListViewModel } from '@/react/docker/containers/types'; import { created } from './created'; import { host } from './host'; diff --git a/app/react/docker/containers/ListView/ContainersDatatable/columns/name.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/name.tsx index 6d9c2e560..bb4263a30 100644 --- a/app/react/docker/containers/ListView/ContainersDatatable/columns/name.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/name.tsx @@ -2,9 +2,9 @@ import { CellContext } from '@tanstack/react-table'; import _ from 'lodash'; import { useSref } from '@uirouter/react'; -import type { ContainerListViewModel } from '@CE/react/docker/containers/types'; +import type { ContainerListViewModel } from '@/react/docker/containers/types'; -import { useTableSettings } from '@@CE/datatables/useTableSettings'; +import { useTableSettings } from '@@/datatables/useTableSettings'; import { TableSettings } from '../types'; diff --git a/app/react/docker/containers/ListView/ContainersDatatable/columns/ports.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/ports.tsx index b6778b6a8..00045b809 100644 --- a/app/react/docker/containers/ListView/ContainersDatatable/columns/ports.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/ports.tsx @@ -1,8 +1,8 @@ import _ from 'lodash'; import { CellContext } from '@tanstack/react-table'; -import { PublishedPortLink } from '@CE/react/docker/components/ImageStatus/PublishedPortLink'; -import type { ContainerListViewModel } from '@CE/react/docker/containers/types'; +import { PublishedPortLink } from '@/react/docker/components/ImageStatus/PublishedPortLink'; +import type { ContainerListViewModel } from '@/react/docker/containers/types'; import { useRowContext } from '../RowContext'; diff --git a/app/react/docker/containers/ListView/ContainersDatatable/columns/quick-actions.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/quick-actions.tsx index 8813b9d21..429ec2652 100644 --- a/app/react/docker/containers/ListView/ContainersDatatable/columns/quick-actions.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/quick-actions.tsx @@ -1,10 +1,10 @@ import { CellContext } from '@tanstack/react-table'; -import { useAuthorizations } from '@CE/react/hooks/useUser'; -import { ContainerQuickActions } from '@CE/react/docker/containers/components/ContainerQuickActions'; -import { ContainerListViewModel } from '@CE/react/docker/containers/types'; +import { useAuthorizations } from '@/react/hooks/useUser'; +import { ContainerQuickActions } from '@/react/docker/containers/components/ContainerQuickActions'; +import { ContainerListViewModel } from '@/react/docker/containers/types'; -import { useTableSettings } from '@@CE/datatables/useTableSettings'; +import { useTableSettings } from '@@/datatables/useTableSettings'; import { TableSettings } from '../types'; diff --git a/app/react/docker/containers/ListView/ContainersDatatable/columns/state.tsx b/app/react/docker/containers/ListView/ContainersDatatable/columns/state.tsx index 2b838d37a..350e232d8 100644 --- a/app/react/docker/containers/ListView/ContainersDatatable/columns/state.tsx +++ b/app/react/docker/containers/ListView/ContainersDatatable/columns/state.tsx @@ -4,10 +4,10 @@ import { CellContext } from '@tanstack/react-table'; import { type ContainerListViewModel, ContainerStatus, -} from '@CE/react/docker/containers/types'; +} from '@/react/docker/containers/types'; -import { filterHOC } from '@@CE/datatables/Filter'; -import { multiple } from '@@CE/datatables/filter-types'; +import { filterHOC } from '@@/datatables/Filter'; +import { multiple } from '@@/datatables/filter-types'; import { columnHelper } from './helper'; diff --git a/app/react/docker/containers/ListView/ContainersDatatable/datatable-store.ts b/app/react/docker/containers/ListView/ContainersDatatable/datatable-store.ts index fba66dc6e..3c4877661 100644 --- a/app/react/docker/containers/ListView/ContainersDatatable/datatable-store.ts +++ b/app/react/docker/containers/ListView/ContainersDatatable/datatable-store.ts @@ -3,7 +3,7 @@ import { hiddenColumnsSettings, createPersistedStore, filteredColumnsSettings, -} from '@@CE/datatables/types'; +} from '@@/datatables/types'; import { QuickAction, TableSettings } from './types'; diff --git a/app/react/docker/containers/ListView/ContainersDatatable/types.ts b/app/react/docker/containers/ListView/ContainersDatatable/types.ts index ee496706f..ec1919034 100644 --- a/app/react/docker/containers/ListView/ContainersDatatable/types.ts +++ b/app/react/docker/containers/ListView/ContainersDatatable/types.ts @@ -3,7 +3,7 @@ import { FilteredColumnsTableSettings, RefreshableTableSettings, SettableColumnsTableSettings, -} from '@@CE/datatables/types'; +} from '@@/datatables/types'; export type QuickAction = 'attach' | 'exec' | 'inspect' | 'logs' | 'stats'; diff --git a/app/react/docker/containers/ListView/ListView.tsx b/app/react/docker/containers/ListView/ListView.tsx index b5a63196f..cef7fca63 100644 --- a/app/react/docker/containers/ListView/ListView.tsx +++ b/app/react/docker/containers/ListView/ListView.tsx @@ -1,8 +1,8 @@ -import { useInfo } from '@CE/react/docker/proxy/queries/useInfo'; -import { Environment } from '@CE/react/portainer/environments/types'; -import { isAgentEnvironment } from '@CE/react/portainer/environments/utils'; +import { useInfo } from '@/react/docker/proxy/queries/useInfo'; +import { Environment } from '@/react/portainer/environments/types'; +import { isAgentEnvironment } from '@/react/portainer/environments/utils'; -import { PageHeader } from '@@CE/PageHeader'; +import { PageHeader } from '@@/PageHeader'; import { ContainersDatatable } from './ContainersDatatable'; diff --git a/app/react/docker/containers/LogView/LogView.tsx b/app/react/docker/containers/LogView/LogView.tsx index 15855b242..8991fb748 100644 --- a/app/react/docker/containers/LogView/LogView.tsx +++ b/app/react/docker/containers/LogView/LogView.tsx @@ -1,10 +1,10 @@ import { useCurrentStateAndParams } from '@uirouter/react'; -import { useContainer } from '@CE/react/docker/containers/queries/useContainer'; +import { useContainer } from '@/react/docker/containers/queries/useContainer'; -import { InformationPanel } from '@@CE/InformationPanel'; -import { TextTip } from '@@CE/Tip/TextTip'; -import { Link } from '@@CE/Link'; +import { InformationPanel } from '@@/InformationPanel'; +import { TextTip } from '@@/Tip/TextTip'; +import { Link } from '@@/Link'; export function LogView() { const { diff --git a/app/react/docker/containers/StatsView/ProcessesDatatable.tsx b/app/react/docker/containers/StatsView/ProcessesDatatable.tsx index 65454f0d3..e4892bba0 100644 --- a/app/react/docker/containers/StatsView/ProcessesDatatable.tsx +++ b/app/react/docker/containers/StatsView/ProcessesDatatable.tsx @@ -2,11 +2,11 @@ import { ColumnDef } from '@tanstack/react-table'; import { List } from 'lucide-react'; import { useCurrentStateAndParams } from '@uirouter/react'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import { Datatable } from '@@CE/datatables'; -import { createPersistedStore } from '@@CE/datatables/types'; -import { useTableState } from '@@CE/datatables/useTableState'; +import { Datatable } from '@@/datatables'; +import { createPersistedStore } from '@@/datatables/types'; +import { useTableState } from '@@/datatables/useTableState'; import { useContainerTop } from '../queries/useContainerTop'; import { ContainerProcesses } from '../queries/types'; diff --git a/app/react/docker/containers/common/confirm-container-delete-modal.ts b/app/react/docker/containers/common/confirm-container-delete-modal.ts index f1e48ffb3..588c274bf 100644 --- a/app/react/docker/containers/common/confirm-container-delete-modal.ts +++ b/app/react/docker/containers/common/confirm-container-delete-modal.ts @@ -1,6 +1,6 @@ -import { ModalType } from '@@CE/modals'; -import { openSwitchPrompt } from '@@CE/modals/SwitchPrompt'; -import { buildConfirmButton } from '@@CE/modals/utils'; +import { ModalType } from '@@/modals'; +import { openSwitchPrompt } from '@@/modals/SwitchPrompt'; +import { buildConfirmButton } from '@@/modals/utils'; export async function confirmContainerDeletion(title: string) { const result = await openSwitchPrompt( diff --git a/app/react/docker/containers/components/ContainerQuickActions/ContainerQuickActions.tsx b/app/react/docker/containers/components/ContainerQuickActions/ContainerQuickActions.tsx index 9038f048d..fe2da97d5 100644 --- a/app/react/docker/containers/components/ContainerQuickActions/ContainerQuickActions.tsx +++ b/app/react/docker/containers/components/ContainerQuickActions/ContainerQuickActions.tsx @@ -1,11 +1,11 @@ import clsx from 'clsx'; import { BarChart, FileText, Info, Paperclip, Terminal } from 'lucide-react'; -import { ContainerStatus } from '@CE/react/docker/containers/types'; -import { Authorized } from '@CE/react/hooks/useUser'; +import { ContainerStatus } from '@/react/docker/containers/types'; +import { Authorized } from '@/react/hooks/useUser'; -import { Icon } from '@@CE/Icon'; -import { Link } from '@@CE/Link'; +import { Icon } from '@@/Icon'; +import { Link } from '@@/Link'; import styles from './ContainerQuickActions.module.css'; diff --git a/app/react/docker/containers/components/NetworkSelector.tsx b/app/react/docker/containers/components/NetworkSelector.tsx index c3e415553..4eba4008d 100644 --- a/app/react/docker/containers/components/NetworkSelector.tsx +++ b/app/react/docker/containers/components/NetworkSelector.tsx @@ -1,13 +1,13 @@ import { useMemo } from 'react'; -import { useNetworks } from '@CE/react/docker/networks/queries/useNetworks'; -import { DockerNetwork } from '@CE/react/docker/networks/types'; -import { useIsSwarm } from '@CE/react/docker/proxy/queries/useInfo'; -import { useApiVersion } from '@CE/react/docker/proxy/queries/useVersion'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { useIsPodman } from '@CE/react/portainer/environments/queries/useIsPodman'; +import { useNetworks } from '@/react/docker/networks/queries/useNetworks'; +import { DockerNetwork } from '@/react/docker/networks/types'; +import { useIsSwarm } from '@/react/docker/proxy/queries/useInfo'; +import { useApiVersion } from '@/react/docker/proxy/queries/useVersion'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { useIsPodman } from '@/react/portainer/environments/queries/useIsPodman'; -import { Option, PortainerSelect } from '@@CE/form-components/PortainerSelect'; +import { Option, PortainerSelect } from '@@/form-components/PortainerSelect'; export function NetworkSelector({ onChange, diff --git a/app/react/docker/containers/containers.service.ts b/app/react/docker/containers/containers.service.ts index 430cf2b7c..4fb2b3f96 100644 --- a/app/react/docker/containers/containers.service.ts +++ b/app/react/docker/containers/containers.service.ts @@ -1,8 +1,8 @@ import _ from 'lodash'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import PortainerError from '@CE/portainer/error'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import PortainerError from '@/portainer/error'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; import { withAgentTargetHeader } from '../proxy/queries/utils'; import { buildDockerProxyUrl } from '../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/containers/queries/gpus.tsx b/app/react/docker/containers/queries/gpus.tsx index f1af2724c..c342a688b 100644 --- a/app/react/docker/containers/queries/gpus.tsx +++ b/app/react/docker/containers/queries/gpus.tsx @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; import { queryKeys } from './query-keys'; diff --git a/app/react/docker/containers/queries/query-keys.ts b/app/react/docker/containers/queries/query-keys.ts index 87e4d78b4..30661cdaa 100644 --- a/app/react/docker/containers/queries/query-keys.ts +++ b/app/react/docker/containers/queries/query-keys.ts @@ -1,4 +1,4 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys as dockerQueryKeys } from '../../queries/utils'; diff --git a/app/react/docker/containers/queries/useContainer.ts b/app/react/docker/containers/queries/useContainer.ts index 3edb75361..a28ef821d 100644 --- a/app/react/docker/containers/queries/useContainer.ts +++ b/app/react/docker/containers/queries/useContainer.ts @@ -8,11 +8,11 @@ import { NetworkSettings, } from 'docker-types/generated/1.44'; -import { PortainerResponse } from '@CE/react/docker/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { ContainerId } from '@CE/react/docker/containers/types'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { queryClient } from '@CE/react-tools/react-query'; +import { PortainerResponse } from '@/react/docker/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { ContainerId } from '@/react/docker/containers/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { queryClient } from '@/react-tools/react-query'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; import { withAgentTargetHeader } from '../../proxy/queries/utils'; diff --git a/app/react/docker/containers/queries/useContainerInspect.ts b/app/react/docker/containers/queries/useContainerInspect.ts index 60708076f..820194d49 100644 --- a/app/react/docker/containers/queries/useContainerInspect.ts +++ b/app/react/docker/containers/queries/useContainerInspect.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; import { ContainerId } from '../types'; import { withAgentTargetHeader } from '../../proxy/queries/utils'; diff --git a/app/react/docker/containers/queries/useContainerResizeTTYMutation.ts b/app/react/docker/containers/queries/useContainerResizeTTYMutation.ts index 2f77707e4..d3bf67477 100644 --- a/app/react/docker/containers/queries/useContainerResizeTTYMutation.ts +++ b/app/react/docker/containers/queries/useContainerResizeTTYMutation.ts @@ -1,5 +1,5 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/containers/queries/useContainerStats.ts b/app/react/docker/containers/queries/useContainerStats.ts index 6598aa479..de117a101 100644 --- a/app/react/docker/containers/queries/useContainerStats.ts +++ b/app/react/docker/containers/queries/useContainerStats.ts @@ -1,5 +1,5 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; import { ContainerId } from '../types'; diff --git a/app/react/docker/containers/queries/useContainerTop.ts b/app/react/docker/containers/queries/useContainerTop.ts index 477fdcca5..f07f1a7fe 100644 --- a/app/react/docker/containers/queries/useContainerTop.ts +++ b/app/react/docker/containers/queries/useContainerTop.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; import { ContainerId } from '../types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/containers/queries/useContainers.ts b/app/react/docker/containers/queries/useContainers.ts index f8532e50a..b4be5987a 100644 --- a/app/react/docker/containers/queries/useContainers.ts +++ b/app/react/docker/containers/queries/useContainers.ts @@ -1,8 +1,8 @@ import { useQuery } from '@tanstack/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { withGlobalError } from '@CE/react-tools/react-query'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { withGlobalError } from '@/react-tools/react-query'; import { DockerContainerResponse } from '../types/response'; import { toListViewModel } from '../utils'; diff --git a/app/react/docker/containers/queries/useCreateExecMutation.ts b/app/react/docker/containers/queries/useCreateExecMutation.ts index 547c37950..44b044272 100644 --- a/app/react/docker/containers/queries/useCreateExecMutation.ts +++ b/app/react/docker/containers/queries/useCreateExecMutation.ts @@ -1,5 +1,5 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; import { ContainerId } from '../types'; diff --git a/app/react/docker/containers/queries/useUpdateContainer.ts b/app/react/docker/containers/queries/useUpdateContainer.ts index 2f0e0bb99..a58d2ac8f 100644 --- a/app/react/docker/containers/queries/useUpdateContainer.ts +++ b/app/react/docker/containers/queries/useUpdateContainer.ts @@ -1,7 +1,7 @@ import { Resources, RestartPolicy } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { withAgentTargetHeader } from '../../proxy/queries/utils'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/containers/types.ts b/app/react/docker/containers/types.ts index 16bc33e60..88db551bc 100644 --- a/app/react/docker/containers/types.ts +++ b/app/react/docker/containers/types.ts @@ -1,4 +1,4 @@ -import { ResourceControlViewModel } from '@CE/react/portainer/access-control/models/ResourceControlViewModel'; +import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; import { DockerContainerResponse } from './types/response'; diff --git a/app/react/docker/containers/types/response.ts b/app/react/docker/containers/types/response.ts index 330efc620..673e31689 100644 --- a/app/react/docker/containers/types/response.ts +++ b/app/react/docker/containers/types/response.ts @@ -1,7 +1,7 @@ import { ContainerSummary } from 'docker-types/generated/1.44'; -import { PortainerResponse } from '@CE/react/docker/types'; -import { WithRequiredProperties } from '@CE/types'; +import { PortainerResponse } from '@/react/docker/types'; +import { WithRequiredProperties } from '@/types'; export type SummaryNetworkSettings = NonNullable< ContainerSummary['NetworkSettings'] diff --git a/app/react/docker/containers/utils.ts b/app/react/docker/containers/utils.ts index 2f05fd4ea..cce54b463 100644 --- a/app/react/docker/containers/utils.ts +++ b/app/react/docker/containers/utils.ts @@ -1,8 +1,8 @@ import _ from 'lodash'; -import { ResourceControlViewModel } from '@CE/react/portainer/access-control/models/ResourceControlViewModel'; -import { useIsStandAlone } from '@CE/react/docker/proxy/queries/useInfo'; -import { Environment } from '@CE/react/portainer/environments/types'; +import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; +import { useIsStandAlone } from '@/react/docker/proxy/queries/useInfo'; +import { Environment } from '@/react/portainer/environments/types'; import { ContainerListViewModel, ContainerStatus } from './types'; import { DockerContainerResponse } from './types/response'; diff --git a/app/react/docker/events/EventsDatatables.tsx b/app/react/docker/events/EventsDatatables.tsx index 578680628..220bdf516 100644 --- a/app/react/docker/events/EventsDatatables.tsx +++ b/app/react/docker/events/EventsDatatables.tsx @@ -2,11 +2,11 @@ import { createColumnHelper } from '@tanstack/react-table'; import { Clock } from 'lucide-react'; import { EventMessage } from 'docker-types/generated/1.44'; -import { isoDateFromTimestamp } from '@CE/portainer/filters/filters'; +import { isoDateFromTimestamp } from '@/portainer/filters/filters'; -import { Datatable } from '@@CE/datatables'; -import { createPersistedStore } from '@@CE/datatables/types'; -import { useTableState } from '@@CE/datatables/useTableState'; +import { Datatable } from '@@/datatables'; +import { createPersistedStore } from '@@/datatables/types'; +import { useTableState } from '@@/datatables/useTableState'; import { createEventDetails } from './model'; diff --git a/app/react/docker/events/ListView.tsx b/app/react/docker/events/ListView.tsx index 913466a25..1a4637f6b 100644 --- a/app/react/docker/events/ListView.tsx +++ b/app/react/docker/events/ListView.tsx @@ -1,9 +1,9 @@ import { useState } from 'react'; import moment from 'moment'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import { PageHeader } from '@@CE/PageHeader'; +import { PageHeader } from '@@/PageHeader'; import { useEvents } from '../proxy/queries/useEvents'; diff --git a/app/react/docker/host/BrowseView/AgentHostBrowser.tsx b/app/react/docker/host/BrowseView/AgentHostBrowser.tsx index c356f5a7d..f65f48f66 100644 --- a/app/react/docker/host/BrowseView/AgentHostBrowser.tsx +++ b/app/react/docker/host/BrowseView/AgentHostBrowser.tsx @@ -1,9 +1,9 @@ import { ComponentProps } from 'react'; -import { FilesTable } from '@CE/react/docker/components/FilesTable'; +import { FilesTable } from '@/react/docker/components/FilesTable'; -import { createPersistedStore } from '@@CE/datatables/types'; -import { useTableState } from '@@CE/datatables/useTableState'; +import { createPersistedStore } from '@@/datatables/types'; +import { useTableState } from '@@/datatables/useTableState'; const tableKey = 'host-browser'; diff --git a/app/react/docker/host/SetupView/GpusList.tsx b/app/react/docker/host/SetupView/GpusList.tsx index 49bd4fa62..982cbde70 100644 --- a/app/react/docker/host/SetupView/GpusList.tsx +++ b/app/react/docker/host/SetupView/GpusList.tsx @@ -1,11 +1,11 @@ import { array, object, string } from 'yup'; -import { r2a } from '@CE/react-tools/react2angular'; -import { withControlledInput } from '@CE/react-tools/withControlledInput'; +import { r2a } from '@/react-tools/react2angular'; +import { withControlledInput } from '@/react-tools/withControlledInput'; -import { InputList } from '@@CE/form-components/InputList'; -import { ItemProps } from '@@CE/form-components/InputList/InputList'; -import { InputGroup } from '@@CE/form-components/InputGroup'; +import { InputList } from '@@/form-components/InputList'; +import { ItemProps } from '@@/form-components/InputList/InputList'; +import { InputGroup } from '@@/form-components/InputGroup'; export interface Gpu { value: string; diff --git a/app/react/docker/images/ItemView/DockerfileDetails.tsx b/app/react/docker/images/ItemView/DockerfileDetails.tsx index b29fe36fc..33ed5528f 100644 --- a/app/react/docker/images/ItemView/DockerfileDetails.tsx +++ b/app/react/docker/images/ItemView/DockerfileDetails.tsx @@ -1,10 +1,10 @@ import { List } from 'lucide-react'; -import { joinCommand } from '@CE/docker/filters/utils'; -import { getPairKey, getPairValue } from '@CE/portainer/filters/filters'; +import { joinCommand } from '@/docker/filters/utils'; +import { getPairKey, getPairValue } from '@/portainer/filters/filters'; -import { TableContainer, TableTitle } from '@@CE/datatables'; -import { DetailsTable } from '@@CE/DetailsTable'; +import { TableContainer, TableTitle } from '@@/datatables'; +import { DetailsTable } from '@@/DetailsTable'; interface DockerImage { Command: null | Array; diff --git a/app/react/docker/images/ItemView/RegistrySelectPrompt.tsx b/app/react/docker/images/ItemView/RegistrySelectPrompt.tsx index 11a478b59..aa6c6c2e3 100644 --- a/app/react/docker/images/ItemView/RegistrySelectPrompt.tsx +++ b/app/react/docker/images/ItemView/RegistrySelectPrompt.tsx @@ -1,10 +1,10 @@ import { useState } from 'react'; -import { Registry } from '@CE/react/portainer/registries/types/registry'; +import { Registry } from '@/react/portainer/registries/types/registry'; -import { Modal, OnSubmit, openModal } from '@@CE/modals'; -import { Button } from '@@CE/buttons'; -import { PortainerSelect } from '@@CE/form-components/PortainerSelect'; +import { Modal, OnSubmit, openModal } from '@@/modals'; +import { Button } from '@@/buttons'; +import { PortainerSelect } from '@@/form-components/PortainerSelect'; interface Props { registries: Registry[]; diff --git a/app/react/docker/images/ListView/ImagesDatatable/ImagesDatatable.test.tsx b/app/react/docker/images/ListView/ImagesDatatable/ImagesDatatable.test.tsx index 3d3930174..14d228fcf 100644 --- a/app/react/docker/images/ListView/ImagesDatatable/ImagesDatatable.test.tsx +++ b/app/react/docker/images/ListView/ImagesDatatable/ImagesDatatable.test.tsx @@ -1,12 +1,12 @@ import { render, screen, waitFor } from '@testing-library/react'; import { http, HttpResponse } from 'msw'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; -import { withUserProvider } from '@CE/react/test-utils/withUserProvider'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; -import { server } from '@CE/setup-tests/server'; -import { createMockUser } from '@CE/react-tools/test-mocks'; -import { Role, User } from '@CE/portainer/users/types'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; +import { withUserProvider } from '@/react/test-utils/withUserProvider'; +import { withTestRouter } from '@/react/test-utils/withRouter'; +import { server } from '@/setup-tests/server'; +import { createMockUser } from '@/react-tools/test-mocks'; +import { Role, User } from '@/portainer/users/types'; import { ImagesListResponse } from '../../queries/useImages'; @@ -19,7 +19,7 @@ vi.mock('@uirouter/react', async (importOriginal: () => Promise) => ({ })), })); -vi.mock('@@CE/Link', () => ({ +vi.mock('@@/Link', () => ({ Link: ({ children, 'data-cy': dataCy, diff --git a/app/react/docker/images/ListView/ImagesDatatable/ImagesDatatable.tsx b/app/react/docker/images/ListView/ImagesDatatable/ImagesDatatable.tsx index d5225a4af..3a71cc809 100644 --- a/app/react/docker/images/ListView/ImagesDatatable/ImagesDatatable.tsx +++ b/app/react/docker/images/ListView/ImagesDatatable/ImagesDatatable.tsx @@ -1,10 +1,10 @@ import { List } from 'lucide-react'; import { useMemo } from 'react'; -import { Authorized } from '@CE/react/hooks/useUser'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { Authorized } from '@/react/hooks/useUser'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import { Datatable, TableSettingsMenu } from '@@CE/datatables'; +import { Datatable, TableSettingsMenu } from '@@/datatables'; import { BasicTableSettings, createPersistedStore, @@ -12,12 +12,12 @@ import { filteredColumnsSettings, refreshableSettings, RefreshableTableSettings, -} from '@@CE/datatables/types'; -import { useTableState } from '@@CE/datatables/useTableState'; -import { AddButton } from '@@CE/buttons'; -import { TableSettingsMenuAutoRefresh } from '@@CE/datatables/TableSettingsMenuAutoRefresh'; -import { mergeOptions } from '@@CE/datatables/extend-options/mergeOptions'; -import { withColumnFilters } from '@@CE/datatables/extend-options/withColumnFilters'; +} from '@@/datatables/types'; +import { useTableState } from '@@/datatables/useTableState'; +import { AddButton } from '@@/buttons'; +import { TableSettingsMenuAutoRefresh } from '@@/datatables/TableSettingsMenuAutoRefresh'; +import { mergeOptions } from '@@/datatables/extend-options/mergeOptions'; +import { withColumnFilters } from '@@/datatables/extend-options/withColumnFilters'; import { useImages } from '../../queries/useImages'; diff --git a/app/react/docker/images/ListView/ImagesDatatable/ImportExportButtons.test.tsx b/app/react/docker/images/ListView/ImagesDatatable/ImportExportButtons.test.tsx index f93ce453d..e51babd05 100644 --- a/app/react/docker/images/ListView/ImagesDatatable/ImportExportButtons.test.tsx +++ b/app/react/docker/images/ListView/ImagesDatatable/ImportExportButtons.test.tsx @@ -2,12 +2,12 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { http } from 'msw'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; -import { withUserProvider } from '@CE/react/test-utils/withUserProvider'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; -import { server } from '@CE/setup-tests/server'; -import { createMockUser } from '@CE/react-tools/test-mocks'; -import { Role } from '@CE/portainer/users/types'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; +import { withUserProvider } from '@/react/test-utils/withUserProvider'; +import { withTestRouter } from '@/react/test-utils/withRouter'; +import { server } from '@/setup-tests/server'; +import { createMockUser } from '@/react-tools/test-mocks'; +import { Role } from '@/portainer/users/types'; import { ImagesListResponse } from '../../queries/useImages'; @@ -33,7 +33,7 @@ vi.mock('@uirouter/react', async (importOriginal: () => Promise) => ({ })), })); -vi.mock('@@CE/Link', () => ({ +vi.mock('@@/Link', () => ({ Link: ({ children, 'data-cy': dataCy, @@ -53,7 +53,7 @@ vi.mock('../../common/ConfirmExportModal', () => ({ })); // Mock the notification service -vi.mock('@CE/portainer/services/notifications', () => ({ +vi.mock('@/portainer/services/notifications', () => ({ notifyWarning: mockNotifyWarning, })); diff --git a/app/react/docker/images/ListView/ImagesDatatable/ImportExportButtons.tsx b/app/react/docker/images/ListView/ImagesDatatable/ImportExportButtons.tsx index 433f77122..1546caf39 100644 --- a/app/react/docker/images/ListView/ImagesDatatable/ImportExportButtons.tsx +++ b/app/react/docker/images/ListView/ImagesDatatable/ImportExportButtons.tsx @@ -1,11 +1,11 @@ import { Download, Upload } from 'lucide-react'; import _ from 'lodash'; -import { Authorized } from '@CE/react/hooks/useUser'; -import { notifyWarning } from '@CE/portainer/services/notifications'; +import { Authorized } from '@/react/hooks/useUser'; +import { notifyWarning } from '@/portainer/services/notifications'; -import { Button, ButtonGroup, LoadingButton } from '@@CE/buttons'; -import { Link } from '@@CE/Link'; +import { Button, ButtonGroup, LoadingButton } from '@@/buttons'; +import { Link } from '@@/Link'; import { ImagesListResponse } from '../../queries/useImages'; import { useExportMutation } from '../../queries/useExportImageMutation'; diff --git a/app/react/docker/images/ListView/ImagesDatatable/RemoveButtonMenu.tsx b/app/react/docker/images/ListView/ImagesDatatable/RemoveButtonMenu.tsx index 4361b2220..299a9590e 100644 --- a/app/react/docker/images/ListView/ImagesDatatable/RemoveButtonMenu.tsx +++ b/app/react/docker/images/ListView/ImagesDatatable/RemoveButtonMenu.tsx @@ -3,16 +3,16 @@ import { Menu, MenuButton, MenuItem, MenuPopover } from '@reach/menu-button'; import { positionRight } from '@reach/popover'; import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { Authorized } from '@CE/react/hooks/useUser'; -import { withInvalidate } from '@CE/react-tools/react-query'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { notifySuccess } from '@CE/portainer/services/notifications'; -import { processItemsInBatches } from '@CE/react/common/processItemsInBatches'; +import { Authorized } from '@/react/hooks/useUser'; +import { withInvalidate } from '@/react-tools/react-query'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { notifySuccess } from '@/portainer/services/notifications'; +import { processItemsInBatches } from '@/react/common/processItemsInBatches'; -import { Button, ButtonGroup } from '@@CE/buttons'; -import { ButtonWithRef } from '@@CE/buttons/Button'; -import { confirmDestructive } from '@@CE/modals/confirm'; -import { buildConfirmButton } from '@@CE/modals/utils'; +import { Button, ButtonGroup } from '@@/buttons'; +import { ButtonWithRef } from '@@/buttons/Button'; +import { confirmDestructive } from '@@/modals/confirm'; +import { buildConfirmButton } from '@@/modals/utils'; import { ImagesListResponse } from '../../queries/useImages'; import { queryKeys } from '../../queries/queryKeys'; diff --git a/app/react/docker/images/ListView/ImagesDatatable/columns/created.tsx b/app/react/docker/images/ListView/ImagesDatatable/columns/created.tsx index dbd3d1112..cf102e09d 100644 --- a/app/react/docker/images/ListView/ImagesDatatable/columns/created.tsx +++ b/app/react/docker/images/ListView/ImagesDatatable/columns/created.tsx @@ -1,4 +1,4 @@ -import { isoDateFromTimestamp } from '@CE/portainer/filters/filters'; +import { isoDateFromTimestamp } from '@/portainer/filters/filters'; import { columnHelper } from './helper'; diff --git a/app/react/docker/images/ListView/ImagesDatatable/columns/helper.ts b/app/react/docker/images/ListView/ImagesDatatable/columns/helper.ts index 69f2e4eea..e7957b4fa 100644 --- a/app/react/docker/images/ListView/ImagesDatatable/columns/helper.ts +++ b/app/react/docker/images/ListView/ImagesDatatable/columns/helper.ts @@ -1,5 +1,5 @@ import { createColumnHelper } from '@tanstack/react-table'; -import { ImagesListResponse } from '@CE/react/docker/images/queries/useImages'; +import { ImagesListResponse } from '@/react/docker/images/queries/useImages'; export const columnHelper = createColumnHelper(); diff --git a/app/react/docker/images/ListView/ImagesDatatable/columns/id.tsx b/app/react/docker/images/ListView/ImagesDatatable/columns/id.tsx index bc00ca7a8..d0de59dfe 100644 --- a/app/react/docker/images/ListView/ImagesDatatable/columns/id.tsx +++ b/app/react/docker/images/ListView/ImagesDatatable/columns/id.tsx @@ -1,12 +1,12 @@ import { CellContext, Column } from '@tanstack/react-table'; -import { truncate } from '@CE/portainer/filters/filters'; -import { getValueAsArrayOfStrings } from '@CE/portainer/helpers/array'; -import { ImagesListResponse } from '@CE/react/docker/images/queries/useImages'; +import { truncate } from '@/portainer/filters/filters'; +import { getValueAsArrayOfStrings } from '@/portainer/helpers/array'; +import { ImagesListResponse } from '@/react/docker/images/queries/useImages'; -import { MultipleSelectionFilter } from '@@CE/datatables/Filter'; -import { UnusedBadge } from '@@CE/Badge/UnusedBadge'; -import { Link } from '@@CE/Link'; +import { MultipleSelectionFilter } from '@@/datatables/Filter'; +import { UnusedBadge } from '@@/Badge/UnusedBadge'; +import { Link } from '@@/Link'; import { columnHelper } from './helper'; diff --git a/app/react/docker/images/ListView/ImagesDatatable/columns/size.tsx b/app/react/docker/images/ListView/ImagesDatatable/columns/size.tsx index a6d288dfc..adabd3427 100644 --- a/app/react/docker/images/ListView/ImagesDatatable/columns/size.tsx +++ b/app/react/docker/images/ListView/ImagesDatatable/columns/size.tsx @@ -1,4 +1,4 @@ -import { humanize } from '@CE/portainer/filters/filters'; +import { humanize } from '@/portainer/filters/filters'; import { columnHelper } from './helper'; diff --git a/app/react/docker/images/ListView/ImagesDatatable/columns/tags.tsx b/app/react/docker/images/ListView/ImagesDatatable/columns/tags.tsx index bdb4440ac..9ca5a71ba 100644 --- a/app/react/docker/images/ListView/ImagesDatatable/columns/tags.tsx +++ b/app/react/docker/images/ListView/ImagesDatatable/columns/tags.tsx @@ -1,8 +1,8 @@ import { CellContext } from '@tanstack/react-table'; -import { ImagesListResponse } from '@CE/react/docker/images/queries/useImages'; +import { ImagesListResponse } from '@/react/docker/images/queries/useImages'; -import { Badge } from '@@CE/Badge'; +import { Badge } from '@@/Badge'; import { columnHelper } from './helper'; diff --git a/app/react/docker/images/ListView/ListView.test.tsx b/app/react/docker/images/ListView/ListView.test.tsx index 5c18e0887..24eeb1521 100644 --- a/app/react/docker/images/ListView/ListView.test.tsx +++ b/app/react/docker/images/ListView/ListView.test.tsx @@ -1,9 +1,9 @@ import { render, screen } from '@testing-library/react'; import { vi } from 'vitest'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; -import { withUserProvider } from '@CE/react/test-utils/withUserProvider'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; +import { withTestRouter } from '@/react/test-utils/withRouter'; +import { withUserProvider } from '@/react/test-utils/withUserProvider'; import { useIsSwarmAgent } from '../../proxy/queries/useIsSwarmAgent'; diff --git a/app/react/docker/images/ListView/ListView.tsx b/app/react/docker/images/ListView/ListView.tsx index 920d3ea23..87e13c6d3 100644 --- a/app/react/docker/images/ListView/ListView.tsx +++ b/app/react/docker/images/ListView/ListView.tsx @@ -1,4 +1,4 @@ -import { PageHeader } from '@@CE/PageHeader'; +import { PageHeader } from '@@/PageHeader'; import { useIsSwarmAgent } from '../../proxy/queries/useIsSwarmAgent'; diff --git a/app/react/docker/images/ListView/PullImageFormWidget.Form.tsx b/app/react/docker/images/ListView/PullImageFormWidget.Form.tsx index 77f0a26aa..3f912309a 100644 --- a/app/react/docker/images/ListView/PullImageFormWidget.Form.tsx +++ b/app/react/docker/images/ListView/PullImageFormWidget.Form.tsx @@ -1,8 +1,8 @@ import { Form, useFormikContext } from 'formik'; -import { ImageConfigFieldset } from '@@CE/ImageConfigFieldset'; -import { FormSection } from '@@CE/form-components/FormSection'; -import { FormActions } from '@@CE/form-components/FormActions'; +import { ImageConfigFieldset } from '@@/ImageConfigFieldset'; +import { FormSection } from '@@/form-components/FormSection'; +import { FormActions } from '@@/form-components/FormActions'; import { NodeSelector } from '../../agent/NodeSelector'; diff --git a/app/react/docker/images/ListView/PullImageFormWidget.test.tsx b/app/react/docker/images/ListView/PullImageFormWidget.test.tsx index b2d8dc135..3f014c531 100644 --- a/app/react/docker/images/ListView/PullImageFormWidget.test.tsx +++ b/app/react/docker/images/ListView/PullImageFormWidget.test.tsx @@ -1,9 +1,9 @@ import { render, screen } from '@testing-library/react'; import { vi } from 'vitest'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; -import { useAuthorizations } from '@CE/react/hooks/useUser'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; +import { withTestRouter } from '@/react/test-utils/withRouter'; +import { useAuthorizations } from '@/react/hooks/useUser'; import { usePullImageMutation } from '../queries/usePullImageMutation'; @@ -11,7 +11,7 @@ import { PullImageFormWidget } from './PullImageFormWidget'; // Mocks vi.mock( - '@CE/react/hooks/useUser', + '@/react/hooks/useUser', async (importOriginal: () => Promise) => { const actual = await importOriginal(); return { @@ -21,11 +21,11 @@ vi.mock( } ); -vi.mock('@CE/react/hooks/useEnvironmentId', () => ({ +vi.mock('@/react/hooks/useEnvironmentId', () => ({ useEnvironmentId: () => 1, })); -vi.mock('@CE/portainer/services/notifications', () => ({ +vi.mock('@/portainer/services/notifications', () => ({ notifySuccess: vi.fn(), })); @@ -36,7 +36,7 @@ vi.mock('../queries/usePullImageMutation', () => ({ })), })); -vi.mock('@@CE/ImageConfigFieldset/getImageConfig', () => ({ +vi.mock('@@/ImageConfigFieldset/getImageConfig', () => ({ getDefaultImageConfig: () => ({ image: '', registryId: 0, diff --git a/app/react/docker/images/ListView/PullImageFormWidget.tsx b/app/react/docker/images/ListView/PullImageFormWidget.tsx index 041b51af7..6eb3e8fa3 100644 --- a/app/react/docker/images/ListView/PullImageFormWidget.tsx +++ b/app/react/docker/images/ListView/PullImageFormWidget.tsx @@ -2,12 +2,12 @@ import { DownloadIcon } from 'lucide-react'; import { Formik } from 'formik'; import { useState } from 'react'; -import { useAuthorizations } from '@CE/react/hooks/useUser'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { notifySuccess } from '@CE/portainer/services/notifications'; +import { useAuthorizations } from '@/react/hooks/useUser'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { notifySuccess } from '@/portainer/services/notifications'; -import { getDefaultImageConfig } from '@@CE/ImageConfigFieldset/getImageConfig'; -import { Widget } from '@@CE/Widget'; +import { getDefaultImageConfig } from '@@/ImageConfigFieldset/getImageConfig'; +import { Widget } from '@@/Widget'; import { usePullImageMutation } from '../queries/usePullImageMutation'; diff --git a/app/react/docker/images/ListView/PullImageFormWidget.types.tsx b/app/react/docker/images/ListView/PullImageFormWidget.types.tsx index 1d354ea37..3e4f3e628 100644 --- a/app/react/docker/images/ListView/PullImageFormWidget.types.tsx +++ b/app/react/docker/images/ListView/PullImageFormWidget.types.tsx @@ -1,4 +1,4 @@ -import { ImageConfigValues } from '@@CE/ImageConfigFieldset'; +import { ImageConfigValues } from '@@/ImageConfigFieldset'; export interface FormValues { config: ImageConfigValues; diff --git a/app/react/docker/images/ListView/PullImageFormWidget.validation.ts b/app/react/docker/images/ListView/PullImageFormWidget.validation.ts index b36b89d37..3d95ffc09 100644 --- a/app/react/docker/images/ListView/PullImageFormWidget.validation.ts +++ b/app/react/docker/images/ListView/PullImageFormWidget.validation.ts @@ -1,7 +1,7 @@ import { useMemo } from 'react'; import { SchemaOf, object, string } from 'yup'; -import { imageConfigValidation } from '@@CE/ImageConfigFieldset'; +import { imageConfigValidation } from '@@/ImageConfigFieldset'; import { FormValues } from './PullImageFormWidget.types'; diff --git a/app/react/docker/images/common/ConfirmExportModal.tsx b/app/react/docker/images/common/ConfirmExportModal.tsx index 0d175bfb5..74e106b52 100644 --- a/app/react/docker/images/common/ConfirmExportModal.tsx +++ b/app/react/docker/images/common/ConfirmExportModal.tsx @@ -1,6 +1,6 @@ -import { ModalType } from '@@CE/modals'; -import { openConfirm } from '@@CE/modals/confirm'; -import { buildConfirmButton } from '@@CE/modals/utils'; +import { ModalType } from '@@/modals'; +import { openConfirm } from '@@/modals/confirm'; +import { buildConfirmButton } from '@@/modals/utils'; export async function confirmImageExport() { return openConfirm({ diff --git a/app/react/docker/images/queries/queryKeys.ts b/app/react/docker/images/queries/queryKeys.ts index 61e0081a0..79db4a0a2 100644 --- a/app/react/docker/images/queries/queryKeys.ts +++ b/app/react/docker/images/queries/queryKeys.ts @@ -1,4 +1,4 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys as dockerQueryKeys } from '../../queries/utils'; diff --git a/app/react/docker/images/queries/useBuildImageMutation.ts b/app/react/docker/images/queries/useBuildImageMutation.ts index fd0a99769..ee9eca5df 100644 --- a/app/react/docker/images/queries/useBuildImageMutation.ts +++ b/app/react/docker/images/queries/useBuildImageMutation.ts @@ -1,8 +1,8 @@ import axios, { jsonObjectsToArrayHandler, parseAxiosError, -} from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +} from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; import { formatArrayQueryParamsForDockerAPI } from '../../proxy/queries/utils'; diff --git a/app/react/docker/images/queries/useDeleteImageMutation.ts b/app/react/docker/images/queries/useDeleteImageMutation.ts index 4ac0a4b49..2fc84fd12 100644 --- a/app/react/docker/images/queries/useDeleteImageMutation.ts +++ b/app/react/docker/images/queries/useDeleteImageMutation.ts @@ -1,9 +1,9 @@ import { RawAxiosRequestHeaders } from 'axios'; import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { withInvalidate } from '@CE/react-tools/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { withInvalidate } from '@/react-tools/react-query'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/images/queries/useExportImageMutation.test.ts b/app/react/docker/images/queries/useExportImageMutation.test.ts index 7fee5491c..8598d1440 100644 --- a/app/react/docker/images/queries/useExportImageMutation.test.ts +++ b/app/react/docker/images/queries/useExportImageMutation.test.ts @@ -4,8 +4,8 @@ import { http, HttpResponse } from 'msw'; import { saveAs } from 'file-saver'; import { createElement, Fragment } from 'react'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; -import { server } from '@CE/setup-tests/server'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; +import { server } from '@/setup-tests/server'; import { useExportMutation, diff --git a/app/react/docker/images/queries/useExportImageMutation.ts b/app/react/docker/images/queries/useExportImageMutation.ts index 3bb54b741..938be4b05 100644 --- a/app/react/docker/images/queries/useExportImageMutation.ts +++ b/app/react/docker/images/queries/useExportImageMutation.ts @@ -2,9 +2,9 @@ import { RawAxiosRequestHeaders } from 'axios'; import { useMutation } from '@tanstack/react-query'; import { saveAs } from 'file-saver'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/images/queries/useImages.ts b/app/react/docker/images/queries/useImages.ts index 86a01e203..ad564b827 100644 --- a/app/react/docker/images/queries/useImages.ts +++ b/app/react/docker/images/queries/useImages.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerUrl } from '../../queries/utils/buildDockerUrl'; diff --git a/app/react/docker/images/queries/usePullImageMutation.ts b/app/react/docker/images/queries/usePullImageMutation.ts index 176f65420..549693e1f 100644 --- a/app/react/docker/images/queries/usePullImageMutation.ts +++ b/app/react/docker/images/queries/usePullImageMutation.ts @@ -1,10 +1,10 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { Registry } from '@CE/react/portainer/registries/types/registry'; -import { useEnvironmentRegistries } from '@CE/react/portainer/environments/queries/useEnvironmentRegistries'; -import { withGlobalError, withInvalidate } from '@CE/react-tools/react-query'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { Registry } from '@/react/portainer/registries/types/registry'; +import { useEnvironmentRegistries } from '@/react/portainer/environments/queries/useEnvironmentRegistries'; +import { withGlobalError, withInvalidate } from '@/react-tools/react-query'; import { buildImageFullURI } from '../utils'; import { diff --git a/app/react/docker/images/queries/usePushImageMutation.ts b/app/react/docker/images/queries/usePushImageMutation.ts index a3d08d714..6408b00ef 100644 --- a/app/react/docker/images/queries/usePushImageMutation.ts +++ b/app/react/docker/images/queries/usePushImageMutation.ts @@ -1,9 +1,9 @@ import axios, { jsonObjectsToArrayHandler, parseAxiosError, -} from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { Registry } from '@CE/react/portainer/registries/types/registry'; +} from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { Registry } from '@/react/portainer/registries/types/registry'; import { buildImageFullURI } from '../utils'; import { withRegistryAuthHeader } from '../../proxy/queries/utils'; diff --git a/app/react/docker/images/utils.ts b/app/react/docker/images/utils.ts index 20681a6e5..a04fd713b 100644 --- a/app/react/docker/images/utils.ts +++ b/app/react/docker/images/utils.ts @@ -1,10 +1,10 @@ import _ from 'lodash'; -import { trimSHA } from '@CE/docker/filters/utils'; +import { trimSHA } from '@/docker/filters/utils'; import { Registry, RegistryTypes, -} from '@CE/react/portainer/registries/types/registry'; +} from '@/react/portainer/registries/types/registry'; import { DockerImage } from './types'; import { DockerImageResponse } from './types/response'; diff --git a/app/react/docker/networks/CreateView/MacvlanNodesSelector/MacvlanNodesSelector.tsx b/app/react/docker/networks/CreateView/MacvlanNodesSelector/MacvlanNodesSelector.tsx index 235eb1ed6..4f02cee5c 100644 --- a/app/react/docker/networks/CreateView/MacvlanNodesSelector/MacvlanNodesSelector.tsx +++ b/app/react/docker/networks/CreateView/MacvlanNodesSelector/MacvlanNodesSelector.tsx @@ -1,13 +1,13 @@ import { HardDrive } from 'lucide-react'; -import { NodeViewModel } from '@CE/docker/models/node'; +import { NodeViewModel } from '@/docker/models/node'; -import { Datatable } from '@@CE/datatables'; -import { createPersistedStore } from '@@CE/datatables/types'; -import { useTableState } from '@@CE/datatables/useTableState'; -import { mergeOptions } from '@@CE/datatables/extend-options/mergeOptions'; -import { withMeta } from '@@CE/datatables/extend-options/withMeta'; -import { withControlledSelected } from '@@CE/datatables/extend-options/withControlledSelected'; +import { Datatable } from '@@/datatables'; +import { createPersistedStore } from '@@/datatables/types'; +import { useTableState } from '@@/datatables/useTableState'; +import { mergeOptions } from '@@/datatables/extend-options/mergeOptions'; +import { withMeta } from '@@/datatables/extend-options/withMeta'; +import { withControlledSelected } from '@@/datatables/extend-options/withControlledSelected'; import { useColumns } from './useColumns'; diff --git a/app/react/docker/networks/CreateView/MacvlanNodesSelector/useColumns.ts b/app/react/docker/networks/CreateView/MacvlanNodesSelector/useColumns.ts index 81fa8b13e..0279e251d 100644 --- a/app/react/docker/networks/CreateView/MacvlanNodesSelector/useColumns.ts +++ b/app/react/docker/networks/CreateView/MacvlanNodesSelector/useColumns.ts @@ -7,7 +7,7 @@ import { role, name, status, -} from '@CE/react/docker/swarm/SwarmView/NodesDatatable/columns'; +} from '@/react/docker/swarm/SwarmView/NodesDatatable/columns'; export function useColumns(isIpColumnVisible: boolean) { return useMemo( diff --git a/app/react/docker/networks/CreateView/macvlanOptions.tsx b/app/react/docker/networks/CreateView/macvlanOptions.tsx index dee38474e..99a5ee577 100644 --- a/app/react/docker/networks/CreateView/macvlanOptions.tsx +++ b/app/react/docker/networks/CreateView/macvlanOptions.tsx @@ -1,6 +1,6 @@ import { Share2, Sliders } from 'lucide-react'; -import { BoxSelectorOption } from '@@CE/BoxSelector'; +import { BoxSelectorOption } from '@@/BoxSelector'; export function getOptions( hasNetworks: boolean diff --git a/app/react/docker/networks/ItemView/ItemView.tsx b/app/react/docker/networks/ItemView/ItemView.tsx index d701735b0..c32386871 100644 --- a/app/react/docker/networks/ItemView/ItemView.tsx +++ b/app/react/docker/networks/ItemView/ItemView.tsx @@ -1,15 +1,15 @@ import { useRouter, useCurrentStateAndParams } from '@uirouter/react'; import { useQueryClient } from '@tanstack/react-query'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { AccessControlPanel } from '@CE/react/portainer/access-control/AccessControlPanel/AccessControlPanel'; -import { ResourceControlType } from '@CE/react/portainer/access-control/types'; -import { ContainerListViewModel } from '@CE/react/docker/containers/types'; -import { ResourceControlViewModel } from '@CE/react/portainer/access-control/models/ResourceControlViewModel'; -import { useContainers } from '@CE/react/docker/containers/queries/useContainers'; -import { notifySuccess } from '@CE/portainer/services/notifications'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { AccessControlPanel } from '@/react/portainer/access-control/AccessControlPanel/AccessControlPanel'; +import { ResourceControlType } from '@/react/portainer/access-control/types'; +import { ContainerListViewModel } from '@/react/docker/containers/types'; +import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; +import { useContainers } from '@/react/docker/containers/queries/useContainers'; +import { notifySuccess } from '@/portainer/services/notifications'; -import { PageHeader } from '@@CE/PageHeader'; +import { PageHeader } from '@@/PageHeader'; import { useDeleteNetwork } from '../queries/useDeleteNetworkMutation'; import { isSystemNetwork } from '../network.helper'; diff --git a/app/react/docker/networks/ItemView/NetworkContainersTable.test.tsx b/app/react/docker/networks/ItemView/NetworkContainersTable.test.tsx index 6bbbac448..d45ebd5aa 100644 --- a/app/react/docker/networks/ItemView/NetworkContainersTable.test.tsx +++ b/app/react/docker/networks/ItemView/NetworkContainersTable.test.tsx @@ -1,11 +1,11 @@ import { render } from '@testing-library/react'; import { http, HttpResponse } from 'msw'; -import { UserViewModel } from '@CE/portainer/models/user'; -import { withUserProvider } from '@CE/react/test-utils/withUserProvider'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; -import { server } from '@CE/setup-tests/server'; +import { UserViewModel } from '@/portainer/models/user'; +import { withUserProvider } from '@/react/test-utils/withUserProvider'; +import { withTestRouter } from '@/react/test-utils/withRouter'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; +import { server } from '@/setup-tests/server'; import { NetworkContainer } from '../types'; diff --git a/app/react/docker/networks/ItemView/NetworkContainersTable.tsx b/app/react/docker/networks/ItemView/NetworkContainersTable.tsx index 73e44e3d7..c3f540d75 100644 --- a/app/react/docker/networks/ItemView/NetworkContainersTable.tsx +++ b/app/react/docker/networks/ItemView/NetworkContainersTable.tsx @@ -1,14 +1,14 @@ import { Server, Trash2 } from 'lucide-react'; -import { Authorized } from '@CE/react/hooks/useUser'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { Icon } from '@CE/react/components/Icon'; -import { notifySuccess } from '@CE/portainer/services/notifications'; +import { Authorized } from '@/react/hooks/useUser'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { Icon } from '@/react/components/Icon'; +import { notifySuccess } from '@/portainer/services/notifications'; -import { TableContainer, TableTitle } from '@@CE/datatables'; -import { DetailsTable } from '@@CE/DetailsTable'; -import { Button } from '@@CE/buttons'; -import { Link } from '@@CE/Link'; +import { TableContainer, TableTitle } from '@@/datatables'; +import { DetailsTable } from '@@/DetailsTable'; +import { Button } from '@@/buttons'; +import { Link } from '@@/Link'; import { NetworkContainer, NetworkId } from '../types'; import { useDisconnectContainer } from '../queries/useDisconnectContainerMutation'; diff --git a/app/react/docker/networks/ItemView/NetworkDetailsTable.test.tsx b/app/react/docker/networks/ItemView/NetworkDetailsTable.test.tsx index e9e108a2a..494fbb503 100644 --- a/app/react/docker/networks/ItemView/NetworkDetailsTable.test.tsx +++ b/app/react/docker/networks/ItemView/NetworkDetailsTable.test.tsx @@ -1,10 +1,10 @@ import { HttpResponse, http } from 'msw'; import { render, screen } from '@testing-library/react'; -import { UserViewModel } from '@CE/portainer/models/user'; -import { server } from '@CE/setup-tests/server'; -import { withUserProvider } from '@CE/react/test-utils/withUserProvider'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; +import { UserViewModel } from '@/portainer/models/user'; +import { server } from '@/setup-tests/server'; +import { withUserProvider } from '@/react/test-utils/withUserProvider'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; import { DockerNetwork } from '../types'; diff --git a/app/react/docker/networks/ItemView/NetworkDetailsTable.tsx b/app/react/docker/networks/ItemView/NetworkDetailsTable.tsx index 242bb060c..0143131bd 100644 --- a/app/react/docker/networks/ItemView/NetworkDetailsTable.tsx +++ b/app/react/docker/networks/ItemView/NetworkDetailsTable.tsx @@ -1,12 +1,12 @@ import { Fragment } from 'react'; import { Network } from 'lucide-react'; -import DockerNetworkHelper from '@CE/docker/helpers/networkHelper'; -import { Authorized } from '@CE/react/hooks/useUser'; +import DockerNetworkHelper from '@/docker/helpers/networkHelper'; +import { Authorized } from '@/react/hooks/useUser'; -import { TableContainer, TableTitle } from '@@CE/datatables'; -import { DetailsTable } from '@@CE/DetailsTable'; -import { DeleteButton } from '@@CE/buttons/DeleteButton'; +import { TableContainer, TableTitle } from '@@/datatables'; +import { DetailsTable } from '@@/DetailsTable'; +import { DeleteButton } from '@@/buttons/DeleteButton'; import { isSystemNetwork } from '../network.helper'; import { DockerNetwork, IPConfig } from '../types'; diff --git a/app/react/docker/networks/ItemView/NetworkOptionsTable.tsx b/app/react/docker/networks/ItemView/NetworkOptionsTable.tsx index 17cd0edb2..9b8c4176a 100644 --- a/app/react/docker/networks/ItemView/NetworkOptionsTable.tsx +++ b/app/react/docker/networks/ItemView/NetworkOptionsTable.tsx @@ -1,7 +1,7 @@ import { Network } from 'lucide-react'; -import { TableContainer, TableTitle } from '@@CE/datatables'; -import { DetailsTable } from '@@CE/DetailsTable'; +import { TableContainer, TableTitle } from '@@/datatables'; +import { DetailsTable } from '@@/DetailsTable'; import { NetworkOptions } from '../types'; diff --git a/app/react/docker/networks/ListView/NestedNetworksTable.tsx b/app/react/docker/networks/ListView/NestedNetworksTable.tsx index 20acb0fc7..f3f47646a 100644 --- a/app/react/docker/networks/ListView/NestedNetworksTable.tsx +++ b/app/react/docker/networks/ListView/NestedNetworksTable.tsx @@ -1,6 +1,6 @@ -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import { NestedDatatable } from '@@CE/datatables/NestedDatatable'; +import { NestedDatatable } from '@@/datatables/NestedDatatable'; import { useIsSwarm } from '../../proxy/queries/useInfo'; diff --git a/app/react/docker/networks/ListView/NetworksDatatable.tsx b/app/react/docker/networks/ListView/NetworksDatatable.tsx index 6dadd8869..668ad7e59 100644 --- a/app/react/docker/networks/ListView/NetworksDatatable.tsx +++ b/app/react/docker/networks/ListView/NetworksDatatable.tsx @@ -1,21 +1,21 @@ import { Network } from 'lucide-react'; -import { Authorized } from '@CE/react/hooks/useUser'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { Authorized } from '@/react/hooks/useUser'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import { ExpandableDatatable } from '@@CE/datatables/ExpandableDatatable'; +import { ExpandableDatatable } from '@@/datatables/ExpandableDatatable'; import { BasicTableSettings, createPersistedStore, refreshableSettings, RefreshableTableSettings, -} from '@@CE/datatables/types'; -import { AddButton } from '@@CE/buttons'; -import { TableSettingsMenu } from '@@CE/datatables'; -import { TableSettingsMenuAutoRefresh } from '@@CE/datatables/TableSettingsMenuAutoRefresh'; -import { useRepeater } from '@@CE/datatables/useRepeater'; -import { useTableState } from '@@CE/datatables/useTableState'; -import { DeleteButton } from '@@CE/buttons/DeleteButton'; +} from '@@/datatables/types'; +import { AddButton } from '@@/buttons'; +import { TableSettingsMenu } from '@@/datatables'; +import { TableSettingsMenuAutoRefresh } from '@@/datatables/TableSettingsMenuAutoRefresh'; +import { useRepeater } from '@@/datatables/useRepeater'; +import { useTableState } from '@@/datatables/useTableState'; +import { DeleteButton } from '@@/buttons/DeleteButton'; import { useIsSwarm } from '../../proxy/queries/useInfo'; diff --git a/app/react/docker/networks/ListView/columns/index.ts b/app/react/docker/networks/ListView/columns/index.ts index 7f24decdd..b2be3b05c 100644 --- a/app/react/docker/networks/ListView/columns/index.ts +++ b/app/react/docker/networks/ListView/columns/index.ts @@ -1,9 +1,9 @@ import _ from 'lodash'; import { useMemo } from 'react'; -import { createOwnershipColumn } from '@CE/react/docker/components/datatable/createOwnershipColumn'; +import { createOwnershipColumn } from '@/react/docker/components/datatable/createOwnershipColumn'; -import { buildExpandColumn } from '@@CE/datatables/expand-column'; +import { buildExpandColumn } from '@@/datatables/expand-column'; import { DecoratedNetwork } from '../types'; diff --git a/app/react/docker/networks/ListView/columns/name.tsx b/app/react/docker/networks/ListView/columns/name.tsx index abeaf3431..baad2611c 100644 --- a/app/react/docker/networks/ListView/columns/name.tsx +++ b/app/react/docker/networks/ListView/columns/name.tsx @@ -1,7 +1,7 @@ -import { truncate } from '@CE/portainer/filters/filters'; +import { truncate } from '@/portainer/filters/filters'; -import { Link } from '@@CE/Link'; -import { Badge } from '@@CE/Badge'; +import { Link } from '@@/Link'; +import { Badge } from '@@/Badge'; import { columnHelper } from './helper'; diff --git a/app/react/docker/networks/ListView/types.ts b/app/react/docker/networks/ListView/types.ts index d1ab0ed54..38bff9c9c 100644 --- a/app/react/docker/networks/ListView/types.ts +++ b/app/react/docker/networks/ListView/types.ts @@ -1,6 +1,6 @@ import { IPAMConfig } from 'docker-types/generated/1.44'; -import { NetworkViewModel } from '@CE/docker/models/network'; +import { NetworkViewModel } from '@/docker/models/network'; export type DecoratedNetwork = NetworkViewModel & { Subs?: DecoratedNetwork[]; diff --git a/app/react/docker/networks/queries/queryKeys.ts b/app/react/docker/networks/queries/queryKeys.ts index ce2bdd77b..42ef0659a 100644 --- a/app/react/docker/networks/queries/queryKeys.ts +++ b/app/react/docker/networks/queries/queryKeys.ts @@ -1,4 +1,4 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys as dockerQueryKeys } from '../../queries/utils'; import { NetworkId } from '../types'; diff --git a/app/react/docker/networks/queries/useConnectContainerMutation.ts b/app/react/docker/networks/queries/useConnectContainerMutation.ts index 1385fcd65..8b387f080 100644 --- a/app/react/docker/networks/queries/useConnectContainerMutation.ts +++ b/app/react/docker/networks/queries/useConnectContainerMutation.ts @@ -1,13 +1,13 @@ import { EndpointSettings } from 'docker-types/generated/1.44'; import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { mutationOptions, withError, withInvalidate, -} from '@CE/react-tools/react-query'; +} from '@/react-tools/react-query'; import { queryKeys as dockerQueryKeys } from '../../queries/utils'; import { withAgentTargetHeader } from '../../proxy/queries/utils'; diff --git a/app/react/docker/networks/queries/useCreateNetworkMutation.ts b/app/react/docker/networks/queries/useCreateNetworkMutation.ts index 6069011f0..4fa33aa53 100644 --- a/app/react/docker/networks/queries/useCreateNetworkMutation.ts +++ b/app/react/docker/networks/queries/useCreateNetworkMutation.ts @@ -1,7 +1,7 @@ import { Network } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; import { diff --git a/app/react/docker/networks/queries/useDeleteNetworkMutation.ts b/app/react/docker/networks/queries/useDeleteNetworkMutation.ts index fb56340fe..c7abd664f 100644 --- a/app/react/docker/networks/queries/useDeleteNetworkMutation.ts +++ b/app/react/docker/networks/queries/useDeleteNetworkMutation.ts @@ -4,9 +4,9 @@ import { mutationOptions, withError, withInvalidate, -} from '@CE/react-tools/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; +} from '@/react-tools/react-query'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; import { withAgentTargetHeader } from '../../proxy/queries/utils'; diff --git a/app/react/docker/networks/queries/useDisconnectContainerMutation.ts b/app/react/docker/networks/queries/useDisconnectContainerMutation.ts index de4da72be..cf74e2c5d 100644 --- a/app/react/docker/networks/queries/useDisconnectContainerMutation.ts +++ b/app/react/docker/networks/queries/useDisconnectContainerMutation.ts @@ -1,12 +1,12 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; import { mutationOptions, withError, withInvalidate, -} from '@CE/react-tools/react-query'; +} from '@/react-tools/react-query'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; import { withAgentTargetHeader } from '../../proxy/queries/utils'; diff --git a/app/react/docker/networks/queries/useNetwork.ts b/app/react/docker/networks/queries/useNetwork.ts index a24054444..e897e43a3 100644 --- a/app/react/docker/networks/queries/useNetwork.ts +++ b/app/react/docker/networks/queries/useNetwork.ts @@ -1,8 +1,8 @@ import { useQuery } from '@tanstack/react-query'; -import { withGlobalError } from '@CE/react-tools/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; +import { withGlobalError } from '@/react-tools/react-query'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; import { DockerNetwork, NetworkId } from '../types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/docker/networks/queries/useNetworks.ts b/app/react/docker/networks/queries/useNetworks.ts index 7be09e226..f408acc00 100644 --- a/app/react/docker/networks/queries/useNetworks.ts +++ b/app/react/docker/networks/queries/useNetworks.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { DockerNetwork } from '../types'; import { withFiltersQueryParam } from '../../proxy/queries/utils'; diff --git a/app/react/docker/networks/types.ts b/app/react/docker/networks/types.ts index 5772618ae..9f1cfc3b1 100644 --- a/app/react/docker/networks/types.ts +++ b/app/react/docker/networks/types.ts @@ -1,5 +1,5 @@ -import { PortainerResponse } from '@CE/react/docker/types'; -import { ContainerId } from '@CE/react/docker/containers/types'; +import { PortainerResponse } from '@/react/docker/types'; +import { ContainerId } from '@/react/docker/containers/types'; export type IPConfig = { Subnet: string; diff --git a/app/react/docker/proxy/queries/buildDockerProxyUrl.ts b/app/react/docker/proxy/queries/buildDockerProxyUrl.ts index e5b1b02db..9f9218eb4 100644 --- a/app/react/docker/proxy/queries/buildDockerProxyUrl.ts +++ b/app/react/docker/proxy/queries/buildDockerProxyUrl.ts @@ -1,6 +1,6 @@ import { compact } from 'lodash'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; /** * Build docker proxy URL for Environment diff --git a/app/react/docker/proxy/queries/images/queryKeys.ts b/app/react/docker/proxy/queries/images/queryKeys.ts index bbcd16939..2daddae1a 100644 --- a/app/react/docker/proxy/queries/images/queryKeys.ts +++ b/app/react/docker/proxy/queries/images/queryKeys.ts @@ -1,4 +1,4 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys as proxyQueryKeys } from '../query-keys'; diff --git a/app/react/docker/proxy/queries/images/useDownloadImages.ts b/app/react/docker/proxy/queries/images/useDownloadImages.ts index 544a3e686..cfcd4c06f 100644 --- a/app/react/docker/proxy/queries/images/useDownloadImages.ts +++ b/app/react/docker/proxy/queries/images/useDownloadImages.ts @@ -1,5 +1,5 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; import { formatArrayQueryParamsForDockerAPI } from '../utils'; diff --git a/app/react/docker/proxy/queries/images/useImage.ts b/app/react/docker/proxy/queries/images/useImage.ts index 6b353b88c..777783164 100644 --- a/app/react/docker/proxy/queries/images/useImage.ts +++ b/app/react/docker/proxy/queries/images/useImage.ts @@ -1,7 +1,7 @@ import { ImageInspect } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/images/useImageHistory.ts b/app/react/docker/proxy/queries/images/useImageHistory.ts index 1eab38e30..089a43b97 100644 --- a/app/react/docker/proxy/queries/images/useImageHistory.ts +++ b/app/react/docker/proxy/queries/images/useImageHistory.ts @@ -1,5 +1,5 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/images/useImages.ts b/app/react/docker/proxy/queries/images/useImages.ts index bbae6cb9f..c9283263d 100644 --- a/app/react/docker/proxy/queries/images/useImages.ts +++ b/app/react/docker/proxy/queries/images/useImages.ts @@ -1,8 +1,8 @@ import { useQuery } from '@tanstack/react-query'; import { ImageSummary } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/images/useRemoveImageMutation.ts b/app/react/docker/proxy/queries/images/useRemoveImageMutation.ts index 8ce820441..d1cd859c0 100644 --- a/app/react/docker/proxy/queries/images/useRemoveImageMutation.ts +++ b/app/react/docker/proxy/queries/images/useRemoveImageMutation.ts @@ -1,6 +1,6 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { ImageId, ImageName } from '@CE/docker/models/image'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { ImageId, ImageName } from '@/docker/models/image'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/images/useTagImageMutation.ts b/app/react/docker/proxy/queries/images/useTagImageMutation.ts index 39fe5e91f..30eb278f2 100644 --- a/app/react/docker/proxy/queries/images/useTagImageMutation.ts +++ b/app/react/docker/proxy/queries/images/useTagImageMutation.ts @@ -1,6 +1,6 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { ImageId, ImageName } from '@CE/docker/models/image'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { ImageId, ImageName } from '@/docker/models/image'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/images/useUploadImageMutation.ts b/app/react/docker/proxy/queries/images/useUploadImageMutation.ts index 5eaa88a3e..5d3c6321c 100644 --- a/app/react/docker/proxy/queries/images/useUploadImageMutation.ts +++ b/app/react/docker/proxy/queries/images/useUploadImageMutation.ts @@ -1,5 +1,5 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/nodes/query-keys.ts b/app/react/docker/proxy/queries/nodes/query-keys.ts index 3f3bf2e58..3f599e1d8 100644 --- a/app/react/docker/proxy/queries/nodes/query-keys.ts +++ b/app/react/docker/proxy/queries/nodes/query-keys.ts @@ -1,4 +1,4 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys as proxyQueryKeys } from '../query-keys'; diff --git a/app/react/docker/proxy/queries/nodes/useNode.ts b/app/react/docker/proxy/queries/nodes/useNode.ts index a74b97878..0046369aa 100644 --- a/app/react/docker/proxy/queries/nodes/useNode.ts +++ b/app/react/docker/proxy/queries/nodes/useNode.ts @@ -1,7 +1,7 @@ import { Node } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/nodes/useNodes.ts b/app/react/docker/proxy/queries/nodes/useNodes.ts index 60467ee89..ed2ae9990 100644 --- a/app/react/docker/proxy/queries/nodes/useNodes.ts +++ b/app/react/docker/proxy/queries/nodes/useNodes.ts @@ -1,8 +1,8 @@ import { Node } from 'docker-types/generated/1.44'; import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/nodes/useUpdateNodeMutation.ts b/app/react/docker/proxy/queries/nodes/useUpdateNodeMutation.ts index 305d898f9..b42504d44 100644 --- a/app/react/docker/proxy/queries/nodes/useUpdateNodeMutation.ts +++ b/app/react/docker/proxy/queries/nodes/useUpdateNodeMutation.ts @@ -1,7 +1,7 @@ import { Node, NodeSpec } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/query-keys.ts b/app/react/docker/proxy/queries/query-keys.ts index 584896bad..d11da4230 100644 --- a/app/react/docker/proxy/queries/query-keys.ts +++ b/app/react/docker/proxy/queries/query-keys.ts @@ -1,4 +1,4 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; export const queryKeys = { base: (environmentId: EnvironmentId) => diff --git a/app/react/docker/proxy/queries/secrets/useCreateSecretMutation.ts b/app/react/docker/proxy/queries/secrets/useCreateSecretMutation.ts index b00c9c535..ea2ca7894 100644 --- a/app/react/docker/proxy/queries/secrets/useCreateSecretMutation.ts +++ b/app/react/docker/proxy/queries/secrets/useCreateSecretMutation.ts @@ -1,7 +1,7 @@ import { SecretSpec } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/secrets/useRemoveSecretMutation.ts b/app/react/docker/proxy/queries/secrets/useRemoveSecretMutation.ts index 5cea964e9..4cd5d8b66 100644 --- a/app/react/docker/proxy/queries/secrets/useRemoveSecretMutation.ts +++ b/app/react/docker/proxy/queries/secrets/useRemoveSecretMutation.ts @@ -1,7 +1,7 @@ import { Secret } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/secrets/useSecret.ts b/app/react/docker/proxy/queries/secrets/useSecret.ts index cee253a1b..3c783b95f 100644 --- a/app/react/docker/proxy/queries/secrets/useSecret.ts +++ b/app/react/docker/proxy/queries/secrets/useSecret.ts @@ -1,8 +1,8 @@ import { Secret } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { PortainerResponse } from '@CE/react/docker/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { PortainerResponse } from '@/react/docker/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/secrets/useSecrets.ts b/app/react/docker/proxy/queries/secrets/useSecrets.ts index 5dbfb84f7..a2ba1d5fa 100644 --- a/app/react/docker/proxy/queries/secrets/useSecrets.ts +++ b/app/react/docker/proxy/queries/secrets/useSecrets.ts @@ -1,5 +1,5 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/tasks/query-keys.ts b/app/react/docker/proxy/queries/tasks/query-keys.ts index 91621cb64..57ba93774 100644 --- a/app/react/docker/proxy/queries/tasks/query-keys.ts +++ b/app/react/docker/proxy/queries/tasks/query-keys.ts @@ -1,4 +1,4 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys as proxyQueryKeys } from '../query-keys'; diff --git a/app/react/docker/proxy/queries/tasks/useTasks.ts b/app/react/docker/proxy/queries/tasks/useTasks.ts index b7fddbf33..ec70644ec 100644 --- a/app/react/docker/proxy/queries/tasks/useTasks.ts +++ b/app/react/docker/proxy/queries/tasks/useTasks.ts @@ -1,8 +1,8 @@ import { Task } from 'docker-types/generated/1.44'; import { useQuery } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../buildDockerProxyUrl'; import { withFiltersQueryParam } from '../utils'; diff --git a/app/react/docker/proxy/queries/useCommitContainerMutation.ts b/app/react/docker/proxy/queries/useCommitContainerMutation.ts index 286198ebb..9d13305c9 100644 --- a/app/react/docker/proxy/queries/useCommitContainerMutation.ts +++ b/app/react/docker/proxy/queries/useCommitContainerMutation.ts @@ -1,5 +1,5 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from './buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/useEvents.ts b/app/react/docker/proxy/queries/useEvents.ts index 03c5343eb..cbf292ce5 100644 --- a/app/react/docker/proxy/queries/useEvents.ts +++ b/app/react/docker/proxy/queries/useEvents.ts @@ -4,8 +4,8 @@ import { useQuery } from '@tanstack/react-query'; import axios, { jsonObjectsToArrayHandler, parseAxiosError, -} from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +} from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from './buildDockerProxyUrl'; import { queryKeys } from './query-keys'; diff --git a/app/react/docker/proxy/queries/useExecResizeTTYMutation.ts b/app/react/docker/proxy/queries/useExecResizeTTYMutation.ts index 1c164f92b..6022ac271 100644 --- a/app/react/docker/proxy/queries/useExecResizeTTYMutation.ts +++ b/app/react/docker/proxy/queries/useExecResizeTTYMutation.ts @@ -1,5 +1,5 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from './buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/useInfo.ts b/app/react/docker/proxy/queries/useInfo.ts index 12b4bd8dd..e4750a7d1 100644 --- a/app/react/docker/proxy/queries/useInfo.ts +++ b/app/react/docker/proxy/queries/useInfo.ts @@ -1,8 +1,8 @@ import { useQuery } from '@tanstack/react-query'; import { SystemInfo } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from './buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/useIsSwarmAgent.ts b/app/react/docker/proxy/queries/useIsSwarmAgent.ts index d7585df1e..b092f2571 100644 --- a/app/react/docker/proxy/queries/useIsSwarmAgent.ts +++ b/app/react/docker/proxy/queries/useIsSwarmAgent.ts @@ -1,6 +1,6 @@ -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { useCurrentEnvironment } from '@CE/react/hooks/useCurrentEnvironment'; -import { isAgentEnvironment } from '@CE/react/portainer/environments/utils'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment'; +import { isAgentEnvironment } from '@/react/portainer/environments/utils'; import { useIsSwarm } from './useInfo'; diff --git a/app/react/docker/proxy/queries/usePing.ts b/app/react/docker/proxy/queries/usePing.ts index 8c4c0b7fa..3539cc259 100644 --- a/app/react/docker/proxy/queries/usePing.ts +++ b/app/react/docker/proxy/queries/usePing.ts @@ -1,5 +1,5 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from './buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/usePlugins.ts b/app/react/docker/proxy/queries/usePlugins.ts index 097dec287..f33d47e84 100644 --- a/app/react/docker/proxy/queries/usePlugins.ts +++ b/app/react/docker/proxy/queries/usePlugins.ts @@ -5,8 +5,8 @@ import { PluginsInfo, } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys } from '../../queries/utils/root'; diff --git a/app/react/docker/proxy/queries/useSwarm.ts b/app/react/docker/proxy/queries/useSwarm.ts index e61b13b17..f0d21454b 100644 --- a/app/react/docker/proxy/queries/useSwarm.ts +++ b/app/react/docker/proxy/queries/useSwarm.ts @@ -1,8 +1,8 @@ import { useQuery } from '@tanstack/react-query'; import { Swarm } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys } from './query-keys'; import { useIsSwarm } from './useInfo'; diff --git a/app/react/docker/proxy/queries/useVersion.ts b/app/react/docker/proxy/queries/useVersion.ts index c601af160..9e54a966f 100644 --- a/app/react/docker/proxy/queries/useVersion.ts +++ b/app/react/docker/proxy/queries/useVersion.ts @@ -1,8 +1,8 @@ import { useQuery } from '@tanstack/react-query'; import { SystemVersion } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from './buildDockerProxyUrl'; diff --git a/app/react/docker/proxy/queries/utils.ts b/app/react/docker/proxy/queries/utils.ts index 395c58831..fc097833f 100644 --- a/app/react/docker/proxy/queries/utils.ts +++ b/app/react/docker/proxy/queries/utils.ts @@ -1,5 +1,5 @@ -import { agentTargetHeader } from '@CE/portainer/services/axios'; -import { RegistryId } from '@CE/react/portainer/registries/types/registry'; +import { agentTargetHeader } from '@/portainer/services/axios'; +import { RegistryId } from '@/react/portainer/registries/types/registry'; /** * Generates the `filters` query param entry for docker API list actions diff --git a/app/react/docker/queries/utils/buildDockerUrl.ts b/app/react/docker/queries/utils/buildDockerUrl.ts index 702031da3..0c94c03db 100644 --- a/app/react/docker/queries/utils/buildDockerUrl.ts +++ b/app/react/docker/queries/utils/buildDockerUrl.ts @@ -1,6 +1,6 @@ import { compact } from 'lodash'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; /** * Build docker URL for Environment diff --git a/app/react/docker/queries/utils/container.ts b/app/react/docker/queries/utils/container.ts index 7ba90f3d5..2fb0484d4 100644 --- a/app/react/docker/queries/utils/container.ts +++ b/app/react/docker/queries/utils/container.ts @@ -1,6 +1,6 @@ -import { ContainerListViewModel } from '@CE/react/docker/containers/types'; -import { EdgeStack } from '@CE/react/edge/edge-stacks/types'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { ContainerListViewModel } from '@/react/docker/containers/types'; +import { EdgeStack } from '@/react/edge/edge-stacks/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerSnapshotUrl, queryKeys as rootQueryKeys } from './root'; diff --git a/app/react/docker/queries/utils/root.ts b/app/react/docker/queries/utils/root.ts index 37f34967a..d47a94a96 100644 --- a/app/react/docker/queries/utils/root.ts +++ b/app/react/docker/queries/utils/root.ts @@ -1,4 +1,4 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerUrl } from './buildDockerUrl'; diff --git a/app/react/docker/secrets/ListView/SecretsDatatable.tsx b/app/react/docker/secrets/ListView/SecretsDatatable.tsx index 48eb88dcd..5655466a3 100644 --- a/app/react/docker/secrets/ListView/SecretsDatatable.tsx +++ b/app/react/docker/secrets/ListView/SecretsDatatable.tsx @@ -1,23 +1,23 @@ import { createColumnHelper } from '@tanstack/react-table'; import { Lock } from 'lucide-react'; -import { SecretViewModel } from '@CE/docker/models/secret'; -import { isoDate } from '@CE/portainer/filters/filters'; -import { Authorized, useAuthorizations } from '@CE/react/hooks/useUser'; +import { SecretViewModel } from '@/docker/models/secret'; +import { isoDate } from '@/portainer/filters/filters'; +import { Authorized, useAuthorizations } from '@/react/hooks/useUser'; -import { buildNameColumn } from '@@CE/datatables/buildNameColumn'; -import { Datatable, TableSettingsMenu } from '@@CE/datatables'; +import { buildNameColumn } from '@@/datatables/buildNameColumn'; +import { Datatable, TableSettingsMenu } from '@@/datatables'; import { BasicTableSettings, RefreshableTableSettings, createPersistedStore, refreshableSettings, -} from '@@CE/datatables/types'; -import { useTableState } from '@@CE/datatables/useTableState'; -import { TableSettingsMenuAutoRefresh } from '@@CE/datatables/TableSettingsMenuAutoRefresh'; -import { AddButton } from '@@CE/buttons'; -import { useRepeater } from '@@CE/datatables/useRepeater'; -import { DeleteButton } from '@@CE/buttons/DeleteButton'; +} from '@@/datatables/types'; +import { useTableState } from '@@/datatables/useTableState'; +import { TableSettingsMenuAutoRefresh } from '@@/datatables/TableSettingsMenuAutoRefresh'; +import { AddButton } from '@@/buttons'; +import { useRepeater } from '@@/datatables/useRepeater'; +import { DeleteButton } from '@@/buttons/DeleteButton'; import { createOwnershipColumn } from '../../components/datatable/createOwnershipColumn'; diff --git a/app/react/docker/services/ItemView/PortMappingField/PortsMappingField.tsx b/app/react/docker/services/ItemView/PortMappingField/PortsMappingField.tsx index e384943db..4d2bf5022 100644 --- a/app/react/docker/services/ItemView/PortMappingField/PortsMappingField.tsx +++ b/app/react/docker/services/ItemView/PortMappingField/PortsMappingField.tsx @@ -1,17 +1,17 @@ import { List, Trash2 } from 'lucide-react'; -import { Authorized } from '@CE/react/hooks/useUser'; +import { Authorized } from '@/react/hooks/useUser'; -import { ButtonSelector } from '@@CE/form-components/ButtonSelector/ButtonSelector'; -import { FormError } from '@@CE/form-components/FormError'; +import { ButtonSelector } from '@@/form-components/ButtonSelector/ButtonSelector'; +import { FormError } from '@@/form-components/FormError'; import { ArrayError, ItemProps, useInputList, -} from '@@CE/form-components/InputList/InputList'; -import { Table } from '@@CE/datatables'; -import { Button } from '@@CE/buttons'; -import { Select } from '@@CE/form-components/Input'; +} from '@@/form-components/InputList/InputList'; +import { Table } from '@@/datatables'; +import { Button } from '@@/buttons'; +import { Select } from '@@/form-components/Input'; import { ServiceWidget } from '../ServiceWidget'; diff --git a/app/react/docker/services/ItemView/PortMappingField/RangeOrNumberField.tsx b/app/react/docker/services/ItemView/PortMappingField/RangeOrNumberField.tsx index 91062991f..c4b773590 100644 --- a/app/react/docker/services/ItemView/PortMappingField/RangeOrNumberField.tsx +++ b/app/react/docker/services/ItemView/PortMappingField/RangeOrNumberField.tsx @@ -1,7 +1,7 @@ -import { AutomationTestingProps } from '@CE/types'; +import { AutomationTestingProps } from '@/types'; -import { InputLabeled } from '@@CE/form-components/Input/InputLabeled'; -import { Checkbox } from '@@CE/form-components/Checkbox'; +import { InputLabeled } from '@@/form-components/Input/InputLabeled'; +import { Checkbox } from '@@/form-components/Checkbox'; import { Range, isRange } from './types'; diff --git a/app/react/docker/services/ItemView/ServiceWidget.stories.tsx b/app/react/docker/services/ItemView/ServiceWidget.stories.tsx index 9cbe8be89..6017ef35e 100644 --- a/app/react/docker/services/ItemView/ServiceWidget.stories.tsx +++ b/app/react/docker/services/ItemView/ServiceWidget.stories.tsx @@ -1,6 +1,6 @@ import type { Meta, StoryObj } from '@storybook/react'; -import { withUserProvider } from '@CE/react/test-utils/withUserProvider'; +import { withUserProvider } from '@/react/test-utils/withUserProvider'; import { ServiceWidget } from './ServiceWidget'; diff --git a/app/react/docker/services/ItemView/ServiceWidget.tsx b/app/react/docker/services/ItemView/ServiceWidget.tsx index dac8984cf..c5a5ce93a 100644 --- a/app/react/docker/services/ItemView/ServiceWidget.tsx +++ b/app/react/docker/services/ItemView/ServiceWidget.tsx @@ -3,11 +3,11 @@ import { ComponentProps, PropsWithChildren } from 'react'; import { Menu, MenuButton, MenuItem, MenuPopover } from '@reach/menu-button'; import { positionRight } from '@reach/popover'; -import { Authorized } from '@CE/react/hooks/useUser'; +import { Authorized } from '@/react/hooks/useUser'; -import { Widget } from '@@CE/Widget'; -import { Button, ButtonGroup } from '@@CE/buttons'; -import { ButtonWithRef } from '@@CE/buttons/Button'; +import { Widget } from '@@/Widget'; +import { Button, ButtonGroup } from '@@/buttons'; +import { ButtonWithRef } from '@@/buttons/Button'; /** * used for wrapping widget in the service item view diff --git a/app/react/docker/services/ItemView/TasksDatatable/TasksDatatable.tsx b/app/react/docker/services/ItemView/TasksDatatable/TasksDatatable.tsx index 914c4493d..cc1e21a37 100644 --- a/app/react/docker/services/ItemView/TasksDatatable/TasksDatatable.tsx +++ b/app/react/docker/services/ItemView/TasksDatatable/TasksDatatable.tsx @@ -1,15 +1,15 @@ import { List } from 'lucide-react'; -import { Datatable } from '@@CE/datatables'; -import { mergeOptions } from '@@CE/datatables/extend-options/mergeOptions'; -import { withColumnFilters } from '@@CE/datatables/extend-options/withColumnFilters'; -import { withMeta } from '@@CE/datatables/extend-options/withMeta'; +import { Datatable } from '@@/datatables'; +import { mergeOptions } from '@@/datatables/extend-options/mergeOptions'; +import { withColumnFilters } from '@@/datatables/extend-options/withColumnFilters'; +import { withMeta } from '@@/datatables/extend-options/withMeta'; import { BasicTableSettings, filteredColumnsSettings, type FilteredColumnsTableSettings, -} from '@@CE/datatables/types'; -import { useTableStateWithStorage } from '@@CE/datatables/useTableState'; +} from '@@/datatables/types'; +import { useTableStateWithStorage } from '@@/datatables/useTableState'; import { useColumns } from './columns'; import { DecoratedTask } from './types'; diff --git a/app/react/docker/services/ItemView/TasksDatatable/columns/actions.tsx b/app/react/docker/services/ItemView/TasksDatatable/columns/actions.tsx index cee320596..1f153c5f2 100644 --- a/app/react/docker/services/ItemView/TasksDatatable/columns/actions.tsx +++ b/app/react/docker/services/ItemView/TasksDatatable/columns/actions.tsx @@ -1,10 +1,10 @@ import { CellContext } from '@tanstack/react-table'; -import { ContainerQuickActions } from '@CE/react/docker/containers/components/ContainerQuickActions'; -import { useCurrentEnvironment } from '@CE/react/hooks/useCurrentEnvironment'; -import { isAgentEnvironment } from '@CE/react/portainer/environments/utils'; -import { QuickActionsState } from '@CE/react/docker/containers/components/ContainerQuickActions/ContainerQuickActions'; -import { TaskTableQuickActions } from '@CE/react/docker/services/common/TaskTableQuickActions'; +import { ContainerQuickActions } from '@/react/docker/containers/components/ContainerQuickActions'; +import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment'; +import { isAgentEnvironment } from '@/react/portainer/environments/utils'; +import { QuickActionsState } from '@/react/docker/containers/components/ContainerQuickActions/ContainerQuickActions'; +import { TaskTableQuickActions } from '@/react/docker/services/common/TaskTableQuickActions'; import { DecoratedTask } from '../types'; diff --git a/app/react/docker/services/ItemView/TasksDatatable/columns/node.tsx b/app/react/docker/services/ItemView/TasksDatatable/columns/node.tsx index c27cdea06..dd2ca7c91 100644 --- a/app/react/docker/services/ItemView/TasksDatatable/columns/node.tsx +++ b/app/react/docker/services/ItemView/TasksDatatable/columns/node.tsx @@ -1,8 +1,8 @@ import { Node } from 'docker-types/generated/1.44'; import { CellContext } from '@tanstack/react-table'; -import { useNodes } from '@CE/react/docker/proxy/queries/nodes/useNodes'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { useNodes } from '@/react/docker/proxy/queries/nodes/useNodes'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; import { DecoratedTask } from '../types'; diff --git a/app/react/docker/services/ItemView/TasksDatatable/columns/status.tsx b/app/react/docker/services/ItemView/TasksDatatable/columns/status.tsx index 594df8ae5..7f1bc39ea 100644 --- a/app/react/docker/services/ItemView/TasksDatatable/columns/status.tsx +++ b/app/react/docker/services/ItemView/TasksDatatable/columns/status.tsx @@ -1,9 +1,9 @@ import clsx from 'clsx'; -import { taskStatusBadge } from '@CE/docker/filters/utils'; +import { taskStatusBadge } from '@/docker/filters/utils'; -import { multiple } from '@@CE/datatables/filter-types'; -import { filterHOC } from '@@CE/datatables/Filter'; +import { multiple } from '@@/datatables/filter-types'; +import { filterHOC } from '@@/datatables/Filter'; import { columnHelper } from './helper'; diff --git a/app/react/docker/services/ItemView/TasksDatatable/columns/task.tsx b/app/react/docker/services/ItemView/TasksDatatable/columns/task.tsx index fd22d506f..5d4212ae3 100644 --- a/app/react/docker/services/ItemView/TasksDatatable/columns/task.tsx +++ b/app/react/docker/services/ItemView/TasksDatatable/columns/task.tsx @@ -1,9 +1,9 @@ import { CellContext } from '@tanstack/react-table'; -import { useCurrentEnvironment } from '@CE/react/hooks/useCurrentEnvironment'; -import { isAgentEnvironment } from '@CE/react/portainer/environments/utils'; +import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment'; +import { isAgentEnvironment } from '@/react/portainer/environments/utils'; -import { Link } from '@@CE/Link'; +import { Link } from '@@/Link'; import { DecoratedTask } from '../types'; import { getTableMeta } from '../meta'; diff --git a/app/react/docker/services/ItemView/TasksDatatable/columns/updated.tsx b/app/react/docker/services/ItemView/TasksDatatable/columns/updated.tsx index a3b840be6..026efc658 100644 --- a/app/react/docker/services/ItemView/TasksDatatable/columns/updated.tsx +++ b/app/react/docker/services/ItemView/TasksDatatable/columns/updated.tsx @@ -1,4 +1,4 @@ -import { isoDate } from '@CE/portainer/filters/filters'; +import { isoDate } from '@/portainer/filters/filters'; import { columnHelper } from './helper'; diff --git a/app/react/docker/services/ItemView/TasksDatatable/types.ts b/app/react/docker/services/ItemView/TasksDatatable/types.ts index 9e6c0e548..e58c37dc2 100644 --- a/app/react/docker/services/ItemView/TasksDatatable/types.ts +++ b/app/react/docker/services/ItemView/TasksDatatable/types.ts @@ -1,5 +1,5 @@ -import { TaskViewModel } from '@CE/docker/models/task'; -import { ContainerListViewModel } from '@CE/react/docker/containers/types'; +import { TaskViewModel } from '@/docker/models/task'; +import { ContainerListViewModel } from '@/react/docker/containers/types'; export type DecoratedTask = TaskViewModel & { Container?: ContainerListViewModel; diff --git a/app/react/docker/services/ListView/ServicesDatatable/ServicesDatatable.tsx b/app/react/docker/services/ListView/ServicesDatatable/ServicesDatatable.tsx index 98b58c65e..1cc74074d 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/ServicesDatatable.tsx +++ b/app/react/docker/services/ListView/ServicesDatatable/ServicesDatatable.tsx @@ -2,23 +2,23 @@ import { Shuffle } from 'lucide-react'; import { Row } from '@tanstack/react-table'; import { useRef } from 'react'; -import { ServiceViewModel } from '@CE/docker/models/service'; -import { useApiVersion } from '@CE/react/docker/proxy/queries/useVersion'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; +import { ServiceViewModel } from '@/docker/models/service'; +import { useApiVersion } from '@/react/docker/proxy/queries/useVersion'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; -import { IconProps } from '@@CE/Icon'; -import { ExpandableDatatable } from '@@CE/datatables/ExpandableDatatable'; +import { IconProps } from '@@/Icon'; +import { ExpandableDatatable } from '@@/datatables/ExpandableDatatable'; import { createPersistedStore, refreshableSettings, hiddenColumnsSettings, -} from '@@CE/datatables/types'; -import { useTableState } from '@@CE/datatables/useTableState'; -import { useRepeater } from '@@CE/datatables/useRepeater'; -import { defaultGlobalFilterFn } from '@@CE/datatables/Datatable'; -import { getColumnVisibilityState } from '@@CE/datatables/ColumnVisibilityMenu'; -import { mergeOptions } from '@@CE/datatables/extend-options/mergeOptions'; -import { withGlobalFilter } from '@@CE/datatables/extend-options/withGlobalFilter'; +} from '@@/datatables/types'; +import { useTableState } from '@@/datatables/useTableState'; +import { useRepeater } from '@@/datatables/useRepeater'; +import { defaultGlobalFilterFn } from '@@/datatables/Datatable'; +import { getColumnVisibilityState } from '@@/datatables/ColumnVisibilityMenu'; +import { mergeOptions } from '@@/datatables/extend-options/mergeOptions'; +import { withGlobalFilter } from '@@/datatables/extend-options/withGlobalFilter'; import { DecoratedTask } from '../../ItemView/TasksDatatable/types'; diff --git a/app/react/docker/services/ListView/ServicesDatatable/TableActions.tsx b/app/react/docker/services/ListView/ServicesDatatable/TableActions.tsx index e90404938..ba47abf08 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/TableActions.tsx +++ b/app/react/docker/services/ListView/ServicesDatatable/TableActions.tsx @@ -1,13 +1,13 @@ import { RefreshCw } from 'lucide-react'; import { useRouter } from '@uirouter/react'; -import { ServiceViewModel } from '@CE/docker/models/service'; -import { Authorized } from '@CE/react/hooks/useUser'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { notifySuccess } from '@CE/portainer/services/notifications'; +import { ServiceViewModel } from '@/docker/models/service'; +import { Authorized } from '@/react/hooks/useUser'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { notifySuccess } from '@/portainer/services/notifications'; -import { AddButton, Button, ButtonGroup } from '@@CE/buttons'; -import { DeleteButton } from '@@CE/buttons/DeleteButton'; +import { AddButton, Button, ButtonGroup } from '@@/buttons'; +import { DeleteButton } from '@@/buttons/DeleteButton'; import { confirmServiceForceUpdate } from '../../common/update-service-modal'; diff --git a/app/react/docker/services/ListView/ServicesDatatable/TableSettings.tsx b/app/react/docker/services/ListView/ServicesDatatable/TableSettings.tsx index 19113ccab..4145c10e7 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/TableSettings.tsx +++ b/app/react/docker/services/ListView/ServicesDatatable/TableSettings.tsx @@ -1,10 +1,10 @@ import { Table } from '@tanstack/react-table'; -import { ServiceViewModel } from '@CE/docker/models/service'; +import { ServiceViewModel } from '@/docker/models/service'; -import { TableSettingsMenu } from '@@CE/datatables'; -import { TableSettingsMenuAutoRefresh } from '@@CE/datatables/TableSettingsMenuAutoRefresh'; -import { ColumnVisibilityMenu } from '@@CE/datatables/ColumnVisibilityMenu'; +import { TableSettingsMenu } from '@@/datatables'; +import { TableSettingsMenuAutoRefresh } from '@@/datatables/TableSettingsMenuAutoRefresh'; +import { ColumnVisibilityMenu } from '@@/datatables/ColumnVisibilityMenu'; import { type TableSettings as TableSettingsType } from './types'; diff --git a/app/react/docker/services/ListView/ServicesDatatable/TasksDatatable/TasksDatatable.tsx b/app/react/docker/services/ListView/ServicesDatatable/TasksDatatable/TasksDatatable.tsx index 657472500..02de64df9 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/TasksDatatable/TasksDatatable.tsx +++ b/app/react/docker/services/ListView/ServicesDatatable/TasksDatatable/TasksDatatable.tsx @@ -1,11 +1,11 @@ -import { DecoratedTask } from '@CE/react/docker/services/ItemView/TasksDatatable/types'; -import { status } from '@CE/react/docker/services/ItemView/TasksDatatable/columns/status'; -import { actions } from '@CE/react/docker/services/ItemView/TasksDatatable/columns/actions'; -import { slot } from '@CE/react/docker/services/ItemView/TasksDatatable/columns/slot'; -import { node } from '@CE/react/docker/services/ItemView/TasksDatatable/columns/node'; -import { updated } from '@CE/react/docker/services/ItemView/TasksDatatable/columns/updated'; +import { DecoratedTask } from '@/react/docker/services/ItemView/TasksDatatable/types'; +import { status } from '@/react/docker/services/ItemView/TasksDatatable/columns/status'; +import { actions } from '@/react/docker/services/ItemView/TasksDatatable/columns/actions'; +import { slot } from '@/react/docker/services/ItemView/TasksDatatable/columns/slot'; +import { node } from '@/react/docker/services/ItemView/TasksDatatable/columns/node'; +import { updated } from '@/react/docker/services/ItemView/TasksDatatable/columns/updated'; -import { NestedDatatable } from '@@CE/datatables/NestedDatatable'; +import { NestedDatatable } from '@@/datatables/NestedDatatable'; import { task } from './task-column'; diff --git a/app/react/docker/services/ListView/ServicesDatatable/TasksDatatable/task-column.tsx b/app/react/docker/services/ListView/ServicesDatatable/TasksDatatable/task-column.tsx index 3f2e4de61..b2c34ce55 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/TasksDatatable/task-column.tsx +++ b/app/react/docker/services/ListView/ServicesDatatable/TasksDatatable/task-column.tsx @@ -1,11 +1,11 @@ import { CellContext } from '@tanstack/react-table'; -import { useCurrentEnvironment } from '@CE/react/hooks/useCurrentEnvironment'; -import { isAgentEnvironment } from '@CE/react/portainer/environments/utils'; -import { DecoratedTask } from '@CE/react/docker/services/ItemView/TasksDatatable/types'; -import { columnHelper } from '@CE/react/docker/services/ItemView/TasksDatatable/columns/helper'; +import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment'; +import { isAgentEnvironment } from '@/react/portainer/environments/utils'; +import { DecoratedTask } from '@/react/docker/services/ItemView/TasksDatatable/types'; +import { columnHelper } from '@/react/docker/services/ItemView/TasksDatatable/columns/helper'; -import { Link } from '@@CE/Link'; +import { Link } from '@@/Link'; export const task = columnHelper.accessor('Id', { header: 'Task', diff --git a/app/react/docker/services/ListView/ServicesDatatable/columns/helper.ts b/app/react/docker/services/ListView/ServicesDatatable/columns/helper.ts index 7bc2e062a..ddabe6644 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/columns/helper.ts +++ b/app/react/docker/services/ListView/ServicesDatatable/columns/helper.ts @@ -1,5 +1,5 @@ import { createColumnHelper } from '@tanstack/react-table'; -import { ServiceViewModel } from '@CE/docker/models/service'; +import { ServiceViewModel } from '@/docker/models/service'; export const columnHelper = createColumnHelper(); diff --git a/app/react/docker/services/ListView/ServicesDatatable/columns/image.tsx b/app/react/docker/services/ListView/ServicesDatatable/columns/image.tsx index 6dff70437..ff71a6669 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/columns/image.tsx +++ b/app/react/docker/services/ListView/ServicesDatatable/columns/image.tsx @@ -1,11 +1,11 @@ import { CellContext } from '@tanstack/react-table'; -import { ServiceViewModel } from '@CE/docker/models/service'; -import { ImageStatus } from '@CE/react/docker/components/ImageStatus'; -import { hideShaSum } from '@CE/docker/filters/utils'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { ResourceType } from '@CE/react/docker/components/ImageStatus/types'; -import { ImageUpToDateTooltip } from '@CE/react/docker/components/datatable/TableColumnHeaderImageUpToDate'; +import { ServiceViewModel } from '@/docker/models/service'; +import { ImageStatus } from '@/react/docker/components/ImageStatus'; +import { hideShaSum } from '@/docker/filters/utils'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { ResourceType } from '@/react/docker/components/ImageStatus/types'; +import { ImageUpToDateTooltip } from '@/react/docker/components/datatable/TableColumnHeaderImageUpToDate'; import { columnHelper } from './helper'; diff --git a/app/react/docker/services/ListView/ServicesDatatable/columns/index.ts b/app/react/docker/services/ListView/ServicesDatatable/columns/index.ts index c55dd329f..85204f23d 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/columns/index.ts +++ b/app/react/docker/services/ListView/ServicesDatatable/columns/index.ts @@ -1,12 +1,12 @@ import { useMemo } from 'react'; import _ from 'lodash'; -import { ServiceViewModel } from '@CE/docker/models/service'; -import { isoDate } from '@CE/portainer/filters/filters'; -import { createOwnershipColumn } from '@CE/react/docker/components/datatable/createOwnershipColumn'; +import { ServiceViewModel } from '@/docker/models/service'; +import { isoDate } from '@/portainer/filters/filters'; +import { createOwnershipColumn } from '@/react/docker/components/datatable/createOwnershipColumn'; -import { buildNameColumn } from '@@CE/datatables/buildNameColumn'; -import { buildExpandColumn } from '@@CE/datatables/expand-column'; +import { buildNameColumn } from '@@/datatables/buildNameColumn'; +import { buildExpandColumn } from '@@/datatables/expand-column'; import { image } from './image'; import { columnHelper } from './helper'; diff --git a/app/react/docker/services/ListView/ServicesDatatable/columns/ports.tsx b/app/react/docker/services/ListView/ServicesDatatable/columns/ports.tsx index ac82b9265..691b0dffd 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/columns/ports.tsx +++ b/app/react/docker/services/ListView/ServicesDatatable/columns/ports.tsx @@ -1,8 +1,8 @@ import { CellContext } from '@tanstack/react-table'; -import { ServiceViewModel } from '@CE/docker/models/service'; -import { useCurrentEnvironment } from '@CE/react/hooks/useCurrentEnvironment'; -import { PublishedPortLink } from '@CE/react/docker/components/ImageStatus/PublishedPortLink'; +import { ServiceViewModel } from '@/docker/models/service'; +import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment'; +import { PublishedPortLink } from '@/react/docker/components/ImageStatus/PublishedPortLink'; import { columnHelper } from './helper'; diff --git a/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/ScaleForm.tsx b/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/ScaleForm.tsx index 6045a3224..714b3bbd7 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/ScaleForm.tsx +++ b/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/ScaleForm.tsx @@ -2,13 +2,13 @@ import { Formik, Form } from 'formik'; import { X, CheckSquare } from 'lucide-react'; import { useRouter } from '@uirouter/react'; -import { ServiceViewModel } from '@CE/docker/models/service'; -import { useUpdateServiceMutation } from '@CE/react/docker/services/queries/useUpdateServiceMutation'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { convertServiceToConfig } from '@CE/react/docker/services/common/convertServiceToConfig'; -import { notifySuccess } from '@CE/portainer/services/notifications'; +import { ServiceViewModel } from '@/docker/models/service'; +import { useUpdateServiceMutation } from '@/react/docker/services/queries/useUpdateServiceMutation'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { convertServiceToConfig } from '@/react/docker/services/common/convertServiceToConfig'; +import { notifySuccess } from '@/portainer/services/notifications'; -import { Button, LoadingButton } from '@@CE/buttons'; +import { Button, LoadingButton } from '@@/buttons'; export function ScaleForm({ onClose, diff --git a/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/ScaleServiceButton.tsx b/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/ScaleServiceButton.tsx index abe72781d..89d36ca20 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/ScaleServiceButton.tsx +++ b/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/ScaleServiceButton.tsx @@ -1,10 +1,10 @@ import { Minimize2 } from 'lucide-react'; import { useState } from 'react'; -import { ServiceViewModel } from '@CE/docker/models/service'; -import { Authorized } from '@CE/react/hooks/useUser'; +import { ServiceViewModel } from '@/docker/models/service'; +import { Authorized } from '@/react/hooks/useUser'; -import { Button } from '@@CE/buttons'; +import { Button } from '@@/buttons'; import { ScaleForm } from './ScaleForm'; diff --git a/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/constraint-helper.ts b/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/constraint-helper.ts index e0fdc03c3..372e9ef50 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/constraint-helper.ts +++ b/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/constraint-helper.ts @@ -1,6 +1,6 @@ import { Node } from 'docker-types/generated/1.44'; -import { ServiceViewModel } from '@CE/docker/models/service'; +import { ServiceViewModel } from '@/docker/models/service'; class ConstraintModel { op: string; diff --git a/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/schedulingMode.tsx b/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/schedulingMode.tsx index a10065ea3..bc1f3aa4b 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/schedulingMode.tsx +++ b/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/schedulingMode.tsx @@ -1,10 +1,10 @@ import { CellContext } from '@tanstack/react-table'; import { Node } from 'docker-types/generated/1.44'; -import { ServiceViewModel } from '@CE/docker/models/service'; -import { useNodes } from '@CE/react/docker/proxy/queries/nodes/useNodes'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { TaskViewModel } from '@CE/docker/models/task'; +import { ServiceViewModel } from '@/docker/models/service'; +import { useNodes } from '@/react/docker/proxy/queries/nodes/useNodes'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { TaskViewModel } from '@/docker/models/task'; import { columnHelper } from '../helper'; diff --git a/app/react/docker/services/ListView/ServicesDatatable/types.ts b/app/react/docker/services/ListView/ServicesDatatable/types.ts index 6b03ba452..2b50727ff 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/types.ts +++ b/app/react/docker/services/ListView/ServicesDatatable/types.ts @@ -2,7 +2,7 @@ import { BasicTableSettings, RefreshableTableSettings, SettableColumnsTableSettings, -} from '@@CE/datatables/types'; +} from '@@/datatables/types'; export type TableSettings = { /** expanded is true (all expanded) or a record where each key value pair sets the state of the mentioned row */ diff --git a/app/react/docker/services/ListView/ServicesDatatable/useForceUpdateServicesMutation.ts b/app/react/docker/services/ListView/ServicesDatatable/useForceUpdateServicesMutation.ts index 30a935bdc..813bb79d1 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/useForceUpdateServicesMutation.ts +++ b/app/react/docker/services/ListView/ServicesDatatable/useForceUpdateServicesMutation.ts @@ -1,9 +1,9 @@ import { useMutation } from '@tanstack/react-query'; -import { promiseSequence } from '@CE/portainer/helpers/promise-utils'; -import { withError } from '@CE/react-tools/react-query'; -import { forceUpdateService } from '@CE/react/portainer/environments/environment.service'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { promiseSequence } from '@/portainer/helpers/promise-utils'; +import { withError } from '@/react-tools/react-query'; +import { forceUpdateService } from '@/react/portainer/environments/environment.service'; +import { EnvironmentId } from '@/react/portainer/environments/types'; export function useForceUpdateServicesMutation(environmentId: EnvironmentId) { return useMutation( diff --git a/app/react/docker/services/ListView/ServicesDatatable/useRemoveServicesMutation.ts b/app/react/docker/services/ListView/ServicesDatatable/useRemoveServicesMutation.ts index 9602aca13..3c635da4a 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/useRemoveServicesMutation.ts +++ b/app/react/docker/services/ListView/ServicesDatatable/useRemoveServicesMutation.ts @@ -1,9 +1,9 @@ import { useMutation } from '@tanstack/react-query'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { promiseSequence } from '@CE/portainer/helpers/promise-utils'; -import { withError } from '@CE/react-tools/react-query'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { promiseSequence } from '@/portainer/helpers/promise-utils'; +import { withError } from '@/react-tools/react-query'; import { buildUrl } from '../../queries/build-url'; import { removeWebhooksForService } from '../../webhooks/removeWebhook'; diff --git a/app/react/docker/services/common/TaskTableQuickActions.tsx b/app/react/docker/services/common/TaskTableQuickActions.tsx index cff3a82a9..28a3628a8 100644 --- a/app/react/docker/services/common/TaskTableQuickActions.tsx +++ b/app/react/docker/services/common/TaskTableQuickActions.tsx @@ -1,9 +1,9 @@ import { FileText, Info } from 'lucide-react'; -import { Authorized } from '@CE/react/hooks/useUser'; +import { Authorized } from '@/react/hooks/useUser'; -import { Icon } from '@@CE/Icon'; -import { Link } from '@@CE/Link'; +import { Icon } from '@@/Icon'; +import { Link } from '@@/Link'; interface State { showQuickActionInspect: boolean; diff --git a/app/react/docker/services/common/update-service-modal.ts b/app/react/docker/services/common/update-service-modal.ts index 892a0afe2..e9107b99a 100644 --- a/app/react/docker/services/common/update-service-modal.ts +++ b/app/react/docker/services/common/update-service-modal.ts @@ -1,6 +1,6 @@ -import { openSwitchPrompt } from '@@CE/modals/SwitchPrompt'; -import { ModalType } from '@@CE/modals'; -import { buildConfirmButton } from '@@CE/modals/utils'; +import { openSwitchPrompt } from '@@/modals/SwitchPrompt'; +import { ModalType } from '@@/modals'; +import { buildConfirmButton } from '@@/modals/utils'; export async function confirmServiceForceUpdate(message: string) { const result = await openSwitchPrompt('Are you sure?', 'Re-pull image', { diff --git a/app/react/docker/services/queries/build-url.ts b/app/react/docker/services/queries/build-url.ts index 8698c476b..34bc4c8b4 100644 --- a/app/react/docker/services/queries/build-url.ts +++ b/app/react/docker/services/queries/build-url.ts @@ -1,4 +1,4 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl'; import { ServiceId } from '../types'; diff --git a/app/react/docker/services/queries/query-keys.ts b/app/react/docker/services/queries/query-keys.ts index 14ab6138c..0c6489761 100644 --- a/app/react/docker/services/queries/query-keys.ts +++ b/app/react/docker/services/queries/query-keys.ts @@ -1,4 +1,4 @@ -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { queryKeys as dockerQueryKeys } from '../../queries/utils'; import { Filters } from '../types'; diff --git a/app/react/docker/services/queries/useCreateServiceMutation.ts b/app/react/docker/services/queries/useCreateServiceMutation.ts index 8a5bfc906..0e314552f 100644 --- a/app/react/docker/services/queries/useCreateServiceMutation.ts +++ b/app/react/docker/services/queries/useCreateServiceMutation.ts @@ -1,13 +1,13 @@ import { Service } from 'docker-types/generated/1.44'; import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { mutationOptions, withError, withInvalidate, -} from '@CE/react-tools/react-query'; +} from '@/react-tools/react-query'; import { ServiceUpdateConfig } from '../types'; import { withRegistryAuthHeader } from '../../proxy/queries/utils'; diff --git a/app/react/docker/services/queries/useService.ts b/app/react/docker/services/queries/useService.ts index 0608641ea..d38002ed4 100644 --- a/app/react/docker/services/queries/useService.ts +++ b/app/react/docker/services/queries/useService.ts @@ -1,12 +1,12 @@ import { useQuery } from '@tanstack/react-query'; import { Service } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { withGlobalError } from '@CE/react-tools/react-query'; -import { ServiceId } from '@CE/react/docker/services/types'; -import { queryKeys } from '@CE/react/docker/services/queries/query-keys'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { buildUrl } from '@CE/react/docker/services/queries/build-url'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { withGlobalError } from '@/react-tools/react-query'; +import { ServiceId } from '@/react/docker/services/types'; +import { queryKeys } from '@/react/docker/services/queries/query-keys'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { buildUrl } from '@/react/docker/services/queries/build-url'; export function useService(environmentId: EnvironmentId, serviceId: ServiceId) { return useQuery( diff --git a/app/react/docker/services/queries/useServiceLogs.ts b/app/react/docker/services/queries/useServiceLogs.ts index 8eef56cf8..2950a2d2a 100644 --- a/app/react/docker/services/queries/useServiceLogs.ts +++ b/app/react/docker/services/queries/useServiceLogs.ts @@ -1,9 +1,9 @@ import _ from 'lodash'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { buildUrl } from '@CE/react/docker/services/queries/build-url'; -import { ServiceId } from '@CE/react/docker/services/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { buildUrl } from '@/react/docker/services/queries/build-url'; +import { ServiceId } from '@/react/docker/services/types'; type ServiceLogsParams = { stdout?: boolean; diff --git a/app/react/docker/services/queries/useServices.ts b/app/react/docker/services/queries/useServices.ts index 874f65cfa..7b9c70947 100644 --- a/app/react/docker/services/queries/useServices.ts +++ b/app/react/docker/services/queries/useServices.ts @@ -1,11 +1,11 @@ import { useQuery } from '@tanstack/react-query'; import { Service } from 'docker-types/generated/1.44'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { withGlobalError } from '@CE/react-tools/react-query'; -import { queryKeys } from '@CE/react/docker/services/queries/query-keys'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { buildUrl } from '@CE/react/docker/services/queries/build-url'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { withGlobalError } from '@/react-tools/react-query'; +import { queryKeys } from '@/react/docker/services/queries/query-keys'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { buildUrl } from '@/react/docker/services/queries/build-url'; import { Filters } from '../types'; import { withFiltersQueryParam } from '../../proxy/queries/utils'; diff --git a/app/react/docker/services/queries/useUpdateServiceMutation.ts b/app/react/docker/services/queries/useUpdateServiceMutation.ts index c52516ad8..846a281e1 100644 --- a/app/react/docker/services/queries/useUpdateServiceMutation.ts +++ b/app/react/docker/services/queries/useUpdateServiceMutation.ts @@ -1,13 +1,13 @@ import { ServiceUpdateResponse } from 'docker-types/generated/1.44'; import { useMutation, useQueryClient } from '@tanstack/react-query'; -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { mutationOptions, withError, withInvalidate, -} from '@CE/react-tools/react-query'; +} from '@/react-tools/react-query'; import { ServiceUpdateConfig } from '../types'; import { withRegistryAuthHeader } from '../../proxy/queries/utils'; diff --git a/app/react/docker/services/webhooks/getWebhooks.ts b/app/react/docker/services/webhooks/getWebhooks.ts index dc72a1d1f..c83d390ab 100644 --- a/app/react/docker/services/webhooks/getWebhooks.ts +++ b/app/react/docker/services/webhooks/getWebhooks.ts @@ -1,5 +1,5 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; import { buildUrl } from './build-url'; import { Webhook } from './types'; diff --git a/app/react/docker/services/webhooks/removeWebhook.ts b/app/react/docker/services/webhooks/removeWebhook.ts index fdcabffc2..550c521d7 100644 --- a/app/react/docker/services/webhooks/removeWebhook.ts +++ b/app/react/docker/services/webhooks/removeWebhook.ts @@ -1,6 +1,6 @@ -import axios, { parseAxiosError } from '@CE/portainer/services/axios'; -import { EnvironmentId } from '@CE/react/portainer/environments/types'; -import { promiseSequence } from '@CE/portainer/helpers/promise-utils'; +import axios, { parseAxiosError } from '@/portainer/services/axios'; +import { EnvironmentId } from '@/react/portainer/environments/types'; +import { promiseSequence } from '@/portainer/helpers/promise-utils'; import { getWebhooks } from './getWebhooks'; import { Webhook } from './types'; diff --git a/app/react/docker/services/webhooks/types.ts b/app/react/docker/services/webhooks/types.ts index 451bce0aa..4f5991b06 100644 --- a/app/react/docker/services/webhooks/types.ts +++ b/app/react/docker/services/webhooks/types.ts @@ -1,5 +1,5 @@ -import { Environment } from '@CE/react/portainer/environments/types'; -import { Registry } from '@CE/react/portainer/registries/types/registry'; +import { Environment } from '@/react/portainer/environments/types'; +import { Registry } from '@/react/portainer/registries/types/registry'; enum WebhookType { Service = 1, diff --git a/app/react/docker/snapshots/types/index.ts b/app/react/docker/snapshots/types/index.ts index 7638f7562..850e305f9 100644 --- a/app/react/docker/snapshots/types/index.ts +++ b/app/react/docker/snapshots/types/index.ts @@ -1,4 +1,4 @@ -import { ContainerListViewModel } from '@CE/react/docker/containers/types'; +import { ContainerListViewModel } from '@/react/docker/containers/types'; export type DockerContainerSnapshot = ContainerListViewModel & { Env: string[]; diff --git a/app/react/docker/stacks/ItemView/ItemView.tsx b/app/react/docker/stacks/ItemView/ItemView.tsx index 9827fa94b..8f3e1baf6 100644 --- a/app/react/docker/stacks/ItemView/ItemView.tsx +++ b/app/react/docker/stacks/ItemView/ItemView.tsx @@ -2,17 +2,17 @@ import { useCurrentStateAndParams, useRouter } from '@uirouter/react'; import { useQueryClient } from '@tanstack/react-query'; import { useEffect } from 'react'; -import { StackContainersDatatable } from '@CE/react/docker/stacks/ItemView/StackContainersDatatable'; -import { AccessControlPanel } from '@CE/react/portainer/access-control'; -import { useStack } from '@CE/react/common/stacks/queries/useStack'; -import { Stack, StackType } from '@CE/react/common/stacks/types'; -import { ResourceControlViewModel } from '@CE/react/portainer/access-control/models/ResourceControlViewModel'; -import { ResourceControlType } from '@CE/react/portainer/access-control/types'; -import { queryKeys } from '@CE/react/common/stacks/queries/query-keys'; -import { useIsEdgeAdmin } from '@CE/react/hooks/useUser'; -import { notifyError } from '@CE/portainer/services/notifications'; +import { StackContainersDatatable } from '@/react/docker/stacks/ItemView/StackContainersDatatable'; +import { AccessControlPanel } from '@/react/portainer/access-control'; +import { useStack } from '@/react/common/stacks/queries/useStack'; +import { Stack, StackType } from '@/react/common/stacks/types'; +import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; +import { ResourceControlType } from '@/react/portainer/access-control/types'; +import { queryKeys } from '@/react/common/stacks/queries/query-keys'; +import { useIsEdgeAdmin } from '@/react/hooks/useUser'; +import { notifyError } from '@/portainer/services/notifications'; -import { PageHeader } from '@@CE/PageHeader'; +import { PageHeader } from '@@/PageHeader'; import { StackDetails } from './StackDetails'; import { StackServicesDatatable } from './StackServicesDatatable'; diff --git a/app/react/docker/stacks/ItemView/StackContainersDatatable.tsx b/app/react/docker/stacks/ItemView/StackContainersDatatable.tsx index 70cf91429..0ac00f2a5 100644 --- a/app/react/docker/stacks/ItemView/StackContainersDatatable.tsx +++ b/app/react/docker/stacks/ItemView/StackContainersDatatable.tsx @@ -1,24 +1,24 @@ import { Box } from 'lucide-react'; -import { ContainerListViewModel } from '@CE/react/docker/containers/types'; -import { createStore } from '@CE/react/docker/containers/ListView/ContainersDatatable/datatable-store'; -import { useColumns } from '@CE/react/docker/containers/ListView/ContainersDatatable/columns'; -import { ContainersDatatableActions } from '@CE/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableActions'; -import { ContainersDatatableSettings } from '@CE/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableSettings'; -import { useShowGPUsColumn } from '@CE/react/docker/containers/utils'; -import { useCurrentEnvironment } from '@CE/react/hooks/useCurrentEnvironment'; +import { ContainerListViewModel } from '@/react/docker/containers/types'; +import { createStore } from '@/react/docker/containers/ListView/ContainersDatatable/datatable-store'; +import { useColumns } from '@/react/docker/containers/ListView/ContainersDatatable/columns'; +import { ContainersDatatableActions } from '@/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableActions'; +import { ContainersDatatableSettings } from '@/react/docker/containers/ListView/ContainersDatatable/ContainersDatatableSettings'; +import { useShowGPUsColumn } from '@/react/docker/containers/utils'; +import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment'; -import { Datatable, Table } from '@@CE/datatables'; +import { Datatable, Table } from '@@/datatables'; import { buildAction, QuickActionsSettings, -} from '@@CE/datatables/QuickActionsSettings'; +} from '@@/datatables/QuickActionsSettings'; import { ColumnVisibilityMenu, getColumnVisibilityState, -} from '@@CE/datatables/ColumnVisibilityMenu'; -import { TableSettingsProvider } from '@@CE/datatables/useTableSettings'; -import { useTableState } from '@@CE/datatables/useTableState'; +} from '@@/datatables/ColumnVisibilityMenu'; +import { TableSettingsProvider } from '@@/datatables/useTableSettings'; +import { useTableState } from '@@/datatables/useTableState'; import { RowProvider } from '../../containers/ListView/ContainersDatatable/RowContext'; diff --git a/app/react/docker/stacks/ItemView/StackDetails.tsx b/app/react/docker/stacks/ItemView/StackDetails.tsx index b08781e9e..479a299c7 100644 --- a/app/react/docker/stacks/ItemView/StackDetails.tsx +++ b/app/react/docker/stacks/ItemView/StackDetails.tsx @@ -1,13 +1,13 @@ import { Edit2, List } from 'lucide-react'; import _ from 'lodash'; -import { useParamState } from '@CE/react/hooks/useParamState'; -import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId'; -import { Stack } from '@CE/react/common/stacks/types'; -import { useStackFile } from '@CE/react/common/stacks/queries/useStackFile'; +import { useParamState } from '@/react/hooks/useParamState'; +import { useEnvironmentId } from '@/react/hooks/useEnvironmentId'; +import { Stack } from '@/react/common/stacks/types'; +import { useStackFile } from '@/react/common/stacks/queries/useStackFile'; -import { NavTabs } from '@@CE/NavTabs'; -import { WidgetBody, Widget } from '@@CE/Widget'; +import { NavTabs } from '@@/NavTabs'; +import { WidgetBody, Widget } from '@@/Widget'; import { useContainers } from '../../containers/queries/useContainers'; diff --git a/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.test.tsx b/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.test.tsx index 5c32fb631..c292931a8 100644 --- a/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.test.tsx +++ b/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.test.tsx @@ -4,18 +4,15 @@ import { http, HttpResponse } from 'msw'; import { vi } from 'vitest'; import { ComponentProps } from 'react'; -import { server } from '@CE/setup-tests/server'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; -import { withUserProvider } from '@CE/react/test-utils/withUserProvider'; -import { createMockUsers, createMockStack } from '@CE/react-tools/test-mocks'; -import { EnvironmentType } from '@CE/react/portainer/environments/types'; -import { Role } from '@CE/portainer/users/types'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; -import { confirmStackUpdate } from '@CE/react/common/stacks/common/confirm-stack-update'; -import { - notifyError, - notifySuccess, -} from '@CE/portainer/services/notifications'; +import { server } from '@/setup-tests/server'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; +import { withUserProvider } from '@/react/test-utils/withUserProvider'; +import { createMockUsers, createMockStack } from '@/react-tools/test-mocks'; +import { EnvironmentType } from '@/react/portainer/environments/types'; +import { Role } from '@/portainer/users/types'; +import { withTestRouter } from '@/react/test-utils/withRouter'; +import { confirmStackUpdate } from '@/react/common/stacks/common/confirm-stack-update'; +import { notifyError, notifySuccess } from '@/portainer/services/notifications'; import { StackEditorTab } from './StackEditorTab'; @@ -39,7 +36,7 @@ const defaultProps = { }; // Mock the hooks and child component -vi.mock('@@CE/WebEditorForm', () => ({ +vi.mock('@@/WebEditorForm', () => ({ usePreventExit: vi.fn(), })); @@ -54,13 +51,13 @@ vi.mock('@uirouter/react', async (importOriginal: () => Promise) => ({ })), })); -vi.mock('@CE/react/common/stacks/common/confirm-stack-update', () => ({ +vi.mock('@/react/common/stacks/common/confirm-stack-update', () => ({ confirmStackUpdate: vi.fn(() => Promise.resolve({ repullImageAndRedeploy: false }) ), })); -vi.mock('@CE/portainer/services/notifications', () => ({ +vi.mock('@/portainer/services/notifications', () => ({ notifyError: vi.fn(), notifySuccess: vi.fn(), })); diff --git a/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.tsx b/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.tsx index 93730f26c..faa0cafa6 100644 --- a/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.tsx +++ b/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.tsx @@ -2,15 +2,12 @@ import { Formik } from 'formik'; import { useRouter } from '@uirouter/react'; import _ from 'lodash'; -import { Stack, StackType } from '@CE/react/common/stacks/types'; -import { useDockerComposeSchema } from '@CE/react/hooks/useDockerComposeSchema/useDockerComposeSchema'; -import { useApiVersion } from '@CE/react/docker/proxy/queries/useVersion'; -import { useCurrentEnvironment } from '@CE/react/hooks/useCurrentEnvironment'; -import { confirmStackUpdate } from '@CE/react/common/stacks/common/confirm-stack-update'; -import { - notifyError, - notifySuccess, -} from '@CE/portainer/services/notifications'; +import { Stack, StackType } from '@/react/common/stacks/types'; +import { useDockerComposeSchema } from '@/react/hooks/useDockerComposeSchema/useDockerComposeSchema'; +import { useApiVersion } from '@/react/docker/proxy/queries/useVersion'; +import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment'; +import { confirmStackUpdate } from '@/react/common/stacks/common/confirm-stack-update'; +import { notifyError, notifySuccess } from '@/portainer/services/notifications'; import { useUpdateStackMutation } from '../../useUpdateStack'; diff --git a/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.types.ts b/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.types.ts index 4377d0314..90f68aa9e 100644 --- a/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.types.ts +++ b/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.types.ts @@ -1,4 +1,4 @@ -import { EnvVarValues } from '@@CE/form-components/EnvironmentVariablesFieldset'; +import { EnvVarValues } from '@@/form-components/EnvironmentVariablesFieldset'; export interface StackEditorFormValues { stackFileContent: string; diff --git a/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.validation.ts b/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.validation.ts index 79fe98f39..70da5ba86 100644 --- a/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.validation.ts +++ b/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.validation.ts @@ -1,6 +1,6 @@ import { object, string, boolean, SchemaOf, array, number } from 'yup'; -import { envVarValidation } from '@@CE/form-components/EnvironmentVariablesFieldset'; +import { envVarValidation } from '@@/form-components/EnvironmentVariablesFieldset'; import { StackEditorFormValues } from './StackEditorTab.types'; import { validateYAML } from './stackYamlValidation'; diff --git a/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTabInner.test.tsx b/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTabInner.test.tsx index 7c531a71b..58d5b3692 100644 --- a/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTabInner.test.tsx +++ b/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTabInner.test.tsx @@ -5,22 +5,22 @@ import { vi } from 'vitest'; import { ComponentProps } from 'react'; import { JSONSchema7 } from 'json-schema'; -import { StackType } from '@CE/react/common/stacks/types'; -import { EnvironmentType } from '@CE/react/portainer/environments/types'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; -import { withUserProvider } from '@CE/react/test-utils/withUserProvider'; -import { createMockUsers } from '@CE/react-tools/test-mocks'; -import { Role } from '@CE/portainer/users/types'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; +import { StackType } from '@/react/common/stacks/types'; +import { EnvironmentType } from '@/react/portainer/environments/types'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; +import { withUserProvider } from '@/react/test-utils/withUserProvider'; +import { createMockUsers } from '@/react-tools/test-mocks'; +import { Role } from '@/portainer/users/types'; +import { withTestRouter } from '@/react/test-utils/withRouter'; -import { usePreventExit } from '@@CE/WebEditorForm'; +import { usePreventExit } from '@@/WebEditorForm'; import { StackEditorTabInner } from './StackEditorTabInner'; import { StackEditorFormValues } from './StackEditorTab.types'; import { useVersionedStackFile } from './useVersionedStackFile'; // Mock the hooks -vi.mock('@@CE/WebEditorForm', () => ({ +vi.mock('@@/WebEditorForm', () => ({ usePreventExit: vi.fn(), })); diff --git a/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTabInner.tsx b/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTabInner.tsx index cc79b8480..96063c035 100644 --- a/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTabInner.tsx +++ b/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTabInner.tsx @@ -2,17 +2,17 @@ import { Form, useFormikContext } from 'formik'; import { JSONSchema7 } from 'json-schema'; import { useCallback } from 'react'; -import { Stack, StackType } from '@CE/react/common/stacks/types'; -import { EnvironmentType } from '@CE/react/portainer/environments/types'; -import { Authorized, useAuthorizations } from '@CE/react/hooks/useUser'; +import { Stack, StackType } from '@/react/common/stacks/types'; +import { EnvironmentType } from '@/react/portainer/environments/types'; +import { Authorized, useAuthorizations } from '@/react/hooks/useUser'; -import { CodeEditor } from '@@CE/CodeEditor'; -import { SwitchField } from '@@CE/form-components/SwitchField'; -import { StackEnvironmentVariablesPanel } from '@@CE/form-components/EnvironmentVariablesFieldset'; -import { FormActions } from '@@CE/form-components/FormActions'; -import { FormSection } from '@@CE/form-components/FormSection'; -import { usePreventExit } from '@@CE/WebEditorForm'; -import { FormError } from '@@CE/form-components/FormError'; +import { CodeEditor } from '@@/CodeEditor'; +import { SwitchField } from '@@/form-components/SwitchField'; +import { StackEnvironmentVariablesPanel } from '@@/form-components/EnvironmentVariablesFieldset'; +import { FormActions } from '@@/form-components/FormActions'; +import { FormSection } from '@@/form-components/FormSection'; +import { usePreventExit } from '@@/WebEditorForm'; +import { FormError } from '@@/form-components/FormError'; import { StackEditorFormValues } from './StackEditorTab.types'; import { WebhookFieldset } from './WebhookFieldset'; diff --git a/app/react/docker/stacks/ItemView/StackEditorTab/WebhookFieldset.tsx b/app/react/docker/stacks/ItemView/StackEditorTab/WebhookFieldset.tsx index 8ea605649..73ecc9a61 100644 --- a/app/react/docker/stacks/ItemView/StackEditorTab/WebhookFieldset.tsx +++ b/app/react/docker/stacks/ItemView/StackEditorTab/WebhookFieldset.tsx @@ -1,13 +1,13 @@ import uuidv4 from 'uuid/v4'; import { useState } from 'react'; -import { baseStackWebhookUrl } from '@CE/portainer/helpers/webhookHelper'; -import { Authorized, useAuthorizations } from '@CE/react/hooks/useUser'; -import { FeatureId } from '@CE/react/portainer/feature-flags/enums'; -import { WebhookSettings } from '@CE/react/portainer/gitops/AutoUpdateFieldset/WebhookSettings'; +import { baseStackWebhookUrl } from '@/portainer/helpers/webhookHelper'; +import { Authorized, useAuthorizations } from '@/react/hooks/useUser'; +import { FeatureId } from '@/react/portainer/feature-flags/enums'; +import { WebhookSettings } from '@/react/portainer/gitops/AutoUpdateFieldset/WebhookSettings'; -import { FormSection } from '@@CE/form-components/FormSection'; -import { SwitchField } from '@@CE/form-components/SwitchField'; +import { FormSection } from '@@/form-components/FormSection'; +import { SwitchField } from '@@/form-components/SwitchField'; export function WebhookFieldset({ value, diff --git a/app/react/docker/stacks/ItemView/StackEditorTab/useVersionedStackFile.test.tsx b/app/react/docker/stacks/ItemView/StackEditorTab/useVersionedStackFile.test.tsx index 8d686e26b..d47410519 100644 --- a/app/react/docker/stacks/ItemView/StackEditorTab/useVersionedStackFile.test.tsx +++ b/app/react/docker/stacks/ItemView/StackEditorTab/useVersionedStackFile.test.tsx @@ -3,8 +3,8 @@ import { renderHook } from '@testing-library/react-hooks'; import { http, HttpResponse } from 'msw'; import { vi } from 'vitest'; -import { server } from '@CE/setup-tests/server'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; +import { server } from '@/setup-tests/server'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; import { useVersionedStackFile } from './useVersionedStackFile'; diff --git a/app/react/docker/stacks/ItemView/StackEditorTab/useVersionedStackFile.tsx b/app/react/docker/stacks/ItemView/StackEditorTab/useVersionedStackFile.tsx index 14158a673..7b7b0f87b 100644 --- a/app/react/docker/stacks/ItemView/StackEditorTab/useVersionedStackFile.tsx +++ b/app/react/docker/stacks/ItemView/StackEditorTab/useVersionedStackFile.tsx @@ -1,7 +1,7 @@ import { useEffect } from 'react'; -import { useStackFile } from '@CE/react/common/stacks/queries/useStackFile'; -import { Stack } from '@CE/react/common/stacks/types'; +import { useStackFile } from '@/react/common/stacks/queries/useStackFile'; +import { Stack } from '@/react/common/stacks/types'; export function useVersionedStackFile({ stackId, diff --git a/app/react/docker/stacks/ItemView/StackInfoTab/AssociateStackForm.test.tsx b/app/react/docker/stacks/ItemView/StackInfoTab/AssociateStackForm.test.tsx index a691b8286..ea29b567b 100644 --- a/app/react/docker/stacks/ItemView/StackInfoTab/AssociateStackForm.test.tsx +++ b/app/react/docker/stacks/ItemView/StackInfoTab/AssociateStackForm.test.tsx @@ -2,22 +2,22 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { delay, http, HttpResponse } from 'msw'; -import { server } from '@CE/setup-tests/server'; -import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery'; -import { withTestRouter } from '@CE/react/test-utils/withRouter'; -import { withUserProvider } from '@CE/react/test-utils/withUserProvider'; -import { createMockUsers } from '@CE/react-tools/test-mocks'; -import { useSwarmId } from '@CE/react/docker/proxy/queries/useSwarm'; +import { server } from '@/setup-tests/server'; +import { withTestQueryProvider } from '@/react/test-utils/withTestQuery'; +import { withTestRouter } from '@/react/test-utils/withRouter'; +import { withUserProvider } from '@/react/test-utils/withUserProvider'; +import { createMockUsers } from '@/react-tools/test-mocks'; +import { useSwarmId } from '@/react/docker/proxy/queries/useSwarm'; import { AssociateStackForm } from './AssociateStackForm'; // Mock the useSwarmId hook to avoid React Query complexity -vi.mock('@CE/react/docker/proxy/queries/useSwarm', () => ({ +vi.mock('@/react/docker/proxy/queries/useSwarm', () => ({ useSwarmId: vi.fn(), })); // Mock the AccessControlForm to simplify testing -vi.mock('@CE/react/portainer/access-control', () => ({ +vi.mock('@/react/portainer/access-control', () => ({ AccessControlForm: vi.fn(({ onChange, values }) => (