fix endpoints after font collection rest controller improvements

woocommerce · Jan 29, 2024 · fcc774b · fcc774b
1 parent e534157
commit fcc774b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/plugins/woocommerce-admin/client/customize-store/design-without-ai/fonts.ts b/plugins/woocommerce-admin/client/customize-store/design-without-ai/fonts.ts
@@ -9,6 +9,12 @@ import apiFetch from '@wordpress/api-fetch';
 import { FONT_FAMILIES_TO_INSTALL } from '../assembler-hub/sidebar/global-styles/font-pairing-variations/constants';
 import { FontFace, FontFamiliesToInstall, FontFamily } from '../types/font';
 
+export type FontCollectionsResponse = Array< {
+	slug: string;
+	description: string;
+	name: string;
+} >;
+
 export type FontCollectionResponse = {
 	slug: string;
 	name: string;

diff --git a/plugins/woocommerce-admin/client/customize-store/design-without-ai/services.ts b/plugins/woocommerce-admin/client/customize-store/design-without-ai/services.ts
@@ -19,6 +19,7 @@ import {
 	installFontFace,
 	installFontFamily,
 	getFontFamiliesAndFontFaceToInstall,
+	FontCollectionsResponse,
 } from './fonts';
 
 const assembleSite = async () => {
@@ -54,11 +55,6 @@ const installAndActivateTheme = async () => {
 };
 
 const installFontFamilies = async () => {
-	const config = {
-		path: '/wp/v2/font-collections/default-font-collection',
-		method: 'GET',
-	};
-
 	try {
 		const installedFontFamily = ( await resolveSelect(
 			'core'
@@ -84,9 +80,15 @@ const installFontFamilies = async () => {
 			} )
 		);
 
-		const fontCollection = await apiFetch< FontCollectionResponse >(
-			config
-		);
+		const fontCollections = await apiFetch< FontCollectionsResponse >( {
+			path: '/wp/v2/font-collections?_fields=slug,name,description,id',
+			method: 'GET',
+		} );
+
+		const fontCollection = await apiFetch< FontCollectionResponse >( {
+			path: `/wp/v2/font-collections/${ fontCollections[ 0 ].slug }`,
+			method: 'GET',
+		} );
 
 		const { fontFacesToInstall, fontFamiliesWithFontFacesToInstall } =
 			getFontFamiliesAndFontFaceToInstall(