Refactor: src/components/Dialog.ts の引数を変更 (#1340)

VOICEVOX · Jun 18, 2023 · 0aa1914 · 0aa1914
1 parent 808830e
commit 0aa1914
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 36 deletions.
diff --git a/src/components/Dialog.ts b/src/components/Dialog.ts
@@ -1,9 +1,5 @@
 import { QVueGlobals } from "quasar";
-import {
-  AudioKey,
-  ConfirmedTips,
-  Encoding as EncodingType,
-} from "@/type/preload";
+import { AudioKey, Encoding as EncodingType } from "@/type/preload";
 import {
   AllActions,
   SaveResultObject,
@@ -23,15 +19,15 @@ export async function generateAndSaveOneAudioWithDialog({
   dispatch,
   filePath,
   encoding,
-  confirmedTips,
+  notifyOnGenerateAudio,
 }: {
   audioKey: AudioKey;
   quasarDialog: QuasarDialog;
   quasarNotify: QuasarNotify;
   dispatch: Dispatch<AllActions>;
   filePath?: string;
   encoding?: EncodingType;
-  confirmedTips: ConfirmedTips;
+  notifyOnGenerateAudio: boolean;
 }): Promise<void> {
   const result: SaveResultObject = await withProgress(
     dispatch("GENERATE_AND_SAVE_AUDIO", {
@@ -46,7 +42,7 @@ export async function generateAndSaveOneAudioWithDialog({
 
   if (result.result === "SUCCESS") {
     // "今後この通知をしない" 有効時
-    if (confirmedTips.notifyOnGenerateAudio) return;
+    if (notifyOnGenerateAudio) return;
 
     // 書き出し成功時に通知をする
     quasarNotify({
@@ -60,9 +56,8 @@ export async function generateAndSaveOneAudioWithDialog({
           label: "今後この通知をしない",
           textColor: "toast-button-display",
           handler: () => {
-            dispatch("SET_CONFIRMED_TIPS", {
-              confirmedTips: {
-                ...confirmedTips,
+            dispatch("SET_CONFIRMED_TIP", {
+              confirmedTip: {
                 notifyOnGenerateAudio: true,
               },
             });
@@ -109,14 +104,14 @@ export async function generateAndSaveAllAudioWithDialog({
   dispatch,
   dirPath,
   encoding,
-  confirmedTips,
+  notifyOnGenerateAudio,
 }: {
   quasarDialog: QuasarDialog;
   quasarNotify: QuasarNotify;
   dispatch: Dispatch<AllActions>;
   dirPath?: string;
   encoding?: EncodingType;
-  confirmedTips: ConfirmedTips;
+  notifyOnGenerateAudio: boolean;
 }): Promise<void> {
   const result = await withProgress(
     dispatch("GENERATE_AND_SAVE_ALL_AUDIO", {
@@ -160,7 +155,7 @@ export async function generateAndSaveAllAudioWithDialog({
 
   if (successArray.length === result?.length) {
     // "今後この通知をしない" 有効時
-    if (confirmedTips.notifyOnGenerateAudio) return;
+    if (notifyOnGenerateAudio) return;
 
     // 書き出し成功時に通知をする
     quasarNotify({
@@ -174,9 +169,8 @@ export async function generateAndSaveAllAudioWithDialog({
           label: "今後この通知をしない",
           textColor: "toast-button-display",
           handler: () => {
-            dispatch("SET_CONFIRMED_TIPS", {
-              confirmedTips: {
-                ...confirmedTips,
+            dispatch("SET_CONFIRMED_TIP", {
+              confirmedTip: {
                 notifyOnGenerateAudio: true,
               },
             });
@@ -204,14 +198,14 @@ export async function generateAndConnectAndSaveAudioWithDialog({
   dispatch,
   filePath,
   encoding,
-  confirmedTips,
+  notifyOnGenerateAudio,
 }: {
   quasarDialog: QuasarDialog;
   quasarNotify: QuasarNotify;
   dispatch: Dispatch<AllActions>;
   filePath?: string;
   encoding?: EncodingType;
-  confirmedTips: ConfirmedTips;
+  notifyOnGenerateAudio: boolean;
 }): Promise<void> {
   const result = await withProgress(
     dispatch("GENERATE_AND_CONNECT_AND_SAVE_AUDIO", {
@@ -227,7 +221,7 @@ export async function generateAndConnectAndSaveAudioWithDialog({
 
   if (result.result === "SUCCESS") {
     // "今後この通知をしない" 有効時
-    if (confirmedTips.notifyOnGenerateAudio) return;
+    if (notifyOnGenerateAudio) return;
 
     // 書き出し成功時に通知をする
     quasarNotify({
@@ -241,9 +235,8 @@ export async function generateAndConnectAndSaveAudioWithDialog({
           label: "今後この通知をしない",
           textColor: "toast-button-display",
           handler: () => {
-            dispatch("SET_CONFIRMED_TIPS", {
-              confirmedTips: {
-                ...confirmedTips,
+            dispatch("SET_CONFIRMED_TIP", {
+              confirmedTip: {
                 notifyOnGenerateAudio: true,
               },
             });
@@ -290,14 +283,14 @@ export async function connectAndExportTextWithDialog({
   dispatch,
   filePath,
   encoding,
-  confirmedTips,
+  notifyOnGenerateAudio,
 }: {
   quasarDialog: QuasarDialog;
   quasarNotify: QuasarNotify;
   dispatch: Dispatch<AllActions>;
   filePath?: string;
   encoding?: EncodingType;
-  confirmedTips: ConfirmedTips;
+  notifyOnGenerateAudio: boolean;
 }): Promise<void> {
   const result = await dispatch("CONNECT_AND_EXPORT_TEXT", {
     filePath,
@@ -308,7 +301,7 @@ export async function connectAndExportTextWithDialog({
 
   if (result.result === "SUCCESS") {
     // "今後この通知をしない" 有効時
-    if (confirmedTips.notifyOnGenerateAudio) return;
+    if (notifyOnGenerateAudio) return;
 
     // 書き出し成功時に通知をする
     quasarNotify({
@@ -322,9 +315,8 @@ export async function connectAndExportTextWithDialog({
           label: "今後この通知をしない",
           textColor: "toast-button-display",
           handler: () => {
-            dispatch("SET_CONFIRMED_TIPS", {
-              confirmedTips: {
-                ...confirmedTips,
+            dispatch("SET_CONFIRMED_TIP", {
+              confirmedTip: {
                 notifyOnGenerateAudio: true,
               },
             });

diff --git a/src/components/HeaderBar.vue b/src/components/HeaderBar.vue
@@ -138,7 +138,7 @@ const generateAndSaveOneAudio = async () => {
     quasarNotify: $q.notify,
     dispatch: store.dispatch,
     encoding: store.state.savingSetting.fileEncoding,
-    confirmedTips: store.state.confirmedTips,
+    notifyOnGenerateAudio: store.state.confirmedTips.notifyOnGenerateAudio,
   });
 };
 const generateAndSaveAllAudio = async () => {
@@ -147,7 +147,7 @@ const generateAndSaveAllAudio = async () => {
     quasarNotify: $q.notify,
     dispatch: store.dispatch,
     encoding: store.state.savingSetting.fileEncoding,
-    confirmedTips: store.state.confirmedTips,
+    notifyOnGenerateAudio: store.state.confirmedTips.notifyOnGenerateAudio,
   });
 };
 const generateAndConnectAndSaveAudio = async () => {
@@ -156,7 +156,7 @@ const generateAndConnectAndSaveAudio = async () => {
     dispatch: store.dispatch,
     quasarNotify: $q.notify,
     encoding: store.state.savingSetting.fileEncoding,
-    confirmedTips: store.state.confirmedTips,
+    notifyOnGenerateAudio: store.state.confirmedTips.notifyOnGenerateAudio,
   });
 };
 const saveProject = async () => {

diff --git a/src/components/MenuBar.vue b/src/components/MenuBar.vue
@@ -132,7 +132,7 @@ const generateAndSaveAllAudio = async () => {
   if (!uiLocked.value) {
     await generateAndSaveAllAudioWithDialog({
       encoding: store.state.savingSetting.fileEncoding,
-      confirmedTips: store.state.confirmedTips,
+      notifyOnGenerateAudio: store.state.confirmedTips.notifyOnGenerateAudio,
       quasarDialog: $q.dialog,
       quasarNotify: $q.notify,
       dispatch: store.dispatch,
@@ -147,7 +147,7 @@ const generateAndConnectAndSaveAllAudio = async () => {
       quasarNotify: $q.notify,
       dispatch: store.dispatch,
       encoding: store.state.savingSetting.fileEncoding,
-      confirmedTips: store.state.confirmedTips,
+      notifyOnGenerateAudio: store.state.confirmedTips.notifyOnGenerateAudio,
     });
   }
 };
@@ -174,7 +174,7 @@ const generateAndSaveOneAudio = async () => {
     encoding: store.state.savingSetting.fileEncoding,
     quasarDialog: $q.dialog,
     quasarNotify: $q.notify,
-    confirmedTips: store.state.confirmedTips,
+    notifyOnGenerateAudio: store.state.confirmedTips.notifyOnGenerateAudio,
     dispatch: store.dispatch,
   });
 };
@@ -186,7 +186,7 @@ const connectAndExportText = async () => {
       quasarNotify: $q.notify,
       dispatch: store.dispatch,
       encoding: store.state.savingSetting.fileEncoding,
-      confirmedTips: store.state.confirmedTips,
+      notifyOnGenerateAudio: store.state.confirmedTips.notifyOnGenerateAudio,
     });
   }
 };

diff --git a/src/store/setting.ts b/src/store/setting.ts
@@ -348,6 +348,19 @@ export const settingStore = createPartialStore<SettingStoreTypes>({
     },
   },
 
+  SET_CONFIRMED_TIP: {
+    action({ state, dispatch }, { confirmedTip }) {
+      const confirmedTips = {
+        ...state.confirmedTips,
+        ...confirmedTip,
+      };
+
+      dispatch("SET_CONFIRMED_TIPS", {
+        confirmedTips: confirmedTips as ConfirmedTips,
+      });
+    },
+  },
+
   RESET_CONFIRMED_TIPS: {
     async action({ state, dispatch }) {
       const confirmedTips: { [key: string]: boolean } = {

diff --git a/src/store/type.ts b/src/store/type.ts
@@ -1090,6 +1090,10 @@ export type SettingStoreTypes = {
     action(payload: { confirmedTips: ConfirmedTips }): void;
   };
 
+  SET_CONFIRMED_TIP: {
+    action(payload: { confirmedTip: Partial<ConfirmedTips> }): void;
+  };
+
   RESET_CONFIRMED_TIPS: {
     action(): void;
   };