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 #14390: Concept cards have line breaks before and above them #14443

Merged
merged 2 commits into from
Dec 17, 2021

Conversation

aishwary023
Copy link
Contributor

@aishwary023 aishwary023 commented Dec 15, 2021

Overview

  1. This PR fixes Concept cards have line breaks before and above them #14390
  2. This PR does the following: Fixes if-condition to check if RTE Component is inline.

What caused the error?

In PR #14263, <oppia-noninteractive- was replaced with <oppia-noninteractive-ckeditor- (why?).

Here, the check for an inline component failed as the RteHelper Service expected the RTE Component name (skillreview) instead of ckeditor-skillreview.

Essential Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The linter/Karma presubmit checks have passed locally on your machine.
  • "Allow edits from maintainers" is checked. (See here for instructions on how to enable it.)
    • This lets reviewers restart your CircleCI tests for you.
  • The PR is made from a branch that's not called "develop".

Proof that changes are correct

Screen.Recording.2021-12-16.at.3.24.10.AM.mov

PR Pointers

  • Make sure to follow the instructions for making a code change.
  • Oppiabot will notify you when you don't add a PR_CHANGELOG label. If you are unable to do so, please @-mention a code owner (who will be in the Reviewers list), or ask on Gitter.
  • For what code owners will expect, see the Code Owner's wiki page.
  • Make sure your PR follows conventions in the style guide, otherwise this will lead to review delays.
  • Never force push. If you do, your PR will be closed.
  • Oppiabot can assign anyone for review/help if you leave a comment like the following: "{{Question/comment}} @{{reviewer_username}} PTAL"
  • Some of the e2e tests are flaky, and can fail for reasons unrelated to your PR. We are working on fixing this, but in the meantime, if you need to restart the tests, please check the "If your build fails" wiki page.

@oppiabot
Copy link

oppiabot bot commented Dec 15, 2021

Hi @aishwary023, can you complete the following:

  1. The proof that changes are correct has not been provided, please make sure to upload a image/video showing that the changes are correct. Or include a sentence saying "No proof of changes needed because" and the reason why proof of changes cannot be provided.
    Thanks!

@oppiabot
Copy link

oppiabot bot commented Dec 15, 2021

Hi, @aishwary023, this pull request does not have a "CHANGELOG: ..." label as mentioned in the PR pointers. Assigning @aishwary023 to add the required label. PRs without this label will not be merged. If you are unsure of which label to add, please ask the reviewers for guidance. Thanks!

@aishwary023 aishwary023 removed their assignment Dec 15, 2021
@oppiabot
Copy link

oppiabot bot commented Dec 15, 2021

Assigning @aks681 for the first-pass review of this pull request. Thanks!

@aishwary023
Copy link
Contributor Author

@aks681 PTAL, thanks!

Copy link
Contributor

@aks681 aks681 left a comment

Choose a reason for hiding this comment

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

Lgtm!

@aks681 aks681 merged commit 1f9fe1c into oppia:develop Dec 17, 2021
aks681 pushed a commit that referenced this pull request Jan 4, 2022
)

* Fixed inline RTE Component appearing in new line

* Fixed lint
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Concept cards have line breaks before and above them
2 participants