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

feat(edge/stacks): info for old agent status [EE-5792] (#10013)

Browse source
This commit is contained in:
Chaim Lev-Ari 2023-08-14 16:04:24 +03:00 • committed by GitHub
parent 7757bf7a84
commit fd7e8a629e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 103 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/react/portainer/environments/update-schedules/common/UpdateScheduleDetailsFieldset.tsx
View file

@ -1,12 +1,12 @@
import _ from 'lodash';
import { Environment } from '@/react/portainer/environments/types';
import { semverCompare } from '@/react/common/semver-utils';
import { TextTip } from '@@/Tip/TextTip';
import { VersionSelect } from './VersionSelect';
import { ScheduledTimeField } from './ScheduledTimeField';
import { semverCompare } from './utils';
interface Props {
environments: Environment[];

78
app/react/portainer/environments/update-schedules/common/utils.test.ts
View file

@ -1,78 +0,0 @@
import { semverCompare } from './utils';
describe('semverCompare', () => {
test('sort array', () => {
const versions = [
'1.2.3',
'4.11.6',
'4.2.0',
'1.5.19',
'1.5.5',
'4.1.3',
'2.3.1',
'10.5.5',
'11.3.0',
];
expect(versions.sort(semverCompare)).toStrictEqual([
'1.2.3',
'1.5.5',
'1.5.19',
'2.3.1',
'4.1.3',
'4.2.0',
'4.11.6',
'10.5.5',
'11.3.0',
]);
});
test('compare versions', () => {
// 1.0.0 < 2.0.0 < 2.1.0 < 2.1.1
expect(semverCompare('1.0.0', '2.0.0')).toBe(-1);
expect(semverCompare('2.0.0', '2.1.0')).toBe(-1);
expect(semverCompare('2.1.0', '2.1.1')).toBe(-1);
// 1.0.0-alpha < 1.0.0
expect(semverCompare('1.0.0-alpha', '1.0.0')).toBe(-1);
// 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
expect(semverCompare('1.0.0-alpha', '1.0.0-alpha.1')).toBe(-1);
expect(semverCompare('1.0.0-alpha.1', '1.0.0-alpha.beta')).toBe(-1);
expect(semverCompare('1.0.0-alpha.beta', '1.0.0-beta')).toBe(-1);
expect(semverCompare('1.0.0-beta', '1.0.0-beta.2')).toBe(-1);
expect(semverCompare('1.0.0-beta.2', '1.0.0-beta.11')).toBe(-1);
expect(semverCompare('1.0.0-beta.11', '1.0.0-rc.1')).toBe(-1);
expect(semverCompare('1.0.0-rc.1', '1.0.0')).toBe(-1);
// Build metadata MUST be ignored when determining version precedence.
// expect(semverCompare("1.0.0", "=", "1.0.0+asdf") // ❌ exp: =, got: <).toBe(-1)
// expect(semverCompare("1.0.0+qwer", "=", "1.0.0+asdf") // ❌ exp: =, got: >).toBe(-1)
// Workaround via `v.replace(/\+.*/, "")`
// expect(semverCompare("1.0.0", "=", "1.0.0+asdf".replace(/\+.*/, ""))).toBe(-1)
// expect(semverCompare("1.0.0+qwer".replace(/\+.*/, ""), "=", "1.0.0+asdf".replace(/\+.*/, ""))).toBe(-1)
expect(semverCompare('0.0.0', '0.0.0-foo')).toBe(1);
expect(semverCompare('0.0.1', '0.0.0')).toBe(1);
expect(semverCompare('1.0.0', '0.9.9')).toBe(1);
expect(semverCompare('0.10.0', '0.9.0')).toBe(1);
expect(semverCompare('0.99.0', '0.10.0')).toBe(1);
expect(semverCompare('2.0.0', '1.2.3')).toBe(1);
expect(semverCompare('1.2.3', '1.2.3-asdf')).toBe(1);
expect(semverCompare('1.2.3', '1.2.3-4')).toBe(1);
expect(semverCompare('1.2.3', '1.2.3-4-foo')).toBe(1);
// expect(semverCompare("1.2.3-5-foo", ">", "1.2.3-5").toBe(1) // ❌ exp: >, got: <)
expect(semverCompare('1.2.3-5', '1.2.3-4')).toBe(1);
expect(semverCompare('1.2.3-5-foo', '1.2.3-5-Foo')).toBe(1);
expect(semverCompare('3.0.0', '2.7.2+asdf')).toBe(1);
expect(semverCompare('1.2.3-a.10', '1.2.3-a.5')).toBe(1);
expect(semverCompare('1.2.3-a.b', '1.2.3-a.5')).toBe(1);
expect(semverCompare('1.2.3-a.b', '1.2.3-a')).toBe(1);
expect(semverCompare('1.2.3-a.b.c.10.d.5', '1.2.3-a.b.c.5.d.100')).toBe(1);
// expect(semverCompare("1.2.3-r2", "1.2.3-r100").toBe(1) // ❌ exp: >, got: <)
expect(semverCompare('1.2.3-r100', '1.2.3-R2')).toBe(1);
expect(semverCompare('1.0.0', '1.0.0')).toBe(0);
expect(semverCompare('1.2.3', '1.2.3')).toBe(0);
});
});

16
app/react/portainer/environments/update-schedules/common/utils.ts
View file

@ -1,18 +1,4 @@
export function semverCompare(a: string, b: string) {
if (a.startsWith(`${b}-`)) {
return -1;
}
if (b.startsWith(`${a}-`)) {
return 1;
}
return a.localeCompare(b, undefined, {
numeric: true,
sensitivity: 'case',
caseFirst: 'upper',
});
}
import { semverCompare } from '@/react/common/semver-utils';
export function compareVersion(
currentVersion: string,

3
app/react/portainer/environments/update-schedules/queries/useSupportedAgentVersions.ts
View file

@ -2,8 +2,7 @@ import { useQuery } from 'react-query';
import axios, { parseAxiosError } from '@/portainer/services/axios';
import { withError } from '@/react-tools/react-query';
import { semverCompare } from '../common/utils';
import { semverCompare } from '@/react/common/semver-utils';
import { queryKeys } from './query-keys';
import { buildUrl } from './urls';