Merge remote-tracking branch 'upstream/develop' into add-innerHTML-li…

…nt-check
oppia · kevinlee12 · Mar 28, 2020 · Mar 18, 2020 · Mar 18, 2020 · Mar 18, 2020
commit 0fe385abb37579ba3287c75963c5a666b25b2921
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -91,7 +91,7 @@ jobs:
           # Python files and that is only possible if we treat it as a module.
           command: |
             python -m scripts.third_party_size_check
-            python -m scripts.pre_commit_linter --path=. --verbose
+            python -m scripts.linters.pre_commit_linter --path=. --verbose
 
   typescript_tests:
     <<: *job_defaults

@@ -45,11 +45,11 @@
 /core/controllers/collection*.py @aks681 @kevintab95
 /core/domain/collection*.py @aks681 @kevintab95
 /core/storage/collection/ @aks681 @kevintab95
-/core/templates/components/entity-creation-services/collection-creation.service*.ts @aks681 @kevintab95
-/core/templates/components/entity-creation-services/collection-creation-backend-api.service*.ts @aks681 @kevintab95
-/core/templates/domain/collection/ @aks681 @kevintab95
-/core/templates/pages/collection-editor-page/ @aks681 @kevintab95
-/core/templates/pages/collection-player-page/ @aks681 @kevintab95
+/core/templates/components/entity-creation-services/collection-creation.service*.ts @kevintab95
+/core/templates/components/entity-creation-services/collection-creation-backend-api.service*.ts @kevintab95
+/core/templates/domain/collection/ @kevintab95
+/core/templates/pages/collection-editor-page/ @kevintab95
+/core/templates/pages/collection-player-page/ @kevintab95
 
 
 # Community contribution project
@@ -67,9 +67,12 @@
 /CONTRIBUTORS @seanlip
 /LICENSE @seanlip
 /NOTICE @seanlip
-/core/templates/pages/about-page/ @seanlip
-/core/templates/pages/privacy-page/ @seanlip
-/core/templates/pages/terms-page/ @seanlip
+/core/templates/pages/about-page/ @DubeySandeep
+/core/templates/pages/about-page/about-page.directive.html @seanlip
+/core/templates/pages/privacy-page/ @DubeySandeep
+/core/templates/pages/privacy-page/privacy-page.mainpage.html @seanlip
+/core/templates/pages/terms-page/ @DubeySandeep
+/core/templates/pages/terms-page/terms-page.mainpage.html @seanlip
 
 
 # Dashboard pages.
@@ -106,6 +109,18 @@
 /codecov.yml @kevinlee12
 /core/templates/css/.stylelintrc @kevinlee12
 /tox.ini @kevinlee12
+/scripts/linters/__init__.py @kevinlee12 @Hudda
+/scripts/linters/codeowner_linter.py @kevinlee12 @Hudda
+/scripts/linters/css_linter.py @kevinlee12 @Hudda
+/scripts/linters/general_purpose_linter.py @kevinlee12 @Hudda
+/scripts/linters/html_linter.py @kevinlee12 @Hudda
+/scripts/linters/js_ts_linter.py @kevinlee12 @Hudda
+/scripts/linters/linter_utils.py @kevinlee12 @Hudda
+/scripts/linters/linter_utils_test.py @kevinlee12 @Hudda
+/scripts/linters/pre_commit_linter.py @kevinlee12 @Hudda
+/scripts/linters/pylint_extensions.py @kevinlee12 @Hudda
+/scripts/linters/pylint_extensions_test.py @kevinlee12 @Hudda
+/scripts/linters/python_linter.py @kevinlee12 @Hudda
 /scripts/__init__.py @kevinlee12
 /scripts/build.py @kevinlee12
 /scripts/build_test.py @kevinlee12
@@ -128,15 +143,10 @@
 /scripts/install_third_party_libs.py @kevinlee12
 /scripts/install_third_party_libs_test.py @kevinlee12
 /scripts/install_third_party_test.py @kevinlee12
-/scripts/linter_utils.py @kevinlee12
-/scripts/linter_utils_test.py @kevinlee12
 /scripts/pre_commit_hook.py @kevinlee12
 /scripts/pre_commit_hook_test.py @kevinlee12
-/scripts/pre_commit_linter.py @kevinlee12
 /scripts/pre_push_hook.py @kevinlee12
 /scripts/pre_push_hook_test.py @kevinlee12
-/scripts/pylint_extensions.py @kevinlee12
-/scripts/pylint_extensions_test.py @kevinlee12
 /scripts/release_scripts/deploy.py @ankita240796 @kevinlee12
 /scripts/release_scripts/deploy_test.py @ankita24079 @kevinlee12
 /scripts/run_backend_tests.py @kevinlee12
