django-fast-treenode 3.0.7__py3-none-any.whl → 3.2.0__py3-none-any.whl

treenode/static/treenode/js/treenode_admin.js

@@ -0,0 +1,322 @@
+/**
+ * treenode_admin.js
+ *
+ * Cleaned version 3.1.0 — TreeNode Admin extension for Django Admin.
+ * - No AJAX loading of children
+ * - No persistence in localStorage
+ * - Local-only expand/collapse logic
+ * - Compatible with pre-rendered full tree
+ *
+ * Version: 3.1.0
+ * Author: Timur Kady
+ * Email: timurkady@yandex.com
+ */
+
+(function($) {
+
+  // ------------------------------- //
+  // Helpers                        //
+  // ------------------------------- //
+
+  function getCookie(name) {
+    let cookieValue = null;
+    if (document.cookie && document.cookie !== '') {
+      const cookies = document.cookie.split(';');
+      for (let i = 0; i < cookies.length; i++) {
+        const cookie = cookies[i].trim();
+        if (cookie.startsWith(name + '=')) {
+          cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+          break;
+        }
+      }
+    }
+    return cookieValue;
+  }
+
+  // ------------------------------- //
+  // AJAX Setup                     //
+  // ------------------------------- //
+
+  const csrftoken = getCookie('csrftoken');
+
+  $.ajaxSetup({
+    beforeSend: function(xhr, settings) {
+      if (!/^https?:.*/.test(settings.url)) {
+        xhr.setRequestHeader("X-CSRFToken", csrftoken);
+      }
+      $('body').css('cursor', 'wait');
+    },
+    complete: function() {
+      $('body').css('cursor', 'default');
+    },
+    cache: false
+  });
+
+  // ------------------------------- //
+  // Visual feedback                 //
+  // ------------------------------- //
+
+  const TreeFx = {
+    flashInsert(nodeId) {
+      const $row = $(`tr[data-node-id="${nodeId}"]`);
+      if (!$row.length) return;
+
+      $row.addClass("flash-insert");
+      setTimeout(() => $row.removeClass("flash-insert"), 1000);
+    },
+
+    markDragging($item, enable) {
+      $item.toggleClass('dragging', enable);
+    }
+  };
+
+  // ------------------------------- //
+  // Tree logic                      //
+  // ------------------------------- //
+
+  var ChangeList = {
+    $tableBody: null,
+    isShiftPressed: false,
+    activeTargetRow: null,
+    isMoving: false,
+
+    init: function() {
+      this.$tableBody = $('table#result_list tbody');
+      this.bindEvents();
+      this.enableDragAndDrop();
+    },
+    
+    // Save expanded nodes to localStorage
+    saveTree: function() {
+      if (!this.$tableBody) return;
+    
+      // Сохраняем ТОЛЬКО те node_id, которые раскрыты
+      this.expandedNodes = this.$tableBody.find(".treenode-toggle").map(function() {
+        const $btn = $(this);
+        return $btn.data("expanded") ? $btn.data("node-id") : null;
+      }).get().filter(Boolean);
+    
+      if (this.expandedNodes.length === 0) {
+        localStorage.removeItem("treenode_expanded");
+      } else {
+        localStorage.setItem("treenode_expanded", JSON.stringify(this.expandedNodes));
+      }
+    
+      const count = $("#result_list tbody tr").length;
+      if (count > 0) {
+        $("p.paginator").first().text(`${count} ${ChangeList.label}`);
+        localStorage.setItem("label", ChangeList.label);
+      }
+    },
+
+    
+    // Restore expanded nodes from localStorage
+    restoreTreeState: function() {
+      const expanded = JSON.parse(localStorage.getItem("treenode_expanded") || "[]");
+      for (const nodeId of expanded) {
+        ChangeList.expandNode(nodeId);
+      }
+    },
+
+    expandNode: function(nodeId) {
+      const $row = this.$tableBody.find(`tr[data-node-id="${nodeId}"]`);
+      const $btn = $row.find(".treenode-toggle");
+      $btn.text("▼").data("expanded", true);
+      this.showChildren(nodeId);
+      this.saveTree();
+    },
+
+    collapseNode: function(nodeId) {
+      const $row = this.$tableBody.find(`tr[data-node-id="${nodeId}"]`);
+      const $btn = $row.find(".treenode-toggle");
+      $btn.text("►").data("expanded", false);  // <-- ВАЖНО!
+      this.hideChildrenRecursive(nodeId);
+      this.saveTree();
+    },
+
+    toggleNode: function($btn) {
+      const nodeId = $btn.data("node-id");
+      const isExpanded = $btn.data("expanded");
+      if (isExpanded) {
+        this.collapseNode(nodeId);
+      } else {
+        this.expandNode(nodeId);
+      }
+    },
+
+    showChildren: function(parentId) {
+      const $children = this.$tableBody.find(`tr[data-parent-id="${parentId}"]`);
+      $children.removeClass("treenode-hidden");
+
+      $children.each((_, child) => {
+        const $child = $(child);
+        const childId = $child.data("node-id");
+        const $toggle = $child.find(".treenode-toggle");
+        if ($toggle.data("expanded")) {
+          this.showChildren(childId);
+        }
+      });
+    },
+
+    hideChildrenRecursive: function(parentId) {
+      const $children = this.$tableBody.find(`tr[data-parent-id="${parentId}"]`);
+      $children.addClass("treenode-hidden");
+
+      $children.each((_, child) => {
+        const childId = $(child).data("node-id");
+        this.hideChildrenRecursive(childId);
+      });
+    },
+
+    expandAll: function() {
+      const self = this;
+      this.$tableBody.find("button.treenode-toggle").each(function() {
+        self.expandNode($(this).data("node-id"));
+      });
+    },
+
+    collapseAll: function() {
+      const self = this;
+      this.$tableBody.find("button.treenode-toggle").each(function() {
+        self.collapseNode($(this).data("node-id"));
+      });
+    },
+
+    bindEvents: function() {
+      const self = this;
+
+      $(document).on("click", "button.treenode-toggle", function(e) {
+        e.preventDefault();
+        self.toggleNode($(this));
+      });
+
+      $(document).on("click", ".treenode-expand-all", function() {
+        self.expandAll();
+      });
+
+      $(document).on("click", ".treenode-collapse-all", function() {
+        self.collapseAll();
+      });
+
+      $(document).on("keydown", function(e) {
+        if (e.key === "Shift") {
+          self.isShiftPressed = true;
+          self.updateDndHighlight();
+        }
+      }).on("keyup", function(e) {
+        if (e.key === "Shift") {
+          self.isShiftPressed = false;
+          self.updateDndHighlight();
+        }
+      });
+
+      $('#result_list').on('change', '#action-toggle', function() {
+        $('input.action-select').prop('checked', this.checked);
+      });
+    },
+
+    enableDragAndDrop: function() {
+      const self = this;
+
+      this.$tableBody.sortable({
+        items: "tr",
+        handle: ".treenode-drag-handle",
+        placeholder: "treenode-placeholder",
+        helper: function(e, tr) {
+          const $originals = tr.children();
+          const $helper = tr.clone();
+          $helper.find('[id]').removeAttr('id');
+          $helper.children().each(function(index) {
+            $(this).width($originals.eq(index).width());
+          });
+          return $helper;
+        },
+        start: function(e, ui) {
+          TreeFx.markDragging(ui.item, true);
+        },
+        over: function(e, ui) {
+          self.updateDndHighlight();
+        },
+        stop: function(e, ui) {
+          TreeFx.markDragging(ui.item, false);
+          const $item = ui.item;
+          const nodeId = $item.data("node-id");
+          const prevId = $item.prev().data("node-id") || null;
+          const mode = self.isShiftPressed ? 'child' : 'after';
+
+          if (self.activeTargetRow) {
+            self.activeTargetRow.removeClass("target-as-child");
+            self.activeTargetRow = null;
+          }
+
+          self.applyMove(nodeId, prevId, mode);
+          TreeFx.flashInsert(nodeId);
+        },
+      });
+    },
+
+    updateDndHighlight: function() {
+      const $placeholder = this.$tableBody.find("tr.treenode-placeholder");
+      const $target = $placeholder.prev();
+
+      if (!$target.length || !$target.data("node-id")) {
+        this.$tableBody.find("tr.target-as-child").removeClass("target-as-child");
+        this.activeTargetRow = null;
+        return;
+      }
+
+      if (this.isShiftPressed) {
+        if (!this.activeTargetRow || !this.activeTargetRow.is($target)) {
+          this.$tableBody.find("tr.target-as-child").removeClass("target-as-child");
+          $target.addClass("target-as-child");
+          this.activeTargetRow = $target;
+        }
+      } else {
+        if (this.activeTargetRow) {
+          this.activeTargetRow.removeClass("target-as-child");
+          this.activeTargetRow = null;
+        }
+      }
+    },
+
+    applyMove: function(nodeId, targetId, mode) {
+      if (this.isMoving) return;
+
+      this.isMoving = true;
+      this.activeTargetRow = null;
+
+      const params = {
+        node_id: nodeId,
+        target_id: targetId,
+        mode: mode
+      };
+
+      $.ajax({
+        url: 'move/',
+        method: 'POST',
+        data: params,
+        dataType: 'json',
+        success: function(data) {
+          const msg = data.message || "Node moved successfully.";
+          $("<li class='success'>" + msg + "</li>").appendTo(".messagelist");
+        },
+        error: function(xhr, status, error) {
+          const fallback = "Error moving node.";
+          $("<li class='error'>" + (xhr.responseText || fallback) + "</li>").appendTo(".messagelist");
+        },
+        complete: function() {
+          ChangeList.isMoving = false;
+          location.reload();
+        }
+      });
+    }
+  };
+
+  $(document).ready(function () {
+    if ($("table#result_list").length) {
+      ChangeList.init();
+      ChangeList.restoreTreeState();
+    }
+  });
+
+})(django.jQuery || window.jQuery);

treenode/templates/treenode/admin/treenode_changelist.html

@@ -2,24 +2,70 @@
 {% load admin_list %}
 {% load i18n %}
 {% load treenode_admin %}
+{% load static %}
 
-{% block object-tools-items %}
-    {{ block.super }}
-    {% if import_export_enabled %}
-        <li><a href="import/" class="button">Import</a></li>
-        <li><a href="export/" class="button">Export</a></li>
+{% block content %}
+
+  {% block object-tools %}
+    {% if has_add_permission %}
+      <ul class="object-tools">
+        {% block object-tools-items %}
+          {{ block.super }}
+          <li><a href="import/" class="button">Import</a></li>
+          <li><a href="export/" class="button">Export</a></li>
+        {% endblock %}
+      </ul>
     {% endif %}
-{% endblock %}
+  {% endblock %}
+  
+  <div id="changelist" class="module filtered">
+    <div class="changelist-form-container">
+
+      {# Search bar + expand/collapse buttons #}
+      {% block search %}
+        <div id="toolbar">
+          <form id="changelist-search" method="get" role="search">
+            <label for="searchbar">
+              <img src="{% static 'admin/img/search.svg' %}" alt="{% translate 'Search' %}">
+            </label>
+            <input type="text" size="40" name="q" value="{{ cl.query }}" id="searchbar">
+            <input type="submit" value="{% translate 'Search' %}">
+            <button type="button" class="button treenode-button treenode-expand-all">
+              {% trans "Expand All" %}
+            </button>
+            <button type="button" class="button treenode-button treenode-collapse-all">
+              {% trans "Collapse All" %}
+            </button>
+          </form>
+        </div>
+      {% endblock %}
+
+      {# Form with list and actions #}
+      <form id="changelist-form" method="post" {% if cl.formset or action_form %} enctype="multipart/form-data"{% endif %}>
+        {% csrf_token %}
 
-{% block result_list %}
-  {% if action_form and actions_on_top and cl.show_admin_actions %}
-    {% admin_actions %}
-  {% endif %}
+        {% if action_form and actions_on_top and cl.show_admin_actions %}
+          {% admin_actions %}
+        {% endif %}
 
-  {% tree_result_list cl %}
+        {% block result_list %}
+          {% tree_result_list cl %}
+        {% endblock %}
 
-  {% if action_form and actions_on_bottom and cl.show_admin_actions %}
-    {% admin_actions %}
-  {% endif %}
+        {% if action_form and actions_on_bottom and cl.show_admin_actions %}
+          {% admin_actions %}
+        {% endif %}
+
+        {% block pagination %}
+          {{ block.super }}
+        {% endblock %}
+      </form>
+    </div>
+
+    {# 📎 Боковая панель фильтров #}
+    {% block filters %}
+      {{ block.super }}
+    {% endblock %}
+  </div>
+{% endblock %}
 
-{% endblock %}

treenode/templates/treenode/admin/treenode_import_export.html

@@ -3,8 +3,9 @@
 
 {% block extrastyle %}
   {{ block.super }}
-  <link rel="stylesheet" href="{% static 'admin/css/forms.css' %}">
-  <link rel="stylesheet" href="{% static 'css/treenode_tabs.css' %}">
+  {# Load built-in admin form styles #}
+  <link rel="stylesheet" href="{% static '/admin/css/forms.css' %}">
+  <link rel="stylesheet" href="{% static 'treenode/css/treenode_tabs.css' %}">
 {% endblock %}
 
 {% block content %}

treenode/templates/treenode/admin/treenode_rows.html

@@ -2,49 +2,45 @@
 
 <div class="results">
   <table id="result_list">
-
-
-<thead>
-  <tr>
-    {% for h in headers %}
-      <th scope="col"{{ h.class_attrib|safe }}>
-        {% if "action-checkbox-column" in h.class_attrib %}
-          <div class="text">
-            <span>
-              <input type="checkbox" id="action-toggle" aria-label="{% translate 'Select all objects on this page for an action' %}">
-            </span>
-          </div>
-          <div class="clear"></div>
-        {% else %}
-          {% if h.sortable %}
-            <div class="sortoptions">
-              {% if h.url_remove %}
-                <a class="sortremove" href="{{ h.url_remove }}" title="{% translate 'Remove from sorting' %}"></a>
-              {% endif %}
-              {% if h.url_toggle %}
-                <a href="{{ h.url_toggle }}" class="toggle {% if h.ascending %}ascending{% else %}descending{% endif %}" title="{% translate 'Toggle sorting' %}"></a>
-              {% endif %}
-            </div>
-          {% else %}
-            <div class="sortoptions"></div>
-          {% endif %}
-
-          <div class="text">
-            {% if h.sortable %}
-              <a href="{{ h.url_primary }}">{{ h.text|safe }}</a>
+    <thead>
+      <tr>
+        {% for h in headers %}
+          <th scope="col"{{ h.class_attrib|safe }}>
+            {% if "action-checkbox-column" in h.class_attrib %}
+              <div class="text">
+                <span>
+                  <input type="checkbox" id="action-toggle" aria-label="{% translate 'Select all objects on this page for an action' %}">
+                </span>
+              </div>
+              <div class="clear"></div>
             {% else %}
-              <a href="#">{{ h.text|safe }}</a>
+              {% if h.sortable %}
+                <div class="sortoptions">
+                  {% if h.url_remove %}
+                    <a class="sortremove" href="{{ h.url_remove }}" title="{% translate 'Remove from sorting' %}"></a>
+                  {% endif %}
+                  {% if h.url_toggle %}
+                    <a href="{{ h.url_toggle }}" class="toggle {% if h.ascending %}ascending{% else %}descending{% endif %}" title="{% translate 'Toggle sorting' %}"></a>
+                  {% endif %}
+                </div>
+              {% else %}
+                <div class="sortoptions"></div>
+              {% endif %}
+              <div class="text">
+                {% if h.sortable %}
+                  <a href="{{ h.url_primary }}">{{ h.text|safe }}</a>
+                {% else %}
+                  <a href="#">{{ h.text|safe }}</a>
+                {% endif %}
+              </div>
+              <div class="clear"></div>
             {% endif %}
-          </div>
-          <div class="clear"></div>
-        {% endif %}
-      </th>
-    {% endfor %}
-  </tr>
-</thead>
+          </th>
+        {% endfor %}
+      </tr>
+    </thead>
 
-
-    <tbody>
+    <tbody id="treenode-table">
       {% for row in rows %}
         <tr {{ row.attrs|safe }}>
           {% for cell in row.cells %}
@@ -53,5 +49,6 @@
         </tr>
       {% endfor %}
     </tbody>
+
   </table>
 </div>

treenode/templatetags/treenode_admin.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 """
-Custon tags for changelist tamplate.
+Custom tags for changelist template.
 
-Version: 3.0.0
+Version: 3.1.0
 Author: Timur Kady
 Email: timurkady@yandex.com
 """
@@ -10,30 +10,73 @@ Email: timurkady@yandex.com
 
 from django import template
 from django.contrib.admin.templatetags import admin_list
+from django.utils.html import format_html, mark_safe
 
 register = template.Library()
 
 
-@register.inclusion_tag(
-    "treenode/admin/treenode_rows.html",
-    takes_context=True,
-)
+@register.inclusion_tag("treenode/admin/treenode_rows.html", takes_context=True)
 def tree_result_list(context, cl):
-    """
-    Return custom results for change_list.
-
-    Заголовки берём из стандартного admin_list.result_headers(),
-    а строки формируем как угодно.
-    """
+    """Get result list."""
     headers = list(admin_list.result_headers(cl))
 
+    # Add a checkbox title manually if it is missing
+    if cl.actions and not any("action-checkbox-column" in h["class_attrib"] for h in headers):
+        headers.insert(0, {
+            "text": "",
+            "class_attrib": ' class="action-checkbox-column"',
+            "sortable": False
+        })
+
     rows = []
+
     for obj in cl.result_list:
         cells = list(admin_list.items_for_result(cl, obj, None))
+
+        # Insert checkbox manually
+        checkbox = format_html(
+            '<td class="action-checkbox">'
+            '<input type="checkbox" name="_selected_action" value="{}" class="action-select" /></td>',
+            obj.pk
+        )
+        cells.insert(0, checkbox)
+
+        # Replace the toggle cell (3rd after inserting checkbox and move)
+        is_leaf = getattr(obj, "is_leaf", lambda: True)()
+        toggle_html = format_html(
+            '<td class="field-toggle">{}</td>',
+            format_html(
+                '<button class="treenode-toggle" data-node-id="{}">►</button>',
+                obj.pk
+            ) if not is_leaf else mark_safe('<div class="treenode-space">&nbsp;</div>')
+        )
+        if len(cells) >= 3:
+            cells.pop(2)
+        cells.insert(2, toggle_html)
+
+        depth = getattr(obj, "get_depth", lambda: 0)()
+        parent_id = getattr(obj, "parent_id", "")
+        is_root = not parent_id
+
+        classes = ["treenode-row"]
+        if is_root:
+            classes.append("treenode-root")
+        else:
+            classes.append("treenode-hidden")
+
+        row_attrs = {
+            "class": " ".join(classes),
+            "data-node-id": obj.pk,
+            "data-parent-id": parent_id or "",
+            "data-depth": depth,
+        }
+
         rows.append({
-            "attrs": getattr(obj, "row_attrs", ""),
+            "attrs": " ".join(f'{k}="{v}"' for k, v in row_attrs.items()),
             "cells": cells,
-            "form": None,   # поддержка list_editable, если нужно
+            "form": None,
+            "is_leaf": is_leaf,
+            "node_id": obj.pk,
         })
 
     return {

treenode/utils/jwt_auth.py

@@ -0,0 +1,25 @@
+import jwt
+from functools import wraps
+
+from django.conf import settings
+from django.http import JsonResponse
+
+
+def jwt_required(view_func):
+    """Ensure that request has valid JWT token."""
+
+    @wraps(view_func)
+    def _wrapped(request, *args, **kwargs):
+        auth_header = request.META.get("HTTP_AUTHORIZATION", "")
+        if not auth_header.startswith("Bearer "):
+            return JsonResponse({"detail": "Authorization header missing"}, status=401)
+        token = auth_header.split(" ", 1)[1]
+        try:
+            payload = jwt.decode(token, settings.SECRET_KEY, algorithms=["HS256"])
+        except jwt.PyJWTError:
+            return JsonResponse({"detail": "Invalid token"}, status=401)
+        request.jwt_payload = payload
+        return view_func(request, *args, **kwargs)
+
+    return _wrapped
+  

treenode/version.py

@@ -4,9 +4,9 @@ TreeNode Version Module
 
 This module defines the current version of the TreeNode package.
 
-Version: 3.0.7
+Version: 3.2.0
 Author: Timur Kady
 Email: timurkady@yandex.com
 """
 
-__version__ = '3.0.7'
+__version__ = '3.2.0'

treenode/views/autoapi.py

@@ -14,10 +14,12 @@ from django.conf import settings
 from django.contrib.auth.decorators import login_required
 
 from ..models import TreeNodeModel
+from ..settings import API_USE_JWT
+from ..utils.jwt_auth import jwt_required
 from .autocomplete import TreeNodeAutocompleteView
 from .children import TreeChildrenView
-from .search import TreeSearchView
 from .crud import TreeNodeBaseAPIView
+from .search import TreeSearchView
 
 
 class AutoTreeAPI:
@@ -35,6 +37,8 @@ class AutoTreeAPI:
         Protects view with login_required if needed, based on model attribute
         or global settings.
         """
+        if API_USE_JWT:
+            return jwt_required(view)
         if getattr(model, 'api_login_required', None) is True:
             return login_required(view)
         if getattr(settings, 'TREENODE_API_LOGIN_REQUIRED', False):