Skip to content

Commit 0e135ab

Browse files
committed
fixes
1 parent 7c615ff commit 0e135ab

File tree

5 files changed

+13
-17
lines changed

5 files changed

+13
-17
lines changed

src/components/Dialogs/CreateProjectDialog.test.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, {useState, useRef} from 'react';
2-
import {CreateProjectWorkspaceDialog, onCreatePayload} from './CreateProjectWorkspaceDialog';
2+
import {CreateProjectWorkspaceDialog, OnCreatePayload} from './CreateProjectWorkspaceDialog';
33
import { MemberRoles} from '../../lib/api/types/shared/members';
44
import {ErrorDialogHandle} from '../Shared/ErrorMessageBox';
55

@@ -38,8 +38,8 @@ export const CreateProjectWorkspaceDialogWrapper: React.FC<{ spyFormBody?: (data
3838
displayName,
3939
chargingTarget,
4040
members,
41-
}: onCreatePayload) => {
42-
const payload: onCreatePayload = {
41+
}: OnCreatePayload) => {
42+
const payload: OnCreatePayload = {
4343
name: name,
4444
displayName: displayName,
4545
chargingTarget: chargingTarget,
@@ -53,7 +53,7 @@ export const CreateProjectWorkspaceDialogWrapper: React.FC<{ spyFormBody?: (data
5353
<CreateProjectWorkspaceDialog
5454
isOpen={isOpen}
5555
setIsOpen={setIsOpen}
56-
titleText="Create Project Workspace"
56+
titleText="Create Workspace"
5757
onCreate={handleSubmit(handleCreate)}
5858
errorDialogRef={errorDialogRef}
5959
members={watch('members')}

src/components/Dialogs/CreateProjectDialogContainer.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {useEffect, useRef} from "react";
33
import {useApiResourceMutation, } from "../../lib/api/useApiResource";
44
import {ErrorDialogHandle} from "../Shared/ErrorMessageBox.tsx";
55
import {APIError} from "../../lib/api/error";
6-
import {CreateProjectWorkspaceDialog, onCreatePayload} from "./CreateProjectWorkspaceDialog.tsx";
6+
import {CreateProjectWorkspaceDialog, OnCreatePayload} from "./CreateProjectWorkspaceDialog.tsx";
77

88
import {useToast} from "../../context/ToastContext.tsx";
99
import {useAuthSubject} from "../../lib/oidc/useUsername.ts";
@@ -84,7 +84,7 @@ export function CreateProjectDialogContainer({
8484
chargingTarget,
8585
displayName,
8686
members
87-
}: onCreatePayload): Promise<Boolean> => {
87+
}: OnCreatePayload): Promise<Boolean> => {
8888
try {
8989
await trigger(CreateProject(name, {
9090
displayName: displayName,

src/components/Dialogs/CreateProjectWorkspaceDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {CreateDialogProps} from "./CreateWorkspaceDialogContainer.tsx";
1212
import {FormEvent} from "react";
1313
import {FieldErrors, UseFormRegister, UseFormSetValue} from "react-hook-form";
1414

15-
export type onCreatePayload = { name: string; displayName: string; chargingTarget: string; members: Member[] };
15+
export type OnCreatePayload = { name: string; displayName?: string; chargingTarget?: string; members: Member[] };
1616

1717
export interface CreateProjectWorkspaceDialogProps {
1818
isOpen: boolean;

src/components/Dialogs/CreateWorkspaceDialogContainer.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {useEffect, useRef} from "react";
22
import {useApiResourceMutation, useRevalidateApiResource} from "../../lib/api/useApiResource";
33
import {ErrorDialogHandle} from "../Shared/ErrorMessageBox.tsx";
44
import {APIError} from "../../lib/api/error";
5-
import {CreateProjectWorkspaceDialog, onCreatePayload} from "./CreateProjectWorkspaceDialog.tsx";
5+
import {CreateProjectWorkspaceDialog, OnCreatePayload} from "./CreateProjectWorkspaceDialog.tsx";
66
import {
77
CreateWorkspace,
88
CreateWorkspaceResource,
@@ -12,7 +12,7 @@ import {projectnameToNamespace} from "../../utils";
1212
import {ListWorkspaces} from "../../lib/api/types/crate/listWorkspaces";
1313
import {useToast} from "../../context/ToastContext.tsx";
1414
import {useAuthSubject} from "../../lib/oidc/useUsername.ts";
15-
import {Member, MemberRoles} from "../../lib/api/types/shared/members.ts";
15+
import { Member, MemberRoles } from '../../lib/api/types/shared/members.ts';
1616
import {useTranslation} from "react-i18next";
1717
import {zodResolver} from "@hookform/resolvers/zod";
1818
import {useForm} from "react-hook-form";
@@ -82,7 +82,7 @@ export function CreateWorkspaceDialogContainer({
8282
displayName,
8383
chargingTarget,
8484
members,
85-
}: onCreatePayload): Promise<Boolean> => {
85+
}: OnCreatePayload): Promise<Boolean> => {
8686
try {
8787
await trigger(
8888
CreateWorkspace(name, namespace, {
@@ -115,7 +115,7 @@ export function CreateWorkspaceDialogContainer({
115115
setIsOpen={setIsOpen}
116116
onCreate={handleSubmit(handleWorkspaceCreate)}
117117
errorDialogRef={errorDialogRef}
118-
titleText="Create Project Workspace"
118+
titleText="Create Workspace"
119119
members={watch('members')}
120120
register={register}
121121
errors={errors}

src/components/Members/EditMembers.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {MemberRoleSelect} from "./MemberRoleSelect.tsx";
55
import {ValueState} from "../Shared/Ui5ValieState.tsx";
66
import {Member, MemberRoles} from "../../lib/api/types/shared/members";
77
import {useTranslation} from "react-i18next";
8-
import {z} from "zod";
8+
99

1010
export interface EditMembersProps {
1111
members: Member[];
@@ -32,11 +32,7 @@ export const EditMembers:FC<EditMembersProps> = ({members = [], onMemberChanged,
3232
setHighlightEmail("Negative");
3333
return;
3434
}
35-
if (!z.string().email().safeParse(emailInput.current!.value).success) {
36-
setValueStateMessage("This is not a valid email.")
37-
setHighlightEmail("Negative");
38-
return;
39-
}
35+
4036
const newMembers = [...members, {name: emailInput.current.value, roles: [role], kind: "User"}]
4137
onMemberChanged(newMembers);
4238
emailInput.current!.value = "";

0 commit comments

Comments
 (0)