New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix part of #9749: Migrate Preferences page #13219

Merged

ashutoshc8101 merged 37 commits into oppia:develop from ashutoshc8101:preferences-page

Jul 7, 2021

Contributor

ashutoshc8101 commented Jun 26, 2021 •

edited

Loading

Overview

This PR fixes part of Migrate directives/controllers to Angular components #9749.
This PR does the following: Migrate preferences page.

Essential Checklist

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

Proof that changes are correct

preferences-page-2021-07-02_17.49.11.mp4

PR Pointers

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

ashutoshc8101 added 6 commits

June 17, 2021 00:04


          continue

3e13500


          sMerge remote-tracking branch 'upstream/develop' into preferences-page

972822b

wip

42b181b

asd

c0bc914

nit

5a20619


          started

3b3b43d

oppiabot bot commented Jun 26, 2021

Hi @ashutoshc8101, can you complete the following:

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

oppiabot bot commented Jun 26, 2021

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

oppiabot bot assigned ashutoshc8101

oppiabot bot commented Jun 26, 2021

Hi @ashutoshc8101, when creating WIP/Draft PRs, ensure that your commit messages are prefixed with [ci skip] or [skip ci] to prevent CI checks from running. You can learn more about it here.

ashutoshc8101 changed the title ~~Fix part of #9742: Migrate Preferences page~~ Fix part of #9472: Migrate Preferences page

oppiabot bot commented Jun 26, 2021

Hi @ashutoshc8101, when creating WIP/Draft PRs, ensure that your commit messages are prefixed with [ci skip] or [skip ci] to prevent CI checks from running. You can learn more about it here.

1 similar comment

oppiabot bot commented Jun 26, 2021

Hi @ashutoshc8101, when creating WIP/Draft PRs, ensure that your commit messages are prefixed with [ci skip] or [skip ci] to prevent CI checks from running. You can learn more about it here.

ashutoshc8101 changed the title ~~Fix part of #9472: Migrate Preferences page~~ Fix part of #9749: Migrate Preferences page

oppiabot bot commented Jun 26, 2021

Hi @ashutoshc8101, when creating WIP/Draft PRs, ensure that your commit messages are prefixed with [ci skip] or [skip ci] to prevent CI checks from running. You can learn more about it here.

1 similar comment

oppiabot bot commented Jun 26, 2021

Hi @ashutoshc8101, when creating WIP/Draft PRs, ensure that your commit messages are prefixed with [ci skip] or [skip ci] to prevent CI checks from running. You can learn more about it here.

oppiabot bot added the PR: don't merge - HAS MERGE CONFLICTS label

oppiabot bot commented Jun 26, 2021

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

ashutoshc8101 added 2 commits

June 28, 2021 18:27


          done


          progress

06ee8c3

oppiabot bot added the PR: don't merge - STALE BUILD label

oppiabot bot commented Jun 28, 2021

Hi @ashutoshc8101, the build of this PR is stale and this could result in tests failing in develop. Please update this pull request with the latest changes from develop. Thanks!

ashutoshc8101 added 4 commits

June 30, 2021 17:51


          continue

49ddd42


          Merge remote-tracking branch 'upstream/develop' into preferences-page

645f2da


          continue

d57045c


          [skip ci] further

78e26f6

oppiabot bot removed PR: don't merge - STALE BUILD PR: don't merge - HAS MERGE CONFLICTS labels

ashutoshc8101 added 2 commits

July 1, 2021 23:18

nit

10bed6e

wip

4ac424a

oppiabot bot commented Jul 5, 2021

Unassigning @darksun27 since they have already approved the PR.

kevintab95 reviewed

View reviewed changes

Member

kevintab95 left a comment

Thanks @ashutoshc8101! Took a pass on the codeowner files and left some questions in the e2e files. PTAL

core/tests/protractor_utils/general.js Outdated

Comment on lines 157 to 160

+                let promiseValue = await browser.executeScript(() => {
+                  return document.getElementsByClassName(
+                    'protractor-test-base-container')[0].innerHTML;
+                });

Member

kevintab95 Jul 5, 2021

Why this change?

Contributor Author

ashutoshc8101 Jul 6, 2021

getAttribute('innerHTML') was returning null.

Member

kevintab95 Jul 6, 2021

oh! do we know why? In general, we try to avoid "browser.executeScript" where possible because it could introduce flakiness. So this should be a last resort.

