feat: implement unique handle generation and validation for icon sets

Author: bhlindemann

src/controllers/IconSetsController.php

@@ -190,7 +190,7 @@ public function actionSave(): ?Response
 
         // Populate model
         $iconSet->name = $request->getBodyParam('name');
-        $iconSet->handle = $request->getBodyParam('handle');
+        $iconSet->handle = $this->_generateUniqueHandle($request->getBodyParam('handle'), $iconSetId);
         $iconSet->type = $request->getBodyParam('type');
         $iconSet->enabled = (bool)$request->getBodyParam('enabled');
 
@@ -619,4 +619,52 @@ public function actionDeleteBackup(): Response
 
         return $this->redirectToPostedUrl();
     }
+
+    /**
+     * Generate a unique handle by appending a number if needed
+     *
+     * @param string $handle The desired handle
+     * @param int|null $currentIconSetId The current icon set ID (to exclude from duplicate check)
+     * @return string A unique handle
+     */
+    private function _generateUniqueHandle(string $handle, ?int $currentIconSetId = null): string
+    {
+        // Check if handle already exists
+        $query = (new \craft\db\Query())
+            ->from('{{%iconmanager_iconsets}}')
+            ->where(['handle' => $handle]);
+
+        // Exclude current icon set if editing
+        if ($currentIconSetId) {
+            $query->andWhere(['not', ['id' => $currentIconSetId]]);
+        }
+
+        // If handle is unique, return as-is
+        if (!$query->exists()) {
+            return $handle;
+        }
+
+        // Handle is taken, generate unique one by appending number
+        $baseHandle = $handle;
+        $i = 1;
+
+        // Keep incrementing until we find a unique handle
+        while (true) {
+            $newHandle = $baseHandle . $i;
+
+            $query = (new \craft\db\Query())
+                ->from('{{%iconmanager_iconsets}}')
+                ->where(['handle' => $newHandle]);
+
+            if ($currentIconSetId) {
+                $query->andWhere(['not', ['id' => $currentIconSetId]]);
+            }
+
+            if (!$query->exists()) {
+                return $newHandle;
+            }
+
+            $i++;
+        }
+    }
 }

src/models/IconSet.php

@@ -81,13 +81,36 @@ protected function defineRules(): array
             [['name', 'handle', 'type'], 'required'],
             [['name', 'handle'], 'string', 'max' => 255],
             [['handle'], 'match', 'pattern' => '/^[a-zA-Z][a-zA-Z0-9_]*$/'],
+            [['handle'], 'validateUniqueHandle'],
             [['type'], 'in', 'range' => ['svg-folder', 'svg-sprite', 'font-awesome', 'material-icons', 'web-font', 'custom']],
             [['enabled'], 'boolean'],
             [['sortOrder'], 'integer'],
             [['settings'], 'safe'],
         ];
     }
 
+    /**
+     * Validate that the handle is unique
+     */
+    public function validateUniqueHandle($attribute)
+    {
+        $handle = $this->$attribute;
+
+        // Build query to check for existing handle
+        $query = (new \craft\db\Query())
+            ->from('{{%iconmanager_iconsets}}')
+            ->where(['handle' => $handle]);
+
+        // Exclude current record if editing
+        if ($this->id) {
+            $query->andWhere(['not', ['id' => $this->id]]);
+        }
+
+        if ($query->exists()) {
+            $this->addError($attribute, Craft::t('icon-manager', 'Handle "{handle}" is already in use.', ['handle' => $handle]));
+        }
+    }
+
     /**
      * Get the display name for this icon set type
      */