From c0f70004eb2f5bb1843fb35d5dfc7af5119014bd Mon Sep 17 00:00:00 2001 From: jedi Date: Sun, 16 Aug 2026 15:15:38 +0200 Subject: [PATCH] stash --- .../0004_alter_accountpreference_id.py | 18 + backend/toolshed/admin.py | 4 +- .../0010_rename_name_workflowinstance_slug.py | 18 + backend/toolshed/models.py | 2 +- backend/toolshed/serializers.py | 2 +- deploy/docker-compose.override.yml | 1 + frontend/src/components/BaseLayout.vue | 3 +- .../workflows/BackupRestoreWorkflow.vue | 4 +- .../workflows/BulkItemImportWorkflow.vue | 4 +- .../workflows/ExpiryCheckWorkflow.vue | 4 +- .../workflows/FotoFirstBulkImportWorkflow.vue | 296 +++- .../FotoFirstBulkImportWorkflow2.vue | 1352 +++++++++++++++++ .../workflows/InventoryAuditWorkflow.vue | 4 +- .../workflows/MaintenanceScheduleWorkflow.vue | 4 +- .../workflows/StorageOptimizationWorkflow.vue | 4 +- frontend/src/scss/toolshed.scss | 37 + frontend/src/store.js | 9 + frontend/src/views/WorkflowDetail.vue | 182 +-- frontend/src/views/Workflows.vue | 117 +- frontend/src/workflows.js | 46 +- frontend/vite.config.js | 4 +- 21 files changed, 1855 insertions(+), 260 deletions(-) create mode 100644 backend/authentication/migrations/0004_alter_accountpreference_id.py create mode 100644 backend/toolshed/migrations/0010_rename_name_workflowinstance_slug.py create mode 100644 frontend/src/components/workflow/workflows/FotoFirstBulkImportWorkflow2.vue diff --git a/backend/authentication/migrations/0004_alter_accountpreference_id.py b/backend/authentication/migrations/0004_alter_accountpreference_id.py new file mode 100644 index 0000000..967b2fb --- /dev/null +++ b/backend/authentication/migrations/0004_alter_accountpreference_id.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.2 on 2026-08-09 13:08 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('authentication', '0003_accountpreference'), + ] + + operations = [ + migrations.AlterField( + model_name='accountpreference', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + ] diff --git a/backend/toolshed/admin.py b/backend/toolshed/admin.py index bbd1525..a3d11a1 100644 --- a/backend/toolshed/admin.py +++ b/backend/toolshed/admin.py @@ -73,8 +73,8 @@ admin.site.register(StorageLocation, StorageLocationAdmin) class WorkflowInstanceAdmin(admin.ModelAdmin): - list_display = ('name', 'state', 'owner', 'created_at', 'updated_at') - search_fields = ('name', 'owner__username') + list_display = ('slug', 'state', 'owner', 'created_at', 'updated_at') + search_fields = ('slug', 'owner__username') list_filter = ('state', 'created_at', 'owner') readonly_fields = ('created_at', 'updated_at') diff --git a/backend/toolshed/migrations/0010_rename_name_workflowinstance_slug.py b/backend/toolshed/migrations/0010_rename_name_workflowinstance_slug.py new file mode 100644 index 0000000..8787453 --- /dev/null +++ b/backend/toolshed/migrations/0010_rename_name_workflowinstance_slug.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.2 on 2026-08-09 13:08 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('toolshed', '0009_alter_workflowinstance_payload'), + ] + + operations = [ + migrations.RenameField( + model_name='workflowinstance', + old_name='name', + new_name='slug', + ), + ] diff --git a/backend/toolshed/models.py b/backend/toolshed/models.py index 47a790c..e89a501 100644 --- a/backend/toolshed/models.py +++ b/backend/toolshed/models.py @@ -135,7 +135,7 @@ class StorageLocation(models.Model): class WorkflowInstance(models.Model): - name = models.CharField(max_length=255) + slug = models.CharField(max_length=255) state = models.CharField(max_length=255) payload = models.TextField(default='', blank=True) # an opaque, frontend-serialized JSON string on the backend. owner = models.ForeignKey(ToolshedUser, on_delete=models.CASCADE, related_name='workflows') diff --git a/backend/toolshed/serializers.py b/backend/toolshed/serializers.py index 43c335b..777801c 100644 --- a/backend/toolshed/serializers.py +++ b/backend/toolshed/serializers.py @@ -206,6 +206,6 @@ class WorkflowInstanceSerializer(serializers.ModelSerializer): class Meta: model = WorkflowInstance - fields = ['id', 'name', 'state', 'payload', 'owner', 'created_at', 'updated_at'] + fields = ['id', 'slug', 'state', 'payload', 'owner', 'created_at', 'updated_at'] read_only_fields = ['owner', 'created_at', 'updated_at'] diff --git a/deploy/docker-compose.override.yml b/deploy/docker-compose.override.yml index 6d542d7..77f21c7 100644 --- a/deploy/docker-compose.override.yml +++ b/deploy/docker-compose.override.yml @@ -1,4 +1,5 @@ version: '3.8' +name: deploy services: backend-a: diff --git a/frontend/src/components/BaseLayout.vue b/frontend/src/components/BaseLayout.vue index 8ec828c..d9a1ac2 100644 --- a/frontend/src/components/BaseLayout.vue +++ b/frontend/src/components/BaseLayout.vue @@ -1,7 +1,7 @@