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

feat: [FC-0070] listen to xblock interaction events #1431

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

Conversation

PKulkoRaccoonGang
Copy link
Contributor

@PKulkoRaccoonGang PKulkoRaccoonGang commented Oct 23, 2024

🚨 Dependencies:

Xblock interaction events

Description

This PR includes changes to the CourseUnit component and the functionality of interaction between xblocks in the iframe and the react page.

The following events have been processed:

  • delete event
  • Manage Access event (opening and closing a modal window)
  • edit event for new xblock React editors
  • clipboard events
  • duplicate event

Testing instructions

Screen.Recording.2024-11-15.at.15.52.27.mov

Settings

EDX_PLATFORM_REPOSITORY: https://github.com/raccoongang/edx-platform.git
EDX_PLATFORM_VERSION: Peter_Kulko/listen-to-xblock-interaction-events

TUTOR_GROVE_NEW_MFES:
  authoring:
    port: 18000
    repository: https://github.com/raccoongang/frontend-app-course-authoring.git
    version: Peter_Kulko/xblock-interaction-events

TUTOR_GROVE_WAFFLE_FLAGS:
  - name: contentstore.new_studio_mfe.use_new_unit_page
    everyone: true

TUTOR_GROVE_MFE_LMS_COMMON_SETTINGS:
  MFE_CONFIG:
    ENABLE_UNIT_PAGE: true

@PKulkoRaccoonGang PKulkoRaccoonGang requested a review from a team as a code owner October 23, 2024 16:46
@openedx-webhooks openedx-webhooks added the open-source-contribution PR author is not from Axim or 2U label Oct 23, 2024
@openedx-webhooks
Copy link

openedx-webhooks commented Oct 23, 2024

Thanks for the pull request, @PKulkoRaccoonGang!

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.

@PKulkoRaccoonGang PKulkoRaccoonGang marked this pull request as draft October 23, 2024 16:46
@mphilbrick211 mphilbrick211 added the FC Relates to an Axim Funded Contribution project label Oct 23, 2024
@PKulkoRaccoonGang PKulkoRaccoonGang force-pushed the Peter_Kulko/xblock-interaction-events branch from 42da735 to cc25c40 Compare October 24, 2024 16:56
@PKulkoRaccoonGang PKulkoRaccoonGang added the create-sandbox open-craft-grove should create a sandbox environment from this PR label Oct 24, 2024
@PKulkoRaccoonGang PKulkoRaccoonGang force-pushed the Peter_Kulko/xblock-interaction-events branch 4 times, most recently from 89ba553 to d9da128 Compare October 25, 2024 09:42
Copy link

codecov bot commented Oct 25, 2024

Codecov Report

Attention: Patch coverage is 94.91525% with 6 lines in your changes missing coverage. Please review.

Project coverage is 93.09%. Comparing base (55fe87a) to head (c8382eb).
Report is 6 commits behind head on master.

Files with missing lines Patch % Lines
src/course-unit/xblock-container-iframe/index.tsx 90.16% 5 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1431      +/-   ##
==========================================
+ Coverage   92.91%   93.09%   +0.17%     
==========================================
  Files        1065     1079      +14     
  Lines       20979    21175     +196     
  Branches     4537     4554      +17     
==========================================
+ Hits        19493    19712     +219     
+ Misses       1419     1391      -28     
- Partials       67       72       +5     

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

@PKulkoRaccoonGang PKulkoRaccoonGang added create-sandbox open-craft-grove should create a sandbox environment from this PR and removed create-sandbox open-craft-grove should create a sandbox environment from this PR labels Oct 25, 2024
@open-craft-grove
Copy link

Sandbox deployment failed 💥
Please check the settings and requirements.
Retry deployment by pushing a new commit or updating the requirements/settings in the pull request's description.
📜 Failure Logs
ℹ️ Grove Config, Tutor Config, Tutor Requirements

@open-craft-grove
Copy link

Sandbox deployment successful 🚀
🎓 LMS
📝 Studio
ℹ️ Grove Config, Tutor Config, Tutor Requirements

@open-craft-grove
Copy link

Sandbox deployment successful 🚀
🎓 LMS
📝 Studio
ℹ️ Grove Config, Tutor Config, Tutor Requirements

@open-craft-grove
Copy link

Sandbox deployment successful 🚀
🎓 LMS
📝 Studio
ℹ️ Grove Config, Tutor Config, Tutor Requirements

@PKulkoRaccoonGang PKulkoRaccoonGang force-pushed the Peter_Kulko/xblock-interaction-events branch 2 times, most recently from 0c8c37e to 54c22f2 Compare November 15, 2024 11:25
@open-craft-grove
Copy link

