Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Refactor components with commonForm #8443

Merged
merged 17 commits into from
Apr 25, 2017
Merged

Refactor components with commonForm #8443

merged 17 commits into from
Apr 25, 2017

Conversation

luixxiul
Copy link
Contributor

@luixxiul luixxiul commented Apr 23, 2017

This PR is based on refactoring-aphrodite.

Refactor components with commonForm.

See:
#8011 - Refactor loginRequired.js with Aphrodite and commonForm
#8032 - Refactor widevinePanel.js and widevineInfo.js
#8105 - Refactor autofillAddressPanel.js and autofillCreditCardPanel.js
#8136 - Refactor addEditBookmarkHanger.js with commonForm
#8154 - Refactor checkDefaultBrowserDialog.js with commonForm
#8155 - Delete genericForm and commonDialog from forms.less
#8194 - Refactor clearBrowsingDataPanel.js with commonForm

Also: move commonForm.js, list.js, dropdown.js, textbox.js and messageBox.js into common folder.

As the PRs above have been reviewed already, there should be no problems with this PR.

Test Plan: described in those PRs

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).

#6372

Suguru Hirahara and others added 13 commits April 23, 2017 10:17
- textbox and textbox__outlineable were copied from textbox.js to commonStyles.js

Since FormTextbox cannot be used for the input elements, I copied the styles applied for that element and applied to them. See: #7164 (comment)

The labels and input forms were grouped and placed with display:flex and justify-content:space-between. Also the elements inside each wrapper were aligned equally to make the length of the input forms always equal (l10n friendly).

Also colons in the label were removed to make the style consistent.

Closes #8009
Addresses #8010

Auditors:

Test Plan:
1. Visit http://browserspy.dk/password.php
2. Click "password-ok.php" link
3. Make sure you can log in successfully with the given credential
4. Change the lang setting on about:preferences
5. Try the same steps above and make sure the length of the input forms is equal
Also:
- Replaced aphrodite with aphrodite/no-important on textbox.js
- Moved the styles from loginRequired.js to commonForm.js

Auditors:

Test Plan: n/a
Closes #8028
Addresses #7989

- Removed isClickDismiss from the dialog
  Installing Widevine influences globally, not specific to a tab which opens the page which requires Widevine. Removing isClickDismiss would clarify to the users that the third party software which we discourage from using is going to be installed on the browser right now.

- Applied commonForm.js to them in order to make styling consistent
- Added CommonFormLarge to commonForm.js
- Added globalStyles.dialogWidth and globalStyles.LargeWidth to global.js
- Added noMargin and noPadding to commonStyles.js
- Added margin-top to the bottom text block on widevineInfo.js
- Added testIds to the buttons and the dialog, modifying dialog.js
  - data-test-id as testId
  - data-test2-id as test2Id
- Added widevinePanelDialog as a testId
- Set cursor:pointer

Auditors:

Test Plan:
1. Visit netflix.com
2. Click outside of the dialog
3. Make sure the dialog is not closed
4. Click "Install and Allow"
5. Log in to the account
6. Make sure movies can be played
Closes #8099
Closes #8100
Addresses #7989

- Refactored with commonForm, replacing it with genericForm
  Aligned labels to the left and input textboxes to the right by applying display:flex

- Added CommonFormLarge
- Added cx to dialog.js for more readability
- Removed .manageAutofillDataPanel from form.less

Also:
- Added testIds
- Edited autofillTest.js and autofill.js
  TODO: refactor autofill.js with Aphrodite
- Edited selectors.js

Auditors:

Test Plan:
1. Automated tests should pass
2. Open about:autofill
3. Add an address
4. Add a credit card
5. Visit https://www.roboform.com/filling-test-all-fields
6. Make sure the input forms can be filled
Closes #6040
Addresses #7989

