django-spire 0.17.5__py3-none-any.whl → 0.17.7__py3-none-any.whl

django_spire/consts.py

@@ -1,4 +1,4 @@
-__VERSION__ = '0.17.5'
+__VERSION__ = '0.17.7'
 
 
 AI_CHAT_WORKFLOW_SENDER_SETTINGS_NAME = 'AI_CHAT_WORKFLOW_NAME'

django_spire/core/templates/django_spire/dropdown/element/dropdown_link_element.html

@@ -1,7 +1,7 @@
 {# Background colours must be applied outside 'a' tag #}
 <div class="bg-app-layer-one bg-app-layer-three-hover dropdown-item">
     <a
-        class="fs--1 p-0 cursor-pointer text-decoration-none text-app-default-text-color"
+        class="fs-7 p-0 cursor-pointer text-decoration-none text-app-default-text-color"
         {% if link_url %}href="{{ link_url }}"{% endif %}
         {% if x_link_url %}
             x-show="{{ x_link_url }} ? true : false"
@@ -13,7 +13,10 @@
         }"
     >
         {% block link_content %}
-            <div class="px-3 py-1 text-nowrap {{ link_css }}">
+            <div class="px-3 py-2 text-nowrap {{ link_css }}">
+                {% if link_icon %}
+                    <i class="{{ link_icon }} pe-1"></i>
+                {% endif %}
                 {% if link_text %}
                     {{ link_text }}
                 {% elif x_link_text %}

django_spire/knowledge/collection/models.py

@@ -35,7 +35,7 @@ class Collection(HistoryModelMixin, OrderingModelMixin):
         db_table = 'django_spire_knowledge_collection'
         permissions = [
             ('can_access_all_collections', 'Can Access All Collections'),
-            ('can_change_collection_groups', 'Can Change Collection Groups')
+            ('can_change_collection_groups', 'Can Change Collection Groups'),
         ]
 
 

django_spire/knowledge/collection/tests/test_urls/test_page_urls.py

@@ -21,19 +21,9 @@ class CollectionPageUrlsTests(BaseTestCase):
 
         self.assertEqual(response.status_code, 200)
 
-    def test_detail_view_url_path(self):
-        response = self.client.get(
-            reverse(
-                'django_spire:knowledge:collection:page:detail',
-                kwargs={'pk': self.test_collection.pk}
-            )
-        )
-
-        self.assertEqual(response.status_code, 200)
-
     def test_list_view_url_path(self):
         response = self.client.get(
-            reverse('django_spire:knowledge:collection:page:list')
+            reverse('django_spire:knowledge:page:home')
         )
 
         self.assertEqual(response.status_code, 200)

django_spire/knowledge/collection/urls/page_urls.py

@@ -7,6 +7,4 @@ app_name = 'page'
 
 urlpatterns = [
     path('<int:pk>/delete/', page_views.delete_view, name='delete'),
-    path('<int:pk>/detail/', page_views.detail_view, name='detail'),
-    path('list/', page_views.list_view, name='list'),
 ]

django_spire/knowledge/collection/views/form_views.py

@@ -60,7 +60,7 @@ def form_view(
             )
 
             return HttpResponseRedirect(
-                reverse('django_spire:knowledge:collection:page:list')
+                reverse('django_spire:knowledge:page:home')
             )
 
         show_form_errors(request, form)

django_spire/knowledge/collection/views/page_views.py

@@ -20,58 +20,6 @@ def delete_view(request: WSGIRequest, pk: int) -> TemplateResponse:
         delete_func=collection.services.processor.set_deleted,
         return_url=request.GET.get(
             'return_url',
-            reverse('django_spire:knowledge:collection:page:list')
+            reverse('django_spire:knowledge:page:home')
         )
     )
