django-spire 0.22.2__py3-none-any.whl → 0.22.3__py3-none-any.whl

django_spire/consts.py

@@ -1,4 +1,4 @@
-__VERSION__ = '0.22.2'
+__VERSION__ = '0.22.3'
 
 MAINTENANCE_MODE_SETTINGS_NAME = 'MAINTENANCE_MODE'
 

django_spire/knowledge/collection/querysets.py

@@ -24,24 +24,21 @@ class CollectionQuerySet(HistoryQuerySet, OrderingQuerySetMixin):
     def by_parent_id(self, parent_id: int) -> QuerySet[Collection]:
         return self.filter(parent_id=parent_id)
 
+    def by_parent_ids(self, parent_ids: list[int]) -> QuerySet[Collection]:
+        return self.filter(parent_id__in=parent_ids)
+
     def childless(self) -> QuerySet[Collection]:
         return self.annotate(child_count=Count('child')).filter(child_count=0)
 
-    def exclude_children(self, collection: Collection) -> QuerySet[Collection]:
-        descendant_ids = set()
-        current_level_ids = [collection.id]
-
-        while current_level_ids:
-            children = self.filter(parent_id__in=current_level_ids)
-            child_ids = list(children.values_list('id', flat=True))
-
-            if not child_ids:
-                break
-
-            descendant_ids.update(child_ids)
-            current_level_ids = child_ids
+    def children(self, collection_id: int) -> QuerySet[Collection]:
+        return self.filter(
+            id__in=self.model.services.tool.get_children_ids(parent_id=collection_id)
+        )
 
-        return self.exclude(id__in=descendant_ids)
+    def exclude_children(self, collection_id: int) -> QuerySet[Collection]:
+        return self.exclude(
+            id__in=self.model.services.tool.get_children_ids(parent_id=collection_id)
+        )
 
     def parentless(self) -> QuerySet[Collection]:
         return self.filter(parent_id__isnull=True)

django_spire/knowledge/collection/services/service.py

@@ -11,6 +11,8 @@ from django_spire.knowledge.collection.services.ordering_service import \
 from django_spire.knowledge.collection.services.processor_service import \
     CollectionProcessorService
 from django_spire.knowledge.collection.services.tag_service import CollectionTagService
+from django_spire.knowledge.collection.services.tool_services import \
+    CollectionToolService
 from django_spire.knowledge.collection.services.transformation_service import \
     CollectionTransformationService
 
@@ -24,6 +26,7 @@ class CollectionService(BaseDjangoModelService['Collection']):
     ordering = CollectionOrderingService()
     processor = CollectionProcessorService()
     tag = CollectionTagService()
+    tool = CollectionToolService()
     transformation = CollectionTransformationService()
 
     def save_model_obj(self, **field_data) -> tuple[Collection, bool]:

django_spire/knowledge/collection/services/tool_services.py

@@ -0,0 +1,37 @@
+from __future__ import annotations
+
+from django_spire.contrib.service import BaseDjangoModelService
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from django_spire.knowledge.collection.models import Collection
+
+
+class CollectionToolService(BaseDjangoModelService['Collection']):
+    obj: Collection
+
+    def get_children_ids(self, parent_id: int) -> set[int]:
+        descendant_ids = set()
+        current_level_ids = [parent_id]
+
+        while current_level_ids:
+            child_ids = self.obj_class.objects.by_parent_ids(
+                parent_ids=current_level_ids
+            ).values_list('id', flat=True)
+
+            if not child_ids:
+                break
+
+            descendant_ids.update(child_ids)
+            current_level_ids = child_ids
+
+        return descendant_ids
+
+    def get_root_collection_pk(self) -> int:
+        collection = self.obj
+
+        while collection.parent_id:
+            collection = collection.parent
+
+        return collection.id

django_spire/knowledge/collection/services/transformation_service.py

@@ -19,11 +19,11 @@ if TYPE_CHECKING:
 class CollectionTransformationService(BaseDjangoModelService['Collection']):
     obj: Collection
 
