Skip to content

Commit f0f40a0

Browse files
authored
Merge branch 'main' into feat/delete-project
2 parents c7613d5 + 9688ee6 commit f0f40a0

File tree

4 files changed

+68
-72
lines changed

4 files changed

+68
-72
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Use the latest LTS version of Node.js
22
# https://hub.docker.com/_/node
3-
FROM node:22@sha256:2fa6c977460b56d4d8278947ab56faeb312bc4cc6c4cf78920c6de27812f51c5 AS build-stage
3+
FROM node:22@sha256:9e6918e8e32a47a58ed5fb9bd235bbc1d18a8c272e37f15d502b9db9e36821ee AS build-stage
44
WORKDIR /usr/src/app
55

66
# Copy package.json and package-lock.json
@@ -15,7 +15,7 @@ COPY . .
1515
RUN npm run build
1616

1717
# The same image but now only install the production dependencies as the frontend is already built using vite in the build-stage
18-
FROM gcr.io/distroless/nodejs22-debian12@sha256:fd90468f47e91d0d3c9bc055c8c09edbf0c225c3c795d0c266e2ca94b3ba17e3 AS production
18+
FROM gcr.io/distroless/nodejs22-debian12@sha256:b765815eafacee5222bfa50179028f41dd8c642b68ad68ec4e6922d3b1ff2710 AS production
1919

2020
WORKDIR /usr/src/app
2121

package-lock.json

Lines changed: 61 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/locales/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
"required": "This field is required!",
277277
"properFormatting": "Use A-Z, a-z, 0-9, hyphen (-), and period (.), but note that whitespace (spaces, tabs, etc.) is not allowed for proper compatibility.",
278278
"properFormattingLowercase": "Use lowercase a-z, 0-9, hyphen (-), and period (.), but note that whitespace (spaces, tabs, etc.) is not allowed for proper compatibility.",
279-
"max25chars": "Max length is 25 characters.",
279+
"maxChars": "Max length is {{maxLength}} characters.",
280280
"userExists": "User with this email already exists!",
281281
"atLeastOneUser": "You need to have at least one member assigned."
282282
},

src/lib/api/validations/schemas.ts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import { z } from 'zod';
22
import { Member } from '../types/shared/members.ts';
33
import i18n from '../../../../i18n.ts';
4-
import {
5-
managedControlPlaneNameRegex,
6-
projectWorkspaceNameRegex,
7-
} from './regex.ts';
4+
import { managedControlPlaneNameRegex, projectWorkspaceNameRegex } from './regex.ts';
85

96
const { t } = i18n;
107

@@ -15,7 +12,7 @@ export const validationSchemaProjectWorkspace = z.object({
1512
.string()
1613
.min(1, t('validationErrors.required'))
1714
.regex(projectWorkspaceNameRegex, t('validationErrors.properFormatting'))
18-
.max(25, t('validationErrors.max25chars')),
15+
.max(25, t('validationErrors.maxChars', { maxLength: 25 })),
1916
displayName: z.string().optional(),
2017
chargingTarget: z.string().optional(),
2118
chargingTargetType: z.string().optional(),
@@ -25,11 +22,8 @@ export const validationSchemaCreateManagedControlPlane = z.object({
2522
name: z
2623
.string()
2724
.min(1, t('validationErrors.required'))
28-
.regex(
29-
managedControlPlaneNameRegex,
30-
t('validationErrors.properFormattingLowercase'),
31-
)
32-
.max(25, t('validationErrors.max25chars')),
25+
.regex(managedControlPlaneNameRegex, t('validationErrors.properFormattingLowercase'))
26+
.max(36, t('validationErrors.maxChars', { maxLength: 36 })),
3327
displayName: z.string().optional(),
3428
chargingTarget: z.string().optional(),
3529
chargingTargetType: z.string().optional(),

0 commit comments

Comments
 (0)