Skip to content

Commit 548970a

Browse files
lucasgorallucasgoral
committed
prettier
1 parent 407177f commit 548970a

File tree

7 files changed

+361
-299
lines changed

7 files changed

+361
-299
lines changed

‎src/components/Dialogs/CreateProjectDialog.test.tsx‎

Lines changed: 56 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
import React, {useState, useRef} from 'react';
2-
import {CreateProjectWorkspaceDialog, OnCreatePayload} from './CreateProjectWorkspaceDialog';
3-
import { MemberRoles} from '../../lib/api/types/shared/members';
4-
import {ErrorDialogHandle} from '../Shared/ErrorMessageBox';
5-
6-
import {useForm} from "react-hook-form";
7-
import {zodResolver} from "@hookform/resolvers/zod";
8-
import {validationSchemaProjectWorkspace} from "../../lib/api/validations/schemas.ts";
9-
import {CreateDialogProps} from "./CreateWorkspaceDialogContainer.tsx";
10-
11-
12-
13-
14-
export const CreateProjectWorkspaceDialogWrapper: React.FC<{ spyFormBody?: (data: any) => {} }> = ({spyFormBody}) => {
1+
import React, { useState, useRef } from 'react';
2+
import {
3+
CreateProjectWorkspaceDialog,
4+
OnCreatePayload,
5+
} from './CreateProjectWorkspaceDialog';
6+
import { MemberRoles } from '../../lib/api/types/shared/members';
7+
import { ErrorDialogHandle } from '../Shared/ErrorMessageBox';
8+
9+
import { useForm } from 'react-hook-form';
10+
import { zodResolver } from '@hookform/resolvers/zod';
11+
import { validationSchemaProjectWorkspace } from '../../lib/api/validations/schemas.ts';
12+
import { CreateDialogProps } from './CreateWorkspaceDialogContainer.tsx';
13+
14+
export const CreateProjectWorkspaceDialogWrapper: React.FC<{
15+
spyFormBody?: (data: any) => {};
16+
}> = ({ spyFormBody }) => {
1517
const [isOpen, setIsOpen] = useState(true);
1618

1719
const errorDialogRef = useRef<ErrorDialogHandle>(null);
@@ -21,53 +23,51 @@ export const CreateProjectWorkspaceDialogWrapper: React.FC<{ spyFormBody?: (data
2123
handleSubmit,
2224
setValue,
2325
formState: { errors },
24-
watch
26+
watch,
2527
} = useForm<CreateDialogProps>({
2628
resolver: zodResolver(validationSchemaProjectWorkspace),
2729
defaultValues: {
28-
name: "",
29-
displayName: "",
30-
chargingTarget: "",
31-
members: [{ name: '[email protected]', roles: [MemberRoles.admin], kind: "User"}],
32-
}
30+
name: '',
31+
displayName: '',
32+
chargingTarget: '',
33+
members: [
34+
{ name: '[email protected]', roles: [MemberRoles.admin], kind: 'User' },
35+
],
36+
},
3337
});
3438

3539
const handleCreate = async ({
36-
name,
37-
displayName,
38-
chargingTarget,
39-
members,
40-
}: OnCreatePayload) => {
40+
name,
41+
displayName,
42+
chargingTarget,
43+
members,
44+
}: OnCreatePayload) => {
4145
const payload: OnCreatePayload = {
4246
name: name,
4347
displayName: displayName,
4448
chargingTarget: chargingTarget,
45-
members: members
49+
members: members,
4650
};
4751

48-
spyFormBody?.(payload)
52+
spyFormBody?.(payload);
4953
setIsOpen(false);
50-
51-
}; return (
54+
};
55+
return (
5256
<CreateProjectWorkspaceDialog
5357
isOpen={isOpen}
5458
setIsOpen={setIsOpen}
5559
titleText="Create Workspace"
56-
onCreate={handleSubmit(handleCreate)}
5760
errorDialogRef={errorDialogRef}
5861
members={watch('members')}
5962
register={register}
6063
errors={errors}
6164
setValue={setValue}
65+
onCreate={handleSubmit(handleCreate)}
6266
/>
6367
);
6468
};
6569

