Skip to content

VideoPress: Fix local video listed as VideoPress video #28237

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
dhasilva merged 2 commits into from
Jan 9, 2023
Merged

VideoPress: Fix local video listed as VideoPress video #28237

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
21cbfc1
add isLocalVideo flag to VideoRow
dhasilva Jan 9, 2023
ff1fcf4
changelog
dhasilva Jan 9, 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
4 changes: 4 additions & 0 deletions projects/packages/videopress/changelog/fix-videopress-local-video-listed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

VideoPress: Fix local video listed as VideoPress video
4 changes: 2 additions & 2 deletions projects/packages/videopress/src/client/admin/components/video-list/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { useState } from 'react';
*/
import { VIDEO_PRIVACY_LEVELS, VIDEO_PRIVACY_LEVEL_PRIVATE } from '../../../state/constants';
import Checkbox from '../checkbox';
import ConnectVideoRow, { VideoRow, Stats } from '../video-row';
import ConnectVideoRow, { LocalVideoRow, Stats } from '../video-row';
import styles from './style.module.scss';
/**
* Types
Expand Down Expand Up @@ -151,7 +151,7 @@ export const LocalVideoList = ( {
return null;
}
return (
<VideoRow
<LocalVideoRow
key={ `local-video-${ video.id }` }
id={ video.id }
title={ video.title }
Expand Down
9 changes: 8 additions & 1 deletion projects/packages/videopress/src/client/admin/components/video-row/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ export const VideoRow = ( {
disableActionButton = false,
disabled = false,
uploadProgress,
isLocalVideo = false,
}: VideoRowProps ) => {
const textRef = useRef( null );
const checkboxRef = useRef( null );
Expand Down Expand Up @@ -320,11 +321,17 @@ export const VideoRow = ( {
) }
</div>

<PublishFirstVideoPopover id={ id } anchor={ anchor } position="top center" />
{ ! isLocalVideo && (
<PublishFirstVideoPopover id={ id } anchor={ anchor } position="top center" />
) }
</div>
);
};

export const LocalVideoRow = ( props: VideoRowProps ) => {
return <VideoRow isLocalVideo={ true } { ...props } />;
};

export const ConnectVideoRow = ( { id, ...restProps }: VideoRowProps ) => {
const { isDeleting, uploading, processing, isUpdatingPoster, data, uploadProgress } = useVideo(
id
Expand Down
4 changes: 4 additions & 0 deletions projects/packages/videopress/src/client/admin/components/video-row/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ type VideoRowBaseProps = {
* Adornment to be showed after title.
*/
disableActionButton?: boolean;
/**
* True when row is used to show a local video.
*/
isLocalVideo?: boolean;
};

type VideoPressVideoProps = VideoRowBaseProps &
Expand Down