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

Commit c804674

Browse files
dastrong-codigadastrong-codiga
committed
chore: removed additional unneeded filtering
1 parent 48f8798 commit c804674

File tree

6 files changed

+18
-83
lines changed

6 files changed

+18
-83
lines changed

‎src/renderer/pages/FavoriteCookbooks.tsx‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import CookbookTableEmpty from '../components/CookbookTable/CookbookTableEmpty';
77
import CookbookTableEmptyFiltered from '../components/CookbookTable/CookbookTableEmptyFiltered';
88
import CookbookTable from '../components/CookbookTable/CookbookTable';
99
import { useFilters } from '../components/FiltersContext';
10-
import filterBy from '../components/Filters/filterBy';
1110
import useQueryVariables from '../hooks/useQueryVariables';
1211

1312
export default function FavoriteCookbooks() {
@@ -25,15 +24,6 @@ export default function FavoriteCookbooks() {
2524

2625
const userCookbooks = data?.user?.cookbooks || [];
2726

28-
// check the recipe against the search filters
29-
const filteredCookbooks = userCookbooks.filter((cookbook) => {
30-
if (!filterBy.name(filters, cookbook.name)) return false;
31-
// if (!filterBy.language(filters, cookbook.language)) return false;
32-
if (!filterBy.privacy(filters, cookbook.isPublic)) return false;
33-
if (!filterBy.isSubscribed(filters, cookbook.isSubscribed)) return false;
34-
return true;
35-
});
36-
3727
if (error) {
3828
return <CookbookTableError />;
3929
}
@@ -42,13 +32,13 @@ export default function FavoriteCookbooks() {
4232
return <CookbookTableLoading />;
4333
}
4434

45-
if (filteredCookbooks.length === 0 && !filters.isEmpty) {
35+
if (userCookbooks.length === 0 && !filters.isEmpty) {
4636
return <CookbookTableEmptyFiltered />;
4737
}
4838

49-
if (filteredCookbooks.length === 0) {
39+
if (userCookbooks.length === 0) {
5040
return <CookbookTableEmpty />;
5141
}
5242

53-
return <CookbookTable page="favorite" cookbooks={filteredCookbooks} />;
43+
return <CookbookTable page="favorite" cookbooks={userCookbooks} />;
5444
}

‎src/renderer/pages/FavoriteSnippets.tsx‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import SnippetTableError from '../components/SnippetTable/SnippetTableError';
66
import SnippetTableEmpty from '../components/SnippetTable/SnippetTableEmpty';
77
import SnippetTableEmptyFiltered from '../components/SnippetTable/SnippetTableEmptyFiltered';
88
import SnippetTable from '../components/SnippetTable/SnippetTable';
9-
import filterBy from '../components/Filters/filterBy';
109
import { useFilters } from '../components/FiltersContext';
1110
import useQueryVariables from '../hooks/useQueryVariables';
1211

@@ -25,17 +24,6 @@ export default function MySnippets() {
2524

2625
const userFavoriteRecipes = data?.user?.recipes || [];
2726

28-
// check the recipe against the search filters
29-
const filteredRecipes = userFavoriteRecipes.filter((recipe) => {
30-
if (!filterBy.name(filters, recipe.name)) return false;
31-
if (!filterBy.language(filters, recipe.language)) return false;
32-
if (!filterBy.library(filters, recipe.dependencyConstraints)) return false;
33-
if (!filterBy.tags(filters, recipe.tags)) return false;
34-
if (!filterBy.privacy(filters, recipe.isPublic)) return false;
35-
if (!filterBy.isSubscribed(filters, recipe.isSubscribed)) return false;
36-
return true;
37-
});
38-
3927
if (error) {
4028
return <SnippetTableError />;
4129
}
@@ -44,13 +32,13 @@ export default function MySnippets() {
4432
return <SnippetTableLoading />;
4533
}
4634

47-
if (filteredRecipes.length === 0 && !filters.isEmpty) {
35+
if (userFavoriteRecipes.length === 0 && !filters.isEmpty) {
4836
return <SnippetTableEmptyFiltered />;
4937
}
5038

51-
if (filteredRecipes.length === 0) {
39+
if (userFavoriteRecipes.length === 0) {
5240
return <SnippetTableEmpty />;
5341
}
5442

55-
return <SnippetTable page="favorite" recipes={filteredRecipes} />;
43+
return <SnippetTable page="favorite" recipes={userFavoriteRecipes} />;
5644
}

‎src/renderer/pages/MyCookbooks.tsx‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import CookbookTableEmpty from '../components/CookbookTable/CookbookTableEmpty';
77
import CookbookTableEmptyFiltered from '../components/CookbookTable/CookbookTableEmptyFiltered';
88
import CookbookTable from '../components/CookbookTable/CookbookTable';
99
import { useFilters } from '../components/FiltersContext';
10-
import filterBy from '../components/Filters/filterBy';
1110
import useQueryVariables from '../hooks/useQueryVariables';
1211

1312
export default function MyCookbooks() {
@@ -25,15 +24,6 @@ export default function MyCookbooks() {
2524

2625
const userCookbooks = data?.user?.cookbooks || [];
2726

28-
// check the recipe against the search filters
29-
const filteredCookbooks = userCookbooks.filter((cookbook) => {
30-
if (!filterBy.name(filters, cookbook.name)) return false;
31-
// if (!filterBy.language(filters, cookbook.language)) return false;
32-
if (!filterBy.privacy(filters, cookbook.isPublic)) return false;
33-
if (!filterBy.isSubscribed(filters, cookbook.isSubscribed)) return false;
34-
return true;
35-
});
36-
3727
if (error) {
3828
return <CookbookTableError />;
3929
}
@@ -42,13 +32,13 @@ export default function MyCookbooks() {
4232
return <CookbookTableLoading />;
4333
}
4434

45-
if (filteredCookbooks.length === 0 && !filters.isEmpty) {
35+
if (userCookbooks.length === 0 && !filters.isEmpty) {
4636
return <CookbookTableEmptyFiltered />;
4737
}
4838

49-
if (filteredCookbooks.length === 0) {
39+
if (userCookbooks.length === 0) {
5040
return <CookbookTableEmpty />;
5141
}
5242

53-
return <CookbookTable page="my" cookbooks={filteredCookbooks} />;
43+
return <CookbookTable page="my" cookbooks={userCookbooks} />;
5444
}

‎src/renderer/pages/MySnippets.tsx‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import SnippetTableEmpty from '../components/SnippetTable/SnippetTableEmpty';
77
import SnippetTableEmptyFiltered from '../components/SnippetTable/SnippetTableEmptyFiltered';
88
import SnippetTable from '../components/SnippetTable/SnippetTable';
99
import { useFilters } from '../components/FiltersContext';
10-
import filterBy from '../components/Filters/filterBy';
1110
import useQueryVariables from '../hooks/useQueryVariables';
1211

1312
export default function MySnippets() {
@@ -25,17 +24,6 @@ export default function MySnippets() {
2524

2625
const userRecipes = data?.user?.recipes || [];
2726

28-
// check the recipe against the search filters
29-
const filteredRecipes = userRecipes.filter((recipe) => {
30-
if (!filterBy.name(filters, recipe.name)) return false;
31-
if (!filterBy.language(filters, recipe.language)) return false;
32-
if (!filterBy.library(filters, recipe.dependencyConstraints)) return false;
33-
if (!filterBy.tags(filters, recipe.tags)) return false;
34-
if (!filterBy.privacy(filters, recipe.isPublic)) return false;
35-
if (!filterBy.isSubscribed(filters, recipe.isSubscribed)) return false;
36-
return true;
37-
});
38-
3927
if (error) {
4028
return <SnippetTableError />;
4129
}
@@ -44,13 +32,13 @@ export default function MySnippets() {
4432
return <SnippetTableLoading />;
4533
}
4634

47-
if (filteredRecipes.length === 0 && !filters.isEmpty) {
35+
if (userRecipes.length === 0 && !filters.isEmpty) {
4836
return <SnippetTableEmptyFiltered />;
4937
}
5038

51-
if (filteredRecipes.length === 0) {
39+
if (userRecipes.length === 0) {
5240
return <SnippetTableEmpty />;
5341
}
5442

55-
return <SnippetTable page="my" recipes={filteredRecipes} />;
43+
return <SnippetTable page="my" recipes={userRecipes} />;
5644
}

‎src/renderer/pages/TeamCookbooks.tsx‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import CookbookTableEmpty from '../components/CookbookTable/CookbookTableEmpty';
77
import CookbookTableEmptyFiltered from '../components/CookbookTable/CookbookTableEmptyFiltered';
88
import CookbookTable from '../components/CookbookTable/CookbookTable';
99
import { useFilters } from '../components/FiltersContext';
10-
import filterBy from '../components/Filters/filterBy';
1110
import useQueryVariables from '../hooks/useQueryVariables';
1211

1312
export default function TeamCookbooks() {
@@ -25,14 +24,6 @@ export default function TeamCookbooks() {
2524

2625
const userCookbooks = data?.cookbooks || [];
2726

28-
// check the recipe against the search filters
29-
const filteredCookbooks = userCookbooks.filter((cookbook) => {
30-
if (!filterBy.name(filters, cookbook.name)) return false;
31-
if (!filterBy.privacy(filters, cookbook.isPublic)) return false;
32-
if (!filterBy.isSubscribed(filters, cookbook.isSubscribed)) return false;
33-
return true;
34-
});
35-
3627
if (error) {
3728
return <CookbookTableError />;
3829
}
@@ -41,13 +32,13 @@ export default function TeamCookbooks() {
4132
return <CookbookTableLoading />;
4233
}
4334

44-
if (filteredCookbooks.length === 0 && !filters.isEmpty) {
35+
if (userCookbooks.length === 0 && !filters.isEmpty) {
4536
return <CookbookTableEmptyFiltered />;
4637
}
4738

48-
if (filteredCookbooks.length === 0) {
39+
if (userCookbooks.length === 0) {
4940
return <CookbookTableEmpty />;
5041
}
5142

52-
return <CookbookTable page="team" cookbooks={filteredCookbooks} />;
43+
return <CookbookTable page="team" cookbooks={userCookbooks} />;
5344
}

‎src/renderer/pages/TeamSnippets.tsx‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import SnippetTableError from '../components/SnippetTable/SnippetTableError';
66
import SnippetTableEmpty from '../components/SnippetTable/SnippetTableEmpty';
77
import SnippetTableEmptyFiltered from '../components/SnippetTable/SnippetTableEmptyFiltered';
88
import SnippetTable from '../components/SnippetTable/SnippetTable';
9-
import filterBy from '../components/Filters/filterBy';
109
import { useFilters } from '../components/FiltersContext';
1110
import useQueryVariables from '../hooks/useQueryVariables';
1211

@@ -25,17 +24,6 @@ export default function TeamSnippets() {
2524

2625
const teamRecipes = data?.recipes || [];
2726

28-
// check the recipe against the search filters
29-
const filteredRecipes = teamRecipes.filter((recipe) => {
30-
if (!filterBy.name(filters, recipe.name)) return false;
31-
if (!filterBy.language(filters, recipe.language)) return false;
32-
if (!filterBy.library(filters, recipe.dependencyConstraints)) return false;
33-
if (!filterBy.tags(filters, recipe.tags)) return false;
34-
if (!filterBy.privacy(filters, recipe.isPublic)) return false;
35-
if (!filterBy.isSubscribed(filters, recipe.isSubscribed)) return false;
36-
return true;
37-
});
38-
3927
if (error) {
4028
return <SnippetTableError />;
4129
}
@@ -44,13 +32,13 @@ export default function TeamSnippets() {
4432
return <SnippetTableLoading />;
4533
}
4634

47-
if (filteredRecipes.length === 0 && !filters.isEmpty) {
35+
if (teamRecipes.length === 0 && !filters.isEmpty) {
4836
return <SnippetTableEmptyFiltered />;
4937
}
5038

51-
if (filteredRecipes.length === 0) {
39+
if (teamRecipes.length === 0) {
5240
return <SnippetTableEmpty />;
5341
}
5442

55-
return <SnippetTable page="team" recipes={filteredRecipes} />;
43+
return <SnippetTable page="team" recipes={teamRecipes} />;
5644
}

0 commit comments

Comments
 (0)