Fix routing and make linking macros

Paradise-Pi · Jun 29, 2022 · 39f31ce · 39f31ce
1 parent bd4d1a0
commit 39f31ce
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 38 deletions.
diff --git a/src/api/preset/presetRouter.ts b/src/api/preset/presetRouter.ts
@@ -27,10 +27,12 @@ export const presetRouter = (
 						e131.convertObjectToChannelData(value.data),
 						value.fadeTime * 1000
 					)
+					resolve({})
 				} else if (value.type === 'osc' && value.data !== null) {
 					Object.entries(value.data).forEach(presetData => {
 						osc.send(presetData)
 					})
+					resolve({})
 				} else if (value.type === 'http' && value.data !== null) {
 					// Make the HTTP request
 					axios({
@@ -42,15 +44,19 @@ export const presetRouter = (
 					}).catch(err => {
 						logger.info('Preset HTTP request failed', { err })
 					})
+					resolve({})
 				} else if (value.type === 'macro' && value.data !== null) {
 					value.data.forEach((step: { type: string; value: string; key: string }) => {
+						logger.info(step)
 						if (step.type === 'preset' && parseInt(step.value) !== value.id) {
 							// Trigger the presets in the macro
 							presetRouter(['recall', step.value], 'GET', {})
+							resolve({})
+						} else if (step.type === 'link') {
+							resolve({ redirect: step.value })
 						}
 					})
 				}
-				resolve({})
 			})
 		} else if (method === 'PUT') {
 			return PresetRepository.setAllFromApp(payload as Array<DatabasePreset>)

diff --git a/src/app/Components/Admin/Controls/Presets/EditModal/Macro.tsx b/src/app/Components/Admin/Controls/Presets/EditModal/Macro.tsx
@@ -52,7 +52,10 @@ export const MacroPresetEditModal = (props: GetInputProps<'input'>) => {
 				<Group key={item.key} mt="xs">
 					<Select
 						{...form.getListInputProps('steps', index, 'type')}
-						data={[{ value: 'preset', label: 'Trigger Preset' }]}
+						data={[
+							{ value: 'preset', label: 'Trigger Preset' },
+							{ value: 'link', label: 'Open a Page' },
+						]}
 					/>
 					{form.values.steps[index].type === 'preset' ? (
 						<Select
@@ -61,6 +64,13 @@ export const MacroPresetEditModal = (props: GetInputProps<'input'>) => {
 							data={presetsForSelect}
 						/>
 					) : null}
+					{form.values.steps[index].type === 'link' ? (
+						<Select
+							placeholder="Page"
+							{...form.getListInputProps('steps', index, 'value')}
+							data={[{ value: '/controlPanel/lxKeypad', label: 'Lighting Keypad' }]}
+						/>
+					) : null}
 					<ActionIcon color="red" variant="hover" onClick={() => form.removeListItem('steps', index)}>
 						<FaTrash />
 					</ActionIcon>

diff --git a/src/app/Navigation/ControlPanelNavigation.tsx b/src/app/Navigation/ControlPanelNavigation.tsx
@@ -56,7 +56,6 @@ export const ControlPanelNavigation = () => {
 				<TopLevelPresetFolders active={active} setActive={setActive} />
 			</Navbar.Section>
 			<Navbar.Section className={classes.footer}>
-				<NavbarItem link="utilities" label="Utilities" Icon={FaCogs} active={active} setActive={setActive} />
 				<NavbarItem link="help" label="Help" Icon={FaQuestion} active={active} setActive={setActive} />
 			</Navbar.Section>
 		</Navbar>

diff --git a/src/app/Pages/ControlPanel/Keypad.tsx b/src/app/Pages/ControlPanel/Keypad.tsx
@@ -34,7 +34,6 @@ export const KeypadPage = () => {
 	 * @returns True if the command array is valid, false otherwise
 	 */
 	function validCommand(command: string[]) {
-		console.log(command)
 		if (
 			command.length === 0 ||
 			command.length > 3 ||
@@ -76,100 +75,99 @@ export const KeypadPage = () => {
 
 	return (
 		<Container>
-			<Space h="xl" />
 			<TextInput disabled aria-label="Command Output" size="xl" value={commandText} />
 			<Space h="xl" />
 			<SimpleGrid cols={3}>
 				<Button
-					size="xl"
+					size="lg"
 					onClick={() => {
 						updateCommandString('7')
 					}}
 				>
 					7
 				</Button>
 				<Button
-					size="xl"
+					size="lg"
 					onClick={() => {
 						updateCommandString('8')
 					}}
 				>
 					8
 				</Button>
 				<Button
-					size="xl"
+					size="lg"
 					onClick={() => {
 						updateCommandString('9')
 					}}
 				>
 					9
 				</Button>
 				<Button
-					size="xl"
+					size="lg"
 					onClick={() => {
 						updateCommandString('4')
 					}}
 				>
 					4
 				</Button>
 				<Button
-					size="xl"
+					size="lg"
 					onClick={() => {
 						updateCommandString('5')
 					}}
 				>
 					5
 				</Button>
 				<Button
-					size="xl"
+					size="lg"
 					onClick={() => {
 						updateCommandString('6')
 					}}
 				>
 					6
 				</Button>
 				<Button
-					size="xl"
+					size="lg"
 					onClick={() => {
 						updateCommandString('1')
 					}}
 				>
 					1
 				</Button>
 				<Button
-					size="xl"
+					size="lg"
 					onClick={() => {
 						updateCommandString('2')
 					}}
 				>
 					2
 				</Button>
 				<Button
-					size="xl"
+					size="lg"
 					onClick={() => {
 						updateCommandString('3')
 					}}
 				>
 					3
 				</Button>
 				<Button
-					size="xl"
+					size="lg"
 					onClick={() => {
 						updateCommandString('clear')
 					}}
 				>
 					Clear
 				</Button>
 				<Button
-					size="xl"
+					size="lg"
 					onClick={() => {
 						updateCommandString('0')
 					}}
 				>
 					0
 				</Button>
 				<Button
-					size="xl"
+					size="lg"
 					onClick={() => {
 						updateCommandString(' thru ')
 					}}

diff --git a/src/app/Pages/ControlPanel/Preset.tsx b/src/app/Pages/ControlPanel/Preset.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { Link, useParams } from 'react-router-dom'
+import { Link, useNavigate, useParams } from 'react-router-dom'
 import { DatabasePresetFolder } from './../../../database/repository/presetFolder'
 import { Button, Paper } from '@mantine/core'
 import { FaLevelUpAlt } from '@react-icons/all-files/fa/FaLevelUpAlt'
@@ -9,6 +9,8 @@ import { useAppSelector } from './../../apis/redux/mainStore'
 import { ApiCall } from './../../apis/wrapper'
 import { PresetFolderIconReact } from './../../Components/ControlPanel/PresetFolderIcon'
 const PresetButton = ({ text, presetId, color }: { text: string; presetId: number; color: string }) => {
+	const navigate = useNavigate()
+
 	return (
 		<Button
 			variant="default"
@@ -18,7 +20,11 @@ const PresetButton = ({ text, presetId, color }: { text: string; presetId: numbe
 				color: pickTextColorBasedOnBgColor(color),
 			})}
 			onClick={() => {
-				ApiCall.get('/presets/recall/' + presetId, {})
+				ApiCall.get('/presets/recall/' + presetId, {}).then(function (value) {
+					if (value.redirect) {
+						navigate(value.redirect)
+					}
+				})
 			}}
 			size="xl"
 			mx="xs"

diff --git a/src/app/Pages/ControlPanel/Utilities.tsx b/src/app/Pages/ControlPanel/Utilities.tsx
diff --git a/src/app/router.tsx b/src/app/router.tsx
@@ -14,7 +14,6 @@ import { FadersConfigurationPage } from './Pages/Admin/Faders'
 import { ControlsConfigurationPage } from './Pages/Admin/Controls'
 import { Locked } from './Components/Locked'
 import { KeypadPage } from './Pages/ControlPanel/Keypad'
-import { UtilitiesPage } from './Pages/ControlPanel/Utilities'
 
 const Router = () => {
 	return (
@@ -30,7 +29,6 @@ const Router = () => {
 				>
 					<Route path="presetFolder/:folderId" element={<PresetPage />} />
 					<Route path="help" element={<HelpPage />} />
-					<Route path="utilities" element={<UtilitiesPage />} />
 					<Route path="lxkeypad" element={<KeypadPage />} />
 				</Route>
 				<Route path="e131sampler" element={<div>Sampling E1.31</div>} />