Skip to content
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.

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

Add single error url page #1418

Merged
merged 93 commits into from
Sep 21, 2018
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
e616a08
Begin prototype for single error URL post.php page
kienstra Sep 6, 2018
f809c3d
Output a search box, though it will need to move above the 'Status' box
kienstra Sep 6, 2018
469d3d2
Refactor simple anonymous function into method with PHPUnit test
kienstra Sep 7, 2018
93b4f26
Create method get_terms_per_page()
kienstra Sep 7, 2018
d91786d
Add a unit test for parse_post_php_term_query()
kienstra Sep 7, 2018
96141eb
Remove print_validation_errors_meta_box(), though might borrow some l…
kienstra Sep 7, 2018
7d501f0
Move template list table into method
kienstra Sep 7, 2018
500a6f5
Add unit test for render_single_url_list_table
kienstra Sep 8, 2018
9446f68
Merge branch 'develop' into add/1365-single-error-url
kienstra Sep 10, 2018
37e29f6
Reorder methods, add example URLs to DocBlock
kienstra Sep 10, 2018
9adc5d4
Output the error type in that column
kienstra Sep 10, 2018
67955cb
Allow filtering the single error page by type
kienstra Sep 10, 2018
b8d8459
Add the <tr> with 'Showing 4 of x validation errors' at the top of th…
kienstra Sep 10, 2018
e8e7906
Use dynamic values and translated text for the 'Showing errors' text
kienstra Sep 11, 2018
2473214
If there are no errors to show, do not display this message
kienstra Sep 11, 2018
838c393
Allow searching for errors
kienstra Sep 11, 2018
6324b34
Minor DocBlock improvements
kienstra Sep 11, 2018
aef6e05
Instead of adding the taxonomy as a query var, add it to $_REQUEST
kienstra Sep 11, 2018
9aaffdf
Correct failed unit test, updating with latest change
kienstra Sep 11, 2018
834b141
Remove PHP logic for displaying search term(s), change number of post…
kienstra Sep 11, 2018
c4ed164
Remove PHP logic to support filtering and searching
kienstra Sep 11, 2018
4a1e7f0
Filter the errors by type, using JavaScript
kienstra Sep 11, 2018
a552168
Address Travis error by removing empty line
kienstra Sep 11, 2018
3fe3ffa
Match text formatting of the desings for the 'Error' and 'Details' co…
kienstra Sep 12, 2018
d9c7113
Apply the design for the link at the top of the page
kienstra Sep 12, 2018
67530a4
Move 'Last checked' UI above 'Recheck' button
kienstra Sep 12, 2018
af06e79
Move 'Last checked' UI lower, to match designs
kienstra Sep 12, 2018
b5c1fb9
Add <select> element in the status column, reusing previous <select> …
kienstra Sep 13, 2018
0b02674
Merge branch 'develop' into add/1365-single-error-url
kienstra Sep 13, 2018
66e3a6f
Merge in develop, resolve conflicts
kienstra Sep 13, 2018
384be89
Change 'Identified' to 'New', update another unit test
kienstra Sep 13, 2018
fb57681
Remove the 'Apply Filter' button, and update the errors on simply cha…
kienstra Sep 13, 2018
4a1e21c
Add and support 'Accept' and 'Reject' buttons for bulk actions
kienstra Sep 14, 2018
9d301f2
Address the Travis error, by changing the class to Exception
kienstra Sep 14, 2018
ebddc40
Update styling for the 'Accept' and 'Reject' buttons
kienstra Sep 14, 2018
a364758
Use the 'Accepted' icon in the post meta box
kienstra Sep 14, 2018
1a282b7
Merge branch 'develop' into add/1365-single-error-url
kienstra Sep 14, 2018
bca2650
Apply John's work with sortable columns
kienstra Sep 14, 2018
589b92f
Add the callback that enables ordering to the single URL page
kienstra Sep 14, 2018
7936fab
Change the page header to match the design
kienstra Sep 16, 2018
2fa80f6
Merge branch 'develop' into add/1365-single-error-url
jacobschweitzer Sep 18, 2018
fbabf80
Single error URL page - add expanded details view
johnwatkins0 Sep 19, 2018
3ca22ee
Merge branch 'add/1365-single-error-url' of https://github.com/Automa…
johnwatkins0 Sep 19, 2018
6d9d60a
Fixes after merge and small style imnprovements
johnwatkins0 Sep 19, 2018
d4307a7
Reuse the existing logic to render the 'Sources' column
kienstra Sep 19, 2018
5d52bf0
Apply existing styling to the 'Sources' column
kienstra Sep 19, 2018
b4d4d60
Apply the existing icons to the 'Status' column
kienstra Sep 19, 2018
02bc366
Address failed Travis builds
kienstra Sep 19, 2018
8edf16e
Display the 'AMP Enabled' status in the post meta box
kienstra Sep 19, 2018
957bb3f
Improve styling of 'AMP enabled' icon
kienstra Sep 19, 2018
9878448
Change the status icon as the user chooses a status from the <select>
kienstra Sep 19, 2018
3d63291
Fix an issue in switching back to 'New' status
kienstra Sep 19, 2018
8b2c568
Restore logic to 'Preview Changes'
kienstra Sep 19, 2018
f80b5e2
Merge branch 'develop' into add/1365-single-error-url
kienstra Sep 19, 2018
1b4c43c
Remove a reference to the constant VALIDATION_DETAILS_NODE_NAME_QUERY…
kienstra Sep 19, 2018
19fc70d
Implement inline actions, like 'Accept' and 'Reject'.
kienstra Sep 19, 2018
e09db3d
Edit some DocBlocks, remove dom-ready from webpack.config.js
kienstra Sep 19, 2018
738f2ad
Implement a basic JS search for errrors, using the 'Details' column
kienstra Sep 19, 2018
bdf411e
Fix an issue in passing the wrong argument to handle_validation_error…
kienstra Sep 19, 2018
c8807bd
Use intval() in sanitization, check that ! empty()
kienstra Sep 19, 2018
2d3f30e
Fix more escaping, like using intval()
kienstra Sep 19, 2018
9cafbeb
Instead of a boolean flag, use an array of arguments
kienstra Sep 19, 2018
4829932
Remove default argument value, add a check for ! event.target.value
kienstra Sep 19, 2018
00c11dd
Move styling from JSS to CSS
kienstra Sep 19, 2018
2c1c140
If all of the rows are showing, hide the notice
kienstra Sep 19, 2018
4875775
Merge in develop, resolve merge conflict
kienstra Sep 20, 2018
029b986
Add a 'Show all' button to display all errors
kienstra Sep 20, 2018
0da5582
Output the sources is the expandable 'Error' section
kienstra Sep 20, 2018
e7b194f
Address Travis error by moving parameter name 2 spaces to the right
kienstra Sep 20, 2018
03cd2a8
On clicking 'Show all,' change the error type <select> to 'All Error …
kienstra Sep 20, 2018
756b884
Change 'Reject' icon to red
kienstra Sep 20, 2018
9074772
Only display the 'Accept' and 'Reject' bulk action buttons if a check…
kienstra Sep 20, 2018
5965fee
Fix styling issue in 'Accept' and 'Reject' buttons, remove dead code
kienstra Sep 20, 2018
731f313
Rename CSS file to reflect that it applies to the whole page
kienstra Sep 20, 2018
f2b62e8
Fix undefined index notices related to queried_object meta missing
westonruter Sep 20, 2018
8e427d7
On clicking 'Show all', still show the notice with the count
kienstra Sep 20, 2018
9db69ee
Prevent showing the 'Invalid URL' page header before it's overwritten…
kienstra Sep 20, 2018
b6695c3
Update Accept/Reject buttons to update select dropdown, not submit form.
westonruter Sep 20, 2018
75f128f
When all of the errors are displaying, hide the notice
kienstra Sep 20, 2018
505a42e
Because the show all button might be newly created, do a new query fo…
kienstra Sep 20, 2018
2ba31f9
Fix presentation of toggle button in narrower screen resolutions
westonruter Sep 20, 2018
818259e
Commit changes in order to merge remote
johnwatkins0 Sep 21, 2018
5f15604
Merge branch 'develop' of https://github.com/Automattic/amp-wp into a…
westonruter Sep 21, 2018
aa21e14
Single error view - add toggle all button for sources column
johnwatkins0 Sep 21, 2018
b28875c
Merge remote and resolve conflicts
johnwatkins0 Sep 21, 2018
5b7c2e0
Merge develop into add/1365-single-error-url
johnwatkins0 Sep 21, 2018
39cb830
Single error view - remove debug statement
johnwatkins0 Sep 21, 2018
f0668f7
Validation - tooltip fixes
johnwatkins0 Sep 21, 2018
da5169b
Validation - PHPCS fixes
johnwatkins0 Sep 21, 2018
3dce980
Validation - PHPCS fixes
johnwatkins0 Sep 21, 2018
8d603f4
Validation PHPUnit - restore removed line in test
johnwatkins0 Sep 21, 2018
d5b3a42
Don't show the 'Reject' and 'Accept' action links on the single URL p…
kienstra Sep 21, 2018
f0677bf
Set document title in addition to the heading
westonruter Sep 21, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion assets/js/amp-invalid-url-post-edit-screen.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ var ampInvalidUrlPostEditScreen = ( function() { // eslint-disable-line no-unuse
component = {
data: {
l10n: {
unsaved_changes: ''
unsaved_changes: '',
showing_number_errors: ''
}
}
};
Expand All @@ -19,6 +20,7 @@ var ampInvalidUrlPostEditScreen = ( function() { // eslint-disable-line no-unuse
*/
component.boot = function boot( data ) {
Object.assign( component.data, data );
component.addShowingErrorsRow();
component.watchForUnsavedChanges();
};

Expand Down Expand Up @@ -56,5 +58,38 @@ var ampInvalidUrlPostEditScreen = ( function() { // eslint-disable-line no-unuse
return component.data.l10n.unsaved_changes;
};

/**
* Add the <tr> with 'Showing x of y validation errors' at the top of the list table.
*/
component.addShowingErrorsRow = function addShowingErrorsRow() {
var thead, tr, th,
theadQuery = document.getElementsByTagName( 'thead' );

/*
* If there are no validation errors, like if someone filters for 'JS Errors',
* there won't be translated text in showing_number_errors.
* In that case, there's no need to output this message.
*/
if ( ! theadQuery[ 0 ] || ! component.data.l10n.showing_number_errors ) {
return;
}

thead = theadQuery[ 0 ];
tr = document.createElement( 'tr' );
th = document.createElement( 'th' );

/* eslint-disable dot-notation */
th.style[ 'text-align' ] = 'center';
th.style[ 'background-color' ] = '#d3d3d3b8';
th.style[ 'color' ] = '#1e8cbecc';
/* eslint-enable dot-notation */

th.innerText = component.data.l10n.showing_number_errors;
th.setAttribute( 'colspan', '6' );

tr.appendChild( th );
thead.appendChild( tr );
};

return component;
}() );
Copy link
Member

Choose a reason for hiding this comment

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

Ideally amp-invalid-url-post-edit-screen.js should be be made into an ES6 module like amp-validation-single-error-url-details.js.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good idea. Do you think that should be done before merging this? Otherwise, maybe I could add this script to #1298.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, better to do as part of #1298.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, I added this to #1298.

Loading