Contributor Author

ashutoshc8101 Jul 6, 2021 •

edited

Loading

The purpose of getAttribute('innerHTML') is to get contents of this attribute.

It is not similiar to javascript innerHTML property on html element.

This javascript property and html attribute are two different things for protractor.

It is returning null due to absence of innerHTML html attribute on base-container div element.

Earlier, there used to be a getInnerHTML function provided by protractor.
This was removed and browser.executeScript was the replacement.

https://github.com/angular/protractor/blob/master/CHANGELOG.md#breaking-changes-3

Contributor Author

ashutoshc8101 Jul 6, 2021

Proof:
test html file.

Test:

This proves that innerHTML attribute and innerHTML javascript property behaves differently from each other.

Member

kevintab95 Jul 6, 2021

Ah, I see. In that case, can you clearly document in a comment that the recommended protractor approach (as described above) is to use browser.executeScript when innerHTML needs to be read? Thanks!

Contributor Author

ashutoshc8101 Jul 7, 2021

done

core/tests/protractor_utils/PreferencesPage.js Outdated

+                    audioLanguageSelector,
+                    'audio language selector taking too long to appear.');
+                  expect(await audioLanguageSelector.getText())
+                    .not.toEqual(language);

Member

kevintab95 Jul 5, 2021

nit: can we move this to line 200?

Contributor Author

ashutoshc8101 Jul 6, 2021

done

core/tests/protractor_utils/PreferencesPage.js Outdated

+                    audioLanguageSelector,
+                    'audio language selector taking too long to appear.');
+                  expect(await audioLanguageSelector.getText())
+                    .toEqual(language);

Member

kevintab95 Jul 5, 2021

nit: Please move this to the previous line.

Contributor Author

ashutoshc8101 Jul 6, 2021

done

core/tests/protractor_desktop/preferences.js

Comment on lines +115 to +120

    
                  await preferencesPage.selectPreferredAudioLanguage('Hungarian');

                  await preferencesPage.expectPreferredAudioLanguageToBe('Hungarian');

                  await browser.refresh();

                  await waitFor.pageToFullyLoad();

                  await preferencesPage.expectPreferredAudioLanguageToBe('Arabic');

                  await preferencesPage.expectPreferredAudioLanguageToBe('Hungarian');

Member

kevintab95 Jul 5, 2021

Why change this?

Contributor Author

ashutoshc8101 Jul 6, 2021

protractor had trouble scrolling mat-select. So, I tried to use a select option, which didn't require scrolling.

Member

kevintab95 Jul 6, 2021

If this is an issue with protractor and mat-select in general, can you please create an issue and assign it to the Automated QA team to investigate? We will need to find a way to fix this in case a test we write in the future uses mat-select and actually expects scrolling to be done.

Contributor Author

ashutoshc8101 Jul 6, 2021

sure

Contributor Author

ashutoshc8101 Jul 6, 2021

done. Issue #13324

kevintab95 removed their assignment

krishnarao22 approved these changes

View reviewed changes

Contributor

krishnarao22 left a comment

LGTM, just restarting 2 workflows to make sure no new flakes are introduced.

oppiabot bot unassigned krishnarao22

oppiabot bot commented Jul 5, 2021

Unassigning @krishnarao22 since they have already approved the PR.

Contributor Author

ashutoshc8101 commented Jul 6, 2021

@kevintab95 @jameesjohn PTAL

oppiabot bot assigned kevintab95

ashutoshc8101 added 4 commits

July 6, 2021 11:46


          nits

b5186a7


          Merge remote-tracking branch 'upstream/develop' into preferences-page

5af0399


          Merge remote-tracking branch 'upstream/develop' into preferences-page

d0902a6


          done

8278d3c

ashutoshc8101 mentioned this pull request

Protractor has issues with scrolling mat select. #13324

Closed

kevintab95 approved these changes

View reviewed changes

Member

kevintab95 left a comment

Thanks @ashutoshc8101! LGTM for codeowner files.

kevintab95 removed their assignment

nit

d60f78a

ashutoshc8101 enabled auto-merge (squash)

July 7, 2021 09:43

jameesjohn approved these changes

View reviewed changes

Contributor

jameesjohn left a comment

LGTM

ashutoshc8101 merged commit f9a5144 into oppia:develop

Contributor

aishwary023 commented Jul 8, 2021

Hey @ashutoshc8101 -- this PR might have introduced a new flake. Can you please confirm/resolve this?