-
-
-@AppAuthController('knowledge').permission_required('can_view')
-def detail_view(request: WSGIRequest, pk: int) -> TemplateResponse:
-    collection = get_object_or_404(Collection, pk=pk)
-
-    def breadcrumbs_func(breadcrumbs):
-        breadcrumbs.add_breadcrumb(name='Knowledge')
-        breadcrumbs.add_breadcrumb(
-            name='Collections',
-            href=reverse('django_spire:knowledge:collection:page:list')
-        )
-
-        if collection.parent_id is not None:
-            parent = collection.parent
-            breadcrumbs.add_breadcrumb(
-                name=parent.name,
-                href=reverse(
-                    viewname='django_spire:knowledge:collection:page:detail',
-                    kwargs={'pk': parent.pk}
-                )
-            )
-
-        breadcrumbs.add_breadcrumb(name=collection.name)
-
-    return portal_views.detail_view(
-        request,
-        obj=collection,
-        breadcrumbs_func=breadcrumbs_func,
-        context_data={
-            'collection': collection,
-            'current_entries': (
-                collection.entries
-                .active()
-                .has_current_version()
-                .user_has_access(user=request.user)
-                .select_related('current_version__author')
-                .order_by('order')
-            )
-        },
-        template='django_spire/knowledge/collection/page/detail_page.html'
-    )
-
-
-@AppAuthController('knowledge').permission_required('can_view')
-def list_view(request: WSGIRequest) -> TemplateResponse:
-    return portal_views.list_view(
-        request,
-        model=Collection,
-        context_data={},
-        template='django_spire/knowledge/collection/page/list_page.html'
-    )

django_spire/knowledge/entry/version/views/form_views.py

