Remove fsIDs from Options (#25)

Author: mlocati

blocks/easy_image_gallery/advanced_options.php

@@ -12,6 +12,7 @@
  * @var Concrete\Package\EasyImageGallery\Options $options
  * @var Concrete\Core\File\Set\Set[] $fileSets
  * @var array $fDetails
+ * @var int[] $fsIDs
  * @var bool $isComposer
  */
 

blocks/easy_image_gallery/controller.php

@@ -545,6 +545,21 @@ private function addOrEdit()
         $this->set('options', $this->getOptions());
         $this->set('fileSets', $this->getFileSetList());
         $this->set('fDetails', $this->getFilesDetails());
+        $this->set('fsIDs', array_values(
+            array_unique(
+                array_filter(
+                    array_map(
+                        static function ($fID) {
+                            return preg_match('/^fsID[1-9]\d{0,18}$/', $fID) ? (int) substr($fID, strlen('fsID')) : 0;
+                        },
+                        explode(',', (string) $this->fIDs)
+                    ),
+                    static function ($fsID) {
+                        return $fsID > 0;
+                    }
+                )
+            )
+        ));
         $this->set('isComposer', false);
     }
 

blocks/easy_image_gallery/form_setup_html.php

@@ -12,6 +12,7 @@
  * @var Concrete\Package\EasyImageGallery\Options $options
  * @var Concrete\Core\File\Set\Set[] $fileSets
  * @var array $fDetails
+ * @var int[] $fsIDs
  * @var bool $isComposer
  */
 
@@ -27,7 +28,7 @@
                 foreach ($fileSets as $fs) {
                     $fsID = (int) $fs->getFileSetID();
                     ?>
-                    <option value="<?= $fsID ?>" <?= in_array($fsID, $options->fsIDs, true) ? 'selected' : '' ?>><?= h($fs->getFileSetName()) ?></option>
+                    <option value="<?= $fsID ?>" <?= in_array($fsID, $fsIDs, true) ? 'selected' : '' ?>><?= h($fs->getFileSetName()) ?></option>
                     <?php
                 }
                 ?>
@@ -129,7 +130,7 @@
 
 const sliderEntriesContainer = $('.easy_image-items');
 
-let selectedFilesets = <?= json_encode($options->fsIDs) ?>;
+let selectedFilesets = <?= json_encode($fsIDs) ?>;
 
 let is_first_file = true;
 

src/Concrete/Options.php

@@ -9,11 +9,6 @@
  */
 final class Options
 {
-    /**
-     * @var int[]
-     */
-    public $fsIDs = [];
-
     /**
      * @var string
      */
@@ -91,14 +86,6 @@ final class Options
 
     private function __construct(array $data)
     {
-        if (isset($data['fsIDs']) && is_array($data['fsIDs'])) {
-            foreach ($data['fsIDs'] as $id) {
-                $id = (int) $id;
-                if ($id > 0 && !in_array($id, $this->fsIDs, true)) {
-                    $this->fsIDs[] = $id;
-                }
-            }
-        }
         $this->setString($data, 'lightbox', 'lightbox');
         $this->setBool($data, 'preloadImages', false);
         $this->setBool($data, 'textFiltering', false);
@@ -133,16 +120,6 @@ public static function fromJson($json)
      */
     public static function fromUI(array $data)
     {
-        $fsIDs = [];
-        if (isset($data['fID']) && is_array($data['fID'])) {
-            foreach ($data['fID'] as $fID) {
-                if (strpos($fID, 'fsID') === 0) {
-                    $fsIDs[] = substr($fID, 4);
-                }
-            }
-        }
-        $data['fsIDs'] = $fsIDs;
-
         return new self($data);
     }
 
@@ -160,7 +137,6 @@ public function getFancyOverlayCSSColor()
     public function export()
     {
         $data = (array) $this;
-        unset($data['fsIDs']);
 
         return json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
     }