Skip to content

Commit

Permalink
Merge branch 'master' into enh/upgrade_cm_6
Browse files Browse the repository at this point in the history
  • Loading branch information
grolu committed Sep 10, 2024
2 parents f067c4e + 544c0b2 commit 3d3f503
Show file tree
Hide file tree
Showing 79 changed files with 2,053 additions and 1,885 deletions.
2 changes: 1 addition & 1 deletion .ci/pipeline_definitions
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dashboard:
pull-request: ~
steps:
check:
image: 'node:20-alpine3.20'
image: 'node:22-alpine3.20'
release:
traits:
version:
Expand Down
1,293 changes: 632 additions & 661 deletions .pnp.cjs

Large diffs are not rendered by default.

54 changes: 32 additions & 22 deletions .pnp.loader.mjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
894 changes: 0 additions & 894 deletions .yarn/releases/yarn-4.3.1.cjs

This file was deleted.

925 changes: 925 additions & 0 deletions .yarn/releases/yarn-4.4.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ supportedArchitectures:
- linux
- darwin

yarnPath: .yarn/releases/yarn-4.3.1.cjs
yarnPath: .yarn/releases/yarn-4.4.1.cjs
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0

############# builder #############
FROM node:20-alpine3.20 AS builder
FROM node:22-alpine3.20 AS builder

WORKDIR /volume

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.77.0-dev
1.78.0-dev
12 changes: 6 additions & 6 deletions backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gardener-dashboard/backend",
"version": "1.76.0",
"version": "1.77.0",
"description": "Gardener Dashboard Server",
"license": "Apache-2.0",
"author": "Koser, Holger <holger.koser@sap.com>",
Expand Down Expand Up @@ -81,11 +81,11 @@
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^26.9.0",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-promise": "^6.4.0",
"eslint-plugin-promise": "^6.6.0",
"fast-json-patch": "^3.1.1",
"jest": "^29.7.0",
"p-event": "^4.2.0",
"path-to-regexp": "^7.0.0",
"path-to-regexp": "^8.0.0",
"set-cookie-parser": "^2.6.0",
"socket.io-client": "^4.7.5",
"supertest": "^7.0.0"
Expand Down Expand Up @@ -144,7 +144,7 @@
"coverageThreshold": {
"global": {
"branches": 68,
"functions": 95,
"functions": 94,
"lines": 90,
"statements": 90
}
Expand All @@ -153,8 +153,8 @@
"<rootDir>/jest.setup.js"
]
},
"packageManager": "yarn@4.3.1",
"packageManager": "yarn@4.4.1",
"engines": {
"node": "^20.9.0"
"node": "^22.7.0"
}
}
9 changes: 3 additions & 6 deletions backend/test/docker.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,11 @@ const { DockerfileParser } = require('dockerfile-ast')

/* Nodejs release schedule (see https://nodejs.org/en/about/releases/) */
const activeNodeReleases = {
18: {
endOfLife: new Date('2025-04-30T23:59:59Z')
},
19: {
endOfLife: new Date('2023-06-01T23:59:59Z')
},
20: {
endOfLife: new Date('2026-04-30T23:59:59Z')
},
22: {
endOfLife: new Date('2027-04-30T23:59:59Z')
}
}

