Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-09 15:55:23 +02:00
Code Issues Releases Activity

feat(system): path to upgrade swarm to BE [EE-4624] (#8124)

Browse source
This commit is contained in:
Chaim Lev-Ari 2022-12-13 22:52:06 +02:00 • committed by GitHub
parent b59a0ba823
commit db9d87c918
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 54 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/portainer/services/axios.ts
View file

@ -74,3 +74,9 @@ function defaultErrorParser(axiosError: AxiosError) {
const error = new Error(message);
return { error, details };
}
export function isAxiosError<
ResponseType = { message: string; details: string }
>(error: unknown): error is AxiosError<ResponseType> {
return axiosOrigin.isAxiosError(error);
}

1
app/react/portainer/system/useSystemStatus.ts
View file

@ -41,6 +41,7 @@ export function useSystemStatus<T = StatusResponse>({
select,
enabled,
retry,
retryDelay: 1000,
onSuccess,
});
}

16
app/react/portainer/system/useUpgradeEditionMutation.ts
View file

@ -1,6 +1,9 @@
import { useMutation } from 'react-query';
import axios, { parseAxiosError } from '@/portainer/services/axios';
import axios, {
isAxiosError,
parseAxiosError,
} from '@/portainer/services/axios';
import { withError } from '@/react-tools/react-query';
import { buildUrl } from './build-url';
@ -15,6 +18,15 @@ async function upgradeEdition({ license }: { license: string }) {
try {
await axios.post(buildUrl('upgrade'), { license });
} catch (error) {
throw parseAxiosError(error as Error);
if (!isAxiosError(error)) {
throw error;
}
// if error is because the server disconnected, then everything went well
if (!error.response || !error.response.status) {
return;
}
throw parseAxiosError(error);
}
}

5
app/react/sidebar/UpgradeBEBanner/UpgradeBEBanner.tsx
View file

@ -19,7 +19,10 @@ export const UpgradeBEBannerWrapper = withHideOnExtension(
withEdition(UpgradeBEBanner, 'CE')
);
const enabledPlatforms: Array<ContainerPlatform> = ['Docker Standalone'];
const enabledPlatforms: Array<ContainerPlatform> = [
'Docker Standalone',
'Docker Swarm',
];
function UpgradeBEBanner() {
const { isAdmin } = useUser();