feat: return key value pair from model

NotFoundNL · Nov 28, 2023 · b3182e8 · b3182e8
1 parent fcf9a75
commit b3182e8
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/Services/Assets/Components/ComponentModelSelect.php b/src/Services/Assets/Components/ComponentModelSelect.php
@@ -12,14 +12,12 @@ public function getAutoLayoutClass(): ?AbstractLayout
     {
         $inputDropdown = new LayoutInputDropdown($this->assetItem->internal, $this->assetItem->name);
 
-        $server_properties = $this->properties();
-
         $items = $this->getModels();
 
-        foreach ($items as $item) {
+        foreach ($items as $key => $value) {
             $inputDropdown->addItem(
-                $item->id,
-                $item->{$server_properties->methodName}()
+                $key,
+                $value,
             );
         }
 
@@ -34,16 +32,16 @@ public function validate($newValue): bool
 
     public function getTableOverviewContent(): LayoutTableColumn
     {
-        $value = $this->properties()->selectedModel::find($this->getCurrentValue());
+        $value = $this->properties()->selectedModel::{$this->properties()->methodName}($this->getCurrentValue(), true);
 
-        $display = ($value) ? $value->{$this->properties()->methodName}() : '-';
+        $display = ($value) ? $value : '-';
 
         return new LayoutTableColumn($display, $this->type);
     }
 
     private function getModels()
     {
-        return $this->properties()->selectedModel::all();
+        return $this->properties()->selectedModel::{$this->properties()->methodName}($this->getCurrentValue());
     }
 
     /**