-    def to_hierarchy_json(self, request: WSGIRequest, parent_id: int | None = None) -> str:
+    def to_hierarchy_json(self, request: WSGIRequest, parent_id: int) -> str:
         collections = (
             self.obj_class.objects
             .active()
-            .by_parent_id(parent_id=parent_id)
+            .children(collection_id=parent_id)
             .request_user_has_access(request)
             .select_related('parent')
         )

django_spire/knowledge/collection/views/form_views.py

@@ -38,7 +38,7 @@ def form_view(
             .active()
             .request_user_has_access(request)
             .exclude(pk=collection.pk)
-            .exclude_children(collection=collection)
+            .exclude_children(collection_id=pk)
         ),
         fields=['name']
     )
@@ -66,7 +66,7 @@ def form_view(
             if collection.parent_id:
                 return_url = reverse(
                     'django_spire:knowledge:collection:page:top_level',
-                    kwargs={'pk': collection.parent_id}
+                    kwargs={'pk': collection.services.tool.get_root_collection_pk()}
                 )
             else:
                 return_url = reverse('django_spire:knowledge:page:home')

django_spire/knowledge/static/django_spire/knowledge/entry/version/js/editor.js

@@ -75,7 +75,6 @@ function create_editorjs_instance({holder_id, update_url, initial_editor_blocks}
                     if (block_id) {
                         setTimeout(() => {
                             const element = document.querySelector(`[data-id="${block_id}"]`)
-                            console.log('element', element)
                             if (element) {
                                 element.scrollIntoView({behavior: 'smooth', block: 'center'})
                                 element.style.transition = 'background-color 1s ease'

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

@@ -18,4 +18,3 @@
         No Items Found
     {% endfor %}
 {% endblock %}
-

django_spire/knowledge/templates/django_spire/knowledge/collection/component/x_collection_navigation.html

@@ -16,13 +16,6 @@
                 :class="{'ms-4': collection.parent.id !== -1}"
                 class="mb-1 collection"
             >
-                <div x-data="{
-                    init() {
-                        console.log(collection)
-                     }
-                }">
-
-                </div>
                 {% include 'django_spire/knowledge/sub_navigation/item/collection_sub_navigation_item.html' %}
 
                 <div x-show="is_expanded(collection.id)" class="my-1">

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

@@ -11,7 +11,6 @@
             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'
-            console.log(this.collection.parent)
 
             if (!this.collection.parent) {
                 this.collection.parent = {{ collection_parent_pk|default:'null' }}

django_spire/knowledge/templates/django_spire/knowledge/entry/version/container/editor_container.html

@@ -64,15 +64,11 @@
                     x-data="{
                     editor_element_id: 'knowledge-entry-version-editor',
                     init() {
-                        console.log('Editor blocks:', {{ version_blocks }})
                         KNOWLEDGE_ENTRY_VERSION_EDITOR = create_editorjs_instance({
                             holder_id: this.editor_element_id,
                             initial_editor_blocks: {{ version_blocks }},
                             update_url: '{% url "django_spire:knowledge:entry:version:json:update_blocks" pk=entry.id %}'
                         })
-                        console.log('Editor initialized:', KNOWLEDGE_ENTRY_VERSION_EDITOR)
-                        console.log(KNOWLEDGE_ENTRY_VERSION_EDITOR)
-
                     }
 
                 }"

{django_spire-0.22.2.dist-info → django_spire-0.22.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.22.2
+Version: 0.22.3
 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.

{django_spire-0.22.2.dist-info → django_spire-0.22.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 django_spire/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/conf.py,sha256=c5Hs-7lk9T15254tOasiQ2ZTFLQIVJof9_QJDfm1PAI,933
-django_spire/consts.py,sha256=1J7ryfVhX7ewZWLdT-crPPUphnRDSFPBY8tn8WUekUo,171
+django_spire/consts.py,sha256=eJ7iYe078p7JYe0fEg6B3xuHt-HWjI4-tq6KzQLfKg8,171
 django_spire/exceptions.py,sha256=L5ndRO5ftMmh0pHkO2z_NG3LSGZviJ-dDHNT73SzTNw,48
 django_spire/settings.py,sha256=B4GPqBGt_dmkt0Ay0j-IP-SZ6mY44m2Ap5kVSON5YLA,1005
 django_spire/urls.py,sha256=mKeZszb5U4iIGqddMb5Tt5fRC72U2wABEOi6mvOfEBU,656
@@ -833,7 +833,7 @@ django_spire/knowledge/collection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 django_spire/knowledge/collection/admin.py,sha256=9OKEgiSDiSHX6ZwB11l6mCx-jdF4VKfOe-SwFBdjKK4,1370
 django_spire/knowledge/collection/forms.py,sha256=7JovVxNzE67hSydDa-1JGK4U4zPyzOj605QyEl0JkP8,238
 django_spire/knowledge/collection/models.py,sha256=69ol2B-ytH6mJ48afFywPhENQNnM37gAsX-Grjim-g4,2387
-django_spire/knowledge/collection/querysets.py,sha256=8DWTGvo4WovXQ9n7XRLoxtyDdBUka2N-kcPUnJVOhOo,2479
+django_spire/knowledge/collection/querysets.py,sha256=JzrCudpAzO45cVt-sqdXva8LMJB5wiwSL1zS2eki47E,2485
 django_spire/knowledge/collection/seeding/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/knowledge/collection/seeding/seed.py,sha256=i4VEvScJvZ1SUV9ukKZp0qdh_owyLyVSHGgl8vIzhwQ,303
 django_spire/knowledge/collection/seeding/seeder.py,sha256=Zgrl-S0iAwK6LU2pMmRIdr87kAvrPtQ7GLJlONUSBlM,1523
@@ -841,9 +841,10 @@ django_spire/knowledge/collection/services/__init__.py,sha256=47DEQpj8HBSa-_TImW
 django_spire/knowledge/collection/services/factory_service.py,sha256=92DLZODSRPF-iA9r3Jgys2GzbC39KssGEk9eOJ5wZjs,1298
 django_spire/knowledge/collection/services/ordering_service.py,sha256=vTkSdt1lVT4VxSK3GhZibj8FPDDy5butwPkVzqmm07g,1243
 django_spire/knowledge/collection/services/processor_service.py,sha256=3ArKBndoL3HEvH_1EBqfiw7AnbFYZ0WmBgcPV8BHdLQ,911
-django_spire/knowledge/collection/services/service.py,sha256=sEamdqRcKdNcL6yz18hok0jww3Z4VRCPWrMF2QLvKGE,1830
+django_spire/knowledge/collection/services/service.py,sha256=g2agKPcnoccjjAw0P5Sj9CVYOA6qU4vNZwn0g4hFvE4,1962
 django_spire/knowledge/collection/services/tag_service.py,sha256=o1HnL0-du0XCGIl_8nMGMgW9AzEQE-AWbGOoBN_cQb0,1774
-django_spire/knowledge/collection/services/transformation_service.py,sha256=ME_jYURSG7at4oujTbcRzIVXyKnb75Xi6M4Nclbw6Yo,3464
+django_spire/knowledge/collection/services/tool_services.py,sha256=tnOL23zJ_x7vKBH4PtR7a0AzYnmfLxHcEpYHIWzu9Kc,984
+django_spire/knowledge/collection/services/transformation_service.py,sha256=KDCLBSdT9sszjtwtDO2yWdT-iwGpxmCwhIRN6MvEvTU,3450
 django_spire/knowledge/collection/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/knowledge/collection/tests/factories.py,sha256=NUu4OliEZIQL9c05RPIPdzYP3Dtn1szLZxP4Wl-kX2w,429
 django_spire/knowledge/collection/tests/test_services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -857,7 +858,7 @@ django_spire/knowledge/collection/urls/form_urls.py,sha256=yHU3sbaA3w-m9rVvon6nX
 django_spire/knowledge/collection/urls/json_urls.py,sha256=XZp5wt8m9x38Uuy1dhegqZ4qlJLZK2EgJsLltx97o0Q,195
 django_spire/knowledge/collection/urls/page_urls.py,sha256=M8zZJJzVmMx7QUc3uGIrjyb8-Kz00fz7u0mHYqFZf3M,280
 django_spire/knowledge/collection/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_spire/knowledge/collection/views/form_views.py,sha256=ziQhlrLEJ62VzYiIAApd0ZThM2jc-who-qw0_BlO-VI,3014
+django_spire/knowledge/collection/views/form_views.py,sha256=jh9pV6SBF7gqflvFooKVU4EFS34eTqRK-Nt22iqAlRg,3038
 django_spire/knowledge/collection/views/json_views.py,sha256=uzSD83O7p-L5Oh8jo_Ejh-4lbo5zXjLkZGe0cn6SXSw,1030
 django_spire/knowledge/collection/views/page_views.py,sha256=jiKsIqi9pvSY5KbLLGDdTHSPHXmnd-7oyYXckF2ONh4,2045
 django_spire/knowledge/entry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -974,15 +975,15 @@ django_spire/knowledge/seeding/seed.py,sha256=LRhVfPHiFluSLLtjSY44YM9Oo1Hvfs_U-k
 django_spire/knowledge/static/django_spire/knowledge/collection/js/managers.js,sha256=1b0pRPYJvYjKKZB2wshdoseAUR3_Al-2qxFUWE5q-oo,4319
 django_spire/knowledge/static/django_spire/knowledge/collection/js/x_component.js,sha256=avczuHac3i58k06wA-LPpgupedCYbuDVTjTYVjEho18,898
 django_spire/knowledge/static/django_spire/knowledge/css/navigation_items.css,sha256=jhjW4fiQI13PUAkSupLrLn-Fu9nzAVqMezK8EkJnGZ8,178
-django_spire/knowledge/static/django_spire/knowledge/entry/version/js/editor.js,sha256=FjcLWrZRRNyDIRE43hqbtlo3Thypzk2GD3uBPzl1SNI,3858
+django_spire/knowledge/static/django_spire/knowledge/entry/version/js/editor.js,sha256=zDK9PNO7XR0j95I17uBmfguSF8LzYijx3irM2my3IqA,3798
 django_spire/knowledge/static/django_spire/knowledge/entry/version/js/managers.js,sha256=q-HiSnOnMMomxU0EAWSbQO55HMVvb8wPxA0KCP3VyP4,2772
 django_spire/knowledge/static/django_spire/knowledge/entry/version/js/null_paragraph.js,sha256=Bc0oslLdlLcncbcUklhU1RF4PGiByC-mH-ENq1S1Niw,211
 django_spire/knowledge/templates/django_spire/knowledge/collection/card/form_card.html,sha256=Fm1PFgMJO0B1ji86pjeL_KbGkKq-ho7n6v9gtCODlzU,154
-django_spire/knowledge/templates/django_spire/knowledge/collection/card/top_level_list_card.html,sha256=LeE67fpcF8OfOXnjOp1199RWunX4pAFbqgVV_wdK9gY,696
-django_spire/knowledge/templates/django_spire/knowledge/collection/component/x_collection_navigation.html,sha256=ozztAZ_dfBHDh13thPkmZK1w1neHKht_cnbypUB1e8U,2590
+django_spire/knowledge/templates/django_spire/knowledge/collection/card/top_level_list_card.html,sha256=RFcSfk37OpuyRTdb3UjQc6ntyE5Rt3_2BgLEoD1mI3Y,695
+django_spire/knowledge/templates/django_spire/knowledge/collection/component/x_collection_navigation.html,sha256=3lHzZ1pD-SWVGnzquczsVaAswli8FM7PSQNiLmg0Pn4,2415
 django_spire/knowledge/templates/django_spire/knowledge/collection/container/detail_container.html,sha256=0T1L7mRyAH-I04_8rmyL6ZbsT1TWcIGzZ-NnGPllRco,321
 django_spire/knowledge/templates/django_spire/knowledge/collection/element/ellipsis_dropdown.html,sha256=o9cceexfwUSDtac4uhlUm4LimnBQrgTP6QPkpJF6DD0,1376
-django_spire/knowledge/templates/django_spire/knowledge/collection/form/form.html,sha256=gDjvFBpNQHGn4PNJBi4pBw89-IakpyrC23D9dr0xQ-c,1902
+django_spire/knowledge/templates/django_spire/knowledge/collection/form/form.html,sha256=o015wNWZCsdqafvdjzsdOS3xUo2UtkyHaXn9-2N2s4s,1854
 django_spire/knowledge/templates/django_spire/knowledge/collection/item/collection_item.html,sha256=gaOqh1wxf5IcWdxWWiYyz6HWjoPyn6FohaTMIssJ67k,517
 django_spire/knowledge/templates/django_spire/knowledge/collection/page/display_page.html,sha256=AzYod7og_yU_lfxWIRFC2R_ga_jwH_Cr4VE07sRlGT8,2400
 django_spire/knowledge/templates/django_spire/knowledge/collection/page/form_page.html,sha256=eD190iYnmx-6u8Y0EAExDdilPtxTlS_ic6-WBfTtj2s,274
@@ -1000,7 +1001,7 @@ django_spire/knowledge/templates/django_spire/knowledge/entry/item/list_item.htm
 django_spire/knowledge/templates/django_spire/knowledge/entry/modal/publish_confirm_modal.html,sha256=7SsTjvk_iOdBgnYy83pMBPIdbuvJadd4h5XI5mPos5o,724
 django_spire/knowledge/templates/django_spire/knowledge/entry/page/form_page.html,sha256=EBfDjDBvo7IR6f5joTtZjzK5LtZb4rt0U1FO1HQNt88,291
 django_spire/knowledge/templates/django_spire/knowledge/entry/page/import_form_page.html,sha256=TK8Bc7mUZwsmV1Xm9FPyWz7Hws68Ijy4c55orvNoOC4,308
-django_spire/knowledge/templates/django_spire/knowledge/entry/version/container/editor_container.html,sha256=NAtXEq8UJOV9_vp3l5HIIdQp-lZhNVW4luF0Nvv8Sl8,3389
+django_spire/knowledge/templates/django_spire/knowledge/entry/version/container/editor_container.html,sha256=-fPVVnCdDUMA0AoKjQ3bA7gRrbnggPRlRlPqYvgIoKA,3153
 django_spire/knowledge/templates/django_spire/knowledge/entry/version/page/editor_page.html,sha256=Gc5uYGjYJR8nwaLa0hm-5GHO3ezI9CLO0H_OLp8EvdE,3092
 django_spire/knowledge/templates/django_spire/knowledge/message/knowledge_message_intel.html,sha256=kOSsRJHkh8hFYp1k1Y0wc-wh75VVjdXldEKErkfANGY,855
 django_spire/knowledge/templates/django_spire/knowledge/page/full_page.html,sha256=vz3WQ6SAL43QALRf0haaLfNkUfIQQemR0FAZQ2tznV4,1331
@@ -1161,8 +1162,8 @@ django_spire/theme/urls/page_urls.py,sha256=S8nkKkgbhG3XHI3uMUL-piOjXIrRkuY2UlM_
 django_spire/theme/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/theme/views/json_views.py,sha256=W1khC2K_EMbEzAFmMxC_P76_MFnkRH4-eVdodrRfAhw,1904
 django_spire/theme/views/page_views.py,sha256=pHr8iekjtR99xs7w1taj35HEo133Svq1dvDD0y0VL1c,3933
-django_spire-0.22.2.dist-info/licenses/LICENSE.md,sha256=tlTbOtgKoy-xAQpUk9gPeh9O4oRXCOzoWdW3jJz0wnA,1091
-django_spire-0.22.2.dist-info/METADATA,sha256=x7u7O7BVs3ABSXG2JluNWbD6vZ08dKZT5pIOVmY9Sj4,4967
-django_spire-0.22.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_spire-0.22.2.dist-info/top_level.txt,sha256=xf3QV1e--ONkVpgMDQE9iqjQ1Vg4--_6C8wmO-KxPHQ,13
-django_spire-0.22.2.dist-info/RECORD,,
+django_spire-0.22.3.dist-info/licenses/LICENSE.md,sha256=tlTbOtgKoy-xAQpUk9gPeh9O4oRXCOzoWdW3jJz0wnA,1091
+django_spire-0.22.3.dist-info/METADATA,sha256=Aa-oMM1yPLilHIiDXaOaoYe6FgpenWFtSxixuTcbQao,4967
+django_spire-0.22.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_spire-0.22.3.dist-info/top_level.txt,sha256=xf3QV1e--ONkVpgMDQE9iqjQ1Vg4--_6C8wmO-KxPHQ,13
+django_spire-0.22.3.dist-info/RECORD,,