@@ -34,14 +34,7 @@ def update_form_view(request: WSGIRequest, pk: int) -> TemplateResponse:
     breadcrumbs.add_breadcrumb(name='Knowledge')
     breadcrumbs.add_breadcrumb(
         name='Collections',
-        href=reverse('django_spire:knowledge:collection:page:list')
-    )
-    breadcrumbs.add_breadcrumb(
-        name=entry.collection.name,
-        href=reverse(
-            'django_spire:knowledge:collection:page:detail',
-            kwargs={'pk': entry.collection_id}
-        )
+        href=reverse('django_spire:knowledge:page:home')
     )
     breadcrumbs.add_breadcrumb(
         name=f'View {entry.name}',

django_spire/knowledge/entry/version/views/page_views.py

@@ -20,16 +20,8 @@ def detail_view(request: WSGIRequest, pk: int) -> TemplateResponse:
         breadcrumbs.add_breadcrumb(name='Knowledge')
         breadcrumbs.add_breadcrumb(
             name='Collections',
-            href=reverse('django_spire:knowledge:collection:page:list')
+            href=reverse('django_spire:knowledge:page:home')
         )
-        breadcrumbs.add_breadcrumb(
-            name=entry.collection.name,
-            href=reverse(
-                'django_spire:knowledge:collection:page:detail',
-                kwargs={'pk': entry.collection.pk}
-            )
-        )
-        breadcrumbs.add_breadcrumb(name=f'View {entry.name}')
 
     return portal_views.detail_view(
         request,

django_spire/knowledge/entry/views/form_views.py

@@ -33,12 +33,12 @@ def form_view(
 
         if form.is_valid():
             form.cleaned_data['collection'] = collection
-            _, _ = entry.services.save_model_obj(author=request.user, **form.cleaned_data)
+            entry, _ = entry.services.save_model_obj(author=request.user, **form.cleaned_data)
 
             return HttpResponseRedirect(
                 reverse(
-                    'django_spire:knowledge:collection:page:detail',
-                    kwargs={'pk': collection.pk}
+                    'django_spire:knowledge:entry:version:page:detail',
+                    kwargs={'pk': entry.pk}
                 )
             )
 
@@ -105,14 +105,6 @@ def import_form_view(
         show_form_errors(request, file_form)
 
     breadcrumbs = Breadcrumbs()
-    if collection_pk != 0:
-        breadcrumbs.add_breadcrumb(
-            name=Collection.objects.get(pk=collection_pk).name,
-            href=reverse(
-                'django_spire:knowledge:collection:page:detail',
-                kwargs={'pk': collection_pk}
-            )
-        )
     breadcrumbs.add_breadcrumb(name='Import Files')
     supported_file_types = [
         '.' + file_type for file_type in list(FILE_TYPE_CONVERTER_MAP.keys())

django_spire/knowledge/entry/views/page_views.py

@@ -18,9 +18,6 @@ def delete_view(request: WSGIRequest, pk: int) -> TemplateResponse:
         delete_func=entry.services.processor.set_deleted,
         return_url=request.GET.get(
             'return_url',
-            reverse(
-                'django_spire:knowledge:collection:page:detail',
-                kwargs={'pk': entry.collection.pk}
-            )
+            reverse('django_spire:knowledge:page:home')
         )
     )

django_spire/knowledge/entry/views/template_views.py

@@ -18,26 +18,9 @@ def file_list_view(request: WSGIRequest, collection_pk: int = 0) -> TemplateResp
 
         breadcrumbs.add_breadcrumb(
             name='Collections',
-            href=reverse('django_spire:knowledge:collection:page:list')
+            href=reverse('django_spire:knowledge:page:home')
         )
 
-        if collection.parent_id is not None:
-            parent = collection.parent
-            breadcrumbs.add_breadcrumb(
-                name=parent.name,
-                href=reverse(
-                    viewname='django_spire:knowledge:collection:page:detail',
-                    kwargs={'pk': parent.pk}
-                )
-            )
-
-        breadcrumbs.add_breadcrumb(
-            name=collection.name,
-            href=reverse(
-                viewname='django_spire:knowledge:collection:page:detail',
-                kwargs={'pk': collection.pk}
-            )
-        )
         breadcrumbs.add_breadcrumb(name='Importing Files')
 
     return TemplateResponse(

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

@@ -1,33 +1,41 @@
 <template x-component="collection-navigation">
     <div
-        x-sort="await move_collection({collection: $item, order: $position, new_parent: data.id})"
-        x-sort:group="collection"
+        {% if AuthController.knowledge.can_change %}
+            x-sort="await move_collection({collection: $item, order: $position, new_parent: data.id})"
+            x-sort:group="collection"
+        {% endif %}
     >
         <template x-for="collection in data.items" :key="collection.id">
             <div
-                x-sort:item="collection"
+                {% if AuthController.knowledge.can_change %}
+                    x-sort:item="collection"
+                    @dragstart="toggle_dragging(true)"
+                    @dragend="toggle_dragging(false)"
+                {% endif %}
                 :id="collection.name"
                 class="my-1 ms-4 collection"
-                @dragstart="toggle_dragging(true)"
-                @dragend="toggle_dragging(false)"
             >
-                {% include 'django_spire/knowledge/collection/navigation/item/collection_item.html' %}
+                {% include 'django_spire/knowledge/navigation/item/collection/collection_item.html' %}
                 <div x-show="collection.show_details" class="my-1">
                     <x-collection-navigation :data="{items: collection.children, id: collection.id}"></x-collection-navigation>
                     <div class="ms-4">
                         <div
-                            x-sort="await move_entry({entry: $item, collection: collection, order: $position})"
-                            x-sort:group="entry"
+                            {% if AuthController.knowledge.can_change %}
+                                x-sort="await move_entry({entry: $item, collection: collection, order: $position})"
+                                x-sort:group="entry"
+                            {% endif %}
                         >
                             <template x-for="entry in collection.entries" :key="entry.version_id">
                                 <div
                                     class="entry"
-                                    x-sort:item="entry"
+                                    {% if AuthController.knowledge.can_change %}
+                                        x-sort:item="collection"
+                                        @dragstart="toggle_dragging(true)"
+                                        @dragend="toggle_dragging(false)"
+                                    {% endif %}
                                     :id="entry.name"
-                                    @dragstart="toggle_dragging(true)"
-                                    @dragend="toggle_dragging(false)"
                                 >
-                                    {% include  'django_spire/knowledge/entry/navigation/item/navigation_item.html' %}
+                                    {% include 'django_spire/knowledge/navigation/item/entry/entry_item.html' %}
                                 </div>
                             </template>
                         </div>

django_spire/knowledge/templates/django_spire/knowledge/collection/page/form_page.html

@@ -1,6 +1,6 @@
-{% extends 'django_spire/page/full_page.html' %}
+{% extends 'django_spire/knowledge/navigation/page/full_page.html' %}
 
-{% block full_page_content %}
+{% block knowledge_full_page_content %}
     <div class="row">
         <div class="col-12">
             {% include 'django_spire/knowledge/collection/card/form_card.html' %}

django_spire/knowledge/templates/django_spire/knowledge/entry/file/page/list_page.html

@@ -1,6 +1,6 @@
 {% extends 'django_spire/page/full_page.html' %}
 
-{% block full_page_content %}
+{% block knowledge_full_page_content %}
     <div class="row">
         <div class="col-12">
             {% include 'django_spire/knowledge/entry/file/card/list_card.html' %}

django_spire/knowledge/templates/django_spire/knowledge/entry/page/form_page.html

@@ -1,6 +1,6 @@
-{% extends 'django_spire/page/full_page.html' %}
+{% extends 'django_spire/knowledge/navigation/page/full_page.html' %}
 
-{% block full_page_content %}
+{% block knowledge_full_page_content %}
     <div class="row">
         <div class="col-12">
             {% include 'django_spire/knowledge/entry/card/form_card.html' %}

django_spire/knowledge/templates/django_spire/knowledge/entry/page/import_form_page.html

@@ -1,6 +1,6 @@
-{% extends 'django_spire/page/full_page.html' %}
+{% extends 'django_spire/knowledge/navigation/page/full_page.html' %}
 
-{% block full_page_content %}
+{% block knowledge_full_page_content %}
     <div class="row">
         <div class="col-12">
             {% include 'django_spire/knowledge/entry/container/import_form_container.html' %}

django_spire/knowledge/templates/django_spire/knowledge/entry/version/page/detail_page.html

@@ -1,8 +1,8 @@
-{% extends 'django_spire/knowledge/page/full_page.html' %}
+{% extends 'django_spire/knowledge/navigation/page/full_page.html' %}
 
 {% block knowledge_full_page_content %}
     <div class="row justify-content-center ps-3">
-        <div class="col-12 col-xl-8">
+        <div class="col-12 col-xl-8'">
             {% include 'django_spire/knowledge/entry/version/container/detail_container.html' %}
         </div>
     </div>

django_spire/knowledge/templates/django_spire/knowledge/entry/version/page/form_page.html

@@ -1,4 +1,4 @@
-{% extends 'django_spire/knowledge/page/full_page.html' %}
+{% extends 'django_spire/knowledge/navigation/page/full_page.html' %}
 
 {% load static %}
 

django_spire/knowledge/templates/django_spire/knowledge/{collection → navigation}/card/navigation_card.html

@@ -5,5 +5,5 @@
 {% endblock %}
 
 {% block card_content %}
-    {% include 'django_spire/knowledge/collection/navigation/navigation.html' %}
+    {% include 'django_spire/knowledge/navigation/content/navigation_content.html' %}
 {% endblock %}

django_spire/knowledge/templates/django_spire/knowledge/{collection/navigation/navigation.html → navigation/content/navigation_content.html}

@@ -2,9 +2,6 @@
     x-data="{
         user_search: '',
         found_items: new Map(),
-        show_context_menu: false,
-        x: 0,
-        y: 0,
         focused_object: {},
         focused_type: '',
         title: '',
@@ -83,57 +80,66 @@
                 this.found_items = item_map
             }
         },
-
-
-        show_menu({event, type, object}) {
-            this.x = event.pageX
-            this.y = event.pageY
-            this.focused_type = type
-            this.focused_object = object
-            this.title = this.focused_object.name
-            this.show_context_menu = true
-        },
-        hide_menu() {
-            this.show_context_menu = false
-            this.focused_object = {}
-        },
-
-        {% if AuthController.knowledge.can_view %}
-        view_entry() {
-            window.location.href = this.focused_object.view_url
-        },
-        {% 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
-        },
-        edit_entry_version() {
-            window.location.href = this.focused_object.edit_version_url
-        },
-        {% endif %}
-
-        {% if AuthController.knowledge.can_delete %}
-        delete_entry() {
-            window.location.href = this.focused_object.delete_url
-        },
-        delete_collection() {
-            window.location.href = this.focused_object.delete_url
-        },
-        {% endif %}
-
-        {% if AuthController.knowledge.can_add %}
-        import_entry() {
-            window.location.href = this.focused_object.import_entry_url
-        },
-        add_entry() {
-            window.location.href = this.focused_object.create_entry_url
-        },
-        {% endif %}
     }"
 >
-    {% include 'django_spire/knowledge/collection/navigation/content/navigation_content.html' %}
+    <div class="container-fluid">
+        <div class="row align-items-center border-bottom mx-1 pb-2">
+            <div class="col px-0 text-uppercase pb-2 d-flex align-items-center">
+                Collections
+            </div>
+            <div class="col-auto px-0 pb-2">
+                {% if AuthController.knowledge.can_add %}
+                    {% url 'django_spire:knowledge:collection:form:create' as create_url %}
+                    {% include 'django_spire/button/primary_button.html' with button_text='Add' button_href=create_url button_icon="bi bi-plus" %}
+                {% endif %}
+            </div>
+            <div class="col-12 px-0">
+                <input
+                    class="rounded-2 p-1 form-control"
+                    type="text"
+                    placeholder="Search ..."
+                    x-model="user_search"
+                    @input.debounce.300ms="search"
+                >
+            </div>
+        </div>
+    </div>
+    <div
+        class="user-select-none pe-3"
+        x-sort:config="{
+            handle: '[x-sort\\:handle]',
+            distance: 20,
+            swapThreshold: 0.01
+        }"
+    >
+        {% include 'django_spire/knowledge/collection/component/x_collection_navigation.html' %}
+
+        <div class="navigation-items">
+            <x-collection-navigation :data="{items: manager.collection_map, id: null}"></x-collection-navigation>
+        </div>
+        <div class="search-items">
+            <template x-for="(item, index) in Array.from(found_items.values())" :key="index">
+                <div>
+                    <template x-if="item?.constructor.name === 'Collection'">
+                        <div
+                            x-data="{
+                                collection: item
+                            }"
+                        >
+                            {% include 'django_spire/knowledge/navigation/item/collection/collection_item.html' with hide_chevron=True %}
+                        </div>
+                    </template>
+                    <template x-if="item?.constructor.name === 'Entry'">
+                        <div
+                            x-data="{
+                                entry: item
+                            }"
+                        >
+                            {% include 'django_spire/knowledge/navigation/item/entry/entry_item.html' %}
+                        </div>
+                    </template>
+                </div>
+            </template>
+        </div>
+    </div>
 </div>

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

