Skip to content
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.

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

fix: revert to single-value video gallery dropdown filter #414

Merged
merged 1 commit into from
Nov 30, 2023

Conversation

CefBoud
Copy link
Contributor

@CefBoud CefBoud commented Oct 23, 2023

Description

This PR affects the SelectionModal component used by VideoGallery and SelectImageModal components.

It reverts changes added by #368. The goal is to have a uniform filter & sort UI.

Before

image

After

image

Testing instructions

  1. (Optional) Create a mock videos response with some broken thumbnails
  2. Enable mock video uploads (create waffle flag contentstore.mock_video_uploads enabled for everyone)
  3. Modify videos_index_json() as follows:
def videos_index_json(course):
    index_videos = [
        {
            'edx_video_id': 'aaaaaaaa-aaaa-4aaa-aaaa-aaaaaaaaaaaa',
            'client_video_id': 'video.mp4',
            'created': '1970-01-01T00:00:00Z',
            'duration': 42.5,
            'status': 'Ready',
            'course_video_image_url': 'https://video/images/1234.jpg'
        },
        {
            'edx_video_id': 'aaaaaaaa-aaaa-4aaa-aaaa-aaaaaaaaaaaa',
            'client_video_id': 'video.mp4',
            'created': '1970-01-01T00:00:00Z',
            'duration': 42.5,
            'status': 'Failed',
            'course_video_image_url': 'https://video/images/1234.jpg'
        }
    ]
    return JsonResponse({"videos": index_videos}, status=200)
  1. Enable the new video editor (create waffle flags new_core_editors.use_new_video_editor and new_core_editors.use_video_gallery_flow for everyone)
    Create a course unit with a video

  2. Open the video gallery http://localhost:2001/course/course-v1:edX+DemoX+Demo_Course/editor/course-videos/videoBlockId

  3. Filter by status using the single-value filter dropdown.

private ref: BB-8054

@openedx-webhooks
Copy link

openedx-webhooks commented Oct 23, 2023

Thanks for the pull request, @CefBoud! Please note that it may take us up to several weeks or months to complete a review and merge your PR.

Feel free to add as much of the following information to the ticket as you can:

  • supporting documentation
  • Open edX discussion forum threads
  • timeline information ("this must be merged by XX date", and why that is)
  • partner information ("this is a course on edx.org")
  • any other information that can help Product understand the context for the PR

All technical communication about the code itself will be done via the GitHub pull request interface. As a reminder, our process documentation is here.

Please let us know once your PR is ready for our review and all tests are green.

@openedx-webhooks openedx-webhooks added the open-source-contribution PR author is not from Axim or 2U label Oct 23, 2023
@@ -11,7 +11,7 @@ const MultiSelectFilterDropdown = ({
}) => {
const intl = useIntl();
return (
<Dropdown autoClose={false}>
<Dropdown autoClose="outside">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we convert this into a prop and pass it from the component?

@mphilbrick211 mphilbrick211 added the needs test run Author's first PR to this repository, awaiting test authorization from Axim label Oct 23, 2023
@CefBoud CefBoud force-pushed the CefBoud/filter-dropdown-fix branch from 32222e5 to 087edf0 Compare October 24, 2023 10:59
@e0d e0d removed the needs test run Author's first PR to this repository, awaiting test authorization from Axim label Oct 24, 2023
@farhaanbukhsh
Copy link
Member

@CefBoud please update the description with the template in the handbook. You can have a look at #412.

Copy link
Member

@farhaanbukhsh farhaanbukhsh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

  • ✅ I tested this on the devstack.
  • ✅ I read through the code
  • ❌ I checked for accessibility issues
  • ❌ Includes documentation
  • ❌ I made sure any change in configuration variables is reflected in the corresponding client's configuration-secure repository.

@CefBoud CefBoud changed the title fix: make filter dropdown closable by clicking outside fix: revert to single-value video gallery dropdown filter Oct 26, 2023
@farhaanbukhsh
Copy link
Member

@CefBoud can you remove the draft status please.

@CefBoud CefBoud force-pushed the CefBoud/filter-dropdown-fix branch from 087edf0 to 1710520 Compare October 26, 2023 11:35
@CefBoud CefBoud marked this pull request as ready for review October 26, 2023 11:35
@CefBoud CefBoud force-pushed the CefBoud/filter-dropdown-fix branch from 1710520 to b3e3620 Compare October 26, 2023 11:36
@CefBoud
Copy link
Contributor Author

CefBoud commented Oct 26, 2023

@farhaanbukhsh Description fixed and status changed.

@tecoholic
Copy link

@navinkarkera Another request to add the "jira:2u" label. :)

cc: @cablaa77

@mphilbrick211 mphilbrick211 added the needs test run Author's first PR to this repository, awaiting test authorization from Axim label Nov 14, 2023
@e0d e0d removed the needs test run Author's first PR to this repository, awaiting test authorization from Axim label Nov 20, 2023
@e0d
Copy link

e0d commented Nov 20, 2023

@tecoholic is this blended work?

@mphilbrick211 mphilbrick211 requested a review from a team November 20, 2023 18:28
@mphilbrick211 mphilbrick211 added the waiting for eng review PR is ready for review. Review and merge it, or suggest changes. label Nov 20, 2023
@mphilbrick211
Copy link

Hi @openedx/teaching-and-learning! This is ready for review. Thanks!

@jristau1984 jristau1984 added the jira:2u We want an issue in the 2U Jira instance label Nov 20, 2023
@openedx-webhooks
Copy link

I've created issue TNL-11222 in the private 2U Jira.

@tecoholic
Copy link

@e0d Yes. This is related to the Video Block UX improvements project work.

@KristinAoki KristinAoki merged commit 8928d35 into openedx:main Nov 30, 2023
3 checks passed
@openedx-webhooks
Copy link

@CefBoud 🎉 Your pull request was merged! Please take a moment to answer a two question survey so we can improve your experience in the future.

@tecoholic tecoholic deleted the CefBoud/filter-dropdown-fix branch December 5, 2023 07:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jira:2u We want an issue in the 2U Jira instance open-source-contribution PR author is not from Axim or 2U waiting for eng review PR is ready for review. Review and merge it, or suggest changes.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

8 participants