Sandbox deployment failed 💥
Please check the settings and requirements.
Retry deployment by pushing a new commit or updating the requirements/settings in the pull request's description.
📜 Failure Logs
ℹ️ Grove Config, Tutor Config, Tutor Requirements

@PKulkoRaccoonGang PKulkoRaccoonGang self-assigned this Nov 15, 2024
@PKulkoRaccoonGang
Copy link
Contributor Author

ℹ️ [inform]: In the next PRs we will move away from receiving updated data via iframe reloading.

@open-craft-grove
Copy link

Sandbox deployment successful 🚀
🎓 LMS
📝 Studio
ℹ️ Grove Config, Tutor Config, Tutor Requirements

@PKulkoRaccoonGang PKulkoRaccoonGang force-pushed the Peter_Kulko/xblock-interaction-events branch 2 times, most recently from b34f1f5 to 9c498fd Compare November 22, 2024 11:50
@open-craft-grove
Copy link

Sandbox deployment failed 💥
Please check the settings and requirements.
Retry deployment by pushing a new commit or updating the requirements/settings in the pull request's description.
📜 Failure Logs
ℹ️ Grove Config, Tutor Config, Tutor Requirements

@PKulkoRaccoonGang PKulkoRaccoonGang force-pushed the Peter_Kulko/xblock-interaction-events branch from 9c498fd to a18a2e9 Compare November 22, 2024 12:00
@open-craft-grove
Copy link

Sandbox deployment failed 💥
Please check the settings and requirements.
Retry deployment by pushing a new commit or updating the requirements/settings in the pull request's description.
📜 Failure Logs
ℹ️ Grove Config, Tutor Config, Tutor Requirements

@open-craft-grove
Copy link

Sandbox deployment successful 🚀
🎓 LMS
📝 Studio
ℹ️ Grove Config, Tutor Config, Tutor Requirements

@PKulkoRaccoonGang PKulkoRaccoonGang force-pushed the Peter_Kulko/xblock-interaction-events branch from 9a07af9 to 1d9ac29 Compare November 25, 2024 09:24
@PKulkoRaccoonGang
Copy link
Contributor Author

PKulkoRaccoonGang commented Nov 25, 2024

[inform]: The following PRs will add:

