Skip to content

improvement: only show uploading card when uploading a video #996

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
Sep 9, 2025
Merged

improvement: only show uploading card when uploading a video #996

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
611de15
Update Caps.tsx
ameer2468 Sep 9, 2025
949888e
Update FolderVideosSection.tsx
ameer2468 Sep 9, 2025
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
47 changes: 26 additions & 21 deletions apps/web/app/(org)/dashboard/caps/Caps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export const Caps = ({
setIsUploading,
setUploadingCapId,
setUploadProgress,
uploadingCapId,
setUploadingThumbnailUrl,
} = useUploadingContext();

Expand Down Expand Up @@ -321,27 +322,31 @@ export const Caps = ({
{isUploading && (
<UploadPlaceholderCard key={"upload-placeholder"} />
)}
{data.map((cap) => (
<CapCard
key={cap.id}
cap={cap}
analytics={analytics[cap.id] || 0}
onDelete={() => {
if (selectedCaps.length > 0) {
deleteCaps(selectedCaps);
} else {
deleteCap(cap.id);
}
}}
userId={user?.id}
customDomain={customDomain}
isLoadingAnalytics={isLoadingAnalytics}
domainVerified={domainVerified}
isSelected={selectedCaps.includes(cap.id)}
anyCapSelected={anyCapSelected}
onSelectToggle={() => handleCapSelection(cap.id)}
/>
))}
{data
.filter((cap) => !isUploading || cap.id !== uploadingCapId)
.map((cap) => {
return (
<CapCard
key={cap.id}
cap={cap}
analytics={analytics[cap.id] || 0}
onDelete={() => {
if (selectedCaps.length > 0) {
deleteCaps(selectedCaps);
} else {
deleteCap(cap.id);
}
}}
userId={user?.id}
customDomain={customDomain}
isLoadingAnalytics={isLoadingAnalytics}
domainVerified={domainVerified}
isSelected={selectedCaps.includes(cap.id)}
anyCapSelected={anyCapSelected}
onSelectToggle={() => handleCapSelection(cap.id)}
/>
);
})}
</div>
</>
)}
Expand Down
32 changes: 17 additions & 15 deletions apps/web/app/(org)/dashboard/folder/[id]/components/FolderVideosSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default function FolderVideosSection({
cardType = "default",
}: FolderVideosSectionProps) {
const router = useRouter();
const { isUploading } = useUploadingContext();
const { isUploading, uploadingCapId } = useUploadingContext();
const { activeOrganization, user } = useDashboardContext();

const [selectedCaps, setSelectedCaps] = useState<Video.VideoId[]>([]);
Expand Down Expand Up @@ -164,20 +164,22 @@ export default function FolderVideosSection({
{isUploading && (
<UploadPlaceholderCard key={"upload-placeholder"} />
)}
{initialVideos.map((video) => (
<CapCard
key={video.id}
cap={video}
analytics={analytics[video.id] || 0}
userId={user?.id}
isLoadingAnalytics={isLoadingAnalytics}
isSelected={selectedCaps.includes(video.id)}
anyCapSelected={selectedCaps.length > 0}
isDeleting={deleteCaps.isPending}
onSelectToggle={() => handleCapSelection(video.id)}
onDelete={() => deleteCaps.mutateAsync(selectedCaps)}
/>
))}
{initialVideos
.filter((cap) => !isUploading || cap.id !== uploadingCapId)
.map((video) => (
<CapCard
key={video.id}
cap={video}
analytics={analytics[video.id] || 0}
userId={user?.id}
isLoadingAnalytics={isLoadingAnalytics}
isSelected={selectedCaps.includes(video.id)}
anyCapSelected={selectedCaps.length > 0}
isDeleting={deleteCaps.isPending}
onSelectToggle={() => handleCapSelection(video.id)}
onDelete={() => deleteCaps.mutateAsync(selectedCaps)}
/>
))}
</>
)}
</div>
Expand Down
Loading