Merge pull request #2 from asulibraries/bootstrap-5

Update Popover for Bootstrap 5

composer.json

@@ -9,6 +9,9 @@
     "require": {
         "ext-bcmath": "*",
         "google/apiclient": "^2.15",
-	"google/analytics-data": "^0.16.0"
+        "google/analytics-data": "^0.16.0"
+    },
+    "conflict": {
+        "drupal/bootstrap_barrio": "<5.5"
     }
 }

js/item-analytics.js

@@ -2,7 +2,7 @@
     /**
     * Activate the Popover utility.
     */
-    [].slice.call(document.querySelectorAll('.block-asu-item-analytics-item-block span[data-toggle="popover"]')).map(function (el) {
+    [].slice.call(document.querySelectorAll('.asu-item-analytics-popover span[data-bs-toggle="popover"]')).map(function (el) {
         return new bootstrap.Popover(el)
     })
 }())

src/Plugin/Block/ItemBlock.php

@@ -87,17 +87,19 @@ public function build() {
     $count = array_sum($this->analyticsQueryService->entityMonthly($entity) ?? []);
     if ($count > 0) {
       return [
+        '#type' => 'container',
+        '#attributes' => ['class' => ['asu-item-analytics-popover']],
         'popover' => [
           '#type' => 'html_tag',
           '#tag' => 'span',
           '#attributes' => [
             'tabindex' => '0',
             'role' => 'button',
-            'data-placement' => 'bottom',
-            'data-toggle' => 'popover',
-            'data-trigger' => 'focus',
+            'data-bs-placement' => 'bottom',
+            'data-bs-toggle' => 'popover',
+            'data-bs-trigger' => 'focus',
             'title' => 'Information',
-            'data-content' => 'The repository began collecting download statistics in 2021.',
+            'data-bs-content' => 'The repository began collecting download statistics in 2021.',
           ],
           'icon' => [
             '#type' => 'html_tag',
@@ -110,7 +112,7 @@ public function build() {
           '#plain_text' => 'Download count: ' . number_format($count),
         ],
         // Attach the library to the block.
-        '#attached' => ['library' => ['asu_item_analytics/item_block' => 'asu_item_analytics/item_block']],
+        '#attached' => ['library' => ['asu_item_analytics/item_block']],
         '#cache' => ['contexts' => ['url.path']],
       ];
     }