feat/updated form composable

qase-tms · May 9, 2024 · 83c8535 · 83c8535
1 parent 4d6e944
commit 83c8535
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/frontend-admin/src/lib/components/auth-form/index.svelte b/frontend-admin/src/lib/components/auth-form/index.svelte
@@ -1,18 +1,19 @@
 <script lang="ts">
 	import 'carbon-components-svelte/css/white.css';
+	import { onMount } from 'svelte';
 
 	import { Button, TextInput, Loading, InlineNotification } from 'carbon-components-svelte';
 	import Card from '$lib/components/card/index.svelte';
-	import { onMount } from 'svelte';
+	import { checkIsEmpty } from '$lib/utils/validations';
 
 	import { store } from './store';
+	import { initialValues } from './consts';
 	import { handleInputChange } from './utils';
-	import { checkIsEmpty } from '$lib/utils/validations';
 
 	let isLoading = false;
 	let errorMessage: string | undefined;
-	let username = '';
-	let password = '';
+	let username = initialValues.username;
+	let password = initialValues.password;
 	let isUsernameValid = true;
 	let isPasswordValid = true;
 	let isFormHasChanges = false;

diff --git a/frontend-admin/src/lib/components/auth-form/store.ts b/frontend-admin/src/lib/components/auth-form/store.ts
@@ -15,6 +15,13 @@ export const store = () => {
 		request: authRequest
 	});
 
+
+	/** TODO:
+	 * 1. Придумать как принимать валидацию внутри composable
+	 * 2. Придумать как автоматически обновлять поля и валидировать их,
+	 * а не писать каждый раз руками
+	 * 3. Придумать как обрабатывать non-required и required кейсы
+	 */
 	const setUsername = (value: string) => {
 		formState.update((state) => ({
 			...state,
@@ -29,6 +36,7 @@ export const store = () => {
 			}
 		}));
 	};
+
 	const setPassword = (value: string) => {
 		formState.update((state) => ({
 			...state,

diff --git a/frontend-admin/src/lib/composable/form-composable/index.ts b/frontend-admin/src/lib/composable/form-composable/index.ts
@@ -14,6 +14,8 @@ export const formComposable = <
 	request,
 	onSuccess
 }: TFormComposableParams<TResponseParams, TFields, TFields>) => {
+	const abortController = new AbortController();
+
 	const extendedValues = extendValuesWithMeta(initialValues);
 	const formState = writable(extendedValues);
 
@@ -25,7 +27,13 @@ export const formComposable = <
 	const setIsLoading = (loading: boolean) =>
 		formState.update((state) => ({ ...state, isLoading: loading }));
 
-	const abortController = new AbortController();
+	const handleSuccess: TFormComposableParams<TResponseParams, TFields, TFields>['onSuccess'] = (
+		data
+	) => {
+		onSuccess(data);
+		formState.set(extendedValues);
+	};
+
 	const handleSubmit = async () => {
 		const requestParams: TFields = {} as TFields;
 
@@ -42,7 +50,7 @@ export const formComposable = <
 			setLoadingState: setIsLoading,
 			onError: setError,
 			requestParams,
-			onSuccess,
+			onSuccess: handleSuccess,
 			request,
 			abortController
 		});