HP-2313: extend trash drop down with disposal locations

src/repositories/DisposalRepository.php → src/repositories/LocationRepository.php

@@ -7,15 +7,15 @@
 use yii\base\Application;
 use yii\caching\CacheInterface;
 
-readonly class DisposalRepository
+readonly class LocationRepository
 {
     public function __construct(public CacheInterface $cache, public Application $app)
     {
     }
 
-    public function findForLocation(?string $deviceLocation): array
+    public function findForLocation(?string $deviceLocation, string $locationLike = 'disposal_'): array
     {
-        $devices = $this->getDevices();
+        $devices = $this->getDevices($locationLike);
         $deviceId2Locations = array_filter(ArrayHelper::map($devices, 'id', 'bindings.location.switch'));
         $deviceLocationIsEmptyOrDevicesAreNotBindedWithLocation = $deviceLocation === null || $deviceId2Locations === [];
         if ($deviceLocationIsEmptyOrDevicesAreNotBindedWithLocation) {
@@ -25,11 +25,11 @@ public function findForLocation(?string $deviceLocation): array
         return $this->sortBySimilarity($deviceId2Locations, $deviceLocation);
     }
 
-    private function getDevices(): array
+    private function getDevices(string $dcLike): array
     {
         return $this->cache->getOrSet(
-            ['disposal_id', $this->app->user->identity->id],
-            static fn() => Server::find()->where(['dc_like' => 'disposal_'])->withBindings()->limit(-1)->all(),
+            ['disposal_id', $dcLike, $this->app->user->identity->id],
+            static fn() => Server::find()->where(['dc_like' => $dcLike])->withBindings()->limit(-1)->all(),
             3600
         );
     }

src/views/part/trash.php

@@ -2,7 +2,7 @@
 
 use hipanel\modules\stock\widgets\combo\PartnoCombo;
 use hipanel\modules\stock\widgets\combo\SourceCombo;
-use hipanel\modules\stock\widgets\combo\TrashDestinationCombo;
+use hipanel\modules\stock\widgets\combo\TrashDestinationDropDownList;
 use hipanel\widgets\Box;
 use hipanel\widgets\DynamicFormWidget;
 use yii\bootstrap\ActiveForm;
@@ -61,11 +61,7 @@
                             'readonly' => true,
                         ],
                     ]) ?>
-                    <?= $form->field($model, "[$i]dst_id")->widget(TrashDestinationCombo::class, [
-                        'pluginOptions' => [
-                            'select2Options' => ['tags' => false],
-                        ],
-                    ]) ?>
+                    <?= $form->field($model, "[$i]dst_id")->widget(TrashDestinationDropDownList::class) ?>
                 </div>
                 <div class="col-md-6">
                     <?= $form->field($model, "[$i]serial")->textInput(['readonly' => true]) ?>

src/widgets/DisposalField.php

@@ -3,7 +3,7 @@
 namespace hipanel\modules\stock\widgets;
 
 use hipanel\modules\stock\models\Part;
-use hipanel\modules\stock\repositories\DisposalRepository;
+use hipanel\modules\stock\repositories\LocationRepository;
 use Yii;
 use yii\base\Widget;
 use yii\helpers\Html;
@@ -17,7 +17,7 @@ class DisposalField extends Widget
     public string $attribute;
     private array $disposalList;
 
-    public function __construct(DisposalRepository $disposalRepository, $config = [])
+    public function __construct(LocationRepository $disposalRepository, $config = [])
     {
         parent::__construct($config);
         $this->disposalList = $disposalRepository->findForLocation($this->model?->device_location);

src/widgets/combo/TrashDestinationDropDownList.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace hipanel\modules\stock\widgets\combo;
+
+use hipanel\modules\stock\repositories\LocationRepository;
+use yii\helpers\Html;
+use yii\widgets\InputWidget;
+
+class TrashDestinationDropDownList extends InputWidget
+{
+    private array $items;
+
+    public function __construct(LocationRepository $disposalRepository, $config = [])
+    {
+        parent::__construct($config);
+        $this->items = $disposalRepository->findForLocation(null, 'trash') + $disposalRepository->findForLocation(null);
+    }
+
+    public function run()
+    {
+        return Html::activeDropDownList($this->model, $this->attribute, $this->items, array_merge($this->options, ['prompt' => '']));
+    }
+}