@@ -147,6 +157,7 @@
 /scripts/run_presubmit_checks.py @kevinlee12
 /scripts/run_tests.py @kevinlee12
 /scripts/script_import_test.py @kevinlee12
+/scripts/concurrent_task_utils.py @kevinlee12 @Hudda
 /scripts/setup.py @kevinlee12
 /scripts/setup_gae.py @kevinlee12
 /scripts/setup_gae_test.py @kevinlee12
@@ -170,29 +181,28 @@
 /core/domain/summary_services*.py @aks681
 /core/domain/value_generators_domain*.py @vojtechjelinek
 /core/storage/exploration/ @aks681
-/core/templates/components/entity-creation-services/exploration-creation.service*.ts @aks681
-/core/templates/components/button-directives/hint-and-solution-buttons.directive*.ts @aks681
-/core/templates/components/button-directives/hint-and-solution-buttons.directive.html @aks681
-/core/templates/components/state-directives/ @aks681
-/core/templates/components/graph-services/ @aks681
+/core/templates/components/entity-creation-services/exploration-creation.service*.ts @kevintab95
+/core/templates/components/button-directives/hint-and-solution-buttons.directive*.ts @kevintab95
+/core/templates/components/button-directives/hint-and-solution-buttons.directive.html @kevintab95
+/core/templates/components/state-directives/ @kevintab95
+/core/templates/components/graph-services/ @kevintab95
 /core/templates/components/version-diff-visualization/version-diff-visualization.directive.html @aks681
 /core/templates/components/version-diff-visualization/version-diff-visualization.directive.ts @aks681
-/core/templates/domain/editor/ @aks681
-/core/templates/domain/exploration/ @aks681
-/core/templates/domain/state/ @aks681
-/core/templates/domain/summary/ @aks681
-/core/templates/domain/state_card/ @aks681
-/core/templates/pages/exploration-editor-page/ @aks681
-/core/templates/pages/exploration-player-page/ @aks681
-/core/templates/components/state-editor/ @aks681
-/core/templates/services/compute-graph.service.ts @aks681
-/core/templates/services/context.service*.ts @aks681
-/core/templates/services/debug-info-tracker.service*.ts @aks681
-/core/templates/services/editability.service*.ts @aks681
-/core/templates/services/exploration-features*.ts @aks681
-/core/templates/services/exploration-html-formatter.service*.ts @aks681
-/core/templates/services/image-upload-helper.service*.ts @aks681
-/core/templates/services/validators.service*.ts @aks681
+/core/templates/domain/editor/ @aks681 @kevintab95
+/core/templates/domain/exploration/ @aks681 @kevintab95
+/core/templates/domain/state/ @kevintab95
+/core/templates/domain/summary/ @kevintab95
+/core/templates/domain/state_card/ @kevintab95
+/core/templates/pages/exploration-editor-page/ @aks681 @kevintab95
+/core/templates/pages/exploration-player-page/ @aks681 @kevintab95
+/core/templates/components/state-editor/ @kevintab95
+/core/templates/services/compute-graph.service.ts @kevintab95
+/core/templates/services/context.service*.ts @kevintab95
+/core/templates/services/editability.service*.ts @kevintab95
+/core/templates/services/exploration-features*.ts @kevintab95
+/core/templates/services/exploration-html-formatter.service*.ts @kevintab95
+/core/templates/services/image-upload-helper.service*.ts @kevintab95
+/core/templates/services/validators.service*.ts @kevintab95
 
 
 # Forms pages.
@@ -263,14 +273,14 @@
 
 
 # Interaction project.
-/core/domain/customization_args_util*.py @seanlip
+/core/domain/customization_args_util*.py @brianrodri
 /core/domain/interaction_registry*.py @aks681
 /core/domain/obj_services*.py @aks681
 /core/templates/components/version-diff-visualization/codemirror-mergeview.directive.ts @aks681
 /core/templates/domain/objects/ @aks681
-/core/templates/expressions/ @seanlip
+/core/templates/expressions/ @brianrodri
 /core/templates/services/code-normalizer.service*.ts @aks681
-/extensions/domain*.py @seanlip
+/extensions/domain*.py @brianrodri
 /extensions/interactions/ @aks681 @vojtechjelinek
 /extensions/objects/ @aks681
 /extensions/value_generators/ @vojtechjelinek
@@ -306,9 +316,9 @@
 /core/controllers/library*.py @aks681
 /core/domain/recommendations*.py @aks681
 /core/domain/search_services*.py @aks681
