From e8b28ccf9055421cfe633586d46d0254a8c5f9fb Mon Sep 17 00:00:00 2001
From: Zamitto <167933696+zamitto@users.noreply.github.com>
Date: Wed, 5 Jun 2024 20:29:42 -0300
Subject: [PATCH] organize ui

---
 .../events/library/add-game-to-library.ts     |   5 +-
 src/preload/index.ts                          |  15 +-
 src/renderer/src/declaration.d.ts             |   3 +-
 .../game-details/hero/hero-panel-actions.tsx  |   7 +-
 .../modals/game-options-modal.tsx             | 157 ++++++++++--------
 5 files changed, 89 insertions(+), 98 deletions(-)

diff --git a/src/main/events/library/add-game-to-library.ts b/src/main/events/library/add-game-to-library.ts
index 804a929b..1c7447e5 100644
--- a/src/main/events/library/add-game-to-library.ts
+++ b/src/main/events/library/add-game-to-library.ts
@@ -11,8 +11,7 @@ const addGameToLibrary = async (
   _event: Electron.IpcMainInvokeEvent,
   objectID: string,
   title: string,
-  shop: GameShop,
-  executablePath: string | null
+  shop: GameShop
 ) => {
   return gameRepository
     .update(
@@ -22,7 +21,6 @@ const addGameToLibrary = async (
       {
         shop,
         status: null,
-        executablePath,
         isDeleted: false,
       }
     )
@@ -42,7 +40,6 @@ const addGameToLibrary = async (
             iconUrl,
             objectID,
             shop,
-            executablePath,
           })
           .then(() => {
             if (iconUrl) {
diff --git a/src/preload/index.ts b/src/preload/index.ts
index 3748baaa..3a47ba82 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -61,19 +61,8 @@ contextBridge.exposeInMainWorld("electron", {
   syncDownloadSources: () => ipcRenderer.invoke("syncDownloadSources"),
 
   /* Library */
-  addGameToLibrary: (
-    objectID: string,
-    title: string,
-    shop: GameShop,
-    executablePath: string
-  ) =>
-    ipcRenderer.invoke(
-      "addGameToLibrary",
-      objectID,
-      title,
-      shop,
-      executablePath
-    ),
+  addGameToLibrary: (objectID: string, title: string, shop: GameShop) =>
+    ipcRenderer.invoke("addGameToLibrary", objectID, title, shop),
   createGameShortcut: (id: number) =>
     ipcRenderer.invoke("createGameShortcut", id),
   updateExecutablePath: (id: number, executablePath: string) =>
diff --git a/src/renderer/src/declaration.d.ts b/src/renderer/src/declaration.d.ts
index 14d8bb80..532fa8d7 100644
--- a/src/renderer/src/declaration.d.ts
+++ b/src/renderer/src/declaration.d.ts
@@ -56,8 +56,7 @@ declare global {
     addGameToLibrary: (
       objectID: string,
       title: string,
-      shop: GameShop,
-      executablePath: string | null
+      shop: GameShop
     ) => Promise<void>;
     createGameShortcut: (id: number) => Promise<boolean>;
     updateExecutablePath: (id: number, executablePath: string) => Promise<void>;
diff --git a/src/renderer/src/pages/game-details/hero/hero-panel-actions.tsx b/src/renderer/src/pages/game-details/hero/hero-panel-actions.tsx
index ba35e404..e75c8807 100644
--- a/src/renderer/src/pages/game-details/hero/hero-panel-actions.tsx
+++ b/src/renderer/src/pages/game-details/hero/hero-panel-actions.tsx
@@ -79,12 +79,7 @@ export function HeroPanelActions() {
       if (game) {
         await removeGameFromLibrary(game.id);
       } else {
-        await window.electron.addGameToLibrary(
-          objectID!,
-          gameTitle,
-          "steam",
-          null
-        );
+        await window.electron.addGameToLibrary(objectID!, gameTitle, "steam");
       }
 
       updateLibrary();
diff --git a/src/renderer/src/pages/game-details/modals/game-options-modal.tsx b/src/renderer/src/pages/game-details/modals/game-options-modal.tsx
index d10332f0..800b9084 100644
--- a/src/renderer/src/pages/game-details/modals/game-options-modal.tsx
+++ b/src/renderer/src/pages/game-details/modals/game-options-modal.tsx
@@ -11,6 +11,7 @@ import { gameDetailsContext } from "../game-details.context";
 import {
   FileDirectoryOpenFillIcon,
   FileSymlinkFileIcon,
+  PencilIcon,
   TrashIcon,
 } from "@primer/octicons-react";
 import { DeleteGameModal } from "@renderer/pages/downloads/delete-game-modal";
@@ -54,6 +55,7 @@ export function GameOptionsModal({
 
   const handleDeleteGame = async () => {
     await removeGameInstaller(game.id);
+    updateGame();
   };
 
   const handleOpenGameInstallerPath = async () => {
@@ -78,81 +80,9 @@ export function GameOptionsModal({
             display: "flex",
             flexDirection: "column",
             gap: `${SPACING_UNIT}px`,
-            width: "700px",
+            width: "100%",
           }}
         >
-          <div className={styles.downloadSourceField}>
-            <TextField
-              label="Caminho do executável"
-              value={game.executablePath || ""}
-              readOnly
-              theme="dark"
-              disabled
-              placeholder="Selecione um executável"
-            />
-          </div>
-
-          <div className={styles.downloadSourceField}>
-            <Button
-              type="button"
-              theme="outline"
-              style={{ alignSelf: "flex-end" }}
-              onClick={handleOpenGameExecutablePath}
-            >
-              <FileDirectoryOpenFillIcon />
-              {"Abrir pasta"}
-            </Button>
-
-            <Button
-              type="button"
-              theme="outline"
-              style={{ alignSelf: "flex-end" }}
-              onClick={handleChangeExecutableLocation}
-            >
-              <FileSymlinkFileIcon />
-              {"Alterar"}
-            </Button>
-            <Button
-              onClick={handleCreateShortcut}
-              theme="outline"
-              disabled={deleting}
-            >
-              {"Criar atalho"}
-            </Button>
-          </div>
-
-          <div className={styles.downloadSourceField}>
-            <TextField
-              label="Caminho do instalador"
-              value={`${game.downloadPath}\\${game.folderName}`}
-              readOnly
-              theme="dark"
-              disabled
-              placeholder=""
-            />
-
-            <Button
-              type="button"
-              theme="outline"
-              style={{ alignSelf: "flex-end" }}
-              onClick={handleOpenGameInstallerPath}
-            >
-              <FileDirectoryOpenFillIcon />
-              {"Abrir pasta"}
-            </Button>
-            <Button
-              type="button"
-              theme="outline"
-              style={{ alignSelf: "flex-end" }}
-              onClick={() => {
-                setShowDeleteModal(true);
-              }}
-            >
-              <TrashIcon />
-              {"Remover"}
-            </Button>
-          </div>
-
           <div className={styles.downloadSourceField}>
             <Button
               onClick={openRepacksModal}
@@ -162,6 +92,87 @@ export function GameOptionsModal({
               {t("open_download_options")}
             </Button>
           </div>
+          <div className={styles.downloadSourceField}>
+            <TextField
+              label="Caminho do executável"
+              value={game.executablePath || ""}
+              readOnly
+              theme="dark"
+              disabled
+              placeholder="Selecione um executável"
+            />
+            <Button
+              type="button"
+              theme="outline"
+              style={{ alignSelf: "flex-end" }}
+              onClick={handleChangeExecutableLocation}
+              title={
+                game.executablePath
+                  ? "Trocar executável"
+                  : "Selecionar executável"
+              }
+            >
+              <PencilIcon />
+            </Button>
+            <Button
+              type="button"
+              theme="outline"
+              style={{ alignSelf: "flex-end" }}
+              onClick={handleOpenGameExecutablePath}
+              disabled={!game.executablePath}
+              title={"Abrir pasta"}
+            >
+              <FileDirectoryOpenFillIcon />
+            </Button>
+
+            <Button
+              onClick={handleCreateShortcut}
+              style={{ alignSelf: "flex-end" }}
+              theme="outline"
+              disabled={deleting || !game.executablePath}
+              title={"Criar atalho"}
+            >
+              <FileSymlinkFileIcon />
+            </Button>
+          </div>
+
+          <div className={styles.downloadSourceField}></div>
+
+          {game.folderName && (
+            <div className={styles.downloadSourceField}>
+              <TextField
+                label="Caminho do instalador"
+                value={`${game.downloadPath}\\${game.folderName}`}
+                readOnly
+                theme="dark"
+                disabled
+                placeholder=""
+              />
+
+              <Button
+                type="button"
+                theme="outline"
+                style={{ alignSelf: "flex-end" }}
+                onClick={handleOpenGameInstallerPath}
+                disabled={!game.downloadPath}
+                title={"Abrir pasta"}
+              >
+                <FileDirectoryOpenFillIcon />
+              </Button>
+              <Button
+                type="button"
+                theme="outline"
+                style={{ alignSelf: "flex-end" }}
+                disabled={!game.downloadPath}
+                onClick={() => {
+                  setShowDeleteModal(true);
+                }}
+                title={"Remover instalador"}
+              >
+                <TrashIcon />
+              </Button>
+            </div>
+          )}
         </div>
       </Modal>
     </>