Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 1, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f38dde
chore: bump typescript from 5.5.4 to 5.6.2 in /site
dependabot[bot] Oct 1, 2024
81d1a73
just do the thing
aslilac Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion site/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
108 changes: 54 additions & 54 deletions site/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions site/src/components/Filter/UserFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[]) => {
Expand Down
20 changes: 10 additions & 10 deletions site/src/components/Filter/menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion site/src/modules/tableFiltering/options.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/AuditPage/AuditFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/UsersPage/UsersFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions site/src/pages/WorkspacesPage/filter/menus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
},
Expand Down Expand Up @@ -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",
Expand Down
Loading