-/core/templates/pages/library-page/ @aks681
-/core/templates/services/construct-translation-ids.service*.ts @aks681
-/core/templates/services/search.service*.ts @aks681
+/core/templates/pages/library-page/ @kevintab95
+/core/templates/services/construct-translation-ids.service*.ts @kevintab95
+/core/templates/services/search.service*.ts @kevintab95
 
 
 # Navigation bar project.
@@ -351,22 +361,22 @@
 /core/controllers/skill*.py @aks681
 /core/domain/skill*.py @aks681
 /core/storage/skill/ @aks681
-/core/templates/components/entity-creation-services/skill-creation.service.ts @aks681
-/core/templates/components/review-material-editor/ @aks681
-/core/templates/components/rubrics-editor/ @aks681
-/core/templates/components/skill-selector/ @aks681
-/core/templates/domain/skill/ @aks681
-/core/templates/pages/skill-editor-page/ @aks681
+/core/templates/components/entity-creation-services/skill-creation.service.ts @kevintab95
+/core/templates/components/review-material-editor/ @kevintab95
+/core/templates/components/rubrics-editor/ @kevintab95
+/core/templates/components/skill-selector/ @kevintab95
+/core/templates/domain/skill/ @kevintab95
+/core/templates/pages/skill-editor-page/ @kevintab95
 
 # Story project.
 /core/controllers/story*.py @aks681
 /core/domain/story*.py @aks681
 /core/storage/story/ @aks681
-/core/templates/components/entity-creation-services/story-creation.service.ts @aks681
-/core/templates/domain/story/ @aks681
-/core/templates/domain/story_viewer/ @aks681
-/core/templates/pages/story-editor-page/ @aks681
-/core/templates/pages/story-viewer-page/ @aks681
+/core/templates/components/entity-creation-services/story-creation.service.ts @kevintab95
+/core/templates/domain/story/ @kevintab95
+/core/templates/domain/story_viewer/ @kevintab95
+/core/templates/pages/story-editor-page/ @kevintab95
+/core/templates/pages/story-viewer-page/ @kevintab95
 
 # Topic project.
 # Instead of * we have used _* to avoid topics_and_skills_dashboard related files.
@@ -376,29 +386,29 @@
 /core/domain/subtopic_page_services*.py @aks681
 /core/domain/topic*.py @aks681
 /core/storage/topic/ @aks681
-/core/templates/components/entity-creation-services/topic-creation.service.ts @aks681
-/core/templates/domain/classroom/ @aks681
-/core/templates/domain/subtopic_viewer/ @aks681
-/core/templates/domain/topic/ @aks681
-/core/templates/domain/topic_viewer @aks681
-/core/templates/pages/classroom-page/ @aks681
-/core/templates/pages/subtopic-viewer-page/ @aks681
-/core/templates/pages/topic-editor-page/ @aks681
-/core/templates/pages/topic-viewer-page/ @aks681
+/core/templates/components/entity-creation-services/topic-creation.service.ts @kevintab95
+/core/templates/domain/classroom/ @kevintab95
+/core/templates/domain/subtopic_viewer/ @kevintab95
+/core/templates/domain/topic/ @kevintab95
+/core/templates/domain/topic_viewer @kevintab95
+/core/templates/pages/classroom-page/ @kevintab95
+/core/templates/pages/subtopic-viewer-page/ @kevintab95
+/core/templates/pages/topic-editor-page/ @kevintab95
+/core/templates/pages/topic-viewer-page/ @kevintab95
 
 # Topics and skills dashboard project.
 /core/controllers/subtopic_viewer*.py @aks681
 /core/controllers/topics_and_skills_dashboard*.py @aks681
-/core/templates/domain/topics_and_skills_dashboard/ @aks681
-/core/templates/pages/topics-and-skills-dashboard-page/ @aks681
+/core/templates/domain/topics_and_skills_dashboard/ @kevintab95
+/core/templates/pages/topics-and-skills-dashboard-page/ @kevintab95
 
 
 # Infrastructure.
 /core/controllers/cron*.py @nithusha21
 /core/domain/cron_services*.py @nithusha21
 /main_cron.py @nithusha21
 /main_mail.py @aks681
-/main.py @nithusha21 @seanlip
+/main.py @nithusha21 @DubeySandeep
 /feconf.py @nithusha21 @seanlip
 /constants*.py @nithusha21
 /assets/constants.ts @nithusha21
@@ -421,15 +431,15 @@
 /core/templates/services/contextual/document-attribute-customization.service*.ts @bansalnitish
 /core/templates/services/contextual/meta-tag-customization.service*.ts @bansalnitish
 /core/templates/services/translation-file-hash-loader.service.ts @nithusha21
