(FIX) [Tour/Highlights] Fixed major issue on opening tours and highli…

…ghts
JibayMcs · Aug 6, 2024 · ab04e60 · ab04e60
1 parent e707673
commit ab04e60
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.1|^8.2",
         "filament/filament": "^3.0",
         "spatie/laravel-package-tools": "^1.15.0",
         "illuminate/contracts": "^10.0|^11.0"

diff --git a/resources/dist/filament-tour.css b/resources/dist/filament-tour.css
diff --git a/resources/dist/filament-tour.js b/resources/dist/filament-tour.js
diff --git a/resources/js/index.js b/resources/js/index.js
@@ -104,6 +104,8 @@ document.addEventListener('livewire:initialized', async function () {
 
         const id = parseId(params);
 
+        console.log(highlights)
+
         let highlight = highlights.find(element => element.id === id);
 
         if (highlight) {
@@ -133,7 +135,7 @@ document.addEventListener('livewire:initialized', async function () {
 
         const id = parseId(params);
 
-        let tour = tours.find(element => element.id === id);
+        let tour = tours.find(element => element.id === `tour_${id}`);
 
         if (tour) {
             openTour(tour);
@@ -274,5 +276,4 @@ document.addEventListener('livewire:initialized', async function () {
             driverObj.drive();
         }
     }
-})
-;
+});
diff --git a/src/Highlight/Highlight.php b/src/Highlight/Highlight.php
@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Support\HtmlString;
+use Illuminate\Support\Str;
 use Illuminate\View\View;
 
 class Highlight
@@ -38,11 +39,11 @@ public function __construct(string $id, array $colors, string $parent)
      * <br>
      * Define a **$parent** to be able to view this highlight button next to it
      */
-    public static function make(string $id, string $parent): static
+    public static function make(string $parent): static
     {
         return app(static::class,
             [
-                'id' => $id,
+                'id' => Str::slug($parent),
                 'colors' => [
                     'dark' => '#fff',
                     'light' => 'rgb(0,0,0)',

diff --git a/src/Tour/HasTour.php b/src/Tour/HasTour.php
@@ -2,6 +2,7 @@
 
 namespace JibayMcs\FilamentTour\Tour;
 
+use Filament\Facades\Filament;
 use JibayMcs\FilamentTour\Tour\Traits\CanConstructRoute;
 
 trait HasTour
@@ -18,7 +19,7 @@ public function constructTours($class): array
 
             if ($tour instanceof Tour) {
 
-                if ($tour->getRoute()) {
+                if ($tour->getRoute() && Filament::auth()->user()) {
                     $this->setRoute($tour->getRoute());
                 }
 
@@ -42,7 +43,7 @@ public function constructTours($class): array
                         ],
                     ];
 
-                    if (! $tour->hasDisabledEvents()) {
+                    if (!$tour->hasDisabledEvents()) {
                         $data[$item]['events'] = [
                             'redirectOnNext' => $step->getRedirectOnNext(),
                             'clickOnNext' => $step->getClickOnNext(),