Flaked locally while pushing changes:

brianrodri added a commit to brianrodri/oppia that referenced this pull request


          Squashed commit of the following:

05a0772

commit 1daef35
Author: Brian Rodriguez <brian@brianrodri.com>
Date:   Wed Jul 7 23:37:43 2021 -0400

    fix lint

commit c45ac4e
Merge: 76360a5 aae335d
Author: Brian Rodriguez <brian@brianrodri.com>
Date:   Wed Jul 7 23:25:52 2021 -0400

    Merge branch 'fix-pylint' into index-all-activities

commit aae335d
Author: Brian Rodriguez <brian@brianrodri.com>
Date:   Wed Jul 7 23:20:26 2021 -0400

    Fix part of oppia#12718: Use init-hook to fix command line calls to pylint

commit 76360a5
Author: Brian Rodriguez <brian@brianrodri.com>
Date:   Wed Jul 7 23:03:22 2021 -0400

    replace index-all-activities-job

commit 1cb69a8
Author: Praneeth <praneethg2001@gmail.com>
Date:   Thu Jul 8 04:09:09 2021 +0530

    Fixes Typescript issue in oppia-short-response-mulitple-choice-input.component and mypy issue in schema_utils.py (oppia#13335)

    * minor fixes

    * mypy fix

commit e2e59bd
Author: Praneeth <praneethg2001@gmail.com>
Date:   Thu Jul 8 00:04:55 2021 +0530

    Frontend Unit Tests(3): Cover multiple component files (oppia#13303)

    * intial commit

    * minor fix

commit 186435d
Author: Hardik Katehara <54679643+hardikkat24@users.noreply.github.com>
Date:   Wed Jul 7 22:44:02 2021 +0530

    Fix oppia#13239 and oppia#13171: Adding type annotations to root files and fix constants errors with mypy (oppia#13269)

commit 7f5757f
Author: EeshaArif <43031234+EeshaArif@users.noreply.github.com>
Date:   Wed Jul 7 22:13:10 2021 +0500

    Fix Part of oppia#10474: Cover some files with TS strict checks - 6 (oppia#13263)

commit 1577479
Author: Nikhil <57531197+Nik-09@users.noreply.github.com>
Date:   Wed Jul 7 21:21:14 2021 +0530

    Adds schema for handlers concept_card_viewer & contributor_dashboard modules (oppia#13225)

    * payload_validator(created) + schema_utils(modified) for SVS architecture

    * payload

    * validate_args_schema in base + backend tests

    * Adds linters to verify handlers must have schema

    * Shows exception message in frontend when SVS validation fails.

    * adds schema in backend test

    * fix coverage

    * adds backend test for payload_validator into shard 1.

    * Changes logic for handling default_value cases.

    * removes dict from properties list in schema utils

    * fix coverage

    * changes codeowners

    * Adds backend unit tests + comments + docstrings

    * fix coverage

    * adds backend tests for coverage

    * fix coverage

    * adds backend tests for coverage

    * fix coverage

    * fix coverage

    * adds test into shard

    * backend coverage

    * fix coverage

    * structured backend test.

    * adds docstring

    * fix coverage

    * changes formatting for schema in MockHandlers

    * refactor domain objects validator

    * refactor handling object_dict

    * fixes backend tests.

    * validate_method -> validation_method

    * adds extra checks in backend test.

    * updates comment

    * adds backend tests.

    * Addressed review comments.

    * fix coverage

    * Addressed review comments.

    * fixes backend tests for linters

    * Addressed review comments.

    * updates loop into list comprehension.

    * addressed review comments

    * fix coverage

    * addressed review comments.

    * addressed review comments

    * addressed review comments.

    * fix coverage

    * addressed review comments

    * fix coverage

    * remove repeted code.

    * addressed review comments.

    * removes duplicate code from payload_validator

    * fix backend tests

    * schemas for contributor_dashboard+concept_card_viewer

    * fixes backend tests

    * updates logic for handling optional cases

    * fixes backend tests

    * adds backend coverage tests

    * refactores payload validator

    * adds schema type string

    * adds handler class name in old handlers list

    * fixes backend tests

    * fix coverage

    * removes dead code.

    * makes backend code typed.

    * adds new handler class in old handler

    * addressed review comments

    * fix coverage

    * fix coverage

    * updates logic for handling normalized value

    * changes string -> basestring

    * updates schema.

    * updates schemas

    * addressed review comments

    * updates by adding schema key 'schema'

    * adds validator for language code.

    * fix coverage

    * adds comment and updates docstring.

    * udates comment.

    * updates comment

    * updates comment

    * updates comment

    * updates schemas

    * changes docstring.

    * updates logic to handle csrf and source

    * fixes backend tests

    * updates logic to raise 400

    * updates logic to handle source

    * updates logic

    * removes if-block in dispatch method

    * adds previous if-else logic to handle source

    * updates if into elif

    * adds comment in csrf_token

    * updates logic and adds tests for backend coverage.

    * fixes coverage

    * updates comment

    * uses sanitize url instead of regex.

    * fix coverage

    * fix coverage.

    * uses regex to check source url.

commit f9a5144
Author: Ashutosh Chauhan <ashutoshc8101@gmail.com>
Date:   Wed Jul 7 16:10:51 2021 +0530

    Fix part of oppia#9749: Migrate Preferences page (oppia#13219)

commit 6b1f473
Author: Brian Rodriguez <brian@brianrodri.com>
Date:   Wed Jul 7 00:31:34 2021 -0400

    Fix part of oppia#11475: Delete all references to continuous jobs (oppia#13313)

    * Removed notification page

    * Fixed merge conflict file

    * Fixed ts error

    * Removed notification from accessiblity test

    * Fixed JS lint issue

    * Changed the shortcut for preferenceURL

    * additional nits

    * Fixed ts error

    * reverting removal of userbackend service

    * Added back the changes

    * Delete FeedbackAnalyticsAggregator

    * fix unused code

    * add PR to note

    * small nit

    * address comments

    * initial attempt

    * initial attempt

    * fix ratings test

    * delete file

    * reduce untested lines

    * fix lint

    * remove frontend references to continuous jobs

    * remove backend references to continuous jobs

    * remove checks for events

    * fix lint

    * delete QUEUE_NAME_EVENTS

    * delete events from queue.yaml

    * fix bugs

    * fix queue.yaml tests

    * fix coverage

    * fix lint

    Co-authored-by: Aasif Faizal <aasif.faizal@gmail.com>

commit 4c64eee
Author: Rijuta Singh <68547101+Rijuta-s@users.noreply.github.com>
Date:   Wed Jul 7 06:47:32 2021 +0530

    Milestone 1.5 : Adds blog admin page frontend. (oppia#13300)

    * Adding blog admin page

    * adding blog admin page

    * fixing lint

    * minor fixes

    * [ci skip] adding spec file

    * adding spec file

    * applying suggestions

    * applying suggestions

    * Applting lint suggestions

    * applying suggestions

    * fixing lint issues

    * sdcsd

    * applying suggestions

    * Revert  adding root component files

    This reverts commit 6bd0d76.

    * applying suggestions

    * minor fix

commit a2f9d14
Author: Aishwary Saxena <aishwary.saxena.min19@itbhu.ac.in>
Date:   Tue Jul 6 18:09:15 2021 +0530

    Unit test for questions-list.component.ts (oppia#13287)

    * Converted AJS Directive to AJS Component

    * Added tests

    * Added tests, completed 100%

    * Fixed lint checks

    * fix karma conf

    * Addressed review

commit 79e6d10
Author: Aishwary Saxena <aishwary.saxena.min19@itbhu.ac.in>
Date:   Tue Jul 6 14:49:00 2021 +0530

    Unit test for exploration creation service (oppia#13176)

    * Added tests

    * Lint err

    * Added callback for dataFilter

    * Removed file name from NOT_FULLY_COVERED_FILENAMES

    * Added expectations

    * Nit

    * Nit

    * Addressed review

    * Removed fdescribe

    * Addressed review

    * lint

    * Removed mock

    * Fix

    * removed fdescribe

commit e0a39a2
Author: Farees Hussain <fareezzhussain@gmail.com>
Date:   Tue Jul 6 13:14:13 2021 +0530

    Fix oppia#13172: Controller to initialize android specific structures (Milestone 1.2) (oppia#13174)

    * controller to initiate android specific structures

    * fix linters

    * using variable for exploration id

    * fix linters

    * upload thumbnails

    * added tests

    * fix linters

    * remove csrf token

    * added to shards

    * refactoring and testcases

    * fix CI checks

    * fix CI

    * Addressed requested changes

    * rename test

    * timeout 30 with comment

    * fix linter

    * remove post_req

    * added render_json

    * NIT

    * changed comment

    * whitespace

    * requested changes

    * more docs

    * NIT

    * docstring update

    * addressed suggestions

    * replaced 500 with 400

    * update docstring

    * updated docstring

commit d12bfc1
Author: Kevin Thomas <kevintab@tutanota.com>
Date:   Tue Jul 6 12:08:19 2021 +0530

    Fix typescript check failure (oppia#13321)

commit c037e83
Author: Kevin Thomas <kevintab@tutanota.com>
Date:   Tue Jul 6 11:33:46 2021 +0530

    Modify translation submission validation to check for custom tags (oppia#13309)

commit 220c03a
Author: Radesh <54100702+Radesh-kumar@users.noreply.github.com>
Date:   Tue Jul 6 10:42:21 2021 +0530

    Added unit tests for admin roles tab (oppia#13206)

commit 56a9e43
Author: Kevin Thomas <kevintab@tutanota.com>
Date:   Tue Jul 6 09:57:02 2021 +0530

    Add Marathi (मराठी) and Ganda (Luganda) to supported languages (oppia#13315)

commit c82945e
Author: AdityaDubey0 <55298925+AdityaDubey0@users.noreply.github.com>
Date:   Tue Jul 6 03:53:03 2021 +0530

    Migrate lint check to disallow innerHTML property. (oppia#13301)

commit 901bc8b
Author: Hitesh Tomar <44300735+lkbhitesh07@users.noreply.github.com>
Date:   Tue Jul 6 02:33:38 2021 +0530

    warning text is within the box (oppia#13296)

commit 90d0152
Author: AdityaDubey0 <55298925+AdityaDubey0@users.noreply.github.com>
Date:   Tue Jul 6 01:45:41 2021 +0530

    Disallow $parent and $broadcast angularJs property (oppia#13291)

Contributor Author

ashutoshc8101 commented Jul 8, 2021

Hey @ashutoshc8101 -- this PR might have introduced a new flake. Can you please confirm/resolve this?

Flaked locally while pushing changes:

Tested locally on develop, 5/5 passing.
@aishwary023 Are you sure this is not due to your local changes?

Contributor

aishwary023 commented Jul 9, 2021

Hey @ashutoshc8101 -- this PR might have introduced a new flake. Can you please confirm/resolve this?
Flaked locally while pushing changes:

Tested locally on develop, 5/5 passing.
@aishwary023 Are you sure this is not due to your local changes?

Yep, this was not due the changes in my PR as the changes were in unrelated files. Can you run the tests on local fork?

Contributor

atpug22 commented Jul 16, 2021 •

edited

Loading

Hey @ashutoshc8101 -- this PR might have introduced a new flake. Can you please confirm/resolve this?

Flaked locally while pushing changes:

Yup, I still get this error sometimes.

Apart from this, I am getting one more frontend coverage check error, which I guess is related to this PR.

@ashutoshc8101 PTAL.

PS: The failing test in @aishwary023's comment is related to the same file which is shown not covered to me.

Contributor Author

ashutoshc8101 commented Jul 16, 2021

@aishwary023 @atpug22 I am looking into it. Thanks for confirming the flake.

ashutoshc8101 mentioned this pull request

Fix coverage flake introduced in #13219 #13419

Merged

4 tasks

Contributor Author

ashutoshc8101 commented Jul 18, 2021

Hey @ashutoshc8101 -- this PR might have introduced a new flake. Can you please confirm/resolve this?
Flaked locally while pushing changes:

Yup, I still get this error sometimes.

Apart from this, I am getting one more frontend coverage check error, which I guess is related to this PR.

@ashutoshc8101 PTAL.

PS: The failing test in @aishwary023's comment is related to the same file which is shown not covered to me.

Fixed in #13419. Thanks

oppiabot bot assigned aishwary023 and ashutoshc8101

vojtechjelinek pushed a commit that referenced this pull request


          Fix coverage flake introduced in #13219 (#13419)

d283158

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

kevintab95 kevintab95 approved these changes

nithusha21 nithusha21 approved these changes

DubeySandeep DubeySandeep approved these changes

srijanreddy98 srijanreddy98 approved these changes

jameesjohn jameesjohn approved these changes

darksun27 darksun27 approved these changes

krishnarao22 krishnarao22 approved these changes

Labels

None yet