-/release_constants.py @ankita240796 @nithusha21 @seanlip
+/release_constants.py @ankita240796 @nithusha21 @DubeySandeep
 
 
 # Miscellaneous.
 /__init__.py @nithusha21
 /core/__init__.py @nithusha21
 /core/controllers/__init__.py @nithusha21
 /core/domain/__init__.py @nithusha21
-/core/domain/config*.py @seanlip
+/core/domain/config*.py @DubeySandeep
 /core/domain/change_domain.py @ankita240796
 /core/templates/tests/ @kevinlee12 @nithusha21
 /core/templates/domain/utilities/ @bansalnitish
@@ -440,16 +450,16 @@
 
 
 # Restricted pages.
-/core/controllers/admin*.py @seanlip @nithusha21
+/core/controllers/admin*.py @DubeySandeep @nithusha21
 /core/controllers/moderator*.py @seanlip
 /core/controllers/recent_commits*.py @seanlip
 /core/domain/moderator_services*.py @seanlip
-/core/templates/pages/admin-page/ @seanlip @nithusha21
-/core/templates/pages/moderator-page/ @seanlip @nithusha21
+/core/templates/pages/admin-page/ @DubeySandeep @nithusha21
+/core/templates/pages/moderator-page/ @DubeySandeep @nithusha21
 
 
 # QA team.
-/core/tests/ @kevinlee12 @nithusha21
+/core/tests/ @kevinlee12 @U8NWXD
 /assets/ @nithusha21
 /data/ @nithusha21
 
@@ -459,13 +469,13 @@
 
 
 # Rich text editor team.
-/core/templates/components/ck-editor-helpers/ck-editor-4-rte.directive.ts @aks681
-/core/templates/directives/mathjax-bind.directive.ts @aks681
-/core/templates/mathjaxConfig.ts @aks681
-/core/templates/components/ck-editor-helpers/ck-editor-4-widgets.initializer.ts @aks681
-/core/templates/services/autoplayed-videos.service*.ts @aks681
-/core/templates/services/rte-helper.service*.ts @aks681
-/core/templates/services/rte-helper-modal.controller*.ts @aks681
+/core/templates/components/ck-editor-helpers/ck-editor-4-rte.directive.ts @aks681 @kevintab95
+/core/templates/directives/mathjax-bind.directive.ts @aks681 @kevintab95
+/core/templates/mathjaxConfig.ts @aks681 @kevintab95
+/core/templates/components/ck-editor-helpers/ck-editor-4-widgets.initializer.ts @aks681 @kevintab95
+/core/templates/services/autoplayed-videos.service*.ts @aks681 @kevintab95
+/core/templates/services/rte-helper.service*.ts @aks681 @kevintab95
+/core/templates/services/rte-helper-modal.controller*.ts @aks681 @kevintab95
 /core/domain/rte_component_registry*.py @vojtechjelinek
 /extensions/ckeditor_plugins/ @vojtechjelinek
 /extensions/rich_text_components/ @vojtechjelinek
@@ -550,7 +560,7 @@
 
 
 # Draft version upgrade.
-/core/domain/draft_upgrade_services*.py @seanlip
+/core/domain/draft_upgrade_services*.py @DubeySandeep
 
 # Critical files.
 #
@@ -561,7 +571,7 @@
 #     https://help.github.com/en/articles/about-code-owners
 #
 # On modifying this list make sure to keep the CODEOWNER_IMPORTANT_PATHS list
-# in scripts/pre_commit_linter.py in sync with the modifications.
+# in scripts/linters/pre_commit_linter.py in sync with the modifications.
 /core/controllers/acl_decorators*.py @seanlip
 /core/controllers/base*.py @seanlip
 /core/domain/html*.py @seanlip

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -18,4 +18,4 @@ jobs:
       - name: Third Party Size Check
         run: python -m scripts.third_party_size_check
       - name: Run Lint Checks
-        run: python -m scripts.pre_commit_linter --path=. --verbose
+        run: python -m scripts.linters.pre_commit_linter --path=. --verbose
diff --git a/.pylintrc b/.pylintrc
@@ -8,7 +8,7 @@ init-hook='import sys; sys.path.append("../oppia_tools/google_appengine_1.9.67/g
 [MASTER]
 
 # Checks for correct docstring style
-load-plugins=pylint.extensions.docstyle, pylint_quotes, scripts.pylint_extensions
+load-plugins=pylint.extensions.docstyle, pylint_quotes, scripts.linters.pylint_extensions
 
 string-quote=single
 triple-quote=double

