Squashed commit of the following:

commit 1daef35 Author: Brian Rodriguez <brian@brianrodri.com> Date: Wed Jul 7 23:37:43 2021 -0400 fix lint commit c45ac4e Merge: 76360a5 aae335d Author: Brian Rodriguez <brian@brianrodri.com> Date: Wed Jul 7 23:25:52 2021 -0400 Merge branch 'fix-pylint' into index-all-activities commit aae335d Author: Brian Rodriguez <brian@brianrodri.com> Date: Wed Jul 7 23:20:26 2021 -0400 Fix part of oppia#12718: Use init-hook to fix command line calls to pylint commit 76360a5 Author: Brian Rodriguez <brian@brianrodri.com> Date: Wed Jul 7 23:03:22 2021 -0400 replace index-all-activities-job commit 1cb69a8 Author: Praneeth <praneethg2001@gmail.com> Date: Thu Jul 8 04:09:09 2021 +0530 Fixes Typescript issue in oppia-short-response-mulitple-choice-input.component and mypy issue in schema_utils.py (oppia#13335) * minor fixes * mypy fix commit e2e59bd Author: Praneeth <praneethg2001@gmail.com> Date: Thu Jul 8 00:04:55 2021 +0530 Frontend Unit Tests(3): Cover multiple component files (oppia#13303) * intial commit * minor fix commit 186435d Author: Hardik Katehara <54679643+hardikkat24@users.noreply.github.com> Date: Wed Jul 7 22:44:02 2021 +0530 Fix oppia#13239 and oppia#13171: Adding type annotations to root files and fix constants errors with mypy (oppia#13269) commit 7f5757f Author: EeshaArif <43031234+EeshaArif@users.noreply.github.com> Date: Wed Jul 7 22:13:10 2021 +0500 Fix Part of oppia#10474: Cover some files with TS strict checks - 6 (oppia#13263) commit 1577479 Author: Nikhil <57531197+Nik-09@users.noreply.github.com> Date: Wed Jul 7 21:21:14 2021 +0530 Adds schema for handlers concept_card_viewer & contributor_dashboard modules (oppia#13225) * payload_validator(created) + schema_utils(modified) for SVS architecture * payload * validate_args_schema in base + backend tests * Adds linters to verify handlers must have schema * Shows exception message in frontend when SVS validation fails. * adds schema in backend test * fix coverage * adds backend test for payload_validator into shard 1. * Changes logic for handling default_value cases. * removes dict from properties list in schema utils * fix coverage * changes codeowners * Adds backend unit tests + comments + docstrings * fix coverage * adds backend tests for coverage * fix coverage * adds backend tests for coverage * fix coverage * fix coverage * adds test into shard * backend coverage * fix coverage * structured backend test. * adds docstring * fix coverage * changes formatting for schema in MockHandlers * refactor domain objects validator * refactor handling object_dict * fixes backend tests. * validate_method -> validation_method * adds extra checks in backend test. * updates comment * adds backend tests. * Addressed review comments. * fix coverage * Addressed review comments. * fixes backend tests for linters * Addressed review comments. * updates loop into list comprehension. * addressed review comments * fix coverage * addressed review comments. * addressed review comments * addressed review comments. * fix coverage * addressed review comments * fix coverage * remove repeted code. * addressed review comments. * removes duplicate code from payload_validator * fix backend tests * schemas for contributor_dashboard+concept_card_viewer * fixes backend tests * updates logic for handling optional cases * fixes backend tests * adds backend coverage tests * refactores payload validator * adds schema type string * adds handler class name in old handlers list * fixes backend tests * fix coverage * removes dead code. * makes backend code typed. * adds new handler class in old handler * addressed review comments * fix coverage * fix coverage * updates logic for handling normalized value * changes string -> basestring * updates schema. * updates schemas * addressed review comments * updates by adding schema key 'schema' * adds validator for language code. * fix coverage * adds comment and updates docstring. * udates comment. * updates comment * updates comment * updates comment * updates schemas * changes docstring. * updates logic to handle csrf and source * fixes backend tests * updates logic to raise 400 * updates logic to handle source * updates logic * removes if-block in dispatch method * adds previous if-else logic to handle source * updates if into elif * adds comment in csrf_token * updates logic and adds tests for backend coverage. * fixes coverage * updates comment * uses sanitize url instead of regex. * fix coverage * fix coverage. * uses regex to check source url. commit f9a5144 Author: Ashutosh Chauhan <ashutoshc8101@gmail.com> Date: Wed Jul 7 16:10:51 2021 +0530 Fix part of oppia#9749: Migrate Preferences page (oppia#13219) commit 6b1f473 Author: Brian Rodriguez <brian@brianrodri.com> Date: Wed Jul 7 00:31:34 2021 -0400 Fix part of oppia#11475: Delete all references to continuous jobs (oppia#13313) * Removed notification page * Fixed merge conflict file * Fixed ts error * Removed notification from accessiblity test * Fixed JS lint issue * Changed the shortcut for preferenceURL * additional nits * Fixed ts error * reverting removal of userbackend service * Added back the changes * Delete FeedbackAnalyticsAggregator * fix unused code * add PR to note * small nit * address comments * initial attempt * initial attempt * fix ratings test * delete file * reduce untested lines * fix lint * remove frontend references to continuous jobs * remove backend references to continuous jobs * remove checks for events * fix lint * delete QUEUE_NAME_EVENTS * delete events from queue.yaml * fix bugs * fix queue.yaml tests * fix coverage * fix lint Co-authored-by: Aasif Faizal <aasif.faizal@gmail.com> commit 4c64eee Author: Rijuta Singh <68547101+Rijuta-s@users.noreply.github.com> Date: Wed Jul 7 06:47:32 2021 +0530 Milestone 1.5 : Adds blog admin page frontend. (oppia#13300) * Adding blog admin page * adding blog admin page * fixing lint * minor fixes * [ci skip] adding spec file * adding spec file * applying suggestions * applying suggestions * Applting lint suggestions * applying suggestions * fixing lint issues * sdcsd * applying suggestions * Revert adding root component files This reverts commit 6bd0d76. * applying suggestions * minor fix commit a2f9d14 Author: Aishwary Saxena <aishwary.saxena.min19@itbhu.ac.in> Date: Tue Jul 6 18:09:15 2021 +0530 Unit test for questions-list.component.ts (oppia#13287) * Converted AJS Directive to AJS Component * Added tests * Added tests, completed 100% * Fixed lint checks * fix karma conf * Addressed review commit 79e6d10 Author: Aishwary Saxena <aishwary.saxena.min19@itbhu.ac.in> Date: Tue Jul 6 14:49:00 2021 +0530 Unit test for exploration creation service (oppia#13176) * Added tests * Lint err * Added callback for dataFilter * Removed file name from NOT_FULLY_COVERED_FILENAMES * Added expectations * Nit * Nit * Addressed review * Removed fdescribe * Addressed review * lint * Removed mock * Fix * removed fdescribe commit e0a39a2 Author: Farees Hussain <fareezzhussain@gmail.com> Date: Tue Jul 6 13:14:13 2021 +0530 Fix oppia#13172: Controller to initialize android specific structures (Milestone 1.2) (oppia#13174) * controller to initiate android specific structures * fix linters * using variable for exploration id * fix linters * upload thumbnails * added tests * fix linters * remove csrf token * added to shards * refactoring and testcases * fix CI checks * fix CI * Addressed requested changes * rename test * timeout 30 with comment * fix linter * remove post_req * added render_json * NIT * changed comment * whitespace * requested changes * more docs * NIT * docstring update * addressed suggestions * replaced 500 with 400 * update docstring * updated docstring commit d12bfc1 Author: Kevin Thomas <kevintab@tutanota.com> Date: Tue Jul 6 12:08:19 2021 +0530 Fix typescript check failure (oppia#13321) commit c037e83 Author: Kevin Thomas <kevintab@tutanota.com> Date: Tue Jul 6 11:33:46 2021 +0530 Modify translation submission validation to check for custom tags (oppia#13309) commit 220c03a Author: Radesh <54100702+Radesh-kumar@users.noreply.github.com> Date: Tue Jul 6 10:42:21 2021 +0530 Added unit tests for admin roles tab (oppia#13206) commit 56a9e43 Author: Kevin Thomas <kevintab@tutanota.com> Date: Tue Jul 6 09:57:02 2021 +0530 Add Marathi (मराठी) and Ganda (Luganda) to supported languages (oppia#13315) commit c82945e Author: AdityaDubey0 <55298925+AdityaDubey0@users.noreply.github.com> Date: Tue Jul 6 03:53:03 2021 +0530 Migrate lint check to disallow innerHTML property. (oppia#13301) commit 901bc8b Author: Hitesh Tomar <44300735+lkbhitesh07@users.noreply.github.com> Date: Tue Jul 6 02:33:38 2021 +0530 warning text is within the box (oppia#13296) commit 90d0152 Author: AdityaDubey0 <55298925+AdityaDubey0@users.noreply.github.com> Date: Tue Jul 6 01:45:41 2021 +0530 Disallow $parent and $broadcast angularJs property (oppia#13291)
brianrodri · Jul 8, 2021 · 05a0772 · 05a0772
1 parent 66cb3b9
commit 05a0772
Show file tree

