Skip to content

Commit 09e7a01

Browse files
committed
chore: handle merge changes
1 parent 48b99b6 commit 09e7a01

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

site/src/components/OrganizationAutocomplete/OrganizationAutocomplete.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
useState,
1010
} from "react";
1111
import { useQuery } from "react-query";
12-
import { myOrganizations } from "api/queries/users";
12+
import { organizations } from "api/queries/organizations";
1313
import type { Organization } from "api/typesGenerated";
1414
import { Avatar } from "components/Avatar/Avatar";
1515
import { AvatarData } from "components/AvatarData/AvatarData";
@@ -46,7 +46,7 @@ export const OrganizationAutocomplete: FC<OrganizationAutocompleteProps> = ({
4646
// enabled: autoComplete.open,
4747
// keepPreviousData: true,
4848
// });
49-
const organizationsQuery = useQuery(myOrganizations());
49+
const organizationsQuery = useQuery(organizations());
5050

5151
const { debounced: debouncedInputOnChange } = useDebouncedFunction(
5252
(event: ChangeEvent<HTMLInputElement>) => {

site/src/pages/CreateTemplatesGalleryPage/CreateTemplatesPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { Margins } from "components/Margins/Margins";
1313
import { OrganizationAutocomplete } from "components/OrganizationAutocomplete/OrganizationAutocomplete";
1414
import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
1515
// import { useDashboard } from "modules/dashboard/useDashboard";
16-
import type { StarterTemplatesByTag } from "utils/starterTemplates";
16+
import type { StarterTemplatesByTag } from "utils/templateAggregators";
1717
import { StarterTemplates } from "./StarterTemplates";
1818

1919
export interface CreateTemplatePageViewProps {

site/src/pages/CreateTemplatesGalleryPage/StarterTemplates.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { FC } from "react";
33
import { Link, useSearchParams } from "react-router-dom";
44
import { Stack } from "components/Stack/Stack";
55
import { TemplateExampleCard } from "modules/templates/TemplateExampleCard/TemplateExampleCard";
6-
import type { StarterTemplatesByTag } from "utils/starterTemplates";
6+
import type { StarterTemplatesByTag } from "utils/templateAggregators";
77

88
const getTagLabel = (tag: string) => {
99
const labelByTag: Record<string, string> = {

site/src/pages/CreateTemplatesGalleryPage/StarterTemplatesPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
PageHeaderSubtitle,
88
PageHeaderTitle,
99
} from "components/PageHeader/PageHeader";
10-
import type { StarterTemplatesByTag } from "utils/starterTemplates";
10+
import type { StarterTemplatesByTag } from "utils/templateAggregators";
1111
import { StarterTemplates } from "./StarterTemplates";
1212

1313
export interface StarterTemplatesPageViewProps {

0 commit comments

Comments
 (0)