#2660 Specialization filter no longer resets when passing more than o…

…ne value (csv).
RaiderIO · Jan 31, 2025 · f9dc203 · f9dc203
1 parent 7e21ce8
commit f9dc203
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/app/Http/Controllers/Dungeon/DungeonExploreController.php b/app/Http/Controllers/Dungeon/DungeonExploreController.php
@@ -182,6 +182,7 @@ public function embed(
         $mapBackgroundColor    = $request->get('mapBackgroundColor');
         $showEnemyInfo         = $request->get('showEnemyInfo', false);
         $showTitle             = $request->get('showTitle', true);
+        $defaultZoom           = $request->get('defaultZoom', 1);
 
         $parameters = [
             'type'             => $request->get('type'),
@@ -217,6 +218,7 @@ public function embed(
                 $seasonService->getWeeklyAffixGroupsSinceStart($mostRecentSeason, GameServerRegion::getUserOrDefaultRegion()) :
                 collect(),
             'parameters'              => $parameters,
+            'defaultZoom'             => $defaultZoom,
             'embedOptions'            => [
                 'style'                 => $style,
                 'headerBackgroundColor' => $headerBackgroundColor,

diff --git a/app/Http/Requests/Heatmap/ExploreEmbedUrlFormRequest.php b/app/Http/Requests/Heatmap/ExploreEmbedUrlFormRequest.php
@@ -29,6 +29,7 @@ public function rules(): array
             'mapBackgroundColor'    => ['nullable', 'regex:/^#([a-f0-9]{6}|[a-f0-9]{3})$/i'],
             'showEnemyInfo'         => 'nullable|bool',
             'showTitle'             => 'nullable|bool',
+            'defaultZoom'           => 'nullable|numeric',
         ]);
     }
 }
diff --git a/resources/assets/js/custom/inline/common/search/filters/filterselect.js b/resources/assets/js/custom/inline/common/search/filters/filterselect.js
@@ -0,0 +1,19 @@
+class SearchFilterSelect extends SearchFilter {
+    /**
+     *
+     * @returns {Array}
+     */
+    getValue() {
+        return $(`${this.selector}`).val();
+    }
+
+    /**
+     *
+     * @param value {string}
+     */
+    setValue(value) {
+        let split = value.split(',');
+
+        $(`${this.selector}`).val(split);
+    }
+}
diff --git a/...rch/filters/filterinputspecializations.js → ...ch/filters/filterselectspecializations.js b/...rch/filters/filterinputspecializations.js → ...ch/filters/filterselectspecializations.js
@@ -1,4 +1,4 @@
-class SearchFilterSpecializations extends SearchFilterInput {
+class SearchFilterSpecializations extends SearchFilterSelect {
     constructor(selector, onChange) {
         super(selector, onChange);
     }
@@ -16,10 +16,6 @@ class SearchFilterSpecializations extends SearchFilterInput {
         });
     }
 
-    getDefaultValue() {
-        return [];
-    }
-
     getFilterHeaderText() {
         let value = this.getValue();
 

diff --git a/resources/views/dungeon/explore/gameversion/embed.blade.php b/resources/views/dungeon/explore/gameversion/embed.blade.php
@@ -23,6 +23,7 @@
  * @var Collection<WeeklyAffixGroup> $seasonWeeklyAffixGroups
  * @var array                        $embedOptions
  * @var array                        $parameters
+ * @var float                        $defaultZoom
  */
 ?>
 @extends('layouts.map', [
@@ -64,7 +65,7 @@
 //            'embedStyle' => $embedOptions['style'],
             'edit' => false,
             'echo' => false,
-            'defaultZoom' => 1,
+            'defaultZoom' => $defaultZoom,
             'floor' => $floor,
             'showAttribution' => false,
             'parameters' => $parameters,