feat(list): do not show test devices

Firmware E2E is now running against prod, so these devices may show up during the test
bifravst · Jan 20, 2021 · 97b4e37 · 97b4e37
1 parent 2e768d6
commit 97b4e37
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 33 deletions.
diff --git a/src/CatList/CatList.tsx b/src/CatList/CatList.tsx
@@ -39,42 +39,51 @@ export const CatList = ({
 	cats,
 	showButtonWarning,
 	snooze,
+	filterTestDevices,
 }: {
-	cats: { id: string; name: string; labels?: string[] }[]
+	cats: { id: string; name: string; labels?: string[]; isTest?: boolean }[]
+	/**
+	 * Filter out
+	 */
+	filterTestDevices?: boolean
 } & ButtonWarningProps) => (
 	<Table>
 		<tbody>
-			{cats.map(({ id, name, labels }) => {
-				const showWarning = showButtonWarning(id)
-				const Widget = showWarning ? CatWithWarning : Cat
-				return (
-					<tr key={id}>
-						<Widget>
-							<Link to={`/cat/${id}`}>{name}</Link>
-							<span>
-								{labels && (
-									<Labels>
-										{labels.map((name) => (
-											<Badge pill={true} color={'info'}>
-												{name}
-											</Badge>
-										))}
-									</Labels>
-								)}
-								{showWarning && (
-									<ClearButton
-										title="Click to snooze alarm"
-										onClick={() => snooze(id)}
-									>
-										{emojify('🔴')}
-										<RelativeTime ts={showWarning} />
-									</ClearButton>
-								)}
-							</span>
-						</Widget>
-					</tr>
+			{cats
+				.filter(
+					({ isTest }) => (filterTestDevices ?? true ? !isTest : true), // This is so that test devices do not show up here
 				)
-			})}
+				.map(({ id, name, labels }) => {
+					const showWarning = showButtonWarning(id)
+					const Widget = showWarning ? CatWithWarning : Cat
+					return (
+						<tr key={id}>
+							<Widget>
+								<Link to={`/cat/${id}`}>{name}</Link>
+								<span>
+									{labels && (
+										<Labels>
+											{labels.map((name) => (
+												<Badge pill={true} color={'info'}>
+													{name}
+												</Badge>
+											))}
+										</Labels>
+									)}
+									{showWarning && (
+										<ClearButton
+											title="Click to snooze alarm"
+											onClick={() => snooze(id)}
+										>
+											{emojify('🔴')}
+											<RelativeTime ts={showWarning} />
+										</ClearButton>
+									)}
+								</span>
+							</Widget>
+						</tr>
+					)
+				})}
 		</tbody>
 	</Table>
 )
diff --git a/src/aws/Cats/List.tsx b/src/aws/Cats/List.tsx
@@ -37,7 +37,7 @@ const ListCats = ({
 } & ButtonWarningProps) => {
 	const [loading, setLoading] = useState(true)
 	const [cats, setCats] = useState(
-		[] as { id: string; name: string; labels?: string[] }[],
+		[] as { id: string; name: string; labels?: string[]; isTest: boolean }[],
 	)
 	const [error, setError] = useState<Error>()
 
@@ -48,14 +48,14 @@ const ListCats = ({
 			.send(new ListThingsCommand({}))
 			.then(({ things }) => {
 				if (isCancelled) return
-				console.log(things)
 				setCats(
 					(things ?? []).map(({ thingName, attributes }) => ({
 						id: thingName ?? 'unknown',
 						name: attributes?.name ?? thingName ?? 'unknown',
 						labels: Object.entries(attributes ?? {})
 							.filter(([name]) => name !== 'name')
 							.map(([name, value]) => `${name}:${value}`),
+						isTest: attributes?.test !== undefined,
 					})),
 				)
 				setLoading(false)