Merge branch 'openwisp:master' into feature/828-api-indoor-map-coordinates

Author: dee077

.github/workflows/ci.yml

@@ -74,7 +74,7 @@ jobs:
         sudo apt -qq -y install sqlite3 gdal-bin libproj-dev \
           libgeos-dev libspatialite-dev spatialite-bin \
           libsqlite3-mod-spatialite
-        sudo npm install -g jshint stylelint
+        sudo npm install -g prettier
         pip install -U pip wheel setuptools
         pip install -U -r requirements-test.txt
         pip install -U -e .

.github/workflows/pypi.yml

@@ -29,4 +29,4 @@ jobs:
     - name: Build package
       run: python -m build
     - name: Publish package distributions to PyPI
-      uses: pypa/[email protected].2
+      uses: pypa/[email protected].4

.jshintrc

@@ -6,6 +6,23 @@ Version 1.2.0 [Unreleased]
 
 Work in progress.
 
+Version 1.1.1 [2025-01-31]
+--------------------------
+
+Bugfixes
+~~~~~~~~
+
+- Fixed `recovering deleted device with related location
+  <https://github.com/openwisp/openwisp-controller/issues/936>`__.
+- Fixed `deleting device with “deactivating” config status
+  <https://github.com/openwisp/openwisp-controller/issues/949>`__.
+- Fixed `conversion of MAC address to uppercase format
+  <https://github.com/openwisp/openwisp-controller/issues/922>`__ with the
+  openwisp-config agent.
+- Fixed `updating templates with invalid configurations to prevent
+  ValidationError due to cache invalidation mechanism
+  <https://github.com/openwisp/openwisp-controller/pull/948>`__.
+
 Version 1.1.0 [2024-11-22]
 --------------------------
 

.jshintignore .prettierignore

@@ -1,8 +1,8 @@
 openwisp-controller
 ===================
 
-.. image:: https://github.com/openwisp/openwisp-controller/workflows/OpenWISP%20Controller%20CI%20Build/badge.svg?branch=master
-    :target: https://github.com/openwisp/openwisp-controller/actions?query=workflow%3A%22OpenWISP+Controller+CI+Build%22
+.. image:: https://github.com/openwisp/openwisp-controller/actions/workflows/ci.yml/badge.svg
+    :target: https://github.com/openwisp/openwisp-controller/actions/workflows/ci.yml
     :alt: CI build status
 
 .. image:: https://coveralls.io/repos/openwisp/openwisp-controller/badge.svg

.stylelintrc.json

@@ -64,7 +64,7 @@ Install development dependencies:
 
     pip install -e .
     pip install -r requirements-test.txt
-    sudo npm install -g jshint stylelint
+    sudo npm install -g prettier
 
 Install WebDriver for Chromium for your browser version from
 https://chromedriver.chromium.org/home and Extract ``chromedriver`` to one

CHANGES.rst

@@ -36,3 +36,11 @@ scheduled to be removed from the device.
 The device has been deactivated. The configuration applied through
 OpenWISP has been removed, and any other operation to manage the device
 will be prevented or rejected.
+
+.. note::
+
+    If a device becomes unreachable (e.g., lost, stolen, or
+    decommissioned) before it can be properly deactivated, you can still
+    force the deletion from OpenWISP by hitting the delete button in the
+    device detail page after having deactivated the device or by using the
+    bulk delete action from the device list page.

README.rst

@@ -1,11 +1,13 @@
 import json
 import logging
+from collections.abc import Iterable
 
 import reversion
 from django import forms
 from django.conf import settings
 from django.contrib import admin, messages
 from django.contrib.admin import helpers
+from django.contrib.admin.actions import delete_selected
 from django.contrib.admin.models import ADDITION, LogEntry
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import (
@@ -566,8 +568,6 @@ def has_delete_permission(self, request, obj=None):
         perm = super().has_delete_permission(request)
         if not obj:
             return perm
-        if obj._has_config():
-            perm = perm and obj.config.is_deactivated()
         return perm and obj.is_deactivated()
 
     def save_form(self, request, form, change):
@@ -765,22 +765,42 @@ def deactivate_device(self, request, queryset):
     def activate_device(self, request, queryset):
         self._change_device_status(request, queryset, 'activate')
 
-    def get_deleted_objects(self, objs, request, *args, **kwargs):
-        # Ensure that all selected devices can be deleted, i.e.
-        # the device should be flagged as deactivated and if it has
-        # a config object, it's status should be "deactivated".
-        active_devices = []
-        for obj in objs:
-            if not self.has_delete_permission(request, obj):
-                active_devices.append(obj)
-        if active_devices:
-            return (
-                active_devices,
-                {self.model._meta.verbose_name_plural: len(active_devices)},
-                ['active_devices'],
-                [],
+    @admin.action(description=delete_selected.short_description, permissions=['delete'])
+    def delete_selected(self, request, queryset):
+        response = delete_selected(self, request, queryset)
+        if not response:
+            return response
+        if 'active_devices' in response.context_data.get('perms_lacking', {}):
+            active_devices = []
+            for device in queryset.iterator():
+                if not device.is_deactivated() or (
+                    device._has_config() and not device.config.is_deactivated()
+                ):
+                    active_devices.append(self._get_device_path(device))
+            response.context_data.update(
+                {
+                    'active_devices': active_devices,
+                    'perms_lacking': set(),
+                    'title': _('Are you sure?'),
+                }
             )
-        return super().get_deleted_objects(objs, request, *args, **kwargs)
+        return response
+
+    def get_deleted_objects(self, objs, request, *args, **kwargs):
+        to_delete, model_count, perms_needed, protected = super().get_deleted_objects(
+            objs, request, *args, **kwargs
+        )
+        if (
+            isinstance(perms_needed, Iterable)
+            and len(perms_needed) == 1
+            and list(perms_needed)[0] == self.model._meta.verbose_name
+            and objs.filter(_is_deactivated=False).exists()
+        ):
+            if request.POST.get("post"):
+                perms_needed = set()
+            else:
+                perms_needed = {'active_devices'}
+        return to_delete, model_count, perms_needed, protected
 
     def get_fields(self, request, obj=None):
         """
@@ -900,6 +920,17 @@ def recover_view(self, request, version_id, extra_context=None):
         request._recover_view = True
         return super().recover_view(request, version_id, extra_context)
 
+    def delete_view(self, request, object_id, extra_context=None):
+        extra_context = extra_context or {}
+        obj = self.get_object(request, object_id)
+        if obj and obj._has_config() and not obj.config.is_deactivated():
+            extra_context['deactivating_warning'] = True
+        return super().delete_view(request, object_id, extra_context)
+
+    def delete_model(self, request, obj):
+        force_delete = request.POST.get('force_delete') == 'true'
+        obj.delete(check_deactivated=not force_delete)
+
     def get_inlines(self, request, obj):
         inlines = super().get_inlines(request, obj)
         # this only makes sense in existing devices

docs/developer/installation.rst

@@ -107,6 +107,10 @@ class DeviceDetailView(ProtectedAPIMixin, RetrieveUpdateDestroyAPIView):
     queryset = Device.objects.select_related('config', 'group', 'organization')
     permission_classes = ProtectedAPIMixin.permission_classes + (DevicePermission,)
 
+    def perform_destroy(self, instance):
+        force_deletion = self.request.query_params.get('force', None) == 'true'
+        instance.delete(check_deactivated=(not force_deletion))
+
 
 class DeviceActivateView(ProtectedAPIMixin, GenericAPIView):
     serializer_class = serializers.Serializer

docs/user/device-config-status.rst

@@ -0,0 +1,11 @@
+#deactivating-warning .warning p {
+  margin-top: 0px;
+}
+#main ul.messagelist li.warning ul li {
+  display: list-item;
+  padding: 0px;
+  background: inherit;
+}
+ul.messagelist li {
+  font-size: unset;
+}