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: allow to preview images #1403

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

Ian2012
Copy link
Contributor

@Ian2012 Ian2012 commented Oct 18, 2024

Description

This PR allows to preview images on the text editor for Libraries.

Supporting information

Closes #1358
Depends on openedx/edx-platform#35681

Testing instructions

Please provide detailed step-by-step instructions for testing this change.

Screenshots

image
image
image

@openedx-webhooks openedx-webhooks added the open-source-contribution PR author is not from Axim or 2U label Oct 18, 2024
@openedx-webhooks
Copy link

openedx-webhooks commented Oct 18, 2024

Thanks for the pull request, @Ian2012!

What's next?

Please work through the following steps to get your changes ready for engineering review:

🔘 Get product approval

If you haven't already, check this list to see if your contribution needs to go through the product review process.

  • If it does, you'll need to submit a product proposal for your contribution, and have it reviewed by the Product Working Group.
    • This process (including the steps you'll need to take) is documented here.
  • If it doesn't, simply proceed with the next step.

🔘 Provide context

To help your reviewers and other members of the community understand the purpose and larger context of your changes, feel free to add as much of the following information to the PR description as you can:

  • Dependencies

    This PR must be merged before / after / at the same time as ...

  • Blockers

    This PR is waiting for OEP-1234 to be accepted.

  • Timeline information

    This PR must be merged by XX date because ...

  • Partner information

    This is for a course on edx.org.

  • Supporting documentation
  • Relevant Open edX discussion forum threads

🔘 Get a green build

If one or more checks are failing, continue working on your changes until this is no longer the case and your build turns green.

🔘 Let us know that your PR is ready for review:

Who will review my changes?

This repository is currently maintained by @openedx/2u-tnl. Tag them in a comment and let them know that your changes are ready for review.

Where can I find more information?

If you'd like to get more details on all aspects of the review process for open source pull requests (OSPRs), check out the following resources:

When can I expect my changes to be merged?

Our goal is to get community contributions seen and reviewed as efficiently as possible.

However, the amount of time that it takes to review and merge a PR can vary significantly based on factors such as:

  • The size and impact of the changes that it introduces
  • The need for product review
  • Maintenance status of the parent repository

💡 As a result it may take up to several weeks or months to complete a review and merge your PR.

@Ian2012 Ian2012 force-pushed the cag/library-image-preview branch 4 times, most recently from ca9c6f1 to 68a673c Compare October 18, 2024 15:41
Copy link

codecov bot commented Oct 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.16%. Comparing base (11470f2) to head (9bb02c6).
Report is 3 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1403      +/-   ##
==========================================
+ Coverage   93.15%   93.16%   +0.01%     
==========================================
  Files        1051     1053       +2     
  Lines       20328    20413      +85     
  Branches     4335     4280      -55     
==========================================
+ Hits        18936    19018      +82     
- Misses       1332     1335       +3     
  Partials       60       60              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Ian2012 Ian2012 marked this pull request as ready for review October 21, 2024 18:14
@Ian2012 Ian2012 requested a review from a team as a code owner October 21, 2024 18:14
@Ian2012 Ian2012 force-pushed the cag/library-image-preview branch 3 times, most recently from 9ffa8d0 to b55811d Compare October 22, 2024 15:11
Comment on lines 106 to 115
// This function doesn't currently know how to deal with Library assets.
// Libraries don't mangle the path into an asset key–it might be sufficient
// to remove the initial "/" in a "/static/images/foo.png" link, and then
// set the base URL to the correct ComponentVersion base. If we let this
// function try to deal with Library assets, it would convert them in such a
// way that it wouldn't convert back later on, and we'd end up storing the
// incorrect OLX and breaking the display from that point forward.
//
// So until we handle it better, just disable static asset URL substitutions
// when dealing with Library content.
Copy link
Contributor

Choose a reason for hiding this comment

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

This is no longer accurate, right? Now that your code is dealing with the case properly?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I'll update this comment with the details of the solution

@ormsbee
Copy link
Contributor

ormsbee commented Oct 22, 2024

I think the code looks fine. I defer to you folks on whether this is impractical to test because of TinyMCE. I'll approve and merge as soon as the comments are updated, unless @bradenmacdonald has additional feedback to give.

@bradenmacdonald
Copy link
Contributor

I'm gonna test this in a few minutes.

@bradenmacdonald
Copy link
Contributor

✅ This works well for existing images, but I don't see any option to upload a new image. Was that out of scope?

@@ -261,9 +262,12 @@ export const editorConfig = ({
content,
minHeight,
learningContextId,
documentURL,
Copy link
Contributor

Choose a reason for hiding this comment

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

documentUrl doesn't mean much to me. staticRootUrl would be more clear

@bradenmacdonald
Copy link
Contributor

LGTM, no blockers from me. Just needs updated comments.

@bradenmacdonald
Copy link
Contributor

bradenmacdonald commented Oct 22, 2024

@ormsbee
Copy link
Contributor

ormsbee commented Oct 22, 2024

@bradenmacdonald: The usage key is undefined. It shows it trying to load this for me: https://cms.tagging-preview.staging.do.opencraft.hosting/library_assets/blocks/undefined/static/deer.jpg

@bradenmacdonald
Copy link
Contributor

@ormsbee Ah, hmm, you're right. Now I see it has to do with a recent refactor on master such that sidebarComponentUsageKey is no longer available from the context.

Though we have to fix it anyways because even without that conflict, if you use the "Edit" menu to open the editor without opening the sidebar, you get the same problem:
Screenshot 2024-10-22 at 2 21 50 PM

fix: dinamically get the component UUID

chore: quality fixes

chore: quality fixes

chore: quality fixes

chore: quality fixes

fix: add optional library context hook

chore: update comment

fix: add blockID parameter to textEditor
@Ian2012 Ian2012 force-pushed the cag/library-image-preview branch 2 times, most recently from 47000cb to 9e8fe74 Compare October 23, 2024 14:20
bradenmacdonald added a commit to open-craft/frontend-app-authoring that referenced this pull request Oct 23, 2024
@Ian2012 Ian2012 force-pushed the cag/library-image-preview branch 2 times, most recently from 4d013d7 to 3d1ec42 Compare October 23, 2024 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
open-source-contribution PR author is not from Axim or 2U
Projects
Status: Ready for Review
Development

Successfully merging this pull request may close these issues.

Support library assets when doing TinyMCE Editor image URL rewriting.
4 participants