Skip to content

Cleanup/font library view error handling #57926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikachan merged 16 commits into from
Jan 17, 2024
Merged

Cleanup/font library view error handling #57926

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9facbad
Add batchInstallFontFaces function and related plumbing.
jffng Jan 15, 2024
3c65771
Fix resolver name.
jffng Jan 15, 2024
2ba4fc4
Add embedding and rebuild theme.json settings for fontFamily.
jffng Jan 15, 2024
73bd4d9
Handle responses directly, add to collection before activating. Remov…
jffng Jan 15, 2024
c251a31
Remove getIntersectingFontFaces.
jffng Jan 15, 2024
94b32c5
Check for existing font family before installing.
jffng Jan 16, 2024
ac9f29d
Reference src, not uploadedFile key.
jffng Jan 16, 2024
6648afc
Check for existing font family using GET /font-families?slug=.
jffng Jan 16, 2024
1c0f335
Filter already installed font faces (determined by matching fontWeigh…
pbking Jan 17, 2024
1c9b7f3
moved response processing into the resolver for fetchGetFontFamilyBySlug
pbking Jan 17, 2024
cf2b95c
Moved response processing for font family installation to the resolver
pbking Jan 17, 2024
5b82fc0
Refactored font face installation process to handle errors more cleanly
pbking Jan 17, 2024
3a0c693
resolved conflicts
pbking Jan 17, 2024
9fe6ec1
Cleanup error handling for font library view
pbking Jan 17, 2024
406fb29
Add i18n function to error messages
mikachan Jan 17, 2024
c960acb
Add TODO comment for uninstall notice
mikachan Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Check for existing font family using GET /font-families?slug=.
  • Loading branch information
@jffng
jffng committed Jan 16, 2024
commit 6648afc527c67e1c2b386df8990998f9a28e632a
11 changes: 8 additions & 3 deletions packages/edit-site/src/components/global-styles/font-library-modal/context.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
* Internal dependencies
*/
import {
fetchGetFontFamilyBySlug,
fetchInstallFontFamily,
fetchUninstallFonts,
fetchFontCollections,
Expand Down Expand Up @@ -203,9 +204,13 @@ function FontLibraryProvider( { children } ) {
setIsInstalling( true );
try {
// Get the ID of the font family post, if it is already installed.
let fontFamilyId = libraryPosts.filter(
( post ) => post.font_family_settings.slug === font.slug
)[ 0 ]?.id;
let fontFamilyId = await fetchGetFontFamilyBySlug( font.slug )
.then( ( response ) => response?.[ 0 ]?.id )
.catch( ( e ) => {
// eslint-disable-next-line no-console
console.error( e );
return null;
} );

// Otherwise, install it.
if ( ! fontFamilyId ) {
Expand Down
8 changes: 8 additions & 0 deletions packages/edit-site/src/components/global-styles/font-library-modal/resolvers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ export async function fetchInstallFontFace( fontFamilyId, data ) {
return apiFetch( config );
}

export async function fetchGetFontFamilyBySlug( slug ) {
const config = {
path: `/wp/v2/font-families?slug=${ slug }`,
method: 'GET',
};
return apiFetch( config );
}

export async function fetchUninstallFonts( fonts ) {
const data = {
font_families: fonts,
Expand Down