+
+{% endblock %}
\ No newline at end of file
diff --git a/reviews/templates/reviews/review_list.html b/reviews/templates/reviews/review_list.html
new file mode 100644
index 00000000..d52428a4
--- /dev/null
+++ b/reviews/templates/reviews/review_list.html
@@ -0,0 +1,154 @@
+{% extends "base.html" %}
+{% load static %}
+
+{% block title %}Reviews - ThrillWiki{% endblock %}
+
+{% block content %}
+
+
+
+
+
+ {% include "history_tracking/includes/version_control_ui.html" %}
+
+
+
+
+
+
+
+
+
+ {% if review.moderated_by %}
+
+
+
+ Review of {{ review.content_object.name }}
+
+
+ {{ review.is_published|yesno:"Published,Unpublished" }}
+
+
+
+
+
+
+
+ {{ review.rating }}/10
+ Visited on {{ review.visit_date|date:"F j, Y" }}
+ {{ review.title }}
+ +
+ {{ review.content|linebreaks }}
+
+
+
+ {% if review.images.exists %}
+
+
+ {% endif %}
+ Photos
+
+ {% for image in review.images.all %}
+
+
+ 
+
+ {% endfor %}
+
+
+
+ {% endif %}
+ Moderation Details
+
+
+ Moderated by: {{ review.moderated_by.username }}
+Moderated on: {{ review.moderated_at|date:"F j, Y H:i" }}
+ {% if review.moderation_notes %} +
+ Notes:
+
+ {% endif %}
+ {{ review.moderation_notes|linebreaks }}
+
+
+
+
+
+
+
+ {{ review.content_object|class_name }}
+
+
+ {{ review.content_object.name }}
+
+ {% if review.content_object.park %}
+
+ {% endif %}
+
+
+
+
+
+ Reviewer
+
+ {% if review.user.avatar %}
+ 
+ {% endif %}
+
+
+ {% endif %}
+
+
+ {{ review.user.username }}
+ Member since {{ review.user.date_joined|date:"F Y" }}
+
+
+ Reviews: {{ review.user.reviews.count }}
+Helpful votes: {{ review.user.review_likes.count }}
+
+
+ Review Details
+
+
+ Created: {{ review.created_at|date:"F j, Y H:i" }}
+ {% if review.created_at != review.updated_at %} +Last updated: {{ review.updated_at|date:"F j, Y H:i" }}
+ {% endif %} +Helpful votes: {{ review.likes.count }}
+
+
+ {% include "history_tracking/includes/version_control_ui.html" %}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/rides/models.py b/rides/models.py
index 1374a759..4622a7c6 100644
--- a/rides/models.py
+++ b/rides/models.py
@@ -1,7 +1,10 @@
from django.db import models
+from django.urls import reverse
from django.utils.text import slugify
from django.contrib.contenttypes.fields import GenericRelation
-from history_tracking.models import HistoricalModel
+from django.contrib.contenttypes.models import ContentType
+from history_tracking.models import HistoricalModel, VersionBranch, ChangeSet
+from history_tracking.signals import get_current_branch, ChangesetContextManager
# Shared choices that will be used by multiple models
@@ -42,9 +45,51 @@ class RideModel(HistoricalModel):
class Meta:
ordering = ['manufacturer', 'name']
unique_together = ['manufacturer', 'name']
+def __str__(self) -> str:
+ return self.name if not self.manufacturer else f"{self.manufacturer.name} {self.name}"
+
+def save(self, *args, **kwargs) -> None:
+ # Get the branch from context or use default
+ current_branch = get_current_branch()
+
+ if current_branch:
+ # Save in the context of the current branch
+ super().save(*args, **kwargs)
+ else:
+ # If no branch context, save in main branch
+ main_branch, _ = VersionBranch.objects.get_or_create(
+ name='main',
+ defaults={'metadata': {'type': 'default_branch'}}
+ )
+
+ with ChangesetContextManager(branch=main_branch):
+ super().save(*args, **kwargs)
+
+def get_version_info(self) -> dict:
+ """Get version control information for this ride model"""
+ content_type = ContentType.objects.get_for_model(self)
+ latest_changes = ChangeSet.objects.filter(
+ content_type=content_type,
+ object_id=self.pk,
+ status='applied'
+ ).order_by('-created_at')[:5]
+
+ active_branches = VersionBranch.objects.filter(
+ changesets__content_type=content_type,
+ changesets__object_id=self.pk,
+ is_active=True
+ ).distinct()
+
+ return {
+ 'latest_changes': latest_changes,
+ 'active_branches': active_branches,
+ 'current_branch': get_current_branch(),
+ 'total_changes': latest_changes.count()
+ }
+
+def get_absolute_url(self) -> str:
+ return reverse("rides:model_detail", kwargs={"pk": self.pk})
- def __str__(self) -> str:
- return self.name if not self.manufacturer else f"{self.manufacturer.name} {self.name}"
class Ride(HistoricalModel):
@@ -145,7 +190,66 @@ class Ride(HistoricalModel):
def save(self, *args, **kwargs) -> None:
if not self.slug:
self.slug = slugify(self.name)
- super().save(*args, **kwargs)
+
+ # Get the branch from context or use default
+ current_branch = get_current_branch()
+
+ if current_branch:
+ # Save in the context of the current branch
+ super().save(*args, **kwargs)
+ else:
+ # If no branch context, save in main branch
+ main_branch, _ = VersionBranch.objects.get_or_create(
+ name='main',
+ defaults={'metadata': {'type': 'default_branch'}}
+ )
+
+ with ChangesetContextManager(branch=main_branch):
+ super().save(*args, **kwargs)
+
+ def get_version_info(self) -> dict:
+ """Get version control information for this ride"""
+ content_type = ContentType.objects.get_for_model(self)
+ latest_changes = ChangeSet.objects.filter(
+ content_type=content_type,
+ object_id=self.pk,
+ status='applied'
+ ).order_by('-created_at')[:5]
+
+ active_branches = VersionBranch.objects.filter(
+ changesets__content_type=content_type,
+ changesets__object_id=self.pk,
+ is_active=True
+ ).distinct()
+
+ return {
+ 'latest_changes': latest_changes,
+ 'active_branches': active_branches,
+ 'current_branch': get_current_branch(),
+ 'total_changes': latest_changes.count(),
+ 'parent_park_branch': self.park.get_version_info()['current_branch']
+ }
+
+ def get_absolute_url(self) -> str:
+ return reverse("rides:ride_detail", kwargs={
+ "park_slug": self.park.slug,
+ "ride_slug": self.slug
+ })
+
+ @classmethod
+ def get_by_slug(cls, slug: str) -> tuple['Ride', bool]:
+ """Get ride by current or historical slug"""
+ try:
+ return cls.objects.get(slug=slug), False
+ except cls.DoesNotExist:
+ # Check historical slugs
+ history = cls.history.filter(slug=slug).order_by("-history_date").first()
+ if history:
+ try:
+ return cls.objects.get(pk=history.instance.pk), True
+ except cls.DoesNotExist as e:
+ raise cls.DoesNotExist("No ride found with this slug") from e
+ raise cls.DoesNotExist("No ride found with this slug")
class RollerCoasterStats(models.Model):
diff --git a/rides/templates/rides/ride_detail.html b/rides/templates/rides/ride_detail.html
new file mode 100644
index 00000000..28544de8
--- /dev/null
+++ b/rides/templates/rides/ride_detail.html
@@ -0,0 +1,220 @@
+{% extends "base.html" %}
+{% load static %}
+
+{% block title %}{{ ride.name }} at {{ ride.park.name }} - ThrillWiki{% endblock %}
+
+{% block content %}
+
+
+
+
+ Reviews
+ {% if object %} +Reviews for {{ object.name }}
+ {% endif %} +
+
+
+
+
+ {% if reviews %}
+
+ {% for review in reviews %}
+
+
+
+ {% if is_paginated %}
+
+
+ {% endfor %}
+
+
+
+
+
+
+
+ + + {{ review.title }} + +
++ Review of + + {{ review.content_object.name }} + + {% if review.content_object.park %} + at + + {{ review.content_object.park.name }} + + {% endif %} +
+
+
+ {{ review.rating }}/10
+
+ {{ review.is_published|yesno:"Published,Unpublished" }}
+
+
+ {{ review.content|truncatewords:50 }}
+
+
+
+ {% with version_info=review.get_version_info %}
+ {% if version_info.active_branches.count > 1 %}
+
+
+ {{ version_info.active_branches.count }} active branches
+
+
+ {% endif %}
+ {% endwith %}
+
+
+
+
+
+
+ by {{ review.user.username }}
+
+ {{ review.visit_date|date:"F j, Y" }}
+ {{ review.likes.count }} helpful votes
+
+ {{ review.created_at|date:"F j, Y" }}
+
+
+
+
+ {% endif %}
+
+ {% else %}
+
+
+ {% endif %}
+No reviews found matching your criteria.
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/rides/templates/rides/ride_list.html b/rides/templates/rides/ride_list.html
new file mode 100644
index 00000000..d3c397b5
--- /dev/null
+++ b/rides/templates/rides/ride_list.html
@@ -0,0 +1,153 @@
+{% extends "base.html" %}
+{% load static %}
+
+{% block title %}Rides - ThrillWiki{% endblock %}
+
+{% block content %}
+
+
+
+
+
+ {% include "history_tracking/includes/version_control_ui.html" %}
+
+
+
+
+
+
+
+
+
+ {% if ride.coaster_stats %}
+
+
+
+ {% if ride.description %}
+ {{ ride.name }}
+ + {{ ride.get_status_display }} + +
+ {{ ride.description|linebreaks }}
+
+ {% endif %}
+
+
+
+ {% if ride.opening_date %}
+
+
+
+ {% endif %}
+
+ {% if ride.manufacturer %}
+ Opening Date
+{{ ride.opening_date }}
+
+
+ {% endif %}
+
+ {% if ride.designer %}
+ Manufacturer
+ +
+
+ {% endif %}
+
+ {% if ride.ride_model %}
+ Designer
+ +
+
+ {% endif %}
+
+ {% if ride.park_area %}
+ Ride Model
+{{ ride.ride_model.name }}
+
+
+ {% endif %}
+
+ {% if ride.capacity_per_hour %}
+ Location
+ +
+
+ {% endif %}
+
+ {% if ride.ride_duration_seconds %}
+ Hourly Capacity
+{{ ride.capacity_per_hour }} riders/hour
+
+
+ {% endif %}
+ Ride Duration
+{{ ride.ride_duration_seconds }} seconds
+
+
+ {% endif %}
+ Coaster Statistics
+
+ {% if ride.coaster_stats.height_ft %}
+
+
+
+ {% endif %}
+
+ {% if ride.coaster_stats.length_ft %}
+ Height
+{{ ride.coaster_stats.height_ft }} ft
+
+
+ {% endif %}
+
+ {% if ride.coaster_stats.speed_mph %}
+ Length
+{{ ride.coaster_stats.length_ft }} ft
+
+
+ {% endif %}
+
+ {% if ride.coaster_stats.inversions %}
+ Speed
+{{ ride.coaster_stats.speed_mph }} mph
+
+
+ {% endif %}
+
+ {% if ride.coaster_stats.track_material %}
+ Inversions
+{{ ride.coaster_stats.inversions }}
+
+
+ {% endif %}
+
+ {% if ride.coaster_stats.roller_coaster_type %}
+ Track Material
+{{ ride.coaster_stats.get_track_material_display }}
+
+
+ {% endif %}
+ Type
+{{ ride.coaster_stats.get_roller_coaster_type_display }}
+
+
+
+
+
+
+
+ Location
+ + {% if ride.park.formatted_location %} +{{ ride.park.formatted_location }}
+ {% endif %} +
+
+
+
+ {% if ride.photos.exists %}
+ Statistics
+
+ {% if ride.average_rating %}
+
+
+ Average Rating:
+ {{ ride.average_rating }}/5
+
+ {% endif %}
+
+ {% if ride.reviews.count %}
+
+ Reviews:
+ {{ ride.reviews.count }}
+
+ {% endif %}
+
+
+ {% endif %}
+ Photo Gallery
+-
+ {% for photo in ride.photos.all|slice:":4" %}
+
-
+
+
+ {% endfor %}
+
+
+ {% include "history_tracking/includes/version_control_ui.html" %}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/static/js/__tests__/version-control.test.js b/static/js/__tests__/version-control.test.js
new file mode 100644
index 00000000..498ae4ff
--- /dev/null
+++ b/static/js/__tests__/version-control.test.js
@@ -0,0 +1,217 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { initVersionControl, setupBranchHandlers, handleMergeConflicts } from '../version-control';
+
+describe('Version Control UI', () => {
+ let container;
+
+ beforeEach(() => {
+ container = document.createElement('div');
+ container.id = 'version-control-panel';
+ document.body.appendChild(container);
+
+ // Mock HTMX
+ window.htmx = {
+ trigger: jest.fn(),
+ ajax: jest.fn(),
+ on: jest.fn()
+ };
+ });
+
+ afterEach(() => {
+ document.body.innerHTML = '';
+ jest.clearAllMocks();
+ });
+
+ describe('initialization', () => {
+ it('should initialize version control UI', () => {
+ const panel = document.createElement('div');
+ panel.className = 'version-control-panel';
+ container.appendChild(panel);
+
+ initVersionControl();
+
+ expect(window.htmx.on).toHaveBeenCalled();
+ expect(container.querySelector('.version-control-panel')).toBeTruthy();
+ });
+
+ it('should setup branch switch handlers', () => {
+ const switchButton = document.createElement('button');
+ switchButton.setAttribute('data-branch-id', '1');
+ switchButton.className = 'branch-switch';
+ container.appendChild(switchButton);
+
+ setupBranchHandlers();
+ switchButton.click();
+
+ expect(window.htmx.ajax).toHaveBeenCalledWith(
+ 'POST',
+ '/version-control/switch-branch/',
+ expect.any(Object)
+ );
+ });
+ });
+
+ describe('branch operations', () => {
+ it('should handle branch creation', () => {
+ const form = document.createElement('form');
+ form.id = 'create-branch-form';
+ container.appendChild(form);
+
+ const event = new Event('submit');
+ form.dispatchEvent(event);
+
+ expect(window.htmx.trigger).toHaveBeenCalledWith(
+ form,
+ 'branch-created',
+ expect.any(Object)
+ );
+ });
+
+ it('should update UI after branch switch', () => {
+ const response = {
+ branch_name: 'feature/test',
+ status: 'success'
+ };
+
+ const event = new CustomEvent('branchSwitched', {
+ detail: response
+ });
+
+ document.dispatchEvent(event);
+
+ expect(container.querySelector('.current-branch')?.textContent)
+ .toContain('feature/test');
+ });
+ });
+
+ describe('merge operations', () => {
+ it('should handle merge conflicts', () => {
+ const conflicts = [
+ {
+ field: 'name',
+ source_value: 'Feature Name',
+ target_value: 'Main Name'
+ }
+ ];
+
+ handleMergeConflicts(conflicts);
+
+ const conflictDialog = document.querySelector('.merge-conflict-dialog');
+ expect(conflictDialog).toBeTruthy();
+ expect(conflictDialog.innerHTML).toContain('name');
+ expect(conflictDialog.innerHTML).toContain('Feature Name');
+ expect(conflictDialog.innerHTML).toContain('Main Name');
+ });
+
+ it('should submit merge resolution', () => {
+ const resolutionForm = document.createElement('form');
+ resolutionForm.id = 'merge-resolution-form';
+ container.appendChild(resolutionForm);
+
+ const event = new Event('submit');
+ resolutionForm.dispatchEvent(event);
+
+ expect(window.htmx.ajax).toHaveBeenCalledWith(
+ 'POST',
+ '/version-control/resolve-conflicts/',
+ expect.any(Object)
+ );
+ });
+ });
+
+ describe('error handling', () => {
+ it('should display error messages', () => {
+ const errorEvent = new CustomEvent('showError', {
+ detail: { message: 'Test error message' }
+ });
+
+ document.dispatchEvent(errorEvent);
+
+ const errorMessage = document.querySelector('.error-message');
+ expect(errorMessage).toBeTruthy();
+ expect(errorMessage.textContent).toContain('Test error message');
+ });
+
+ it('should clear error messages', () => {
+ const errorMessage = document.createElement('div');
+ errorMessage.className = 'error-message';
+ container.appendChild(errorMessage);
+
+ const clearEvent = new Event('clearErrors');
+ document.dispatchEvent(clearEvent);
+
+ expect(container.querySelector('.error-message')).toBeFalsy();
+ });
+ });
+
+ describe('loading states', () => {
+ it('should show loading indicator during operations', () => {
+ const loadingEvent = new Event('versionControlLoading');
+ document.dispatchEvent(loadingEvent);
+
+ const loader = document.querySelector('.version-control-loader');
+ expect(loader).toBeTruthy();
+ expect(loader.style.display).toBe('block');
+ });
+
+ it('should hide loading indicator after operations', () => {
+ const loader = document.createElement('div');
+ loader.className = 'version-control-loader';
+ container.appendChild(loader);
+
+ const doneEvent = new Event('versionControlLoaded');
+ document.dispatchEvent(doneEvent);
+
+ expect(loader.style.display).toBe('none');
+ });
+ });
+
+ describe('UI updates', () => {
+ it('should update branch list after operations', () => {
+ const branchList = document.createElement('ul');
+ branchList.className = 'branch-list';
+ container.appendChild(branchList);
+
+ const updateEvent = new CustomEvent('updateBranchList', {
+ detail: {
+ branches: [
+ { name: 'main', active: true },
+ { name: 'feature/test', active: false }
+ ]
+ }
+ });
+
+ document.dispatchEvent(updateEvent);
+
+ const listItems = branchList.querySelectorAll('li');
+ expect(listItems.length).toBe(2);
+ expect(listItems[0].textContent).toContain('main');
+ expect(listItems[1].textContent).toContain('feature/test');
+ });
+
+ it('should highlight active branch', () => {
+ const branchItems = [
+ { name: 'main', active: true },
+ { name: 'feature/test', active: false }
+ ].map(branch => {
+ const item = document.createElement('li');
+ item.textContent = branch.name;
+ item.className = 'branch-item';
+ if (branch.active) item.classList.add('active');
+ return item;
+ });
+
+ const branchList = document.createElement('ul');
+ branchList.className = 'branch-list';
+ branchList.append(...branchItems);
+ container.appendChild(branchList);
+
+ const activeItem = branchList.querySelector('.branch-item.active');
+ expect(activeItem).toBeTruthy();
+ expect(activeItem.textContent).toBe('main');
+ });
+ });
+});
\ No newline at end of file
diff --git a/static/js/error-handling.js b/static/js/error-handling.js
new file mode 100644
index 00000000..455668ed
--- /dev/null
+++ b/static/js/error-handling.js
@@ -0,0 +1,207 @@
+/**
+ * Error handling and state management for version control system
+ */
+
+class VersionControlError extends Error {
+ constructor(message, code, details = {}) {
+ super(message);
+ this.name = 'VersionControlError';
+ this.code = code;
+ this.details = details;
+ this.timestamp = new Date();
+ }
+}
+
+// Error boundary for version control operations
+class VersionControlErrorBoundary {
+ constructor(options = {}) {
+ this.onError = options.onError || this.defaultErrorHandler;
+ this.errors = new Map();
+ this.retryAttempts = new Map();
+ this.maxRetries = options.maxRetries || 3;
+ }
+
+ defaultErrorHandler(error) {
+ console.error(`[Version Control Error]: ${error.message}`, error);
+ this.showErrorNotification(error);
+ }
+
+ showErrorNotification(error) {
+ const notification = document.createElement('div');
+ notification.className = 'version-control-error notification';
+ notification.innerHTML = `
+
+
+
+
+ Rides
+ {% if park %} +Rides at {{ park.name }}
+ {% endif %} +
+
+
+
+
+ {% if rides %}
+
+ {% for ride in rides %}
+
+
+
+ {% if is_paginated %}
+
+ {% if ride.photos.exists %}
+
+ {% endfor %}
+
+ 
+
+ {% endif %}
+
+
+
+
+
+
+
+ {% if ride.park %}
+
+ {% endif %}
+
+ {% if ride.manufacturer %}
+ + + {{ ride.name }} + +
+ + {{ ride.get_status_display }} + ++ {{ ride.manufacturer.name }} +
+ {% endif %} + + {% if ride.description %} +{{ ride.description|truncatewords:30 }}
+ {% endif %} + + + {% with version_info=ride.get_version_info %} + {% if version_info.active_branches.count > 1 %} +
+
+ {{ version_info.active_branches.count }} active branches
+
+
+ {% endif %}
+ {% endwith %}
+
+
+
+ {% endif %}
+
+ {% else %}
+
+
+ {% endif %}
+No rides found matching your criteria.
+
+
+
+
+
+ ${error.details.retry ? '' : ''}
+ `;
+
+ document.body.appendChild(notification);
+
+ // Auto-hide after 5 seconds unless it's a critical error
+ if (!error.details.critical) {
+ setTimeout(() => {
+ notification.remove();
+ }, 5000);
+ }
+
+ // Handle retry
+ const retryBtn = notification.querySelector('.retry-btn');
+ if (retryBtn && error.details.retryCallback) {
+ retryBtn.addEventListener('click', () => {
+ notification.remove();
+ error.details.retryCallback();
+ });
+ }
+
+ // Handle close
+ const closeBtn = notification.querySelector('.close-btn');
+ closeBtn.addEventListener('click', () => notification.remove());
+ }
+
+ async wrapOperation(operationKey, operation) {
+ try {
+ // Check if operation is already in progress
+ if (this.errors.has(operationKey)) {
+ throw new VersionControlError(
+ 'Operation already in progress',
+ 'DUPLICATE_OPERATION'
+ );
+ }
+
+ // Show loading state
+ this.showLoading(operationKey);
+
+ const result = await operation();
+
+ // Clear any existing errors for this operation
+ this.errors.delete(operationKey);
+ this.retryAttempts.delete(operationKey);
+
+ return result;
+ } catch (error) {
+ const retryCount = this.retryAttempts.get(operationKey) || 0;
+
+ // Handle specific error types
+ if (error.name === 'VersionControlError') {
+ this.handleVersionControlError(error, operationKey, retryCount);
+ } else {
+ // Convert unknown errors to VersionControlError
+ const vcError = new VersionControlError(
+ 'An unexpected error occurred',
+ 'UNKNOWN_ERROR',
+ { originalError: error }
+ );
+ this.handleVersionControlError(vcError, operationKey, retryCount);
+ }
+
+ throw error;
+ } finally {
+ this.hideLoading(operationKey);
+ }
+ }
+
+ handleVersionControlError(error, operationKey, retryCount) {
+ this.errors.set(operationKey, error);
+
+ // Determine if operation can be retried
+ const canRetry = retryCount < this.maxRetries;
+
+ error.details.retry = canRetry;
+ error.details.retryCallback = canRetry ?
+ () => this.retryOperation(operationKey) :
+ undefined;
+
+ this.onError(error);
+ }
+
+ async retryOperation(operationKey) {
+ const retryCount = (this.retryAttempts.get(operationKey) || 0) + 1;
+ this.retryAttempts.set(operationKey, retryCount);
+
+ // Exponential backoff for retries
+ const backoffDelay = Math.min(1000 * Math.pow(2, retryCount - 1), 10000);
+ await new Promise(resolve => setTimeout(resolve, backoffDelay));
+
+ // Get the original operation and retry
+ const operation = this.pendingOperations.get(operationKey);
+ if (operation) {
+ return this.wrapOperation(operationKey, operation);
+ }
+ }
+
+ showLoading(operationKey) {
+ const loadingElement = document.createElement('div');
+ loadingElement.className = `loading-indicator loading-${operationKey}`;
+ loadingElement.innerHTML = `
+
+ Processing...
+ `;
+ document.body.appendChild(loadingElement);
+ }
+
+ hideLoading(operationKey) {
+ const loadingElement = document.querySelector(`.loading-${operationKey}`);
+ if (loadingElement) {
+ loadingElement.remove();
+ }
+ }
+}
+
+// Create singleton instance
+const errorBoundary = new VersionControlErrorBoundary({
+ onError: (error) => {
+ // Log to monitoring system
+ if (window.monitoring) {
+ window.monitoring.logError('version_control', error);
+ }
+ }
+});
+
+// Export error handling utilities
+export const versionControl = {
+ /**
+ * Wrap version control operations with error handling
+ */
+ async performOperation(key, operation) {
+ return errorBoundary.wrapOperation(key, operation);
+ },
+
+ /**
+ * Create a new error instance
+ */
+ createError(message, code, details) {
+ return new VersionControlError(message, code, details);
+ },
+
+ /**
+ * Show loading state manually
+ */
+ showLoading(key) {
+ errorBoundary.showLoading(key);
+ },
+
+ /**
+ * Hide loading state manually
+ */
+ hideLoading(key) {
+ errorBoundary.hideLoading(key);
+ },
+
+ /**
+ * Show error notification manually
+ */
+ showError(error) {
+ errorBoundary.showErrorNotification(error);
+ }
+};
+
+// Add global error handler for uncaught version control errors
+window.addEventListener('unhandledrejection', event => {
+ if (event.reason instanceof VersionControlError) {
+ event.preventDefault();
+ errorBoundary.defaultErrorHandler(event.reason);
+ }
+});
\ No newline at end of file
diff --git a/tests/test_runner.py b/tests/test_runner.py
index d088257c..6fc6ca7b 100644
--- a/tests/test_runner.py
+++ b/tests/test_runner.py
@@ -4,7 +4,7 @@ import sys
import django
from django.conf import settings
from django.test.runner import DiscoverRunner
-import coverage
+import coverage # type: ignore
import unittest
def setup_django():