homelab/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2026-06-23 04:10:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "feat(frontend): import CE code to EE" (#1557)

Browse Source
This commit is contained in:
Chaim Lev-Ari
2025-12-18 13:45:26 +02:00
committed by GitHub
parent 2f5b083c5c
commit bf8ccbcec6
1849 changed files with 6494 additions and 6602 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.eslintrc.yml
+7 -7
View File
@@ -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:
app/agent/components/host-browser/hostBrowserController.js
+1 -1
View File
@@ -1,5 +1,5 @@
import _ from 'lodash-es';
import { confirmDelete } from '@@CE/modals/confirm';
import { confirmDelete } from '@@/modals/confirm';
const ROOT_PATH = '/host';
app/agent/components/volume-browser/volumeBrowserController.js
+1 -1
View File
@@ -1,5 +1,5 @@
import _ from 'lodash-es';
import { confirmDelete } from '@@CE/modals/confirm';
import { confirmDelete } from '@@/modals/confirm';
export class VolumeBrowserController {
/* @ngInject */
app/azure/index.ts
+3 -3
View File
@@ -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';
app/azure/react/views/index.ts
+8 -8
View File
@@ -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', [])
app/docker/__module.js
+2 -2
View File
@@ -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',
},
},
app/docker/components/imageRegistry/por-image-registry-rate-limits.controller.js
+1 -1
View File
@@ -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 */
app/docker/components/imageRegistry/por-image-registry.controller.js
+1 -1
View File
@@ -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 */
app/docker/components/log-viewer/logViewerController.js
+1 -1
View File
@@ -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',
app/docker/components/network-macvlan-form/networkMacvlanFormController.js
+1 -1
View File
@@ -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',
app/docker/helpers/imageHelper.js
+1 -1
View File
@@ -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() {
app/docker/helpers/logHelper/constants.ts
+1 -1
View File
@@ -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';
app/docker/models/config.ts
+3 -3
View File
@@ -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;
app/docker/models/containerDetails.ts
+4 -4
View File
@@ -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<PortainerResponse<unknown>, 'IsPortainer'>
app/docker/models/containerStats.ts
+2 -2
View File
@@ -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.
app/docker/models/image.ts
+1 -1
View File
@@ -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;
app/docker/models/imageLayer.ts
+1 -1
View File
@@ -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'];
app/docker/models/network.ts
+3 -3
View File
@@ -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
//
app/docker/models/secret.ts
+3 -3
View File
@@ -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;
app/docker/models/service.ts
+2 -2
View File
@@ -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';
app/docker/models/task.ts
+1 -1
View File
@@ -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<Task['ID']>;
app/docker/models/volume.ts
+3 -3
View File
@@ -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;
app/docker/react/components/containers.ts
+4 -4
View File
@@ -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', [])
app/docker/react/components/index.ts
+17 -17
View File
@@ -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';
app/docker/react/components/networks.ts
+3 -3
View File
@@ -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', [])
app/docker/react/components/services.ts
+7 -7
View File
@@ -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', [])
app/docker/react/components/swarm.ts
+3 -3
View File
@@ -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', [])
app/docker/react/components/volumes.ts
+4 -4
View File
@@ -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', [])
app/docker/react/views/configs.ts
+5 -5
View File
@@ -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', [])
app/docker/react/views/containers.ts
+13 -13
View File
@@ -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',
},
},
app/docker/react/views/images.ts
+4 -4
View File
@@ -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', [])
app/docker/react/views/index.ts
+6 -6
View File
@@ -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';
app/docker/react/views/stacks.ts
+5 -5
View File
@@ -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', [])
app/docker/services/buildService.js
+1 -1
View File
@@ -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';
app/docker/services/configService.js
+5 -5
View File
@@ -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);
app/docker/services/containerService.js
+8 -8
View File
@@ -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';
app/docker/services/execService.js
+1 -1
View File
@@ -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);
app/docker/services/imageService.js
+12 -12
View File
@@ -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';
app/docker/services/networkService.js
+5 -5
View File
@@ -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';
app/docker/services/nodeService.js
+3 -3
View File
@@ -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';
app/docker/services/pluginService.js
+3 -3
View File
@@ -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);
app/docker/services/secretService.js
+4 -4
View File
@@ -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';
app/docker/services/serviceService.js
+6 -6
View File
@@ -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';
app/docker/services/swarmService.js
+1 -1
View File
@@ -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);
app/docker/services/systemService.js
+3 -3
View File
@@ -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);
app/docker/services/taskService.js
+3 -3
View File
@@ -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';
app/docker/services/volumeService.js
+4 -4
View File
@@ -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';
app/docker/views/configs/create/createConfigController.js
+1 -1
View File
@@ -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 */
app/docker/views/configs/edit/configController.js
+1 -1
View File
@@ -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',
app/docker/views/containers/console/containerConsoleController.js
+2 -2
View File
@@ -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',
app/docker/views/containers/edit/containerController.js
+6 -6
View File
@@ -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',
app/docker/views/docker-features-configuration/docker-features-configuration.controller.js
+1 -1
View File
@@ -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 */
app/docker/views/images/build/buildImageController.js
+2 -2
View File
@@ -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);
app/docker/views/images/edit/imageController.js
+2 -2
View File
@@ -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',
app/docker/views/networks/networksController.js
+2 -2
View File
@@ -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',
app/docker/views/secrets/edit/secretController.js
+1 -1
View File
@@ -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);
app/docker/views/secrets/secretsController.js
+1 -1
View File
@@ -1,4 +1,4 @@
import { processItemsInBatches } from '@CE/react/common/processItemsInBatches';
import { processItemsInBatches } from '@/react/common/processItemsInBatches';
angular.module('portainer.docker').controller('SecretsController', [
'$scope',
app/docker/views/services/create/createServiceController.js
+1 -1
View File
@@ -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';
app/docker/views/services/edit/serviceController.js
+8 -8
View File
@@ -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',
app/docker/views/volumes/edit/volumeController.js
+2 -2
View File
@@ -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',
app/docker/views/volumes/volumesController.js
+1 -1
View File
@@ -1,4 +1,4 @@
import { processItemsInBatches } from '@CE/react/common/processItemsInBatches';
import { processItemsInBatches } from '@/react/common/processItemsInBatches';
angular.module('portainer.docker').controller('VolumesController', [
'$q',
app/edge/__module.js
+1 -1
View File
@@ -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
app/edge/react/components/index.ts
+9 -9
View File
@@ -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', [])
app/edge/react/views/edge-stacks.ts
+6 -6
View File
@@ -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', [])
app/edge/react/views/groups.ts
+6 -6
View File
@@ -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', [])
app/edge/react/views/index.ts
+5 -5
View File
@@ -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';
app/edge/react/views/jobs.ts
+6 -6
View File
@@ -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', [])
app/index.js
+2 -2
View File
@@ -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';
app/kubernetes/__module.js
+2 -2
View File
@@ -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';
app/kubernetes/converters/application.js
+1 -1
View File
@@ -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) => {
app/kubernetes/converters/configMap.js
+1 -1
View File
@@ -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();
app/kubernetes/converters/daemonSet.js
+1 -1
View File
@@ -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 {
/**
app/kubernetes/converters/deployment.js
+1 -1
View File
@@ -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 {
/**
app/kubernetes/converters/resourceQuota.js
+1 -1
View File
@@ -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) {
app/kubernetes/converters/secret.js
+1 -1
View File
@@ -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 {
app/kubernetes/converters/statefulSet.js
+1 -1
View File
@@ -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 {
app/kubernetes/filters/applicationFilters.js
+1 -1
View File
@@ -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
app/kubernetes/helpers/application/index.js
+2 -2
View File
@@ -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 */
app/kubernetes/helpers/namespaceHelper.js
+1 -1
View File
@@ -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 {
/**
app/kubernetes/helpers/resourceReservationHelper.js
+1 -1
View File
@@ -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) {
app/kubernetes/models/application/formValues.js
+1 -1
View File
@@ -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';
/**
app/kubernetes/models/application/models/Application.ts
+2 -2
View File
@@ -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';
app/kubernetes/models/application/models/appConstants.ts
+2 -2
View File
@@ -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<AppType, AppType> = {
app/kubernetes/node/converter.js
+1 -1
View File
@@ -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) {
app/kubernetes/react/components/clusterManagement.ts
+6 -6
View File
@@ -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', [])
app/kubernetes/react/components/index.ts
+37 -37
View File
@@ -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';
app/kubernetes/react/components/namespaces.ts
+4 -4
View File
@@ -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', [])
app/kubernetes/react/components/registries.tsx
+2 -2
View File
@@ -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', [])
app/kubernetes/react/views/index.ts
+27 -27
View File
@@ -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', [])
app/kubernetes/rest/serviceAccount.js
+1 -1
View File
@@ -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 {
app/kubernetes/services/applicationService.js
+2 -2
View File
@@ -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 {
app/kubernetes/services/resourcePoolService.js
+1 -1
View File
@@ -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(
app/kubernetes/views/applications/create/createApplicationController.js
+10 -10
View File
@@ -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 */
app/kubernetes/views/applications/logs/logsController.js
+1 -1
View File
@@ -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 */
app/kubernetes/views/applications/stats/statsController.js
+2 -2
View File
@@ -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 */
app/kubernetes/views/cluster/node/stats/statsController.js
+3 -3
View File
@@ -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 */
app/kubernetes/views/configurations/configmap/create/createConfigMapController.js
+2 -2
View File
@@ -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 {
app/kubernetes/views/configurations/configmap/edit/configMapController.js
+2 -2
View File
@@ -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 {
app/kubernetes/views/configurations/configurationsController.js
+1 -1
View File
@@ -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 {
app/kubernetes/views/configurations/secret/create/createSecretController.js
+2 -2
View File
@@ -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 {

Some files were not shown because too many files have changed in this diff Show More