From 8823605ea18784cc4a6d1713f125c22afa0f9cf0 Mon Sep 17 00:00:00 2001 From: Glen Davies Date: Thu, 20 Jul 2023 09:57:32 +1200 Subject: [PATCH 1/2] Fix empty general template parts in patterns --- .../edit-site/src/components/page-patterns/patterns-list.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/edit-site/src/components/page-patterns/patterns-list.js b/packages/edit-site/src/components/page-patterns/patterns-list.js index 406999bee09c35..1e86a6c63980f7 100644 --- a/packages/edit-site/src/components/page-patterns/patterns-list.js +++ b/packages/edit-site/src/components/page-patterns/patterns-list.js @@ -27,7 +27,7 @@ import usePatterns from './use-patterns'; import SidebarButton from '../sidebar-button'; import useDebouncedInput from '../../utils/use-debounced-input'; import { unlock } from '../../lock-unlock'; -import { SYNC_TYPES, USER_PATTERN_CATEGORY } from './utils'; +import { SYNC_TYPES, USER_PATTERN_CATEGORY, PATTERNS } from './utils'; import Pagination from './pagination'; const { useLocation, useHistory } = unlock( routerPrivateApis ); @@ -65,7 +65,7 @@ export default function PatternsList( { categoryId, type } ) { const { patterns, isResolving } = usePatterns( type, - categoryId !== 'uncategorized' ? categoryId : '', + type !== PATTERNS || categoryId !== 'uncategorized' ? categoryId : '', { search: deferredFilterValue, syncStatus: From cbe588449b5d8701f53e49e6b41bbc9ec1845a88 Mon Sep 17 00:00:00 2001 From: Kai Hao Date: Thu, 20 Jul 2023 00:46:07 +0800 Subject: [PATCH 2/2] Reword and extract var --- .../edit-site/src/components/page-patterns/patterns-list.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/edit-site/src/components/page-patterns/patterns-list.js b/packages/edit-site/src/components/page-patterns/patterns-list.js index 1e86a6c63980f7..2744359bf0628b 100644 --- a/packages/edit-site/src/components/page-patterns/patterns-list.js +++ b/packages/edit-site/src/components/page-patterns/patterns-list.js @@ -63,9 +63,12 @@ export default function PatternsList( { categoryId, type } ) { const deferredSyncedFilter = useDeferredValue( syncFilter ); + const isUncategorizedThemePatterns = + type === PATTERNS && categoryId === 'uncategorized'; + const { patterns, isResolving } = usePatterns( type, - type !== PATTERNS || categoryId !== 'uncategorized' ? categoryId : '', + isUncategorizedThemePatterns ? '' : categoryId, { search: deferredFilterValue, syncStatus: