Skip to content

Commit e27c966

Browse files
Merge branch 'main' into clipboard
2 parents 2c2a1dd + d27c1e6 commit e27c966

File tree

15 files changed

+987
-1407
lines changed

15 files changed

+987
-1407
lines changed

renovate.json renamed to .github/renovate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"docker:pinDigests",
66
"helpers:pinGitHubActionDigests",
77
"group:allNonMajor",
8-
"npm:unpublishSafe"
8+
"npm:unpublishSafe",
9+
":disableDependencyDashboard"
910
]
1011
}

package-lock.json

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

package.json

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -22,80 +22,80 @@
2222
"generate-graphql-types:watch": "graphql-codegen --config graphql.config.yaml --watch"
2323
},
2424
"dependencies": {
25-
"@apollo/client": "^3.13.6",
26-
"@fastify/autoload": "^6.3.0",
27-
"@fastify/cookie": "^11.0.2",
28-
"@fastify/env": "^5.0.2",
29-
"@fastify/helmet": "^13.0.1",
30-
"@fastify/http-proxy": "^11.1.2",
31-
"@fastify/secure-session": "^8.2.0",
32-
"@fastify/sensible": "^6.0.3",
33-
"@fastify/session": "^11.1.0",
34-
"@fastify/static": "^8.1.1",
35-
"@fastify/vite": "^8.1.3",
36-
"@hookform/resolvers": "^5.0.0",
37-
"@sentry/node": "^10.0.0",
38-
"@sentry/react": "^10.0.0",
39-
"@sentry/vite-plugin": "^4.0.0",
40-
"@ui5/webcomponents": "^2.7.2",
41-
"@ui5/webcomponents-fiori": "^2.7.2",
42-
"@ui5/webcomponents-icons": "^2.7.2",
43-
"@ui5/webcomponents-react": "^2.7.2",
44-
"@ui5/webcomponents-react-charts": "^2.13.1",
45-
"@xyflow/react": "^12.8.2",
46-
"clsx": "^2.1.1",
47-
"dagre": "^0.8.5",
48-
"dotenv": "^17.0.0",
49-
"fastify": "^5.3.3",
50-
"fastify-plugin": "^5.0.1",
51-
"graphql": "^16.10.0",
52-
"graphql-config": "^5.1.3",
53-
"i18next": "^25.0.0",
54-
"javascript-time-ago": "^2.5.11",
55-
"js-yaml": "^4.1.0",
25+
"@apollo/client": "3.14.0",
26+
"@fastify/autoload": "6.3.1",
27+
"@fastify/cookie": "11.0.2",
28+
"@fastify/env": "5.0.2",
29+
"@fastify/helmet": "13.0.1",
30+
"@fastify/http-proxy": "11.3.0",
31+
"@fastify/secure-session": "8.2.0",
32+
"@fastify/sensible": "6.0.3",
33+
"@fastify/session": "11.1.0",
34+
"@fastify/static": "8.2.0",
35+
"@fastify/vite": "8.2.0",
36+
"@hookform/resolvers": "5.2.1",
37+
"@sentry/node": "10.10.0",
38+
"@sentry/react": "10.10.0",
39+
"@sentry/vite-plugin": "4.3.0",
40+
"@ui5/webcomponents": "2.14.0",
41+
"@ui5/webcomponents-fiori": "2.14.0",
42+
"@ui5/webcomponents-icons": "2.14.0",
43+
"@ui5/webcomponents-react": "2.14.0",
44+
"@ui5/webcomponents-react-charts": "2.14.0",
45+
"@xyflow/react": "12.8.4",
46+
"clsx": "2.1.1",
47+
"dagre": "0.8.5",
48+
"dotenv": "17.2.2",
49+
"fastify": "5.6.0",
50+
"fastify-plugin": "5.0.1",
51+
"graphql": "16.11.0",
52+
"graphql-config": "5.1.5",
53+
"i18next": "25.5.2",
54+
"javascript-time-ago": "2.5.11",
55+
"js-yaml": "4.1.0",
5656
"react": "19.1.1",
5757
"react-dom": "19.1.1",
58-
"react-error-boundary": "^6.0.0",
59-
"react-hook-form": "^7.54.2",
60-
"react-i18next": "^15.4.1",
61-
"react-router-dom": "^7.2.0",
62-
"react-syntax-highlighter": "^15.6.1",
63-
"react-time-ago": "^7.3.3",
64-
"swr": "^2.3.0",
65-
"yaml": "^2.7.1",
66-
"zod": "^4.0.0"
58+
"react-error-boundary": "6.0.0",
59+
"react-hook-form": "7.62.0",
60+
"react-i18next": "15.7.3",
61+
"react-router-dom": "7.8.2",
62+
"react-syntax-highlighter": "15.6.6",
63+
"react-time-ago": "7.3.3",
64+
"swr": "2.3.6",
65+
"yaml": "2.8.1",
66+
"zod": "4.1.5"
6767
},
6868
"devDependencies": {
69-
"@eslint/eslintrc": "^3.3.0",
70-
"@eslint/js": "^9.22.0",
71-
"@graphql-codegen/cli": "^5.0.5",
72-
"@graphql-codegen/client-preset": "^4.8.0",
73-
"@types/dagre": "^0.7.53",
74-
"@types/js-yaml": "^4.0.9",
75-
"@types/node": "^22.13.5",
76-
"@types/react": "^19.0.10",
69+
"@eslint/eslintrc": "3.3.1",
70+
"@eslint/js": "9.35.0",
71+
"@graphql-codegen/cli": "5.0.7",
72+
"@graphql-codegen/client-preset": "4.8.3",
73+
"@types/dagre": "0.7.53",
74+
"@types/js-yaml": "4.0.9",
75+
"@types/node": "22.18.1",
76+
"@types/react": "19.1.12",
7777
"@types/react-dom": "19.1.9",
78-
"@types/react-syntax-highlighter": "^15.5.13",
79-
"@ui5/webcomponents-cypress-commands": "^2.7.2",
80-
"@vitejs/plugin-react": "^5.0.0",
81-
"@vitest/eslint-plugin": "^1.1.37",
82-
"cypress": "^15.0.0",
83-
"eslint-config-prettier": "^10.1.1",
84-
"eslint-import-resolver-typescript": "^4.1.1",
85-
"eslint-plugin-i18next": "^6.1.3",
86-
"eslint-plugin-import": "^2.31.0",
78+
"@types/react-syntax-highlighter": "15.5.13",
79+
"@ui5/webcomponents-cypress-commands": "2.14.0",
80+
"@vitejs/plugin-react": "5.0.2",
81+
"@vitest/eslint-plugin": "1.3.9",
82+
"cypress": "15.1.0",
83+
"eslint-config-prettier": "10.1.8",
84+
"eslint-import-resolver-typescript": "4.4.4",
85+
"eslint-plugin-i18next": "6.1.3",
86+
"eslint-plugin-import": "2.32.0",
8787
"eslint-plugin-jest-dom": "5.5.0",
88-
"eslint-plugin-jsx-a11y": "^6.10.2",
89-
"eslint-plugin-prettier": "^5.2.3",
90-
"eslint-plugin-react": "^7.37.4",
91-
"eslint-plugin-react-hooks": "^5.2.0",
92-
"fastify-tsconfig": "^3.0.0",
93-
"globals": "^16.0.0",
94-
"prettier": "^3.5.3",
95-
"tsx": "^4.20.5",
96-
"typescript": "^5.7.3",
97-
"typescript-eslint": "^8.26.1",
98-
"vite": "^6.3.4",
99-
"vitest": "^3.1.4"
88+
"eslint-plugin-jsx-a11y": "6.10.2",
89+
"eslint-plugin-prettier": "5.5.4",
90+
"eslint-plugin-react": "7.37.5",
91+
"eslint-plugin-react-hooks": "5.2.0",
92+
"fastify-tsconfig": "3.0.0",
93+
"globals": "16.3.0",
94+
"prettier": "3.6.2",
95+
"tsx": "4.20.5",
96+
"typescript": "5.9.2",
97+
"typescript-eslint": "8.42.0",
98+
"vite": "7.1.5",
99+
"vitest": "3.2.4"
100100
}
101101
}

