Skip to content

Add waiting notice and support missing web-vitals script #1

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

Merged
merged 4 commits into from
Jul 20, 2023
Merged

Add waiting notice and support missing web-vitals script #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65cc438
add waiting notice and support missing script
crstauf Jul 19, 2023
a12eb48
fix nesting
crstauf Jul 19, 2023
f130bb4
change script handle and version
crstauf Jul 19, 2023
7063e3b
remove extra parenthesis
crstauf Jul 19, 2023
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
4 changes: 2 additions & 2 deletions dispatchers/Html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,10 @@ public function enqueue_assets() {
// Only load if the wp-admin bar is visible.
if ( is_admin_bar_showing() ) {
wp_enqueue_script(
'web-vitals',
'qm-web-vitals',
$this->qm->plugin_url( 'assets/web-vitals.js' ),
array(),
QM_VERSION,
'3.3.2',
true
);
}
Expand Down
16 changes: 15 additions & 1 deletion output/html/web_vitals.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@ public function name() {
* @return void
*/
public function output() {
if ( ! wp_script_is( 'qm-web-vitals', 'enqueued' ) && ! wp_script_is( 'qm-web-vitals', 'done' ) ) {
$this->before_non_tabular_output();
/* translators: %s: Script handle. */
$notice = sprintf( __( 'Script %s is not available.', 'query-monitor' ), 'qm-web-vitals' );
echo $this->build_notice( $notice );
$this->after_non_tabular_output();
return;
}

$this->before_tabular_output();
echo '<thead>';

Expand All @@ -47,19 +56,24 @@ public function output() {
echo '</thead>';

echo '<tbody id="qm-web-vitals-inner">';
echo '<tr class="waiting">';
echo '<td colspan="4">';
echo '<div class="qm-none"><p>Waiting for data...</p></div>';
echo '</td>';
echo '</tr>';
echo '</tbody>';

$this->after_tabular_output();
echo '<script>
// Insert the web vital into the qm-web-vitals div.
function insertWebVital( webVital ) {
console.log( { webVital } );
var webVitalsDiv = document.getElementById( "qm-web-vitals-inner" );
var divToAdd = document.createElement("tr");
divToAdd.innerHTML = "<td>" + webVital.name + "</td>" +
"<td>" + webVital.value + "</td>" +
"<td>" + webVital.rating + "</td>" +
"<td><pre class=\"qm-pre-wrap\"><code>" + JSON.stringify( webVital ) + "</code></pre></td>";
webVitalsDiv.querySelector( ".waiting" )?.remove();
webVitalsDiv.appendChild( divToAdd );
}

Expand Down