Skip to content

Update Retake Button [TOYOTA] #431

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
merged 2 commits into from
Feb 13, 2023
Merged

Update Retake Button [TOYOTA] #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8abbbb
Updated the label of retake all in french
Feb 13, 2023
65d81f0
Hide the retake all button when there is no picture to retake
Feb 13, 2023
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
6 changes: 3 additions & 3 deletions packages/camera/src/components/UploadCenter/UploadCard/hooks/useVariant.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function useThumbnail({
label: t('uploadCenter.variant.retake.label'),
icon: 'camera-retake',
callback: handleRetake,
sublable: t('uploadCenter.variant.retake.sublabel'),
sublabel: t('uploadCenter.variant.retake.sublabel'),
color: colors.error,
};
}
Expand All @@ -32,7 +32,7 @@ export default function useThumbnail({
label: t('uploadCenter.variant.recheck.label'),
icon: 'alert-circle',
callback: handleRecheck,
sublable: t('uploadCenter.variant.recheck.sublabel'),
sublabel: t('uploadCenter.variant.recheck.sublabel'),
color: colors.disabled,
};
}
Expand All @@ -41,7 +41,7 @@ export default function useThumbnail({
label: t('uploadCenter.variant.retake.label'),
icon: 'camera-retake',
callback: handleRetake,
sublable: t('uploadCenter.variant.retake.sublabel'),
sublabel: t('uploadCenter.variant.retake.sublabel'),
color: colors.accent,
};
}, [isPending, isComplianceFailed, isComplianceIdle, isUploadFailed,
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/src/components/UploadCenter/UploadCard/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ function UploadCard({
{variant?.callback
? (
<TouchableOpacity onPress={variant.callback}>
<Text style={{ fontWeight: 'bold' }}>{`, ${variant.sublable}`}</Text>
<Text style={{ fontWeight: 'bold' }}>{`, ${variant.sublabel}`}</Text>
</TouchableOpacity>
)
: null}
Expand Down
30 changes: 20 additions & 10 deletions packages/camera/src/components/UploadCenter/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,14 @@ export default function UploadCenter({
onComplianceCheckStart();
}, [onComplianceCheckStart]);

const displayRetakeAll = useMemo(
() => Object.values(uploads.state).some((u) => !!u.error) || Object.values(compliance.state)
.some((c) => ['rejected', 'unsatisfied'].includes(c.status)
|| c?.result?.data?.compliances?.image_quality_assessment?.is_compliant === false
|| c?.result?.data?.compliances?.zoom_level?.is_compliant === false),
[compliance, uploads],
);

const statEventsData = useMemo(() => ({
retakesNeeded: ids.length,
compliances: Object.entries(compliance.state)
Expand Down Expand Up @@ -210,16 +218,18 @@ export default function UploadCenter({

{/* actions */}
<View style={styles.actions}>
<Button
onPress={handleRetakeAll}
colors={colors}
color={colors.actions.primary}
disabled={!hasFulfilledAllUploads}
>
<Text style={{ color: colors.actions.primary.text || colors.text }}>
{`${t('uploadCenter.view.retakeAll')} ${ids.length ? `(${ids.length})` : ''}`}
</Text>
</Button>
{displayRetakeAll ? (
<Button
onPress={handleRetakeAll}
colors={colors}
color={colors.actions.primary}
disabled={!hasFulfilledAllUploads}
>
<Text style={{ color: colors.actions.primary.text || colors.text }}>
{`${t('uploadCenter.view.retakeAll')} ${ids.length ? `(${ids.length})` : ''}`}
</Text>
</Button>
) : null}
<Button
colors={colors}
color={colors.actions.secondary}
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/src/i18n/resources/fr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const fr = {
tooMuchTodo: 'Impossible de vérifier toutes les images, cela pourrait affecter la précision des résultats',
allRejected: 'Impossible d\'upload les images, veuillez réessayer',
loading: 'Chargement...',
retakeAll: 'Recommencer tout',
retakeAll: 'Reprendre ces photos',
submit: 'Passer',
},
subtitle: {
Expand Down