public/locales/en.json

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
},
88
"Entities": {
99
"ManagedControlPlane": "Managed Control Plane",
10-
"Project": "Project"
10+
"Project": "Project",
11+
"Workspace": "Workspace",
12+
"Users": "Users",
13+
"ServiceAccounts": "ServiceAccounts"
1114
},
1215
"ComponentList": {
1316
"tableComponentHeader": "Name",
@@ -140,7 +143,7 @@
140143
"subtitle": "Fetching data..."
141144
},
142145
"MemberTable": {
143-
"columnEmailHeader": "Email",
146+
"columnNameHeader": "Name",
144147
"columnRoleHeader": "Role",
145148
"columnTypeHeader": "Type",
146149
"columnNamespaceHeader": "Namespace"
@@ -163,12 +166,18 @@
163166
"membersHeader": "Members"
164167
},
165168
"EditMembers": {
166-
"addButton": "Add new member or service account",
167-
"editHeader": "Edit member or service account",
168-
"addHeader": "Add new member or service account",
169+
"addButton": "Add User or ServiceAccount",
170+
"editHeader": "Edit User or ServiceAccount",
171+
"addHeader": "Add User or ServiceAccount",
169172
"saveButton": "Save changes",
170173
"defaultNamespaceInfo": "Leave empty to use <span>default</span> namespace",
171-
"serviceAccoutsGuide": "You can also use our <link1>Service Account Guide</link1> for more information."
174+
"serviceAccoutsGuide": "You can also use our <link1>Service Account Guide</link1> for more information.",
175+
"reuseMembersButton": "Reuse",
176+
"membersToastNoChanges": "No changes.",
177+
"membersToastAdded1": "1 member added.",
178+
"membersToastAddedN": "{{count}} members added.",
179+
"membersToastChanged1": "1 member changed.",
180+
"membersToastChangedN": "{{count}} members changed."
172181
},
173182

174183
"ProjectsPage": {
@@ -309,6 +318,7 @@
309318
"notValidChargingTargetFormat": "Use lowercase letters a-f, numbers 0-9, and hyphens (-) in the format: aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
310319
},
311320
"common": {
321+
"all": "All",
312322
"documentation": "Documentation",
313323
"close": "Close",
314324
"cannotLoadData": "Cannot load data",
@@ -416,4 +426,13 @@
416426
"activate": "Activate"
417427
}
418428
}
429+
,
430+
"ImportMembersDialog": {
431+
"dialogTitle": "Reuse Members",
432+
"reuseFromLabel": "Reuse from",
433+
"filterForLabel": "Filter for",
434+
"addMembersButton0": "Add members",
435+
"addMembersButton1": "Add member",
436+
"addMembersButtonN": "Add {{count}} members"
437+
}
419438
}

src/components/Dialogs/CreateProjectWorkspaceDialog.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export interface CreateProjectWorkspaceDialogProps {
3535
errors: FieldErrors<CreateDialogProps>;
3636
setValue: UseFormSetValue<CreateDialogProps>;
3737
projectName?: string;
38-
type: 'workspace' | 'project';
38+
type: 'workspace' | 'project' | 'mcp';
3939
watch: UseFormWatch<CreateDialogProps>;
4040
}
4141

@@ -93,7 +93,13 @@ export function CreateProjectWorkspaceDialog({
9393
requireChargingTarget={type === 'project'}
9494
sideFormContent={
9595
<FormGroup headerText={t('CreateProjectWorkspaceDialog.membersHeader')}>
96-
<EditMembers members={members} isValidationError={!!errors.members} onMemberChanged={setMembers} />
96+
<EditMembers
97+
type={type}
98+
members={members}
99+
isValidationError={!!errors.members}
100+
projectName={projectName}
101+
onMemberChanged={setMembers}
102+
/>
97103
</FormGroup>
98104
}
99105
/>

0 commit comments

Comments
 (0)