diff --git a/assets/constants.ts b/assets/constants.ts
@@ -453,7 +453,7 @@ export = {
     "id": "en-auto",
     "description": "English (auto)",
     "explorationLanguage": "en",
-    "speechSynthesisCode": "en-GB",
+    "speechSynthesisCode": "en-US",
     "speechSynthesisCodeMobile": "en_US"
   }],
 
@@ -522,6 +522,15 @@ export = {
     ]
   }],
 
+  "REVIEW_CATEGORY_TRANSLATION": "translation",
+  "REVIEW_CATEGORY_VOICEOVER": "voiceover",
+  "REVIEW_CATEGORY_QUESTION": "question",
+
+  "ACTION_REMOVE_ALL_REVIEW_RIGHTS": "all",
+  "ACTION_REMOVE_SPECIFIC_REVIEW_RIGHTS": "specific",
+  "USER_FILTER_CRITERION_USERNAME": "username",
+  "USER_FILTER_CRITERION_ROLE": "role",
+
   // Interaction IDs for which answer details cannot be solicited.
   "INTERACTION_IDS_WITHOUT_ANSWER_DETAILS": ["EndExploration", "Continue"],
 

diff --git a/assets/i18n/en.json b/assets/i18n/en.json
@@ -554,6 +554,8 @@
     "I18N_TOPNAV_ABOUT_OPPIA": "About Oppia",
     "I18N_TOPNAV_ADMIN_PAGE": "Admin Page",
     "I18N_TOPNAV_BLOG": "Blog",
+    "I18N_TOPNAV_CLASSROOM": "Classroom",
+    "I18N_TOPNAV_CLASSROOM_BASIC_MATHS": "Basic Mathematics",
     "I18N_TOPNAV_CONTACT_US": "Contact Us",
     "I18N_TOPNAV_CREATOR_DASHBOARD": "Creator Dashboard",
     "I18N_TOPNAV_DONATE": "Donate",

diff --git a/assets/i18n/qqq.json b/assets/i18n/qqq.json
@@ -554,6 +554,8 @@
 	"I18N_TOPNAV_ABOUT_OPPIA": "Text displayed inside drop-down menu - The list is shown after the user hovers over the I18N_TOPNAV_ABOUT button. When the option is clicked, the about oppia page is loaded which contains a more general description of the site.",
 	"I18N_TOPNAV_ADMIN_PAGE": "Text displayed inside a drop-down menu. - The list is shown after the user hovers over their profile picture. When the option is clicked, the admin page is loaded.",
 	"I18N_TOPNAV_BLOG": "Text displayed inside a drop-down menu. - The list is shown after the user hovers over the I18N_TOPNAV_ABOUT button. When the option is clicked, the Oppia blog is loaded.\n{{Identical|Blog}}",
+	"I18N_TOPNAV_CLASSROOM": "Text displayed inside the navigation bar. - When the user hovers over the button, a list with several classroom pages is displayed.\n{{Identical|Classroom}}",
+	"I18N_TOPNAV_CLASSROOM_BASIC_MATHS": "Text displayed inside drop-down menu. - The list is shown after the user hovers over the I18N_TOPNAV_CLASSROOM button. When the option is clicked, the Maths Classroom page is loaded.",
 	"I18N_TOPNAV_CONTACT_US": "Text displayed inside a drop-down menu. - The list is shown after the user hovers over the I18N_TOPNAV_ABOUT button. When the option is clicked, the Contact Us page is loaded.\n{{Identical|Contact us}}",
 	"I18N_TOPNAV_CREATOR_DASHBOARD": "Text displayed inside a drop-down menu. - The list is shown after the user hovers his profile picture. When the option is clicked, the creator dashboard page is loaded where the user can administrate his own explorations and groups.",
 	"I18N_TOPNAV_DONATE": "Text displayed in the navigation bar. - When the user clicks the button the donation page is loaded. The donation page asks the viewer to donate to The Oppia Foundation.\n{{Identical|Donate}}",

diff --git a/assets/rich_text_components_definitions.ts b/assets/rich_text_components_definitions.ts
@@ -145,8 +145,15 @@ export = {
     "is_lesson_related": true,
     "is_block_element": false,
     "customization_arg_specs": [{
-      "name": "skill_summary",
-      "description": "Click on skill to view concept card.",
+      "name": "text",
+      "description": "The link to be displayed",
+      "schema": {
+        "type": "unicode"
+      },
+      "default_value": ""
+    }, {
+      "name": "skill_id",
+      "description": "The skill that this link refers to",
       "schema": {
         "type": "custom",
         "obj_type": "SkillSelector"