From d41895953b961e7b1b9da023497cd77809c9abe0 Mon Sep 17 00:00:00 2001 From: TheCatLady <52870424+TheCatLady@users.noreply.github.com> Date: Tue, 8 Jun 2021 12:12:28 -0400 Subject: [PATCH] refactor: clean up collection part request status logic --- .../RequestModal/CollectionRequestModal.tsx | 66 ++++++++----------- 1 file changed, 27 insertions(+), 39 deletions(-) diff --git a/src/components/RequestModal/CollectionRequestModal.tsx b/src/components/RequestModal/CollectionRequestModal.tsx index 00c3b03e71..f226022701 100644 --- a/src/components/RequestModal/CollectionRequestModal.tsx +++ b/src/components/RequestModal/CollectionRequestModal.tsx @@ -339,6 +339,12 @@ const CollectionRequestModal: React.FC = ({ {data?.parts.map((part) => { const partRequest = getPartRequest(part.id); + const partMedia = + part.mediaInfo && + part.mediaInfo[is4k ? 'status4k' : 'status'] !== + MediaStatus.UNKNOWN + ? part.mediaInfo + : undefined; return ( @@ -347,10 +353,7 @@ const CollectionRequestModal: React.FC = ({ role="checkbox" tabIndex={0} aria-checked={ - (part.mediaInfo && - part.mediaInfo[is4k ? 'status4k' : 'status'] !== - MediaStatus.UNKNOWN) || - isSelectedPart(part.id) + !!partMedia || isSelectedPart(part.id) } onClick={() => togglePart(part.id)} onKeyDown={(e) => { @@ -359,13 +362,11 @@ const CollectionRequestModal: React.FC = ({ } }} className={`pt-2 relative inline-flex items-center justify-center flex-shrink-0 h-5 w-10 cursor-pointer focus:outline-none ${ - (part.mediaInfo && - part.mediaInfo[is4k ? 'status4k' : 'status'] !== - MediaStatus.UNKNOWN) || + !!partMedia || + partRequest || (quota?.movie.limit && currentlyRemaining <= 0 && - !isSelectedPart(part.id)) || - partRequest + !isSelectedPart(part.id)) ? 'opacity-50' : '' }`} @@ -373,10 +374,7 @@ const CollectionRequestModal: React.FC = ({