diff --git a/.circleci/config.yml b/.circleci/config.yml index acd900c31f4a..badcac80abc8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,7 +80,7 @@ jobs: name: Generate frontend coverage report command: | sudo pip install codecov - codecov --file ../karma_coverage_reports/coverage-final.json + codecov --file ../karma_coverage_reports/lcov.info when: on_success backend_tests: diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c38da8447193..cad7e4397bc9 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -251,19 +251,19 @@ # New structures team. # Question project. /core/controllers/practice_sessions*.py @vinitamurthi -/core/controllers/question*.py @aks681 -/core/controllers/review_tests*.py @sophiewu6 -/core/domain/question*.py @aks681 -/core/storage/question/ @aks681 -/core/templates/dev/head/components/entity-creation-services/question-creation.service.ts @aks681 +/core/controllers/question*.py @aks681 @vinitamurthi +/core/controllers/review_tests*.py @sophiewu6 @vinitamurthi +/core/domain/question*.py @aks681 @vinitamurthi +/core/storage/question/ @aks681 @vinitamurthi +/core/templates/dev/head/components/entity-creation-services/question-creation.service.ts @aks681 @vinitamurthi /core/templates/dev/head/components/score-ring/ @vinitamurthi -/core/templates/dev/head/domain/question/ @aks681 +/core/templates/dev/head/domain/question/ @aks681 @vinitamurthi /core/templates/dev/head/pages/practice-session-page/ @vinitamurthi -/core/templates/dev/head/pages/review-test-page/ @sophiewu6 -/core/templates/dev/head/services/QuestionsListService.ts @sophiewu6 -/core/templates/dev/head/components/question-directives/question-editor/ @aks681 -/core/templates/dev/head/components/question-directives/questions-list/ @aks681 -/core/templates/dev/head/components/question-directives/modal-templates/ @aks681 +/core/templates/dev/head/pages/review-test-page/ @sophiewu6 @vinitamurthi +/core/templates/dev/head/services/QuestionsListService.ts @sophiewu6 @vinitamurthi +/core/templates/dev/head/components/question-directives/question-editor/ @aks681 @vinitamurthi +/core/templates/dev/head/components/question-directives/questions-list/ @aks681 @vinitamurthi +/core/templates/dev/head/components/question-directives/modal-templates/ @aks681 @vinitamurthi /core/templates/dev/head/components/question-directives/question-player/ @vinitamurthi # Skill project. diff --git a/core/controllers/question_editor.py b/core/controllers/question_editor.py index ca5823aab670..69a554106e6c 100644 --- a/core/controllers/question_editor.py +++ b/core/controllers/question_editor.py @@ -30,9 +30,14 @@ class QuestionCreationHandler(base.BaseHandler): """A handler that creates the question model given a question dict.""" @acl_decorators.can_manage_question_skill_status - def post(self, comma_separated_skill_ids): + def post(self): """Handles POST requests.""" - skill_ids = comma_separated_skill_ids.split(',') + skill_ids = self.payload.get('skill_ids') + + if not skill_ids: + raise self.InvalidInputException( + 'skill_ids parameter isn\'t present in the payload') + if len(skill_ids) > constants.MAX_SKILLS_PER_QUESTION: raise self.InvalidInputException( 'More than %d QuestionSkillLinks for one question ' @@ -40,12 +45,12 @@ def post(self, comma_separated_skill_ids): try: for skill_id in skill_ids: skill_domain.Skill.require_valid_skill_id(skill_id) - except Exception: - raise self.InvalidInputException + except Exception as e: + raise self.InvalidInputException('Skill ID(s) aren\'t valid: ', e) try: skill_services.get_multi_skills(skill_ids) - except Exception, e: + except Exception as e: raise self.PageNotFoundException(e) question_dict = self.payload.get('question_dict') @@ -54,24 +59,49 @@ def post(self, comma_separated_skill_ids): ('question_state_data' not in question_dict) or ('language_code' not in question_dict) or (question_dict['version'] != 1)): - raise self.InvalidInputException + raise self.InvalidInputException( + 'Question Data should contain id, state data, language code, ' + + 'and its version should be set as 1') question_dict['question_state_data_schema_version'] = ( feconf.CURRENT_STATE_SCHEMA_VERSION) question_dict['id'] = question_services.get_new_question_id() question_dict['linked_skill_ids'] = skill_ids + try: question = question_domain.Question.from_dict(question_dict) - except Exception: - raise self.InvalidInputException + except Exception as e: + raise self.InvalidInputException( + 'Question structure is invalid:', e) + + skill_difficulties = self.payload.get('skill_difficulties') + + if not skill_difficulties: + raise self.InvalidInputException( + 'skill_difficulties not present in the payload') + if len(skill_ids) != len(skill_difficulties): + raise self.InvalidInputException( + 'Skill difficulties don\'t match up with skill IDs') + + try: + skill_difficulties = [ + float(difficulty) for difficulty in skill_difficulties] + except (ValueError, TypeError): + raise self.InvalidInputException( + 'Skill difficulties must be a float value') + + if any(( + difficulty < 0 or difficulty > 1) + for difficulty in skill_difficulties): + raise self.InvalidInputException( + 'Skill difficulties must be between 0 and 1') + question_services.add_question(self.user_id, question) - # TODO(vinitamurthi): Replace DEFAULT_SKILL_DIFFICULTY - # with a value passed from the frontend. question_services.link_multiple_skills_for_question( self.user_id, question.id, skill_ids, - [constants.DEFAULT_SKILL_DIFFICULTY] * len(skill_ids)) + skill_difficulties) self.values.update({ 'question_id': question.id diff --git a/core/controllers/question_editor_test.py b/core/controllers/question_editor_test.py index 56f6a6a8a6ff..8757917c733b 100644 --- a/core/controllers/question_editor_test.py +++ b/core/controllers/question_editor_test.py @@ -69,8 +69,9 @@ def test_post_with_non_admin_or_topic_manager_email_disallows_access(self): self.login(self.NEW_USER_EMAIL) csrf_token = self.get_new_csrf_token() self.post_json( - '%s/%s' % (feconf.NEW_QUESTION_URL, self.skill_id), - {}, csrf_token=csrf_token, expected_status_int=401) + feconf.NEW_QUESTION_URL, { + 'skill_ids': [self.skill_id] + }, csrf_token=csrf_token, expected_status_int=401) self.logout() def test_post_with_editor_email_does_not_allow_question_creation(self): @@ -79,8 +80,9 @@ def test_post_with_editor_email_does_not_allow_question_creation(self): question_dict = self.question.to_dict() question_dict['id'] = None self.post_json( - '%s/%s' % (feconf.NEW_QUESTION_URL, self.skill_id), { - 'question_dict': question_dict + feconf.NEW_QUESTION_URL, { + 'question_dict': question_dict, + 'skill_ids': [self.skill_id] }, csrf_token=csrf_token, expected_status_int=401) self.logout() @@ -89,17 +91,27 @@ def test_post_with_incorrect_skill_id_returns_404(self): csrf_token = self.get_new_csrf_token() incorrect_skill_id = 'abc123456789' self.post_json( - '%s/%s' % (feconf.NEW_QUESTION_URL, incorrect_skill_id), - {}, csrf_token=csrf_token, expected_status_int=404) + feconf.NEW_QUESTION_URL, { + 'skill_ids': [incorrect_skill_id] + }, csrf_token=csrf_token, expected_status_int=404) + self.logout() + + def test_post_with_no_skill_ids_returns_400(self): + self.login(self.ADMIN_EMAIL) + csrf_token = self.get_new_csrf_token() + self.post_json( + feconf.NEW_QUESTION_URL, {}, + csrf_token=csrf_token, expected_status_int=400) self.logout() def test_post_with_incorrect_list_of_skill_ids_returns_400(self): self.login(self.ADMIN_EMAIL) csrf_token = self.get_new_csrf_token() - incorrect_skill_id = [1, 2] + incorrect_skill_ids = [1, 2] self.post_json( - '%s/%s' % (feconf.NEW_QUESTION_URL, incorrect_skill_id), - {}, csrf_token=csrf_token, expected_status_int=400) + feconf.NEW_QUESTION_URL, { + 'skill_ids': incorrect_skill_ids + }, csrf_token=csrf_token, expected_status_int=400) self.logout() def test_post_with_incorrect_type_of_skill_ids_returns_400(self): @@ -107,8 +119,9 @@ def test_post_with_incorrect_type_of_skill_ids_returns_400(self): csrf_token = self.get_new_csrf_token() incorrect_skill_id = 1 self.post_json( - '%s/%s' % (feconf.NEW_QUESTION_URL, incorrect_skill_id), - {}, csrf_token=csrf_token, expected_status_int=400) + feconf.NEW_QUESTION_URL, { + 'skill_ids': [incorrect_skill_id], + }, csrf_token=csrf_token, expected_status_int=400) self.logout() def test_post_with_incorrect_question_id_returns_400(self): @@ -117,8 +130,9 @@ def test_post_with_incorrect_question_id_returns_400(self): question_dict = self.question.to_dict() question_dict['id'] = 'abc123456789' self.post_json( - '%s/%s' % (feconf.NEW_QUESTION_URL, self.skill_id), { - 'question_dict': question_dict + feconf.NEW_QUESTION_URL, { + 'question_dict': question_dict, + 'skill_ids': [self.skill_id] }, csrf_token=csrf_token, expected_status_int=400) self.logout() @@ -128,8 +142,60 @@ def test_post_with_incorrect_question_schema_returns_400(self): question_dict = self.question.to_dict() del question_dict['question_state_data']['content'] self.post_json( - '%s/%s' % (feconf.NEW_QUESTION_URL, self.skill_id), { - 'question_dict': question_dict + feconf.NEW_QUESTION_URL, { + 'question_dict': question_dict, + 'skill_ids': [self.skill_id], + }, csrf_token=csrf_token, expected_status_int=400) + self.logout() + + def test_post_with_no_skill_difficulty_returns_400(self): + self.login(self.ADMIN_EMAIL) + csrf_token = self.get_new_csrf_token() + question_dict = self.question.to_dict() + question_dict['id'] = None + self.post_json( + feconf.NEW_QUESTION_URL, { + 'question_dict': question_dict, + 'skill_ids': [self.skill_id] + }, csrf_token=csrf_token, expected_status_int=400) + self.logout() + + def test_post_with_wrong_skill_difficulty_length_returns_400(self): + self.login(self.ADMIN_EMAIL) + csrf_token = self.get_new_csrf_token() + question_dict = self.question.to_dict() + question_dict['id'] = None + self.post_json( + feconf.NEW_QUESTION_URL, { + 'question_dict': question_dict, + 'skill_ids': [self.skill_id], + 'skill_difficulties': [0.6, 0.8] + }, csrf_token=csrf_token, expected_status_int=400) + self.logout() + + def test_post_with_invalid_skill_difficulty_type_returns_400(self): + self.login(self.ADMIN_EMAIL) + csrf_token = self.get_new_csrf_token() + question_dict = self.question.to_dict() + question_dict['id'] = None + self.post_json( + feconf.NEW_QUESTION_URL, { + 'question_dict': question_dict, + 'skill_ids': [self.skill_id], + 'skill_difficulties': ['test'] + }, csrf_token=csrf_token, expected_status_int=400) + self.logout() + + def test_post_with_invalid_skill_difficulty_value_returns_400(self): + self.login(self.ADMIN_EMAIL) + csrf_token = self.get_new_csrf_token() + question_dict = self.question.to_dict() + question_dict['id'] = None + self.post_json( + feconf.NEW_QUESTION_URL, { + 'question_dict': question_dict, + 'skill_ids': [self.skill_id], + 'skill_difficulties': [2.0] }, csrf_token=csrf_token, expected_status_int=400) self.logout() @@ -139,8 +205,10 @@ def test_post_with_admin_email_allows_question_creation(self): question_dict = self.question.to_dict() question_dict['id'] = None self.post_json( - '%s/%s' % (feconf.NEW_QUESTION_URL, self.skill_id), { - 'question_dict': question_dict + feconf.NEW_QUESTION_URL, { + 'question_dict': question_dict, + 'skill_ids': [self.skill_id], + 'skill_difficulties': [0.6] }, csrf_token=csrf_token, expected_status_int=200) all_models = question_models.QuestionModel.get_all() questions = [ @@ -156,8 +224,10 @@ def test_post_with_topic_manager_email_allows_question_creation(self): question_dict = self.question.to_dict() question_dict['id'] = None self.post_json( - '%s/%s' % (feconf.NEW_QUESTION_URL, self.skill_id), { - 'question_dict': question_dict + feconf.NEW_QUESTION_URL, { + 'question_dict': question_dict, + 'skill_ids': [self.skill_id], + 'skill_difficulties': [0.6] }, csrf_token=csrf_token) all_models = question_models.QuestionModel.get_all() questions = [ @@ -174,8 +244,9 @@ def test_post_with_invalid_question_returns_400_status(self): question_dict['id'] = None question_dict['question_state_data'] = 'invalid_question_state_data' self.post_json( - '%s/%s' % (feconf.NEW_QUESTION_URL, self.skill_id), { - 'question_dict': question_dict + feconf.NEW_QUESTION_URL, { + 'question_dict': question_dict, + 'skill_ids': [self.skill_id], }, csrf_token=csrf_token, expected_status_int=400) self.logout() @@ -184,8 +255,9 @@ def test_post_with_too_many_skills_returns_400(self): csrf_token = self.get_new_csrf_token() skill_ids = [1, 2, 3, 4] self.post_json( - '%s/%s' % (feconf.NEW_QUESTION_URL, skill_ids), - {}, csrf_token=csrf_token, expected_status_int=400) + feconf.NEW_QUESTION_URL, { + 'skill_ids': skill_ids + }, csrf_token=csrf_token, expected_status_int=400) self.logout() diff --git a/core/domain/classifier_domain_test.py b/core/domain/classifier_domain_test.py index 264ea2416dcc..e9f482fc2824 100644 --- a/core/domain/classifier_domain_test.py +++ b/core/domain/classifier_domain_test.py @@ -217,33 +217,25 @@ def test_validation_training_data_with_invalid_answers_type(self): utils.ValidationError, 'Expected answers to be a list'): training_job.validate() - def test_validation(self): - """Tests to verify validate method of ClassifierTrainingJob domain.""" - - # Verify no errors are raised for correct data. + def test_validation_for_training_job_with_correct_data(self): training_job = self._get_training_job_from_dict(self.training_job_dict) training_job.validate() - # Verify validation error is raised when int is provided for job id - # instead of string. + def test_validation_with_invalid_job_id(self): self.training_job_dict['job_id'] = 1 training_job = self._get_training_job_from_dict(self.training_job_dict) with self.assertRaisesRegexp( utils.ValidationError, 'Expected id to be a string'): training_job.validate() - # Verify validation error is raised when string is provided for - # exp_version instead of int. - self.training_job_dict['job_id'] = 'exp_id1.SOME_RANDOM_STRING' + def test_validation_with_invalid_exp_version(self): self.training_job_dict['exp_version'] = 'abc' training_job = self._get_training_job_from_dict(self.training_job_dict) with self.assertRaisesRegexp( utils.ValidationError, 'Expected exp_version to be an int'): training_job.validate() - # Verify validation error is raised when string is provided for - # next_scheduled_check_time instead of datetime. - self.training_job_dict['exp_version'] = 1 + def test_validation_with_invalid_next_scheduled_check_time(self): self.training_job_dict['next_scheduled_check_time'] = 'abc' training_job = self._get_training_job_from_dict(self.training_job_dict) with self.assertRaisesRegexp( @@ -251,27 +243,21 @@ def test_validation(self): 'Expected next_scheduled_check_time to be datetime'): training_job.validate() - # Verify validation error is raised when invalid state_name is provided. - self.training_job_dict['next_scheduled_check_time'] = ( - datetime.datetime.strptime( - '2017-08-11 12:42:31', '%Y-%m-%d %H:%M:%S')) + def test_validation_with_invalid_state_name(self): self.training_job_dict['state_name'] = 'A string #' training_job = self._get_training_job_from_dict(self.training_job_dict) with self.assertRaisesRegexp( utils.ValidationError, 'Invalid character # in the state name'): training_job.validate() - # Verify validation error is raised when invalid algorithm_id is - # provided. - self.training_job_dict['state_name'] = 'a state name' + def test_validation_with_invalid_algorithm_id(self): self.training_job_dict['algorithm_id'] = 'abc' training_job = self._get_training_job_from_dict(self.training_job_dict) with self.assertRaisesRegexp( utils.ValidationError, 'Invalid algorithm id'): training_job.validate() - # Verify validation error is raised when dict is provided for list. - self.training_job_dict['algorithm_id'] = 'TextClassifier' + def test_validation_with_invalid_training_data(self): self.training_job_dict['training_data'] = {} training_job = self._get_training_job_from_dict(self.training_job_dict) with self.assertRaisesRegexp( @@ -281,6 +267,15 @@ def test_validation(self): class TrainingJobExplorationMappingDomainTests(test_utils.GenericTestBase): """Tests for the TrainingJobExplorationMapping domain.""" + def setUp(self): + super(TrainingJobExplorationMappingDomainTests, self).setUp() + + self.mapping_dict = { + 'exp_id': 'exp_id1', + 'exp_version': 2, + 'state_name': u'網站有中', + 'job_id': 'job_id1' + } def _get_mapping_from_dict(self, mapping_dict): """Returns the TrainingJobExplorationMapping object after receiving the @@ -307,52 +302,34 @@ def test_to_dict(self): expected_mapping_dict, observed_mapping.to_dict()) - def test_validation(self): - """Tests to verify validate method of TrainingJobExplorationMapping - domain. - """ - - # Verify no errors are raised for correct data. - mapping_dict = { - 'exp_id': 'exp_id1', - 'exp_version': 2, - 'state_name': u'網站有中', - 'job_id': 'job_id1' - } - mapping = self._get_mapping_from_dict(mapping_dict) + def test_validation_for_mapping_with_correct_data(self): + mapping = self._get_mapping_from_dict(self.mapping_dict) mapping.validate() - # Verify validation error is raised when int is provided for exp_id - # instead of string. - mapping_dict['exp_id'] = 1 - mapping = self._get_mapping_from_dict(mapping_dict) + def test_validation_with_invalid_exp_id(self): + self.mapping_dict['exp_id'] = 1 + mapping = self._get_mapping_from_dict(self.mapping_dict) with self.assertRaisesRegexp( utils.ValidationError, 'Expected exp_id to be a string'): mapping.validate() - # Verify validation error is raised when string is provided for - # exp_version instead of int. - mapping_dict['exp_id'] = 'exp_id1' - mapping_dict['exp_version'] = '1' - mapping = self._get_mapping_from_dict(mapping_dict) + def test_validation_with_invalid_exp_version(self): + self.mapping_dict['exp_version'] = '1' + mapping = self._get_mapping_from_dict(self.mapping_dict) with self.assertRaisesRegexp( utils.ValidationError, 'Expected exp_version to be an int'): mapping.validate() - # Verify validation error is raised when int is provided for job id - # instead of string. - mapping_dict['exp_version'] = 2 - mapping_dict['job_id'] = 0 - mapping = self._get_mapping_from_dict(mapping_dict) + def test_validation_with_invalid_job_id(self): + self.mapping_dict['job_id'] = 0 + mapping = self._get_mapping_from_dict(self.mapping_dict) with self.assertRaisesRegexp( utils.ValidationError, 'Expected job_id to be a string'): mapping.validate() - # Verify validation error is raised when int is provided for state name - # instead of string. - mapping_dict['job_id'] = 'job_id1' - mapping_dict['state_name'] = 0 - mapping = self._get_mapping_from_dict(mapping_dict) + def test_validation_with_invalid_state_name(self): + self.mapping_dict['state_name'] = 0 + mapping = self._get_mapping_from_dict(self.mapping_dict) with self.assertRaisesRegexp( utils.ValidationError, 'Expected state_name to be a string'): mapping.validate() diff --git a/core/domain/stats_domain_test.py b/core/domain/stats_domain_test.py index 540cb7b14f58..9ce62b96a888 100644 --- a/core/domain/stats_domain_test.py +++ b/core/domain/stats_domain_test.py @@ -31,6 +31,40 @@ class ExplorationStatsTests(test_utils.GenericTestBase): """Tests the ExplorationStats domain object.""" + def setUp(self): + super(ExplorationStatsTests, self).setUp() + + self.state_stats_dict = { + 'total_answers_count_v1': 0, + 'total_answers_count_v2': 10, + 'useful_feedback_count_v1': 0, + 'useful_feedback_count_v2': 4, + 'total_hit_count_v1': 0, + 'total_hit_count_v2': 18, + 'first_hit_count_v1': 0, + 'first_hit_count_v2': 7, + 'num_times_solution_viewed_v2': 2, + 'num_completions_v1': 0, + 'num_completions_v2': 2 + } + + self.exploration_stats_dict = { + 'exp_id': 'exp_id1', + 'exp_version': 1, + 'num_starts_v1': 0, + 'num_starts_v2': 30, + 'num_actual_starts_v1': 0, + 'num_actual_starts_v2': 10, + 'num_completions_v1': 0, + 'num_completions_v2': 5, + 'state_stats_mapping': { + 'Home': self.state_stats_dict, + 'Home2': self.state_stats_dict + } + } + + self.exploration_stats = self._get_exploration_stats_from_dict( + self.exploration_stats_dict) def _get_exploration_stats_from_dict(self, exploration_stats_dict): """Converts and returns the ExplorationStats object from the given @@ -52,19 +86,6 @@ def _get_exploration_stats_from_dict(self, exploration_stats_dict): state_stats_mapping) def test_to_dict(self): - state_stats_dict = { - 'total_answers_count_v1': 0, - 'total_answers_count_v2': 10, - 'useful_feedback_count_v1': 0, - 'useful_feedback_count_v2': 4, - 'total_hit_count_v1': 0, - 'total_hit_count_v2': 18, - 'first_hit_count_v1': 0, - 'first_hit_count_v2': 7, - 'num_times_solution_viewed_v2': 2, - 'num_completions_v1': 0, - 'num_completions_v2': 2 - } expected_exploration_stats_dict = { 'exp_id': 'exp_id1', 'exp_version': 1, @@ -75,7 +96,7 @@ def test_to_dict(self): 'num_completions_v1': 0, 'num_completions_v2': 5, 'state_stats_mapping': { - 'Home': state_stats_dict + 'Home': self.state_stats_dict } } observed_exploration_stats = self._get_exploration_stats_from_dict( @@ -86,132 +107,41 @@ def test_to_dict(self): def test_get_sum_of_first_hit_counts(self): """Test the get_sum_of_first_hit_counts method.""" - state_stats_dict = { - 'total_answers_count_v1': 0, - 'total_answers_count_v2': 10, - 'useful_feedback_count_v1': 0, - 'useful_feedback_count_v2': 4, - 'total_hit_count_v1': 0, - 'total_hit_count_v2': 18, - 'first_hit_count_v1': 0, - 'first_hit_count_v2': 7, - 'num_times_solution_viewed_v2': 2, - 'num_completions_v1': 0, - 'num_completions_v2': 2 - } - exploration_stats_dict = { - 'exp_id': 'exp_id1', - 'exp_version': 1, - 'num_starts_v1': 0, - 'num_starts_v2': 30, - 'num_actual_starts_v1': 0, - 'num_actual_starts_v2': 10, - 'num_completions_v1': 0, - 'num_completions_v2': 5, - 'state_stats_mapping': { - 'Home': state_stats_dict, - 'Home2': state_stats_dict - } - } - exploration_stats = self._get_exploration_stats_from_dict( - exploration_stats_dict) + self.assertEqual( + self.exploration_stats.get_sum_of_first_hit_counts(), 14) - self.assertEqual(exploration_stats.get_sum_of_first_hit_counts(), 14) + def test_validate_for_exploration_stats_with_correct_data(self): + self.exploration_stats.validate() - def test_validate(self): - state_stats_dict = { - 'total_answers_count_v1': 0, - 'total_answers_count_v2': 10, - 'useful_feedback_count_v1': 0, - 'useful_feedback_count_v2': 4, - 'total_hit_count_v1': 0, - 'total_hit_count_v2': 18, - 'first_hit_count_v1': 0, - 'first_hit_count_v2': 7, - 'num_times_solution_viewed_v2': 2, - 'num_completions_v1': 0, - 'num_completions_v2': 2 - } - exploration_stats_dict = { - 'exp_id': 'exp_id1', - 'exp_version': 1, - 'num_starts_v1': 0, - 'num_starts_v2': 30, - 'num_actual_starts_v1': 0, - 'num_actual_starts_v2': 10, - 'num_completions_v1': 0, - 'num_completions_v2': 5, - 'state_stats_mapping': { - 'Home': state_stats_dict - } - } - exploration_stats = self._get_exploration_stats_from_dict( - exploration_stats_dict) - exploration_stats.validate() - - # Make the exp_id integer. - exploration_stats.exp_id = 10 + def test_validate_with_int_exp_id(self): + self.exploration_stats.exp_id = 10 with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected exp_id to be a string')): - exploration_stats.validate() + self.exploration_stats.validate() - # Make the num_actual_starts string. - exploration_stats.exp_id = 'exp_id1' - exploration_stats.num_actual_starts_v2 = '0' + def test_validation_with_string_num_actual_starts(self): + self.exploration_stats.num_actual_starts_v2 = '0' with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected num_actual_starts_v2 to be an int')): - exploration_stats.validate() + self.exploration_stats.validate() - # Make the state_stats_mapping list. - exploration_stats.num_actual_starts_v2 = 10 - exploration_stats.state_stats_mapping = [] + def test_validation_with_list_state_stats_mapping(self): + self.exploration_stats.state_stats_mapping = [] with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected state_stats_mapping to be a dict')): - exploration_stats.validate() + self.exploration_stats.validate() - # Make the num_completions negative. - exploration_stats.state_stats_mapping = {} - exploration_stats.num_completions_v2 = -5 + def test_validation_with_negative_num_completions(self): + self.exploration_stats.num_completions_v2 = -5 with self.assertRaisesRegexp(utils.ValidationError, ( '%s cannot have negative values' % ('num_completions_v2'))): - exploration_stats.validate() + self.exploration_stats.validate() def test_validate_exp_version(self): - state_stats_dict = { - 'total_answers_count_v1': 0, - 'total_answers_count_v2': 10, - 'useful_feedback_count_v1': 0, - 'useful_feedback_count_v2': 4, - 'total_hit_count_v1': 0, - 'total_hit_count_v2': 18, - 'first_hit_count_v1': 0, - 'first_hit_count_v2': 7, - 'num_times_solution_viewed_v2': 2, - 'num_completions_v1': 0, - 'num_completions_v2': 2 - } - exploration_stats_dict = { - 'exp_id': 'exp_id1', - 'exp_version': 1, - 'num_starts_v1': 0, - 'num_starts_v2': 30, - 'num_actual_starts_v1': 0, - 'num_actual_starts_v2': 10, - 'num_completions_v1': 0, - 'num_completions_v2': 5, - 'state_stats_mapping': { - 'Home': state_stats_dict - } - } - - exploration_stats = self._get_exploration_stats_from_dict( - exploration_stats_dict) - exploration_stats.validate() - - exploration_stats.exp_version = 'invalid_exp_version' + self.exploration_stats.exp_version = 'invalid_exp_version' with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected exp_version to be an int')): - exploration_stats.validate() + self.exploration_stats.validate() def test_to_frontend_dict(self): state_stats_dict = { @@ -270,6 +200,11 @@ def test_to_frontend_dict(self): class StateStatsTests(test_utils.GenericTestBase): """Tests the StateStats domain object.""" + def setUp(self): + super(StateStatsTests, self).setUp() + + self.state_stats = stats_domain.StateStats( + 0, 10, 0, 4, 0, 18, 0, 7, 2, 0, 2) def test_from_dict(self): state_stats_dict = { @@ -353,21 +288,20 @@ def test_to_dict(self): state_stats = stats_domain.StateStats(0, 10, 0, 4, 0, 18, 0, 7, 2, 0, 2) self.assertEqual(state_stats_dict, state_stats.to_dict()) - def test_validation(self): - state_stats = stats_domain.StateStats(0, 10, 0, 4, 0, 18, 0, 7, 2, 0, 2) - state_stats.validate() + def test_validation_for_state_stats_with_correct_data(self): + self.state_stats.validate() - # Change total_answers_count to string. - state_stats.total_answers_count_v2 = '10' + def test_validation_for_state_stats_with_string_total_answers_count(self): + self.state_stats.total_answers_count_v2 = '10' with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected total_answers_count_v2 to be an int')): - state_stats.validate() + self.state_stats.validate() - # Make the total_answers_count negative. - state_stats.total_answers_count_v2 = -5 + def test_validation_for_state_stats_with_negative_total_answers_count(self): + self.state_stats.total_answers_count_v2 = -5 with self.assertRaisesRegexp(utils.ValidationError, ( '%s cannot have negative values' % ('total_answers_count_v2'))): - state_stats.validate() + self.state_stats.validate() def test_to_frontend_dict(self): state_stats_dict = { @@ -401,15 +335,10 @@ def test_to_frontend_dict(self): class ExplorationIssuesTests(test_utils.GenericTestBase): """Tests the ExplorationIssues domain object.""" + def setUp(self): + super(ExplorationIssuesTests, self).setUp() - def test_create_default(self): - exp_issues = stats_domain.ExplorationIssues.create_default('exp_id1', 1) - self.assertEqual(exp_issues.exp_id, 'exp_id1') - self.assertEqual(exp_issues.exp_version, 1) - self.assertEqual(exp_issues.unresolved_issues, []) - - def test_to_dict(self): - exp_issues = stats_domain.ExplorationIssues( + self.exp_issues = stats_domain.ExplorationIssues( 'exp_id1', 1, [ stats_domain.ExplorationIssue.from_dict({ 'issue_type': 'EarlyQuit', @@ -426,7 +355,14 @@ def test_to_dict(self): 'is_valid': True}) ]) - exp_issues_dict = exp_issues.to_dict() + def test_create_default(self): + exp_issues = stats_domain.ExplorationIssues.create_default('exp_id1', 1) + self.assertEqual(exp_issues.exp_id, 'exp_id1') + self.assertEqual(exp_issues.exp_version, 1) + self.assertEqual(exp_issues.unresolved_issues, []) + + def test_to_dict(self): + exp_issues_dict = self.exp_issues.to_dict() self.assertEqual(exp_issues_dict['exp_id'], 'exp_id1') self.assertEqual(exp_issues_dict['exp_version'], 1) @@ -486,84 +422,36 @@ def test_from_dict(self): 'schema_version': 1, 'is_valid': True}) - def test_validate(self): - exp_issues = stats_domain.ExplorationIssues( - 'exp_id1', 1, [ - stats_domain.ExplorationIssue.from_dict({ - 'issue_type': 'EarlyQuit', - 'issue_customization_args': { - 'state_name': { - 'value': 'state_name1' - }, - 'time_spent_in_exp_in_msecs': { - 'value': 200 - } - }, - 'playthrough_ids': ['playthrough_id1'], - 'schema_version': 1, - 'is_valid': True}) - ]) - exp_issues.validate() + def test_validate_for_exp_issues_with_correct_data(self): + self.exp_issues.validate() - # Change ID to int. - exp_issues.exp_id = 5 + def test_validate_with_int_exp_id(self): + self.exp_issues.exp_id = 5 with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected exp_id to be a string, received %s' % (type(5)))): - exp_issues.validate() + self.exp_issues.validate() def test_validate_exp_version(self): - exp_issues = stats_domain.ExplorationIssues( - 'exp_id1', 1, [ - stats_domain.ExplorationIssue.from_dict({ - 'issue_type': 'EarlyQuit', - 'issue_customization_args': { - 'state_name': { - 'value': 'state_name1' - }, - 'time_spent_in_exp_in_msecs': { - 'value': 200 - } - }, - 'playthrough_ids': ['playthrough_id1'], - 'schema_version': 1, - 'is_valid': True}) - ]) - exp_issues.validate() - - exp_issues.exp_version = 'invalid_version' + self.exp_issues.exp_version = 'invalid_version' with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected exp_version to be an int')): - exp_issues.validate() + self.exp_issues.validate() def test_validate_unresolved_issues(self): - exp_issues = stats_domain.ExplorationIssues( - 'exp_id1', 1, [ - stats_domain.ExplorationIssue.from_dict({ - 'issue_type': 'EarlyQuit', - 'issue_customization_args': { - 'state_name': { - 'value': 'state_name1' - }, - 'time_spent_in_exp_in_msecs': { - 'value': 200 - } - }, - 'playthrough_ids': ['playthrough_id1'], - 'schema_version': 1, - 'is_valid': True}) - ]) - exp_issues.validate() - - exp_issues.unresolved_issues = 0 + self.exp_issues.unresolved_issues = 0 with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected unresolved_issues to be a list')): - exp_issues.validate() + self.exp_issues.validate() class PlaythroughTests(test_utils.GenericTestBase): """Tests the Playthrough domain object.""" + def setUp(self): + super(PlaythroughTests, self).setUp() + + self.playthrough = self._get_valid_early_quit_playthrough() def _get_valid_early_quit_playthrough(self): """Returns an early quit playthrough after validating it.""" @@ -696,25 +584,20 @@ def test_from_backend_dict(self): 'exp_id not in playthrough data dict.'): stats_domain.Playthrough.from_backend_dict(playthrough_dict) - def test_validate(self): - playthrough = self._get_valid_early_quit_playthrough() - - # Change exp_version to string. - playthrough.exp_version = '1' + def test_validate_with_string_exp_version(self): + self.playthrough.exp_version = '1' with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected exp_version to be an int, received %s' % (type('1')))): - playthrough.validate() + self.playthrough.validate() - # Change to invalid issue_type. - playthrough.exp_version = 1 - playthrough.issue_type = 'InvalidIssueType' + def test_validate_with_invalid_issue_type(self): + self.playthrough.issue_type = 'InvalidIssueType' with self.assertRaisesRegexp(utils.ValidationError, ( - 'Invalid issue type: %s' % playthrough.issue_type)): - playthrough.validate() + 'Invalid issue type: %s' % self.playthrough.issue_type)): + self.playthrough.validate() - # Change to invalid action_type. - playthrough.issue_type = 'EarlyQuit' - playthrough.actions = [ + def test_validate_with_invalid_action_type(self): + self.playthrough.actions = [ stats_domain.LearnerAction.from_dict({ 'action_type': 'InvalidActionType', 'schema_version': 1, @@ -726,47 +609,44 @@ def test_validate(self): })] with self.assertRaisesRegexp(utils.ValidationError, ( 'Invalid action type: %s' % 'InvalidActionType')): - playthrough.validate() + self.playthrough.validate() def test_validate_non_str_exp_id(self): - playthrough = self._get_valid_early_quit_playthrough() - - playthrough.exp_id = 0 + self.playthrough.exp_id = 0 with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected exp_id to be a string')): - playthrough.validate() + self.playthrough.validate() def test_validate_non_str_issue_type(self): - playthrough = self._get_valid_early_quit_playthrough() - - playthrough.issue_type = 0 + self.playthrough.issue_type = 0 with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected issue_type to be a string')): - playthrough.validate() + self.playthrough.validate() def test_validate_non_list_actions(self): - playthrough = self._get_valid_early_quit_playthrough() - - playthrough.actions = 0 + self.playthrough.actions = 0 with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected actions to be a list')): - playthrough.validate() + self.playthrough.validate() def test_validate_non_dict_issue_customization_args(self): - playthrough = self._get_valid_early_quit_playthrough() - - playthrough.issue_customization_args = 0 + self.playthrough.issue_customization_args = 0 with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected issue_customization_args to be a dict')): - playthrough.validate() + self.playthrough.validate() class ExplorationIssueTests(test_utils.GenericTestBase): """Tests the ExplorationIssue domain object.""" + def setUp(self): + super(ExplorationIssueTests, self).setUp() + + self.exp_issue = stats_domain.ExplorationIssue( + 'EarlyQuit', {}, [], 1, True) def _dummy_convert_issue_v1_dict_to_v2_dict(self, issue_dict): """A test implementation of schema conversion function.""" @@ -902,54 +782,48 @@ def test_actual_update_exp_issue_from_model_raises_error(self): stats_domain.ExplorationIssue.update_exp_issue_from_model( exp_issue_dict) - def test_validate(self): - exp_issue = stats_domain.ExplorationIssue('EarlyQuit', {}, [], 1, True) - exp_issue.validate() + def test_validate_for_exp_issues_with_correct_data(self): + self.exp_issue.validate() - # Change issue_type to int. - exp_issue.issue_type = 5 + def test_validate_with_int_issue_type(self): + self.exp_issue.issue_type = 5 with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected issue_type to be a string, received %s' % (type(5)))): - exp_issue.validate() + self.exp_issue.validate() - # Change schema_version to string. - exp_issue.issue_type = 'EarlyQuit' - exp_issue.schema_version = '1' + def test_validate_with_string_schema_version(self): + self.exp_issue.schema_version = '1' with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected schema_version to be an int, received %s' % (type('1')))): - exp_issue.validate() + self.exp_issue.validate() def test_validate_issue_type(self): - exp_issue = stats_domain.ExplorationIssue('EarlyQuit', {}, [], 1, True) - exp_issue.validate() - - exp_issue.issue_type = 'invalid_issue_type' + self.exp_issue.issue_type = 'invalid_issue_type' with self.assertRaisesRegexp(utils.ValidationError, ( 'Invalid issue type')): - exp_issue.validate() + self.exp_issue.validate() def test_validate_playthrough_ids(self): - exp_issue = stats_domain.ExplorationIssue('EarlyQuit', {}, [], 1, True) - exp_issue.validate() - - exp_issue.playthrough_ids = 'invalid_playthrough_ids' + self.exp_issue.playthrough_ids = 'invalid_playthrough_ids' with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected playthrough_ids to be a list')): - exp_issue.validate() + self.exp_issue.validate() def test_validate_playthrough_id_type(self): - exp_issue = stats_domain.ExplorationIssue('EarlyQuit', {}, [], 1, True) - exp_issue.validate() - - exp_issue.playthrough_ids = [0, 1] + self.exp_issue.playthrough_ids = [0, 1] with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected each playthrough_id to be a string')): - exp_issue.validate() + self.exp_issue.validate() class LearnerActionTests(test_utils.GenericTestBase): """Tests the LearnerAction domain object.""" + def setUp(self): + super(LearnerActionTests, self).setUp() + + self.learner_action = stats_domain.LearnerAction( + 'ExplorationStart', {}, 1) def _dummy_convert_action_v1_dict_to_v2_dict(self, action_dict): """A test implementation of schema conversion function.""" @@ -1092,22 +966,20 @@ def test_actual_update_learner_action_from_model_raises_error(self): stats_domain.LearnerAction.update_learner_action_from_model( learner_action_dict) - def test_validate(self): - learner_action = stats_domain.LearnerAction('ExplorationStart', {}, 1) - learner_action.validate() + def test_validate_for_learner_action_with_correct_data(self): + self.learner_action.validate() - # Change action_type to int. - learner_action.action_type = 5 + def test_validate_with_int_action_type(self): + self.learner_action.action_type = 5 with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected action_type to be a string, received %s' % (type(5)))): - learner_action.validate() + self.learner_action.validate() - # Change schema_version to string. - learner_action.action_type = 'EarlyQuit' - learner_action.schema_version = '1' + def test_validate_with_string_schema_version(self): + self.learner_action.schema_version = '1' with self.assertRaisesRegexp(utils.ValidationError, ( 'Expected schema_version to be an int, received %s' % (type('1')))): - learner_action.validate() + self.learner_action.validate() class StateAnswersTests(test_utils.GenericTestBase): diff --git a/core/domain/visualization_registry_test.py b/core/domain/visualization_registry_test.py index 45286cb5eafa..21a3369d78c3 100644 --- a/core/domain/visualization_registry_test.py +++ b/core/domain/visualization_registry_test.py @@ -19,6 +19,7 @@ import importlib import inspect import os +import re from core.domain import visualization_registry from core.tests import test_utils @@ -39,6 +40,34 @@ def test_get_visualization_class_with_invalid_id_raises_error(self): visualization_registry.Registry.get_visualization_class( 'invalid_visualization_id') + def test_visualization_class_with_invalid_option_names(self): + bar_chart = visualization_registry.Registry.get_visualization_class( + 'BarChart') + bar_chart_instance = bar_chart('AnswerFrequencies', {}, True) + + with self.assertRaisesRegexp( + Exception, + re.escape( + 'For visualization BarChart, expected option names ' + '[\'x_axis_label\', \'y_axis_label\']; received names []')): + bar_chart_instance.validate() + + def test_visualization_class_with_invalid_addressed_info_is_supported(self): + bar_chart = visualization_registry.Registry.get_visualization_class( + 'BarChart') + option_names = { + 'x_axis_label': 'Answer', + 'y_axis_label': 'Count' + } + bar_chart_instance = bar_chart( + 'AnswerFrequencies', option_names, 'invalid_value') + + with self.assertRaisesRegexp( + Exception, + 'For visualization BarChart, expected a bool value for ' + 'addressed_info_is_supported; received invalid_value'): + bar_chart_instance.validate() + class VisualizationsNameTests(test_utils.GenericTestBase): diff --git a/core/templates/dev/head/base_components/BaseContentDirective.ts b/core/templates/dev/head/base_components/BaseContentDirective.ts index e4b97c8498e7..b3144746d85a 100644 --- a/core/templates/dev/head/base_components/BaseContentDirective.ts +++ b/core/templates/dev/head/base_components/BaseContentDirective.ts @@ -17,7 +17,7 @@ */ require('pages/OppiaFooterDirective.ts'); - +require('domain/sidebar/SidebarStatusService.ts'); require('domain/utilities/UrlInterpolationService.ts'); var oppia = require('AppInit.ts').module; @@ -39,7 +39,11 @@ oppia.directive('baseContent', [ '/base_components/base_content_directive.html'), controllerAs: '$ctrl', controller: [ - function() {} + '$scope', 'SidebarStatusService', + function($scope, SidebarStatusService) { + var ctrl = this; + ctrl.isSidebarShown = SidebarStatusService.isSidebarShown; + } ] }; } diff --git a/core/templates/dev/head/components/question-directives/questions-list/questions-list.constants.ts b/core/templates/dev/head/components/question-directives/questions-list/questions-list.constants.ts new file mode 100644 index 000000000000..c402d1cc8dbc --- /dev/null +++ b/core/templates/dev/head/components/question-directives/questions-list/questions-list.constants.ts @@ -0,0 +1,23 @@ +// Copyright 2019 The Oppia Authors. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS-IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @fileoverview Constants for the question player directive. + */ + +var oppia = require('AppInit.ts').module; + +oppia.constant('DEFAULT_SKILL_DIFFICULTY', '0.3'); +oppia.constant('MODE_SELECT_DIFFICULTY', 'MODE_SELECT_DIFFICULTY'); +oppia.constant('MODE_SELECT_SKILL', 'MODE_SELECT_SKILL'); diff --git a/core/templates/dev/head/components/question-directives/questions-list/questions-list.directive.ts b/core/templates/dev/head/components/question-directives/questions-list/questions-list.directive.ts index 2ce065a33a9d..d7bc0bd906fc 100644 --- a/core/templates/dev/head/components/question-directives/questions-list/questions-list.directive.ts +++ b/core/templates/dev/head/components/question-directives/questions-list/questions-list.directive.ts @@ -21,6 +21,9 @@ require('directives/AngularHtmlBindDirective.ts'); require( 'components/question-directives/question-editor/' + 'question-editor.directive.ts'); +require( + 'components/question-directives/questions-list/' + + 'questions-list.constants.ts'); require('components/entity-creation-services/question-creation.service.ts'); require('domain/editor/undo_redo/UndoRedoService.ts'); @@ -28,6 +31,7 @@ require('domain/question/EditableQuestionBackendApiService.ts'); require('domain/question/QuestionObjectFactory.ts'); require('domain/skill/EditableSkillBackendApiService.ts'); require('domain/skill/MisconceptionObjectFactory.ts'); +require('domain/skill/SkillDifficultyObjectFactory.ts'); require('domain/utilities/UrlInterpolationService.ts'); require('filters/string-utility-filters/truncate.filter.ts'); require('pages/topic-editor-page/services/topic-editor-state.service.ts'); @@ -62,14 +66,18 @@ oppia.directive('questionsList', [ 'AlertsService', 'QuestionCreationService', 'UrlService', 'NUM_QUESTIONS_PER_PAGE', 'EditableQuestionBackendApiService', 'EditableSkillBackendApiService', 'MisconceptionObjectFactory', - 'QuestionObjectFactory', 'EVENT_QUESTION_SUMMARIES_INITIALIZED', + 'QuestionObjectFactory', 'SkillDifficultyObjectFactory', + 'DEFAULT_SKILL_DIFFICULTY', 'EVENT_QUESTION_SUMMARIES_INITIALIZED', + 'MODE_SELECT_DIFFICULTY', 'MODE_SELECT_SKILL', 'StateEditorService', 'QuestionUndoRedoService', 'UndoRedoService', function( $scope, $filter, $http, $q, $uibModal, $window, AlertsService, QuestionCreationService, UrlService, NUM_QUESTIONS_PER_PAGE, EditableQuestionBackendApiService, EditableSkillBackendApiService, MisconceptionObjectFactory, - QuestionObjectFactory, EVENT_QUESTION_SUMMARIES_INITIALIZED, + QuestionObjectFactory, SkillDifficultyObjectFactory, + DEFAULT_SKILL_DIFFICULTY, EVENT_QUESTION_SUMMARIES_INITIALIZED, + MODE_SELECT_DIFFICULTY, MODE_SELECT_SKILL, StateEditorService, QuestionUndoRedoService, UndoRedoService) { var ctrl = this; ctrl.currentPage = 0; @@ -133,7 +141,8 @@ oppia.directive('questionsList', [ } if (!ctrl.questionIsBeingUpdated) { EditableQuestionBackendApiService.createQuestion( - ctrl.newQuestionSkillIds, ctrl.question.toBackendDict(true) + ctrl.newQuestionSkillIds, ctrl.newQuestionSkillDifficulties, + ctrl.question.toBackendDict(true) ).then(function() { ctrl.questionSummaries = ctrl.getQuestionSummariesAsync( 0, ctrl.skillIds, true, true @@ -173,14 +182,18 @@ oppia.directive('questionsList', [ }; ctrl.createQuestion = function() { + ctrl.newQuestionSkillIds = []; + var currentMode = MODE_SELECT_SKILL; if (!ctrl.selectSkillModalIsShown()) { ctrl.newQuestionSkillIds = ctrl.skillIds; - ctrl.populateMisconceptions(ctrl.skillIds); - if (AlertsService.warnings.length === 0) { - ctrl.initializeNewQuestionCreation(ctrl.skillIds); - } - return; + currentMode = MODE_SELECT_DIFFICULTY; } + var linkedSkillsWithDifficulty = []; + ctrl.newQuestionSkillIds.forEach(function(skillId) { + linkedSkillsWithDifficulty.push( + SkillDifficultyObjectFactory.create( + skillId, '', DEFAULT_SKILL_DIFFICULTY)); + }); var allSkillSummaries = ctrl.getAllSkillSummaries(); var modalInstance = $uibModal.open({ templateUrl: UrlInterpolationService.getDirectiveTemplateUrl( @@ -190,43 +203,71 @@ oppia.directive('questionsList', [ controller: [ '$scope', '$uibModalInstance', function($scope, $uibModalInstance) { - $scope.selectedSkillIds = []; - $scope.skillSummaries = allSkillSummaries; - $scope.skillSummaries.forEach(function(summary) { - summary.isSelected = false; - }); + var init = function() { + $scope.currentMode = currentMode; + $scope.linkedSkillsWithDifficulty = + linkedSkillsWithDifficulty; + $scope.skillSummaries = allSkillSummaries; + }; $scope.selectOrDeselectSkill = function(skillId, index) { if (!$scope.skillSummaries[index].isSelected) { - $scope.selectedSkillIds.push(skillId); + $scope.linkedSkillsWithDifficulty.push( + SkillDifficultyObjectFactory.create( + skillId, + $scope.skillSummaries[index].getDescription(), + DEFAULT_SKILL_DIFFICULTY)); $scope.skillSummaries[index].isSelected = true; } else { - var idIndex = $scope.selectedSkillIds.indexOf(skillId); - $scope.selectedSkillIds.splice(idIndex, 1); + var idIndex = $scope.linkedSkillsWithDifficulty.map( + function(linkedSkillWithDifficulty) { + return linkedSkillWithDifficulty.getId(); + }).indexOf(skillId); + $scope.linkedSkillsWithDifficulty.splice(idIndex, 1); $scope.skillSummaries[index].isSelected = false; } }; - $scope.done = function() { - $uibModalInstance.close($scope.selectedSkillIds); + $scope.goToSelectSkillView = function() { + $scope.currentMode = MODE_SELECT_SKILL; }; - $scope.cancel = function() { + $scope.goToSelectDifficultyView = function() { + $scope.currentMode = MODE_SELECT_DIFFICULTY; + }; + + $scope.startQuestionCreation = function() { + $uibModalInstance.close($scope.linkedSkillsWithDifficulty); + }; + + $scope.cancelModal = function() { $uibModalInstance.dismiss('cancel'); }; - $scope.ok = function() { + $scope.closeModal = function() { $uibModalInstance.dismiss('ok'); }; + + init(); } ] }); - modalInstance.result.then(function(skillIds) { - ctrl.newQuestionSkillIds = skillIds; - ctrl.populateMisconceptions(skillIds); + modalInstance.result.then(function(linkedSkillsWithDifficulty) { + ctrl.newQuestionSkillIds = []; + ctrl.newQuestionSkillDifficulties = []; + linkedSkillsWithDifficulty.forEach( + function(linkedSkillWithDifficulty) { + ctrl.newQuestionSkillIds.push( + linkedSkillWithDifficulty.getId()); + ctrl.newQuestionSkillDifficulties.push( + linkedSkillWithDifficulty.getDifficulty()); + } + ); + ctrl.populateMisconceptions(ctrl.newQuestionSkillIds); if (AlertsService.warnings.length === 0) { - ctrl.initializeNewQuestionCreation(skillIds); + ctrl.initializeNewQuestionCreation( + ctrl.newQuestionSkillIds); } }); }; diff --git a/core/templates/dev/head/css/oppia.css b/core/templates/dev/head/css/oppia.css index 6b9cabd4f532..71dafd5d77b5 100644 --- a/core/templates/dev/head/css/oppia.css +++ b/core/templates/dev/head/css/oppia.css @@ -3890,7 +3890,7 @@ span.learner-action { margin-bottom: 2em; } -span.oppia-issues-learner-action { +div.oppia-issues-learner-action { display: block; margin-bottom: 2em; } diff --git a/core/templates/dev/head/domain/question/EditableQuestionBackendApiService.ts b/core/templates/dev/head/domain/question/EditableQuestionBackendApiService.ts index 4a9fb833725c..a5fa16789758 100644 --- a/core/templates/dev/head/domain/question/EditableQuestionBackendApiService.ts +++ b/core/templates/dev/head/domain/question/EditableQuestionBackendApiService.ts @@ -39,15 +39,14 @@ oppia.factory('EditableQuestionBackendApiService', [ EDITABLE_QUESTION_DATA_URL_TEMPLATE, QUESTION_CREATION_URL, QUESTION_SKILL_LINK_URL_TEMPLATE) { var _createQuestion = function( - skillIds, questionDict, successCallback, errorCallback) { - var questionCreationUrl = UrlInterpolationService.interpolateUrl( - QUESTION_CREATION_URL, { - comma_separated_skill_ids: skillIds.join(',') - }); + skillIds, skillDifficulties, + questionDict, successCallback, errorCallback) { var postData = { - question_dict: questionDict + question_dict: questionDict, + skill_ids: skillIds, + skill_difficulties: skillDifficulties }; - $http.post(questionCreationUrl, postData).then(function(response) { + $http.post(QUESTION_CREATION_URL, postData).then(function(response) { var questionId = response.data.question_id; if (successCallback) { successCallback(questionId); @@ -126,9 +125,10 @@ oppia.factory('EditableQuestionBackendApiService', [ }; return { - createQuestion: function(skillIds, questionDict) { + createQuestion: function(skillIds, skillDifficulties, questionDict) { return $q(function(resolve, reject) { - _createQuestion(skillIds, questionDict, resolve, reject); + _createQuestion(skillIds, skillDifficulties, + questionDict, resolve, reject); }); }, diff --git a/core/templates/dev/head/domain/question/question-domain.constants.ts b/core/templates/dev/head/domain/question/question-domain.constants.ts index fe8c43c543a5..63c3c5c10eef 100644 --- a/core/templates/dev/head/domain/question/question-domain.constants.ts +++ b/core/templates/dev/head/domain/question/question-domain.constants.ts @@ -23,7 +23,7 @@ oppia.constant( '/question_editor_handler/data/'); oppia.constant( 'QUESTION_CREATION_URL', - '/question_editor_handler/create_new/'); + '/question_editor_handler/create_new'); oppia.constant( 'QUESTION_SKILL_LINK_URL_TEMPLATE', '/manage_question_skill_link//'); diff --git a/core/templates/dev/head/domain/skill/SkillDifficultyObjectFactory.ts b/core/templates/dev/head/domain/skill/SkillDifficultyObjectFactory.ts new file mode 100644 index 000000000000..bfed7b26412e --- /dev/null +++ b/core/templates/dev/head/domain/skill/SkillDifficultyObjectFactory.ts @@ -0,0 +1,66 @@ +// Copyright 2018 The Oppia Authors. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS-IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @fileoverview Object factory for creating frontend instances of + * skills with their difficulty for a question. + */ + +var oppia = require('AppInit.ts').module; + +oppia.factory('SkillDifficultyObjectFactory', [ + function() { + var SkillDifficulty = function(id, description, difficulty) { + this._id = id; + this._description = description; + this._difficulty = difficulty; + }; + + SkillDifficulty.prototype.toBackendDict = function() { + return { + id: this._id, + description: this._description, + difficulty: this._difficulty, + }; + }; + + /* eslint-disable dot-notation */ + SkillDifficulty['create'] = function(id, description, difficulty) { + /* eslint-enable dot-notation */ + return new SkillDifficulty(id, description, difficulty); + }; + + SkillDifficulty.prototype.getId = function() { + return this._id; + }; + + SkillDifficulty.prototype.getDescription = function() { + return this._description; + }; + + SkillDifficulty.prototype.setDescription = function(newDescription) { + this._description = newDescription; + }; + + SkillDifficulty.prototype.getDifficulty = function() { + return this._difficulty; + }; + + SkillDifficulty.prototype.setDifficulty = function(newDifficulty) { + this._difficulty = newDifficulty; + }; + + return SkillDifficulty; + } +]); diff --git a/core/templates/dev/head/domain/skill/SkillDifficultyObjectFactorySpec.ts b/core/templates/dev/head/domain/skill/SkillDifficultyObjectFactorySpec.ts new file mode 100644 index 000000000000..380f0aad7ea1 --- /dev/null +++ b/core/templates/dev/head/domain/skill/SkillDifficultyObjectFactorySpec.ts @@ -0,0 +1,51 @@ +// Copyright 2018 The Oppia Authors. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS-IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @fileoverview Unit tests for SkillDifficultyObjectFactory. + */ + +require('domain/skill/SkillDifficultyObjectFactory.ts'); + +describe('Skill Difficulty object factory', function() { + beforeEach(angular.mock.module('oppia')); + + describe('SkillDifficultyObjectFactory', function() { + var SkillDifficultyObjectFactory; + + beforeEach(angular.mock.inject(function($injector) { + SkillDifficultyObjectFactory = $injector.get( + 'SkillDifficultyObjectFactory'); + })); + + it('should create a new skill difficulty instance', function() { + var skillDifficulty = + SkillDifficultyObjectFactory.create('1', 'test skill', 0.3); + expect(skillDifficulty.getId()).toEqual('1'); + expect(skillDifficulty.getDescription()).toEqual('test skill'); + expect(skillDifficulty.getDifficulty()).toEqual(0.3); + }); + + it('should convert to a backend dictionary', function() { + var skillDifficulty = + SkillDifficultyObjectFactory.create('1', 'test skill', 0.3); + var skillDifficultyDict = { + id: '1', + description: 'test skill', + difficulty: 0.3 + }; + expect(skillDifficulty.toBackendDict()).toEqual(skillDifficultyDict); + }); + }); +}); diff --git a/core/templates/dev/head/domain/statistics/FeedbackImprovementCardObjectFactory.ts b/core/templates/dev/head/domain/statistics/FeedbackImprovementCardObjectFactory.ts index f6ee18ea1757..cb99c6b6bf80 100644 --- a/core/templates/dev/head/domain/statistics/FeedbackImprovementCardObjectFactory.ts +++ b/core/templates/dev/head/domain/statistics/FeedbackImprovementCardObjectFactory.ts @@ -16,25 +16,30 @@ * @fileoverview Factory for creating Feedback Cards in the Improvements Tab. */ - require('domain/statistics/ImprovementActionButtonObjectFactory.ts'); -require('domain/utilities/UrlInterpolationService.ts'); +require( + 'pages/exploration-editor-page/improvements-tab/services/' + + 'improvement-modal.service.ts'); require( 'pages/exploration-editor-page/feedback-tab/services/thread-data.service.ts'); - require('domain/statistics/statistics-domain.constants.ts'); var oppia = require('AppInit.ts').module; oppia.factory('FeedbackImprovementCardObjectFactory', [ - '$q', 'ImprovementActionButtonObjectFactory', 'ThreadDataService', - 'UrlInterpolationService', 'FEEDBACK_IMPROVEMENT_CARD_TYPE', + '$q', 'ImprovementActionButtonObjectFactory', 'ImprovementModalService', + 'ThreadDataService', 'FEEDBACK_IMPROVEMENT_CARD_TYPE', function( - $q, ImprovementActionButtonObjectFactory, ThreadDataService, - UrlInterpolationService, FEEDBACK_IMPROVEMENT_CARD_TYPE) { + $q, ImprovementActionButtonObjectFactory, ImprovementModalService, + ThreadDataService, FEEDBACK_IMPROVEMENT_CARD_TYPE) { var FeedbackImprovementCard = function(feedbackThread) { - this._actionButtons = []; this._feedbackThread = feedbackThread; + this._actionButtons = [ + ImprovementActionButtonObjectFactory.createNew( + 'Review Thread', 'btn-primary', function() { + ImprovementModalService.openFeedbackThread(feedbackThread); + }), + ]; }; /** diff --git a/core/templates/dev/head/domain/statistics/FeedbackImprovementCardObjectFactorySpec.ts b/core/templates/dev/head/domain/statistics/FeedbackImprovementCardObjectFactorySpec.ts index ff2691121acc..a442fad34f39 100644 --- a/core/templates/dev/head/domain/statistics/FeedbackImprovementCardObjectFactorySpec.ts +++ b/core/templates/dev/head/domain/statistics/FeedbackImprovementCardObjectFactorySpec.ts @@ -21,18 +21,23 @@ require('domain/statistics/FeedbackImprovementCardObjectFactory.ts'); describe('FeedbackImprovementCardObjectFactory', function() { var $q = null; var $rootScope = null; + var $uibModal = null; var FeedbackImprovementCardObjectFactory = null; + var ImprovementModalService = null; var ThreadDataService = null; var FEEDBACK_IMPROVEMENT_CARD_TYPE = null; beforeEach(angular.mock.module('oppia')); beforeEach(angular.mock.inject(function( - _$q_, _$rootScope_, _FeedbackImprovementCardObjectFactory_, - _ThreadDataService_, _FEEDBACK_IMPROVEMENT_CARD_TYPE_) { + _$q_, _$rootScope_, _$uibModal_, _FeedbackImprovementCardObjectFactory_, + _ImprovementModalService_, _ThreadDataService_, + _FEEDBACK_IMPROVEMENT_CARD_TYPE_) { $q = _$q_; $rootScope = _$rootScope_; + $uibModal = _$uibModal_; FeedbackImprovementCardObjectFactory = _FeedbackImprovementCardObjectFactory_; + ImprovementModalService = _ImprovementModalService_; ThreadDataService = _ThreadDataService_; FEEDBACK_IMPROVEMENT_CARD_TYPE = _FEEDBACK_IMPROVEMENT_CARD_TYPE_; })); @@ -114,8 +119,22 @@ describe('FeedbackImprovementCardObjectFactory', function() { }); describe('.getActionButtons', function() { - it('is empty', function() { - expect(this.card.getActionButtons()).toEqual([]); + it('contains one button', function() { + expect(this.card.getActionButtons().length).toEqual(1); + }); + + describe('first button', function() { + beforeEach(function() { + this.button = this.card.getActionButtons()[0]; + }); + + it('opens a thread modal', function() { + var spy = spyOn(ImprovementModalService, 'openFeedbackThread'); + + this.button.execute(); + + expect(spy).toHaveBeenCalledWith(this.mockThread); + }); }); }); }); diff --git a/core/templates/dev/head/domain/statistics/ImprovementActionButtonObjectFactory.ts b/core/templates/dev/head/domain/statistics/ImprovementActionButtonObjectFactory.ts index 4db92b8dcfb0..500f5120f054 100644 --- a/core/templates/dev/head/domain/statistics/ImprovementActionButtonObjectFactory.ts +++ b/core/templates/dev/head/domain/statistics/ImprovementActionButtonObjectFactory.ts @@ -27,10 +27,10 @@ oppia.factory('ImprovementActionButtonObjectFactory', [function() { * @param {string} [cssClass=btn-default] - The CSS class to render the button * with. */ - var ImprovementActionButton = function(text, actionFunc, cssClass) { + var ImprovementActionButton = function(text, cssClass, actionFunc) { this._text = text; + this._cssClass = cssClass; this._actionFunc = actionFunc; - this._cssClass = cssClass || 'btn-default'; }; /** @returns {string} - The text of the action (text rendered in button). */ @@ -38,16 +38,16 @@ oppia.factory('ImprovementActionButtonObjectFactory', [function() { return this._text; }; - /** Performs the associated action and return its result. */ - ImprovementActionButton.prototype.execute = function() { - return this._actionFunc(); - }; - /** Returns the CSS class of the button. */ ImprovementActionButton.prototype.getCssClass = function() { return this._cssClass; }; + /** Performs the associated action and return its result. */ + ImprovementActionButton.prototype.execute = function() { + return this._actionFunc(); + }; + return { /** * @returns {ImprovementActionButton} diff --git a/core/templates/dev/head/domain/statistics/ImprovementActionButtonObjectFactorySpec.ts b/core/templates/dev/head/domain/statistics/ImprovementActionButtonObjectFactorySpec.ts index a265f5eb2449..533a9e6b485b 100644 --- a/core/templates/dev/head/domain/statistics/ImprovementActionButtonObjectFactorySpec.ts +++ b/core/templates/dev/head/domain/statistics/ImprovementActionButtonObjectFactorySpec.ts @@ -19,19 +19,22 @@ require('domain/statistics/ImprovementActionButtonObjectFactory.ts'); describe('ImprovementActionButtonObjectFactory', function() { + var ImprovementActionButtonObjectFactory = null; + beforeEach(angular.mock.module('oppia')); - beforeEach(angular.mock.inject(function($injector) { - this.ImprovementActionButtonObjectFactory = - $injector.get('ImprovementActionButtonObjectFactory'); + beforeEach(angular.mock.inject(function( + _ImprovementActionButtonObjectFactory_) { + ImprovementActionButtonObjectFactory = + _ImprovementActionButtonObjectFactory_; })); describe('.createNew', function() { it('stores the name and action', function() { var flagToSetOnCallback = false; - var improvementAction = - this.ImprovementActionButtonObjectFactory.createNew('Test', function() { + var improvementAction = ImprovementActionButtonObjectFactory.createNew( + 'Test', 'btn-success', function() { flagToSetOnCallback = true; - }, 'btn-success'); + }); expect(improvementAction.getText()).toEqual('Test'); expect(improvementAction.getCssClass()).toEqual('btn-success'); @@ -39,13 +42,5 @@ describe('ImprovementActionButtonObjectFactory', function() { improvementAction.execute(); expect(flagToSetOnCallback).toBe(true); }); - - it('uses btn-default as class by default', function() { - var improvementAction = - this.ImprovementActionButtonObjectFactory.createNew('Test', function() { - }); - - expect(improvementAction.getCssClass()).toEqual('btn-default'); - }); }); }); diff --git a/core/templates/dev/head/domain/statistics/PlaythroughImprovementCardObjectFactory.ts b/core/templates/dev/head/domain/statistics/PlaythroughImprovementCardObjectFactory.ts index 6961effc88aa..6aba281db759 100644 --- a/core/templates/dev/head/domain/statistics/PlaythroughImprovementCardObjectFactory.ts +++ b/core/templates/dev/head/domain/statistics/PlaythroughImprovementCardObjectFactory.ts @@ -49,8 +49,9 @@ oppia.factory('PlaythroughImprovementCardObjectFactory', [ '$scope', '$uibModalInstance', function($scope, $uibModalInstance) { $scope.confirmationMessage = - 'Are you sure you want to discard this card?'; - $scope.confirmationButtonText = 'Discard'; + 'Marking this action as resolved will discard the ' + + 'playthrough. Are you sure you want to proceed?'; + $scope.confirmationButtonText = 'Mark as Resolved'; $scope.confirmationButtonClass = 'btn-danger'; $scope.action = function() { $uibModalInstance.close(); @@ -74,7 +75,7 @@ oppia.factory('PlaythroughImprovementCardObjectFactory', [ /** @type {ImprovementActionButton[]} */ this._actionButtons = [ ImprovementActionButtonObjectFactory.createNew( - 'Discard', discardThis, 'btn-danger'), + 'Mark as Resolved', 'btn-primary', discardThis), ]; /** @type {{suggestions: string[], playthroughIds: string[]}} */ this._directiveData = { diff --git a/core/templates/dev/head/domain/statistics/PlaythroughImprovementCardObjectFactorySpec.ts b/core/templates/dev/head/domain/statistics/PlaythroughImprovementCardObjectFactorySpec.ts index 54f2b344b01f..848dbf24d360 100644 --- a/core/templates/dev/head/domain/statistics/PlaythroughImprovementCardObjectFactorySpec.ts +++ b/core/templates/dev/head/domain/statistics/PlaythroughImprovementCardObjectFactorySpec.ts @@ -20,24 +20,39 @@ require('domain/statistics/PlaythroughImprovementCardObjectFactory.ts'); require('domain/statistics/PlaythroughIssueObjectFactory.ts'); describe('PlaythroughImprovementCardObjectFactory', function() { + var $q = null; + var $rootScope = null; + var $uibModal = null; + var PlaythroughImprovementCardObjectFactory = null; + var PlaythroughIssueObjectFactory = null; + var PlaythroughIssuesService = null; + var PLAYTHROUGH_IMPROVEMENT_CARD_TYPE = null; + beforeEach(angular.mock.module('oppia')); - beforeEach(angular.mock.inject(function($injector) { - this.PlaythroughImprovementCardObjectFactory = - $injector.get('PlaythroughImprovementCardObjectFactory'); - this.PlaythroughIssueObjectFactory = - $injector.get('PlaythroughIssueObjectFactory'); - this.PLAYTHROUGH_IMPROVEMENT_CARD_TYPE = - $injector.get('PLAYTHROUGH_IMPROVEMENT_CARD_TYPE'); + beforeEach(angular.mock.inject(function( + _$q_, _$rootScope_, _$uibModal_, + _PlaythroughImprovementCardObjectFactory_, + _PlaythroughIssueObjectFactory_, _PlaythroughIssuesService_, + _PLAYTHROUGH_IMPROVEMENT_CARD_TYPE_) { + $q = _$q_; + $rootScope = _$rootScope_; + $uibModal = _$uibModal_; + PlaythroughImprovementCardObjectFactory = + _PlaythroughImprovementCardObjectFactory_; + PlaythroughIssueObjectFactory = _PlaythroughIssueObjectFactory_; + PlaythroughIssuesService = _PlaythroughIssuesService_; + PLAYTHROUGH_IMPROVEMENT_CARD_TYPE = _PLAYTHROUGH_IMPROVEMENT_CARD_TYPE_; + + PlaythroughIssuesService.initSession(expId, expVersion); var expId = '7'; var expVersion = 1; - this.PlaythroughIssuesService = $injector.get('PlaythroughIssuesService'); - this.PlaythroughIssuesService.initSession(expId, expVersion); + this.scope = $rootScope.$new(); })); describe('.createNew', function() { it('retrieves data from passed issue', function() { - var issue = this.PlaythroughIssueObjectFactory.createFromBackendDict({ + var issue = PlaythroughIssueObjectFactory.createFromBackendDict({ issue_type: 'EarlyQuit', issue_customization_args: { state_name: {value: 'Hola'}, @@ -48,25 +63,25 @@ describe('PlaythroughImprovementCardObjectFactory', function() { is_valid: true, }); - var card = this.PlaythroughImprovementCardObjectFactory.createNew(issue); + var card = PlaythroughImprovementCardObjectFactory.createNew(issue); expect(card.getTitle()).toEqual( - this.PlaythroughIssuesService.renderIssueStatement(issue)); + PlaythroughIssuesService.renderIssueStatement(issue)); expect(card.getDirectiveData()).toEqual({ - title: this.PlaythroughIssuesService.renderIssueStatement(issue), + title: PlaythroughIssuesService.renderIssueStatement(issue), suggestions: - this.PlaythroughIssuesService.renderIssueSuggestions(issue), + PlaythroughIssuesService.renderIssueSuggestions(issue), playthroughIds: ['1', '2'], }); expect(card.getDirectiveType()).toEqual( - this.PLAYTHROUGH_IMPROVEMENT_CARD_TYPE); + PLAYTHROUGH_IMPROVEMENT_CARD_TYPE); }); }); describe('.fetchCards', function() { it('returns a card for each existing issue', function(done) { var earlyQuitIssue = - this.PlaythroughIssueObjectFactory.createFromBackendDict({ + PlaythroughIssueObjectFactory.createFromBackendDict({ issue_type: 'EarlyQuit', issue_customization_args: { state_name: {value: 'Hola'}, @@ -77,10 +92,10 @@ describe('PlaythroughImprovementCardObjectFactory', function() { is_valid: true, }); var earlyQuitCardTitle = - this.PlaythroughIssuesService.renderIssueStatement(earlyQuitIssue); + PlaythroughIssuesService.renderIssueStatement(earlyQuitIssue); var multipleIncorrectSubmissionsIssue = - this.PlaythroughIssueObjectFactory.createFromBackendDict({ + PlaythroughIssueObjectFactory.createFromBackendDict({ issue_type: 'MultipleIncorrectSubmissions', issue_customization_args: { state_name: {value: 'Hola'}, @@ -91,11 +106,11 @@ describe('PlaythroughImprovementCardObjectFactory', function() { is_valid: true, }); var multipleIncorrectSubmissionsCardTitle = - this.PlaythroughIssuesService.renderIssueStatement( + PlaythroughIssuesService.renderIssueStatement( multipleIncorrectSubmissionsIssue); var cyclicTransitionsIssue = - this.PlaythroughIssueObjectFactory.createFromBackendDict({ + PlaythroughIssueObjectFactory.createFromBackendDict({ issue_type: 'CyclicTransitions', issue_customization_args: { state_names: {value: ['Hola', 'Me Llamo', 'Hola']}, @@ -105,17 +120,17 @@ describe('PlaythroughImprovementCardObjectFactory', function() { is_valid: true, }); var cyclicTransitionsCardTitle = - this.PlaythroughIssuesService.renderIssueStatement( + PlaythroughIssuesService.renderIssueStatement( cyclicTransitionsIssue); - spyOn(this.PlaythroughIssuesService, 'getIssues').and.returnValue( - Promise.resolve([ + spyOn(PlaythroughIssuesService, 'getIssues').and.returnValue( + $q.resolve([ earlyQuitIssue, multipleIncorrectSubmissionsIssue, cyclicTransitionsIssue, ])); - this.PlaythroughImprovementCardObjectFactory.fetchCards() + PlaythroughImprovementCardObjectFactory.fetchCards() .then(function(cards) { expect(cards.length).toEqual(3); expect(cards[0].getTitle()).toEqual(earlyQuitCardTitle); @@ -123,12 +138,14 @@ describe('PlaythroughImprovementCardObjectFactory', function() { .toEqual(multipleIncorrectSubmissionsCardTitle); expect(cards[2].getTitle()).toEqual(cyclicTransitionsCardTitle); }).then(done, done.fail); + + this.scope.$digest(); // Forces all pending promises to evaluate. }); }); describe('PlaythroughImprovementCard', function() { beforeEach(function() { - this.issue = this.PlaythroughIssueObjectFactory.createFromBackendDict({ + this.issue = PlaythroughIssueObjectFactory.createFromBackendDict({ issue_type: 'EarlyQuit', issue_customization_args: { state_name: {value: 'Hola'}, @@ -138,62 +155,62 @@ describe('PlaythroughImprovementCardObjectFactory', function() { schema_version: 1, is_valid: true, }); - this.card = - this.PlaythroughImprovementCardObjectFactory.createNew(this.issue); + this.card = PlaythroughImprovementCardObjectFactory.createNew(this.issue); }); describe('.getActionButtons', function() { it('contains a specific sequence of buttons', function() { expect(this.card.getActionButtons().length).toEqual(1); - expect(this.card.getActionButtons()[0].getText()).toEqual('Discard'); + expect(this.card.getActionButtons()[0].getText()) + .toEqual('Mark as Resolved'); }); }); - describe('Discard Action Button', function() { - beforeEach(angular.mock.inject(function($injector) { - this.$uibModal = $injector.get('$uibModal'); - })); - + describe('Mark as Resolved Action Button', function() { it('marks the card as resolved after confirmation', function(done) { var card = this.card; var issue = this.issue; - var discardActionButton = card.getActionButtons()[0]; + var resolveActionButton = card.getActionButtons()[0]; var resolveIssueSpy = - spyOn(this.PlaythroughIssuesService, 'resolveIssue').and.stub(); + spyOn(PlaythroughIssuesService, 'resolveIssue').and.stub(); - spyOn(this.$uibModal, 'open').and.returnValue({ - result: Promise.resolve(), // Returned when confirm button is pressed. + spyOn($uibModal, 'open').and.returnValue({ + result: $q.resolve(), // Returned when confirm button is pressed. }); expect(card.isOpen()).toBe(true); - discardActionButton.execute().then(function() { + resolveActionButton.execute().then(function() { expect(resolveIssueSpy).toHaveBeenCalledWith(issue); expect(card.isOpen()).toBe(false); done(); }, function() { done.fail('dismiss button unexpectedly failed.'); }); + + this.scope.$digest(); // Forces all pending promises to evaluate. }); it('keeps the card after cancel', function(done) { var card = this.card; var issue = this.issue; - var discardActionButton = card.getActionButtons()[0]; + var resolveActionButton = card.getActionButtons()[0]; var resolveIssueSpy = - spyOn(this.PlaythroughIssuesService, 'resolveIssue').and.stub(); + spyOn(PlaythroughIssuesService, 'resolveIssue').and.stub(); - spyOn(this.$uibModal, 'open').and.returnValue({ - result: Promise.reject(), // Returned when cancel button is pressed. + spyOn($uibModal, 'open').and.returnValue({ + result: $q.reject(), // Returned when cancel button is pressed. }); expect(card.isOpen()).toBe(true); - discardActionButton.execute().then(function() { + resolveActionButton.execute().then(function() { done.fail('dismiss button unexpectedly succeeded.'); }, function() { expect(resolveIssueSpy).not.toHaveBeenCalled(); expect(card.isOpen()).toBe(true); done(); }); + + this.scope.$digest(); // Forces all pending promises to evaluate. }); }); }); diff --git a/core/templates/dev/head/domain/statistics/SuggestionImprovementCardObjectFactory.ts b/core/templates/dev/head/domain/statistics/SuggestionImprovementCardObjectFactory.ts index 9e847590efbd..b1f4cd2a05f8 100644 --- a/core/templates/dev/head/domain/statistics/SuggestionImprovementCardObjectFactory.ts +++ b/core/templates/dev/head/domain/statistics/SuggestionImprovementCardObjectFactory.ts @@ -16,24 +16,32 @@ * @fileoverview Factory for creating Suggestion Cards in the Improvements Tab. */ - require('domain/statistics/ImprovementActionButtonObjectFactory.ts'); -require('domain/utilities/UrlInterpolationService.ts'); - +require( + 'pages/exploration-editor-page/improvements-tab/services/' + + 'improvement-modal.service.ts'); require( 'pages/exploration-editor-page/feedback-tab/services/thread-data.service.ts'); +require( + 'pages/exploration-editor-page/suggestion-modal-for-editor-view/' + + 'suggestion-modal-for-exploration-editor.service.ts'); require('domain/statistics/statistics-domain.constants.ts'); var oppia = require('AppInit.ts').module; oppia.factory('SuggestionImprovementCardObjectFactory', [ - '$q', 'ImprovementActionButtonObjectFactory', 'ThreadDataService', - 'UrlInterpolationService', 'SUGGESTION_IMPROVEMENT_CARD_TYPE', + '$q', 'ImprovementActionButtonObjectFactory', 'ImprovementModalService', + 'ThreadDataService', 'SUGGESTION_IMPROVEMENT_CARD_TYPE', function( - $q, ImprovementActionButtonObjectFactory, ThreadDataService, - UrlInterpolationService, SUGGESTION_IMPROVEMENT_CARD_TYPE) { + $q, ImprovementActionButtonObjectFactory, ImprovementModalService, + ThreadDataService, SUGGESTION_IMPROVEMENT_CARD_TYPE) { var SuggestionImprovementCard = function(suggestionThread) { - this._actionButtons = []; + this._actionButtons = [ + ImprovementActionButtonObjectFactory.createNew( + 'Review Thread', 'btn-primary', function() { + ImprovementModalService.openSuggestionThread(suggestionThread); + }), + ]; this._suggestionThread = suggestionThread; }; diff --git a/core/templates/dev/head/domain/statistics/SuggestionImprovementCardObjectFactorySpec.ts b/core/templates/dev/head/domain/statistics/SuggestionImprovementCardObjectFactorySpec.ts index de5c69526b0d..6926e3b1e480 100644 --- a/core/templates/dev/head/domain/statistics/SuggestionImprovementCardObjectFactorySpec.ts +++ b/core/templates/dev/head/domain/statistics/SuggestionImprovementCardObjectFactorySpec.ts @@ -21,18 +21,30 @@ require('domain/statistics/SuggestionImprovementCardObjectFactory.ts'); describe('SuggestionImprovementCardObjectFactory', function() { var $q = null; var $rootScope = null; + var $uibModal = null; + var ImprovementModalService = null; var SuggestionImprovementCardObjectFactory = null; + var SuggestionModalForExplorationEditorService = null; + var SuggestionThreadObjectFactory = null; var ThreadDataService = null; var SUGGESTION_IMPROVEMENT_CARD_TYPE = null; beforeEach(angular.mock.module('oppia')); beforeEach(angular.mock.inject(function( - _$q_, _$rootScope_, _SuggestionImprovementCardObjectFactory_, - _ThreadDataService_, _SUGGESTION_IMPROVEMENT_CARD_TYPE_) { + _$q_, _$rootScope_, _$uibModal_, _ImprovementModalService_, + _SuggestionImprovementCardObjectFactory_, + _SuggestionModalForExplorationEditorService_, + _SuggestionThreadObjectFactory_, _ThreadDataService_, + _SUGGESTION_IMPROVEMENT_CARD_TYPE_) { $q = _$q_; $rootScope = _$rootScope_; + $uibModal = _$uibModal_; + ImprovementModalService = _ImprovementModalService_; SuggestionImprovementCardObjectFactory = _SuggestionImprovementCardObjectFactory_; + SuggestionModalForExplorationEditorService = + _SuggestionModalForExplorationEditorService_; + SuggestionThreadObjectFactory = _SuggestionThreadObjectFactory_; ThreadDataService = _ThreadDataService_; SUGGESTION_IMPROVEMENT_CARD_TYPE = _SUGGESTION_IMPROVEMENT_CARD_TYPE_; })); @@ -68,15 +80,40 @@ describe('SuggestionImprovementCardObjectFactory', function() { describe('SuggestionImprovementCard', function() { beforeEach(function() { - this.mockThread = { - last_updated: 1441870501230.642, - original_author_username: 'test_learner', - state_name: null, - status: 'open', - subject: 'Suggestion from a learner', - summary: null, - thread_id: 'abc1', + var mockSuggestionThreadBackendDict = { + last_updated: 1000, + original_author_username: 'author', + status: 'accepted', + subject: 'sample subject', + summary: 'sample summary', + message_count: 10, + state_name: 'state 1', + thread_id: 'exploration.exp1.thread1' }; + var mockSuggestionBackendDict = { + suggestion_id: 'exploration.exp1.thread1', + suggestion_type: 'edit_exploration_state_content', + target_type: 'exploration', + target_id: 'exp1', + target_version_at_submission: 1, + status: 'accepted', + author_name: 'author', + change: { + cmd: 'edit_state_property', + property_name: 'content', + state_name: 'state_1', + new_value: { + html: 'new suggestion content' + }, + old_value: { + html: 'old suggestion content' + } + }, + last_updated: 1000 + }; + + this.mockThread = SuggestionThreadObjectFactory.createFromBackendDicts( + mockSuggestionThreadBackendDict, mockSuggestionBackendDict); this.card = SuggestionImprovementCardObjectFactory.createNew(this.mockThread); }); @@ -114,8 +151,22 @@ describe('SuggestionImprovementCardObjectFactory', function() { }); describe('.getActionButtons', function() { - it('is empty', function() { - expect(this.card.getActionButtons()).toEqual([]); + it('contains one button', function() { + expect(this.card.getActionButtons().length).toEqual(1); + }); + + describe('first button', function() { + beforeEach(function() { + this.button = this.card.getActionButtons()[0]; + }); + + it('opens a thread modal', function() { + var spy = spyOn(ImprovementModalService, 'openSuggestionThread'); + + this.button.execute(); + + expect(spy).toHaveBeenCalledWith(this.mockThread); + }); }); }); }); diff --git a/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/feedback-improvement-card/feedback-improvement-card.directive.html b/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/feedback-improvement-card/feedback-improvement-card.directive.html index e15c47ab4f84..9565a854441f 100644 --- a/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/feedback-improvement-card/feedback-improvement-card.directive.html +++ b/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/feedback-improvement-card/feedback-improvement-card.directive.html @@ -1,7 +1,7 @@
-