@@ -0,0 +1,29 @@
+<div class="knowledge-nav-item cursor-pointer row">
+    <div
+        class="col text-start"
+        {% if AuthController.knowledge.can_view %}
+            @click="collection.toggle_show_details({value: !collection.show_details})"
+        {% endif %}
+    >
+        <i
+            :class="collection.show_details ? 'bi bi-chevron-down' : 'bi bi-chevron-right'"
+            {% if hide_chevron %}
+            style="visibility: hidden"
+            {% else %}
+            :style="{visibility: (collection.has_child_collections() || collection.has_entries()) ? 'visible' : 'hidden'}"
+            {% endif %}
+        ></i>
+        <i class="bi bi-folder2 fs-5"></i>
+        <span
+            :class="collection.id === {{ collection.pk|default:0 }} ? 'text-app-accent' : ''"
+            x-text="collection.name"
+        ></span>
+    </div>
+    {% if AuthController.knowledge.can_view %}
+        <div class="col-auto">
+            <div class="d-flex h-100 justify-content-center align-items-center">
+                {% include 'django_spire/knowledge/navigation/item/collection/dropdown/navigation_ellipsis_dropdown.html' %}
+            </div>
+        </div>
+    {% endif %}
+</div>

django_spire/knowledge/templates/django_spire/knowledge/navigation/item/collection/dropdown/navigation_ellipsis_dropdown.html

