Allow to delete non default taxon tree

specifyweb/businessrules/rules/tree_rules.py

@@ -23,15 +23,16 @@ def post_tree_rank_initiation_handler(sender, obj, created):
 
 @orm_signal_handler('pre_delete')
 def cannot_delete_root_treedefitem(sender, obj):
-    if is_treedefitem(obj):  # is it a treedefitem?
-        if sender.objects.get(id=obj.id).parent is None:
-            raise TreeBusinessRuleException(
-                "cannot delete root level tree definition item",
-                {"tree": obj.__class__.__name__,
-                 "localizationKey": 'deletingTreeRoot',
-                 "node": {
-                     "id": obj.id
-                 }})
+    pass
+    # if is_treedefitem(obj):  # is it a treedefitem?
+    #     if sender.objects.get(id=obj.id).parent is None:
+    #         raise TreeBusinessRuleException(
+    #             "cannot delete root level tree definition item",
+    #             {"tree": obj.__class__.__name__,
+    #              "localizationKey": 'deletingTreeRoot',
+    #              "node": {
+    #                  "id": obj.id
+    #              }})
         # pre_tree_rank_deletion(sender, obj)
         # verify_rank_parent_chain_integrity(obj, RankOperation.DELETED)
 

specifyweb/businessrules/tests/test_geographytreedefitem.py

@@ -5,9 +5,6 @@
 from ..exceptions import TreeBusinessRuleException
 
 class GeographyTreeDefItem(ApiTests):
-    def test_cannot_delete_root(self):
-        with self.assertRaises(TreeBusinessRuleException):
-            self.geographytreedef.treedefitems.filter(parent=None).delete()
 
     def test_delete_blocked_by_geography(self):
         earth = models.Geography.objects.create(

specifyweb/businessrules/tests/test_geologictimeperiodtreedefitem.py

@@ -3,13 +3,6 @@
 from ..exceptions import TreeBusinessRuleException
 
 class GeologictimeperiodtreedefitemTests(ApiTests):
-    def test_cannot_delete_root(self):
-        root = self.geologictimeperiodtreedef.treedefitems.create(
-            name="root",
-            rankid=0)
-
-        with self.assertRaises(TreeBusinessRuleException):
-            root.delete()
 
     def test_delete_blocked_by_geologictimeperiod(self):
         root = self.geologictimeperiodtreedef.treedefitems.create(

specifyweb/businessrules/tests/test_lithostrattreedefitem.py

@@ -19,12 +19,6 @@ def setUp(self):
             definition=self.rootlithostrattreedefitem.treedef,
             rankid=self.rootlithostrattreedefitem.rankid)
 
-    def test_cannot_delete_root(self):
-        self.rootlithostrat.delete()
-
-        with self.assertRaises(TreeBusinessRuleException):
-            self.rootlithostrattreedefitem.delete()
-
     def test_delete_blocked_by_lithostrat(self):
         layer = self.rootlithostrattreedefitem.children.create(
             name="Layer",

specifyweb/businessrules/tests/test_storagetreedefitem.py

@@ -19,12 +19,6 @@ def setUp(self):
             definition=self.rootstoragetreedefitem.treedef,
             rankid=self.rootstoragetreedefitem.rankid)
 
-    def test_cannot_delete_root(self):
-        self.rootstorage.delete()
-
-        with self.assertRaises(TreeBusinessRuleException):
-            self.rootstoragetreedefitem.delete()
-
     def test_delete_blocked_by_storage(self):
         site = self.rootstoragetreedefitem.children.create(
             name="Site",

specifyweb/businessrules/tests/test_taxontreedefitem.py

@@ -19,12 +19,6 @@ def setUp(self):
             definition=self.roottaxontreedefitem.treedef,
             rankid=self.roottaxontreedefitem.rankid)
 
-    def test_cannot_delete_root(self):
-        self.roottaxon.delete()
-
-        with self.assertRaises(TreeBusinessRuleException):
-            self.roottaxontreedefitem.delete()
-
     def test_delete_blocked_by_taxon(self):
         kingdom = self.roottaxontreedefitem.children.create(
             name="Kingdom",
@@ -37,8 +31,4 @@ def test_delete_blocked_by_taxon(self):
             definition=kingdom.treedef,
             rankid=kingdom.rankid)
 
-        with self.assertRaises(ProtectedError):
-            kingdom.delete()
-
         animals.delete()
-        kingdom.delete()

specifyweb/frontend/js_src/lib/components/Molecules/ResourceLink.tsx

@@ -113,7 +113,7 @@ export function ResourceEdit({
       }}
       resource={resource}
       resourceView={{
-        onDeleted: undefined,
+        onDeleted: (): void => globalThis.location.replace('/specify/'),
         onSaved: handleSaved,
       }}
     />

specifyweb/specify/migrations/0024_taxontreedef_alter_delete.py

@@ -0,0 +1,34 @@
+# Generated by Django 3.2.15 on 2025-02-03 17:11
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('specify', '0023_update_schema_config_text'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='taxon',
+            name='definition',
+            field=models.ForeignKey(db_column='TaxonTreeDefID', on_delete=django.db.models.deletion.CASCADE, related_name='treeentries', to='specify.taxontreedef'),
+        ),
+        migrations.AlterField(
+            model_name='taxon',
+            name='definitionitem',
+            field=models.ForeignKey(db_column='TaxonTreeDefItemID', on_delete=django.db.models.deletion.CASCADE, related_name='treeentries', to='specify.taxontreedefitem'),
+        ),
+        migrations.AlterField(
+            model_name='taxontreedefitem',
+            name='parent',
+            field=models.ForeignKey(db_column='ParentItemID', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='specify.taxontreedefitem'),
+        ),
+        migrations.AlterField(
+            model_name='taxontreedefitem',
+            name='treedef',
+            field=models.ForeignKey(db_column='TaxonTreeDefID', on_delete=django.db.models.deletion.CASCADE, related_name='treedefitems', to='specify.taxontreedef'),
+        ),
+    ]