@@ -249,12 +246,7 @@ export function duplicateUnitItemQuery(itemId, xblockId) {
dispatch(showProcessingNotification(NOTIFICATION_MESSAGES.duplicating));

try {
const { locator } = await duplicateUnitItem(itemId, xblockId);
const newCourseVerticalChildren = await getCourseVerticalChildren(itemId);
dispatch(duplicateXBlock({
Copy link
Contributor Author

Choose a reason for hiding this comment

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

[inform]: since we use legacy functionality to store xblock data, in the current implementation it makes sense to use thunks exclusively for working with the backend API, without storing data from the Redux store

// to ensure the iframe content is properly refreshed.
setTimeout(() => {
sendMessageToIframe(messageTypes.refreshXBlock, null);
}, 1000);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

[inform]: such delays will be removed after optimization of updating content inside the iframe, via the backbone.js

setTimeout(() => {
sendMessageToIframe(messageTypes.refreshXBlock, null);
}, 1000);
}, [sendMessageToIframe]);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

[inform]: we plan to abandon such reboots after implementing the tree comparison algorithm on the backbone.js side

Copy link
Contributor

Choose a reason for hiding this comment

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

What would that look like? I generally think we need to try to dramatically reduce the amount of code we have on the backbone side, not add major new functionality to it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We assumed there might be a comparison algorithm that compares the response containing xblocks information with the current backbone xblocks model. However, this idea turned out to be incorrect since we do not have separate models for xblocks on the backbone side. At the moment, a draft of a working solution is presented in these draft PRs.

@open-craft-grove
Copy link

Sandbox deployment successful 🚀
🎓 LMS
📝 Studio
ℹ️ Grove Config, Tutor Config, Tutor Requirements

@open-craft-grove
Copy link

Sandbox deployment failed 💥
Please check the settings and requirements.
Retry deployment by pushing a new commit or updating the requirements/settings in the pull request's description.
📜 Failure Logs
ℹ️ Grove Config, Tutor Config, Tutor Requirements

@PKulkoRaccoonGang PKulkoRaccoonGang force-pushed the Peter_Kulko/xblock-interaction-events branch from 9f2796e to 310421d Compare November 25, 2024 12:31
@open-craft-grove
Copy link

Sandbox deployment failed 💥
Please check the settings and requirements.
Retry deployment by pushing a new commit or updating the requirements/settings in the pull request's description.
📜 Failure Logs
ℹ️ Grove Config, Tutor Config, Tutor Requirements

src/constants.js Outdated
@@ -76,3 +76,7 @@ export const REGEX_RULES = {
specialCharsRule: /^[a-zA-Z0-9_\-.'*~\s]+$/,
noSpaceRule: /^\S*$/,
};

export const IFRAME_FEATURE_POLICY = (
'microphone *; camera *; midi *; geolocation *; encrypted-media *, clipboard-write *'
Copy link
Contributor

Choose a reason for hiding this comment

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

I mentioned this on another PR, but this contains a typo: openedx/frontend-app-learning#1500

Copy link
Contributor Author

Choose a reason for hiding this comment

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

setTimeout(() => {
sendMessageToIframe(messageTypes.refreshXBlock, null);
}, 1000);
}, [sendMessageToIframe]);
Copy link
Contributor

Choose a reason for hiding this comment

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

What would that look like? I generally think we need to try to dramatically reduce the amount of code we have on the backbone side, not add major new functionality to it.

const [isConfigureModalOpen, openConfigureModal, closeConfigureModal] = useToggle(false);
const { setIframeRef, sendMessageToIframe } = useIframe();
const [currentXBlockId, setCurrentXBlockId] = useState<string | null>(null);
const [currentXBlockData, setCurrentXBlockData] = useState<any>({});
Copy link
Contributor

Choose a reason for hiding this comment

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

Please specify an actual type, not any.

What is the "current XBlock" ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

return () => {
window.removeEventListener('message', handleMessage);
};
}, [dispatch, blockId, courseVerticalChildren, currentXBlockId, currentXBlockData]);
Copy link
Contributor

Choose a reason for hiding this comment

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

Complex objects like courseVerticalChildren and currentXBlockData sometimes cause additional runs of the effect, because they're compared by reference and not by value. That may be OK in this case but it's not ideal.

This is also missing dependencies like handleDuplicateXBlock, handleRefetchXBlocks, etc. which are also changing.

Since currentXBlockData is React state, I would personally just fetch it inside handleDuplicateXBlock (const handleDuplicateXBlock = useCallback(() => { /* do something with currentXBlockData */ }, [currentXBlockData]);) and then you can simplify this so it's just [messageTypes.duplicateXBlock]: () => handleDuplicateXBlock and only depends on handleDuplicateXBlock, not directly depending on currentXBlockData


But as I mentioned on the other PR, I think it would be much cleaner to pass in the usage key as part of the event payload, and then you don't need currentXBlock[Id|Data] at all, and you can simplify a lot of these, as well as removing most of the dependencies for the useEffect and useCallback hooks, which will improve performance and reduce re-rendering a lot.

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, thanks. I like the idea of ​​getting the xblock id via payload. I added this feature + did some refactoring, please take a look.
ea4da9f

@open-craft-grove
Copy link

Sandbox deployment successful 🚀
🎓 LMS
📝 Studio
ℹ️ Grove Config, Tutor Config, Tutor Requirements

@PKulkoRaccoonGang PKulkoRaccoonGang force-pushed the Peter_Kulko/xblock-interaction-events branch from 2261a51 to 4c2d5bf Compare November 27, 2024 19:00
@PKulkoRaccoonGang PKulkoRaccoonGang force-pushed the Peter_Kulko/xblock-interaction-events branch from 4c2d5bf to ea4da9f Compare November 27, 2024 19:04
@open-craft-grove
Copy link

Sandbox deployment successful 🚀
🎓 LMS
📝 Studio
ℹ️ Grove Config, Tutor Config, Tutor Requirements

Copy link
Contributor

@bradenmacdonald bradenmacdonald left a comment

Choose a reason for hiding this comment

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

Thanks for that change, @PKulkoRaccoonGang. I think that's much cleaner.
I haven't tested this again but I'm happy with how the code is looking. Thanks for all the new Typescript typing 💯

src/course-unit/constants.js Outdated Show resolved Hide resolved
src/course-unit/constants.js Outdated Show resolved Hide resolved
@open-craft-grove
Copy link

Sandbox deployment successful 🚀
🎓 LMS
📝 Studio
ℹ️ Grove Config, Tutor Config, Tutor Requirements

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
create-sandbox open-craft-grove should create a sandbox environment from this PR FC Relates to an Axim Funded Contribution project open-source-contribution PR author is not from Axim or 2U
Projects
Status: In Eng Review
Development

Successfully merging this pull request may close these issues.

5 participants