mirror of
https://github.com/siderolabs/omni.git
synced 2026-05-05 14:46:12 +02:00
fix(frontend): select default join token in installation media wizard
Select the default join token in the installation media wizard. Also bump tsconfig to ES2023 (which is baseline widely available) to get access to .toSorted(). Signed-off-by: Edward Sammut Alessi <edward.sammutalessi@siderolabs.com>
This commit is contained in:
parent
0987fa9e8f
commit
cc0adefcad
@ -33,8 +33,7 @@ export const sortMachineSetIds = (clusterId: string | undefined, ids: string[]):
|
||||
return ids
|
||||
}
|
||||
|
||||
const idsCopy = ids.concat()
|
||||
return idsCopy.sort((a, b) => {
|
||||
return ids.toSorted((a, b) => {
|
||||
const nameA = machineSetName(clusterId, a)
|
||||
const nameB = machineSetName(clusterId, b)
|
||||
|
||||
|
||||
@ -56,10 +56,17 @@ const talosVersions = computed(() =>
|
||||
)
|
||||
|
||||
const joinTokens = computed(() =>
|
||||
joinTokenList.value.map((t) => ({
|
||||
label: t.spec.name || t.metadata.id || '',
|
||||
value: t.metadata.id || '',
|
||||
})),
|
||||
joinTokenList.value
|
||||
.toSorted((a, b) => {
|
||||
if (a.spec.is_default) return -1
|
||||
if (b.spec.is_default) return 1
|
||||
|
||||
return 0
|
||||
})
|
||||
.map((t) => ({
|
||||
label: t.spec.name || t.metadata.id || '',
|
||||
value: t.metadata.id || '',
|
||||
})),
|
||||
)
|
||||
|
||||
// Form defaults
|
||||
|
||||
@ -143,9 +143,9 @@ const groupedK8sVersions = computed(() => {
|
||||
})
|
||||
|
||||
const allTalosVersions = computed(() =>
|
||||
allTalosVersionsUnsorted.value
|
||||
.slice()
|
||||
.sort((a, b) => semver.compare(a.spec.version!, b.spec.version!)),
|
||||
allTalosVersionsUnsorted.value.toSorted((a, b) =>
|
||||
semver.compare(a.spec.version!, b.spec.version!),
|
||||
),
|
||||
)
|
||||
|
||||
function isVersionUpgradeable(version: string) {
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
"include": ["env.d.ts", "src/**/*", "src/**/*.vue", "typed-router.d.ts"],
|
||||
"exclude": ["src/**/*.spec.*", "src/**/*.stories.*"],
|
||||
"compilerOptions": {
|
||||
"lib": ["ES2023", "DOM", "DOM.Iterable"],
|
||||
|
||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
|
||||
"moduleResolution": "Bundler",
|
||||
"rootDir": ".",
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
"compilerOptions": {
|
||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.vitest.tsbuildinfo",
|
||||
|
||||
"lib": ["ES2022"],
|
||||
"lib": ["ES2023"],
|
||||
"types": ["node", "jsdom", "@testing-library/jest-dom"],
|
||||
|
||||
"paths": {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user