+

<[getData().subject]> -

+
<[getHumanReadableStatus()]>
@@ -14,7 +14,7 @@

- anonymously submitted + (anonymously submitted) by <[getLatestMessage().author]> diff --git a/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/improvements-tab.directive.html b/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/improvements-tab.directive.html index ee7f234e7b70..650639e31663 100644 --- a/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/improvements-tab.directive.html +++ b/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/improvements-tab.directive.html @@ -1,5 +1,5 @@
-
+

Open Cards

@@ -7,27 +7,21 @@

<[getOpenCardCount()]>
-
- -
- - - - - - -
-
- -
- -
+ +
+ + + + + + +
+
+ +
+
diff --git a/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/services/improvement-modal.service.ts b/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/services/improvement-modal.service.ts new file mode 100644 index 000000000000..55bc8f3f8c25 --- /dev/null +++ b/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/services/improvement-modal.service.ts @@ -0,0 +1,199 @@ +// Copyright 2019 The Oppia Authors. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS-IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @fileoverview Service for creating modals associated to the improvements tab. + */ + +require( + 'pages/exploration-editor-page/feedback-tab/services/thread-data.service.ts'); +require( + 'pages/exploration-editor-page/feedback-tab/services/' + + 'thread-status-display.service.ts'); +require( + 'pages/exploration-editor-page/suggestion-modal-for-editor-view/' + + 'suggestion-modal-for-exploration-editor.service.ts'); +require('domain/utilities/UrlInterpolationService.ts'); + +var oppia = require('AppInit.ts').module; + +oppia.factory('ImprovementModalService', [ + '$uibModal', 'AlertsService', 'ChangeListService', 'DateTimeFormatService', + 'EditabilityService', 'ExplorationStatesService', + 'SuggestionModalForExplorationEditorService', 'ThreadDataService', + 'ThreadStatusDisplayService', 'UrlInterpolationService', 'UserService', + function( + $uibModal, AlertsService, ChangeListService, DateTimeFormatService, + EditabilityService, ExplorationStatesService, + SuggestionModalForExplorationEditorService, ThreadDataService, + ThreadStatusDisplayService, UrlInterpolationService, UserService) { + return { + openFeedbackThread: function(thread) { + return $uibModal.open({ + templateUrl: UrlInterpolationService.getDirectiveTemplateUrl( + '/pages/exploration-editor-page/improvements-tab/templates/' + + 'feedback-thread-modal.template.html'), + resolve: { + isUserLoggedIn: function() { + return UserService.getUserInfoAsync().then(function(userInfo) { + return userInfo.isLoggedIn(); + }); + }, + }, + controller: [ + '$scope', '$uibModalInstance', 'isUserLoggedIn', + function($scope, $uibModalInstance, isUserLoggedIn) { + $scope.activeThread = thread; + $scope.isUserLoggedIn = isUserLoggedIn; + $scope.STATUS_CHOICES = ThreadStatusDisplayService.STATUS_CHOICES; + $scope.getLabelClass = ThreadStatusDisplayService.getLabelClass; + $scope.getHumanReadableStatus = ( + ThreadStatusDisplayService.getHumanReadableStatus); + $scope.getLocaleAbbreviatedDatetimeString = ( + DateTimeFormatService.getLocaleAbbreviatedDatetimeString); + $scope.EditabilityService = EditabilityService; + + // Initial load of the thread list on page load. + $scope.tmpMessage = { + status: $scope.activeThread.status, + text: '', + }; + + $scope.getTitle = function() { + return $scope.activeThread.subject; + }; + + // TODO(Allan): Implement ability to edit suggestions before + // applying. + $scope.addNewMessage = function(threadId, tmpText, tmpStatus) { + if (threadId === null) { + AlertsService.addWarning( + 'Cannot add message to thread with ID: null.'); + return; + } + if (!tmpStatus) { + AlertsService.addWarning( + 'Invalid message status: ' + tmpStatus); + return; + } + $scope.messageSendingInProgress = true; + ThreadDataService.addNewMessage( + threadId, tmpText, tmpStatus, function() { + $scope.tmpMessage.status = $scope.activeThread.status; + $scope.messageSendingInProgress = false; + }, function() { + $scope.messageSendingInProgress = false; + }); + }; + $scope.close = function() { + $uibModalInstance.close(); + }; + }, + ], + backdrop: 'static', + size: 'lg', + }); + }, + + openSuggestionThread: function(thread) { + var openSuggestionReviewer = this.openSuggestionReviewer; + return $uibModal.open({ + templateUrl: UrlInterpolationService.getDirectiveTemplateUrl( + '/pages/exploration-editor-page/improvements-tab/templates/' + + 'suggestion-thread-modal.template.html'), + resolve: { + isUserLoggedIn: function() { + return UserService.getUserInfoAsync().then(function(userInfo) { + return userInfo.isLoggedIn(); + }); + }, + }, + controller: [ + '$scope', '$uibModalInstance', 'isUserLoggedIn', + function($scope, $uibModalInstance, isUserLoggedIn) { + $scope.activeThread = thread; + $scope.isUserLoggedIn = isUserLoggedIn; + $scope.STATUS_CHOICES = ThreadStatusDisplayService.STATUS_CHOICES; + $scope.getLabelClass = ThreadStatusDisplayService.getLabelClass; + $scope.getHumanReadableStatus = ( + ThreadStatusDisplayService.getHumanReadableStatus); + $scope.getLocaleAbbreviatedDatetimeString = ( + DateTimeFormatService.getLocaleAbbreviatedDatetimeString); + $scope.EditabilityService = EditabilityService; + $scope.openSuggestionReviewer = openSuggestionReviewer; + + // Initial load of the thread list on page load. + $scope.tmpMessage = { + status: $scope.activeThread.status, + text: '', + }; + + $scope.getTitle = function() { + return ( + 'Suggestion for the card "' + + $scope.activeThread.suggestion.stateName + '"'); + }; + + // TODO(Allan): Implement ability to edit suggestions before + // applying. + $scope.addNewMessage = function(threadId, tmpText, tmpStatus) { + if (threadId === null) { + AlertsService.addWarning( + 'Cannot add message to thread with ID: null.'); + return; + } + if (!tmpStatus) { + AlertsService.addWarning( + 'Invalid message status: ' + tmpStatus); + return; + } + $scope.messageSendingInProgress = true; + ThreadDataService.addNewMessage( + threadId, tmpText, tmpStatus, function() { + $scope.tmpMessage.status = $scope.activeThread.status; + $scope.messageSendingInProgress = false; + }, function() { + $scope.messageSendingInProgress = false; + }); + }; + $scope.close = function() { + $uibModalInstance.close(); + }; + }, + ], + backdrop: 'static', + size: 'lg', + }); + }, + + openSuggestionReviewer: function(suggestionThread) { + return SuggestionModalForExplorationEditorService.showSuggestionModal( + suggestionThread.suggestion.suggestionType, { + activeThread: suggestionThread, + hasUnsavedChanges: function() { + return ChangeListService.getChangeList().length > 0; + }, + isSuggestionHandled: function() { + return suggestionThread.isSuggestionHandled(); + }, + isSuggestionValid: function() { + return ExplorationStatesService.hasState( + suggestionThread.getSuggestionStateName()); + }, + } + ); + }, + }; + }, +]); diff --git a/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/suggestion-improvement-card/suggestion-improvement-card.directive.html b/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/suggestion-improvement-card/suggestion-improvement-card.directive.html index d5b042fedc61..2e4776c54d24 100644 --- a/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/suggestion-improvement-card/suggestion-improvement-card.directive.html +++ b/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/suggestion-improvement-card/suggestion-improvement-card.directive.html @@ -1,7 +1,7 @@
-