@@ -0,0 +1,15 @@
+{% extends 'django_spire/dropdown/ellipsis_dropdown.html' %}
+
+{% block dropdown_content %}
+    {% if AuthController.knowledge.can_change %}
+        {% include 'django_spire/dropdown/element/dropdown_link_element.html' with x_link_url='collection.edit_url' link_icon='bi bi-pencil' link_text='Edit Collection' %}
+    {% endif %}
+    {% if AuthController.knowledge.can_add %}
+        {% include 'django_spire/dropdown/element/dropdown_link_element.html' with x_link_url='collection.create_entry_url' link_icon='bi bi-plus' link_text='Add Entry' %}
+        {% include 'django_spire/dropdown/element/dropdown_link_element.html' with x_link_url='collection.import_entry_url' link_icon='bi bi-upload' link_text='Import Entry' %}
+    {% endif %}
+    {% if AuthController.knowledge.can_delete %}
+        {% include 'django_spire/dropdown/element/dropdown_link_element.html' with x_link_url='collection.delete_url' link_icon='bi bi-trash3' link_text='Delete Collection' link_css='text-app-danger' %}
+    {% endif %}
+{% endblock %}
+

django_spire/knowledge/templates/django_spire/knowledge/navigation/item/entry/dropdown/navigation_ellipsis_dropdown.html