66-
67-
68-
6970
describe('CreateProjectWorkspaceDialog', () => {
70-
7171
it('checks if there is existing member and delete it', () => {
7272
cy.mount(<CreateProjectWorkspaceDialogWrapper />, {});
7373
cy.get('div[data-component-name="AnalyticalTableContainerWithScrollbar"]')
@@ -81,10 +81,10 @@ describe('CreateProjectWorkspaceDialog', () => {
8181

8282
it('should add a new member and display it in the table', () => {
8383
cy.mount(<CreateProjectWorkspaceDialogWrapper />, {});
84-
cy.get('ui5-input[id*="member-email-input"]').find('input[id*="inner"]')
84+
cy.get('ui5-input[id*="member-email-input"]')
85+
.find('input[id*="inner"]')
8586
.type('[email protected]', { force: true });
86-
cy.get('ui5-button:contains("Add")')
87-
.click({ force: true });
87+
cy.get('ui5-button:contains("Add")').click({ force: true });
8888
cy.get('div[data-component-name="AnalyticalTableContainerWithScrollbar"]')
8989
.contains('[email protected]')
9090
.should('be.visible');
@@ -94,18 +94,20 @@ describe('CreateProjectWorkspaceDialog', () => {
9494
const stubFn = cy.stub().as('stubFn');
9595
cy.mount(<CreateProjectWorkspaceDialogWrapper spyFormBody={stubFn} />, {});
9696

97-
cy.get('ui5-input[id*="name"]').find('input[id*="inner"]')
97+
cy.get('ui5-input[id*="name"]')
98+
.find('input[id*="inner"]')
9899
.type('brand--01', { force: true });
99-
cy.get('ui5-input[id*="displayName"]').find('input[id*="inner"]')
100+
cy.get('ui5-input[id*="displayName"]')
101+
.find('input[id*="inner"]')
100102
.type('Brand new workspace number one', { force: true });
101-
cy.get('ui5-input[id*="chargingTarget"]').find('input[id*="inner"]')
103+
cy.get('ui5-input[id*="chargingTarget"]')
104+
.find('input[id*="inner"]')
102105
.type('Charging target 1000', { force: true });
103-
cy.get('ui5-input[id*="email"]').find('input[id*="inner"]')
106+
cy.get('ui5-input[id*="email"]')
107+
.find('input[id*="inner"]')
104108
.type('[email protected]', { force: true });
105-
cy.get('ui5-button:contains("Add")')
106-
.click({ force: true });
107-
cy.get('ui5-button:contains("Create")')
108-
.click({ force: true });
109+
cy.get('ui5-button:contains("Add")').click({ force: true });
110+
cy.get('ui5-button:contains("Create")').click({ force: true });
109111

110112
cy.get('@stubFn').should('have.been.calledWith', {
111113
name: 'brand--01',
@@ -115,30 +117,30 @@ describe('CreateProjectWorkspaceDialog', () => {
115117
{
116118
name: '[email protected]',
117119
roles: [MemberRoles.admin],
118-
kind: 'User'
120+
kind: 'User',
119121
},
120122
{
121123
name: '[email protected]',
122124
roles: [MemberRoles.viewer],
123-
kind: 'User'
124-
}
125-
]
125+
kind: 'User',
126+
},
127+
],
126128
});
127129
});
128-
129130

130131
it('should handle multiple member additions', () => {
131132
cy.mount(<CreateProjectWorkspaceDialogWrapper />, {});
132133

133134
const newMembers = ['[email protected]', '[email protected]'];
134-
newMembers.forEach(email => {
135-
cy.get('ui5-input[id*="member-email-input"]').find('input[id*="inner"]')
135+
newMembers.forEach((email) => {
136+
cy.get('ui5-input[id*="member-email-input"]')
137+
.find('input[id*="inner"]')
136138
.clear({ force: true })
137139
.type(email, { force: true });
138140
cy.get('ui5-button:contains("Add")').click({ force: true });
139141
});
140142

141-
newMembers.forEach(email => {
143+
newMembers.forEach((email) => {
142144
cy.get('div[data-component-name="AnalyticalTableContainerWithScrollbar"]')
143145
.contains(email)
144146
.should('be.visible');
@@ -152,5 +154,4 @@ describe('CreateProjectWorkspaceDialog', () => {
152154
cy.get('ui5-button:contains("Cancel")').click({ force: true });
153155
cy.get('ui5-dialog').should('not.be.visible');
154156
});
155-
156-
});
157+
});

‎src/components/Dialogs/CreateProjectDialog.tsx‎

Whitespace-only changes.

‎src/components/Dialogs/CreateProjectDialogContainer.tsx‎

Lines changed: 57 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,116 @@
1-
2-
import {useEffect, useRef} from "react";
3-
import {useApiResourceMutation, } from "../../lib/api/useApiResource";
4-
import {ErrorDialogHandle} from "../Shared/ErrorMessageBox.tsx";
5-
import {APIError} from "../../lib/api/error";
6-
import {CreateProjectWorkspaceDialog, OnCreatePayload} from "./CreateProjectWorkspaceDialog.tsx";
7-
8-
import {useToast} from "../../context/ToastContext.tsx";
9-
import {useAuthSubject} from "../../lib/oidc/useUsername.ts";
10-
import { MemberRoles, } from "../../lib/api/types/shared/members.ts";
11-
12-
import {useTranslation} from "react-i18next";
13-
14-
15-
16-
import {zodResolver} from "@hookform/resolvers/zod";
17-
import {useForm} from "react-hook-form";
18-
import {CreateProject, CreateProjectResource, CreateProjectType} from "../../lib/api/types/crate/createProject.ts";
19-
import {validationSchemaProjectWorkspace} from "../../lib/api/validations/schemas.ts";
1+
import { useEffect, useRef } from 'react';
2+
import { useApiResourceMutation } from '../../lib/api/useApiResource';
3+
import { ErrorDialogHandle } from '../Shared/ErrorMessageBox.tsx';
4+
import { APIError } from '../../lib/api/error';
5+
import {
6+
CreateProjectWorkspaceDialog,
7+
OnCreatePayload,
8+
} from './CreateProjectWorkspaceDialog.tsx';
9+
10+
import { useToast } from '../../context/ToastContext.tsx';
11+
import { useAuthSubject } from '../../lib/oidc/useUsername.ts';
12+
import { MemberRoles } from '../../lib/api/types/shared/members.ts';
13+
14+
import { useTranslation } from 'react-i18next';
15+
16+
import { zodResolver } from '@hookform/resolvers/zod';
17+
import { useForm } from 'react-hook-form';
18+
import {
19+
CreateProject,
20+
CreateProjectResource,
21+
CreateProjectType,
22+
} from '../../lib/api/types/crate/createProject.ts';
23+
import { validationSchemaProjectWorkspace } from '../../lib/api/validations/schemas.ts';
2024
import { CreateDialogProps } from './CreateWorkspaceDialogContainer.tsx';
2125

22-
23-
24-
2526
export function CreateProjectDialogContainer({
26-
isOpen,
27-
setIsOpen,
28-
29-
}: {
27+
isOpen,
28+
setIsOpen,
29+
}: {
3030
isOpen: boolean;
3131
setIsOpen: (isOpen: boolean) => void;
32-
3332
}) {
34-
35-
36-
37-
38-
3933
const {
4034
register,
4135
handleSubmit,
4236
reset,
4337
setValue,
4438
formState: { errors },
45-
watch
39+
watch,
4640
} = useForm<CreateDialogProps>({
4741
resolver: zodResolver(validationSchemaProjectWorkspace),
4842
defaultValues: {
49-
name: "",
50-
displayName: "",
51-
chargingTarget: "",
43+
name: '',
44+
displayName: '',
45+
chargingTarget: '',
5246
members: [],
53-
}
47+
},
5448
});
5549

56-
const username = useAuthSubject()
50+
const username = useAuthSubject();
5751

58-
const {t} = useTranslation();
52+
const { t } = useTranslation();
5953

6054
useEffect(() => {
6155
if (username) {
62-
setValue('members', [{name: username, roles: [MemberRoles.admin], kind: "User"}])
56+
setValue('members', [
57+
{ name: username, roles: [MemberRoles.admin], kind: 'User' },
58+
]);
6359
}
6460
return () => {
65-
reset()
66-
61+
reset();
6762
};
6863
}, []);
6964

7065
const toast = useToast();
7166

72-
const {trigger} = useApiResourceMutation<CreateProjectType>(CreateProjectResource())
67+
const { trigger } = useApiResourceMutation<CreateProjectType>(
68+
CreateProjectResource(),
69+
);
7370

7471
const errorDialogRef = useRef<ErrorDialogHandle>(null);
7572

7673
const handleProjectCreate = async ({
77-
name,
78-
chargingTarget,
79-
displayName,
80-
members
81-
}: OnCreatePayload): Promise<Boolean> => {
74+
name,
75+
chargingTarget,
76+
displayName,
77+
members,
78+
}: OnCreatePayload): Promise<boolean> => {
8279
try {
83-
await trigger(CreateProject(name, {
84-
displayName: displayName,
85-
chargingTarget: chargingTarget,
86-
members: members
87-
}));
80+
await trigger(
81+
CreateProject(name, {
82+
displayName: displayName,
83+
chargingTarget: chargingTarget,
84+
members: members,
85+
}),
86+
);
8887
setIsOpen(false);
8988
toast.show(t('CreateProjectDialog.toastMessage'));
9089
return true;
9190
} catch (e) {
9291
console.error(e);
9392
if (e instanceof APIError) {
9493
if (errorDialogRef.current) {
95-
errorDialogRef.current.showErrorDialog(`${e.message}: ${JSON.stringify(e.info)}`);
94+
errorDialogRef.current.showErrorDialog(
95+
`${e.message}: ${JSON.stringify(e.info)}`,
96+
);
9697
}
9798
}
9899
return false;
99100
}
100-
}
101-
101+
};
102102

103103
return (
104-
105-
106104
<CreateProjectWorkspaceDialog
107105
isOpen={isOpen}
108106
setIsOpen={setIsOpen}
109-
onCreate={handleSubmit(handleProjectCreate)}
110107
errorDialogRef={errorDialogRef}
111108
titleText="Create Project"
112109
members={watch('members')}
113110
register={register}
114111
errors={errors}
115112
setValue={setValue}
113+
onCreate={handleSubmit(handleProjectCreate)}
116114
/>
117-
118115
);
119116
}

0 commit comments

Comments
 (0)