Skip to content
This repository was archived by the owner on May 4, 2023. It is now read-only.

Commit 422684f

Browse files
dastrong-codigadastrong-codiga
committed
fix: updated pages to use new hook
1 parent d9cbd6b commit 422684f

File tree

7 files changed

+22
-58
lines changed

7 files changed

+22
-58
lines changed

‎src/renderer/pages/FavoriteCookbooks.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { useQuery } from '@apollo/client';
22
import { GET_USER_SUBSCRIBED_COOKBOOKS } from '../graphql/queries';
3-
import { GET_USER_SUBSCRIBED_COOKBOOKS_VARIABLES } from '../graphql/variables';
43
import { AssistantCookbook } from '../types/assistantTypes';
54
import CookbookTableLoading from '../components/CookbookTable/CookbookTableLoading';
65
import CookbookTableError from '../components/CookbookTable/CookbookTableError';
@@ -9,17 +8,16 @@ import CookbookTableEmptyFiltereed from '../components/CookbookTable/CookbookTab
98
import CookbookTable from '../components/CookbookTable/CookbookTable';
109
import { useFilters } from '../components/FiltersContext';
1110
import filterBy from '../components/Filters/filterBy';
11+
import useQueryVariables from '../hooks/useQueryVariables';
1212

1313
export default function FavoriteCookbooks() {
1414
const filters = useFilters();
15+
const variables = useQueryVariables('favorite-cookbooks');
1516

1617
const { data, loading, error } = useQuery<{
1718
user: { cookbooks: AssistantCookbook[] };
1819
}>(GET_USER_SUBSCRIBED_COOKBOOKS, {
19-
variables: {
20-
...GET_USER_SUBSCRIBED_COOKBOOKS_VARIABLES,
21-
name: filters.searchTerm,
22-
},
20+
variables,
2321
context: {
2422
debounceKey: 'favorite-cookbooks',
2523
},

‎src/renderer/pages/FavoriteSnippets.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { useQuery } from '@apollo/client';
22
import { GET_USER_SUBSCRIBED_RECIPES } from '../graphql/queries';
3-
import { GET_USER_SUBSCRIBED_RECIPES_VARIABLES } from '../graphql/variables';
43
import { AssistantRecipeWithStats } from '../types/assistantTypes';
54
import SnippetTableLoading from '../components/SnippetTable/SnippetTableLoading';
65
import SnippetTableError from '../components/SnippetTable/SnippetTableError';
@@ -9,17 +8,16 @@ import SnippetTableEmptyFiltered from '../components/SnippetTable/SnippetTableEm
98
import SnippetTable from '../components/SnippetTable/SnippetTable';
109
import filterBy from '../components/Filters/filterBy';
1110
import { useFilters } from '../components/FiltersContext';
11+
import useQueryVariables from '../hooks/useQueryVariables';
1212

1313
export default function MySnippets() {
1414
const filters = useFilters();
15+
const variables = useQueryVariables('favorite-snippets');
1516

1617
const { data, loading, error } = useQuery<{
1718
user: { recipes: AssistantRecipeWithStats[] };
1819
}>(GET_USER_SUBSCRIBED_RECIPES, {
19-
variables: {
20-
...GET_USER_SUBSCRIBED_RECIPES_VARIABLES,
21-
name: filters.searchTerm,
22-
},
20+
variables,
2321
context: {
2422
debounceKey: 'favorite-snippets',
2523
},

‎src/renderer/pages/Home.tsx

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { useQuery } from '@apollo/client';
2+
import useQueryVariables from '../hooks/useQueryVariables';
23
import { useFilters } from '../components/FiltersContext';
34
import SearchResults from '../components/SearchResults';
45
import SearchResultsEmpty from '../components/SearchResults/SearchResultsEmpty';
@@ -9,29 +10,16 @@ import {
910
GetRecipesSemanticallyVariables,
1011
GET_RECIPES_SEMANTICALLY,
1112
} from '../graphql/queries';
12-
import { Language } from '../lib/constants';
1313

1414
export default function Home() {
1515
const filters = useFilters();
16+
const variables = useQueryVariables('home');
1617

1718
const { data, loading, error } = useQuery<
1819
GetRecipesSemanticallyData,
1920
GetRecipesSemanticallyVariables
2021
>(GET_RECIPES_SEMANTICALLY, {
21-
variables: {
22-
howmany: 100,
23-
skip: 0,
24-
languages:
25-
filters.language && filters.language !== Language.ALL_LANGUAGES
26-
? [filters.language]
27-
: null,
28-
dependencies: filters.library ? [filters.library] : null,
29-
term: filters.searchTerm || null,
30-
tags: filters.tags ? [filters.tags] : null,
31-
onlyPrivate: filters.privacy === 'private' ? true : null,
32-
onlyPublic: filters.privacy === 'public' ? true : null,
33-
onlySubscribed: filters.isSubscribed || null,
34-
},
22+
variables: variables as GetRecipesSemanticallyVariables,
3523
context: {
3624
debounceKey: 'search',
3725
},

‎src/renderer/pages/MyCookbooks.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { useQuery } from '@apollo/client';
2-
import { GET_USER_COOKBOOKS_VARIABLES } from '../graphql/variables';
32
import { GET_USER_COOKBOOKS } from '../graphql/queries';
43
import { AssistantCookbook } from '../types/assistantTypes';
54
import CookbookTableLoading from '../components/CookbookTable/CookbookTableLoading';
@@ -9,17 +8,16 @@ import CookbookTableEmptyFiltereed from '../components/CookbookTable/CookbookTab
98
import CookbookTable from '../components/CookbookTable/CookbookTable';
109
import { useFilters } from '../components/FiltersContext';
1110
import filterBy from '../components/Filters/filterBy';
11+
import useQueryVariables from '../hooks/useQueryVariables';
1212

1313
export default function MyCookbooks() {
1414
const filters = useFilters();
15+
const variables = useQueryVariables('my-cookbooks');
1516

1617
const { data, loading, error } = useQuery<{
1718
user: { cookbooks: AssistantCookbook[] };
1819
}>(GET_USER_COOKBOOKS, {
19-
variables: {
20-
...GET_USER_COOKBOOKS_VARIABLES,
21-
name: filters.searchTerm,
22-
},
20+
variables,
2321
context: {
2422
debounceKey: 'my-cookbooks',
2523
},

‎src/renderer/pages/MySnippets.tsx

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,23 @@
11
import { useQuery } from '@apollo/client';
22
import { GET_USER_RECIPES } from '../graphql/queries';
3-
import { GET_USER_RECIPES_VARIABLES } from '../graphql/variables';
43
import { AssistantRecipeWithStats } from '../types/assistantTypes';
54
import SnippetTableLoading from '../components/SnippetTable/SnippetTableLoading';
65
import SnippetTableError from '../components/SnippetTable/SnippetTableError';
76
import SnippetTableEmpty from '../components/SnippetTable/SnippetTableEmpty';
7+
import SnippetTableEmptyFiltered from '../components/SnippetTable/SnippetTableEmptyFiltered';
88
import SnippetTable from '../components/SnippetTable/SnippetTable';
99
import { useFilters } from '../components/FiltersContext';
1010
import filterBy from '../components/Filters/filterBy';
11-
import SnippetTableEmptyFiltered from '../components/SnippetTable/SnippetTableEmptyFiltered';
12-
import { Language } from '../lib/constants';
11+
import useQueryVariables from '../hooks/useQueryVariables';
1312

1413
export default function MySnippets() {
1514
const filters = useFilters();
15+
const variables = useQueryVariables('my-snippets');
1616

1717
const { data, loading, error } = useQuery<{
1818
user: { recipes: AssistantRecipeWithStats[] };
1919
}>(GET_USER_RECIPES, {
20-
variables: {
21-
...GET_USER_RECIPES_VARIABLES,
22-
name: filters.searchTerm,
23-
language:
24-
filters.language && filters.language !== Language.ALL_LANGUAGES
25-
? filters.language
26-
: null,
27-
tag: filters.tags || null,
28-
},
20+
variables,
2921
context: {
3022
debounceKey: 'my-snippets',
3123
},

‎src/renderer/pages/TeamCookbooks.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { useQuery } from '@apollo/client';
22
import { GET_SHARED_COOKBOOKS } from '../graphql/queries';
3-
import { GET_SHARED_COOKBOOKS_VARIABLES } from '../graphql/variables';
43
import { AssistantCookbook } from '../types/assistantTypes';
54
import CookbookTableLoading from '../components/CookbookTable/CookbookTableLoading';
65
import CookbookTableError from '../components/CookbookTable/CookbookTableError';
@@ -9,17 +8,16 @@ import CookbookTableEmptyFiltereed from '../components/CookbookTable/CookbookTab
98
import CookbookTable from '../components/CookbookTable/CookbookTable';
109
import { useFilters } from '../components/FiltersContext';
1110
import filterBy from '../components/Filters/filterBy';
11+
import useQueryVariables from '../hooks/useQueryVariables';
1212

1313
export default function TeamCookbooks() {
1414
const filters = useFilters();
15+
const variables = useQueryVariables('team-cookbooks');
1516

1617
const { data, loading, error } = useQuery<{
1718
cookbooks: AssistantCookbook[];
1819
}>(GET_SHARED_COOKBOOKS, {
19-
variables: {
20-
...GET_SHARED_COOKBOOKS_VARIABLES,
21-
name: filters.searchTerm,
22-
},
20+
variables,
2321
context: {
2422
debounceKey: 'team-cookbooks',
2523
},

‎src/renderer/pages/TeamSnippets.tsx

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { useQuery } from '@apollo/client';
22
import { GET_SHARED_RECIPES } from '../graphql/queries';
3-
import { GET_SHARED_RECIPES_VARIABLES } from '../graphql/variables';
43
import { AssistantRecipeWithStats } from '../types/assistantTypes';
54
import SnippetTableLoading from '../components/SnippetTable/SnippetTableLoading';
65
import SnippetTableError from '../components/SnippetTable/SnippetTableError';
@@ -9,23 +8,16 @@ import SnippetTableEmptyFiltereed from '../components/SnippetTable/SnippetTableE
98
import SnippetTable from '../components/SnippetTable/SnippetTable';
109
import filterBy from '../components/Filters/filterBy';
1110
import { useFilters } from '../components/FiltersContext';
12-
import { Language } from '../lib/constants';
11+
import useQueryVariables from '../hooks/useQueryVariables';
1312

1413
export default function TeamSnippets() {
1514
const filters = useFilters();
15+
const variables = useQueryVariables('team-snippets');
1616

1717
const { data, loading, error } = useQuery<{
1818
recipes: AssistantRecipeWithStats[];
1919
}>(GET_SHARED_RECIPES, {
20-
variables: {
21-
...GET_SHARED_RECIPES_VARIABLES,
22-
name: filters.searchTerm,
23-
languages:
24-
filters.language && filters.language !== Language.ALL_LANGUAGES
25-
? [filters.language]
26-
: null,
27-
tag: filters.tags || null,
28-
},
20+
variables,
2921
context: {
3022
debounceKey: 'team-snippets',
3123
},

0 commit comments

Comments
 (0)