RC2 WWW timing fix (#1173)

* Combining two useEffects in our settings page to hopefully offset timings * Removing update available addons as we use peripherals now * Removing update addons from display config
OpenStickCommunity · Oct 1, 2024 · b675e94 · b675e94
1 parent f71ef96
commit b675e94
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 29 deletions.
diff --git a/www/src/Contexts/AppContext.jsx b/www/src/Contexts/AppContext.jsx
@@ -182,7 +182,6 @@ export const AppContextProvider = ({ children, ...props }) => {
 		basePeripheralMapping,
 	);
 	const [expansionPins, setExpansionPins] = useState({});
-	const [availableAddons, setAvailableAddons] = useState({});
 
 	const updateUsedPins = async () => {
 		const data = await WebApi.getUsedPins(setLoading);
@@ -268,23 +267,6 @@ export const AppContextProvider = ({ children, ...props }) => {
 
 	useEffect(() => {}, [availablePeripherals, setAvailablePeripherals]);
 
-	useEffect(() => {
-		async function fetchData() {
-			const data = await WebApi.getAddonsOptions(setLoading);
-			setAvailableAddons(data);
-		}
-		fetchData();
-	}, []);
-
-	const updateAddons = async () => {
-		const data = await WebApi.getAddonsOptions(setLoading);
-		setAvailableAddons(data);
-	};
-
-	const getAvailableAddons = () => {
-		return availableAddons;
-	};
-
 	const [savedColorScheme, _setSavedColorScheme] = useState(
 		localStorage.getItem('savedColorScheme') || 'auto',
 	);
@@ -317,8 +299,6 @@ export const AppContextProvider = ({ children, ...props }) => {
 				availablePeripherals,
 				getAvailablePeripherals,
 				expansionPins,
-				getAvailableAddons,
-				updateAddons,
 				getSelectedPeripheral,
 				setButtonLabels,
 				setGradientNormalColor1,

diff --git a/www/src/Pages/DisplayConfig.jsx b/www/src/Pages/DisplayConfig.jsx
@@ -204,7 +204,6 @@ export default function DisplayConfigPage() {
 		getAvailablePeripherals,
 		getSelectedPeripheral,
 		updatePeripherals,
-		updateAddons,
 	} = useContext(AppContext);
 	const [saveMessage, setSaveMessage] = useState('');
 
@@ -218,7 +217,6 @@ export default function DisplayConfigPage() {
 	);
 
 	useEffect(() => {
-		updateAddons();
 		updatePeripherals();
 	}, []);
 

diff --git a/www/src/Pages/SettingsPage.jsx b/www/src/Pages/SettingsPage.jsx
@@ -479,7 +479,6 @@ export default function SettingsPage() {
 		buttonLabels,
 		setButtonLabels,
 		getAvailablePeripherals,
-		updateAddons,
 		updatePeripherals,
 	} = useContext(AppContext);
 
@@ -488,6 +487,7 @@ export default function SettingsPage() {
 
 	useEffect(() => {
 		fetchProfiles();
+		updatePeripherals();
 	}, []);
 
 	const [saveMessage, setSaveMessage] = useState('');
@@ -1110,11 +1110,6 @@ export default function SettingsPage() {
 
 	const { t } = useTranslation('');
 
-	useEffect(() => {
-		updateAddons();
-		updatePeripherals();
-	}, []);
-
 	const translatedInputBootModes = translateArray(
 		checkRequiredArray(INPUT_BOOT_MODES),
 	);
@@ -1458,7 +1453,7 @@ export default function SettingsPage() {
 													<div id="Hotkeys" hidden={values.lockHotkeys}>
 														{Object.keys(hotkeyFields).map((o, i) => (
 															<Form.Group
-																key={`hotkey-${i}`}
+																key={`hotkey-${i}-base`}
 																className="row mb-3"
 															>
 																<Col sm="auto">