diff --git a/.claude/settings.local.json b/.claude/settings.local.json index c68a5e77..2fc9bd45 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -6,7 +6,10 @@ "Bash(find:*)", "Bash(python:*)", "Bash(DJANGO_SETTINGS_MODULE=config.django.local python:*)", - "Bash(DJANGO_SETTINGS_MODULE=config.django.local uv run python:*)" + "Bash(DJANGO_SETTINGS_MODULE=config.django.local uv run python:*)", + "Bash(ls:*)", + "Bash(grep:*)", + "Bash(mkdir:*)" ], "deny": [], "ask": [] diff --git a/backend/apps/core/context_processors.py b/backend/apps/core/context_processors.py new file mode 100644 index 00000000..45cfe0bd --- /dev/null +++ b/backend/apps/core/context_processors.py @@ -0,0 +1,37 @@ +""" +Context processors for the core app. + +This module provides context processors that add useful utilities +and data to template contexts across the application. +""" +from django_fsm import can_proceed + +from .state_machine.exceptions import format_transition_error +from .state_machine.mixins import TRANSITION_METADATA + + +def fsm_context(request): + """ + Add FSM utilities to template context. + + This context processor makes FSM-related utilities available in all + templates, enabling easier integration of state machine functionality. + + Available context variables: + - can_proceed: Function to check if a transition can proceed + - format_transition_error: Function to format FSM exceptions + - TRANSITION_METADATA: Dictionary of default transition metadata + + Usage in templates: + {% if can_proceed(submission.transition_to_approved, request.user) %} + + {% endif %} + + Returns: + Dictionary of FSM utilities + """ + return { + 'can_proceed': can_proceed, + 'format_transition_error': format_transition_error, + 'TRANSITION_METADATA': TRANSITION_METADATA, + } diff --git a/backend/apps/core/management/commands/list_transition_callbacks.py b/backend/apps/core/management/commands/list_transition_callbacks.py index 84da1ea9..3e1393ad 100644 --- a/backend/apps/core/management/commands/list_transition_callbacks.py +++ b/backend/apps/core/management/commands/list_transition_callbacks.py @@ -8,7 +8,7 @@ showing which callbacks are registered for each model and transition. from django.core.management.base import BaseCommand, CommandParser from django.apps import apps -from apps.core.state_machine.callbacks import ( +from apps.core.state_machine.callback_base import ( callback_registry, CallbackStage, ) diff --git a/backend/apps/core/management/commands/test_transition_callbacks.py b/backend/apps/core/management/commands/test_transition_callbacks.py index 5c641b09..2a3c4879 100644 --- a/backend/apps/core/management/commands/test_transition_callbacks.py +++ b/backend/apps/core/management/commands/test_transition_callbacks.py @@ -9,7 +9,7 @@ from django.core.management.base import BaseCommand, CommandParser, CommandError from django.apps import apps from django.contrib.auth import get_user_model -from apps.core.state_machine.callbacks import ( +from apps.core.state_machine.callback_base import ( callback_registry, CallbackStage, TransitionContext, diff --git a/backend/apps/core/state_machine/__init__.py b/backend/apps/core/state_machine/__init__.py index b9069700..52a8e676 100644 --- a/backend/apps/core/state_machine/__init__.py +++ b/backend/apps/core/state_machine/__init__.py @@ -22,7 +22,7 @@ from .registry import ( register_transition_callbacks, discover_and_register_callbacks, ) -from .callbacks import ( +from .callback_base import ( BaseTransitionCallback, PreTransitionCallback, PostTransitionCallback, diff --git a/backend/apps/core/state_machine/callbacks.py b/backend/apps/core/state_machine/callback_base.py similarity index 99% rename from backend/apps/core/state_machine/callbacks.py rename to backend/apps/core/state_machine/callback_base.py index 638c8e8f..82c20a17 100644 --- a/backend/apps/core/state_machine/callbacks.py +++ b/backend/apps/core/state_machine/callback_base.py @@ -20,7 +20,7 @@ Callback Lifecycle: Example Usage: Define a custom callback:: - from apps.core.state_machine.callbacks import ( + from apps.core.state_machine.callback_base import ( PostTransitionCallback, TransitionContext, register_post_callback @@ -91,7 +91,7 @@ class CallbackStage(Enum): Example: Register callbacks at different stages:: - from apps.core.state_machine.callbacks import ( + from apps.core.state_machine.callback_base import ( CallbackStage, callback_registry ) diff --git a/backend/apps/core/state_machine/callbacks/cache.py b/backend/apps/core/state_machine/callbacks/cache.py index 954c7df8..15657d5b 100644 --- a/backend/apps/core/state_machine/callbacks/cache.py +++ b/backend/apps/core/state_machine/callbacks/cache.py @@ -11,7 +11,7 @@ import logging from django.conf import settings from django.db import models -from ..callbacks import PostTransitionCallback, TransitionContext +from ..callback_base import PostTransitionCallback, TransitionContext logger = logging.getLogger(__name__) diff --git a/backend/apps/core/state_machine/callbacks/notifications.py b/backend/apps/core/state_machine/callbacks/notifications.py index dcb2e34a..a7a20824 100644 --- a/backend/apps/core/state_machine/callbacks/notifications.py +++ b/backend/apps/core/state_machine/callbacks/notifications.py @@ -11,7 +11,7 @@ import logging from django.conf import settings from django.db import models -from ..callbacks import PostTransitionCallback, TransitionContext +from ..callback_base import PostTransitionCallback, TransitionContext logger = logging.getLogger(__name__) diff --git a/backend/apps/core/state_machine/callbacks/related_updates.py b/backend/apps/core/state_machine/callbacks/related_updates.py index 7ed38afe..fb22ebf9 100644 --- a/backend/apps/core/state_machine/callbacks/related_updates.py +++ b/backend/apps/core/state_machine/callbacks/related_updates.py @@ -11,7 +11,7 @@ import logging from django.conf import settings from django.db import models, transaction -from ..callbacks import PostTransitionCallback, TransitionContext +from ..callback_base import PostTransitionCallback, TransitionContext logger = logging.getLogger(__name__) diff --git a/backend/apps/core/state_machine/decorators.py b/backend/apps/core/state_machine/decorators.py index 14cd37a6..9bd128cf 100644 --- a/backend/apps/core/state_machine/decorators.py +++ b/backend/apps/core/state_machine/decorators.py @@ -7,7 +7,7 @@ from django.db import models from django_fsm import transition from django_fsm_log.decorators import fsm_log_by -from .callbacks import ( +from .callback_base import ( BaseTransitionCallback, CallbackStage, TransitionContext, @@ -275,7 +275,7 @@ def register_method_callbacks( if not metadata or not metadata.get('callbacks'): return - from .callbacks import CallbackStage, PostTransitionCallback, PreTransitionCallback + from .callback_base import CallbackStage, PostTransitionCallback, PreTransitionCallback for callback in metadata['callbacks']: # Determine stage from callback type diff --git a/backend/apps/core/state_machine/mixins.py b/backend/apps/core/state_machine/mixins.py index 37a31c45..622c463e 100644 --- a/backend/apps/core/state_machine/mixins.py +++ b/backend/apps/core/state_machine/mixins.py @@ -38,12 +38,72 @@ See Also: - apps.core.state_machine.fields.RichFSMField: The FSM field implementation - django_fsm.can_proceed: FSM transition checking utility """ -from typing import Any, Iterable, Optional +from typing import Any, Dict, Iterable, List, Optional from django.db import models from django_fsm import can_proceed +# Default transition metadata for styling +TRANSITION_METADATA = { + # Approval transitions + "approve": {"style": "green", "icon": "check", "requires_confirm": True, "confirm_message": "Are you sure you want to approve this?"}, + "transition_to_approved": {"style": "green", "icon": "check", "requires_confirm": True, "confirm_message": "Are you sure you want to approve this?"}, + # Rejection transitions + "reject": {"style": "red", "icon": "times", "requires_confirm": True, "confirm_message": "Are you sure you want to reject this?"}, + "transition_to_rejected": {"style": "red", "icon": "times", "requires_confirm": True, "confirm_message": "Are you sure you want to reject this?"}, + # Escalation transitions + "escalate": {"style": "yellow", "icon": "arrow-up", "requires_confirm": True, "confirm_message": "Are you sure you want to escalate this?"}, + "transition_to_escalated": {"style": "yellow", "icon": "arrow-up", "requires_confirm": True, "confirm_message": "Are you sure you want to escalate this?"}, + # Assignment transitions + "assign": {"style": "blue", "icon": "user-plus", "requires_confirm": False}, + "unassign": {"style": "gray", "icon": "user-minus", "requires_confirm": False}, + # Status transitions + "start": {"style": "blue", "icon": "play", "requires_confirm": False}, + "complete": {"style": "green", "icon": "check-circle", "requires_confirm": True, "confirm_message": "Are you sure you want to complete this?"}, + "cancel": {"style": "red", "icon": "ban", "requires_confirm": True, "confirm_message": "Are you sure you want to cancel this?"}, + "reopen": {"style": "blue", "icon": "redo", "requires_confirm": False}, + # Resolution transitions + "resolve": {"style": "green", "icon": "check-double", "requires_confirm": True, "confirm_message": "Are you sure you want to resolve this?"}, + "dismiss": {"style": "gray", "icon": "times-circle", "requires_confirm": True, "confirm_message": "Are you sure you want to dismiss this?"}, + # Default + "default": {"style": "gray", "icon": "arrow-right", "requires_confirm": False}, +} + + +def _get_transition_metadata(transition_name: str) -> Dict[str, Any]: + """Get metadata for a transition by name.""" + if transition_name in TRANSITION_METADATA: + return TRANSITION_METADATA[transition_name].copy() + + for key, metadata in TRANSITION_METADATA.items(): + if key in transition_name.lower() or transition_name.lower() in key: + return metadata.copy() + + return TRANSITION_METADATA["default"].copy() + + +def _format_transition_label(transition_name: str) -> str: + """Format a transition method name into a human-readable label.""" + label = transition_name + for prefix in ['transition_to_', 'transition_', 'do_']: + if label.startswith(prefix): + label = label[len(prefix):] + break + + if label.endswith('ed') and len(label) > 3: + if label.endswith('ied'): + label = label[:-3] + 'y' + elif label[-3] == label[-4]: + label = label[:-3] + else: + label = label[:-1] + if not label.endswith('e'): + label = label[:-1] + + return label.replace('_', ' ').title() + + class StateMachineMixin(models.Model): """ Common helpers for models that use django-fsm. @@ -148,5 +208,57 @@ class StateMachineMixin(models.Model): current_state = self.get_state_value(field_name) return current_state == state + def get_available_user_transitions(self, user) -> List[Dict[str, Any]]: + """ + Get transitions available to the given user. -__all__ = ["StateMachineMixin"] + This method returns a list of transition metadata dictionaries for + transitions that the given user can execute based on their permissions. + + Args: + user: The user to check permissions for + + Returns: + List of dictionaries containing: + - name: The transition method name + - label: Human-readable label + - icon: Font Awesome icon name + - style: Button style (green, red, yellow, blue, gray) + - requires_confirm: Whether confirmation is needed + - confirm_message: Message to show in confirmation dialog + + Example: + transitions = submission.get_available_user_transitions(request.user) + for t in transitions: + print(f"{t['label']}: {t['name']}") + """ + transitions = [] + + if not user: + return transitions + + # Get available transitions from the FSM field + available_transition_names = list(self.get_available_transitions()) + + for transition_name in available_transition_names: + method = getattr(self, transition_name, None) + if method and callable(method): + try: + if can_proceed(method, user): + metadata = _get_transition_metadata(transition_name) + transitions.append({ + 'name': transition_name, + 'label': _format_transition_label(transition_name), + 'icon': metadata.get('icon', 'arrow-right'), + 'style': metadata.get('style', 'gray'), + 'requires_confirm': metadata.get('requires_confirm', False), + 'confirm_message': metadata.get('confirm_message', 'Are you sure?'), + }) + except Exception: + # Skip transitions that raise errors + pass + + return transitions + + +__all__ = ["StateMachineMixin", "TRANSITION_METADATA"] diff --git a/backend/apps/core/state_machine/monitoring.py b/backend/apps/core/state_machine/monitoring.py index 091c3431..89be2290 100644 --- a/backend/apps/core/state_machine/monitoring.py +++ b/backend/apps/core/state_machine/monitoring.py @@ -16,7 +16,7 @@ import threading from django.conf import settings from django.db import models -from .callbacks import TransitionContext +from .callback_base import TransitionContext logger = logging.getLogger(__name__) @@ -431,7 +431,7 @@ def get_callback_execution_order( Returns: List of (stage, callback_name, priority) tuples in execution order. """ - from .callbacks import callback_registry, CallbackStage + from .callback_base import callback_registry, CallbackStage order = [] diff --git a/backend/apps/core/state_machine/registry.py b/backend/apps/core/state_machine/registry.py index 94511f7e..b1a8c08f 100644 --- a/backend/apps/core/state_machine/registry.py +++ b/backend/apps/core/state_machine/registry.py @@ -307,7 +307,7 @@ def register_callback( callback: The callback instance. stage: When to execute ('pre', 'post', 'error'). """ - from .callbacks import callback_registry, CallbackStage + from .callback_base import callback_registry, CallbackStage callback_registry.register( model_class=model_class, diff --git a/backend/apps/core/state_machine/signals.py b/backend/apps/core/state_machine/signals.py index e672df0b..18f0da94 100644 --- a/backend/apps/core/state_machine/signals.py +++ b/backend/apps/core/state_machine/signals.py @@ -11,7 +11,7 @@ import logging from django.db import models from django.dispatch import Signal, receiver -from .callbacks import TransitionContext +from .callback_base import TransitionContext logger = logging.getLogger(__name__) diff --git a/backend/apps/core/state_machine/tests/test_callbacks.py b/backend/apps/core/state_machine/tests/test_callbacks.py index 2bc92be5..d771faa1 100644 --- a/backend/apps/core/state_machine/tests/test_callbacks.py +++ b/backend/apps/core/state_machine/tests/test_callbacks.py @@ -452,7 +452,7 @@ class NotificationCallbackTests(TestCase): instance=None, ): """Helper to create a TransitionContext.""" - from ..callbacks import TransitionContext + from ..callback_base import TransitionContext from django.utils import timezone if instance is None: @@ -603,7 +603,7 @@ class CacheCallbackTests(TestCase): target_state: str = 'CLOSED_TEMP', ): """Helper to create a TransitionContext.""" - from ..callbacks import TransitionContext + from ..callback_base import TransitionContext from django.utils import timezone instance = Mock() @@ -716,7 +716,7 @@ class ModelCacheInvalidationTests(TestCase): model_name: str = 'Ride', instance_id: int = 789, ): - from ..callbacks import TransitionContext + from ..callback_base import TransitionContext from django.utils import timezone instance = Mock() @@ -783,7 +783,7 @@ class RelatedUpdateCallbackTests(TestCase): instance=None, target_state: str = 'OPERATING', ): - from ..callbacks import TransitionContext + from ..callback_base import TransitionContext from django.utils import timezone if instance is None: @@ -920,7 +920,7 @@ class CallbackErrorHandlingTests(TestCase): """Tests for callback error handling paths.""" def _create_transition_context(self): - from ..callbacks import TransitionContext + from ..callback_base import TransitionContext from django.utils import timezone instance = Mock() @@ -979,7 +979,7 @@ class CallbackErrorHandlingTests(TestCase): def test_callback_with_none_user(self): """Test callbacks handle None user gracefully.""" - from ..callbacks import TransitionContext + from ..callback_base import TransitionContext from ..callbacks.notifications import NotificationCallback from django.utils import timezone diff --git a/backend/apps/core/templatetags/__init__.py b/backend/apps/core/templatetags/__init__.py new file mode 100644 index 00000000..2b18d3ec --- /dev/null +++ b/backend/apps/core/templatetags/__init__.py @@ -0,0 +1 @@ +# Template tags for the core app diff --git a/backend/apps/core/templatetags/fsm_tags.py b/backend/apps/core/templatetags/fsm_tags.py new file mode 100644 index 00000000..7456c417 --- /dev/null +++ b/backend/apps/core/templatetags/fsm_tags.py @@ -0,0 +1,434 @@ +""" +Template tags for FSM (Finite State Machine) operations. + +This module provides template tags and filters for working with FSM-enabled +models in Django templates, including transition buttons, status displays, +and permission checks. + +Usage: + {% load fsm_tags %} + + {# Get available transitions for an object #} + {% get_available_transitions submission request.user as transitions %} + + {# Check if a specific transition is allowed #} + {% can_transition submission 'approve' request.user as can_approve %} + + {# Get the current state value #} + {{ submission|get_state_value }} + + {# Get the current state display #} + {{ submission|get_state_display }} + + {# Render a transition button #} + {% transition_button submission 'approve' request.user %} +""" +from typing import Any, Dict, List, Optional + +from django import template +from django.urls import reverse, NoReverseMatch +from django_fsm import can_proceed + +from apps.core.views.views import get_transition_metadata, TRANSITION_METADATA + +register = template.Library() + + +# ============================================================================= +# Filters for State Machine Properties +# ============================================================================= + + +@register.filter +def get_state_value(obj) -> Optional[str]: + """ + Get the current state value of an FSM-enabled object. + + Usage: + {{ object|get_state_value }} + + Args: + obj: An FSM-enabled model instance + + Returns: + The current state value or None + """ + if hasattr(obj, 'get_state_value'): + return obj.get_state_value() + if hasattr(obj, 'state_field_name'): + return getattr(obj, obj.state_field_name, None) + # Try common field names + for field in ['status', 'state']: + if hasattr(obj, field): + return getattr(obj, field, None) + return None + + +@register.filter +def get_state_display(obj) -> str: + """ + Get the display value for the current state. + + Usage: + {{ object|get_state_display }} + + Args: + obj: An FSM-enabled model instance + + Returns: + The human-readable state display value + """ + if hasattr(obj, 'get_state_display_value'): + return obj.get_state_display_value() + if hasattr(obj, 'state_field_name'): + field_name = obj.state_field_name + getter = getattr(obj, f'get_{field_name}_display', None) + if callable(getter): + return getter() + # Try common field names + for field in ['status', 'state']: + getter = getattr(obj, f'get_{field}_display', None) + if callable(getter): + return getter() + return str(get_state_value(obj) or '') + + +@register.filter +def get_state_choice(obj): + """ + Get the RichChoice object for the current state. + + Usage: + {% with choice=object|get_state_choice %} + {{ choice.metadata.icon }} + {% endwith %} + + Args: + obj: An FSM-enabled model instance + + Returns: + The RichChoice object or None + """ + if hasattr(obj, 'get_state_choice'): + return obj.get_state_choice() + return None + + +@register.filter +def app_label(obj) -> str: + """ + Get the app label of a model instance. + + Usage: + {{ object|app_label }} + + Args: + obj: A Django model instance + + Returns: + The app label string + """ + return obj._meta.app_label + + +@register.filter +def model_name(obj) -> str: + """ + Get the model name (lowercase) of a model instance. + + Usage: + {{ object|model_name }} + + Args: + obj: A Django model instance + + Returns: + The model name in lowercase + """ + return obj._meta.model_name + + +@register.filter +def default_target_id(obj) -> str: + """ + Get the default HTMX target ID for an object. + + Usage: + {{ object|default_target_id }} + + Args: + obj: A Django model instance + + Returns: + The target ID string (e.g., "editsubmission-123") + """ + return f"{obj._meta.model_name}-{obj.pk}" + + +# ============================================================================= +# Assignment Tags for Transition Operations +# ============================================================================= + + +@register.simple_tag +def get_available_transitions(obj, user) -> List[Dict[str, Any]]: + """ + Get all available transitions for an object that the user can execute. + + This tag checks each transition method on the object and returns metadata + for transitions that can proceed for the given user. + + Usage: + {% get_available_transitions submission request.user as transitions %} + {% for transition in transitions %} + + {% endfor %} + + Args: + obj: An FSM-enabled model instance + user: The user to check permissions for + + Returns: + List of transition metadata dictionaries with keys: + - name: The method name + - label: Human-readable label + - icon: Font Awesome icon name + - style: Button style (green, red, yellow, blue, gray) + - requires_confirm: Whether to show confirmation dialog + - confirm_message: Confirmation message to display + """ + transitions = [] + + if not obj or not user: + return transitions + + # Get list of available transitions + available_transition_names = [] + + if hasattr(obj, 'get_available_user_transitions'): + # Use the helper method if available + return obj.get_available_user_transitions(user) + + if hasattr(obj, 'get_available_transitions'): + available_transition_names = list(obj.get_available_transitions()) + else: + # Fallback: look for transition methods by convention + for attr_name in dir(obj): + if attr_name.startswith('transition_to_') or attr_name in ['approve', 'reject', 'escalate', 'complete', 'cancel']: + method = getattr(obj, attr_name, None) + if callable(method) and hasattr(method, '_django_fsm'): + available_transition_names.append(attr_name) + + # Filter transitions by user permission + for transition_name in available_transition_names: + method = getattr(obj, transition_name, None) + if method and callable(method): + try: + if can_proceed(method, user): + metadata = get_transition_metadata(transition_name) + transitions.append({ + 'name': transition_name, + 'label': _format_transition_label(transition_name), + 'icon': metadata.get('icon', 'arrow-right'), + 'style': metadata.get('style', 'gray'), + 'requires_confirm': metadata.get('requires_confirm', False), + 'confirm_message': metadata.get('confirm_message', 'Are you sure?'), + }) + except Exception: + # Skip transitions that raise errors during can_proceed check + pass + + return transitions + + +@register.simple_tag +def can_transition(obj, transition_name: str, user) -> bool: + """ + Check if a specific transition can be executed by the user. + + Usage: + {% can_transition submission 'approve' request.user as can_approve %} + {% if can_approve %} + + {% endif %} + + Args: + obj: An FSM-enabled model instance + transition_name: The name of the transition method + user: The user to check permissions for + + Returns: + True if the transition can proceed, False otherwise + """ + if not obj or not user or not transition_name: + return False + + method = getattr(obj, transition_name, None) + if not method or not callable(method): + return False + + try: + return can_proceed(method, user) + except Exception: + return False + + +@register.simple_tag +def get_transition_url(obj, transition_name: str) -> str: + """ + Get the URL for executing a transition on an object. + + Usage: + {% get_transition_url submission 'approve' as approve_url %} + + Args: + obj: An FSM-enabled model instance + transition_name: The name of the transition method + + Returns: + The URL string for the transition endpoint + """ + try: + return reverse('core:fsm_transition', kwargs={ + 'app_label': obj._meta.app_label, + 'model_name': obj._meta.model_name, + 'pk': obj.pk, + 'transition_name': transition_name, + }) + except NoReverseMatch: + return '' + + +# ============================================================================= +# Inclusion Tags for Rendering Components +# ============================================================================= + + +@register.inclusion_tag('htmx/state_actions.html', takes_context=True) +def render_state_actions(context, obj, user=None, **kwargs): + """ + Render the state action buttons for an FSM-enabled object. + + Usage: + {% render_state_actions submission request.user %} + {% render_state_actions submission request.user button_size='sm' %} + + Args: + context: Template context + obj: An FSM-enabled model instance + user: The user to check permissions for (defaults to request.user) + **kwargs: Additional template context variables + + Returns: + Context for the state_actions.html template + """ + if user is None: + user = context.get('request', {}).user if 'request' in context else None + + return { + 'object': obj, + 'user': user, + 'request': context.get('request'), + **kwargs, + } + + +@register.inclusion_tag('htmx/status_with_actions.html', takes_context=True) +def render_status_with_actions(context, obj, user=None, **kwargs): + """ + Render the status badge with action buttons for an FSM-enabled object. + + Usage: + {% render_status_with_actions submission request.user %} + {% render_status_with_actions submission request.user dropdown_actions=True %} + + Args: + context: Template context + obj: An FSM-enabled model instance + user: The user to check permissions for (defaults to request.user) + **kwargs: Additional template context variables + + Returns: + Context for the status_with_actions.html template + """ + if user is None: + user = context.get('request', {}).user if 'request' in context else None + + return { + 'object': obj, + 'user': user, + 'request': context.get('request'), + **kwargs, + } + + +# ============================================================================= +# Helper Functions +# ============================================================================= + + +def _format_transition_label(transition_name: str) -> str: + """ + Format a transition method name into a human-readable label. + + Examples: + 'transition_to_approved' -> 'Approve' + 'approve' -> 'Approve' + 'reject_submission' -> 'Reject Submission' + + Args: + transition_name: The transition method name + + Returns: + Human-readable label + """ + # Remove common prefixes + label = transition_name + for prefix in ['transition_to_', 'transition_', 'do_']: + if label.startswith(prefix): + label = label[len(prefix):] + break + + # Remove past tense suffix and capitalize + # e.g., 'approved' -> 'Approve' + if label.endswith('ed') and len(label) > 3: + # Handle special cases + if label.endswith('ied'): + label = label[:-3] + 'y' + elif label[-3] == label[-4]: # doubled consonant (e.g., 'submitted') + label = label[:-3] + else: + label = label[:-1] # Remove 'd' + if label.endswith('e'): + pass # Keep the 'e' for words like 'approve' + else: + label = label[:-1] # Remove 'e' for words like 'rejected' -> 'reject' + + # Replace underscores with spaces and title case + label = label.replace('_', ' ').title() + + return label + + +# ============================================================================= +# Registration +# ============================================================================= + + +# Ensure all tags and filters are registered +__all__ = [ + # Filters + 'get_state_value', + 'get_state_display', + 'get_state_choice', + 'app_label', + 'model_name', + 'default_target_id', + # Tags + 'get_available_transitions', + 'can_transition', + 'get_transition_url', + # Inclusion tags + 'render_state_actions', + 'render_status_with_actions', +] diff --git a/backend/apps/core/urls.py b/backend/apps/core/urls.py deleted file mode 100644 index ebbd351f..00000000 --- a/backend/apps/core/urls.py +++ /dev/null @@ -1,26 +0,0 @@ -""" -Core app URL configuration. -""" - -from django.urls import path, include -from .views.entity_search import ( - EntityFuzzySearchView, - EntityNotFoundView, - QuickEntitySuggestionView, -) - -app_name = "core" - -# Entity search endpoints -entity_patterns = [ - path("search/", EntityFuzzySearchView.as_view(), name="entity_fuzzy_search"), - path("not-found/", EntityNotFoundView.as_view(), name="entity_not_found"), - path( - "suggestions/", QuickEntitySuggestionView.as_view(), name="entity_suggestions" - ), -] - -urlpatterns = [ - # Entity fuzzy matching and search endpoints - path("entities/", include(entity_patterns)), -] diff --git a/backend/apps/core/urls/__init__.py b/backend/apps/core/urls/__init__.py index 01327379..6bbfff11 100644 --- a/backend/apps/core/urls/__init__.py +++ b/backend/apps/core/urls/__init__.py @@ -1 +1,47 @@ -# URLs package for core app +""" +Core app URL configuration. +""" + +from django.urls import path, include +from ..views.entity_search import ( + EntityFuzzySearchView, + EntityNotFoundView, + QuickEntitySuggestionView, +) +from ..views.views import FSMTransitionView + +app_name = "core" + +# Entity search endpoints +entity_patterns = [ + path("search/", EntityFuzzySearchView.as_view(), name="entity_fuzzy_search"), + path("not-found/", EntityNotFoundView.as_view(), name="entity_not_found"), + path( + "suggestions/", QuickEntitySuggestionView.as_view(), name="entity_suggestions" + ), +] + +# FSM transition endpoints +fsm_patterns = [ + # Generic FSM transition endpoint + # URL: /core/fsm////transition// + path( + "///transition//", + FSMTransitionView.as_view(), + name="fsm_transition", + ), + # Slug-based FSM transition endpoint for models that use slugs + # URL: /core/fsm///by-slug//transition// + path( + "//by-slug//transition//", + FSMTransitionView.as_view(), + name="fsm_transition_by_slug", + ), +] + +urlpatterns = [ + # Entity fuzzy matching and search endpoints + path("entities/", include(entity_patterns)), + # FSM transition endpoints + path("fsm/", include(fsm_patterns)), +] diff --git a/backend/apps/core/views/views.py b/backend/apps/core/views/views.py index 6113b621..b7c8d60e 100644 --- a/backend/apps/core/views/views.py +++ b/backend/apps/core/views/views.py @@ -1,14 +1,30 @@ """ Core views for the application. """ +import json +import logging from typing import Any, Dict, Optional, Type +from django.contrib.contenttypes.models import ContentType +from django.core.exceptions import ObjectDoesNotExist from django.db.models import Model -from django.http import HttpRequest, HttpResponse -from django.shortcuts import redirect, render +from django.http import HttpRequest, HttpResponse, JsonResponse +from django.shortcuts import redirect, render, get_object_or_404 from django.urls import reverse +from django.utils.decorators import method_decorator from django.views import View +from django.views.decorators.csrf import csrf_protect from django.views.generic import DetailView, TemplateView +from django_fsm import can_proceed, TransitionNotAllowed + +from apps.core.state_machine.exceptions import ( + TransitionPermissionDenied, + TransitionValidationError, + TransitionNotAvailable, + format_transition_error, +) + +logger = logging.getLogger(__name__) class SlugRedirectMixin(View): @@ -91,3 +107,409 @@ class GlobalSearchView(TemplateView): ) return render(request, self.template_name, context) + + +# ============================================================================= +# FSM Transition View Infrastructure +# ============================================================================= + + +# Default transition metadata for styling +TRANSITION_METADATA = { + # Approval transitions + "approve": {"style": "green", "icon": "check", "requires_confirm": True, "confirm_message": "Are you sure you want to approve this?"}, + "transition_to_approved": {"style": "green", "icon": "check", "requires_confirm": True, "confirm_message": "Are you sure you want to approve this?"}, + # Rejection transitions + "reject": {"style": "red", "icon": "times", "requires_confirm": True, "confirm_message": "Are you sure you want to reject this?"}, + "transition_to_rejected": {"style": "red", "icon": "times", "requires_confirm": True, "confirm_message": "Are you sure you want to reject this?"}, + # Escalation transitions + "escalate": {"style": "yellow", "icon": "arrow-up", "requires_confirm": True, "confirm_message": "Are you sure you want to escalate this?"}, + "transition_to_escalated": {"style": "yellow", "icon": "arrow-up", "requires_confirm": True, "confirm_message": "Are you sure you want to escalate this?"}, + # Assignment transitions + "assign": {"style": "blue", "icon": "user-plus", "requires_confirm": False}, + "unassign": {"style": "gray", "icon": "user-minus", "requires_confirm": False}, + # Status transitions + "start": {"style": "blue", "icon": "play", "requires_confirm": False}, + "complete": {"style": "green", "icon": "check-circle", "requires_confirm": True, "confirm_message": "Are you sure you want to complete this?"}, + "cancel": {"style": "red", "icon": "ban", "requires_confirm": True, "confirm_message": "Are you sure you want to cancel this?"}, + "reopen": {"style": "blue", "icon": "redo", "requires_confirm": False}, + # Resolution transitions + "resolve": {"style": "green", "icon": "check-double", "requires_confirm": True, "confirm_message": "Are you sure you want to resolve this?"}, + "dismiss": {"style": "gray", "icon": "times-circle", "requires_confirm": True, "confirm_message": "Are you sure you want to dismiss this?"}, + # Default + "default": {"style": "gray", "icon": "arrow-right", "requires_confirm": False}, +} + + +def get_transition_metadata(transition_name: str) -> Dict[str, Any]: + """Get metadata for a transition by name.""" + # Check for exact match first + if transition_name in TRANSITION_METADATA: + return TRANSITION_METADATA[transition_name].copy() + + # Check for partial match (e.g., "transition_to_approved" contains "approve") + for key, metadata in TRANSITION_METADATA.items(): + if key in transition_name.lower() or transition_name.lower() in key: + return metadata.copy() + + return TRANSITION_METADATA["default"].copy() + + +def add_toast_trigger(response: HttpResponse, message: str, toast_type: str = "success") -> HttpResponse: + """ + Add HX-Trigger header to trigger Alpine.js toast. + + Args: + response: The HTTP response to modify + message: Toast message to display + toast_type: Type of toast ('success', 'error', 'warning', 'info') + + Returns: + Modified response with HX-Trigger header + """ + trigger_data = { + "showToast": { + "message": message, + "type": toast_type + } + } + response["HX-Trigger"] = json.dumps(trigger_data) + return response + + +@method_decorator(csrf_protect, name='dispatch') +class FSMTransitionView(View): + """ + Generic view for handling FSM state transitions via HTMX. + + This view handles POST requests to execute FSM transitions on any model + that uses django-fsm. It validates permissions, executes the transition, + and returns either an updated HTML partial (for HTMX) or JSON response. + + URL pattern should provide: + - app_label: The app containing the model + - model_name: The model name (lowercase) + - pk: The primary key of the object + - transition_name: The name of the transition method to execute + + Example URL patterns: + path('fsm////transition//', + FSMTransitionView.as_view(), name='fsm_transition') + """ + + # Override these in subclasses or pass via URL kwargs + partial_template = None # Template to render after successful transition + + def get_model_class(self, app_label: str, model_name: str) -> Optional[Type[Model]]: + """ + Get the model class from app_label and model_name. + + Args: + app_label: The Django app label (e.g., 'moderation') + model_name: The model name in lowercase (e.g., 'editsubmission') + + Returns: + The model class or None if not found + """ + try: + content_type = ContentType.objects.get(app_label=app_label, model=model_name) + return content_type.model_class() + except ContentType.DoesNotExist: + return None + + def get_object(self, model_class: Type[Model], pk: Any, slug: Optional[str] = None) -> Model: + """ + Get the model instance. + + Args: + model_class: The model class + pk: Primary key of the object (can be int or slug) + slug: Optional slug if using slug-based lookup + + Returns: + The model instance + + Raises: + Http404: If object not found + """ + if slug: + return get_object_or_404(model_class, slug=slug) + return get_object_or_404(model_class, pk=pk) + + def get_transition_method(self, obj: Model, transition_name: str): + """ + Get the transition method from the object. + + Args: + obj: The model instance + transition_name: The name of the transition method + + Returns: + The transition method or None + """ + return getattr(obj, transition_name, None) + + def validate_transition(self, obj: Model, transition_name: str, user) -> tuple[bool, Optional[str]]: + """ + Validate that the transition can proceed. + + Args: + obj: The model instance + transition_name: The name of the transition method + user: The user attempting the transition + + Returns: + Tuple of (can_proceed, error_message) + """ + method = self.get_transition_method(obj, transition_name) + + if method is None: + return False, f"Transition '{transition_name}' not found on {obj.__class__.__name__}" + + if not callable(method): + return False, f"'{transition_name}' is not a callable method" + + # Check if the transition can proceed + if not can_proceed(method, user): + return False, f"Transition '{transition_name}' is not allowed from current state" + + return True, None + + def execute_transition(self, obj: Model, transition_name: str, user, **kwargs) -> None: + """ + Execute the transition on the object. + + Args: + obj: The model instance + transition_name: The name of the transition method + user: The user performing the transition + **kwargs: Additional arguments to pass to the transition method + + Raises: + TransitionNotAllowed: If transition fails + """ + method = self.get_transition_method(obj, transition_name) + + # Execute the transition with user parameter + method(user=user, **kwargs) + obj.save() + + def get_success_message(self, obj: Model, transition_name: str) -> str: + """Generate a success message for the transition.""" + # Clean up transition name for display + display_name = transition_name.replace("transition_to_", "").replace("_", " ").title() + model_name = obj._meta.verbose_name.title() + return f"{model_name} has been {display_name.lower()}d successfully." + + def get_error_message(self, error: Exception) -> str: + """Generate an error message from an exception.""" + if hasattr(error, "user_message"): + return error.user_message + return str(error) or "An error occurred during the transition." + + def get_partial_template(self, obj: Model, request: HttpRequest) -> Optional[str]: + """ + Get the template to render after a successful transition. + + Override this method to return a custom template based on the object. + Uses Django's template loader to find model-specific templates. + """ + if self.partial_template: + return self.partial_template + + app_label = obj._meta.app_label + model_name = obj._meta.model_name + + # Special handling for parks and rides - return status section + if app_label == 'parks' and model_name == 'park': + return "parks/partials/park_status_actions.html" + elif app_label == 'rides' and model_name == 'ride': + return "rides/partials/ride_status_actions.html" + + # Check for model-specific templates in order of preference + possible_templates = [ + f"{app_label}/partials/{model_name}_row.html", + f"{app_label}/partials/{model_name}_item.html", + f"{app_label}/partials/{model_name}.html", + "htmx/updated_row.html", + ] + + # Use template loader to check if template exists + from django.template.loader import select_template + from django.template import TemplateDoesNotExist + try: + template = select_template(possible_templates) + return template.template.name + except TemplateDoesNotExist: + return "htmx/updated_row.html" + + def format_success_response( + self, + request: HttpRequest, + obj: Model, + transition_name: str + ) -> HttpResponse: + """ + Format a successful transition response. + + For HTMX requests: renders the partial template with toast trigger + For regular requests: returns JSON response + """ + message = self.get_success_message(obj, transition_name) + + if request.headers.get("HX-Request"): + # HTMX request - render partial and add toast trigger + template = self.get_partial_template(obj, request) + + if template: + # Build context with object and model-specific variable names + context = { + "object": obj, + "user": request.user, + "transition_success": True, + "success_message": message, + } + # Add model-specific variable (e.g., 'park' or 'ride') for template compatibility + model_name = obj._meta.model_name + context[model_name] = obj + + response = render(request, template, context) + else: + # No template - return empty response with OOB swap for status + response = HttpResponse("") + + return add_toast_trigger(response, message, "success") + + # Regular request - return JSON + return JsonResponse({ + "success": True, + "message": message, + "new_state": getattr(obj, obj.state_field_name, None) if hasattr(obj, "state_field_name") else None, + }) + + def format_error_response( + self, + request: HttpRequest, + error: Exception, + status_code: int = 400 + ) -> HttpResponse: + """ + Format an error response. + + For HTMX requests: returns error with toast trigger + For regular requests: returns JSON response + """ + message = self.get_error_message(error) + error_data = format_transition_error(error) + + if request.headers.get("HX-Request"): + # HTMX request - return error response with toast trigger + response = HttpResponse(status=status_code) + return add_toast_trigger(response, message, "error") + + # Regular request - return JSON + return JsonResponse({ + "success": False, + "error": error_data, + }, status=status_code) + + def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse: + """Handle POST request to execute a transition.""" + app_label = kwargs.get("app_label") + model_name = kwargs.get("model_name") + pk = kwargs.get("pk") + slug = kwargs.get("slug") + transition_name = kwargs.get("transition_name") + + # Validate required parameters + if not all([app_label, model_name, transition_name]): + return self.format_error_response( + request, + ValueError("Missing required parameters: app_label, model_name, and transition_name"), + 400 + ) + + if not pk and not slug: + return self.format_error_response( + request, + ValueError("Missing required parameter: pk or slug"), + 400 + ) + + # Get the model class + model_class = self.get_model_class(app_label, model_name) + if model_class is None: + return self.format_error_response( + request, + ValueError(f"Model '{app_label}.{model_name}' not found"), + 404 + ) + + # Get the object + try: + obj = self.get_object(model_class, pk, slug) + except ObjectDoesNotExist: + return self.format_error_response( + request, + ValueError(f"Object not found: {model_name} with pk={pk}"), + 404 + ) + + # Validate the transition + can_execute, error_msg = self.validate_transition(obj, transition_name, request.user) + if not can_execute: + return self.format_error_response( + request, + TransitionNotAvailable( + message=error_msg, + user_message=error_msg, + current_state=getattr(obj, "status", None), + requested_transition=transition_name, + ), + 400 + ) + + # Execute the transition + try: + # Get any additional kwargs from POST data + extra_kwargs = {} + if request.POST.get("notes"): + extra_kwargs["notes"] = request.POST.get("notes") + if request.POST.get("reason"): + extra_kwargs["reason"] = request.POST.get("reason") + + self.execute_transition(obj, transition_name, request.user, **extra_kwargs) + + logger.info( + f"Transition '{transition_name}' executed on {model_class.__name__}(pk={obj.pk}) by user {request.user}" + ) + + return self.format_success_response(request, obj, transition_name) + + except TransitionPermissionDenied as e: + logger.warning( + f"Permission denied for transition '{transition_name}' on {model_class.__name__}(pk={obj.pk}) by user {request.user}: {e}" + ) + return self.format_error_response(request, e, 403) + + except TransitionValidationError as e: + logger.warning( + f"Validation error for transition '{transition_name}' on {model_class.__name__}(pk={obj.pk}): {e}" + ) + return self.format_error_response(request, e, 400) + + except TransitionNotAllowed as e: + logger.warning( + f"Transition not allowed: '{transition_name}' on {model_class.__name__}(pk={obj.pk}): {e}" + ) + return self.format_error_response(request, e, 400) + + except Exception as e: + logger.exception( + f"Unexpected error during transition '{transition_name}' on {model_class.__name__}(pk={obj.pk})" + ) + return self.format_error_response( + request, + ValueError(f"An unexpected error occurred: {str(e)}"), + 500 + ) diff --git a/backend/apps/moderation/urls.py b/backend/apps/moderation/urls.py index a80f6345..e2fee8fd 100644 --- a/backend/apps/moderation/urls.py +++ b/backend/apps/moderation/urls.py @@ -7,6 +7,7 @@ moderation functionality including reports, queue management, actions, and bulk """ from django.urls import path, include +from django.views.generic import TemplateView from rest_framework.routers import DefaultRouter from .views import ( @@ -16,6 +17,49 @@ from .views import ( BulkOperationViewSet, UserModerationViewSet, ) +from apps.core.views.views import FSMTransitionView + + +class ModerationDashboardView(TemplateView): + """Moderation dashboard view with HTMX integration.""" + template_name = "moderation/dashboard.html" + + def get_context_data(self, **kwargs): + from .models import EditSubmission, PhotoSubmission + from .selectors import pending_submissions_for_review + + context = super().get_context_data(**kwargs) + context["submissions"] = pending_submissions_for_review() + return context + + +class SubmissionListView(TemplateView): + """Submission list view with filtering.""" + template_name = "moderation/partials/dashboard_content.html" + + def get_context_data(self, **kwargs): + from .models import EditSubmission, PhotoSubmission + from itertools import chain + + context = super().get_context_data(**kwargs) + status = self.request.GET.get("status", "PENDING") + + # Get filtered submissions + edit_submissions = EditSubmission.objects.filter(status=status).select_related("user") + photo_submissions = PhotoSubmission.objects.filter(status=status).select_related("user") + + # Combine and sort + context["submissions"] = sorted( + chain(edit_submissions, photo_submissions), + key=lambda x: x.created_at, + reverse=True, + ) + return context + + +class HistoryPageView(TemplateView): + """Main history page view.""" + template_name = "moderation/history.html" # Create router and register viewsets router = DefaultRouter() @@ -27,11 +71,104 @@ router.register(r"users", UserModerationViewSet, basename="user-moderation") app_name = "moderation" -urlpatterns = [ - # Include all router URLs - path("", include(router.urls)), +# FSM transition convenience URLs for moderation models +fsm_transition_patterns = [ + # EditSubmission transitions + # URL: /api/moderation/submissions//transition// + path( + "submissions//transition//", + FSMTransitionView.as_view(), + {"app_label": "moderation", "model_name": "editsubmission"}, + name="submission_transition", + ), + # PhotoSubmission transitions + # URL: /api/moderation/photos//transition// + path( + "photos//transition//", + FSMTransitionView.as_view(), + {"app_label": "moderation", "model_name": "photosubmission"}, + name="photo_transition", + ), + # ModerationReport transitions + # URL: /api/moderation/reports//transition// + path( + "reports//transition//", + FSMTransitionView.as_view(), + {"app_label": "moderation", "model_name": "moderationreport"}, + name="report_transition", + ), + # ModerationQueue transitions + # URL: /api/moderation/queue//transition// + path( + "queue//transition//", + FSMTransitionView.as_view(), + {"app_label": "moderation", "model_name": "moderationqueue"}, + name="queue_transition", + ), + # BulkOperation transitions + # URL: /api/moderation/bulk//transition// + path( + "bulk//transition//", + FSMTransitionView.as_view(), + {"app_label": "moderation", "model_name": "bulkoperation"}, + name="bulk_operation_transition", + ), + # Backward compatibility aliases for EditSubmission actions + # These redirect the old URL patterns to the FSM transition view + path( + "submissions//approve/", + FSMTransitionView.as_view(), + {"app_label": "moderation", "model_name": "editsubmission", "transition_name": "transition_to_approved"}, + name="approve_submission", + ), + path( + "submissions//reject/", + FSMTransitionView.as_view(), + {"app_label": "moderation", "model_name": "editsubmission", "transition_name": "transition_to_rejected"}, + name="reject_submission", + ), + path( + "submissions//escalate/", + FSMTransitionView.as_view(), + {"app_label": "moderation", "model_name": "editsubmission", "transition_name": "transition_to_escalated"}, + name="escalate_submission", + ), + # Backward compatibility aliases for PhotoSubmission actions + path( + "photos//approve/", + FSMTransitionView.as_view(), + {"app_label": "moderation", "model_name": "photosubmission", "transition_name": "transition_to_approved"}, + name="approve_photo", + ), + path( + "photos//reject/", + FSMTransitionView.as_view(), + {"app_label": "moderation", "model_name": "photosubmission", "transition_name": "transition_to_rejected"}, + name="reject_photo", + ), + path( + "photos//escalate/", + FSMTransitionView.as_view(), + {"app_label": "moderation", "model_name": "photosubmission", "transition_name": "transition_to_escalated"}, + name="escalate_photo", + ), ] +# HTML page patterns (for moderation dashboard) +html_patterns = [ + path("", ModerationDashboardView.as_view(), name="dashboard"), + path("submissions/", SubmissionListView.as_view(), name="submission_list"), + path("history/", HistoryPageView.as_view(), name="history"), +] + +urlpatterns = [ + # HTML page views + *html_patterns, + # Include all router URLs (API endpoints) + path("api/", include(router.urls)), + # FSM transition convenience endpoints +] + fsm_transition_patterns + # URL patterns generated by the router: # # Moderation Reports: diff --git a/backend/apps/moderation/views.py b/backend/apps/moderation/views.py index d9069447..6e02656e 100644 --- a/backend/apps/moderation/views.py +++ b/backend/apps/moderation/views.py @@ -18,6 +18,8 @@ from django_filters.rest_framework import DjangoFilterBackend from django.contrib.auth import get_user_model from django.utils import timezone from django.db.models import Q, Count +from django.shortcuts import render +from django.core.paginator import Paginator from datetime import timedelta from django_fsm import can_proceed, TransitionNotAllowed @@ -334,31 +336,85 @@ class ModerationReportViewSet(viewsets.ModelViewSet): @action(detail=False, methods=['get'], permission_classes=[CanViewModerationData]) def all_history(self, request): - """Get all transition history with filtering.""" + """Get all transition history with filtering. + + Supports both HTMX (returns HTML partials) and API (returns JSON) requests. + """ from django_fsm_log.models import StateLog from django.contrib.contenttypes.models import ContentType - + queryset = StateLog.objects.select_related('by', 'content_type').all() # Filter by id (for detail view) log_id = request.query_params.get('id') if log_id: - queryset = queryset.filter(id=log_id) + try: + log = queryset.get(id=log_id) + # Check if HTMX request for detail view + if request.headers.get('HX-Request'): + return render(request, 'moderation/partials/history_detail_content.html', { + 'log': log, + }) + # Return JSON for API request + return Response({ + 'id': log.id, + 'timestamp': log.timestamp, + 'model': log.content_type.model, + 'object_id': log.object_id, + 'state': log.state, + 'from_state': log.source_state, + 'to_state': log.state, + 'transition': log.transition, + 'user': log.by.username if log.by else None, + 'description': log.description, + 'reason': log.description, + }) + except StateLog.DoesNotExist: + if request.headers.get('HX-Request'): + return render(request, 'moderation/partials/history_detail_content.html', { + 'log': None, + }) + return Response({'error': 'Log not found'}, status=status.HTTP_404_NOT_FOUND) - # Filter by model type + # Filter by model type with app_label support for correct ContentType resolution model_type = request.query_params.get('model_type') + app_label = request.query_params.get('app_label') if model_type: try: - content_type = ContentType.objects.get(model=model_type) + if app_label: + # Use both app_label and model for precise matching + content_type = ContentType.objects.get_by_natural_key(app_label, model_type) + else: + # Map common model names to their app_labels for correct resolution + model_app_mapping = { + 'park': 'parks', + 'ride': 'rides', + 'editsubmission': 'submissions', + 'photosubmission': 'submissions', + 'moderationreport': 'moderation', + 'moderationqueue': 'moderation', + 'bulkoperation': 'moderation', + } + mapped_app_label = model_app_mapping.get(model_type.lower()) + if mapped_app_label: + content_type = ContentType.objects.get_by_natural_key(mapped_app_label, model_type.lower()) + else: + # Fallback to model-only lookup + content_type = ContentType.objects.get(model=model_type) queryset = queryset.filter(content_type=content_type) except ContentType.DoesNotExist: pass - + + # Filter by object_id (for object-level history) + object_id = request.query_params.get('object_id') + if object_id: + queryset = queryset.filter(object_id=object_id) + # Filter by user user_id = request.query_params.get('user_id') if user_id: queryset = queryset.filter(by_id=user_id) - + # Filter by date range start_date = request.query_params.get('start_date') end_date = request.query_params.get('end_date') @@ -366,16 +422,41 @@ class ModerationReportViewSet(viewsets.ModelViewSet): queryset = queryset.filter(timestamp__gte=start_date) if end_date: queryset = queryset.filter(timestamp__lte=end_date) - + # Filter by state state = request.query_params.get('state') if state: queryset = queryset.filter(state=state) - + + # Search filter (case-insensitive across relevant fields) + search_query = request.query_params.get('q') + if search_query: + queryset = queryset.filter( + Q(transition__icontains=search_query) | + Q(description__icontains=search_query) | + Q(state__icontains=search_query) | + Q(source_state__icontains=search_query) | + Q(object_id__icontains=search_query) | + Q(by__username__icontains=search_query) + ) + # Order queryset queryset = queryset.order_by('-timestamp') - # Paginate + # Check if HTMX request + if request.headers.get('HX-Request'): + # Use Django's Paginator for HTMX responses + paginator = Paginator(queryset, 20) + page_number = request.query_params.get('page', 1) + page_obj = paginator.get_page(page_number) + + return render(request, 'moderation/partials/history_table.html', { + 'history_logs': page_obj, + 'page_obj': page_obj, + 'request': request, + }) + + # Paginate for API response page = self.paginate_queryset(queryset) if page is not None: history_data = [{ diff --git a/backend/apps/parks/urls.py b/backend/apps/parks/urls.py index 856e256f..1a763d95 100644 --- a/backend/apps/parks/urls.py +++ b/backend/apps/parks/urls.py @@ -1,6 +1,7 @@ from django.urls import path, include from . import views, views_search from apps.rides.views import ParkSingleCategoryListView +from apps.core.views.views import FSMTransitionView from .views_roadtrip import ( RoadTripPlannerView, CreateTripView, @@ -99,6 +100,8 @@ urlpatterns = [ path("/", views.ParkDetailView.as_view(), name="park_detail"), path("/edit/", views.ParkUpdateView.as_view(), name="park_update"), path("/actions/", views.park_actions, name="park_actions"), + path("/status-actions/", views.park_status_actions, name="park_status_actions"), + path("/header-badge/", views.park_header_badge, name="park_header_badge"), # Area views path( "/areas//", @@ -147,4 +150,12 @@ urlpatterns = [ "/rides/", include("apps.rides.park_urls", namespace="rides"), ), + # FSM transition endpoint for parks + # URL: /parks//transition// + path( + "/transition//", + FSMTransitionView.as_view(), + {"app_label": "parks", "model_name": "park"}, + name="park_transition", + ), ] diff --git a/backend/apps/parks/views.py b/backend/apps/parks/views.py index a16c8e0f..6a88bccc 100644 --- a/backend/apps/parks/views.py +++ b/backend/apps/parks/views.py @@ -132,6 +132,29 @@ def park_actions(request: HttpRequest, slug: str) -> HttpResponse: return render(request, "parks/partials/park_actions.html", {"park": park}) +def park_status_actions(request: HttpRequest, slug: str) -> HttpResponse: + """Return FSM status actions for park moderators""" + park = get_object_or_404(Park, slug=slug) + + # Only show to moderators + if not request.user.has_perm('parks.change_park'): + return HttpResponse("") + + return render(request, "parks/partials/park_status_actions.html", { + "park": park, + "user": request.user + }) + + +def park_header_badge(request: HttpRequest, slug: str) -> HttpResponse: + """Return the header status badge partial for a park""" + park = get_object_or_404(Park, slug=slug) + return render(request, "parks/partials/park_header_badge.html", { + "park": park, + "user": request.user + }) + + def get_park_areas(request: HttpRequest) -> HttpResponse: """Return park areas as options for a select element""" park_id = request.GET.get("park") diff --git a/backend/apps/rides/park_urls.py b/backend/apps/rides/park_urls.py index 4618c5ec..92fb3821 100644 --- a/backend/apps/rides/park_urls.py +++ b/backend/apps/rides/park_urls.py @@ -9,6 +9,8 @@ urlpatterns = [ path("create/", views.RideCreateView.as_view(), name="ride_create"), # Park-specific detail views path("/", views.RideDetailView.as_view(), name="ride_detail"), + path("/status-actions/", views.ride_status_actions, name="ride_status_actions"), + path("/header-badge/", views.ride_header_badge, name="ride_header_badge"), path( "/update/", views.RideUpdateView.as_view(), diff --git a/backend/apps/rides/urls.py b/backend/apps/rides/urls.py index 27f833bc..e3f3daea 100644 --- a/backend/apps/rides/urls.py +++ b/backend/apps/rides/urls.py @@ -1,5 +1,6 @@ from django.urls import path from . import views +from apps.core.views.views import FSMTransitionView app_name = "rides" @@ -83,4 +84,12 @@ urlpatterns = [ views.RideUpdateView.as_view(), name="ride_update", ), + # FSM transition endpoint for rides + # URL: /rides//transition// + path( + "/transition//", + FSMTransitionView.as_view(), + {"app_label": "rides", "model_name": "ride"}, + name="ride_transition", + ), ] diff --git a/backend/apps/rides/views.py b/backend/apps/rides/views.py index 09cf0d26..8f9260d6 100644 --- a/backend/apps/rides/views.py +++ b/backend/apps/rides/views.py @@ -35,6 +35,33 @@ def show_coaster_fields(request: HttpRequest) -> HttpResponse: return render(request, "rides/partials/coaster_fields.html") +def ride_status_actions(request: HttpRequest, park_slug: str, ride_slug: str) -> HttpResponse: + """Return FSM status actions for ride moderators""" + park = get_object_or_404(Park, slug=park_slug) + ride = get_object_or_404(Ride, park=park, slug=ride_slug) + + # Only show to moderators + if not request.user.has_perm('rides.change_ride'): + return HttpResponse("") + + return render(request, "rides/partials/ride_status_actions.html", { + "ride": ride, + "park": park, + "user": request.user + }) + + +def ride_header_badge(request: HttpRequest, park_slug: str, ride_slug: str) -> HttpResponse: + """Return the header status badge partial for a ride""" + park = get_object_or_404(Park, slug=park_slug) + ride = get_object_or_404(Ride, park=park, slug=ride_slug) + return render(request, "rides/partials/ride_header_badge.html", { + "ride": ride, + "park": park, + "user": request.user + }) + + class RideDetailView(HistoryMixin, DetailView): """View for displaying ride details""" diff --git a/backend/config/django/base.py b/backend/config/django/base.py index e3f52220..a791c50d 100644 --- a/backend/config/django/base.py +++ b/backend/config/django/base.py @@ -148,6 +148,7 @@ if TEMPLATES_ENABLED: "django.contrib.auth.context_processors.auth", "django.contrib.messages.context_processors.messages", "apps.moderation.context_processors.moderation_access", + "apps.core.context_processors.fsm_context", ] }, } @@ -166,6 +167,7 @@ else: "django.contrib.auth.context_processors.auth", "django.contrib.messages.context_processors.messages", "apps.moderation.context_processors.moderation_access", + "apps.core.context_processors.fsm_context", ] }, } diff --git a/backend/static/js/fsm-transitions.js b/backend/static/js/fsm-transitions.js new file mode 100644 index 00000000..e80f665e --- /dev/null +++ b/backend/static/js/fsm-transitions.js @@ -0,0 +1,305 @@ +/** + * FSM Transitions JavaScript Module + * + * Provides enhanced UX for FSM state transitions including: + * - Toast notifications via HTMX event triggers + * - Loading indicators during transitions + * - Optimistic UI updates + * - Error handling and retry logic + * - Keyboard shortcuts for common transitions + */ + +// ============================================================================= +// Toast Integration for HTMX +// ============================================================================= + +/** + * Listen for showToast events triggered by HX-Trigger headers + * and display them using the Alpine.js toast store. + */ +document.body.addEventListener('showToast', function(evt) { + const detail = evt.detail; + if (detail && Alpine && Alpine.store('toast')) { + const toastStore = Alpine.store('toast'); + const type = detail.type || 'info'; + const message = detail.message || 'Operation completed'; + + switch (type) { + case 'success': + toastStore.success(message); + break; + case 'error': + toastStore.error(message); + break; + case 'warning': + toastStore.warning(message); + break; + case 'info': + default: + toastStore.info(message); + break; + } + } +}); + +// ============================================================================= +// Transition Success/Error Handlers +// ============================================================================= + +/** + * Handle successful transition animations + */ +document.body.addEventListener('transitionSuccess', function(evt) { + const targetId = evt.detail?.targetId; + if (targetId) { + const element = document.getElementById(targetId); + if (element) { + // Add success flash animation + element.classList.add('animate-flash-success'); + setTimeout(() => { + element.classList.remove('animate-flash-success'); + }, 1000); + } + } +}); + +/** + * Handle transition errors with visual feedback + */ +document.body.addEventListener('transitionError', function(evt) { + const targetId = evt.detail?.targetId; + if (targetId) { + const element = document.getElementById(targetId); + if (element) { + // Add error shake animation + element.classList.add('animate-shake'); + setTimeout(() => { + element.classList.remove('animate-shake'); + }, 500); + } + } +}); + +// ============================================================================= +// Loading State Management +// ============================================================================= + +/** + * Track loading states for transition buttons + */ +const loadingStates = new Map(); + +/** + * Show loading state on a button + */ +function showButtonLoading(button) { + if (!button) return; + + const buttonId = button.id || button.dataset.transitionName; + if (!buttonId) return; + + // Store original content + loadingStates.set(buttonId, { + innerHTML: button.innerHTML, + disabled: button.disabled, + }); + + // Show loading spinner + button.disabled = true; + button.innerHTML = ' Processing...'; + button.classList.add('opacity-75', 'cursor-not-allowed'); +} + +/** + * Hide loading state and restore button + */ +function hideButtonLoading(button) { + if (!button) return; + + const buttonId = button.id || button.dataset.transitionName; + const originalState = loadingStates.get(buttonId); + + if (originalState) { + button.innerHTML = originalState.innerHTML; + button.disabled = originalState.disabled; + button.classList.remove('opacity-75', 'cursor-not-allowed'); + loadingStates.delete(buttonId); + } +} + +// Listen for HTMX before send to show loading +document.body.addEventListener('htmx:beforeSend', function(evt) { + const element = evt.detail.elt; + if (element && element.matches('[hx-post*="transition"]')) { + showButtonLoading(element); + } +}); + +// Listen for HTMX after settle to hide loading +document.body.addEventListener('htmx:afterSettle', function(evt) { + const element = evt.detail.elt; + if (element && element.matches('[hx-post*="transition"]')) { + hideButtonLoading(element); + } +}); + +// Also handle errors +document.body.addEventListener('htmx:responseError', function(evt) { + const element = evt.detail.elt; + if (element && element.matches('[hx-post*="transition"]')) { + hideButtonLoading(element); + } +}); + +// ============================================================================= +// Keyboard Shortcuts +// ============================================================================= + +/** + * Keyboard shortcut configuration + * Ctrl/Cmd + key triggers the action + */ +const keyboardShortcuts = { + 'a': 'approve', // Ctrl+A for approve + 'r': 'reject', // Ctrl+R for reject + 'e': 'escalate', // Ctrl+E for escalate +}; + +/** + * Handle keyboard shortcuts for transitions + * Only active when an item is selected/focused + */ +document.addEventListener('keydown', function(evt) { + // Only handle if Ctrl/Cmd is pressed + if (!(evt.ctrlKey || evt.metaKey)) return; + + const key = evt.key.toLowerCase(); + const action = keyboardShortcuts[key]; + + if (!action) return; + + // Find the focused/selected item + const focusedItem = document.querySelector('.submission-item.selected, .queue-item.selected, [data-selected="true"]'); + if (!focusedItem) return; + + // Find the corresponding transition button + const transitionButton = focusedItem.querySelector(`[data-transition="${action}"], [hx-post*="${action}"]`); + if (transitionButton && !transitionButton.disabled) { + evt.preventDefault(); + transitionButton.click(); + } +}); + +// ============================================================================= +// Batch Operations +// ============================================================================= + +/** + * Execute batch transitions on multiple selected items + */ +function executeBatchTransition(transitionName, itemIds) { + if (!transitionName || !itemIds || itemIds.length === 0) { + console.warn('Batch transition requires transitionName and itemIds'); + return; + } + + // Show confirmation for batch operations + const confirmed = confirm(`Are you sure you want to ${transitionName} ${itemIds.length} items?`); + if (!confirmed) return; + + // Track progress + let completed = 0; + let failed = 0; + + itemIds.forEach(itemId => { + const element = document.getElementById(itemId); + if (!element) return; + + const transitionButton = element.querySelector(`[hx-post*="${transitionName}"]`); + if (transitionButton) { + // Use HTMX to trigger the transition + htmx.trigger(transitionButton, 'click'); + completed++; + } else { + failed++; + } + }); + + // Show summary toast + if (Alpine && Alpine.store('toast')) { + if (failed === 0) { + Alpine.store('toast').success(`Batch ${transitionName} initiated for ${completed} items`); + } else { + Alpine.store('toast').warning(`Batch ${transitionName}: ${completed} succeeded, ${failed} failed`); + } + } +} + +// Expose batch function globally +window.fsmBatchTransition = executeBatchTransition; + +// ============================================================================= +// Status Change Event Dispatchers for Parks and Rides +// ============================================================================= + +/** + * Listen for successful FSM transitions and dispatch custom events + * to refresh status sections on detail pages. + */ +document.body.addEventListener('htmx:afterOnLoad', function(evt) { + const triggerHeader = evt.detail.xhr.getResponseHeader('HX-Trigger'); + if (triggerHeader) { + try { + const triggers = JSON.parse(triggerHeader); + + // Check if this was a transition request + const requestPath = evt.detail.pathInfo?.requestPath || ''; + + // Dispatch status change events for parks and rides + if (requestPath.includes('/parks/') && requestPath.includes('/transition/')) { + document.body.dispatchEvent(new CustomEvent('park-status-changed')); + } + + if (requestPath.includes('/rides/') && requestPath.includes('/transition/')) { + document.body.dispatchEvent(new CustomEvent('ride-status-changed')); + } + } catch (e) { + // Ignore parsing errors + } + } +}); + +// ============================================================================= +// Initialization +// ============================================================================= + +document.addEventListener('DOMContentLoaded', function() { + console.log('FSM Transitions module initialized'); + + // Add CSS for animations if not present + if (!document.getElementById('fsm-animations-style')) { + const style = document.createElement('style'); + style.id = 'fsm-animations-style'; + style.textContent = ` + @keyframes flash-success { + 0%, 100% { background-color: transparent; } + 50% { background-color: rgba(34, 197, 94, 0.2); } + } + + @keyframes shake { + 0%, 100% { transform: translateX(0); } + 20%, 60% { transform: translateX(-5px); } + 40%, 80% { transform: translateX(5px); } + } + + .animate-flash-success { + animation: flash-success 1s ease-in-out; + } + + .animate-shake { + animation: shake 0.5s ease-in-out; + } + `; + document.head.appendChild(style); + } +}); diff --git a/backend/static/js/moderation/history.js b/backend/static/js/moderation/history.js index 9b66058d..9ed47fc8 100644 --- a/backend/static/js/moderation/history.js +++ b/backend/static/js/moderation/history.js @@ -1,377 +1,27 @@ /** - * Moderation Transition History JavaScript - * Handles AJAX loading and display of FSM transition history + * DEPRECATED: This file is no longer used. + * + * History functionality has been migrated to HTMX-based implementation. + * + * See the following files for the new implementation: + * - backend/templates/moderation/history.html + * - backend/templates/moderation/partials/history_table.html + * - backend/templates/moderation/partials/history_filters.html + * - backend/templates/moderation/partials/history_pagination.html + * - backend/templates/moderation/partials/history_detail_modal.html + * + * The HTMX implementation provides: + * - Server-side rendered history table + * - HTMX-based filtering and pagination + * - Alpine.js modal for detail views + * - Integration with the moderation dashboard + * + * This file will be removed in a future version. */ -let currentPage = 1; -let nextPageUrl = null; -let previousPageUrl = null; +console.warn( + '[DEPRECATED] history.js is deprecated and will be removed in a future version. ' + + 'History functionality has been migrated to HTMX. See moderation/history.html for the new implementation.' +); -/** - * Format timestamp to human-readable format - */ -function formatTimestamp(timestamp) { - const date = new Date(timestamp); - return date.toLocaleString('en-US', { - year: 'numeric', - month: 'short', - day: 'numeric', - hour: '2-digit', - minute: '2-digit' - }); -} - -/** - * Get CSRF token from cookie - */ -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.substring(0, name.length + 1) === (name + '=')) { - cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); - break; - } - } - } - return cookieValue; -} - -/** - * Fetch and display transition history - */ -function loadHistory(url = null, filters = {}) { - const tbody = document.getElementById('history-tbody'); - tbody.innerHTML = ' Loading history...'; - - // Build URL - let fetchUrl = url || '/api/moderation/reports/all_history/'; - - // Add filters to URL if no custom URL provided - if (!url && Object.keys(filters).length > 0) { - const params = new URLSearchParams(); - for (const [key, value] of Object.entries(filters)) { - if (value) { - params.append(key, value); - } - } - fetchUrl += '?' + params.toString(); - } - - fetch(fetchUrl, { - method: 'GET', - headers: { - 'Content-Type': 'application/json', - 'X-CSRFToken': getCookie('csrftoken') - }, - credentials: 'same-origin' - }) - .then(response => { - if (!response.ok) { - throw new Error('Network response was not ok'); - } - return response.json(); - }) - .then(data => { - renderHistoryTable(data.results || data); - updatePagination(data); - }) - .catch(error => { - console.error('Error loading history:', error); - tbody.innerHTML = 'Error loading history. Please try again.'; - }); -} - -/** - * Render history table rows - */ -function renderHistoryTable(logs) { - const tbody = document.getElementById('history-tbody'); - - if (!logs || logs.length === 0) { - tbody.innerHTML = 'No transition history found.'; - return; - } - - tbody.innerHTML = logs.map(log => ` - - ${formatTimestamp(log.timestamp)} - ${log.model} - ${log.object_id} - ${log.transition || '-'} - ${log.state} - ${log.user || 'System'} - - - `).join(''); -} - -/** - * Update pagination controls - */ -function updatePagination(data) { - nextPageUrl = data.next || null; - previousPageUrl = data.previous || null; - - const prevBtn = document.getElementById('prev-page'); - const nextBtn = document.getElementById('next-page'); - const pageInfo = document.getElementById('page-info'); - - prevBtn.disabled = !previousPageUrl; - nextBtn.disabled = !nextPageUrl; - - // Calculate page number from count - if (data.count) { - const resultsPerPage = data.results ? data.results.length : 0; - const totalPages = Math.ceil(data.count / (resultsPerPage || 1)); - pageInfo.textContent = `Page ${currentPage} of ${totalPages}`; - } else { - pageInfo.textContent = `Page ${currentPage}`; - } -} - -/** - * View details modal - */ -function viewDetails(logId) { - const modal = document.getElementById('details-modal'); - const modalBody = document.getElementById('modal-body'); - - modalBody.innerHTML = ' Loading details...'; - modal.style.display = 'flex'; - - // Fetch detailed information filtered by id - fetch(`/api/moderation/reports/all_history/?id=${logId}`, { - headers: { - 'X-CSRFToken': getCookie('csrftoken') - }, - credentials: 'same-origin' - }) - .then(response => response.json()) - .then(data => { - // Handle both paginated and non-paginated responses - let log = null; - if (data.results && data.results.length > 0) { - log = data.results[0]; - } else if (Array.isArray(data) && data.length > 0) { - log = data[0]; - } else if (data.id) { - // Single object response - log = data; - } - - if (log) { - modalBody.innerHTML = ` -
-
- ID: ${log.id} -
-
- Timestamp: ${formatTimestamp(log.timestamp)} -
-
- Model: ${log.model} -
-
- Object ID: ${log.object_id} -
-
- Transition: ${log.transition || '-'} -
-
- From State: ${log.from_state || '-'} -
-
- To State: ${log.to_state || log.state || '-'} -
-
- User: ${log.user || 'System'} -
- ${log.reason ? `
Reason:
${log.reason}
` : ''} - ${log.description ? `
Description:
${log.description}
` : ''} -
- `; - } else { - modalBody.innerHTML = '

No log entry found with this ID.

'; - } - }) - .catch(error => { - console.error('Error loading details:', error); - modalBody.innerHTML = '

Error loading details.

'; - }); -} - -/** - * Close modal - */ -function closeModal() { - const modal = document.getElementById('details-modal'); - modal.style.display = 'none'; -} - -/** - * Get current filters - */ -function getCurrentFilters() { - return { - model_type: document.getElementById('model-filter').value, - state: document.getElementById('state-filter').value, - start_date: document.getElementById('start-date').value, - end_date: document.getElementById('end-date').value, - user_id: document.getElementById('user-filter').value, - }; -} - -/** - * Event listeners - */ -document.addEventListener('DOMContentLoaded', function() { - // Apply filters button - document.getElementById('apply-filters').addEventListener('click', () => { - currentPage = 1; - const filters = getCurrentFilters(); - loadHistory(null, filters); - }); - - // Clear filters button - document.getElementById('clear-filters').addEventListener('click', () => { - document.getElementById('model-filter').value = ''; - document.getElementById('state-filter').value = ''; - document.getElementById('start-date').value = ''; - document.getElementById('end-date').value = ''; - document.getElementById('user-filter').value = ''; - currentPage = 1; - loadHistory(); - }); - - // Pagination buttons - document.getElementById('prev-page').addEventListener('click', () => { - if (previousPageUrl) { - currentPage--; - loadHistory(previousPageUrl); - } - }); - - document.getElementById('next-page').addEventListener('click', () => { - if (nextPageUrl) { - currentPage++; - loadHistory(nextPageUrl); - } - }); - - // Close modal on background click - document.getElementById('details-modal').addEventListener('click', (e) => { - if (e.target.id === 'details-modal') { - closeModal(); - } - }); - - // Initial load - loadHistory(); -}); - -// Additional CSS for badges (inline styles) -const style = document.createElement('style'); -style.textContent = ` - .badge { - display: inline-block; - padding: 4px 8px; - border-radius: 4px; - font-size: 0.75rem; - font-weight: 600; - text-transform: uppercase; - } - - .badge-model { - background-color: #e7f3ff; - color: #0066cc; - } - - .badge-transition { - background-color: #fff3cd; - color: #856404; - } - - .badge-state { - background-color: #d4edda; - color: #155724; - } - - .badge-state-PENDING { - background-color: #fff3cd; - color: #856404; - } - - .badge-state-APPROVED { - background-color: #d4edda; - color: #155724; - } - - .badge-state-REJECTED { - background-color: #f8d7da; - color: #721c24; - } - - .badge-state-IN_PROGRESS { - background-color: #d1ecf1; - color: #0c5460; - } - - .badge-state-COMPLETED { - background-color: #d4edda; - color: #155724; - } - - .badge-state-ESCALATED { - background-color: #f8d7da; - color: #721c24; - } - - .object-link { - color: #007bff; - text-decoration: none; - } - - .object-link:hover { - text-decoration: underline; - } - - .btn-view { - background-color: #007bff; - color: white; - border: none; - padding: 4px 12px; - border-radius: 4px; - cursor: pointer; - } - - .btn-view:hover { - background-color: #0056b3; - } - - .detail-grid { - display: grid; - grid-template-columns: repeat(2, 1fr); - gap: 15px; - } - - .detail-item { - padding: 10px; - background-color: #f8f9fa; - border-radius: 4px; - } - - .detail-item.full-width { - grid-column: 1 / -1; - } - - .detail-item strong { - display: block; - margin-bottom: 5px; - color: #666; - font-size: 0.875rem; - } -`; -document.head.appendChild(style); +// No functionality provided - all history features now use HTMX diff --git a/backend/templates/base/base.html b/backend/templates/base/base.html index b474c87d..6b6a398f 100644 --- a/backend/templates/base/base.html +++ b/backend/templates/base/base.html @@ -136,6 +136,27 @@ + + + + {% block extra_js %}{% endblock %} diff --git a/backend/templates/components/status_badge.html b/backend/templates/components/status_badge.html index e3ced9b6..47c7a5db 100644 --- a/backend/templates/components/status_badge.html +++ b/backend/templates/components/status_badge.html @@ -1,17 +1,22 @@ {% comment %} Reusable status badge component with consistent styling. Usage: {% include 'components/status_badge.html' with status="OPERATING" %} +Usage (clickable): {% include 'components/status_badge.html' with status="OPERATING" clickable=True %} {% endcomment %} {% load park_tags %} {% with status_config=status|get_status_config %} - + {% if status_config.icon %} {% endif %} {{ status_config.label }} + {% if clickable %} + + {% endif %} {% endwith %} diff --git a/backend/templates/htmx/components/loading_indicator.html b/backend/templates/htmx/components/loading_indicator.html index dd30b45f..cac74947 100644 --- a/backend/templates/htmx/components/loading_indicator.html +++ b/backend/templates/htmx/components/loading_indicator.html @@ -1,3 +1,33 @@ -