diff --git a/src-ui/app/config_page/topbar/section_title_box/SectionTitleBox.jsx b/src-ui/app/config_page/topbar/section_title_box/SectionTitleBox.jsx
index ff4d9292..53bb6b16 100644
--- a/src-ui/app/config_page/topbar/section_title_box/SectionTitleBox.jsx
+++ b/src-ui/app/config_page/topbar/section_title_box/SectionTitleBox.jsx
@@ -7,7 +7,7 @@ export const SectionTitleBox = () => {
const { currentSelectedConfigTabId } = useStore_SelectedConfigTabId();
return (
-
{t(`config_page.side_menu_labels.${currentSelectedConfigTabId}`)}
+
{t(`config_page.side_menu_labels.${currentSelectedConfigTabId.data}`)}
);
};
\ No newline at end of file
diff --git a/src-ui/app/main_page/MainPage.jsx b/src-ui/app/main_page/MainPage.jsx
index 037b53aa..2a563fd6 100644
--- a/src-ui/app/main_page/MainPage.jsx
+++ b/src-ui/app/main_page/MainPage.jsx
@@ -9,8 +9,8 @@ export const MainPage = () => {
return (
diff --git a/src-ui/app/main_page/main_section/MainSection.jsx b/src-ui/app/main_page/main_section/MainSection.jsx
index 8ca35c1b..fc6d5021 100644
--- a/src-ui/app/main_page/main_section/MainSection.jsx
+++ b/src-ui/app/main_page/main_section/MainSection.jsx
@@ -28,10 +28,10 @@ const HandleLanguageSelector = () => {
setSelectedTargetLanguages,
} = useLanguageSettings();
- if (currentIsOpenedLanguageSelector.your_language === true) {
+ if (currentIsOpenedLanguageSelector.data.your_language === true) {
const onclickFunction_YourLanguage = (payload) => setSelectedYourLanguages(payload);
return
;
- } else if (currentIsOpenedLanguageSelector.target_language === true) {
+ } else if (currentIsOpenedLanguageSelector.data.target_language === true) {
const onclickFunction_TargetLanguage = (payload) => setSelectedTargetLanguages(payload);
return ;
} else {
diff --git a/src-ui/app/main_page/main_section/language_selector/LanguageSelector.jsx b/src-ui/app/main_page/main_section/language_selector/LanguageSelector.jsx
index 3ee86c84..3f956590 100644
--- a/src-ui/app/main_page/main_section/language_selector/LanguageSelector.jsx
+++ b/src-ui/app/main_page/main_section/language_selector/LanguageSelector.jsx
@@ -27,7 +27,7 @@ export const LanguageSelector = ({ id, onClickFunction }) => {
}, {});
};
- const groupedLanguages = groupLanguagesByFirstLetter(currentSelectableLanguageList);
+ const groupedLanguages = groupLanguagesByFirstLetter(currentSelectableLanguageList.data);
return (
diff --git a/src-ui/app/main_page/main_section/message_container/log_box/LogBox.jsx b/src-ui/app/main_page/main_section/message_container/log_box/LogBox.jsx
index 4c0c6962..b04ef63b 100644
--- a/src-ui/app/main_page/main_section/message_container/log_box/LogBox.jsx
+++ b/src-ui/app/main_page/main_section/message_container/log_box/LogBox.jsx
@@ -1,20 +1,22 @@
import { useEffect, useLayoutEffect, useRef, useState } from "react";
import styles from "./LogBox.module.scss";
-import { useStore_MessageLogs, store } from "@store";
+import { store } from "@store";
import { MessageContainer } from "./message_container/MessageContainer";
import { scrollToBottom } from "@utils/scrollToBottom";
+import { useMessage } from "@logics_common/useMessage";
export const LogBox = () => {
- const { currentMessageLogs } = useStore_MessageLogs();
+ const { currentMessageLogs } = useMessage();
const log_container_ref = useRef(null);
const [is_scrolling, setIsScrolling] = useState(false);
+
useLayoutEffect(() => {
store.log_box_ref = log_container_ref;
if (!is_scrolling) {
scrollToBottom(store.log_box_ref, true);
}
- }, [currentMessageLogs]);
+ }, [currentMessageLogs.data]);
useEffect(() => {
const handleScroll = () => {
@@ -39,7 +41,7 @@ export const LogBox = () => {
return (
- {currentMessageLogs.map(message_data => (
+ {currentMessageLogs.data.map(message_data => (
))}
diff --git a/src-ui/app/main_page/main_section/top_bar/sidebar_compact_mode_button/SidebarCompactModeButton.jsx b/src-ui/app/main_page/main_section/top_bar/sidebar_compact_mode_button/SidebarCompactModeButton.jsx
index 0ad2be9e..f275e3c2 100644
--- a/src-ui/app/main_page/main_section/top_bar/sidebar_compact_mode_button/SidebarCompactModeButton.jsx
+++ b/src-ui/app/main_page/main_section/top_bar/sidebar_compact_mode_button/SidebarCompactModeButton.jsx
@@ -8,11 +8,11 @@ export const SidebarCompactModeButton = () => {
const { updateIsMainPageCompactMode, currentIsMainPageCompactMode } = useStore_IsMainPageCompactMode();
const toggleCompactMode = () => {
- updateIsMainPageCompactMode(!currentIsMainPageCompactMode);
+ updateIsMainPageCompactMode(!currentIsMainPageCompactMode.data);
};
const class_names = clsx(styles["arrow_left_svg"], {
- [styles["reverse"]]: currentIsMainPageCompactMode
+ [styles["reverse"]]: currentIsMainPageCompactMode.data
});
return (
diff --git a/src-ui/app/main_page/sidebar_section/SidebarSection.jsx b/src-ui/app/main_page/sidebar_section/SidebarSection.jsx
index 64e7c7ba..ac607a6a 100644
--- a/src-ui/app/main_page/sidebar_section/SidebarSection.jsx
+++ b/src-ui/app/main_page/sidebar_section/SidebarSection.jsx
@@ -11,12 +11,12 @@ import { OpenSettings } from "./open_settings/OpenSettings";
export const SidebarSection = () => {
const { currentIsMainPageCompactMode } = useStore_IsMainPageCompactMode();
const container_class_name = clsx(styles.container, {
- [styles.is_compact_mode]: currentIsMainPageCompactMode
+ [styles.is_compact_mode]: currentIsMainPageCompactMode.data
});
const { currentIsOpenedLanguageSelector } = useStore_IsOpenedLanguageSelector();
const scroll_container_class_names = clsx(styles.scroll_container, {
- [styles.is_opened]: (currentIsOpenedLanguageSelector.your_language === true || currentIsOpenedLanguageSelector.target_language === true)
+ [styles.is_opened]: (currentIsOpenedLanguageSelector.data.your_language === true || currentIsOpenedLanguageSelector.data.target_language === true)
});
return (
@@ -24,7 +24,7 @@ export const SidebarSection = () => {
- {!currentIsMainPageCompactMode && }
+ {!currentIsMainPageCompactMode.data && }
{t("main_page.translator")}:
{selected_translator_name}
- {currentIsOpenedTranslatorSelector &&
+ {currentIsOpenedTranslatorSelector.data &&
{
const { currentIsMainPageCompactMode } = useStore_IsMainPageCompactMode();
- if (currentIsMainPageCompactMode === true) {
+ if (currentIsMainPageCompactMode.data === true) {
return 
;
} else {
return 
;
diff --git a/src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.jsx b/src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.jsx
index 9505b56d..7e92a574 100644
--- a/src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.jsx
+++ b/src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.jsx
@@ -77,9 +77,9 @@ export const SwitchContainer = ({ switchLabel, switch_id, children, currentState
const { currentIsMainPageCompactMode } = useStore_IsMainPageCompactMode();
const getClassNames = (baseClass) => clsx(baseClass, {
- [styles.is_compact_mode]: currentIsMainPageCompactMode,
+ [styles.is_compact_mode]: currentIsMainPageCompactMode.data,
[styles.is_active]: (currentState.data === true),
- [styles.is_loading]: (currentState.state === "loading"),
+ [styles.is_loading]: (currentState.state === "pending"),
[styles.is_hovered]: is_hovered,
[styles.is_mouse_down]: is_mouse_down,
});
@@ -108,7 +108,7 @@ export const SwitchContainer = ({ switchLabel, switch_id, children, currentState
- {(currentState.state === "loading")
+ {(currentState.state === "pending")
?
: null
}
diff --git a/src-ui/logics/common/useMessage.js b/src-ui/logics/common/useMessage.js
index 3773e0ba..944c40b7 100644
--- a/src-ui/logics/common/useMessage.js
+++ b/src-ui/logics/common/useMessage.js
@@ -71,8 +71,8 @@ const generateMessageObject = (data, category) => {
};
-const updateItemById = (id, translated_data) => (prev_items) => {
- return prev_items.map(item => {
+const updateItemById = (id, translated_data) => (current_items) => {
+ return current_items.data.map(item => {
if (item.id === id) {
item.status = "ok";
item.messages.translated = translated_data;
diff --git a/src-ui/logics/common/useVolume.js b/src-ui/logics/common/useVolume.js
index 974b822b..3ed45538 100644
--- a/src-ui/logics/common/useVolume.js
+++ b/src-ui/logics/common/useVolume.js
@@ -11,17 +11,24 @@ export const useVolume = () => {
const { asyncStdoutToPython } = useStdoutToPython();
const { updateMicVolume } = useStore_MicVolume();
const { updateSpeakerVolume } = useStore_SpeakerVolume();
- const { currentMicThresholdCheckStatus, updateMicThresholdCheckStatus } = useStore_MicThresholdCheckStatus();
- const { currentSpeakerThresholdCheckStatus, updateSpeakerThresholdCheckStatus } = useStore_SpeakerThresholdCheckStatus();
+ const {
+ currentMicThresholdCheckStatus,
+ updateMicThresholdCheckStatus,
+ pendingMicThresholdCheckStatus,
+ } = useStore_MicThresholdCheckStatus();
+ const {
+ currentSpeakerThresholdCheckStatus,
+ updateSpeakerThresholdCheckStatus,
+ pendingSpeakerThresholdCheckStatus,
+ } = useStore_SpeakerThresholdCheckStatus();
- const asyncPending = () => new Promise(() => {});
return {
volumeCheckStart_Mic: () => {
- updateMicThresholdCheckStatus(asyncPending);
+ pendingMicThresholdCheckStatus();
asyncStdoutToPython("/set/enable_check_mic_threshold");
},
volumeCheckStop_Mic: () => {
- updateMicThresholdCheckStatus(asyncPending);
+ pendingMicThresholdCheckStatus();
asyncStdoutToPython("/set/disable_check_mic_threshold");
},
updateVolumeVariable_Mic: (payload) => {
@@ -35,11 +42,11 @@ export const useVolume = () => {
volumeCheckStart_Speaker: () => {
updateSpeakerVolume("0");
- updateSpeakerThresholdCheckStatus(asyncPending);
+ pendingSpeakerThresholdCheckStatus();
asyncStdoutToPython("/set/enable_check_speaker_threshold");
},
volumeCheckStop_Speaker: () => {
- updateSpeakerThresholdCheckStatus(asyncPending);
+ pendingSpeakerThresholdCheckStatus();
asyncStdoutToPython("/set/disable_check_speaker_threshold");
},
updateVolumeVariable_Speaker: (payload) => {
diff --git a/src-ui/logics/configs/useEnableAutoClearMessageBox.js b/src-ui/logics/configs/useEnableAutoClearMessageBox.js
index c489ce99..eddee3f9 100644
--- a/src-ui/logics/configs/useEnableAutoClearMessageBox.js
+++ b/src-ui/logics/configs/useEnableAutoClearMessageBox.js
@@ -3,15 +3,15 @@ import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useEnableAutoClearMessageBox = () => {
const { asyncStdoutToPython } = useStdoutToPython();
- const { currentEnableAutoClearMessageBox, updateEnableAutoClearMessageBox } = useStore_EnableAutoClearMessageBox();
+ const { currentEnableAutoClearMessageBox, updateEnableAutoClearMessageBox, pendingEnableAutoClearMessageBox } = useStore_EnableAutoClearMessageBox();
const getEnableAutoClearMessageBox = () => {
- updateEnableAutoClearMessageBox(() => new Promise(() => {}));
+ pendingEnableAutoClearMessageBox();
asyncStdoutToPython("/get/auto_clear_message_box");
};
const toggleEnableAutoClearMessageBox = () => {
- updateEnableAutoClearMessageBox(() => new Promise(() => {}));
+ pendingEnableAutoClearMessageBox();
if (currentEnableAutoClearMessageBox.data) {
asyncStdoutToPython("/set/disable_auto_clear_message_box");
} else {
diff --git a/src-ui/logics/configs/useEnableAutoMicSelect.js b/src-ui/logics/configs/useEnableAutoMicSelect.js
index 811adf8c..6a87eed0 100644
--- a/src-ui/logics/configs/useEnableAutoMicSelect.js
+++ b/src-ui/logics/configs/useEnableAutoMicSelect.js
@@ -3,15 +3,15 @@ import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useEnableAutoMicSelect = () => {
const { asyncStdoutToPython } = useStdoutToPython();
- const { currentEnableAutoMicSelect, updateEnableAutoMicSelect } = useStore_EnableAutoMicSelect();
+ const { currentEnableAutoMicSelect, updateEnableAutoMicSelect, pendingEnableAutoMicSelect } = useStore_EnableAutoMicSelect();
const getEnableAutoMicSelect = () => {
- updateEnableAutoMicSelect(() => new Promise(() => {}));
+ pendingEnableAutoMicSelect();
asyncStdoutToPython("/get/auto_mic_select");
};
const toggleEnableAutoMicSelect = () => {
- updateEnableAutoMicSelect(() => new Promise(() => {}));
+ pendingEnableAutoMicSelect();
if (currentEnableAutoMicSelect.data) {
asyncStdoutToPython("/set/disable_auto_mic_select");
} else {
diff --git a/src-ui/logics/configs/useEnableAutoSpeakerSelect.js b/src-ui/logics/configs/useEnableAutoSpeakerSelect.js
index 2512fd55..59dfdcfa 100644
--- a/src-ui/logics/configs/useEnableAutoSpeakerSelect.js
+++ b/src-ui/logics/configs/useEnableAutoSpeakerSelect.js
@@ -3,15 +3,15 @@ import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useEnableAutoSpeakerSelect = () => {
const { asyncStdoutToPython } = useStdoutToPython();
- const { currentEnableAutoSpeakerSelect, updateEnableAutoSpeakerSelect } = useStore_EnableAutoSpeakerSelect();
+ const { currentEnableAutoSpeakerSelect, updateEnableAutoSpeakerSelect, pendingEnableAutoSpeakerSelect } = useStore_EnableAutoSpeakerSelect();
const getEnableAutoSpeakerSelect = () => {
- updateEnableAutoSpeakerSelect(() => new Promise(() => {}));
+ pendingEnableAutoSpeakerSelect();
asyncStdoutToPython("/get/auto_speaker_select");
};
const toggleEnableAutoSpeakerSelect = () => {
- updateEnableAutoSpeakerSelect(() => new Promise(() => {}));
+ pendingEnableAutoSpeakerSelect();
if (currentEnableAutoSpeakerSelect.data) {
asyncStdoutToPython("/set/disable_auto_speaker_select");
} else {
diff --git a/src-ui/logics/configs/useMicDeviceList.js b/src-ui/logics/configs/useMicDeviceList.js
index 4616d69d..93a8c196 100644
--- a/src-ui/logics/configs/useMicDeviceList.js
+++ b/src-ui/logics/configs/useMicDeviceList.js
@@ -3,10 +3,10 @@ import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useMicDeviceList = () => {
const { asyncStdoutToPython } = useStdoutToPython();
- const { currentMicDeviceList, updateMicDeviceList } = useStore_MicDeviceList();
+ const { currentMicDeviceList, updateMicDeviceList, pendingMicDeviceList } = useStore_MicDeviceList();
const getMicDeviceList = () => {
- updateMicDeviceList(() => new Promise(() => {}));
+ pendingMicDeviceList();
asyncStdoutToPython("/get/list_mic_device");
};
diff --git a/src-ui/logics/configs/useMicHostList.js b/src-ui/logics/configs/useMicHostList.js
index 3595cff5..6d15eb49 100644
--- a/src-ui/logics/configs/useMicHostList.js
+++ b/src-ui/logics/configs/useMicHostList.js
@@ -3,10 +3,10 @@ import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useMicHostList = () => {
const { asyncStdoutToPython } = useStdoutToPython();
- const { currentMicHostList, updateMicHostList } = useStore_MicHostList();
+ const { currentMicHostList, updateMicHostList, pendingMicHostList } = useStore_MicHostList();
const getMicHostList = () => {
- updateMicHostList(() => new Promise(() => {}));
+ pendingMicHostList();
asyncStdoutToPython("/get/list_mic_host");
};
diff --git a/src-ui/logics/configs/useMicThreshold.js b/src-ui/logics/configs/useMicThreshold.js
index 0ac383e4..a8e2ceec 100644
--- a/src-ui/logics/configs/useMicThreshold.js
+++ b/src-ui/logics/configs/useMicThreshold.js
@@ -4,7 +4,7 @@ import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useMicThreshold = () => {
const { asyncStdoutToPython } = useStdoutToPython();
const { updateMicThreshold, currentMicThreshold } = useStore_MicThreshold();
- const { updateEnableAutomaticMicThreshold, currentEnableAutomaticMicThreshold } = useStore_EnableAutomaticMicThreshold();
+ const { updateEnableAutomaticMicThreshold, currentEnableAutomaticMicThreshold, pendingEnableAutomaticMicThreshold } = useStore_EnableAutomaticMicThreshold();
const getMicThreshold = () => {
asyncStdoutToPython("/get/mic_energy_threshold");
@@ -15,12 +15,12 @@ export const useMicThreshold = () => {
};
const getEnableAutomaticMicThreshold = () => {
- updateEnableAutomaticMicThreshold(() => new Promise(() => {}));
+ pendingEnableAutomaticMicThreshold();
asyncStdoutToPython("/get/mic_dynamic_energy_threshold");
};
const toggleEnableAutomaticMicThreshold = () => {
- updateEnableAutomaticMicThreshold(() => new Promise(() => {}));
+ pendingEnableAutomaticMicThreshold();
if (currentEnableAutomaticMicThreshold.data) {
asyncStdoutToPython("/set/disable_mic_dynamic_energy_threshold");
} else {
diff --git a/src-ui/logics/configs/useSelectedMicDevice.js b/src-ui/logics/configs/useSelectedMicDevice.js
index 8639faaa..c4df9a13 100644
--- a/src-ui/logics/configs/useSelectedMicDevice.js
+++ b/src-ui/logics/configs/useSelectedMicDevice.js
@@ -3,15 +3,15 @@ import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useSelectedMicDevice = () => {
const { asyncStdoutToPython } = useStdoutToPython();
- const { currentSelectedMicDevice, updateSelectedMicDevice } = useStore_SelectedMicDevice();
+ const { currentSelectedMicDevice, updateSelectedMicDevice, pendingSelectedMicDevice } = useStore_SelectedMicDevice();
const getSelectedMicDevice = () => {
- updateSelectedMicDevice(() => new Promise(() => {}));
+ pendingSelectedMicDevice();
asyncStdoutToPython("/get/selected_mic_device");
};
const setSelectedMicDevice = (selected_mic_device) => {
- updateSelectedMicDevice(() => new Promise(() => {}));
+ pendingSelectedMicDevice();
asyncStdoutToPython("/set/selected_mic_device", selected_mic_device);
};
diff --git a/src-ui/logics/configs/useSelectedMicHost.js b/src-ui/logics/configs/useSelectedMicHost.js
index 97ad8e00..4016e68b 100644
--- a/src-ui/logics/configs/useSelectedMicHost.js
+++ b/src-ui/logics/configs/useSelectedMicHost.js
@@ -3,15 +3,15 @@ import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useSelectedMicHost = () => {
const { asyncStdoutToPython } = useStdoutToPython();
- const { currentSelectedMicHost, updateSelectedMicHost } = useStore_SelectedMicHost();
+ const { currentSelectedMicHost, updateSelectedMicHost, pendingSelectedMicHost } = useStore_SelectedMicHost();
const getSelectedMicHost = () => {
- updateSelectedMicHost(() => new Promise(() => {}));
+ pendingSelectedMicHost();
asyncStdoutToPython("/get/selected_mic_host");
};
const setSelectedMicHost = (selected_mic_host) => {
- updateSelectedMicHost(() => new Promise(() => {}));
+ pendingSelectedMicHost();
asyncStdoutToPython("/set/selected_mic_host", selected_mic_host);
};
diff --git a/src-ui/logics/configs/useSelectedSpeakerDevice.js b/src-ui/logics/configs/useSelectedSpeakerDevice.js
index 00053873..3b733f17 100644
--- a/src-ui/logics/configs/useSelectedSpeakerDevice.js
+++ b/src-ui/logics/configs/useSelectedSpeakerDevice.js
@@ -3,15 +3,15 @@ import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useSelectedSpeakerDevice = () => {
const { asyncStdoutToPython } = useStdoutToPython();
- const { currentSelectedSpeakerDevice, updateSelectedSpeakerDevice } = useStore_SelectedSpeakerDevice();
+ const { currentSelectedSpeakerDevice, updateSelectedSpeakerDevice, pendingSelectedSpeakerDevice } = useStore_SelectedSpeakerDevice();
const getSelectedSpeakerDevice = () => {
- updateSelectedSpeakerDevice(() => new Promise(() => {}));
+ pendingSelectedSpeakerDevice();
asyncStdoutToPython("/get/selected_speaker_device");
};
const setSelectedSpeakerDevice = (selected_speaker_device) => {
- updateSelectedSpeakerDevice(() => new Promise(() => {}));
+ pendingSelectedSpeakerDevice();
asyncStdoutToPython("/set/selected_speaker_device", selected_speaker_device);
};
diff --git a/src-ui/logics/configs/useSendMessageButtonType.js b/src-ui/logics/configs/useSendMessageButtonType.js
index 13e5be74..8d873254 100644
--- a/src-ui/logics/configs/useSendMessageButtonType.js
+++ b/src-ui/logics/configs/useSendMessageButtonType.js
@@ -3,15 +3,15 @@ import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useSendMessageButtonType = () => {
const { asyncStdoutToPython } = useStdoutToPython();
- const { currentSendMessageButtonType, updateSendMessageButtonType } = useStore_SendMessageButtonType();
+ const { currentSendMessageButtonType, updateSendMessageButtonType, pendingSendMessageButtonType } = useStore_SendMessageButtonType();
const getSendMessageButtonType = () => {
- updateSendMessageButtonType(() => new Promise(() => {}));
+ pendingSendMessageButtonType();
asyncStdoutToPython("/get/send_message_button_type");
};
const setSendMessageButtonType = (selected_type) => {
- updateSendMessageButtonType(() => new Promise(() => {}));
+ pendingSendMessageButtonType();
asyncStdoutToPython("/set/send_message_button_type", selected_type);
};
diff --git a/src-ui/logics/configs/useSoftwareVersion.js b/src-ui/logics/configs/useSoftwareVersion.js
index 1731160b..91812be9 100644
--- a/src-ui/logics/configs/useSoftwareVersion.js
+++ b/src-ui/logics/configs/useSoftwareVersion.js
@@ -3,10 +3,10 @@ import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useSoftwareVersion = () => {
const { asyncStdoutToPython } = useStdoutToPython();
- const { currentSoftwareVersion, updateSoftwareVersion } = useStore_SoftwareVersion();
+ const { currentSoftwareVersion, updateSoftwareVersion, pendingSoftwareVersion } = useStore_SoftwareVersion();
const getSoftwareVersion = () => {
- updateSoftwareVersion(() => new Promise(() => {}));
+ pendingSoftwareVersion();
asyncStdoutToPython("/get/version");
};
diff --git a/src-ui/logics/configs/useSpeakerDeviceList.js b/src-ui/logics/configs/useSpeakerDeviceList.js
index faf191b3..d3d8f140 100644
--- a/src-ui/logics/configs/useSpeakerDeviceList.js
+++ b/src-ui/logics/configs/useSpeakerDeviceList.js
@@ -3,10 +3,10 @@ import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useSpeakerDeviceList = () => {
const { asyncStdoutToPython } = useStdoutToPython();
- const { currentSpeakerDeviceList, updateSpeakerDeviceList } = useStore_SpeakerDeviceList();
+ const { currentSpeakerDeviceList, updateSpeakerDeviceList, pendingSpeakerDeviceList } = useStore_SpeakerDeviceList();
const getSpeakerDeviceList = () => {
- updateSpeakerDeviceList(() => new Promise(() => {}));
+ pendingSpeakerDeviceList();
asyncStdoutToPython("/get/list_speaker_device");
};
diff --git a/src-ui/logics/configs/useSpeakerThreshold.js b/src-ui/logics/configs/useSpeakerThreshold.js
index fab741ae..4049b817 100644
--- a/src-ui/logics/configs/useSpeakerThreshold.js
+++ b/src-ui/logics/configs/useSpeakerThreshold.js
@@ -4,7 +4,7 @@ import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useSpeakerThreshold = () => {
const { asyncStdoutToPython } = useStdoutToPython();
const { updateSpeakerThreshold, currentSpeakerThreshold } = useStore_SpeakerThreshold();
- const { updateEnableAutomaticSpeakerThreshold, currentEnableAutomaticSpeakerThreshold } = useStore_EnableAutomaticSpeakerThreshold();
+ const { updateEnableAutomaticSpeakerThreshold, currentEnableAutomaticSpeakerThreshold, pendingEnableAutomaticSpeakerThreshold } = useStore_EnableAutomaticSpeakerThreshold();
const getSpeakerThreshold = () => {
asyncStdoutToPython("/get/speaker_energy_threshold");
@@ -15,12 +15,12 @@ export const useSpeakerThreshold = () => {
};
const getEnableAutomaticSpeakerThreshold = () => {
- updateEnableAutomaticSpeakerThreshold(() => new Promise(() => {}));
+ pendingEnableAutomaticSpeakerThreshold();
asyncStdoutToPython("/get/speaker_dynamic_energy_threshold");
};
const toggleEnableAutomaticSpeakerThreshold = () => {
- updateEnableAutomaticSpeakerThreshold(() => new Promise(() => {}));
+ pendingEnableAutomaticSpeakerThreshold();
if (currentEnableAutomaticSpeakerThreshold.data) {
asyncStdoutToPython("/set/disable_speaker_dynamic_energy_threshold");
} else {
diff --git a/src-ui/logics/configs/useUiLanguage.js b/src-ui/logics/configs/useUiLanguage.js
index 671d314b..cd45e6e1 100644
--- a/src-ui/logics/configs/useUiLanguage.js
+++ b/src-ui/logics/configs/useUiLanguage.js
@@ -3,15 +3,15 @@ import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useUiLanguage = () => {
const { asyncStdoutToPython } = useStdoutToPython();
- const { currentUiLanguage, updateUiLanguage } = useStore_UiLanguage();
+ const { currentUiLanguage, updateUiLanguage, pendingUiLanguage } = useStore_UiLanguage();
const getUiLanguage = () => {
- updateUiLanguage(() => new Promise(() => {}));
+ pendingUiLanguage();
asyncStdoutToPython("/get/ui_language");
};
const setUiLanguage = (selected_ui_language) => {
- updateUiLanguage(() => new Promise(() => {}));
+ pendingUiLanguage();
asyncStdoutToPython("/set/ui_language", selected_ui_language);
};
diff --git a/src-ui/logics/main/useLanguageSettings.js b/src-ui/logics/main/useLanguageSettings.js
index d38df69d..64d3213c 100644
--- a/src-ui/logics/main/useLanguageSettings.js
+++ b/src-ui/logics/main/useLanguageSettings.js
@@ -3,37 +3,61 @@ import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useLanguageSettings = () => {
const { asyncStdoutToPython } = useStdoutToPython();
- const { currentEnableMultiTranslation, updateEnableMultiTranslation } = useStore_EnableMultiTranslation();
- const { currentSelectedYourLanguages, updateSelectedYourLanguages } = useStore_SelectedYourLanguages();
- const { currentSelectedTargetLanguages, updateSelectedTargetLanguages } = useStore_SelectedTargetLanguages();
- const { currentSelectedPresetTabNumber, updateSelectedPresetTabNumber } = useStore_SelectedPresetTabNumber();
- const { currentTranslationEngines, updateTranslationEngines } = useStore_TranslationEngines();
- const { currentSelectedTranslationEngines, updateSelectedTranslationEngines } = useStore_SelectedTranslationEngines();
+ const {
+ currentEnableMultiTranslation,
+ updateEnableMultiTranslation,
+ pendingEnableMultiTranslation,
+ } = useStore_EnableMultiTranslation();
+ const {
+ currentSelectedYourLanguages,
+ updateSelectedYourLanguages,
+ pendingSelectedYourLanguages,
+ } = useStore_SelectedYourLanguages();
+ const {
+ currentSelectedTargetLanguages,
+ updateSelectedTargetLanguages,
+ pendingSelectedTargetLanguages,
+ } = useStore_SelectedTargetLanguages();
+ const {
+ currentSelectedPresetTabNumber,
+ updateSelectedPresetTabNumber,
+ pendingSelectedPresetTabNumber,
+ } = useStore_SelectedPresetTabNumber();
+ const {
+ currentTranslationEngines,
+ updateTranslationEngines,
+ pendingTranslationEngines,
+ } = useStore_TranslationEngines();
+ const {
+ currentSelectedTranslationEngines,
+ updateSelectedTranslationEngines,
+ pendingSelectedTranslationEngines,
+ } = useStore_SelectedTranslationEngines();
const getEnableMultiTranslation = () => {
- updateEnableMultiTranslation(() => new Promise(() => {}));
+ pendingEnableMultiTranslation();
asyncStdoutToPython("/get/multi_language_translation");
};
const getSelectedPresetTabNumber = () => {
- updateSelectedPresetTabNumber(() => new Promise(() => {}));
+ pendingSelectedPresetTabNumber();
asyncStdoutToPython("/get/selected_tab_no");
};
const setSelectedPresetTabNumber = (preset_number) => {
- updateSelectedPresetTabNumber(() => new Promise(() => {}));
+ pendingSelectedPresetTabNumber();
asyncStdoutToPython("/set/selected_tab_no", preset_number);
};
const getSelectedYourLanguages = () => {
- updateSelectedYourLanguages(() => new Promise(() => {}));
+ pendingSelectedPresetTabNumber();
asyncStdoutToPython("/get/selected_your_languages");
};
const setSelectedYourLanguages = (selected_language_data) => {
- // updateSelectedYourLanguages(() => new Promise(() => {}));
+ pendingSelectedYourLanguages();
const send_obj = {
...currentSelectedYourLanguages.data,
[currentSelectedPresetTabNumber.data]: {
@@ -48,12 +72,12 @@ export const useLanguageSettings = () => {
const getSelectedTargetLanguages = () => {
- updateSelectedTargetLanguages(() => new Promise(() => {}));
+ pendingSelectedTargetLanguages();
asyncStdoutToPython("/get/selected_target_languages");
};
const setSelectedTargetLanguages = (selected_language_data) => {
- // updateSelectedTargetLanguages(() => new Promise(() => {}));
+ pendingSelectedTargetLanguages();
let send_obj = currentSelectedTargetLanguages.data;
send_obj[currentSelectedPresetTabNumber.data].primary.language = selected_language_data.language,
@@ -64,21 +88,19 @@ export const useLanguageSettings = () => {
const getTranslationEngines = () => {
- updateTranslationEngines(() => new Promise(() => {}));
+ pendingTranslationEngines();
asyncStdoutToPython("/get/list_translation_engines");
};
const getSelectedTranslationEngines = () => {
- updateSelectedTranslationEngines(() => new Promise(() => {}));
+ pendingSelectedTranslationEngines();
asyncStdoutToPython("/get/selected_translator_engines");
};
const setSelectedTranslationEngines = (selected_translator) => {
- // updateSelectedTranslationEngines(() => new Promise(() => {}));
- let send_obj = currentSelectedTranslationEngines;
-
+ pendingSelectedTranslationEngines();
+ let send_obj = currentSelectedTranslationEngines.data;
send_obj[currentSelectedPresetTabNumber.data] = selected_translator;
-
asyncStdoutToPython("/set/selected_translator_engines", send_obj);
};
diff --git a/src-ui/logics/main/useMainFunction.js b/src-ui/logics/main/useMainFunction.js
index 114ec31f..ffcc8607 100644
--- a/src-ui/logics/main/useMainFunction.js
+++ b/src-ui/logics/main/useMainFunction.js
@@ -13,17 +13,17 @@ export const useMainFunction = () => {
const {
currentTranslationStatus,
updateTranslationStatus,
- asyncUpdateTranslationStatus,
+ pendingTranslationStatus,
} = useStore_TranslationStatus();
const {
currentTranscriptionSendStatus,
updateTranscriptionSendStatus,
- asyncUpdateTranscriptionSendStatus,
+ pendingTranscriptionSendStatus,
} = useStore_TranscriptionSendStatus();
const {
currentTranscriptionReceiveStatus,
updateTranscriptionReceiveStatus,
- asyncUpdateTranscriptionReceiveStatus,
+ pendingTranscriptionReceiveStatus,
} = useStore_TranscriptionReceiveStatus();
const {
currentForegroundStatus,
@@ -32,9 +32,8 @@ export const useMainFunction = () => {
const { asyncStdoutToPython } = useStdoutToPython();
- const asyncPending = () => new Promise(() => {});
const toggleTranslation = () => {
- asyncUpdateTranslationStatus(asyncPending);
+ pendingTranslationStatus();
if (currentTranslationStatus.data) {
asyncStdoutToPython("/set/disable_translation");
} else {
@@ -43,7 +42,7 @@ export const useMainFunction = () => {
};
const toggleTranscriptionSend = () => {
- asyncUpdateTranscriptionSendStatus(asyncPending);
+ pendingTranscriptionSendStatus();
if (currentTranscriptionSendStatus.data) {
asyncStdoutToPython("/set/disable_transcription_send");
} else {
@@ -52,7 +51,7 @@ export const useMainFunction = () => {
};
const toggleTranscriptionReceive = () => {
- asyncUpdateTranscriptionReceiveStatus(asyncPending);
+ pendingTranscriptionReceiveStatus();
if (currentTranscriptionReceiveStatus.data) {
asyncStdoutToPython("/set/disable_transcription_receive");
} else {
diff --git a/src-ui/store.js b/src-ui/store.js
index bd4c4792..22fde03a 100644
--- a/src-ui/store.js
+++ b/src-ui/store.js
@@ -17,8 +17,11 @@ export const store = {
};
const generatePropertyNames = (base_ame) => ({
+ error: `error${base_ame}`,
+ pending: `pending${base_ame}`,
current: `current${base_ame}`,
update: `update${base_ame}`,
+ updatePart: `updatePart${base_ame}`,
async_update: `asyncUpdate${base_ame}`,
add: `add${base_ame}`,
async_add: `asyncAdd${base_ame}`,
@@ -94,64 +97,136 @@ const createAsyncAtomWithHook = (initialValue, base_ame) => {
return { atomInstance, useHook };
};
-export const { atomInstance: Atom_SoftwareVersion, useHook: useStore_SoftwareVersion } = createAtomWithHook("-", "SoftwareVersion");
-export const { atomInstance: Atom_TranslationStatus, useHook: useStore_TranslationStatus } = createAsyncAtomWithHook(false, "TranslationStatus");
-export const { atomInstance: Atom_TranscriptionSendStatus, useHook: useStore_TranscriptionSendStatus } = createAsyncAtomWithHook(false, "TranscriptionSendStatus");
-export const { atomInstance: Atom_TranscriptionReceiveStatus, useHook: useStore_TranscriptionReceiveStatus } = createAsyncAtomWithHook(false, "TranscriptionReceiveStatus");
-export const { atomInstance: Atom_ForegroundStatus, useHook: useStore_ForegroundStatus } = createAsyncAtomWithHook(false, "ForegroundStatus");
+const createAtomWithHook_WIP = (initialValue, base_ame, options) => {
+ const property_names = generatePropertyNames(base_ame);
+ const atomInstance = atom({
+ state: (options?.is_state_ok) ? "ok" : "pending",
+ data: initialValue,
+ });
-export const { atomInstance: Atom_MessageLogs, useHook: useStore_MessageLogs } = createAtomWithHook(generateTestData(20), "MessageLogs");
-export const { atomInstance: Atom_IsMainPageCompactMode, useHook: useStore_IsMainPageCompactMode } = createAtomWithHook(false, "IsMainPageCompactMode");
+ const useHook = () => {
+ const currentAtom = useAtomValue(atomInstance);
+ const setAtom = useSetAtom(atomInstance);
-export const { atomInstance: Atom_IsOpenedLanguageSelector, useHook: useStore_IsOpenedLanguageSelector } = createAtomWithHook(
+ const pendingAtom = () => {
+ setAtom((old_value) => {
+ let new_value = {
+ state: "pending",
+ data: old_value.data,
+ };
+ return new_value;
+ });
+ };
+
+ const updateAtom = (payload) => {
+ setAtom((currentValue) => {
+ if (typeof payload === "function") {
+ const updated_data = payload(currentValue);
+ return {
+ state: "ok",
+ data: updated_data,
+ };
+ } else {
+ return {
+ state: "ok",
+ data: payload,
+ };
+ }
+ });
+ };
+
+ const errorAtom = () => {
+ setAtom((old_value) => {
+ let new_value = {
+ state: "error",
+ data: old_value.data,
+ };
+ return new_value;
+ });
+ };
+
+ const addAtom = (value) => {
+ setAtom((old_value) => {
+ return {
+ state: "ok",
+ data: [...old_value.data, value],
+ };
+ });
+ };
+
+ return {
+ [property_names.error]: errorAtom,
+ [property_names.pending]: pendingAtom,
+ [property_names.current]: currentAtom,
+ [property_names.update]: updateAtom,
+ [property_names.add]: addAtom,
+ };
+ };
+
+ return { atomInstance, useHook };
+};
+
+
+
+export const { atomInstance: Atom_SoftwareVersion, useHook: useStore_SoftwareVersion } = createAtomWithHook_WIP("-", "SoftwareVersion");
+
+export const { atomInstance: Atom_TranslationStatus, useHook: useStore_TranslationStatus } = createAtomWithHook_WIP(false, "TranslationStatus", {is_state_ok: true});
+export const { atomInstance: Atom_TranscriptionSendStatus, useHook: useStore_TranscriptionSendStatus } = createAtomWithHook_WIP(false, "TranscriptionSendStatus", {is_state_ok: true});
+export const { atomInstance: Atom_TranscriptionReceiveStatus, useHook: useStore_TranscriptionReceiveStatus } = createAtomWithHook_WIP(false, "TranscriptionReceiveStatus", {is_state_ok: true});
+export const { atomInstance: Atom_ForegroundStatus, useHook: useStore_ForegroundStatus } = createAtomWithHook_WIP(false, "ForegroundStatus", {is_state_ok: true});
+
+export const { atomInstance: Atom_MessageLogs, useHook: useStore_MessageLogs } = createAtomWithHook_WIP(generateTestData(20), "MessageLogs");
+export const { atomInstance: Atom_IsMainPageCompactMode, useHook: useStore_IsMainPageCompactMode } = createAtomWithHook_WIP(false, "IsMainPageCompactMode");
+
+export const { atomInstance: Atom_IsOpenedLanguageSelector, useHook: useStore_IsOpenedLanguageSelector } = createAtomWithHook_WIP(
{ your_language: false, target_language: false },
"IsOpenedLanguageSelector"
);
-export const { atomInstance: Atom_SelectableLanguageList, useHook: useStore_SelectableLanguageList } = createAtomWithHook([], "SelectableLanguageList");
+export const { atomInstance: Atom_SelectableLanguageList, useHook: useStore_SelectableLanguageList } = createAtomWithHook_WIP([], "SelectableLanguageList");
-export const { atomInstance: Atom_SelectedPresetTabNumber, useHook: useStore_SelectedPresetTabNumber } = createAsyncAtomWithHook("", "SelectedPresetTabNumber");
-export const { atomInstance: Atom_EnableMultiTranslation, useHook: useStore_EnableMultiTranslation } = createAsyncAtomWithHook(false, "EnableMultiTranslation");
-export const { atomInstance: Atom_SelectedYourLanguages, useHook: useStore_SelectedYourLanguages } = createAsyncAtomWithHook({}, "SelectedYourLanguages");
-export const { atomInstance: Atom_SelectedTargetLanguages, useHook: useStore_SelectedTargetLanguages } = createAsyncAtomWithHook({}, "SelectedTargetLanguages");
+export const { atomInstance: Atom_SelectedPresetTabNumber, useHook: useStore_SelectedPresetTabNumber } = createAtomWithHook_WIP("", "SelectedPresetTabNumber");
+export const { atomInstance: Atom_EnableMultiTranslation, useHook: useStore_EnableMultiTranslation } = createAtomWithHook_WIP(false, "EnableMultiTranslation");
+export const { atomInstance: Atom_SelectedYourLanguages, useHook: useStore_SelectedYourLanguages } = createAtomWithHook_WIP({}, "SelectedYourLanguages");
+export const { atomInstance: Atom_SelectedTargetLanguages, useHook: useStore_SelectedTargetLanguages } = createAtomWithHook_WIP({}, "SelectedTargetLanguages");
-export const { atomInstance: Atom_TranslationEngines, useHook: useStore_TranslationEngines } = createAsyncAtomWithHook(translator_status, "TranslationEngines");
-export const { atomInstance: Atom_SelectedTranslationEngines, useHook: useStore_SelectedTranslationEngines } = createAtomWithHook({}, "SelectedTranslationEngines");
+export const { atomInstance: Atom_TranslationEngines, useHook: useStore_TranslationEngines } = createAtomWithHook_WIP(translator_status, "TranslationEngines");
+export const { atomInstance: Atom_SelectedTranslationEngines, useHook: useStore_SelectedTranslationEngines } = createAtomWithHook_WIP({}, "SelectedTranslationEngines");
-export const { atomInstance: Atom_IsOpenedConfigPage, useHook: useStore_IsOpenedConfigPage } = createAtomWithHook(false, "IsOpenedConfigPage");
-export const { atomInstance: Atom_SelectedConfigTabId, useHook: useStore_SelectedConfigTabId } = createAtomWithHook("device", "SelectedConfigTabId");
-export const { atomInstance: Atom_IsOpenedDropdownMenu, useHook: useStore_IsOpenedDropdownMenu } = createAtomWithHook("", "IsOpenedDropdownMenu");
+export const { atomInstance: Atom_IsOpenedConfigPage, useHook: useStore_IsOpenedConfigPage } = createAtomWithHook_WIP(false, "IsOpenedConfigPage");
+export const { atomInstance: Atom_SelectedConfigTabId, useHook: useStore_SelectedConfigTabId } = createAtomWithHook_WIP("device", "SelectedConfigTabId");
+export const { atomInstance: Atom_IsOpenedDropdownMenu, useHook: useStore_IsOpenedDropdownMenu } = createAtomWithHook_WIP("", "IsOpenedDropdownMenu");
// Config Page
-export const { atomInstance: Atom_EnableAutoMicSelect, useHook: useStore_EnableAutoMicSelect } = createAsyncAtomWithHook(true, "EnableAutoMicSelect");
-export const { atomInstance: Atom_EnableAutoSpeakerSelect, useHook: useStore_EnableAutoSpeakerSelect } = createAsyncAtomWithHook(true, "EnableAutoSpeakerSelect");
+export const { atomInstance: Atom_EnableAutoMicSelect, useHook: useStore_EnableAutoMicSelect } = createAtomWithHook_WIP(true, "EnableAutoMicSelect");
+export const { atomInstance: Atom_EnableAutoSpeakerSelect, useHook: useStore_EnableAutoSpeakerSelect } = createAtomWithHook_WIP(true, "EnableAutoSpeakerSelect");
-export const { atomInstance: Atom_MicHostList, useHook: useStore_MicHostList } = createAsyncAtomWithHook({}, "MicHostList");
-export const { atomInstance: Atom_SelectedMicHost, useHook: useStore_SelectedMicHost } = createAsyncAtomWithHook("Nothing Selected", "SelectedMicHost");
-export const { atomInstance: Atom_MicDeviceList, useHook: useStore_MicDeviceList } = createAsyncAtomWithHook({}, "MicDeviceList");
-export const { atomInstance: Atom_SelectedMicDevice, useHook: useStore_SelectedMicDevice } = createAsyncAtomWithHook("Nothing Selected", "SelectedMicDevice");
+export const { atomInstance: Atom_MicHostList, useHook: useStore_MicHostList } = createAtomWithHook_WIP({}, "MicHostList");
+export const { atomInstance: Atom_SelectedMicHost, useHook: useStore_SelectedMicHost } = createAtomWithHook_WIP("Nothing Selected", "SelectedMicHost");
+export const { atomInstance: Atom_MicDeviceList, useHook: useStore_MicDeviceList } = createAtomWithHook_WIP({}, "MicDeviceList");
+export const { atomInstance: Atom_SelectedMicDevice, useHook: useStore_SelectedMicDevice } = createAtomWithHook_WIP("Nothing Selected", "SelectedMicDevice");
-export const { atomInstance: Atom_SpeakerDeviceList, useHook: useStore_SpeakerDeviceList } = createAsyncAtomWithHook({}, "SpeakerDeviceList");
-export const { atomInstance: Atom_SelectedSpeakerDevice, useHook: useStore_SelectedSpeakerDevice } = createAsyncAtomWithHook("Nothing Selected", "SelectedSpeakerDevice");
+export const { atomInstance: Atom_SpeakerDeviceList, useHook: useStore_SpeakerDeviceList } = createAtomWithHook_WIP({}, "SpeakerDeviceList");
+export const { atomInstance: Atom_SelectedSpeakerDevice, useHook: useStore_SelectedSpeakerDevice } = createAtomWithHook_WIP("Nothing Selected", "SelectedSpeakerDevice");
-export const { atomInstance: Atom_MicVolume, useHook: useStore_MicVolume } = createAsyncAtomWithHook(0, "MicVolume");
-export const { atomInstance: Atom_SpeakerVolume, useHook: useStore_SpeakerVolume } = createAsyncAtomWithHook(0, "SpeakerVolume");
+export const { atomInstance: Atom_MicVolume, useHook: useStore_MicVolume } = createAtomWithHook_WIP(0, "MicVolume");
+export const { atomInstance: Atom_SpeakerVolume, useHook: useStore_SpeakerVolume } = createAtomWithHook_WIP(0, "SpeakerVolume");
-export const { atomInstance: Atom_MicThresholdCheckStatus, useHook: useStore_MicThresholdCheckStatus } = createAsyncAtomWithHook(false, "MicThresholdCheckStatus");
-export const { atomInstance: Atom_SpeakerThresholdCheckStatus, useHook: useStore_SpeakerThresholdCheckStatus } = createAsyncAtomWithHook(false, "SpeakerThresholdCheckStatus");
+export const { atomInstance: Atom_MicThresholdCheckStatus, useHook: useStore_MicThresholdCheckStatus } = createAtomWithHook_WIP(false, "MicThresholdCheckStatus", {is_state_ok: true});
+export const { atomInstance: Atom_SpeakerThresholdCheckStatus, useHook: useStore_SpeakerThresholdCheckStatus } = createAtomWithHook_WIP(false, "SpeakerThresholdCheckStatus", {is_state_ok: true});
-export const { atomInstance: Atom_MicThreshold, useHook: useStore_MicThreshold } = createAtomWithHook(0, "MicThreshold");
-export const { atomInstance: Atom_SpeakerThreshold, useHook: useStore_SpeakerThreshold } = createAtomWithHook(0, "SpeakerThreshold");
+export const { atomInstance: Atom_MicThreshold, useHook: useStore_MicThreshold } = createAtomWithHook_WIP(0, "MicThreshold");
+export const { atomInstance: Atom_SpeakerThreshold, useHook: useStore_SpeakerThreshold } = createAtomWithHook_WIP(0, "SpeakerThreshold");
-export const { atomInstance: Atom_EnableAutomaticMicThreshold, useHook: useStore_EnableAutomaticMicThreshold } = createAsyncAtomWithHook(false, "EnableAutomaticMicThreshold");
-export const { atomInstance: Atom_EnableAutomaticSpeakerThreshold, useHook: useStore_EnableAutomaticSpeakerThreshold } = createAsyncAtomWithHook(false, "EnableAutomaticSpeakerThreshold");
+export const { atomInstance: Atom_EnableAutomaticMicThreshold, useHook: useStore_EnableAutomaticMicThreshold } = createAtomWithHook_WIP(false, "EnableAutomaticMicThreshold");
+export const { atomInstance: Atom_EnableAutomaticSpeakerThreshold, useHook: useStore_EnableAutomaticSpeakerThreshold } = createAtomWithHook_WIP(false, "EnableAutomaticSpeakerThreshold");
// Appearance
-export const { atomInstance: Atom_UiLanguage, useHook: useStore_UiLanguage } = createAsyncAtomWithHook("en", "UiLanguage");
+export const { atomInstance: Atom_UiLanguage, useHook: useStore_UiLanguage } = createAtomWithHook_WIP("en", "UiLanguage");
@@ -181,16 +256,16 @@ export const { atomInstance: Atom_ReceivedMessageFormatWithT, useHook: useStore_
is_message_first: true,
}, "ReceivedMessageFormatWithT");
-export const { atomInstance: Atom_IsOpenedWordFilterList, useHook: useStore_IsOpenedWordFilterList } = createAtomWithHook(false, "IsOpenedWordFilterList");
-export const { atomInstance: Atom_WordFilterList, useHook: useStore_WordFilterList } = createAtomWithHook(word_filter_list, "WordFilterList");
+export const { atomInstance: Atom_IsOpenedWordFilterList, useHook: useStore_IsOpenedWordFilterList } = createAtomWithHook_WIP(false, "IsOpenedWordFilterList");
+export const { atomInstance: Atom_WordFilterList, useHook: useStore_WordFilterList } = createAtomWithHook_WIP(word_filter_list, "WordFilterList");
// Others
-export const { atomInstance: Atom_EnableAutoClearMessageBox, useHook: useStore_EnableAutoClearMessageBox } = createAsyncAtomWithHook(true, "EnableAutoClearMessageBox");
-export const { atomInstance: Atom_SendMessageButtonType, useHook: useStore_SendMessageButtonType } = createAsyncAtomWithHook("show", "SendMessageButtonType");
+export const { atomInstance: Atom_EnableAutoClearMessageBox, useHook: useStore_EnableAutoClearMessageBox } = createAtomWithHook_WIP(true, "EnableAutoClearMessageBox");
+export const { atomInstance: Atom_SendMessageButtonType, useHook: useStore_SendMessageButtonType } = createAtomWithHook_WIP("show", "SendMessageButtonType");
-export const { atomInstance: Atom_IsOpenedTranslatorSelector, useHook: useStore_IsOpenedTranslatorSelector } = createAtomWithHook(false, "IsOpenedTranslatorSelector");
+export const { atomInstance: Atom_IsOpenedTranslatorSelector, useHook: useStore_IsOpenedTranslatorSelector } = createAtomWithHook_WIP(false, "IsOpenedTranslatorSelector");
-export const { atomInstance: Atom_VrctPosterIndex, useHook: useStore_VrctPosterIndex } = createAtomWithHook(0, "VrctPosterIndex");
-export const { atomInstance: Atom_PosterShowcaseWorldPageIndex, useHook: useStore_PosterShowcaseWorldPageIndex } = createAtomWithHook(0, "PosterShowcaseWorldPageIndex");
\ No newline at end of file
+export const { atomInstance: Atom_VrctPosterIndex, useHook: useStore_VrctPosterIndex } = createAtomWithHook_WIP(0, "VrctPosterIndex");
+export const { atomInstance: Atom_PosterShowcaseWorldPageIndex, useHook: useStore_PosterShowcaseWorldPageIndex } = createAtomWithHook_WIP(0, "PosterShowcaseWorldPageIndex");
\ No newline at end of file
From 72b01be3af0a84d20f8f549c76bced402004e433 Mon Sep 17 00:00:00 2001
From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com>
Date: Mon, 23 Sep 2024 03:53:00 +0900
Subject: [PATCH 3/3] [Remove] Remove MessageFormat.
---
.../setting_box/appearance/Appearance.jsx | 11 --
.../message_format/MessageFormat.jsx | 180 ------------------
.../message_format/MessageFormat.module.scss | 65 -------
.../setting_box/components/useSettingBox.jsx | 33 ----
src-ui/store.js | 97 ----------
5 files changed, 386 deletions(-)
delete mode 100644 src-ui/app/config_page/setting_section/setting_box/components/message_format/MessageFormat.jsx
delete mode 100644 src-ui/app/config_page/setting_section/setting_box/components/message_format/MessageFormat.module.scss
diff --git a/src-ui/app/config_page/setting_section/setting_box/appearance/Appearance.jsx b/src-ui/app/config_page/setting_section/setting_box/appearance/Appearance.jsx
index edf1dadb..de5223e2 100644
--- a/src-ui/app/config_page/setting_section/setting_box/appearance/Appearance.jsx
+++ b/src-ui/app/config_page/setting_section/setting_box/appearance/Appearance.jsx
@@ -16,7 +16,6 @@ export const Appearance = () => {
// ThresholdContainer,
// RadioButtonContainer,
// DeeplAuthKeyContainer,
- // MessageFormatContainer,
// WordFilterContainer,
// ActionButtonContainer,
} = useSettingBox();
@@ -54,16 +53,6 @@ export const Appearance = () => {
-
-
-
-
-
-
-
-
-
-
{}}/> */}
diff --git a/src-ui/app/config_page/setting_section/setting_box/components/message_format/MessageFormat.jsx b/src-ui/app/config_page/setting_section/setting_box/components/message_format/MessageFormat.jsx
deleted file mode 100644
index 1474c97d..00000000
--- a/src-ui/app/config_page/setting_section/setting_box/components/message_format/MessageFormat.jsx
+++ /dev/null
@@ -1,180 +0,0 @@
-import styles from "./MessageFormat.module.scss";
-import { useTranslation } from "react-i18next";
-import {
- useStore_UiLanguage,
- useStore_SendMessageFormat,
- useStore_SendMessageFormatWithT,
- useStore_ReceivedMessageFormat,
- useStore_ReceivedMessageFormatWithT,
-} from "@store";
-import { _Entry } from "../_atoms/_entry/_Entry";
-import SwapImg from "@images/swap_icon.png";
-
-export const MessageFormat = (props) => {
- const { currentSendMessageFormat, updateSendMessageFormat } = useStore_SendMessageFormat();
- const { currentSendMessageFormatWithT, updateSendMessageFormatWithT } = useStore_SendMessageFormatWithT();
- const { currentReceivedMessageFormat, updateReceivedMessageFormat } = useStore_ReceivedMessageFormat();
- const { currentReceivedMessageFormatWithT, updateReceivedMessageFormatWithT } = useStore_ReceivedMessageFormatWithT();
-
- let atoms = [];
- switch (props.id) {
- case "send":
- atoms = [currentSendMessageFormat, updateSendMessageFormat];
- break;
-
- case "send_with_t":
- atoms = [currentSendMessageFormatWithT, updateSendMessageFormatWithT];
- break;
-
- case "received":
- atoms = [currentReceivedMessageFormat, updateReceivedMessageFormat];
- break;
-
- case "received_with_t":
- atoms = [currentReceivedMessageFormatWithT, updateReceivedMessageFormatWithT];
- break;
-
- default:
- break;
- }
-
- return (
-
-
-
- {["send_with_t", "received_with_t"].includes(props.id) && }
-
- );
-};
-
-const ExampleComponent = ({ id, current_format }) => {
- const { t } = useTranslation();
- const { currentUiLanguage } = useStore_UiLanguage();
-
- const createExampleMessage = () => {
- const originalLangMessage = t("config_page.send_message_format.example_text");
- let format = current_format;
-
- if (["send_with_t", "received_with_t"].includes(id)) {
- const translationLocale = currentUiLanguage.data === "en" ? "ja" : "en";
- const translatedLangMessage = t("config_page.send_message_format.example_text", { lng: translationLocale });
-
- return format.is_message_first
- ? `${format.before}${originalLangMessage}${format.between}${translatedLangMessage}${format.after}`
- : `${format.before}${translatedLangMessage}${format.between}${originalLangMessage}${format.after}`;
- } else {
- return `${format.before}${originalLangMessage}${format.after}`;
- }
- };
-
- return (
-
-
{createExampleMessage()}
-
- <_Entry width="100%" onChange={handleChange("before")} />
- {["send_with_t", "received_with_t"].includes(id) ? (
- <>
-
{current.is_message_first ? "[message]" : "[translation]"}
- <_Entry width="100%" onChange={handleChange("between")} />
-
{current.is_message_first ? "[translation]" : "[message]"}
-
- ) : (
-
[message]
- )}
- <_Entry width="100%" onChange={handleChange("after")} />
-
-
-
{current.is_message_first ? "[message]" : "[translation]"}
-
-
{current.is_message_first ? "[translation]" : "[message]"}
-
-
-//
-//
-//
-//
-//
-//
-//
-//
@@ -159,7 +127,6 @@ export const useSettingBox = () => {
EntryContainer,
RadioButtonContainer,
DeeplAuthKeyContainer,
- MessageFormatContainer,
WordFilterContainer,
ActionButtonContainer,
};
diff --git a/src-ui/store.js b/src-ui/store.js
index 22fde03a..5173dc62 100644
--- a/src-ui/store.js
+++ b/src-ui/store.js
@@ -27,76 +27,6 @@ const generatePropertyNames = (base_ame) => ({
async_add: `asyncAdd${base_ame}`,
});
-const createAtomWithHook = (initialValue, base_ame) => {
- const property_names = generatePropertyNames(base_ame);
- const atomInstance = atom(initialValue);
-
- const useHook = () => {
- const currentAtom = useAtomValue(atomInstance);
- const setAtom = useSetAtom(atomInstance);
-
- const updateAtom = (value) => {
- setAtom(value);
- };
-
- const addAtom = (value) => {
- setAtom((old_value) => [...old_value, value]);
- };
-
- return {
- [property_names.current]: currentAtom,
- [property_names.update]: updateAtom,
- [property_names.add]: addAtom,
- };
- };
-
- return { atomInstance, useHook };
-};
-
-import { loadable } from "jotai/utils";
-const createAsyncAtomWithHook = (initialValue, base_ame) => {
- const property_names = generatePropertyNames(base_ame);
- const atomInstance = atom(initialValue);
- const asyncAtom = atom(async (get) => get(atomInstance));
- const loadableAtom = loadable(asyncAtom);
-
- const useHook = () => {
- const asyncCurrentAtom = useAtomValue(loadableAtom);
- const setAtom = useSetAtom(atomInstance);
-
- const updateAtom = (value) => {
- setAtom(value);
- };
-
- const asyncSetAtom = useSetAtom(atom(null, async (get, set, payloadAsyncFunc, ...args) => {
- set(atomInstance, payloadAsyncFunc(...args));
- }));
-
- const asyncUpdateAtom = async (asyncFunction, ...args) => {
- asyncSetAtom(asyncFunction, ...args);
- };
-
- const addAtom = (value) => {
- setAtom((old_value) => [...old_value, value]);
- };
-
- const asyncAddAtom = useSetAtom(atom(null, async (get, set, payloadAsyncFunc, ...args) => {
- const old_value = await get(atomInstance);
- set(atomInstance, payloadAsyncFunc([...old_value, ...args]));
- }));
-
- return {
- [property_names.current]: asyncCurrentAtom,
- [property_names.update]: updateAtom,
- [property_names.async_update]: asyncUpdateAtom,
- [property_names.add]: addAtom,
- [property_names.async_add]: asyncAddAtom,
- };
- };
-
- return { atomInstance, useHook };
-};
-
const createAtomWithHook_WIP = (initialValue, base_ame, options) => {
const property_names = generatePropertyNames(base_ame);
@@ -229,33 +159,6 @@ export const { atomInstance: Atom_EnableAutomaticSpeakerThreshold, useHook: useS
export const { atomInstance: Atom_UiLanguage, useHook: useStore_UiLanguage } = createAtomWithHook_WIP("en", "UiLanguage");
-
-
-
-
-
-
-export const { atomInstance: Atom_SendMessageFormat, useHook: useStore_SendMessageFormat } = createAtomWithHook({
- before: "",
- after: "",
-}, "SendMessageFormat");
-export const { atomInstance: Atom_SendMessageFormatWithT, useHook: useStore_SendMessageFormatWithT } = createAtomWithHook({
- before: "",
- between: "",
- after: "",
- is_message_first: true,
-}, "SendMessageFormatWithT");
-export const { atomInstance: Atom_ReceivedMessageFormat, useHook: useStore_ReceivedMessageFormat } = createAtomWithHook({
- before: "",
- after: "",
-}, "ReceivedMessageFormat");
-export const { atomInstance: Atom_ReceivedMessageFormatWithT, useHook: useStore_ReceivedMessageFormatWithT } = createAtomWithHook({
- before: "",
- between: "",
- after: "",
- is_message_first: true,
-}, "ReceivedMessageFormatWithT");
-
export const { atomInstance: Atom_IsOpenedWordFilterList, useHook: useStore_IsOpenedWordFilterList } = createAtomWithHook_WIP(false, "IsOpenedWordFilterList");
export const { atomInstance: Atom_WordFilterList, useHook: useStore_WordFilterList } = createAtomWithHook_WIP(word_filter_list, "WordFilterList");