fix(characters): fix character warning array mapping (#1072)

corowne · Sep 26, 2024 · 7b30804 · 7b30804
1 parent 2b135f0
commit 7b30804
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/app/Http/Controllers/Admin/Characters/CharacterController.php b/app/Http/Controllers/Admin/Characters/CharacterController.php
@@ -771,7 +771,7 @@ public function getContentWarnings() {
 
                 return ['warning' => ucwords($lower)];
             });
-        })->collapse()->unique()->sort()->toJson();
+        })->sort()->flatten(1)->unique()->values()->toJson();
 
         return $contentWarnings;
     }

diff --git a/app/Models/Character/CharacterImage.php b/app/Models/Character/CharacterImage.php
@@ -288,7 +288,7 @@ public function getEditWarningsAttribute() {
 
                 return ['warning' => ucwords($lower)];
             });
-        })->collapse()->sort()->toJson();
+        })->sort()->flatten(1)->values()->toJson();
 
         return $contentWarnings;
     }

diff --git a/resources/views/widgets/_character_warning_js.blade.php b/resources/views/widgets/_character_warning_js.blade.php
@@ -21,8 +21,7 @@
                     options: options,
                     onInitialize: function() {
                         console.log(this.$input.attr('data-init-value'));
-                        var existingOptions = JSON.parse(this.$input.attr(
-                            'data-init-value'));
+                        let existingOptions = this.$input.attr('data-init-value') ? JSON.parse(this.$input.attr('data-init-value')) : [];
                         var self = this;
                         if (Object.prototype.toString.call(existingOptions) ===
                             "[object Array]") {