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.

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

Jump to bottom

Fix part of #6732: Migrate visualizations to webpack #6885

Merged
merged 9 commits into from
Jun 12, 2019
Merged

Fix part of #6732: Migrate visualizations to webpack #6885

merged 9 commits into from
Jun 12, 2019

Conversation

vojtechjelinek
Copy link
Contributor

@vojtechjelinek vojtechjelinek commented Jun 9, 2019 •
edited
Loading

Explanation

Fixes part of #6732: Use webpack for importing visualizations used in exploration editor.

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 PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The linter/Karma presubmit checks have passed.
    • These should run automatically, but if not, you can manually trigger them locally using python scripts/pre_commit_linter.py and bash scripts/run_frontend_tests.sh.
  • The PR is made from a branch that's not called "develop".
  • The PR has an appropriate "CHANGELOG: ..." label (If you are unsure of which label to add, ask the reviewers for guidance).
  • The PR follows the style guide.
  • The PR addresses the points mentioned in the codeowner checks for the files/folders changed. (See the codeowner's wiki page.)
  • The PR is assigned to an appropriate reviewer.
    • If you're a new contributor, please ask on Gitter for someone to assign a reviewer and don't tick this checkbox.
    • If you're not sure who the appropriate reviewer is, please assign to the issue's "owner" -- see the "talk-to" label on the issue. Do not only request the review but also add the reviewer as an assignee.

@vojtechjelinek vojtechjelinek requested a review from seanlip June 9, 2019 23:50
@vojtechjelinek
Copy link
Contributor Author

@kevinlee12 Can you QA this for me?

seanlip
seanlip approved these changes Jun 10, 2019
View reviewed changes
Copy link
Member

@seanlip seanlip left a comment

Choose a reason for hiding this comment

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

PR seems generally reasonable to me! Just had one question.

tsconfig.json Outdated
"extensions/classifiers",
"extensions/interactions",
"extensions/objects",
"rich_text_components",
Copy link
Member

Choose a reason for hiding this comment

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

This looks odd. Should it be extensions/rich_text_components?

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 will fix this after I merge with the RTCs PR.

@vojtechjelinek vojtechjelinek mentioned this pull request Jun 10, 2019
Closed
8 tasks
kevinlee12
kevinlee12 approved these changes Jun 10, 2019
View reviewed changes
Copy link
Contributor

@kevinlee12 kevinlee12 left a comment

Choose a reason for hiding this comment

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

lgtm on functionality!

@kevinlee12 kevinlee12 mentioned this pull request Jun 10, 2019
Merged
8 tasks
@oppiabot
Copy link

oppiabot bot commented Jun 10, 2019

Hi @vojtechjelinek. Due to recent changes in the "develop" branch, this PR now has a merge conflict. Please follow this link if you need help resolving the conflict, so that the PR can be merged. Thanks!

@codecov
Copy link

codecov bot commented Jun 10, 2019

Codecov Report

Merging #6885 into develop will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #6885      +/-   ##
===========================================
- Coverage    95.07%   95.06%   -0.02%     
===========================================
  Files          371      371              
  Lines        50299    50239      -60     
===========================================
- Hits         47822    47758      -64     
- Misses        2477     2481       +4
Impacted Files Coverage Δ
core/domain/visualization_registry_test.py 100% <ø> (ø) ⬆️
core/domain/visualization_registry.py 95.65% <ø> (-4.35%) ⬇️
core/controllers/editor.py 82.53% <ø> (-0.1%) ⬇️
core/domain/question_services.py 93.82% <0%> (-6.18%) ⬇️
core/controllers/topics_and_skills_dashboard.py 100% <0%> (ø) ⬆️
core/controllers/profile.py 100% <0%> (ø) ⬆️
core/domain/rte_component_registry_test.py 100% <0%> (ø) ⬆️
core/controllers/base.py 100% <0%> (ø) ⬆️
core/domain/question_services_test.py 100% <0%> (ø) ⬆️
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 46c0969...ac13784. Read the comment docs.

@codecov
Copy link

codecov bot commented Jun 10, 2019 •
edited
Loading

Codecov Report

Merging #6885 into develop will decrease coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #6885      +/-   ##
===========================================
- Coverage    95.19%   95.18%   -0.01%     
===========================================
  Files          371      371              
  Lines        50419    50403      -16     
===========================================
- Hits         47995    47978      -17     
- Misses        2424     2425       +1
Impacted Files Coverage Δ
core/domain/visualization_registry.py 95.65% <ø> (-4.35%) ⬇️
core/domain/visualization_registry_test.py 100% <ø> (ø) ⬆️
core/controllers/editor.py 82.18% <ø> (-0.11%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bd95914...581afa9. Read the comment docs.

@oppiabot
Copy link

oppiabot bot commented Jun 11, 2019

Hi @vojtechjelinek. Due to recent changes in the "develop" branch, this PR now has a merge conflict. Please follow this link if you need help resolving the conflict, so that the PR can be merged. Thanks!

seanlip
seanlip approved these changes Jun 11, 2019
View reviewed changes
Copy link
Member

@seanlip seanlip left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Basically LGTM. @vojtechjelinek please address the merge conflicts and let me know once you would like this to be merged. Thanks!

@vojtechjelinek
Copy link
Contributor Author

@seanlip Ready to merge.

@seanlip seanlip merged commit f9e9922 into oppia:develop Jun 12, 2019
@vojtechjelinek vojtechjelinek deleted the webpack-extensions-visualizations branch January 26, 2020 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@seanlip seanlip seanlip approved these changes

@kevinlee12 kevinlee12 kevinlee12 approved these changes

@aks681 aks681 Awaiting requested review from aks681

@ankita240796 ankita240796 Awaiting requested review from ankita240796

@apb7 apb7 Awaiting requested review from apb7

@brianrodri brianrodri Awaiting requested review from brianrodri

@DubeySandeep DubeySandeep Awaiting requested review from DubeySandeep

@nithusha21 nithusha21 Awaiting requested review from nithusha21

Assignees

@kevinlee12 kevinlee12

@seanlip seanlip

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@vojtechjelinek @kevinlee12 @seanlip