Hide file tree

Showing 143 changed files with 8,951 additions and 2,212 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -126,13 +126,29 @@
       "rules": {
         "oppia/no-testonly": "off"
       }
+    },
+     {
+      "files": ["*.js", "*.ts"],
+      "excludedFiles": [
+      "Polyfills.ts",
+      "ck-editor-copy-content.service.spec.ts",
+      "unit-test-utils.ajs.ts",
+      "mathjax.directive.ts",
+      "math-expression-content-editor.component.ts",
+      "rte-output-display.component.spec.ts",
+      "core/tests/*"
+      ],
+      "rules": {
+        "oppia/no-inner-html": "error"
+      }
     }
   ],
   "rules": {
     "oppia/break-after-parens": "error",
     "oppia/constant-declaration": "error",
     "oppia/comment-style": "error",
     "oppia/disallow-flags": "error",
+    "oppia/disallow-angularjs-properties": "error",
     "oppia/no-multiple-component": "error",
     "oppia/no-multiline-disable": "error",
     "oppia/directive-scope": "error",

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -99,8 +99,8 @@
 
 
 # Blog project
-/core/domain/blog*.py @iamprayush
-/core/controllers/blog_dashboard*.py @iamprayush
+/core/domain/blog*.py @iamprayush @aks681
+/core/controllers/blog_dashboard*.py @aks681
 
 
 # Collection project.
@@ -528,14 +528,15 @@
 
 # Restricted pages.
 /core/controllers/admin*.py @DubeySandeep @nithusha21
-/core/controllers/blog_admin*.py @iamprayush
+/core/controllers/blog_admin*.py @DubeySandeep
 /core/controllers/moderator*.py @DubeySandeep
 /core/controllers/recent_commits*.py @DubeySandeep
 /core/domain/moderator_services*.py @DubeySandeep
 /core/templates/domain/admin/ @DubeySandeep @nithusha21
-/core/templates/domain/blog-admin/ @iamprayush
+/core/templates/domain/blog-admin/ @DubeySandeep
 /core/templates/pages/admin-page/ @DubeySandeep @nithusha21
 /core/templates/pages/moderator-page/ @DubeySandeep @nithusha21
+/core/templates/pages/blog-admin-page/ @DubeySandeep @nithusha21
 
 
 # Release team.
@@ -685,6 +686,7 @@
 /core/tests/ @nithusha21
 /assets/ @nithusha21
 /data/ @nithusha21
+/core/controllers/android_e2e_config*.py @BenHenning
 # TODO(#13119): Set @vojtechjelinek as owner after 2021-07-06
 /core/templates/karma.module.ts @nithusha21
 # TODO(#12993): Restore code ownership to @U8NWXD after 2021-07-10

diff --git a/.isort.cfg b/.isort.cfg
@@ -2,6 +2,6 @@
 force_single_line=true
 force_sort_within_sections=true
 ignore_whitespace=true
-known_third_party=apache_beam,backports.functools_lru_cache,browsermobproxy,cloudstorage,contextlib2,elasticsearch,firebase_admin,google.api_core,google.appengine,google.cloud,google.protobuf,mapreduce,mock,mutagen,pipeline,pkg_resources,psutil,pylatexenc,pylint,requests,requests_mock,selenium,six,skulpt,webapp2,webapp2_extras,webtest,yaml
+known_third_party=apache_beam,backports.functools_lru_cache,browsermobproxy,cloudstorage,contextlib2,elasticsearch,firebase_admin,google.api_core,google.appengine,google.cloud,google.protobuf,mapreduce,mock,mutagen,pipeline,pkg_resources,psutil,pylatexenc,pylint,requests,requests_mock,selenium,six,skulpt,typing,webapp2,webapp2_extras,webtest,yaml
 line_length=80
 sections=FUTURE,STDLIB,FIRSTPARTY,THIRDPARTY,LOCALFOLDER
diff --git a/.pylintrc b/.pylintrc
@@ -6,6 +6,7 @@
 init-hook='import sys; sys.path.append("../oppia_tools/google_appengine_1.9.67/google_appengine")'
 
 [MASTER]
+init-hook='import sys; sys.path.append(".")'
 
 # Checks for correct docstring style
 load-plugins=pylint.extensions.docstyle, pylint_quotes, scripts.linters.pylint_extensions
@@ -58,6 +59,7 @@ bad-functions=apply,input
 [FORMAT]
 
 max-line-length=80
+ignore-long-lines=^.*#\stype:.*$|^\s*(# )?<?https?://\S+>?$
 
 indent-string='    '
 

diff --git a/android_validation_constants_test.py b/android_validation_constants_test.py
@@ -28,6 +28,7 @@ class AndroidValidationConstantsTest(test_utils.GenericTestBase):
     """Tests verifying the character limits."""
 
     def test_that_character_limits_in_both_files_are_equal(self):
+        # type: () -> None
         self.assertEqual(
             android_validation_constants.MAX_CHARS_IN_ABBREV_TOPIC_NAME,
             constants.MAX_CHARS_IN_ABBREV_TOPIC_NAME)
@@ -57,6 +58,7 @@ def test_that_character_limits_in_both_files_are_equal(self):
             constants.MAX_CHARS_IN_MISCONCEPTION_NAME)
 
     def test_exploration_constants_in_both_files_are_equal(self):