specifyweb/specify/models.py

@@ -6762,8 +6762,8 @@ class Taxon(model_extras.Taxon):
     # Relationships: Many-to-One
     acceptedtaxon = models.ForeignKey('Taxon', db_column='AcceptedID', related_name='acceptedchildren', null=True, on_delete=protect_with_blockers)
     createdbyagent = models.ForeignKey('Agent', db_column='CreatedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
-    definition = models.ForeignKey('TaxonTreeDef', db_column='TaxonTreeDefID', related_name='treeentries', null=False, on_delete=protect_with_blockers)
-    definitionitem = models.ForeignKey('TaxonTreeDefItem', db_column='TaxonTreeDefItemID', related_name='treeentries', null=False, on_delete=protect_with_blockers)
+    definition = models.ForeignKey('TaxonTreeDef', db_column='TaxonTreeDefID', related_name='treeentries', null=False, on_delete=models.CASCADE)
+    definitionitem = models.ForeignKey('TaxonTreeDefItem', db_column='TaxonTreeDefItemID', related_name='treeentries', null=False, on_delete=models.CASCADE)
     hybridparent1 = models.ForeignKey('Taxon', db_column='HybridParent1ID', related_name='hybridchildren1', null=True, on_delete=protect_with_blockers)
     hybridparent2 = models.ForeignKey('Taxon', db_column='HybridParent2ID', related_name='hybridchildren2', null=True, on_delete=protect_with_blockers)
     modifiedbyagent = models.ForeignKey('Agent', db_column='ModifiedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
@@ -7085,8 +7085,8 @@ class Taxontreedefitem(model_extras.Taxontreedefitem):
     # Relationships: Many-to-One
     createdbyagent = models.ForeignKey('Agent', db_column='CreatedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
     modifiedbyagent = models.ForeignKey('Agent', db_column='ModifiedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
-    parent = models.ForeignKey('TaxonTreeDefItem', db_column='ParentItemID', related_name='children', null=True, on_delete=models.DO_NOTHING)
-    treedef = models.ForeignKey('TaxonTreeDef', db_column='TaxonTreeDefID', related_name='treedefitems', null=False, on_delete=protect_with_blockers)
+    parent = models.ForeignKey('TaxonTreeDefItem', db_column='ParentItemID', related_name='children', null=True, on_delete=models.CASCADE)
+    treedef = models.ForeignKey('TaxonTreeDef', db_column='TaxonTreeDefID', related_name='treedefitems', null=False, on_delete=models.CASCADE)
 
     class Meta:
         db_table = 'taxontreedefitem'