feat(app): limit the docker API version supported by the frontend (#11855)

app/react/docker/containers/CreateView/BaseForm/toViewModel.ts

@@ -3,13 +3,13 @@ import { ResourceControlOwnership } from '@/react/portainer/access-control/types
 import { UserId } from '@/portainer/users/types';
 import { getDefaultImageConfig } from '@/react/portainer/registries/utils/getImageConfig';
 
-import { ContainerResponse } from '../../queries/container';
+import { ContainerDetailsResponse } from '../../queries/useContainer';
 
 import { toViewModel as toPortsMappingViewModel } from './PortsMappingField.viewModel';
 import { Values } from './BaseForm';
 
 export function toViewModel(
-  config: ContainerResponse,
+  config: ContainerDetailsResponse,
   isPureAdmin: boolean,
   currentUserId: UserId,
   nodeName: string,

app/react/docker/containers/CreateView/CapabilitiesTab/toViewModel.ts

@@ -1,9 +1,9 @@
-import { ContainerJSON } from '@/react/docker/containers/queries/container';
+import { ContainerDetailsJSON } from '@/react/docker/containers/queries/useContainer';
 
 import { capabilities } from './types';
 import { Values } from './CapabilitiesTab';
 
-export function toViewModel(config: ContainerJSON): Values {
+export function toViewModel(config: ContainerDetailsJSON): Values {
   const { CapAdd, CapDrop } = getDefaults(config);
 
   const missingCaps = capabilities
@@ -15,7 +15,7 @@ export function toViewModel(config: ContainerJSON): Values {
 
   return [...CapAdd, ...missingCaps];
 
-  function getDefaults(config: ContainerJSON) {
+  function getDefaults(config: ContainerDetailsJSON) {
     return {
       CapAdd: config.HostConfig?.CapAdd || [],
       CapDrop: config.HostConfig?.CapDrop || [],

app/react/docker/containers/CreateView/CommandsTab/toViewModel.tsx

@@ -2,7 +2,7 @@ import { HostConfig } from 'docker-types/generated/1.41';
 
 import { commandArrayToString } from '@/docker/helpers/containers';
 
-import { ContainerJSON } from '../../queries/container';
+import { ContainerDetailsJSON } from '../../queries/useContainer';
 
 import { ConsoleConfig, ConsoleSetting } from './ConsoleSettings';
 import { LogConfig } from './LoggerConfig';
@@ -19,7 +19,7 @@ export function getDefaultViewModel(): Values {
   };
 }
 
-export function toViewModel(config: ContainerJSON): Values {
+export function toViewModel(config: ContainerDetailsJSON): Values {
   if (!config.Config) {
     return getDefaultViewModel();
   }

app/react/docker/containers/CreateView/CreateView.tsx

@@ -19,7 +19,7 @@ import { InformationPanel } from '@@/InformationPanel';
 import { TextTip } from '@@/Tip/TextTip';
 import { HelpLink } from '@@/HelpLink';
 
-import { useContainers } from '../queries/containers';
+import { useContainers } from '../queries/useContainers';
 import { useSystemLimits, useIsWindows } from '../../proxy/queries/useInfo';
 
 import { useCreateOrReplaceMutation } from './useCreateMutation';

app/react/docker/containers/CreateView/EnvVarsTab/toViewModel.ts

@@ -1,11 +1,11 @@
 import { parseArrayOfStrings } from '@@/form-components/EnvironmentVariablesFieldset/utils';
 
-import { ContainerJSON } from '../../queries/container';
+import { ContainerDetailsJSON } from '../../queries/useContainer';
 
 export function getDefaultViewModel() {
   return [];
 }
 
-export function toViewModel(container: ContainerJSON) {
+export function toViewModel(container: ContainerDetailsJSON) {
   return parseArrayOfStrings(container.Config?.Env);
 }

app/react/docker/containers/CreateView/LabelsTab/toViewModel.ts

@@ -1,8 +1,8 @@
-import { ContainerJSON } from '../../queries/container';
+import { ContainerDetailsJSON } from '../../queries/useContainer';
 
 import { Values } from './types';
 
-export function toViewModel(config: ContainerJSON): Values {
+export function toViewModel(config: ContainerDetailsJSON): Values {
   if (!config || !config.Config || !config.Config.Labels) {
     return [];
   }

app/react/docker/containers/CreateView/NetworkTab/ContainerSelector.tsx

@@ -2,7 +2,7 @@ import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
 
 import { Option, PortainerSelect } from '@@/form-components/PortainerSelect';
 
-import { useContainers } from '../../queries/containers';
+import { useContainers } from '../../queries/useContainers';
 import { ContainerStatus } from '../../types';
 
 export function ContainerSelector({

app/react/docker/containers/CreateView/NetworkTab/toViewModel.ts

@@ -1,7 +1,7 @@
 import { DockerNetwork } from '@/react/docker/networks/types';
 
-import { ContainerJSON } from '../../queries/container';
-import { DockerContainer } from '../../types';
+import { ContainerDetailsJSON } from '../../queries/useContainer';
+import { ContainerListViewModel } from '../../types';
 
 import { CONTAINER_MODE, Values } from './types';
 
@@ -22,9 +22,9 @@ export function getDefaultViewModel(isWindows: boolean) {
 }
 
 export function toViewModel(
-  config: ContainerJSON,
+  config: ContainerDetailsJSON,
   networks: Array<DockerNetwork>,
-  runningContainers: Array<DockerContainer> = []
+  runningContainers: Array<ContainerListViewModel> = []
 ): Values {
   const dns = config.HostConfig?.Dns;
   const [primaryDns = '', secondaryDns = ''] = dns || [];
@@ -62,9 +62,9 @@ export function toViewModel(
 }
 
 function getNetworkMode(
-  config: ContainerJSON,
+  config: ContainerDetailsJSON,
   networks: Array<DockerNetwork>,
-  runningContainers: Array<DockerContainer> = []
+  runningContainers: Array<ContainerListViewModel> = []
 ) {
   let networkMode = config.HostConfig?.NetworkMode || '';
   if (!networkMode) {

app/react/docker/containers/CreateView/ResourcesTab/EditResourceForm.tsx

@@ -4,7 +4,7 @@ import { useCurrentStateAndParams } from '@uirouter/react';
 import { useState } from 'react';
 import { FormikHelpers } from 'formik/dist/types';
 
-import { invalidateContainer } from '@/react/docker/containers/queries/container';
+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';

app/react/docker/containers/CreateView/ResourcesTab/toViewModel.ts

@@ -1,11 +1,11 @@
-import { ContainerJSON } from '../../queries/container';
+import { ContainerDetailsJSON } from '../../queries/useContainer';
 
 import { toDevicesViewModel } from './DevicesField';
 import { gpuFieldsetUtils } from './GpuFieldset';
 import { toViewModelCpu, toViewModelMemory } from './memory-utils';
 import { Values } from './ResourcesTab';
 
-export function toViewModel(config: ContainerJSON): Values {
+export function toViewModel(config: ContainerDetailsJSON): Values {
   return {
     runtime: {
       privileged: config.HostConfig?.Privileged || false,

app/react/docker/containers/CreateView/RestartPolicyTab/toViewModel.ts

@@ -1,8 +1,8 @@
-import { ContainerJSON } from '../../queries/container';
+import { ContainerDetailsJSON } from '../../queries/useContainer';
 
 import { RestartPolicy } from './types';
 
-export function toViewModel(config: ContainerJSON): RestartPolicy {
+export function toViewModel(config: ContainerDetailsJSON): RestartPolicy {
   switch (config.HostConfig?.RestartPolicy?.Name) {
     case 'always':
       return RestartPolicy.Always;

app/react/docker/containers/CreateView/VolumesTab/toViewModel.ts

@@ -1,8 +1,8 @@
-import { ContainerJSON } from '../../queries/container';
+import { ContainerDetailsJSON } from '../../queries/useContainer';
 
 import { VolumeType, Values } from './types';
 
-export function toViewModel(config: ContainerJSON): Values {
+export function toViewModel(config: ContainerDetailsJSON): Values {
   return Object.values(config.Mounts || {}).map((mount) => ({
     type: (mount.Type || 'volume') as VolumeType,
     name: mount.Name || mount.Source || '',

app/react/docker/containers/CreateView/useCreateMutation.tsx

@@ -31,13 +31,13 @@ import {
   renameContainer,
   startContainer,
   stopContainer,
-  urlBuilder,
 } from '../containers.service';
 import { PortainerResponse } from '../../types';
-import { connectContainer } from '../../networks/queries/useConnectContainer';
-import { DockerContainer } from '../types';
+import { connectContainer } from '../../networks/queries/useConnectContainerMutation';
+import { ContainerListViewModel } from '../types';
 import { queryKeys } from '../queries/query-keys';
-import { addNodeHeader } from '../../proxy/addNodeHeader';
+import { withAgentTargetHeader } from '../../proxy/queries/utils';
+import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl';
 
 import { CreateContainerRequest } from './types';
 import { Values } from './useInitialValues';
@@ -75,7 +75,7 @@ interface CreateOptions {
 }
 
 interface ReplaceOptions extends CreateOptions {
-  oldContainer: DockerContainer;
+  oldContainer: ContainerListViewModel;
   extraNetworks: Array<ExtraNetwork>;
 }
 
@@ -172,7 +172,7 @@ async function replace({
 async function renameAndCreate(
   environmentId: EnvironmentId,
   name: string,
-  oldContainer: DockerContainer,
+  oldContainer: ContainerListViewModel,
   config: CreateContainerRequest,
   nodeName?: string
 ) {
@@ -234,7 +234,7 @@ async function applyContainerSettings(
 async function createAndStart(
   environmentId: EnvironmentId,
   config: CreateContainerRequest,
-  name: string,
+  name?: string,
   nodeName?: string
 ) {
   let containerId = '';
@@ -290,12 +290,10 @@ async function createContainer(
   { nodeName }: { nodeName?: string } = {}
 ) {
   try {
-    const headers = addNodeHeader(nodeName);
-
     const { data } = await axios.post<
       PortainerResponse<{ Id: string; Warnings: Array<string> }>
-    >(urlBuilder(environmentId, undefined, 'create'), config, {
-      headers,
+    >(buildDockerProxyUrl(environmentId, 'containers', 'create'), config, {
+      headers: { ...withAgentTargetHeader(nodeName) },
       params: { name },
     });
 
@@ -349,7 +347,7 @@ function connectToExtraNetworks(
 
 function stopContainerIfNeeded(
   environmentId: EnvironmentId,
-  container: DockerContainer,
+  container: ContainerListViewModel,
   nodeName?: string
 ) {
   if (container.State !== 'running' || !container.Id) {

app/react/docker/containers/CreateView/useInitialValues.ts

@@ -43,8 +43,8 @@ import { useEnvironmentRegistries } from '@/react/portainer/environments/queries
 import { EnvVarValues } from '@@/form-components/EnvironmentVariablesFieldset';
 
 import { useNetworksForSelector } from '../components/NetworkSelector';
-import { useContainers } from '../queries/containers';
-import { useContainer } from '../queries/container';
+import { useContainers } from '../queries/useContainers';
+import { useContainer } from '../queries/useContainer';
 
 export interface Values extends BaseFormValues {
   commands: CommandsTabValues;