+        # type: () -> None
         interaction_ids_in_constants = []
         language_ids_in_constants = []
         constants_interactions_list = (

diff --git a/appengine_config.py b/appengine_config.py
@@ -25,6 +25,8 @@
 from google.appengine.ext import vendor
 import pkg_resources
 
+from typing import Any, Text # isort:skip # pylint: disable=unused-import
+
 # Root path of the app.
 ROOT_PATH = os.path.dirname(__file__)
 THIRD_PARTY_PATH = os.path.join(ROOT_PATH, 'third_party')
@@ -44,7 +46,7 @@
     PIL_PATH = os.path.join(OPPIA_TOOLS_PATH, 'Pillow-6.2.2')
     if not os.path.isdir(PIL_PATH):
         raise Exception('Invalid path for oppia_tools library: %s' % PIL_PATH)
-    sys.path.insert(0, PIL_PATH)
+    sys.path.insert(0, PIL_PATH) # type: ignore[arg-type]
 
 
 # Google App Engine (GAE) uses its own virtual environment that sets up the
@@ -80,19 +82,21 @@
 # It should be fine to ignore this, see https://stackoverflow.com/a/47494229
 # and https://github.com/urllib3/urllib3/issues/1138#issuecomment-290325277.
 import requests # isort:skip  pylint: disable=wrong-import-position, wrong-import-order
-requests.packages.urllib3.disable_warnings(
-    requests.packages.urllib3.contrib.appengine.AppEnginePlatformWarning
+requests.packages.urllib3.disable_warnings( # type: ignore[no-untyped-call]
+    requests.packages.urllib3.contrib.appengine.AppEnginePlatformWarning # type: ignore[attr-defined]
 )
 
 
 class MockDistribution(python_utils.OBJECT):
     """Mock distribution object for the monkeypatching function."""
 
     def __init__(self, version):
+        # type: (Text) -> None
         self.version = version
 
 
 def monkeypatched_get_distribution(distribution_name):
+    # type: (Text) -> Any
     """Monkeypatched version of pkg_resources.get_distribution.
 
     This approach is inspired by the discussion at:

diff --git a/appengine_config_test.py b/appengine_config_test.py
@@ -23,11 +23,14 @@
 from core.tests import test_utils
 import pkg_resources
 
+from typing import Text # isort:skip # pylint: disable=unused-import
+
 
 class AppengineConfigTests(test_utils.GenericTestBase):
     """Test the appengine config mock methods."""
 
     def _mock_get_distribution_which_raises_error(self, distribution_name):
+        # type: (Text) -> None
         """Mock function for pkg_resources.get_distribution().
 
         Args:
@@ -42,6 +45,7 @@ def _mock_get_distribution_which_raises_error(self, distribution_name):
         raise pkg_resources.DistributionNotFound(distribution_name, 'tests')
 
     def test_monkeypatched_get_distribution_for_google_cloud_tasks(self):
+        # type: () -> None
         """Test that the monkey-patched get_distribution() method returns an
         object with a suitable version string for google-cloud-tasks.
         """
@@ -54,6 +58,7 @@ def test_monkeypatched_get_distribution_for_google_cloud_tasks(self):
         self.assertEqual(mock_distribution.version, '1.5.0')
 
     def test_monkeypatched_get_distribution_for_google_cloud_translate(self):
+        # type: () -> None
         """Test that the monkey-patched get_distribution() method returns an
         object with a suitable version string for google-cloud-tasks.
         """
@@ -66,10 +71,11 @@ def test_monkeypatched_get_distribution_for_google_cloud_translate(self):
         self.assertEqual(mock_distribution.version, '2.0.1')
 
     def test_monkeypatched_get_distribution_behaves_like_existing_one(self):
+        # type: () -> None
         """Test that the monkey-patched get_distribution() method returns an
         object with a suitable version string for google-cloud-tasks.
         """
-        assert_raises_regexp_context_manager = self.assertRaisesRegexp(
+        assert_raises_regexp_context_manager = self.assertRaisesRegexp( # type: ignore[no-untyped-call]
             pkg_resources.DistributionNotFound, 'invalid-lib')
         with self.swap(
             appengine_config, 'old_get_distribution',

diff --git a/assets/constants.ts b/assets/constants.ts
@@ -4816,6 +4816,10 @@ export default {
     "code": "fr",
     "description": "français (French)",
     "direction": "ltr"
+  }, {
+    "code": "lg",
+    "description": "Luganda (Ganda)",
+    "direction": "ltr"
   }, {
     "code": "de",
     "description": "Deutsch (German)",
@@ -4868,6 +4872,10 @@ export default {
     "code": "lt",
     "description": "lietuvių (Lithuanian)",
     "direction": "ltr"
+  }, {
+    "code": "mr",
+    "description": "मराठी (Marathi)",
+    "direction": "ltr"
   }, {
     "code": "no",
     "description": "Norsk (Norwegian)",
@@ -5102,6 +5110,11 @@ export default {
     "description": "French",
     "relatedLanguages": ["fr"],
     "direction": "ltr"
+  }, {
+    "id": "lg",
+    "description": "Ganda",
+    "relatedLanguages": ["lg"],
+    "direction": "ltr"
   }, {
     "id": "de",
     "description": "German",
@@ -5172,6 +5185,11 @@ export default {
     "description": "Lithuanian",
     "relatedLanguages": ["lt"],
     "direction": "ltr"
+  }, {
+    "id": "mr",
+    "description": "Marathi",
+    "relatedLanguages": ["mr"],
+    "direction": "ltr"
   }, {
     "id": "no",
     "description": "Norwegian",

diff --git a/constants.py b/constants.py
@@ -25,8 +25,11 @@
 
 import python_utils
 
+from typing import Any, Dict, Text, TextIO # isort:skip # pylint: disable=unused-import
+
 
 def parse_json_from_js(js_file):
+    # type: (TextIO) -> Dict[Text, Any]
     """Extracts JSON object from JS file.
 
     Args:
@@ -40,10 +43,12 @@ def parse_json_from_js(js_file):
     json_start = text_without_comments.find('{\n')
     # Add 1 to index returned because the '}' is part of the JSON object.
     json_end = text_without_comments.rfind('}') + 1
-    return json.loads(text_without_comments[json_start:json_end])
+    json_dict = json.loads(text_without_comments[json_start:json_end]) # type: Dict[Text, Any]
+    return json_dict
 
 
 def remove_comments(text):
+    # type: (Text) -> Text
     """Removes comments from given text.
 
     Args:
@@ -55,14 +60,20 @@ def remove_comments(text):
     return re.sub(r'  //.*\n', r'', text)
 
 
-class Constants(dict):
+class Constants(dict): # type: ignore[type-arg]
     """Transforms dict to object, attributes can be accessed by dot notation."""
 
-    __getattr__ = dict.__getitem__
+    def __setattr__(self, name, value):
+        # type: (Text, Any) -> None
+        self[name] = value
+
+    def __getattr__(self, name):
+        # type: (Text) -> Any
+        return self[name]
 
 
-with python_utils.open_file(os.path.join('assets', 'constants.ts'), 'r') as f:
+with python_utils.open_file(os.path.join('assets', 'constants.ts'), 'r') as f: # type: ignore[no-untyped-call]
     constants = Constants(parse_json_from_js(f))  # pylint:disable=invalid-name
 
-with python_utils.open_file('release_constants.json', 'r') as f:
+with python_utils.open_file('release_constants.json', 'r') as f: # type: ignore[no-untyped-call]
     release_constants = Constants(json.loads(f.read()))  # pylint:disable=invalid-name
diff --git a/constants_test.py b/constants_test.py
@@ -28,19 +28,22 @@
 class ConstantsTests(test_utils.GenericTestBase):
 
     def test_constants_file_is_existing(self):
+        # type: () -> None
         """Test if the constants file is existing."""
         self.assertTrue(os.path.isfile(os.path.join(
             'assets', 'constants.ts')))
 
     def test_constants_file_contains_valid_json(self):
+        # type: () -> None
         """Test if the constants file is valid json file."""
-        with python_utils.open_file(
+        with python_utils.open_file( # type: ignore[no-untyped-call]
             os.path.join('assets', 'constants.ts'), 'r') as f:
             json = constants.parse_json_from_js(f)
             self.assertTrue(isinstance(json, dict))
             self.assertEqual(json['TESTING_CONSTANT'], 'test')
 
     def test_difficulty_values_are_matched(self):
+        # type: () -> None
         """Tests that the difficulty values and strings are matched in the
         various constants.
         """
@@ -58,6 +61,7 @@ def test_difficulty_values_are_matched(self):
                 constants.constants.SKILL_DIFFICULTY_EASY])
 
     def test_constants_and_feconf_are_consistent(self):
+        # type: () -> None
         """Test if constants that are related are consistent between feconf and
         constants.js.
         """
@@ -68,10 +72,11 @@ def test_constants_and_feconf_are_consistent(self):
         self.assertEqual(len(constants.constants.SYSTEM_USER_IDS), 2)
 
     def test_all_comments_are_removed_from_json_text(self):
+        # type: () -> None
         """Tests if comments are removed from json text."""
         dummy_constants_filepath = os.path.join(
             feconf.TESTS_DATA_DIR, 'dummy_constants.js')
-        with python_utils.open_file(dummy_constants_filepath, 'r') as f:
+        with python_utils.open_file(dummy_constants_filepath, 'r') as f: # type: ignore[no-untyped-call]
             actual_text_without_comments = constants.remove_comments(f.read())
             expected_text_without_comments = (
                 'var dummy_constants = {\n'
@@ -88,6 +93,7 @@ def test_all_comments_are_removed_from_json_text(self):
                 actual_text_without_comments, expected_text_without_comments)
 
     def test_language_constants_are_in_sync(self):
+        # type: () -> None
         """Test if SUPPORTED_CONTENT_LANGUAGES and SUPPORTED_AUDIO_LANGUAGES
         constants have any conflicting values.
         """