update for wq.db 2.0

data_wizard/migrations/0003_alter_run_options.py

@@ -1,17 +1,17 @@
-# Generated by Django 3.2.7 on 2021-09-15 08:20
+# Generated by Django 4.2.2 on 2023-06-26 11:58
 
 from django.db import migrations
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('data_wizard', '0002_auto_20190306_2022'),
+        ("data_wizard", "0002_auto_20190306_2022"),
     ]
 
     operations = [
         migrations.AlterModelOptions(
-            name='run',
-            options={'ordering': ('-pk',), 'verbose_name': 'data wizard', 'verbose_name_plural': 'data wizard'},
+            name="run",
+            options={"ordering": ("-pk",), "verbose_name": "data wizard run"},
         ),
     ]

data_wizard/models.py

@@ -122,8 +122,7 @@ def last_update(self):
 
     class Meta:
         ordering = ("-pk",)
-        verbose_name = "data wizard"
-        verbose_name_plural = "data wizard"
+        verbose_name = "data wizard run"
 
 
 class RunLog(models.Model):

data_wizard/rest.py

@@ -81,4 +81,8 @@ def user_filter(qs, request):
     fields="__all__",
     filter=user_filter,
     cache="none",
+    show_in_index="can_change",
+    section="Data Wizard",
+    order=210,
+    icon="list",
 )

data_wizard/settings.py

@@ -16,6 +16,7 @@
         "data_wizard.tasks.import_data",
     ),
     "ROW_LOGGER": "data_wizard.tasks.create_record",
+    "SHOW_IN_LIST": "data_wizard.tasks.show_in_list",
 }
 
 

data_wizard/sources/migrations/0003_model_options.py

@@ -0,0 +1,41 @@
+# Generated by Django 4.2.2 on 2023-06-27 11:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("sources", "0002_source_user"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="filesource",
+            options={
+                "verbose_name": "File for Import",
+                "verbose_name_plural": "Import via File",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="urlsource",
+            options={
+                "verbose_name": "URL for Import",
+                "verbose_name_plural": "Import via URL",
+            },
+        ),
+        migrations.AlterField(
+            model_name="filesource",
+            name="name",
+            field=models.CharField(
+                blank=True, max_length=255, null=True, verbose_name="Name (Optional)"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="urlsource",
+            name="name",
+            field=models.CharField(
+                blank=True, max_length=255, null=True, verbose_name="Name (Optional)"
+            ),
+        ),
+    ]

data_wizard/sources/models.py

@@ -10,13 +10,17 @@ class FileSource(models.Model):
         blank=True,
         on_delete=models.PROTECT,
     )
-    name = models.CharField(max_length=255, null=True, blank=True)
     file = models.FileField(upload_to="datawizard/")
+    name = models.CharField(max_length=255, null=True, blank=True, verbose_name="Name (Optional)")
     date = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return self.name or os.path.basename(self.file.name)
 
+    class Meta:
+        verbose_name = "File for Import"
+        verbose_name_plural = "Import via File"
+
 
 class URLSource(models.Model):
     user = models.ForeignKey(
@@ -25,9 +29,13 @@ class URLSource(models.Model):
         blank=True,
         on_delete=models.PROTECT,
     )
-    name = models.CharField(max_length=255, null=True, blank=True)
     url = models.URLField()
+    name = models.CharField(max_length=255, null=True, blank=True, verbose_name="Name (Optional)")
     date = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return self.name or self.url
+
+    class Meta:
+        verbose_name = "URL for Import"
+        verbose_name_plural = "Import via URL"

data_wizard/sources/rest.py

@@ -5,6 +5,16 @@
 from ..rest import user_filter
 
 
+@rest.register(
+    FileSource,
+    url="filesources",
+    background_sync=False,
+    filter=user_filter,
+    show_in_index="can_change",
+    section="Data Wizard",
+    order=200,
+    icon="wizard",
+)
 class FileSourceSerializer(ModelSerializer):
     user = serializers.HiddenField(default=serializers.CurrentUserDefault())
 
@@ -13,24 +23,20 @@ class Meta:
         fields = "__all__"
 
 
+
+@rest.register(
+    URLSource,
+    url="urlsources",
+    background_sync=False,
+    filter=user_filter,
+    show_in_index="can_change",
+    section="Data Wizard",
+    order=201,
+    icon="wizard",
+)
 class URLSourceSerializer(ModelSerializer):
     user = serializers.HiddenField(default=serializers.CurrentUserDefault())
 
     class Meta:
         model = URLSource
         fields = "__all__"
-
-
-rest.router.register_model(
-    FileSource,
-    serializer=FileSourceSerializer,
-    background_sync=False,
-    filter=user_filter,
-)
-
-rest.router.register_model(
-    URLSource,
-    serializer=URLSourceSerializer,
-    background_sync=False,
-    filter=user_filter,
-)

data_wizard/tasks.py

@@ -76,17 +76,21 @@ def check_serializer(run):
 
 @wizard_task(label="Serializers", url_path="serializers")
 def list_serializers(run):
+    show_in_list = import_setting("SHOW_IN_LIST")
     result = {}
     result["serializer_choices"] = [
         {
             "name": s["class_name"],
             "label": s["name"],
         }
         for s in registry.get_serializers()
-        if s["options"].get("show_in_list", True)
+        if show_in_list(s['serializer'], run, s['options'])
     ]
     return result
 
+def show_in_list(serializer, run, options):
+    return options.get("show_in_list", True)
+
 
 @wizard_task(label="Update Serializer")
 def updateserializer(run, post={}):