+

Suggestion for the card "<[getData().suggestion.stateName]>" -

+
<[getHumanReadableStatus()]>
@@ -14,7 +14,7 @@

- anonymously submitted + (anonymously submitted) by <[getLatestMessage().author]> diff --git a/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/templates/feedback-thread-modal.template.html b/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/templates/feedback-thread-modal.template.html new file mode 100644 index 000000000000..bfa601d31e05 --- /dev/null +++ b/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/templates/feedback-thread-modal.template.html @@ -0,0 +1,118 @@ +
+

<[getTitle()]>

+ +
+ + state: <[activeThread.stateName]> + + + <[getHumanReadableStatus(activeThread.status)]> + +
+ +
+
+ +
+
    +
  1. +
    + #<[m.message_id]> + by <[m.author_username]> + (anonymously submitted) +
    + +
    + <[getLocaleAbbreviatedDatetimeString(m.created_on)]> +
    + +
    + + Status changed to '<[getHumanReadableStatus(m.updated_status)]>' + + + Subject changed to '<[m.updated_subject]>' + +
    + +

    <[m.text]>

    +
    2. +
+
+ +
+
+ + + +
+
+ Change status (optional): + +
+ error_outline + Please specify a reason for setting the status to "<[getHumanReadableStatus(tmpMessage.status)]>". +
+
+ +
+ + +
+ +
+
+
+
+ To respond to a feedback thread, please log in. +
+ +
+
+
+
+ + + diff --git a/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/templates/suggestion-thread-modal.template.html b/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/templates/suggestion-thread-modal.template.html new file mode 100644 index 000000000000..e00e71cd23f3 --- /dev/null +++ b/core/templates/dev/head/pages/exploration-editor-page/improvements-tab/templates/suggestion-thread-modal.template.html @@ -0,0 +1,105 @@ +
+