Expand Down
6 changes: 3 additions & 3 deletions charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^26.9.0",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-promise": "^6.4.0",
"eslint-plugin-promise": "^6.6.0",
"jest": "^29.7.0",
"js-yaml": "^4.1.0",
"lodash": "^4.17.21"
Expand Down Expand Up @@ -62,8 +62,8 @@
"<rootDir>/jest.setup.js"
]
},
"packageManager": "yarn@4.3.1",
"packageManager": "yarn@4.4.1",
"engines": {
"node": "^20.9.0"
"node": "^22.7.0"
}
}
10 changes: 5 additions & 5 deletions frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gardener-dashboard/frontend",
"version": "1.76.0",
"version": "1.77.0",
"description": "Gardener Dashboard Client",
"license": "Apache-2.0",
"author": "Koser, Holger <holger.koser@sap.com>",
Expand Down Expand Up @@ -94,10 +94,10 @@
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-import-newlines": "^1.4.0",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-promise": "^6.4.0",
"eslint-plugin-promise": "^6.6.0",
"eslint-plugin-vitest": "^0.4.0",
"eslint-plugin-vue": "^9.23.0",
"jsdom": "^24.0.0",
"jsdom": "^25.0.0",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "~1.74.1",
"unplugin-fonts": "^1.1.1",
Expand All @@ -107,8 +107,8 @@
"vitest": "^2.0.0",
"vitest-fetch-mock": "^0.3.0"
},
"packageManager": "yarn@4.3.1",
"packageManager": "yarn@4.4.1",
"engines": {
"node": "^20.9.0"
"node": "^22.7.0"
}
}
2 changes: 1 addition & 1 deletion frontend/src/components/GPurpose.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
<template>
<v-select
v-model="v$.internalValue.$model"
hint="Indicate the importance of the cluster"
hint="Indicate the importance of the cluster. Available purposes may be limited by the selected secret. If any add-on is enabled, only purpose evaluation can be selected."
color="primary"
item-color="primary"
label="Purpose"
Expand Down
14 changes: 10 additions & 4 deletions frontend/src/components/GShootStatus.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ SPDX-License-Identifier: Apache-2.0
v-bind="mergeProps(activatorProps, tooltipProps)"
density="comfortable"
variant="text"
:icon="true"
icon
>
<v-progress-circular
v-if="showProgress"
Expand All @@ -41,7 +41,7 @@ SPDX-License-Identifier: Apache-2.0
:color="color"
>
<v-icon
v-if="!!statusIcon"
v-if="hasStatusIcon"
size="small"
:color="color"
:icon="statusIcon"
Expand All @@ -55,7 +55,7 @@ SPDX-License-Identifier: Apache-2.0
</v-progress-circular>
<template v-else>
<v-icon
v-if="!!statusIcon"
v-if="hasStatusIcon"
size="small"
:color="color"
:icon="statusIcon"
Expand Down Expand Up @@ -236,6 +236,9 @@ export default {
isPending () {
return this.operationState === 'Pending'
},
isSucceeded () {
return this.operationState === 'Succeeded'
},
isTypeCreate () {
return this.operationType === 'Create'
},
Expand Down Expand Up @@ -270,7 +273,7 @@ export default {
if (this.isShootMarkedForDeletion) {
return 'mdi-delete-clock'
}
if (this.isTypeCreate) {
if (this.isTypeCreate && !this.isSucceeded) {
return 'mdi-plus'
}
if (this.isError) {
Expand All @@ -281,6 +284,9 @@ export default {
}
return undefined
},
hasStatusIcon () {
return !!this.statusIcon
},
statusTitle () {
const statusTitle = []
if (this.isShootStatusHibernationProgressing) {
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/ShootAddons/GAddonConfiguration.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ SPDX-License-Identifier: Apache-2.0
>
<template #content>
<v-card-text>
<g-manage-shoot-addons />
<g-manage-addons />
</v-card-text>
</template>
</g-action-button-dialog>
</template>

<script>
import GActionButtonDialog from '@/components/dialogs/GActionButtonDialog'
import GManageShootAddons from '@/components/ShootAddons/GManageAddons'
import GManageAddons from '@/components/ShootAddons/GManageAddons'
import { useShootContext } from '@/composables/useShootContext'
import { useShootItem } from '@/composables/useShootItem'
Expand All @@ -33,7 +33,7 @@ import { errorDetailsFromError } from '@/utils/error'
export default {
components: {
GActionButtonDialog,
GManageShootAddons,
GManageAddons,
},
inject: ['api', 'logger'],
setup () {
Expand Down
Loading

0 comments on commit 3d3f503

Please sign in to comment.