@@ -0,0 +1,12 @@
+{% extends 'django_spire/dropdown/ellipsis_dropdown.html' %}
+
+{% block dropdown_content %}
+    {% if AuthController.knowledge.can_change %}
+        {% include 'django_spire/dropdown/element/dropdown_link_element.html' with x_link_url='entry.edit_url' link_icon='bi bi-input-cursor-text' link_text='Rename' %}
+        {% include 'django_spire/dropdown/element/dropdown_link_element.html' with x_link_url='entry.edit_version_url' link_icon='bi bi-pencil' link_text='Edit' %}
+    {% endif %}
+    {% if AuthController.knowledge.can_delete %}
+        {% include 'django_spire/dropdown/element/dropdown_link_element.html' with x_link_url='entry.delete_url' link_icon='bi bi-trash3' link_text='Delete' link_css='text-app-danger' %}
+    {% endif %}
+{% endblock %}
+

django_spire/knowledge/templates/django_spire/knowledge/navigation/item/entry/entry_item.html

@@ -0,0 +1,18 @@
+<div class="row ms-4 knowledge-nav-item cursor-pointer">
+    <a
+        class="col text-decoration-none text-black"
+        {% if AuthController.knowledge.can_view %}
+            :href="'{% url "django_spire:knowledge:entry:version:page:detail" pk=0 %}'.replace(0, entry.version_id)"
+        {% endif %}
+    >
+        <i class="bi bi-file-earmark-text"></i>
+        <span class="fw-normal" x-text="entry.name"></span>
+    </a>
+    {% if AuthController.knowledge.can_view %}
+        <div class="col-auto">
+            <div class="d-flex h-100 justify-content-center align-items-center">
+                {% include 'django_spire/knowledge/navigation/item/entry/dropdown/navigation_ellipsis_dropdown.html' %}
+            </div>
+        </div>
+    {% endif %}
+</div>