<[getTitle()]>

+ +
+ + <[getHumanReadableStatus(activeThread.status)]> + +
+ +
+
+ +
+
    +
  1. +
    + #<[m.message_id]> + by <[m.author_username]> + (anonymously submitted) +
    + +
    + <[getLocaleAbbreviatedDatetimeString(m.created_on)]> +
    + +
    + + Status changed to '<[getHumanReadableStatus(m.updated_status)]>' + + + Subject changed to '<[m.updated_subject]>' + +
    + +

    <[m.text]>

    +

    + <[activeThread.subject]> +
    + +

    +
    2. +
+
+ +
+
+ + + +
+
+ + +
+ +
+
+
+
+ To respond to a suggestion thread, please log in. +
+ +
+
+
+
+ + + diff --git a/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/issues/answer-submit-action.directive.html b/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/issues/answer-submit-action.directive.html new file mode 100644 index 000000000000..f8a26b7df177 --- /dev/null +++ b/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/issues/answer-submit-action.directive.html @@ -0,0 +1,9 @@ +<[$ctrl.actionIndex]>. Submitted answer " + + + " in card "<[$ctrl.currentStateName]>". + + + " and moved to card "<[$ctrl.destStateName]>" after spending <[$ctrl.timeSpentInStateSecs]> + seconds on card "<[$ctrl.currentStateName]>". + diff --git a/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/issues/answer-submit-action.directive.ts b/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/issues/answer-submit-action.directive.ts new file mode 100644 index 000000000000..a0d475d21c0e --- /dev/null +++ b/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/issues/answer-submit-action.directive.ts @@ -0,0 +1,56 @@ +// Copyright 2019 The Oppia Authors. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS-IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @fileoverview Directive for the Answer Submit Learner Action. + */ + +require('domain/utilities/UrlInterpolationService.ts'); +require('services/ExplorationHtmlFormatterService.ts'); +require('services/HtmlEscaperService.ts'); + +var oppia = require('AppInit.ts').module; + +oppia.directive('answerSubmitAction', [ + 'ExplorationHtmlFormatterService', 'HtmlEscaperService', + 'UrlInterpolationService', + function( + ExplorationHtmlFormatterService, HtmlEscaperService, + UrlInterpolationService) { + return { + restrict: 'E', + scope: {}, + bindToController: {}, + templateUrl: UrlInterpolationService.getDirectiveTemplateUrl( + '/pages/exploration-editor-page/statistics-tab/issues/' + + 'answer-submit-action.directive.html'), + controllerAs: '$ctrl', + controller: ['$attrs', function($attrs) { + var ctrl = this; + ctrl.currentStateName = $attrs.currentStateName; + ctrl.destStateName = $attrs.destStateName; + ctrl.actionIndex = $attrs.actionIndex; + ctrl.timeSpentInStateSecs = $attrs.timeSpentInStateSecs; + + var _customizationArgs = HtmlEscaperService.escapedJsonToObj( + $attrs.interactionCustomizationArgs); + var _answer = HtmlEscaperService.escapedJsonToObj($attrs.answer); + ctrl.getShortAnswerHtml = function() { + return ExplorationHtmlFormatterService.getShortAnswerHtml( + _answer, $attrs.interactionId, _customizationArgs); + }; + }] + }; + } +]); diff --git a/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/services/learner-action-render.service.spec.ts b/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/services/learner-action-render.service.spec.ts index 9abf1153b52a..9c97e2f2d45a 100644 --- a/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/services/learner-action-render.service.spec.ts +++ b/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/services/learner-action-render.service.spec.ts @@ -41,12 +41,32 @@ describe('Learner Action Render Service', function() { this.LearnerActionObjectFactory = $injector.get('LearnerActionObjectFactory'); this.PlaythroughService = $injector.get('PlaythroughService'); + this.ExplorationStatesService = $injector.get('ExplorationStatesService'); this.ExplorationFeaturesService = $injector.get('ExplorationFeaturesService'); this.PlaythroughService.initSession('expId1', 1, 1.0); spyOn(this.ExplorationFeaturesService, 'isPlaythroughRecordingEnabled') .and.returnValue(true); + spyOn(this.ExplorationStatesService, 'getState') + .withArgs('stateName1').and.returnValue( + { interaction: { id: 'Continue'}}) + .withArgs('stateName2').and.returnValue( + { interaction: { id: 'TextInput'}}) + .withArgs('stateName3').and.returnValue( + { interaction: { + id: 'MultipleChoiceInput', + customizationArgs: { + choices: { + value: [ + 'Choice1', + 'Choice2', + 'Choice3' + ] + } + }} + }); + this.LearnerActionRenderService = $injector.get('LearnerActionRenderService'); })); @@ -311,8 +331,7 @@ describe('Learner Action Render Service', function() { .renderFinalDisplayBlockForMISIssueHTML(displayBlocks[0], 1); expect(this.$sce.getTrustedHtml(finalBlockHTML)).toEqual( - '1. Started exploration ' + - 'at card "stateName1".' + + '1. Started exploration at card "stateName1".' + '2. Submitted the ' + 'following answers in card "stateName1"' + '' + '' + '
Answer' + @@ -322,8 +341,8 @@ describe('Learner Action Render Service', function() { '
HelloTry again
HelloTry again
HelloTry again
' + - '3. Left the exploration ' + - 'after spending a total of 120 seconds on card "stateName1".' + '3. Left the exploration after spending a total of 120 seconds on ' + + 'card "stateName1".' ); }); @@ -332,7 +351,10 @@ describe('Learner Action Render Service', function() { this.PlaythroughService.recordAnswerSubmitAction( 'stateName1', 'stateName2', 'Continue', '', 'Welcome', 30); this.PlaythroughService.recordAnswerSubmitAction( - 'stateName2', 'stateName2', 'TextInput', 'Hello', 'Try again', 30); + 'stateName2', 'stateName3', 'TextInput', 'Hello', 'Go ahead', 30); + this.PlaythroughService.recordAnswerSubmitAction( + 'stateName3', 'stateName3', 'MultipleChoiceInput', 'Choice1', + 'Go ahead', 30); this.PlaythroughService.recordExplorationQuitAction('stateName2', 120); var learnerActions = this.PlaythroughService.getPlaythrough().actions; @@ -341,19 +363,33 @@ describe('Learner Action Render Service', function() { expect(displayBlocks.length).toEqual(1); - var blockHTML = this.LearnerActionRenderService.renderDisplayBlockHTML( - displayBlocks[0], 1); + var actionHtmlList = []; + for (var i = 0; i < displayBlocks[0].length; i++) { + actionHtmlList.push(this.LearnerActionRenderService.renderLearnerAction( + displayBlocks[0][i], 0, i + 1)); + } - expect(this.$sce.getTrustedHtml(blockHTML)).toEqual( - '1. Started exploration at ' + - 'card "stateName1".' + - '2. Pressed "Continue" to ' + - 'move to card "stateName2" after 30 seconds.' + - '3. Submitted answer ' + - '"Hello" in card "stateName2".' + - '4. Left the exploration ' + - 'after spending a total of 120 seconds on card "stateName2".' - ); + expect(actionHtmlList[0]).toEqual( + '1. Started exploration at card "stateName1".'); + expect(actionHtmlList[1]).toEqual( + '2. Pressed "Continue" to move to card "stateName2" after 30 seconds.'); + expect(actionHtmlList[2]).toEqual( + ''); + expect(actionHtmlList[3]).toEqual( + ''); + expect(actionHtmlList[4]).toEqual( + '5. Left the exploration after spending a total of 120 seconds on ' + + 'card "stateName2".'); }); }); }); diff --git a/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/services/learner-action-render.service.ts b/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/services/learner-action-render.service.ts index ff96eaf1a0d7..1b1d2788fc64 100644 --- a/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/services/learner-action-render.service.ts +++ b/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/services/learner-action-render.service.ts @@ -26,38 +26,44 @@ * learner actions and then returns a giant HTML string. */ +require('pages/exploration-editor-page/services/exploration-states.service.ts'); +require( + 'pages/exploration-editor-page/statistics-tab/issues/' + + 'answer-submit-action.directive.ts'); +require('services/ExplorationHtmlFormatterService.ts'); + var oppia = require('AppInit.ts').module; oppia.factory('LearnerActionRenderService', [ - '$sce', 'ACTION_TYPE_ANSWER_SUBMIT', 'ACTION_TYPE_EXPLORATION_QUIT', - 'ACTION_TYPE_EXPLORATION_START', 'ISSUE_TYPE_MULTIPLE_INCORRECT_SUBMISSIONS', + '$sce', 'ExplorationHtmlFormatterService', 'ExplorationStatesService', + 'HtmlEscaperService', 'ACTION_TYPE_ANSWER_SUBMIT', + 'ACTION_TYPE_EXPLORATION_QUIT', 'ACTION_TYPE_EXPLORATION_START', + 'ISSUE_TYPE_MULTIPLE_INCORRECT_SUBMISSIONS', function( - $sce, ACTION_TYPE_ANSWER_SUBMIT, ACTION_TYPE_EXPLORATION_QUIT, - ACTION_TYPE_EXPLORATION_START, + $sce, ExplorationHtmlFormatterService, ExplorationStatesService, + HtmlEscaperService, ACTION_TYPE_ANSWER_SUBMIT, + ACTION_TYPE_EXPLORATION_QUIT, ACTION_TYPE_EXPLORATION_START, ISSUE_TYPE_MULTIPLE_INCORRECT_SUBMISSIONS) { var renderExplorationStartActionHTML = function(stateName, actionIndex) { - var htmlString = - '' + actionIndex + - '. Started exploration at card "' + stateName + '".'; - return htmlString; + var statement = + actionIndex + '. Started exploration at card "' + stateName + '".'; + return ($('').text(statement)).html(); }; var renderExplorationQuitActionHTML = function( stateName, timeSpentInStateSecs, actionIndex) { - var htmlString = - '' + actionIndex + - '. Left the exploration after spending a ' + 'total of ' + - timeSpentInStateSecs + ' seconds on card "' + stateName + '".'; - return htmlString; + var statement = + actionIndex + '. Left the exploration after spending a total of ' + + timeSpentInStateSecs + ' seconds on card "' + stateName + '".'; + return ($('').text(statement)).html(); }; var renderContinueButtonSubmitActionHTML = function( stateName, timeSpentInStateSecs, actionIndex) { - var htmlString = - '' + actionIndex + - '. Pressed "Continue" to move to card "' + stateName + '" after ' + - timeSpentInStateSecs + ' seconds.'; - return htmlString; + var statement = + actionIndex + '. Pressed "Continue" to move to card "' + stateName + + '" after ' + timeSpentInStateSecs + ' seconds.'; + return ($('').text(statement)).html(); }; /** @@ -68,25 +74,23 @@ oppia.factory('LearnerActionRenderService', [ * @param {int} timeSpentInStateSecs. * @param {string} currentStateName. * @param {int} actionIndex. + * @param {Interaction} interaction. * @returns {string} */ var renderAnswerSubmitActionHTML = function( answer, destStateName, timeSpentInStateSecs, currentStateName, - actionIndex) { - var htmlString; - if (currentStateName === destStateName) { - htmlString = - '' + actionIndex + - '. Submitted answer "' + answer + '" in card "' + currentStateName + - '".'; - } else { - htmlString = - '' + actionIndex + - '. Submitted answer "' + answer + '" and moved to card "' + - destStateName + '" after spending ' + timeSpentInStateSecs + - ' seconds on card "' + currentStateName + '".'; - } - return htmlString; + actionIndex, interaction) { + var el = $(''); + el.attr('answer', HtmlEscaperService.objToEscapedJson(answer)); + el.attr('dest-state-name', destStateName); + el.attr('time-spent-in-state-secs', timeSpentInStateSecs); + el.attr('current-state-name', currentStateName); + el.attr('action-index', actionIndex); + el.attr('interaction-id', interaction.id); + el.attr( + 'interaction-customization-args', + HtmlEscaperService.objToEscapedJson(interaction.customizationArgs)); + return ($('').append(el)).html(); }; /** @@ -129,6 +133,8 @@ oppia.factory('LearnerActionRenderService', [ var renderLearnerActionHTML = function(learnerAction, actionIndex) { var actionType = learnerAction.actionType; var custArgs = learnerAction.actionCustomizationArgs; + var interaction = ExplorationStatesService.getState( + custArgs.state_name.value).interaction; if (actionType === ACTION_TYPE_EXPLORATION_START) { return renderExplorationStartActionHTML( custArgs.state_name.value, actionIndex); @@ -146,7 +152,7 @@ oppia.factory('LearnerActionRenderService', [ return renderAnswerSubmitActionHTML( custArgs.submitted_answer.value, custArgs.dest_state_name.value, custArgs.time_spent_state_in_msecs.value, custArgs.state_name.value, - actionIndex); + actionIndex, interaction); } } }; @@ -217,6 +223,10 @@ oppia.factory('LearnerActionRenderService', [ block[index], actionStartIndex + i + 1); return $sce.trustAsHtml(htmlString); }, + renderLearnerAction: function(learnerAction, blockIndex, actionIndex) { + return renderLearnerActionHTML( + learnerAction, blockIndex + actionIndex); + }, renderDisplayBlockHTML: function(block, actionStartIndex) { var htmlString = ''; for (var i = 0; i < block.length; i++) { diff --git a/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/templates/playthrough-modal.template.html b/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/templates/playthrough-modal.template.html index b747b7fac694..892fbd789dbd 100644 --- a/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/templates/playthrough-modal.template.html +++ b/core/templates/dev/head/pages/exploration-editor-page/statistics-tab/templates/playthrough-modal.template.html @@ -8,9 +8,19 @@

