From d13f25ef4711c5ac3622b3043eb246997d405006 Mon Sep 17 00:00:00 2001 From: Divya Bhatt Date: Wed, 16 Oct 2024 14:47:34 +0100 Subject: [PATCH 1/3] Add link for missing background image --- fronts-client/src/components/form/ChefMetaForm.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/fronts-client/src/components/form/ChefMetaForm.tsx b/fronts-client/src/components/form/ChefMetaForm.tsx index 6138af4fc5..48707ceeb0 100644 --- a/fronts-client/src/components/form/ChefMetaForm.tsx +++ b/fronts-client/src/components/form/ChefMetaForm.tsx @@ -119,6 +119,7 @@ const Form = ({ name="chefImageOverride" component={InputImage} criteria={squareImageCriteria} + defaultImageUrl={chef?.bylineImageUrl} /> From b392e8a54f8f198d645ceb3888aec08dc3ab6a50 Mon Sep 17 00:00:00 2001 From: Divya Bhatt Date: Wed, 16 Oct 2024 14:49:13 +0100 Subject: [PATCH 2/3] Use regex to check image from grid (to enable recrop functionality if it is else not) --- fronts-client/src/components/inputs/InputImage.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fronts-client/src/components/inputs/InputImage.tsx b/fronts-client/src/components/inputs/InputImage.tsx index 0f80029bfb..f659569250 100644 --- a/fronts-client/src/components/inputs/InputImage.tsx +++ b/fronts-client/src/components/inputs/InputImage.tsx @@ -257,6 +257,8 @@ interface ComponentState { const dragImage = new Image(); dragImage.src = imageDragIcon; +const regexToCheckGridImage: RegExp = /^https?:\/\/(www\.)?media\.(?:dev-|)guim\.co\.uk\/([0-9a-fA-F]+)\//; + class InputImage extends React.Component { private inputRef = React.createRef(); @@ -306,6 +308,8 @@ class InputImage extends React.Component { ); } + const isImgFromGrid = defaultImageUrl ? regexToCheckGridImage.test(defaultImageUrl) : false; + const hasImage = !useDefault && !!input.value && !!input.value.thumb; const imageUrl = !useDefault && input.value && input.value.thumb @@ -411,7 +415,7 @@ class InputImage extends React.Component { {!!small ? null : } - { > {!!small ? null : } - + )} )} {hasVideo && useDefault && ( From 07c6c30bc913329af6b8f5ab804f3c1af1e61623 Mon Sep 17 00:00:00 2001 From: Divya Bhatt Date: Wed, 16 Oct 2024 17:08:21 +0100 Subject: [PATCH 3/3] IDE Prettier fix Co-authored-by: Emily Bourke --- .../src/components/inputs/InputImage.tsx | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/fronts-client/src/components/inputs/InputImage.tsx b/fronts-client/src/components/inputs/InputImage.tsx index f659569250..2053ffdcc1 100644 --- a/fronts-client/src/components/inputs/InputImage.tsx +++ b/fronts-client/src/components/inputs/InputImage.tsx @@ -257,7 +257,8 @@ interface ComponentState { const dragImage = new Image(); dragImage.src = imageDragIcon; -const regexToCheckGridImage: RegExp = /^https?:\/\/(www\.)?media\.(?:dev-|)guim\.co\.uk\/([0-9a-fA-F]+)\//; +const regexToCheckGridImage: RegExp = + /^https?:\/\/(www\.)?media\.(?:dev-|)guim\.co\.uk\/([0-9a-fA-F]+)\//; class InputImage extends React.Component { private inputRef = React.createRef(); @@ -308,7 +309,9 @@ class InputImage extends React.Component { ); } - const isImgFromGrid = defaultImageUrl ? regexToCheckGridImage.test(defaultImageUrl) : false; + const isImgFromGrid = defaultImageUrl + ? regexToCheckGridImage.test(defaultImageUrl) + : false; const hasImage = !useDefault && !!input.value && !!input.value.thumb; const imageUrl = @@ -415,15 +418,17 @@ class InputImage extends React.Component { {!!small ? null : } - {isImgFromGrid && ( - - {!!small ? null : } - )} + {isImgFromGrid && ( + + + {!!small ? null : } + + )} )} {hasVideo && useDefault && (