django-microsys 2.2.3__tar.gz → 2.2.5__tar.gz

{django_microsys-2.2.3 → django_microsys-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django_microsys
-Version: 2.2.3
+Version: 2.2.5
 Summary: Django microSYS (System Integration Service) - Multilingual Django Starter Pack, Packed with Features.
 Author-email: DeBeski <debeski1@gmail.com>
 License: NON-COMMERCIAL
@@ -8,6 +8,7 @@ Project-URL: Homepage, https://github.com/debeski/django-microsys
 Keywords: django,microsys,permissions,authentication
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 5
+Classifier: Framework :: Django :: 6
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{django_microsys-2.2.3 → django_microsys-2.2.5}/django_microsys.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-microsys
-Version: 2.2.3
+Version: 2.2.5
 Summary: Django microSYS (System Integration Service) - Multilingual Django Starter Pack, Packed with Features.
 Author-email: DeBeski <debeski1@gmail.com>
 License: NON-COMMERCIAL
@@ -8,6 +8,7 @@ Project-URL: Homepage, https://github.com/debeski/django-microsys
 Keywords: django,microsys,permissions,authentication
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 5
+Classifier: Framework :: Django :: 6
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{django_microsys-2.2.3 → django_microsys-2.2.5}/django_microsys.egg-info/SOURCES.txt

@@ -26,6 +26,7 @@ microsys/guards.py
 microsys/managers.py
 microsys/middleware.py
 microsys/models.py
+microsys/navbar.py
 microsys/patches.py
 microsys/registration.py
 microsys/scaffold.py
@@ -33,6 +34,7 @@ microsys/signals.py
 microsys/tables.py
 microsys/themes.py
 microsys/translations.py
+microsys/trust.py
 microsys/urls.py
 microsys/utils.py
 microsys/widgets.py
@@ -43,6 +45,7 @@ microsys/formats/en/__init__.py
 microsys/formats/en/formats.py
 microsys/management/commands/__init__.py
 microsys/management/commands/microsys_check.py
+microsys/management/commands/microsys_settings.py
 microsys/management/commands/microsys_setup.py
 microsys/management/commands/migrator.py
 microsys/management/commands/seed_activity_log.py
@@ -51,6 +54,8 @@ microsys/migrations/0002_public_registration.py
 microsys/migrations/0003_public_root_split.py
 microsys/migrations/0004_client_ip_and_trusted_devices.py
 microsys/migrations/0005_systemsettings_allow_user_font_override_and_more.py
+microsys/migrations/0006_systemsettings_navbar_config.py
+microsys/migrations/0007_systemsettings_prevent_multiple_active_sessions.py
 microsys/migrations/__init__.py
 microsys/scaffold_templates/app/README.md.tmpl
 microsys/scaffold_templates/app/__init__.py.tmpl
@@ -138,6 +143,7 @@ microsys/static/microsys/main/css/buttons.css
 microsys/static/microsys/main/css/dropdowns.css
 microsys/static/microsys/main/css/index_cards.css
 microsys/static/microsys/main/css/main.css
+microsys/static/microsys/main/css/navbar.css
 microsys/static/microsys/main/css/options.css
 microsys/static/microsys/main/css/pagination.css
 microsys/static/microsys/main/css/selectors.css
@@ -147,6 +153,7 @@ microsys/static/microsys/main/css/template_cleanup.css
 microsys/static/microsys/main/css/titlebar.css
 microsys/static/microsys/main/js/base_head.js
 microsys/static/microsys/main/js/base_runtime.js
+microsys/static/microsys/main/js/navbar.js
 microsys/static/microsys/main/js/options.js
 microsys/static/microsys/main/js/selectors.js
 microsys/static/microsys/main/js/system_setup.js
@@ -210,6 +217,9 @@ microsys/templates/microsys/includes/font_settings_matrix.html
 microsys/templates/microsys/includes/language_catalog_editor.html
 microsys/templates/microsys/includes/language_fonts_editor.html
 microsys/templates/microsys/includes/language_previews.html
+microsys/templates/microsys/includes/navbar.html
+microsys/templates/microsys/includes/navbar_builder.html
+microsys/templates/microsys/includes/navbar_mode_previews.html
 microsys/templates/microsys/includes/options.html
 microsys/templates/microsys/includes/sidebar_builder.html
 microsys/templates/microsys/includes/sidebar_density_previews.html

django_microsys-2.2.5/microsys/VERSION

@@ -0,0 +1 @@
+2.2.5

{django_microsys-2.2.3 → django_microsys-2.2.5}/microsys/api.py

@@ -7,7 +7,7 @@ import json
 from datetime import date, datetime
 import logging
 # Project imports
-from .constants import SIDEBAR_DENSITY_VALUES, TABLE_DENSITY_VALUES, TABLE_PAGE_SIZE_VALUES
+from .constants import NAVBAR_MODE_VALUES, SIDEBAR_DENSITY_VALUES, TABLE_DENSITY_VALUES, TABLE_PAGE_SIZE_VALUES
 from .utils import (
     get_effective_allowed_themes,
     get_system_config,
@@ -15,6 +15,7 @@ from .utils import (
     is_global_staff,
     is_scope_enabled,
     log_user_action,
+    normalize_navbar_config,
     normalize_sidebar_behavior,
     user_has_model_permission,
 )
@@ -208,6 +209,7 @@ def update_preferences(request):
             system_config = get_system_config()
             allowed_themes = set(get_effective_allowed_themes(system_config))
             sidebar_config = normalize_sidebar_behavior(system_config.get('sidebar', {}))
+            navbar_config = normalize_navbar_config(system_config.get('navbar', {}))
             
             language_preview_requested = bool(data.get('__language_preview'))
 
@@ -255,6 +257,14 @@ def update_preferences(request):
                         if value not in SIDEBAR_DENSITY_VALUES:
                             prefs.pop('sidebar_density', None)
                             continue
+                    if key == 'navbar_mode':
+                        if (
+                            not navbar_config.get('enabled', False)
+                            or not navbar_config.get('allow_user_mode_override', True)
+                            or value not in NAVBAR_MODE_VALUES
+                        ):
+                            prefs.pop('navbar_mode', None)
+                            continue
                     if key == 'table_page_size':
                         try:
                             coerced_value = int(value)

{django_microsys-2.2.3 → django_microsys-2.2.5}/microsys/constants.py

@@ -20,6 +20,12 @@ SIDEBAR_COLLAPSE_MODE_CHOICES = (
     ('locked_expanded', 'Locked Expanded'),
 )
 SIDEBAR_COLLAPSE_MODE_VALUES = {value for value, _label in SIDEBAR_COLLAPSE_MODE_CHOICES}
+DEFAULT_NAVBAR_MODE = 'hierarchy'
+NAVBAR_MODE_CHOICES = (
+    (DEFAULT_NAVBAR_MODE, 'Hierarchy'),
+    ('history', 'History'),
+)
+NAVBAR_MODE_VALUES = {value for value, _label in NAVBAR_MODE_CHOICES}
 TITLEBAR_HOME_SHAPE_CHOICES = (
     ('circle', 'Circle'),
     ('square', 'Square'),

{django_microsys-2.2.3 → django_microsys-2.2.5}/microsys/context_processors.py

@@ -1,11 +1,13 @@
 from urllib.parse import urlsplit
 
 from .constants import DEFAULT_TABLE_DENSITY, TABLE_DENSITY_CHOICES, TABLE_DENSITY_VALUES
+from .navbar import resolve_navbar_mode, strip_navbar_mode_preference
 from .utils import (
     get_effective_allowed_themes,
     get_user_management_tier_state_for_user,
     has_section_models,
     is_scope_enabled,
+    normalize_navbar_config,
     normalize_sidebar_behavior,
     resolve_sidebar_collapsed_preference,
     resolve_sidebar_density_preference,
@@ -244,6 +246,8 @@ def microsys_context(request):
     if not allow_user_language_override and not request.session.get('ms_force_language_preview'):
         user_prefs = {key: value for key, value in user_prefs.items() if key != 'language'}
     user_prefs = resolve_user_theme_preference(user_prefs, final_config)
+    navbar_runtime_config = normalize_navbar_config(final_config.get('navbar', {}))
+    user_prefs = strip_navbar_mode_preference(user_prefs, navbar_runtime_config)
     default_table_density = final_config.get('default_table_density', DEFAULT_TABLE_DENSITY)
     if default_table_density not in TABLE_DENSITY_VALUES:
         default_table_density = DEFAULT_TABLE_DENSITY
@@ -318,6 +322,15 @@ def microsys_context(request):
         context['sidebar_reorder_enabled'],
         context['sidebar_has_sections_manager'],
     ])
+    current_route_name = getattr(getattr(request, 'resolver_match', None), 'url_name', '')
+    navbar_enabled = bool(navbar_runtime_config.get('enabled', False)) and current_route_name != 'system_setup'
+    context['navbar_enabled'] = navbar_enabled
+    context['navbar_mode'] = resolve_navbar_mode(user_prefs, navbar_runtime_config)
+    context['navbar'] = {
+        **navbar_runtime_config,
+        'enabled': navbar_enabled,
+        'mode': context['navbar_mode'],
+    }
 
     # 7. Sidebar State (Collapsed/Expanded)
     # Prioritize DB preference if available, else session, else default

{django_microsys-2.2.3 → django_microsys-2.2.5}/microsys/discovery.py

@@ -177,6 +177,10 @@ def _route_name_tokens(value):
     return [token for token in re.split(r'[_:\-]+', (value or '').lower()) if token]
 
 
+def _route_leaf(url_name):
+    return str(url_name or '').split(':')[-1]
+
+
 def _plain_text(value, fallback=''):
     if value is None:
         return fallback
@@ -214,7 +218,7 @@ def _normalize_permissions(value):
 
 
 def _is_configurable_system_url(url_name):
-    return isinstance(url_name, str) and url_name in CONFIGURABLE_SYSTEM_ROUTE_NAMES
+    return isinstance(url_name, str) and _route_leaf(url_name) in CONFIGURABLE_SYSTEM_ROUTE_NAMES
 
 
 def _infer_model(pattern):
@@ -251,8 +255,9 @@ def _infer_group_key(url_name, model, callback):
     callback_app = _infer_callback_app_label(callback)
     if callback_app:
         return callback_app
-    if url_name in SYSTEM_ROUTE_META:
-        return SYSTEM_ROUTE_META[url_name]['group_key']
+    leaf = _route_leaf(url_name)
+    if leaf in SYSTEM_ROUTE_META:
+        return SYSTEM_ROUTE_META[leaf]['group_key']
     if ':' in url_name:
         return url_name.split(':')[0]
     return 'general'
@@ -283,13 +288,13 @@ def _infer_label(url_name, strings, model=None, callback=None):
     if explicit:
         return _plain_text(explicit)
 
-    leaf = url_name.split(':')[-1]
+    leaf = _route_leaf(url_name)
     namespace = url_name.split(':')[0] if ':' in url_name else ''
     group_key = _infer_group_key(url_name, model, callback)
     group_label = _group_label(group_key, strings)
 
-    if url_name in SYSTEM_ROUTE_META:
-        return _plain_text(strings.get(SYSTEM_ROUTE_META[url_name]['label_key'], _humanize(leaf)))
+    if leaf in SYSTEM_ROUTE_META:
+        return _plain_text(strings.get(SYSTEM_ROUTE_META[leaf]['label_key'], _humanize(leaf)))
 
     candidates = [
         f'view_{leaf}',
@@ -329,8 +334,9 @@ def _infer_permissions(url_name, model, callback):
     if explicit:
         return explicit, True
 
-    if url_name in SYSTEM_ROUTE_META:
-        perms = list(SYSTEM_ROUTE_META[url_name].get('permissions', []))
+    leaf = _route_leaf(url_name)
+    if leaf in SYSTEM_ROUTE_META:
+        perms = list(SYSTEM_ROUTE_META[leaf].get('permissions', []))
         return perms, True
 
     if model is not None:
@@ -386,7 +392,7 @@ def _infer_permissions(url_name, model, callback):
 def _is_hidden_sidebar_url(url_name, allow_system_items=False):
     if not url_name or not isinstance(url_name, str):
         return False
-    if url_name in SYSTEM_ROUTE_META:
+    if _route_leaf(url_name) in SYSTEM_ROUTE_META:
         if allow_system_items and _is_configurable_system_url(url_name):
             return False
         return True
@@ -766,6 +772,43 @@ def _is_active_path(request_path, url):
     return request_path == url or request_path.startswith(url.rstrip('/') + '/')
 
 
+def _normalized_active_path(value):
+    value = str(value or '').split('?', 1)[0].strip()
+    if not value:
+        return ''
+    return value.rstrip('/') or '/'
+
+
+def _iter_render_sidebar_items(entries):
+    for entry in entries if isinstance(entries, list) else []:
+        if not isinstance(entry, dict):
+            continue
+        if entry.get('kind') == 'group':
+            yield from _iter_render_sidebar_items(entry.get('items'))
+            continue
+        yield entry
+
+
+def _apply_sidebar_active_state(entries, request_path, open_accordions):
+    items = list(_iter_render_sidebar_items(entries))
+    current_path = _normalized_active_path(request_path)
+    exact_match = any(_normalized_active_path(item.get('url')) == current_path for item in items)
+    for item in items:
+        item_url = item.get('url')
+        item['active'] = (
+            _normalized_active_path(item_url) == current_path
+            if exact_match
+            else _is_active_path(request_path, item_url)
+        )
+
+    open_ids = set(open_accordions or [])
+    for entry in entries if isinstance(entries, list) else []:
+        if isinstance(entry, dict) and entry.get('kind') == 'group':
+            has_active = any(item.get('active') for item in entry.get('items', []))
+            entry['has_active'] = has_active
+            entry['is_open'] = entry.get('id') in open_ids or has_active
+
+
 def build_sidebar_navigation(lang_code=None, sidebar_override=None, user=None, request_path='', open_accordions=None):
     """
     Transform sidebar JSON config into a single render-ready sidebar tree.
@@ -810,11 +853,9 @@ def build_sidebar_navigation(lang_code=None, sidebar_override=None, user=None, r
                 for raw_item in entry.get('items', []):
                     resolved_item = _resolve_sidebar_item(raw_item, catalog)
                     if resolved_item and _user_has_sidebar_permission(user, resolved_item.get('permissions'), resolved_item.get('permissions_explicit', False)):
-                        resolved_item['active'] = _is_active_path(request_path, resolved_item.get('url'))
                         items.append(resolved_item)
                 if items:
                     group_id = entry.get('id') or f"group-{len(render_entries) + 1}"
-                    has_active = any(item.get('active') for item in items)
                     inferred_group_label = next((item.get('group_label') for item in items if item.get('group_label')), None)
                     inferred_group_icon = next((item.get('group_icon') for item in items if item.get('group_icon')), None)
                     render_entries.append({
@@ -825,22 +866,23 @@ def build_sidebar_navigation(lang_code=None, sidebar_override=None, user=None, r
                         'url': _resolve_group_url(entry),
                         'url_name': entry.get('url_name'),
                         'items': items,
-                        'has_active': has_active,
-                        'is_open': (group_id in open_accordions) or has_active,
+                        'has_active': False,
+                        'is_open': group_id in open_accordions,
                         'raw_name': entry.get('id') or group_id,
                     })
                 continue
 
             resolved = _resolve_sidebar_item(entry, catalog)
             if resolved and _user_has_sidebar_permission(user, resolved.get('permissions'), resolved.get('permissions_explicit', False)):
-                resolved['active'] = _is_active_path(request_path, resolved.get('url'))
                 render_entries.append(resolved)
         return render_entries
 
     render_entries = render_sidebar_entries(sidebar.get('entries', []) if isinstance(sidebar, dict) else [])
+    _apply_sidebar_active_state(render_entries, request_path, open_accordions)
     if override_sidebar and override_sidebar.get('entries') and not render_entries and base_sidebar.get('entries'):
         sidebar = base_sidebar
         render_entries = render_sidebar_entries(base_sidebar.get('entries', []))
+        _apply_sidebar_active_state(render_entries, request_path, open_accordions)
 
     return {
         'entries': render_entries,