Merge branch 'main' into feat/Tapis-v3-redesign

designsafe/apps/workspace/migrations/0011_alter_applistingentry_options.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.11 on 2024-04-29 16:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("workspace", "0010_alter_applistingentry_options_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="applistingentry",
+            options={
+                "ordering": ["-is_popular", "label"],
+                "verbose_name_plural": "App Listing Entries",
+            },
+        ),
+    ]

designsafe/apps/workspace/models/app_entries.py

@@ -147,7 +147,7 @@ class Meta:
             )
         ]
 
-        ordering = ["is_popular", "label"]
+        ordering = ["-is_popular", "label"]
 
 
 class AppVariant(models.Model):