Edit static device groups from device (librenms#18240)

Author: murrant

app/Http/Controllers/Device/EditDeviceController.php

@@ -30,6 +30,7 @@
 use App\Facades\Rrd;
 use App\Http\Requests\UpdateDeviceRequest;
 use App\Models\Device;
+use App\Models\DeviceGroup;
 use App\Models\PollerGroup;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
@@ -65,12 +66,17 @@ public function index(Device $device): View
         });
         $exclusive_schedule_id = $exclusiveSchedules->count() === 1 ? $exclusiveSchedules->first()->schedule_id : 0;
 
+        [$static_show, $static_groups] = DeviceGroup::where('type', 'static')->exists()
+            ? [true, $device->groups()->where('type', 'static')->pluck('name', 'id')]
+            : [false, []];
+
         return view('device.edit.device', [
             'device' => $device,
+            'show_static_groups' => $static_show,
+            'static_groups' => $static_groups,
             'types' => $types,
             'default_type' => LibrenmsConfig::getOsSetting($device->os, 'type'),
-            'parents' => $device->parents()->pluck('device_id'),
-            'devices' => Device::orderBy('hostname')->whereNot('device_id', $device->device_id)->select(['device_id', 'hostname', 'sysName'])->get(),
+            'parents' => $device->parents()->pluck('hostname', 'device_id'),
             'poller_groups' => PollerGroup::orderBy('group_name')->pluck('group_name', 'id'),
             'default_poller_group' => LibrenmsConfig::get('distributed_poller_group'),
             'override_sysContact_bool' => $device->getAttrib('override_sysContact_bool'),
@@ -89,6 +95,10 @@ public function update(UpdateDeviceRequest $request, Device $device): RedirectRe
 
         $device->parents()->sync($request->get('parent_id', [])); // TODO avoid loops!
 
+        // sync groups without removing dynamic groups
+        $dynamic_groups = $device->groups()->where('type', 'dynamic')->pluck('id')->toArray();
+        $device->groups()->sync(array_merge($dynamic_groups, $request->get('static_groups', [])));
+
         // handle sysLocation update
         if ($device->override_sysLocation) {
             $device->setLocation($request->get('sysLocation'), true, true);

app/Http/Controllers/Select/DeviceController.php

@@ -38,6 +38,7 @@ protected function rules()
             'access' => 'nullable|in:normal,inverted',
             'user' => 'nullable|int',
             'id' => 'nullable|in:device_id,hostname',
+            'exclude' => 'nullable|int',
         ];
     }
 
@@ -54,7 +55,7 @@ protected function baseQuery($request)
         // list devices the user does not have access to
         if ($request->get('access') == 'inverted' && $user_id && $request->user()->isAdmin()) {
             return Device::query()
-                ->select('device_id', 'hostname', 'sysName', 'display', 'icon')
+                ->select(['device_id', 'hostname', 'sysName', 'display', 'icon'])
                 ->whereNotIn('device_id', function ($query) use ($user_id) {
                     $query->select('device_id')
                         ->from('devices_perms')
@@ -64,7 +65,8 @@ protected function baseQuery($request)
         }
 
         return Device::hasAccess($request->user())
-            ->select('device_id', 'hostname', 'sysName', 'display', 'icon')
+            ->when($request->get('exclude'), fn ($query, $exclude) => $query->where('device_id', '!=', $exclude))
+            ->select(['device_id', 'hostname', 'sysName', 'display', 'icon'])
             ->orderBy('hostname');
     }
 

lang/en/device.php

@@ -34,6 +34,7 @@
 
         'description' => 'Description',
         'type' => 'Type',
+        'static_groups' => 'Static Groups',
 
         'override_sysLocation' => 'Override sysLocation',
         'coordinates_title' => 'To set coordinates, include [latitude,longitude]',

resources/views/device/edit/device.blade.php

@@ -79,6 +79,19 @@ class="btn btn-primary" name="rediscover" title="{{ __('device.edit.rediscover_t
                 </div>
             </div>
 
+            @if($show_static_groups)
+            <div class="form-group">
+                <label for="static_groups" class="col-sm-2 control-label">{{ __('device.edit.static_groups') }}</label>
+                <div class="col-sm-6">
+                    <select id="static_groups" name="static_groups[]" class="form-control" multiple style="width: 100%">
+                        @foreach($static_groups as $group_id => $group_name)
+                            <option value="{{ $group_id }}" selected>{{ $group_name }}</option>
+                        @endforeach
+                    </select>
+                </div>
+            </div>
+            @endif
+
             <div class="form-group">
                 <label for="sysLocation" class="col-sm-2 control-label">{{ __('device.edit.override_sysLocation') }}</label>
                 <div class="col-sm-6">
@@ -123,11 +136,8 @@ class="btn btn-primary" name="rediscover" title="{{ __('device.edit.rediscover_t
                 <label for="parent_id" class="col-sm-2 control-label">{{ __('device.edit.depends_on') }}</label>
                 <div class="col-sm-6">
                     <select multiple name="parent_id[]" id="parent_id" class="form-control" style="width: 100%">
-                        <option value="0" {{ empty($parents) ? 'selected' : '' }}>{{ __('device.edit.none') }}</option>
-                        @foreach ($devices as $dev)
-                            <option value="{{ $dev->device_id }}" {{ $parents->contains($dev->device_id) ? 'selected' : '' }}>
-                                {{ $dev->hostname }} ({{ $dev->sysName }})
-                            </option>
+                        @foreach ($parents as $parent_id => $parent_hostname)
+                            <option value="{{  $parent_id }}" selected>{{ $parent_hostname }}</option>
                         @endforeach
                     </select>
                 </div>
@@ -220,6 +230,8 @@ class="btn btn-primary" name="rediscover" title="{{ __('device.edit.rediscover_t
 
 @push('scripts')
     <script>
+        init_select2('#parent_id', 'device', {exclude: {{ $device->device_id }}}, null, '{{ __('device.edit.none') }}');
+        init_select2('#static_groups', 'device-group', {type: 'static'}, null, '{{ __('device.edit.none') }}');
         const defaultType = '{{ $default_type }}';
         function templateTypeSelection(option) {
             if (!option.id) { // placeholder
@@ -281,9 +293,6 @@ class: `fa-solid fa-${iconClass} fa-fw fa-lg`
         function toggleHostnameEdit() {
             document.getElementById('edit-hostname-input').disabled = ! document.getElementById('edit-hostname-input').disabled;
         }
-        $('#parent_id').select2({
-            width: 'resolve'
-        });
     </script>
     @vuei18n
 @endpush