Update to v0.1.0-beta4

.github/workflows/docker-package-publish.yml

@@ -6,8 +6,6 @@ name: Docker
 # documentation.
 
 on:
-  schedule:
-    - cron: '37 19 * * *'
   push:
     branches: [ "master" ]
     # Publish semver tags as releases.

package.json

@@ -78,6 +78,7 @@
     "postcss": "^8",
     "prettier": "3.3.2",
     "tailwindcss": "^3.4.4",
-    "typescript": "^5.5.3"
+    "typescript": "^5.5.3",
+    "zustand": "^4.5.4"
   }
 }

src/entities/ProfileCard/lib/store.ts

@@ -0,0 +1,12 @@
+import { create } from "zustand";
+import { EntityState, EntityStateOption } from "@/shared/enums";
+
+interface State {
+  state: Nullable<EntityState>;
+  setState: (state: EntityState) => void;
+}
+
+export const useProfileCardStore = create<State>((set) => ({
+  state: null,
+  setState: (state) => set(() => ({ state })),
+}));

src/entities/ProfileCard/ui/ProfileCard.tsx

@@ -31,6 +31,7 @@ import {
 import defaultProfileIcon from "@/assets/logos/minecraft.png";
 
 import classes from "./styles.module.css";
+import { useProfileCardStore } from "@/entities/ProfileCard/lib/store";
 
 interface ProfileCardParams {
   profile: ProfileExtendedBaseEntity;
@@ -68,6 +69,8 @@ export const ProfileCard = ({ profile }: ProfileCardParams) => {
     window.location.reload();
   };
 
+  const { state } = useProfileCardStore();
+
   return (
     <div
       className={classes["profile-card"]}
@@ -129,7 +132,7 @@ export const ProfileCard = ({ profile }: ProfileCardParams) => {
       {/* Профиль */}
       <div className={classes["profile-card__info"]}>
         <div className={classes["profile-card__info-state"]}>
-          <ClientState state={profile.state} />
+          <ClientState state={state || profile.state} />
         </div>
         <div className={classes["profile-card__info-icon-wrapper"]}>
           <Image

src/features/connect-textures-form/ui/ConnectTexturesForm.tsx

@@ -41,15 +41,19 @@ export function ConnectTexturesForm({
   });
 
   const onSubmit = async (data: ConnectTexturesFormSchemaType) => {
-    await mutateAsync({
-      type: TexturesServiceType.TEXTURES_SERVICE_SKINS,
-      url: data.url_skins,
-    });
+    if (form.getFieldState("url_skins").isDirty) {
+      await mutateAsync({
+        type: TexturesServiceType.TEXTURES_SERVICE_SKINS,
+        url: data.url_skins,
+      });
+    }
 
-    await mutateAsync({
-      type: TexturesServiceType.TEXTURES_SERVICE_CLOAKS,
-      url: data.url_cloaks,
-    });
+    if (form.getFieldState("url_cloaks").isDirty) {
+      await mutateAsync({
+        type: TexturesServiceType.TEXTURES_SERVICE_CLOAKS,
+        url: data.url_cloaks,
+      });
+    }
 
     onOpenChange(false);
   };

src/features/create-profile-form/ui/CreateProfileForm.tsx

@@ -21,6 +21,7 @@ import { Icons } from "@/shared/ui/icons";
 import { Input } from "@/shared/ui/input";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/shared/ui/select";
 import { Textarea } from "@/shared/ui/textarea";
+import { FormCombobox } from "@/shared/ui/FormCombobox";
 
 import loaderMinecraft from "@/assets/logos/minecraft.png";
 import loaderForge from "@/assets/logos/forge.png";
@@ -130,7 +131,6 @@ export function CreateProfileForm(props: CreateProfileFormProps) {
               <FormMessage>{form.formState.errors.name.message}</FormMessage>
             )}
           </FormItem>
-
           <FormItem>
             <FormLabel>Введите описание сервера</FormLabel>
             <FormControl>
@@ -146,20 +146,15 @@ export function CreateProfileForm(props: CreateProfileFormProps) {
             render={({ field }) => (
               <FormItem className="flex-1">
                 <FormLabel>Выберите версию игры</FormLabel>
-                <FormControl>
-                  <Select onValueChange={field.onChange} defaultValue={field.value}>
-                    <SelectTrigger>
-                      <SelectValue placeholder="Выберите версию игры" />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {versions.data?.map((version: string) => (
-                        <SelectItem key={version} value={version}>
-                          {version}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                </FormControl>
+                <FormCombobox
+                  name={field.name}
+                  value={field.value}
+                  placeholder="Выберите версию игры"
+                  placeholderInputSearch="Поиск версий"
+                  options={versions && versions.data}
+                  isLoading={versions.isLoading}
+                  setValue={form.setValue}
+                />
                 {form.formState.errors.version && (
                   <FormMessage>{form.formState.errors.version.message}</FormMessage>
                 )}
@@ -207,28 +202,17 @@ export function CreateProfileForm(props: CreateProfileFormProps) {
               render={({ field }) => (
                 <FormItem className="flex-1">
                   <FormLabel>Выберите версию загрузчика</FormLabel>
-                  <FormControl>
-                    <Select
-                      onValueChange={field.onChange}
-                      value={field.value}
-                      disabled={
-                        !form.getFieldState("version").isDirty ||
-                        loaderVersion.isFetching ||
-                        loaderVersion.isError
-                      }
-                    >
-                      <SelectTrigger>
-                        <SelectValue placeholder="Выберите версию загрузчика" />
-                      </SelectTrigger>
-                      <SelectContent>
-                        {loaderVersion.data?.map((loader: string) => (
-                          <SelectItem key={loader} value={loader}>
-                            {loader}
-                          </SelectItem>
-                        ))}
-                      </SelectContent>
-                    </Select>
-                  </FormControl>
+                  <FormCombobox
+                    name={field.name}
+                    value={field.value}
+                    placeholder="Выберите версию загрузчика"
+                    placeholderInputSearch="Поиск версии загрузчика"
+                    options={loaderVersion && loaderVersion.data}
+                    description="Данная версия игры не поддерживается загрузчиком"
+                    isError={loaderVersion.isError}
+                    isLoading={!form.getFieldState("version").isDirty || loaderVersion.isFetching}
+                    setValue={form.setValue}
+                  />
                   {form.formState.errors.gameLoader && (
                     <FormMessage>{form.formState.errors.gameLoader.message}</FormMessage>
                   )}
@@ -238,7 +222,7 @@ export function CreateProfileForm(props: CreateProfileFormProps) {
           )}
 
           <div className="flex justify-end">
-            <Button disabled={isPending || !form.formState.isDirty}>
+            <Button disabled={isPending || !form.formState.isDirty || loaderVersion.isError}>
               {isPending && <Icons.spinner className="mr-2 h-4 w-4 animate-spin" />}
               Создать
             </Button>

src/features/edit-profile-form/ui/EditProfileForm.tsx

@@ -33,6 +33,7 @@ export const EditProfileForm = (props: EditProfileFormProps) => {
       name: profile?.profileName || "",
       description: profile?.description || "",
       jvmArguments: profile?.jvmArguments || "",
+      gameArguments: profile?.gameArguments || "",
       icon: profile?.iconBase64 || "",
       background: profile?.background || "",
     },
@@ -56,6 +57,10 @@ export const EditProfileForm = (props: EditProfileFormProps) => {
       formUpdate.append("jvmArguments", body.jvmArguments);
     }
 
+    if (body.gameArguments) {
+      formUpdate.append("gameArguments", body.gameArguments);
+    }
+
     await mutateAsync(formUpdate);
 
     if (form.formState.dirtyFields.name) {
@@ -98,7 +103,9 @@ export const EditProfileForm = (props: EditProfileFormProps) => {
           <div className="grid grid-cols-1 lg:grid-cols-2 gap-x-8">
             <div className="flex flex-col gap-y-1 min-w-96 mb-2 lg:mb-0">
               <h6 className="text-sm font-bold">Jvm Аргументы</h6>
-              <p className="text-sm text-gray-700 dark:text-gray-300">Параметры запуска клиента</p>
+              <p className="text-sm text-gray-700 dark:text-gray-300">
+                Параметры запуска виртуальной Java машины
+              </p>
             </div>
             <div className="flex flex-col gap-y-1 min-w-96 mb-2 lg:mb-0">
               <Input
@@ -111,6 +118,22 @@ export const EditProfileForm = (props: EditProfileFormProps) => {
               )}
             </div>
           </div>
+          <div className="grid grid-cols-1 lg:grid-cols-2 gap-x-8">
+            <div className="flex flex-col gap-y-1 min-w-96 mb-2 lg:mb-0">
+              <h6 className="text-sm font-bold">Game Аргументы</h6>
+              <p className="text-sm text-gray-700 dark:text-gray-300">Параметры запуска клиента</p>
+            </div>
+            <div className="flex flex-col gap-y-1 min-w-96 mb-2 lg:mb-0">
+              <Input
+                type="text"
+                placeholder="Введите ваши game аргументы"
+                {...form.register("gameArguments")}
+              />
+              {form.formState.errors.gameArguments && (
+                <FormMessage>{form.formState.errors.gameArguments.message?.toString()}</FormMessage>
+              )}
+            </div>
+          </div>
           <div className="flex justify-end">
             <Button disabled={isPending || form.formState.disabled || !form.formState.isDirty}>
               {isPending && <Icons.spinner className="mr-2 h-4 w-4 animate-spin" />}