chore: bump typescript from 5.5.4 to 5.6.2 in /site (#14911)

dependabot[bot] · web-flow · commit f724b03a9038 · 2024-10-01T15:58:12.000-06:00
diff --git a/site/package.json b/site/package.json
@@ -160,7 +160,7 @@
 		"ts-node": "10.9.1",
 		"ts-proto": "1.164.0",
 		"ts-prune": "0.10.3",
-		"typescript": "5.5.4",
+		"typescript": "5.6.2",
 		"vite": "5.4.6",
 		"vite-plugin-checker": "0.7.2",
 		"vite-plugin-turbosnap": "1.0.3"
diff --git a/site/pnpm-lock.yaml b/site/pnpm-lock.yaml
diff --git a/site/src/components/Filter/UserFilter.tsx b/site/src/components/Filter/UserFilter.tsx
@@ -13,10 +13,7 @@ export const useUserFilterMenu = ({
 	value,
 	onChange,
 	enabled,
-}: Pick<
-	UseFilterMenuOptions<SelectFilterOption>,
-	"value" | "onChange" | "enabled"
->) => {
+}: Pick<UseFilterMenuOptions, "value" | "onChange" | "enabled">) => {
 	const { user: me } = useAuthenticated();
 
 	const addMeAsFirstOption = (options: readonly SelectFilterOption[]) => {
diff --git a/site/src/components/Filter/menu.ts b/site/src/components/Filter/menu.ts
@@ -2,28 +2,28 @@ import type { SelectFilterOption } from "components/Filter/SelectFilter";
 import { useMemo, useRef, useState } from "react";
 import { useQuery } from "react-query";
 
-export type UseFilterMenuOptions<TOption extends SelectFilterOption> = {
+export type UseFilterMenuOptions = {
 	id: string;
 	value: string | undefined;
 	// Using null because of react-query
 	// https://tanstack.com/query/v4/docs/react/guides/migrating-to-react-query-4#undefined-is-an-illegal-cache-value-for-successful-queries
-	getSelectedOption: () => Promise<TOption | null>;
-	getOptions: (query: string) => Promise<TOption[]>;
-	onChange: (option: TOption | undefined) => void;
+	getSelectedOption: () => Promise<SelectFilterOption | null>;
+	getOptions: (query: string) => Promise<SelectFilterOption[]>;
+	onChange: (option: SelectFilterOption | undefined) => void;
 	enabled?: boolean;
 };
 
-export const useFilterMenu = <
-	TOption extends SelectFilterOption = SelectFilterOption,
->({
+export const useFilterMenu = ({
 	id,
 	value,
 	getSelectedOption,
 	getOptions,
 	onChange,
 	enabled,
-}: UseFilterMenuOptions<TOption>) => {
-	const selectedOptionsCacheRef = useRef<Record<string, TOption>>({});
+}: UseFilterMenuOptions) => {
+	const selectedOptionsCacheRef = useRef<Record<string, SelectFilterOption>>(
+		{},
+	);
 	const [query, setQuery] = useState("");
 	const selectedOptionQuery = useQuery({
 		queryKey: [id, "autocomplete", "selected", value],
@@ -80,7 +80,7 @@ export const useFilterMenu = <
 		selectedOption,
 	]);
 
-	const selectOption = (option: TOption | undefined) => {
+	const selectOption = (option: SelectFilterOption | undefined) => {
 		if (option) {
 			selectedOptionsCacheRef.current[option.value] = option;
 		}
diff --git a/site/src/modules/tableFiltering/options.tsx b/site/src/modules/tableFiltering/options.tsx
@@ -25,7 +25,7 @@ import type { FC } from "react";
 export const useOrganizationsFilterMenu = ({
 	value,
 	onChange,
-}: Pick<UseFilterMenuOptions<SelectFilterOption>, "value" | "onChange">) => {
+}: Pick<UseFilterMenuOptions, "value" | "onChange">) => {
 	return useFilterMenu({
 		onChange,
 		value,
diff --git a/site/src/pages/AuditPage/AuditFilter.tsx b/site/src/pages/AuditPage/AuditFilter.tsx
@@ -81,7 +81,7 @@ export const AuditFilter: FC<AuditFilterProps> = ({ filter, error, menus }) => {
 export const useActionFilterMenu = ({
 	value,
 	onChange,
-}: Pick<UseFilterMenuOptions<SelectFilterOption>, "value" | "onChange">) => {
+}: Pick<UseFilterMenuOptions, "value" | "onChange">) => {
 	const actionOptions: SelectFilterOption[] = AuditActions.map((action) => ({
 		value: action,
 		label: capitalize(action),
@@ -119,7 +119,7 @@ const ActionMenu: FC<ActionMenuProps> = ({ menu, width }) => {
 export const useResourceTypeFilterMenu = ({
 	value,
 	onChange,
-}: Pick<UseFilterMenuOptions<SelectFilterOption>, "value" | "onChange">) => {
+}: Pick<UseFilterMenuOptions, "value" | "onChange">) => {
 	const actionOptions: SelectFilterOption[] = ResourceTypes.map((type) => {
 		let label = capitalize(type);
 
diff --git a/site/src/pages/UsersPage/UsersFilter.tsx b/site/src/pages/UsersPage/UsersFilter.tsx
@@ -19,7 +19,7 @@ const userFilterQuery = {
 export const useStatusFilterMenu = ({
 	value,
 	onChange,
-}: Pick<UseFilterMenuOptions<SelectFilterOption>, "value" | "onChange">) => {
+}: Pick<UseFilterMenuOptions, "value" | "onChange">) => {
 	const statusOptions: SelectFilterOption[] = [
 		{
 			value: "active",
diff --git a/site/src/pages/WorkspacesPage/filter/menus.tsx b/site/src/pages/WorkspacesPage/filter/menus.tsx
@@ -17,7 +17,7 @@ import { getDisplayWorkspaceStatus } from "utils/workspace";
 export const useTemplateFilterMenu = ({
 	value,
 	onChange,
-}: Pick<UseFilterMenuOptions<SelectFilterOption>, "value" | "onChange">) => {
+}: Pick<UseFilterMenuOptions, "value" | "onChange">) => {
 	return useFilterMenu({
 		onChange,
 		value,
@@ -31,7 +31,7 @@ export const useTemplateFilterMenu = ({
 					label: template.display_name || template.name,
 					value: template.name,
 					startIcon: <TemplateAvatar size="xs" template={template} />,
-				};
+				} satisfies SelectFilterOption;
 			}
 			return null;
 		},
@@ -86,7 +86,7 @@ export const TemplateMenu: FC<TemplateMenuProps> = ({ width, menu }) => {
 export const useStatusFilterMenu = ({
 	value,
 	onChange,
-}: Pick<UseFilterMenuOptions<SelectFilterOption>, "value" | "onChange">) => {
+}: Pick<UseFilterMenuOptions, "value" | "onChange">) => {
 	const statusesToFilter: WorkspaceStatus[] = [
 		"running",
 		"stopped",

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ const userFilterQuery = {`
`19`	`19`	`export const useStatusFilterMenu = ({`
`20`	`20`	`value,`
`21`	`21`	`onChange,`
`22`		`-}: Pick<UseFilterMenuOptions<SelectFilterOption>, "value" \| "onChange">) => {`
	`22`	`+}: Pick<UseFilterMenuOptions, "value" \| "onChange">) => {`
`23`	`23`	`const statusOptions: SelectFilterOption[] = [`
`24`	`24`	`{`
`25`	`25`	`value: "active",`