- Added CommonFormBookmarkHanger to commonForm.js
- Added globalStyles.spacing.bookmarkHangerMaxWidth to global.js
  Max-width of the bookmark hanger was set to 350px. Also, setting white-space:normal makes it possible for lines to be wrapped.

- Moved Dialog from addEditBookmark.js to addEditBookmarkHanger.js
- Added cancel button with this.onClose as 'fa fa-close' was removed

- Added const arrowUp and dialogHanger
- Added box-shadow to arrowUp

- Added styles.bookmarkHanger which is applied if !this.props.isModal
- Copied CommonFormSection and CommonFormTitle from commonForm.js, adding CommonFormBookmarkHangerTitle to addEditBookmarkHanger.js
  The margin-top of the title should be reduced if this.props.isModal.

- Changed backgroundColor of commonForm to #fff

- Add zindex to elements on navigation bar to let tests pass
  The value was set to higher than that of dialog, which is 3000.

- Updated test code

Also:
- Replaced divs with sections
- Removed styles from form.less
- Removed wideButton from buttons
- Added testIds to buttons (bookmarkHangerRemoveButton, bookmarkHangerCancelButton, bookmarkHangerDoneButton)
- Fixed camel cases

Auditors:

Test Plan 1:
1. Open about:preferences
2. Disable Home button
3. Click the star icon on the URL bar
4. Make sure the arrow up appears exactly under the star
5. Make sure the button appears under the icon
6. Open about:preferences
7. Enable Home button
8. Click the star icon again
9. Make sure th arrow up appears exactly under the star

Test Plan 2:
1. Open about:bookmarks
2. Click the star icon on the URL bar
3. Click "Done"
4. Click the star icon again
5. Click "Remove"
6. Make sure the bookmark is successfully removed

Test Plan 3:
1. Click "Add Folder" icon on about:bookmarks
2. Click "Cancel"
3. Make sure the dialog is closed

Test Plan 4:
1. Create a bookmark folder on about:bookmarks
2. Edit the folder via context menu on about:bookmarks
3. Click "Remove"
4. Make sure the folder is successfully removed

Test Plan 5:
1. Click the star icon on about:bookmarks
2. Click "Cancel"
3. Make sure the dialog is closed
4. Click the star icon again
5. Create a bookmark
6. Edit the bookmark via context menu
7. Click "Remove"
8. Make sure the bookmark is successfully removed
Closes #8137
Addresses #7989

- Added CommonFormMedium
- Removed styles under checkDefaultBrowserDialog in forms.less

Auditors:

Test Plan:
1. Change your default browser to other than Brave
2. Start Brave
Closes #8010
Addresses #7989

Auditors:

Test Plan: n/a
Closes #8192
Addresses #7989

- Added CommonFormSmall to commonForm.js
- Added data-test-id and testIds
- Removed clearBrowsingDataPanel from forms.less
- Updated test code

Auditors:

Test Plan:
1. Open Clear browsing data panel from the menu
2. Test the cancel button works
3. Reopen the panel
4. Test the clear button works
Auditors:

Test Plan: n/a
Auditors:

Test Plan: n/a
@luixxiul
Copy link
Contributor Author

luixxiul commented Apr 23, 2017

If this PR looks good to you, please add ready-to-merge label and let me merge the commits, which I have signed.

@luixxiul
Copy link
Contributor Author

It seems that the errors on the Travis are irrelevant with this PR.

Copy link
Contributor

@cezaraugusto cezaraugusto left a comment

Choose a reason for hiding this comment

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

Failing tests are unrelated to these changes and PRs described are all already approved, so LGTM

just as a reminder pls rebase as needed ++

Suguru Hirahara added 3 commits April 25, 2017 09:45
Auditors:

Test Plan: n/a
Auditors:

Test Plan: n/a
Auditors:

Test Plan: n/a
@luixxiul luixxiul force-pushed the refactoring-aphrodite branch from 1822219 to 16a3171 Compare April 25, 2017 00:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants