django-spire 0.16.4__py3-none-any.whl → 0.16.6__py3-none-any.whl

django_spire/knowledge/collection/services/transformation_service.py

@@ -4,25 +4,39 @@ import json
 
 from django.conf import settings
 from django.contrib.sites.models import Site
-from django.db.models import QuerySet, Prefetch
+from django.db.models import Prefetch
 from django.urls import reverse
 
+from django_spire.auth.controller.controller import AppAuthController
 from django_spire.contrib.service import BaseDjangoModelService
 
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from django.contrib.auth.models import User
+    from django.core.handlers.wsgi import WSGIRequest
     from django_spire.knowledge.collection.models import Collection
 
 
 class CollectionTransformationService(BaseDjangoModelService['Collection']):
     obj: Collection
 
-    @staticmethod
-    def to_hierarchy_json(queryset: QuerySet[Collection], user: User) -> str:
+    def to_hierarchy_json(self, request: WSGIRequest) -> str:
+        user = request.user
+
+        collections = (
+            self.obj_class.objects
+            .active()
+            .select_related('parent')
+        )
+
+        if not (
+                user.is_superuser or
+                AppAuthController('knowledge', request).can_access_all_collections()
+        ):
+            collections = collections.user_has_access(user=user)
+
         entry_queryset = (
-            queryset.model._meta.fields_map.get('entry')
+            collections.model._meta.fields_map.get('entry')
             .related_model
             .objects
             .active()
@@ -33,7 +47,7 @@ class CollectionTransformationService(BaseDjangoModelService['Collection']):
         )
 
         collections = list(
-            queryset.prefetch_related(Prefetch('entries', queryset=entry_queryset))
+            collections.prefetch_related(Prefetch('entries', queryset=entry_queryset))
             .active()
             .order_by('order')
         )
@@ -44,7 +58,7 @@ class CollectionTransformationService(BaseDjangoModelService['Collection']):
 
         tree = []
         for collection in collections:
-            if collection.parent_id:
+            if collection.parent_id and collection.parent_id in collection_map:
                 collection_map[collection.parent_id]['children'].append(
                     collection_map[collection.pk]
                 )
@@ -74,6 +88,14 @@ class CollectionTransformationService(BaseDjangoModelService['Collection']):
                     )
                 }
             ''',
+            'edit_url': f'''
+                {site}{
+                    reverse(
+                        'django_spire:knowledge:collection:form:update',
+                        kwargs={'pk': self.obj.pk},
+                    )
+                }
+            ''',
             'create_entry_url': f'''
                 {site}{
                     reverse(

django_spire/knowledge/collection/tests/test_services/test_transformation_service.py

@@ -2,6 +2,7 @@ import json
 
 from django.contrib.sites.models import Site
 from django.conf import settings
+from django.test import RequestFactory
 
 from django_spire.core.tests.test_cases import BaseTestCase
 from django_spire.knowledge.collection.models import Collection
@@ -29,9 +30,10 @@ class TestCollectionTransformationService(BaseTestCase):
         self.test_collection_2 = Collection.objects.create(name='Parent A1', id=2, parent_id=1)
         self.test_collection_3 = Collection.objects.create(name='Child A1a', id=3, parent_id=2)
 
+        request = RequestFactory().get('/')
+        request.user = self.super_user
         family_tree = Collection.services.transformation.to_hierarchy_json(
-            queryset=Collection.objects.all().select_related('parent'),
-            user=self.super_user
+            request=request
         )
 
         for collection_json in json.loads(family_tree):

django_spire/knowledge/collection/views/form_views.py

@@ -8,10 +8,11 @@ from django.http import HttpResponseRedirect
 from django.urls import reverse
 
 from django_spire.auth.controller.controller import AppAuthController
+from django_spire.auth.group.models import AuthGroup
 from django_spire.contrib.form.utils import show_form_errors
 from django_spire.contrib.generic_views import portal_views
 from django_spire.core.shortcuts import get_object_or_null_obj
-from django_spire.knowledge.collection.models import Collection
+from django_spire.knowledge.collection.models import Collection, CollectionGroup
 from django_spire.knowledge.collection.forms import CollectionForm
 
 if TYPE_CHECKING:
@@ -30,7 +31,13 @@ def form_view(
     dg.glue_query_set(
         request,
         unique_name='collections',
-        target=Collection.objects.active(),
+        target=Collection.objects.active().user_has_access(request.user),
+        fields=['name']
+    )
+    dg.glue_query_set(
+        request,
+        unique_name='group_query_set',
+        target=AuthGroup.objects.all(),
         fields=['name']
     )
 
@@ -38,7 +45,13 @@ def form_view(
         form = CollectionForm(request.POST, instance=collection)
 
         if form.is_valid():
-            _, _ = collection.services.save_model_obj(**form.cleaned_data)
+            collection, _ = collection.services.save_model_obj(**form.cleaned_data)
+
+            _ = CollectionGroup.services.factory.replace_groups(
+                request=request,
+                group_pks=dict(request.POST).get('groups'),
+                collection=collection,
+            )
 
             return HttpResponseRedirect(
                 reverse('django_spire:knowledge:collection:page:list')
@@ -53,7 +66,10 @@ def form_view(
         form=form,
         obj=collection,
         context_data={
-            'collection': collection
+            'collection': collection,
+            'group_ids': list(
+                collection.groups.all().values_list('auth_group_id', flat=True)
+            ) if collection.id else [],
         },
         template='django_spire/knowledge/collection/page/form_page.html'
     )

django_spire/knowledge/context_processors.py

@@ -11,7 +11,6 @@ def django_spire_knowledge(request: WSGIRequest) -> dict[str, Any]:
 
     return {
         'collection_tree_json': Collection.services.transformation.to_hierarchy_json(
-            queryset=Collection.objects.all().select_related('parent').order_by('name'),
-            user=request.user,
+            request=request,
         )
     }

django_spire/knowledge/migrations/0004_alter_collection_options_collectiongroup.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.2.6 on 2025-09-23 14:11
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_spire_auth_group', '0001_initial'),
+        ('django_spire_knowledge', '0003_alter_collection_order_alter_entry_order_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='collection',
+            options={'permissions': [('can_access_all_collections', 'Can Access All Collections'), ('can_change_collection_groups', 'Can Change Collection Groups')], 'verbose_name': 'Collection', 'verbose_name_plural': 'Collections'},
+        ),
+        migrations.CreateModel(
+            name='CollectionGroup',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('auth_group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='collection_groups', related_query_name='collection_group', to='django_spire_auth_group.authgroup')),
+                ('collection', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='groups', related_query_name='group', to='django_spire_knowledge.collection')),
+            ],
+        ),
+    ]

django_spire/knowledge/static/django_spire/knowledge/collection/js/managers.js

@@ -28,27 +28,29 @@ class Entry {
 
 class Collection {
     constructor({
-        children = [],
-        create_entry_url = '',
-        delete_url = '',
-        description = '',
-        entries = [],
         id = -1,
-        import_entry_url = '',
         name = 'None',
+        description = '',
         order = 0,
         parent = null,
+        children = [],
+        entries = [],
+        delete_url = '',
+        edit_url = '',
+        create_entry_url = '',
+        import_entry_url = '',
     }) {
-        this.children = children
-        this.create_entry_url = create_entry_url
-        this.delete_url = delete_url
-        this.description = description
-        this.entries = entries
         this.id = id
-        this.import_entry_url = import_entry_url
         this.name = name
+        this.description = description
         this.order = order
         this.parent = parent
+        this.children = children
+        this.entries = entries
+        this.delete_url = delete_url
+        this.edit_url = edit_url
+        this.create_entry_url = create_entry_url
+        this.import_entry_url = import_entry_url
         this.show_details = false
     }
 
@@ -107,9 +109,10 @@ class CollectionManager {
                 parent: new Collection({}),
                 children: this._create_tree_structure({collections: collection.children}),
                 entries: this._create_entries({entries_json: collection.entries}),
+                delete_url: collection.delete_url,
+                edit_url: collection.edit_url,
                 create_entry_url: collection.create_entry_url,
-                import_entry_url: collection.import_entry_url,
-                delete_url: collection.delete_url
+                import_entry_url: collection.import_entry_url
             })
 
             this.collection_lookup_map.set(collection_object.id, collection_object)

django_spire/knowledge/templates/django_spire/knowledge/collection/card/context_menu_card.html

@@ -7,21 +7,27 @@
         top: y + 'px',
         left: x + 'px',
     }"
-    class="position-fixed card shadow-lg z-3 vstack cursor-pointer"
+    class="position-fixed card shadow-lg z-3 vstack cursor-pointer bg-app-layer-one"
     @click.away="hide_menu()"
 >
     <span class="px-2 py-1" x-text="title"></span>
 
+    {% if AuthController.knowledge.can_change %}
+        <span class="border-top bg-app-layer-one-hover px-3 text-app-default-link-color" @click="edit_collection()">
+            <i class="bi bi-pencil pe-1"></i>
+            Edit Collection
+        </span>
+    {% endif %}
     {% if AuthController.knowledge.can_add %}
-    <span class="border-top bg-app-layer-one-hover px-3 text-app-default-link-color" @click="add_entry()">
-        <i class="bi bi-plus pe-1"></i>
-        Add Entry
-    </span>
-    <span class="border-top bg-app-layer-one-hover px-3 text-app-default-link-color" @click="import_entry()">
-        <i class="bi bi-upload pe-1">
-        </i>
-        Import Entry
-    </span>
+        <span class="border-top bg-app-layer-one-hover px-3 text-app-default-link-color" @click="add_entry()">
+            <i class="bi bi-plus pe-1"></i>
+            Add Entry
+        </span>
+        <span class="border-top bg-app-layer-one-hover px-3 text-app-default-link-color" @click="import_entry()">
+            <i class="bi bi-upload pe-1">
+            </i>
+            Import Entry
+        </span>
     {% endif %}
 
     {% if AuthController.knowledge.can_delete %}

django_spire/knowledge/templates/django_spire/knowledge/collection/form/form.html

@@ -5,11 +5,15 @@
     x-data="{
         collection: new ModelObjectGlue('collection'),
         collection_query_set: new QuerySetGlue('collections'),
+        groups: new GlueCharField('groups'),
+        group_query_set: new QuerySetGlue('group_query_set'),
         async init() {
             await this.collection.get()
             this.collection.glue_fields.parent.choices = await this.collection_query_set.to_choices()
-
             this.collection.glue_fields.parent.label = 'Parent Collection'
+
+            this.groups.choices = await this.group_query_set.to_choices()
+            this.groups.value = JSON.parse('{{ group_ids }}')
         }
     }"
 >
@@ -23,6 +27,11 @@
     <div class="col-12 mt-2">
         {% include 'django_glue/form/field/search_and_select_field.html' with glue_model_field='collection.parent' %}
     </div>
+    {% if AuthController.knowledge.can_change_collection_groups %}
+        <div class="col-12 mt-2">
+            {% include 'django_glue/form/field/multi_select_field.html' with glue_field='groups' %}
+        </div>
+    {% endif %}
     <div class="col-12 mt-2">
         {% include 'django_spire/contrib/form/button/form_submit_button.html' %}
     </div>

django_spire/knowledge/templates/django_spire/knowledge/collection/navigation/navigation.html

@@ -105,6 +105,9 @@
         {% endif %}
 
         {% if AuthController.knowledge.can_change %}
+        edit_collection() {
+            window.location.href = this.focused_object.edit_url
+        },
         edit_entry() {
             window.location.href = this.focused_object.edit_url
         },

django_spire/knowledge/templates/django_spire/knowledge/entry/card/context_menu_card.html

@@ -7,7 +7,7 @@
         top: y + 'px',
         left: x + 'px',
     }"
-    class="position-fixed card shadow-lg z-3 vstack cursor-pointer"
+    class="position-fixed card shadow-lg z-3 vstack cursor-pointer bg-app-layer-one"
     @click.away="hide_menu()"
 >
     <span class="px-2 py-1" x-text="title"></span>

django_spire/knowledge/templates/django_spire/knowledge/page/full_page.html

@@ -51,7 +51,7 @@
         ></i>
     </div>
     <div
-        class="offcanvas offcanvas-end rounded-3"
+        class="offcanvas offcanvas-end rounded-3 bg-app-layer-one"
         data-bs-scroll="true"
         data-bs-backdrop="false"
         tabindex="-1"

django_spire/theme/tests/test_filesystem.py

@@ -15,7 +15,7 @@ class ThemeFilesystemValidationTests(TestCase):
     def _get_themes_base_path(self) -> Path:
         file = Path(__file__)
         root = file.parent.parent.parent.parent
-        return root / 'django_spire' / 'static' / 'django_spire' / 'css' / 'themes'
+        return root / 'django_spire' / 'core' / 'static' / 'django_spire' / 'css' / 'themes'
 
     def test_themes_directory_exists(self) -> None:
         if not self.base_path.exists():
@@ -98,7 +98,7 @@ class ThemeFilesystemValidationTests(TestCase):
 
             file = Path(__file__)
             root = file.parent.parent.parent.parent
-            path = root / 'django_spire' / 'static' / expected
+            path = root / 'django_spire' / 'core' / 'static' / expected
 
             if not path.exists():
                 missing.append(f'{theme.value}: {expected}')

django_spire/theme/tests/{test_views.py → test_views/test_json_views.py}

@@ -11,7 +11,7 @@ from django.http import JsonResponse
 from django_spire.core.tests.test_cases import BaseTestCase
 from django_spire.theme.enums import ThemeFamily
 from django_spire.theme.utils import get_theme_cookie_name
-from django_spire.theme.views import ajax_views
+from django_spire.theme.views import json_views
 
 
 class ThemeViewTests(TestCase):
@@ -19,8 +19,8 @@ class ThemeViewTests(TestCase):
         self.factory = RequestFactory()
 
     def test_get_config_success(self) -> None:
-        request = self.factory.get('/theme/ajax/get_config/')
-        response = ajax_views.get_config(request)
+        request = self.factory.get('/django_spire/theme/json/get_config/')
+        response = json_views.get_config(request)
 
         self.assertIsInstance(response, JsonResponse)
         self.assertEqual(response.status_code, HTTPStatus.OK)
@@ -42,18 +42,18 @@ class ThemeViewTests(TestCase):
             self.assertEqual(set(family_config['modes']), {'dark', 'light'})
 
     def test_get_config_cache_header(self) -> None:
-        _ = self.factory.get('/theme/ajax/get_config/')
+        _ = self.factory.get('/django_spire/theme/json/get_config/')
 
-        with patch('django_spire.theme.views.ajax_views.cache_page') as _:
-            self.assertTrue(hasattr(ajax_views.get_config, '__wrapped__'))
+        with patch('django_spire.theme.views.json_views.cache_page') as _:
+            self.assertTrue(hasattr(json_views.get_config, '__wrapped__'))
 
     def test_set_theme_success(self) -> None:
         request = self.factory.post(
-            '/theme/ajax/set_theme/',
+            '/django_spire/theme/json/set_theme/',
             data=json.dumps({'theme': 'dracula-dark'}),
             content_type='application/json'
         )
-        response = ajax_views.set_theme(request)
+        response = json_views.set_theme(request)
 
         self.assertIsInstance(response, JsonResponse)
         self.assertEqual(response.status_code, HTTPStatus.OK)
@@ -72,11 +72,11 @@ class ThemeViewTests(TestCase):
 
     def test_set_theme_missing_theme(self) -> None:
         request = self.factory.post(
-            '/theme/ajax/set_theme/',
+            '/django_spire/theme/json/set_theme/',
             data=json.dumps({}),
             content_type='application/json'
         )
-        response = ajax_views.set_theme(request)
+        response = json_views.set_theme(request)
 
         self.assertEqual(response.status_code, HTTPStatus.BAD_REQUEST)
         data = json.loads(response.content)
@@ -86,11 +86,11 @@ class ThemeViewTests(TestCase):
 
     def test_set_theme_invalid_theme(self) -> None:
         request = self.factory.post(
-            '/theme/ajax/set_theme/',
+            '/django_spire/theme/json/set_theme/',
             data=json.dumps({'theme': 'invalid-theme'}),
             content_type='application/json'
         )
-        response = ajax_views.set_theme(request)
+        response = json_views.set_theme(request)
 
         self.assertEqual(response.status_code, HTTPStatus.BAD_REQUEST)
         data = json.loads(response.content)
@@ -102,7 +102,7 @@ class ThemeViewTests(TestCase):
 class ThemeViewIntegrationTests(BaseTestCase):
     def test_set_theme_with_authenticated_client(self) -> None:
         response = self.client.post(
-            '/theme/ajax/set_theme/',
+            '/django_spire/theme/json/set_theme/',
             data=json.dumps({'theme': 'dracula-dark'}),
             content_type='application/json'
         )
@@ -112,7 +112,7 @@ class ThemeViewIntegrationTests(BaseTestCase):
         self.assertTrue(data['success'])
 
     def test_get_config_with_authenticated_client(self) -> None:
-        response = self.client.get('/theme/ajax/get_config/')
+        response = self.client.get('/django_spire/theme/json/get_config/')
         self.assertEqual(response.status_code, HTTPStatus.OK)
 
         data = json.loads(response.content)

django_spire/theme/urls/__init__.py

@@ -4,6 +4,6 @@ from django.urls.conf import path, include
 app_name = 'theme'
 
 urlpatterns = [
-    path('ajax/', include('django_spire.theme.urls.ajax_urls', namespace='ajax')),
+    path('json/', include('django_spire.theme.urls.json_urls', namespace='json')),
     path('page/', include('django_spire.theme.urls.page_urls', namespace='page')),
 ]

django_spire/theme/urls/json_urls.py

@@ -0,0 +1,10 @@
+from django.urls import path
+
+from django_spire.theme.views import json_views
+
+app_name = 'json'
+
+urlpatterns = [
+    path('get_config/', json_views.get_config, name='get_config'),
+    path('set_theme/', json_views.set_theme, name='set_theme'),
+]

{django_spire-0.16.4.dist-info → django_spire-0.16.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.16.4
+Version: 0.16.6
 Summary: A project for Django Spire
 Author-email: Brayden Carlson <braydenc@stratusadv.com>, Nathan Johnson <nathanj@stratusadv.com>
 License: Copyright (c) 2024 Stratus Advanced Technologies and Contributors.