Sample Playthrough

- + +
+
+
+ + +
-
diff --git a/core/templates/dev/head/pages/topic-editor-page/modal-templates/select-skill-modal.template.html b/core/templates/dev/head/pages/topic-editor-page/modal-templates/select-skill-modal.template.html index 72e2fee6c690..0d096361de8a 100644 --- a/core/templates/dev/head/pages/topic-editor-page/modal-templates/select-skill-modal.template.html +++ b/core/templates/dev/head/pages/topic-editor-page/modal-templates/select-skill-modal.template.html @@ -1,31 +1,75 @@ -
-

- No skills linked to topic -

-

- Select the skill to link the question to: -

-
-
-
- You can only create questions for topics that have atleast one skill - attached to it. Please link a skill to this topic before adding questions. + +
+
+

+ No skills linked to topic +

+

+ Select the skill to link the question to: +

+
+
+
+ You can only create questions for topics that have atleast one skill + attached to it. Please link a skill to this topic before adding questions. +
+
+ + + +
-
- - - +
+
+ + +
+
+ +
-
-
- - + +
+
+

+ Select skills you would like to link to the question. +

+

+ Select the difficulty per skill: +

+
+
+
+ You can only set difficulty after selecting skills linked to the question. Please go back and link skill(s) to this question. +
+
+
+ + + Easy + Medium + Hard + +
+
-
- +
+
+ + +
+
+ +
diff --git a/core/templates/dev/head/services/CsrfTokenService.ts b/core/templates/dev/head/services/CsrfTokenService.ts index 23f492b20623..27a1aa8c01c4 100644 --- a/core/templates/dev/head/services/CsrfTokenService.ts +++ b/core/templates/dev/head/services/CsrfTokenService.ts @@ -15,48 +15,38 @@ /** * @fileoverview Service for managing CSRF tokens. */ + var oppia = require('AppInit.ts').module; oppia.factory('CsrfTokenService', [function() { - var token = null; var tokenPromise = null; return { initializeToken: function() { if (tokenPromise !== null) { - throw new Error('Token request already made'); + throw new Error('Token request has already been made'); } - tokenPromise = new Promise(function(resolve, reject) { - // We use jQuery here instead of Angular's $http, since the latter - // creates a circular dependency. - $.ajax({ - url: '/csrfhandler', - type: 'GET', - dataType: 'text', - dataFilter: function(data) { - // Remove the XSSI prefix. - var transformedData = data.substring(5); - return JSON.parse(transformedData); - }, - }).done(function(response) { - token = response.token; - resolve(response.token); - }); + // We use jQuery here instead of Angular's $http, since the latter creates + // a circular dependency. + tokenPromise = $.ajax({ + url: '/csrfhandler', + type: 'GET', + dataType: 'text', + dataFilter: function(data) { + // Remove the protective XSSI (cross-site scripting inclusion) prefix. + var actualData = data.substring(5); + return JSON.parse(actualData); + }, + }).then(function(response) { + return response.token; }); }, getTokenAsync: function() { - if (token !== null) { - return new Promise(function(resolve, reject) { - resolve(token); - }); - } - if (tokenPromise !== null) { - // The token initialization request is still pending. - return tokenPromise; - } else { + if (tokenPromise === null) { throw new Error('Token needs to be initialized'); } + return tokenPromise; } }; }]); diff --git a/core/templates/dev/head/services/CsrfTokenServiceSpec.ts b/core/templates/dev/head/services/CsrfTokenServiceSpec.ts index 91ce1efc1826..3d2b567f66d1 100644 --- a/core/templates/dev/head/services/CsrfTokenServiceSpec.ts +++ b/core/templates/dev/head/services/CsrfTokenServiceSpec.ts @@ -19,41 +19,43 @@ require('services/CsrfTokenService.ts'); describe('Csrf Token Service', function() { - var CsrfTokenService, $httpBackend; + var $httpBackend = null; + var $q = null; + var $rootScope = null; + var CsrfTokenService = null; beforeEach(angular.mock.module('oppia')); - beforeEach(angular.mock.inject(function($injector, $q) { - CsrfTokenService = $injector.get('CsrfTokenService'); - $httpBackend = $injector.get('$httpBackend'); - - spyOn($, 'ajax').and.callFake(function() { - var deferred = $q.defer(); - deferred.resolve('sample-csrf-token'); - return deferred.promise; - }); + beforeEach(angular.mock.inject(function( + _$httpBackend_, _$q_, _$rootScope_, _CsrfTokenService_) { + $httpBackend = _$httpBackend_; + $q = _$q_; + $rootScope = _$rootScope_; + CsrfTokenService = _CsrfTokenService_; + + this.scope = $rootScope.$new(); + + spyOn($, 'ajax').and.returnValue($q.resolve({token: 'sample-csrf-token'})); })); - it('should correctly set the csrf token', function() { + it('should correctly set the csrf token', function(done) { CsrfTokenService.initializeToken(); CsrfTokenService.getTokenAsync().then(function(token) { - expect(token).toBe('sample-csrf-token'); - }); + expect(token).toEqual('sample-csrf-token'); + }).then(done, done.fail); + + this.scope.$digest(); // Force all promises to evaluate. + }); + + it('should error if initialize is called more than once', function() { + CsrfTokenService.initializeToken(); + + expect(CsrfTokenService.initializeToken) + .toThrowError('Token request has already been made'); }); - it('should error if initialize is called more than once', - function() { - CsrfTokenService.initializeToken(); - - expect(CsrfTokenService.initializeToken).toThrowError( - 'Token request already made'); - } - ); - - it('should error if getTokenAsync is called before initialization', - function() { - expect(CsrfTokenService.getTokenAsync).toThrowError( - 'Token needs to be initialized'); - } - ); + it('should error if getTokenAsync is called before initialize', function() { + expect(CsrfTokenService.getTokenAsync) + .toThrowError('Token needs to be initialized'); + }); }); diff --git a/core/templates/dev/head/services/PlaythroughIssuesBackendApiService.ts b/core/templates/dev/head/services/PlaythroughIssuesBackendApiService.ts index 2838319ef9a2..6b1a8952bc5c 100644 --- a/core/templates/dev/head/services/PlaythroughIssuesBackendApiService.ts +++ b/core/templates/dev/head/services/PlaythroughIssuesBackendApiService.ts @@ -24,11 +24,11 @@ require('services/services.constants.ts'); var oppia = require('AppInit.ts').module; oppia.factory('PlaythroughIssuesBackendApiService', [ - '$http', 'PlaythroughIssueObjectFactory', 'PlaythroughObjectFactory', + '$http', '$q', 'PlaythroughIssueObjectFactory', 'PlaythroughObjectFactory', 'UrlInterpolationService', 'FETCH_ISSUES_URL', 'FETCH_PLAYTHROUGH_URL', 'RESOLVE_ISSUE_URL', function( - $http, PlaythroughIssueObjectFactory, PlaythroughObjectFactory, + $http, $q, PlaythroughIssueObjectFactory, PlaythroughObjectFactory, UrlInterpolationService, FETCH_ISSUES_URL, FETCH_PLAYTHROUGH_URL, RESOLVE_ISSUE_URL) { /** @type {PlaythroughIssue[]} */ @@ -58,7 +58,7 @@ oppia.factory('PlaythroughIssuesBackendApiService', [ return { fetchIssues: function(explorationId, explorationVersion) { if (cachedIssues !== null) { - return Promise.resolve(cachedIssues); + return $q.resolve(cachedIssues); } else { return $http.get(getFullIssuesUrl(explorationId), { params: { @@ -92,7 +92,7 @@ oppia.factory('PlaythroughIssuesBackendApiService', [ var invalidIssueError = new Error( 'An issue which was not fetched from the backend has been ' + 'resolved'); - return Promise.reject(invalidIssueError); + return $q.reject(invalidIssueError); } else { cachedIssues.splice(issueIndex, 1); } diff --git a/core/templates/dev/head/services/PlaythroughIssuesService.ts b/core/templates/dev/head/services/PlaythroughIssuesService.ts index a4af853e122e..2a267d0678be 100644 --- a/core/templates/dev/head/services/PlaythroughIssuesService.ts +++ b/core/templates/dev/head/services/PlaythroughIssuesService.ts @@ -18,6 +18,9 @@ require('domain/utilities/UrlInterpolationService.ts'); require('services/PlaythroughIssuesBackendApiService.ts'); +require( + 'pages/exploration-editor-page/statistics-tab/services/' + + 'learner-action-render.service.ts'); var oppia = require('AppInit.ts').module; @@ -183,9 +186,44 @@ oppia.factory('PlaythroughIssuesService', [ displayBlock, blockActionIndexMapping[index]); }; + /** + * Returns the index of the learner action wihtin the display + * block. + * @param {LearnerAction} learnerAction. + * @param {LearnerAction[]} displayBlock. + * @returns {int} + */ + $scope.getLearnerActionIndex = function( + learnerAction, displayBlock) { + return displayBlock.indexOf(learnerAction); + }; + + /** + * Renders the HTML of the learner action. The index of the + * learner action will be the sum of the starting action index + * of the block (a block is a list of learner actions grouped + * together for display) computed using the + * blockActionIndexMapping field and the index of the learner + * action within the block. + * @param {LearnerAction} learnerAction. + * @param {int} blockIndex - The index of the block among all + * the display blocks. + * @param {int} actionIndex - The index of the learner action + * within it's display block. + * @returns {string} + */ + $scope.renderLearnerAction = function( + learnerAction, blockIndex, actionIndex) { + return LearnerActionRenderService.renderLearnerAction( + learnerAction, blockActionIndexMapping[blockIndex], + actionIndex); + }; + var getRemainingActionsElements = function(pIdx, i) { - return document.getElementById( - 'remainingActions' + pIdx.toString() + i.toString()); + // We only expect one element to match the below statement and + // thus, we take the first element. + return document.getElementsByClassName( + 'remaining-actions' + pIdx.toString() + i.toString())[0]; }; /** diff --git a/core/tests/data/dummy_assets/assets/example1.yaml b/core/tests/data/dummy_assets/assets/example1.yaml new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/core/tests/data/dummy_assets/assets/example2.yaml b/core/tests/data/dummy_assets/assets/example2.yaml new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/core/tests/karma.conf.ts b/core/tests/karma.conf.ts index ed79244d5524..2556aff668b6 100644 --- a/core/tests/karma.conf.ts +++ b/core/tests/karma.conf.ts @@ -83,7 +83,7 @@ module.exports = function(config) { }, reporters: ['progress', 'coverage-istanbul'], coverageIstanbulReporter: { - reports: ['html', 'json'], + reports: ['html', 'lcovonly'], dir: '../karma_coverage_reports/', fixWebpackSourcePaths: true, 'report-config': { diff --git a/core/tests/protractor_desktop/skillEditor.js b/core/tests/protractor_desktop/skillEditor.js index 955e70aa8798..b0c97b03d4c0 100644 --- a/core/tests/protractor_desktop/skillEditor.js +++ b/core/tests/protractor_desktop/skillEditor.js @@ -93,6 +93,7 @@ describe('Skill Editor functionality', function() { it('should create a question for the skill', function() { skillEditorPage.moveToQuestionsTab(); skillEditorPage.clickCreateQuestionButton(); + skillEditorPage.confirmSkillDifficulty(); explorationEditorMainTab.setContent(forms.toRichText('Question 1')); explorationEditorMainTab.setInteraction('TextInput', 'Placeholder', 5); explorationEditorMainTab.addResponse( diff --git a/core/tests/protractor_desktop/topicsAndSkillsDashboard.js b/core/tests/protractor_desktop/topicsAndSkillsDashboard.js index a8d9f90d7f0a..0e4c9507c935 100644 --- a/core/tests/protractor_desktop/topicsAndSkillsDashboard.js +++ b/core/tests/protractor_desktop/topicsAndSkillsDashboard.js @@ -100,6 +100,7 @@ describe('Topics and skills dashboard functionality', function() { skillEditorPage.saveOrPublishSkill('Added review material.'); skillEditorPage.moveToQuestionsTab(); skillEditorPage.clickCreateQuestionButton(); + skillEditorPage.confirmSkillDifficulty(); explorationEditorMainTab.setContent(forms.toRichText('Question 1')); explorationEditorMainTab.setInteraction('TextInput', 'Placeholder', 5); explorationEditorMainTab.addResponse( diff --git a/core/tests/protractor_utils/SkillEditorPage.js b/core/tests/protractor_utils/SkillEditorPage.js index 3cf808664e9e..5e22b7f42e07 100644 --- a/core/tests/protractor_utils/SkillEditorPage.js +++ b/core/tests/protractor_utils/SkillEditorPage.js @@ -22,6 +22,8 @@ var waitFor = require('./waitFor.js'); var SkillEditorPage = function() { var EDITOR_URL_PREFIX = '/skill_editor/'; + var confirmSkillDifficultyButton = element( + by.css('.protractor-test-confirm-skill-difficulty-button')); var EditConceptCardExplanationButton = element( by.css('.protractor-test-edit-concept-card')); var saveConceptCardExplanationButton = element( @@ -113,6 +115,10 @@ var SkillEditorPage = function() { createQuestionButton.click(); }; + this.confirmSkillDifficulty = function() { + confirmSkillDifficultyButton.click(); + }; + this.changeSkillDescription = function(description) { skillDescriptionField.clear(); skillDescriptionField.sendKeys(description); diff --git a/core/tests/protractor_utils/TopicEditorPage.js b/core/tests/protractor_utils/TopicEditorPage.js index e58be2e68067..7b9321f8a3b9 100644 --- a/core/tests/protractor_utils/TopicEditorPage.js +++ b/core/tests/protractor_utils/TopicEditorPage.js @@ -71,6 +71,8 @@ var TopicEditorPage = function() { var skillItems = element.all(by.css('.protractor-test-skill-item')); var confirmSkillButton = element( by.css('.protractor-test-confirm-skill-button')); + var confirmSkillDifficultyButton = element( + by.css('.protractor-test-confirm-skill-difficulty-button')); var saveQuestionButton = element( by.css('.protractor-test-save-question-button')); var questionItems = element.all( @@ -102,6 +104,7 @@ var TopicEditorPage = function() { confirmSkillButton, 'Confirm Skill button takes too long to be clickable'); confirmSkillButton.click(); + confirmSkillDifficultyButton.click(); }); }; diff --git a/extensions/answer_summarizers/models_test.py b/extensions/answer_summarizers/models_test.py index 7871b0b9001e..d4f67d82f6b0 100644 --- a/extensions/answer_summarizers/models_test.py +++ b/extensions/answer_summarizers/models_test.py @@ -30,6 +30,15 @@ def test_requires_override_for_calculation(self): answer_models.BaseCalculation().calculate_from_state_answers_dict( state_answers_dict={}) + def test_equality_of_hashable_answers(self): + hashable_answer_1 = answer_models._HashableAnswer('answer_1') # pylint: disable=protected-access + hashable_answer_2 = answer_models._HashableAnswer('answer_2') # pylint: disable=protected-access + hashable_answer_3 = answer_models._HashableAnswer('answer_1') # pylint: disable=protected-access + + self.assertFalse(hashable_answer_1 == hashable_answer_2) + self.assertTrue(hashable_answer_1 == hashable_answer_3) + self.assertFalse(hashable_answer_1 == 1) + class CalculationUnitTestBase(test_utils.GenericTestBase): """Utility methods for testing calculations.""" @@ -74,9 +83,6 @@ def _create_state_answers_dict( def _get_calculation_instance(self): """Requires the existance of the class constant: CALCULATION_ID.""" - if not hasattr(self, 'CALCULATION_ID'): - raise NotImplementedError( - 'Subclasses must provide a value for CALCULATION_ID.') return calculation_registry.Registry.get_calculation_by_id( self.CALCULATION_ID) diff --git a/extensions/interactions/NumberWithUnits/directives/NumberWithUnitsValidationService.ts b/extensions/interactions/NumberWithUnits/directives/NumberWithUnitsValidationService.ts index 0b4c1926ad25..64364f3dacd7 100644 --- a/extensions/interactions/NumberWithUnits/directives/NumberWithUnitsValidationService.ts +++ b/extensions/interactions/NumberWithUnits/directives/NumberWithUnitsValidationService.ts @@ -72,8 +72,17 @@ oppia.factory('NumberWithUnitsValidationService', [ } var earlierInputString = earlierInput.toMathjsCompatibleString(); var laterInputString = laterInput.toMathjsCompatibleString(); - return math.unit(laterInputString).equals(math.unit( - earlierInputString)); + try { + return math.unit(laterInputString).equals(math.unit( + earlierInputString)); + } catch (e) { + var additionalInfo = ( + '\nlaterInput: ' + JSON.stringify(laterInput.toDict()) + + '\nearlierInput: ' + JSON.stringify(earlierInput.toDict()) + ); + e.message += additionalInfo; + throw e; + } }; var ranges = []; diff --git a/extensions/interactions/base.py b/extensions/interactions/base.py index e5de8a1df6e1..d34b4e62ab0a 100644 --- a/extensions/interactions/base.py +++ b/extensions/interactions/base.py @@ -211,18 +211,6 @@ def html_body(self): feconf.INTERACTIONS_DIR, self.id, '%s.html' % self.id)) return html_templates - @property - def validator_html(self): - """The HTML code containing validators for the interaction's - customization_args and submission handler. - """ - return ( - '\n' % - utils.get_file_contents(os.path.join( - feconf.INTERACTIONS_DIR, - self.id, - '%sValidationService.js' % self.id))) - def to_dict(self): """Gets a dict representing this interaction. Only default values are provided. diff --git a/extensions/interactions/base_test.py b/extensions/interactions/base_test.py index c488b8383174..6937282500f2 100644 --- a/extensions/interactions/base_test.py +++ b/extensions/interactions/base_test.py @@ -24,7 +24,6 @@ from core.domain import dependency_registry from core.domain import exp_fetchers from core.domain import exp_services -from core.domain import html_validation_service from core.domain import interaction_registry from core.domain import obj_services from core.tests import test_utils @@ -49,11 +48,6 @@ ('show_generic_submit_button', bool)] -def mock_get_filename_with_dimensions(filename, unused_exp_id): - return html_validation_service.regenerate_image_filename_using_dimensions( - filename, 490, 120) - - class InteractionAnswerUnitTests(test_utils.GenericTestBase): """Test the answer object and type properties of an interaction object.""" @@ -70,6 +64,23 @@ def test_rules_property(self): interaction.answer_type = 'FakeObjType' interaction.normalize_answer('15') + def test_get_rule_description_with_invalid_rule_name_raises_error(self): + interaction = interaction_registry.Registry.get_interaction_by_id( + 'CodeRepl') + with self.assertRaisesRegexp( + Exception, 'Could not find rule with name invalid_rule_name'): + interaction.get_rule_description('invalid_rule_name') + + def test_get_rule_param_type_with_invalid_rule_param_name_raises_error( + self): + interaction = interaction_registry.Registry.get_interaction_by_id( + 'CodeRepl') + with self.assertRaisesRegexp( + Exception, + 'Rule CodeEquals has no param called invalid_rule_param_name'): + interaction.get_rule_param_type( + 'CodeEquals', 'invalid_rule_param_name') + class InteractionUnitTests(test_utils.GenericTestBase): """Test that the default interactions are valid.""" @@ -578,12 +589,9 @@ class InteractionDemoExplorationUnitTests(test_utils.GenericTestBase): _DEMO_EXPLORATION_ID = '16' def test_interactions_demo_exploration(self): - with self.swap( - html_validation_service, 'get_filename_with_dimensions', - mock_get_filename_with_dimensions): - exp_services.load_demo(self._DEMO_EXPLORATION_ID) - exploration = exp_fetchers.get_exploration_by_id( - self._DEMO_EXPLORATION_ID) + exp_services.load_demo(self._DEMO_EXPLORATION_ID) + exploration = exp_fetchers.get_exploration_by_id( + self._DEMO_EXPLORATION_ID) all_interaction_ids = set( interaction_registry.Registry.get_all_interaction_ids()) diff --git a/extensions/objects/models/objects_test.py b/extensions/objects/models/objects_test.py index 184dbbfeb5ec..59b96a4b09f0 100644 --- a/extensions/objects/models/objects_test.py +++ b/extensions/objects/models/objects_test.py @@ -498,3 +498,26 @@ def test_default_values_for_objects_are_valid(self): member.normalize(member.default_value), type(member.default_value), msg=type_error_message) + + +class NormalizedRectangleTests(test_utils.GenericTestBase): + + def test_normalize(self): + normalized_rectangle = objects.NormalizedRectangle2D() + self.assertEqual(normalized_rectangle.normalize( + [[0, 1], [1, 0]]), [[0.0, 0.0], [0.0, 0.0]]) + + with self.assertRaisesRegexp( + TypeError, 'Cannot convert to Normalized Rectangle '): + normalized_rectangle.normalize('') + + +class CodeStringTests(test_utils.GenericTestBase): + + def test_normalize(self): + code_string = objects.CodeString() + self.assertEqual(code_string.normalize(code_string.default_value), '') + + with self.assertRaisesRegexp( + TypeError, 'Unexpected tab characters in code string: \t'): + code_string.normalize('\t') diff --git a/extensions/rich_text_components/components_test.py b/extensions/rich_text_components/components_test.py index d79ecf1bfd29..b7269c9ecfc6 100644 --- a/extensions/rich_text_components/components_test.py +++ b/extensions/rich_text_components/components_test.py @@ -38,14 +38,7 @@ def check_validation(self, rte_component_class, valid_items, invalid_items): a TypeError when validated. """ for item in valid_items: - try: - rte_component_class.validate(item) - except Exception as e: - self.fail( - msg=( - 'Unexpected exception %s raised during ' - 'validation of %s' % ( - str(e), str(item)))) + rte_component_class.validate(item) for item in invalid_items: with self.assertRaises(Exception): diff --git a/extensions/value_generators/models/generators_test.py b/extensions/value_generators/models/generators_test.py index dc1fc81278e2..b576e62c7256 100644 --- a/extensions/value_generators/models/generators_test.py +++ b/extensions/value_generators/models/generators_test.py @@ -28,6 +28,8 @@ def test_copier(self): self.assertEqual(generator.generate_value({}, **{'value': 'a'}), 'a') self.assertEqual(generator.generate_value( {}, **{'value': 'a', 'parse_with_jinja': False}), 'a') + self.assertEqual(generator.generate_value( + None, **{'value': 'a', 'parse_with_jinja': False}), 'a') self.assertEqual(generator.generate_value( {}, **{'value': '{{a}}', 'parse_with_jinja': False}), '{{a}}') self.assertEqual(generator.generate_value( diff --git a/extensions/visualizations/models.py b/extensions/visualizations/models.py index 66c1b6890987..46b4b4e70fd9 100644 --- a/extensions/visualizations/models.py +++ b/extensions/visualizations/models.py @@ -68,7 +68,7 @@ def validate(self): raise utils.ValidationError( 'For visualization %s, expected a bool value for ' 'addressed_info_is_supported; received %s' % - self.addressed_info_is_supported) + (self.id, self.addressed_info_is_supported)) class BarChart(BaseVisualization): diff --git a/main.py b/main.py index 5127d298362d..fb756c38e87b 100644 --- a/main.py +++ b/main.py @@ -225,7 +225,7 @@ def ui_access_wrapper(self, *args, **kwargs): r'%s' % feconf.NEW_SKILL_URL, topics_and_skills_dashboard.NewSkillHandler), get_redirect_route( - r'%s/' % feconf.NEW_QUESTION_URL, + r'%s' % feconf.NEW_QUESTION_URL, question_editor.QuestionCreationHandler), get_redirect_route( r'%s/' % feconf.QUESTIONS_LIST_URL_PREFIX, diff --git a/package-lock.json b/package-lock.json index b962ad6ed652..bd44b4becaae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,103 +5,103 @@ "requires": true, "dependencies": { "@angular/common": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.1.1.tgz", - "integrity": "sha512-kgLtexfPhAyNFlwJHKBkpwKyt/19pfULIJWJpUahFqXdYE3LkRNMJQqgfz7DCNpAQxG7B6u4ocq1j2Hx206kxw==", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.1.2.tgz", + "integrity": "sha512-bywFofN5RjcvygYEC/3eo+bfUnYBmARA6DPau8fm6D2ZGpXrWXJ3Thd99ZesuuffvpniaIHlAjbHGI83XSnixQ==", "dev": true, "requires": { "tslib": "^1.9.0" } }, "@angular/compiler": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.1.1.tgz", - "integrity": "sha512-wz8Mc45EGax5RKRYYqgXI8lr1d0w+f9BDbHui7b3hQtKM5Mj1QxLXiSOYX0dt3lG4VzrxpO0Xku5tS3D4T1xxQ==", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.1.2.tgz", + "integrity": "sha512-oRkHrstOV6imbb4mGf6q20d4N4iYfBbI6WfxtPL4dz08GipGg4Zvekn4e3R01vzhFBxssGcgmeEtFQJh/UzI8g==", "dev": true, "requires": { "tslib": "^1.9.0" } }, "@angular/core": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.1.1.tgz", - "integrity": "sha512-B6x8IZeu0Qm2H13leEcNzsx0pGKHMvowziurvDnm7W97MaVrYrgbelNsnly4wNX91FzdBtSVXqbe3jijAD9kjA==", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.1.2.tgz", + "integrity": "sha512-Gm/UIUnIkeah39vxi4enVH/CUcPZOgGDyw4RNagw4pH8dTP8V0RUz8uteOr3DS+Eh49BcHkrT2oU5MBZSZ3lvw==", "dev": true, "requires": { "tslib": "^1.9.0" } }, "@angular/forms": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.1.1.tgz", - "integrity": "sha512-jz05UIiIY2Zz/nEveL4Pm9mVCAd5O6JwVDWTHKQ64nKYIN9Nepzgb0ASeOBEZA4qP82KTGJtUm2AN4L7fXN6Pw==", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.1.2.tgz", + "integrity": "sha512-DHqbWt6AGnLkNajLZUAH4yQrxZdgUkjzEW6oxwvS2PxmLIrppz4TYWizfAVQndZ1Ddl7Eo1zRoRzqqHT90XyGA==", "dev": true, "requires": { "tslib": "^1.9.0" } }, "@angular/platform-browser": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.1.1.tgz", - "integrity": "sha512-uP9UIhi9NYTEbfvNj4misBspXkItFopA2pRk083AhHEhOKs79WvMI15w5H5ziIFeH+4UiCvyKrSnPfcjP+Yrvg==", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.1.2.tgz", + "integrity": "sha512-n61OtH3B0e+LTHCfHPjB7hiuo0ZxKxZvNWigczGyLZf2abga5jac2bNrdZnU8zXC44AUfasUD2qDS2IPIhNbqA==", "dev": true, "requires": { "tslib": "^1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.1.1.tgz", - "integrity": "sha512-yUazvP4IBNgXjbzo+NKmu7lVYrrplAN3HSkgYszXwd9uvWLtk1CtXER5hSJE5ZE3Lawoh7PU5hOfMYbqtdAbwg==", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.1.2.tgz", + "integrity": "sha512-NmbGMwKPbYq3ZFt6nOqRslJsQNRS2E94cjkSLseEb5wauUmdUBX9stoHu8BOhvd+EIEcYhD7uxPB+L/qPsH46g==", "dev": true, "requires": { "tslib": "^1.9.0" } }, "@angular/router": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.1.1.tgz", - "integrity": "sha512-UTL/TjokRUd3hdePBrj1ITmBGq+EcVNz3D18lFi96461ZLQeXSbbf3vjQfL6SE53E4+hfKKR7/tOqQOgb5br7A==", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.1.2.tgz", + "integrity": "sha512-+SWoYZHyDBBUydDTbIu+hyoGzWtSA4VUsriUPWEOCplzQiabFhWxVvcT00mO0cim4XfupL1tmiPjE66sivLYBw==", "dev": true, "requires": { "tslib": "^1.9.0" } }, "@angular/upgrade": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/@angular/upgrade/-/upgrade-8.1.1.tgz", - "integrity": "sha512-j+GWIY7DZCxw60lz8frfpuLBCFA7JkLgoDjIwlq52AAcNxmGB3Sev6NWgjHpaqQxEgwJ9XUUjMxv/PMITsipGQ==", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/@angular/upgrade/-/upgrade-8.1.2.tgz", + "integrity": "sha512-VqpZC5ulA91s8CjlsrjjusPQ0RQgfJ5jeOBxVvfpZE6x213E0ONXHhjbvaHqarSOPJ2DPRJIdNKZLvY/rXBSDw==", "dev": true, "requires": { "tslib": "^1.9.0" } }, "@babel/code-frame": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz", - "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz", + "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==", "dev": true, "requires": { "@babel/highlight": "^7.0.0" } }, "@babel/core": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.4.tgz", - "integrity": "sha512-+DaeBEpYq6b2+ZmHx3tHspC+ZRflrvLqwfv8E3hNr5LVQoyBnL8RPKSBCg+rK2W2My9PWlujBiqd0ZPsR9Q6zQ==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz", + "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.5.0", - "@babel/helpers": "^7.5.4", - "@babel/parser": "^7.5.0", + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.5.5", + "@babel/helpers": "^7.5.5", + "@babel/parser": "^7.5.5", "@babel/template": "^7.4.4", - "@babel/traverse": "^7.5.0", - "@babel/types": "^7.5.0", + "@babel/traverse": "^7.5.5", + "@babel/types": "^7.5.5", "convert-source-map": "^1.1.0", "debug": "^4.1.0", "json5": "^2.1.0", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "resolve": "^1.3.2", "semver": "^5.4.1", "source-map": "^0.5.0" @@ -119,14 +119,14 @@ } }, "@babel/generator": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.0.tgz", - "integrity": "sha512-1TTVrt7J9rcG5PMjvO7VEG3FrEoEJNHxumRq66GemPmzboLWtIjjcJgk8rokuAS7IiRSpgVSu5Vb9lc99iJkOA==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz", + "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==", "dev": true, "requires": { - "@babel/types": "^7.5.0", + "@babel/types": "^7.5.5", "jsesc": "^2.5.1", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "source-map": "^0.5.0", "trim-right": "^1.0.1" } @@ -161,14 +161,14 @@ } }, "@babel/helpers": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.4.tgz", - "integrity": "sha512-6LJ6xwUEJP51w0sIgKyfvFMJvIb9mWAfohJp0+m6eHJigkFdcH8duZ1sfhn0ltJRzwUIT/yqqhdSfRpCpL7oow==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz", + "integrity": "sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==", "dev": true, "requires": { "@babel/template": "^7.4.4", - "@babel/traverse": "^7.5.0", - "@babel/types": "^7.5.0" + "@babel/traverse": "^7.5.5", + "@babel/types": "^7.5.5" } }, "@babel/highlight": { @@ -183,9 +183,9 @@ } }, "@babel/parser": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.0.tgz", - "integrity": "sha512-I5nW8AhGpOXGCCNYGc+p7ExQIBxRFnS2fd/d862bNOKvmoEPjYPcfIjsfdy0ujagYOIYPczKgD9l3FsgTkAzKA==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz", + "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==", "dev": true }, "@babel/template": { @@ -200,30 +200,30 @@ } }, "@babel/traverse": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.0.tgz", - "integrity": "sha512-SnA9aLbyOCcnnbQEGwdfBggnc142h/rbqqsXcaATj2hZcegCl903pUD/lfpsNBlBSuWow/YDfRyJuWi2EPR5cg==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz", + "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.5.0", + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.5.5", "@babel/helper-function-name": "^7.1.0", "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.5.0", - "@babel/types": "^7.5.0", + "@babel/parser": "^7.5.5", + "@babel/types": "^7.5.5", "debug": "^4.1.0", "globals": "^11.1.0", - "lodash": "^4.17.11" + "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.0.tgz", - "integrity": "sha512-UFpDVqRABKsW01bvw7/wSUe56uy6RXM5+VJibVVAybDGxEW25jdwiFJEf7ASvSaC7sN7rbE/l3cLp2izav+CtQ==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", + "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", "dev": true, "requires": { "esutils": "^2.0.2", - "lodash": "^4.17.11", + "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } }, @@ -612,9 +612,9 @@ } }, "@types/leaflet": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.4.5.tgz", - "integrity": "sha512-Il58swdE/W77eNR56D9Ent1hDdTDKF68loeszyEOAtnfBQxHwJRoTnODjnXbAFFGqXS5ifP3rXHK1qKYVulNAw==", + "version": "1.4.6", + "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.4.6.tgz", + "integrity": "sha512-mCCym3P1kzr63CneInbXFUtWyT9XsWfueKVyHNRnLsQAqfS46TCXfecFHgDLWA8B8yCrMPcUyIB5urn4w6Q40Q==", "dev": true, "requires": { "@types/geojson": "*" @@ -648,9 +648,9 @@ "dev": true }, "@types/node": { - "version": "10.14.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.12.tgz", - "integrity": "sha512-QcAKpaO6nhHLlxWBvpc4WeLrTvPqlHOvaj0s5GriKkA1zq+bsFBPpfYCvQhLqLgYlIko8A9YrPdaMHCo5mBcpg==", + "version": "10.14.13", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.13.tgz", + "integrity": "sha512-yN/FNNW1UYsRR1wwAoyOwqvDuLDtVXnaJTZ898XIw/Q5cCaeVAlVwvsmXLX5PuiScBYwZsZU4JYSHB3TvfdwvQ==", "dev": true }, "@types/q": { @@ -984,9 +984,9 @@ } }, "ajv": { - "version": "6.10.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.1.tgz", - "integrity": "sha512-w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==", + "version": "6.10.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", + "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", "dev": true, "requires": { "fast-deep-equal": "^2.0.1", @@ -1344,12 +1344,12 @@ "dev": true }, "async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", - "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", "dev": true, "requires": { - "lodash": "^4.17.11" + "lodash": "^4.17.14" } }, "async-done": { @@ -2957,9 +2957,9 @@ } }, "date-format": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz", - "integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz", + "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==", "dev": true }, "date-now": { @@ -3348,9 +3348,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.191", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.191.tgz", - "integrity": "sha512-jasjtY5RUy/TOyiUYM2fb4BDaPZfm6CXRFeJDMfFsXYADGxUN49RBqtgB7EL2RmJXeIRUk9lM1U6A5yk2YJMPQ==", + "version": "1.3.194", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.194.tgz", + "integrity": "sha512-w0LHR2YD9Ex1o+Sz4IN2hYzCB8vaFtMNW+yJcBf6SZlVqgFahkne/4rGVJdk4fPF98Gch9snY7PiabOh+vqHNg==", "dev": true }, "elliptic": { @@ -3733,10 +3733,13 @@ } }, "eslint-utils": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz", - "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==", - "dev": true + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.0.tgz", + "integrity": "sha512-7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.0.0" + } }, "eslint-visitor-keys": { "version": "1.0.0", @@ -3829,31 +3832,18 @@ } }, "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", "is-stream": "^1.1.0", "npm-run-path": "^2.0.0", "p-finally": "^1.0.0", "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - } } }, "execall": { @@ -4309,9 +4299,9 @@ "dev": true }, "fork-ts-checker-webpack-plugin": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.4.0.tgz", - "integrity": "sha512-Sy8rowZZJuGbu5NoBhk+XiSFpspxt9vJO6XOvPNonajm+8SFddUM375697Sn5b3RVVu/xPD9fZyNHCIbFUGnRA==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.4.3.tgz", + "integrity": "sha512-srf43Z3B1hCJNrwCG78DbHmWgKQUqHKsvFbLP182gank28j9s05KJbSZaMKBA0b6Pqi0LBLpAFWeB0JPbc1iLQ==", "dev": true, "requires": { "babel-code-frame": "^6.22.0", @@ -4998,10 +4988,25 @@ "dev": true }, "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "dev": true, + "requires": { + "pump": "^3.0.0" + }, + "dependencies": { + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + } + } }, "get-value": { "version": "2.0.6", @@ -5551,175 +5556,25 @@ } }, "htmllint-cli": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/htmllint-cli/-/htmllint-cli-0.0.7.tgz", - "integrity": "sha1-E0yKPZOaLuArQL0FTUv43tAHNYY=", + "version": "github:kevinlee12/htmllint-cli#62a160294e8fa23023c40373697a87daa830312d", + "from": "github:kevinlee12/htmllint-cli#62a1602", "dev": true, "requires": { - "bluebird": "^3.5.1", - "chalk": "^2.4.0", + "bluebird": "^3.5.5", + "chalk": "^2.4.2", "cjson": "^0.5.0", - "glob": "^7.1.2", - "htmllint": "^0.7.2", - "liftoff": "^2.5.0", - "semver": "^5.5.0", - "yargs": "^11.0.0" + "glob": "^7.1.4", + "htmllint": "^0.8.0", + "liftoff": "^3.1.0", + "semver": "^6.2.0", + "yargs": "^13.3.0" }, "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", - "dev": true, - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "findup-sync": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", - "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", - "dev": true, - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^3.1.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" - } - }, - "htmllint": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/htmllint/-/htmllint-0.7.3.tgz", - "integrity": "sha512-h8wfCu0CC0FVo18Jkygv7xqj0fa23Xlv4QsR2n34LDr8eqpf4glfbNg1HTbiCqpT3ONioMOfk8EkFUbZgrO1KA==", - "dev": true, - "requires": { - "bulk-require": "^1.0.1", - "htmlparser2": "^3.10.0", - "lodash": "^4.17.11", - "promise": "^8.0.2" - } - }, - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "^2.1.0" - } - }, - "liftoff": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz", - "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=", - "dev": true, - "requires": { - "extend": "^3.0.0", - "findup-sync": "^2.0.0", - "fined": "^1.0.1", - "flagged-respawn": "^1.0.0", - "is-plain-object": "^2.0.4", - "object.map": "^1.0.0", - "rechoir": "^0.6.2", - "resolve": "^1.1.7" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "dev": true, - "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" - } - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "semver": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz", + "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==", "dev": true - }, - "yargs": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", - "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^9.0.2" - } - }, - "yargs-parser": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", - "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", - "dev": true, - "requires": { - "camelcase": "^4.1.0" - } } } }, @@ -5955,12 +5810,6 @@ "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true }, - "lodash": { - "version": "4.17.14", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", - "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==", - "dev": true - }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", @@ -7433,12 +7282,22 @@ "dev": true }, "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", + "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^2.0.0", + "p-is-promise": "^2.0.0" + }, + "dependencies": { + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + } } }, "memory-fs": { @@ -10058,12 +9917,6 @@ "requires": { "ms": "^2.1.1" } - }, - "lodash": { - "version": "4.17.14", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", - "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==", - "dev": true } } }, @@ -10626,13 +10479,13 @@ "dev": true }, "table": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/table/-/table-5.4.1.tgz", - "integrity": "sha512-E6CK1/pZe2N75rGZQotFOdmzWQ1AILtgYbMAbAjvms0S1l5IDB47zG3nCnFGB/w+7nB3vKofbLXCH7HPBo864w==", + "version": "5.4.4", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.4.tgz", + "integrity": "sha512-IIfEAUx5QlODLblLrGTTLJA7Tk0iLSGBvgY8essPRVNGHAzThujww1YqHLs6h3HfTg55h++RzLHH5Xw/rfv+mg==", "dev": true, "requires": { - "ajv": "^6.9.1", - "lodash": "^4.17.11", + "ajv": "^6.10.2", + "lodash": "^4.17.14", "slice-ansi": "^2.1.0", "string-width": "^3.0.0" }, @@ -11697,9 +11550,9 @@ } }, "webpack": { - "version": "4.35.3", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.35.3.tgz", - "integrity": "sha512-xggQPwr9ILlXzz61lHzjvgoqGU08v5+Wnut19Uv3GaTtzN4xBTcwnobodrXE142EL1tOiS5WVEButooGzcQzTA==", + "version": "4.36.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.36.1.tgz", + "integrity": "sha512-Ej01/N9W8DVyhEpeQnbUdGvOECw0L46FxS12cCOs8gSK7bhUlrbHRnWkjiXckGlHjUrmL89kDpTRIkUk6Y+fKg==", "dev": true, "requires": { "@webassemblyjs/ast": "1.8.5", @@ -11728,9 +11581,9 @@ } }, "webpack-cli": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.5.tgz", - "integrity": "sha512-w0j/s42c5UhchwTmV/45MLQnTVwRoaUTu9fM5LuyOd/8lFoCNCELDogFoecx5NzRUndO0yD/gF2b02XKMnmAWQ==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.6.tgz", + "integrity": "sha512-0vEa83M7kJtxK/jUhlpZ27WHIOndz5mghWL2O53kiDoA9DIxSKnfqB92LoqEn77cT4f3H2cZm1BMEat/6AZz3A==", "dev": true, "requires": { "chalk": "2.4.2", @@ -11746,6 +11599,35 @@ "yargs": "13.2.4" }, "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true + }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true + }, "global-modules": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", @@ -11766,6 +11648,58 @@ "which": "^1.3.1" } }, + "invert-kv": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", + "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", + "dev": true + }, + "lcid": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", + "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", + "dev": true, + "requires": { + "invert-kv": "^2.0.0" + } + }, + "os-locale": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", + "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", + "dev": true, + "requires": { + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" + } + }, + "require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + }, "supports-color": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", @@ -11774,6 +11708,58 @@ "requires": { "has-flag": "^3.0.0" } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } + }, + "y18n": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "dev": true + }, + "yargs": { + "version": "13.2.4", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz", + "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==", + "dev": true, + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "os-locale": "^3.1.0", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.0" + } + }, + "yargs-parser": { + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", + "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } } } }, @@ -11992,22 +11978,21 @@ "dev": true }, "yargs": { - "version": "13.2.4", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz", - "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==", + "version": "13.3.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", + "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", "dev": true, "requires": { "cliui": "^5.0.0", "find-up": "^3.0.0", "get-caller-file": "^2.0.1", - "os-locale": "^3.1.0", "require-directory": "^2.1.1", "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", "string-width": "^3.0.0", "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^13.1.0" + "yargs-parser": "^13.1.1" }, "dependencies": { "ansi-regex": { @@ -12033,89 +12018,12 @@ "wrap-ansi": "^5.1.0" } }, - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "dev": true, - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "invert-kv": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", - "dev": true - }, - "lcid": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", - "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "dev": true, - "requires": { - "invert-kv": "^2.0.0" - } - }, - "mem": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", - "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", - "dev": true, - "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^2.0.0", - "p-is-promise": "^2.0.0" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "os-locale": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", - "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", - "dev": true, - "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" - } - }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, "require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", diff --git a/package.json b/package.json index 91d66d3a06f0..4a8d8d7dfc38 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "gulp-concat": "^2.6.1", "html-webpack-plugin": "4.0.0-beta.5", "htmllint": "^0.8.0", - "htmllint-cli": "0.0.7", + "htmllint-cli": "github:kevinlee12/htmllint-cli#62a1602", "istanbul-instrumenter-loader": "^3.0.1", "jasmine-core": "^3.4.0", "jasmine-spec-reporter": "^4.2.1", diff --git a/schema_utils_test.py b/schema_utils_test.py index 21bc8b8273e2..0769d1636e85 100644 --- a/schema_utils_test.py +++ b/schema_utils_test.py @@ -273,11 +273,6 @@ def validate_schema(schema): _validate_ui_config( schema[SCHEMA_KEY_TYPE], schema[SCHEMA_KEY_UI_CONFIG]) - if SCHEMA_KEY_CHOICES in schema and SCHEMA_KEY_POST_NORMALIZERS in schema: - raise AssertionError( - 'Schema cannot contain both a \'choices\' and a ' - '\'post_normalizers\' key.') - if SCHEMA_KEY_POST_NORMALIZERS in schema: assert isinstance(schema[SCHEMA_KEY_POST_NORMALIZERS], list) for post_normalizer in schema[SCHEMA_KEY_POST_NORMALIZERS]: diff --git a/scripts/backend_tests.py b/scripts/backend_tests.py index 4d66032b46da..5a570187829d 100644 --- a/scripts/backend_tests.py +++ b/scripts/backend_tests.py @@ -182,12 +182,12 @@ def run(self): """Runs all tests corresponding to the given test target.""" test_target_flag = '--test_target=%s' % self.test_target + # This is done because PYTHONPATH is modified while using importlib + # to import modules. PYTHONPATH is changed to comma separated list + # after which python is unable to find certain modules. So, the old + # PYTHONPATH is copied here to avoid import errors. + os.environ['PYTHONPATH'] = PYTHONPATH if self.generate_coverage_report: - # This is done because PYTHONPATH is modified while using importlib - # to import modules. PYTHONPATH is changed to comma separated list - # after which python is unable to find coverage module. So, the old - # PYTHONPATH is copied here to avoid import errors. - os.environ['PYTHONPATH'] = PYTHONPATH exc_list = [ 'python', COVERAGE_PATH, 'run', '-p', TEST_RUNNER_PATH, test_target_flag] diff --git a/utils.py b/utils.py index 30fdac424dcd..ec3872ed0b5b 100644 --- a/utils.py +++ b/utils.py @@ -14,7 +14,6 @@ """Common utility functions.""" -import StringIO import base64 import collections import datetime @@ -29,7 +28,6 @@ import unicodedata import urllib import urlparse -import zipfile from constants import constants # pylint: disable=relative-import import feconf # pylint: disable=relative-import @@ -116,21 +114,20 @@ def get_exploration_components_from_dir(dir_path): for filename in files: filepath = os.path.join(root, filename) if root == dir_path: - if filepath.endswith('.DS_Store'): - # These files are added automatically by Mac OS Xsystems. - # We ignore them. - continue - - if yaml_content is not None: - raise Exception('More than one non-asset file specified ' - 'for %s' % dir_path) - elif not filepath.endswith('.yaml'): - raise Exception('Found invalid non-asset file %s. There ' - 'should only be a single non-asset file, ' - 'and it should have a .yaml suffix.' % - filepath) - else: - yaml_content = get_file_contents(filepath) + # These files are added automatically by Mac OS Xsystems. + # We ignore them. + if not filepath.endswith('.DS_Store'): + if yaml_content is not None: + raise Exception( + 'More than one non-asset file specified ' + 'for %s' % dir_path) + elif not filepath.endswith('.yaml'): + raise Exception( + 'Found invalid non-asset file %s. There ' + 'should only be a single non-asset file, ' + 'and it should have a .yaml suffix.' % filepath) + else: + yaml_content = get_file_contents(filepath) else: filepath_array = filepath.split('/') # The additional offset is to remove the 'assets/' prefix. @@ -144,50 +141,6 @@ def get_exploration_components_from_dir(dir_path): return yaml_content, assets_list -def get_exploration_components_from_zip(zip_file_contents): - """Gets the (yaml, assets) from the contents of an exploration zip file. - - Args: - zip_file_contents: a string of raw bytes representing the contents of - a zip file that comprises the exploration. - - Returns: - a 2-tuple, the first element of which is a yaml string, and the second - element of which is a list of (filepath, content) 2-tuples. The filepath - does not include the assets/ prefix. - - Raises: - Exception: if the following condition doesn't hold: "There is exactly - one file not in assets/, and this file has a .yaml suffix". - """ - memfile = StringIO.StringIO() - memfile.write(zip_file_contents) - - zf = zipfile.ZipFile(memfile, 'r') - yaml_content = None - assets_list = [] - for filepath in zf.namelist(): - if filepath.startswith('assets/'): - assets_list.append('/'.join(filepath.split('/')[1:]), - zf.read(filepath)) - else: - if yaml_content is not None: - raise Exception( - 'More than one non-asset file specified for zip file') - elif not filepath.endswith('.yaml'): - raise Exception('Found invalid non-asset file %s. There ' - 'should only be a single file not in assets/, ' - 'and it should have a .yaml suffix.' % - filepath) - else: - yaml_content = zf.read(filepath) - - if yaml_content is None: - raise Exception('No yaml file specified in zip file contents') - - return yaml_content, assets_list - - def get_comma_sep_string_from_list(items): """Turns a list of items into a comma-separated string. @@ -552,7 +505,7 @@ def require_valid_name(name, name_type, allow_empty=False): allow_empty: bool. If True, empty strings are allowed. """ if not isinstance(name, basestring): - raise ValidationError('%s must be a string.' % name_type) + raise ValidationError('%s must be a string.' % name) if allow_empty and name == '': return diff --git a/utils_test.py b/utils_test.py index ce89b7931376..392ae42e827c 100644 --- a/utils_test.py +++ b/utils_test.py @@ -18,6 +18,7 @@ import copy import datetime +import os # pylint: disable=relative-import from core.tests import test_utils @@ -182,6 +183,11 @@ def test_vfs_normpath(self): self.assertEqual(p, 'foo') p = utils.vfs_normpath('/foo//bar//baz//') self.assertEqual(p, '/foo/bar/baz') + p = utils.vfs_normpath('') + self.assertEqual(p, '.') + p = utils.vfs_normpath('//foo//bar//baz//') + self.assertEqual(p, '//foo/bar/baz') + def test_capitalize_string(self): test_data = [ @@ -252,3 +258,52 @@ def test_get_hashable_value(self): def test_is_valid_language_code(self): self.assertTrue(utils.is_valid_language_code('en')) self.assertFalse(utils.is_valid_language_code('unknown')) + + def test_require_valid_name(self): + name = 'name' + utils.require_valid_name(name, 'name_type') + + name = 0 + with self.assertRaisesRegexp(Exception, '0 must be a string.'): + utils.require_valid_name(name, 'name_type') + + def test_validate_convert_to_hash(self): + with self.assertRaisesRegexp( + Exception, 'Expected string, received 1 of type %s' % type(1)): + utils.convert_to_hash(1, 10) + + def test_convert_png_to_data_url_with_non_png_image_raises_error(self): + favicon_filepath = os.path.join( + self.get_static_asset_filepath(), 'assets', 'favicon.ico') + + with self.assertRaisesRegexp( + Exception, 'The given string does not represent a PNG image.'): + utils.convert_png_to_data_url(favicon_filepath) + + def test_get_exploration_components_from_dir_with_invalid_path_raises_error( + self): + with self.assertRaisesRegexp( + Exception, + 'Found invalid non-asset file .+' + 'There should only be a single non-asset file, and it should have ' + 'a .yaml suffix.'): + utils.get_exploration_components_from_dir('core/tests/load_tests') + + with self.assertRaisesRegexp( + Exception, 'The only directory in . should be assets/'): + utils.get_exploration_components_from_dir('.') + + def test_get_exploration_components_from_dir_with_multiple_yaml_files(self): + with self.assertRaisesRegexp( + Exception, + 'More than one non-asset file specified for ' + 'core/tests/data/dummy_assets/assets'): + utils.get_exploration_components_from_dir( + 'core/tests/data/dummy_assets/assets/') + + def test_get_exploration_components_from_dir_with_no_yaml_file(self): + with self.assertRaisesRegexp( + Exception, + 'No yaml file specifed for core/tests/data/dummy_assets'): + utils.get_exploration_components_from_dir( + 'core/tests/data/dummy_assets/')