Merge pull request #21457 from colemanw/searchDisplayAfformDelete

Fixes dev/core#2824 - Handle related Afforms when deleting Search Displays

diff --cc ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
index f6b22aeeaadf9ee67d1a21c675ca17d8d88ee9cd,7fd093d1e69cc7724665ceaa5bb4af238468ef6b..64868513b759421c33d3f70822d3bc7740815342
--- 1/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
--- 2/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
+++ b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
@@@ -6,9 -6,10 +6,10 @@@
        savedSearch: '<'
      },
      templateUrl: '~/crmSearchAdmin/crmSearchAdmin.html',
 -    controller: function($scope, $element, $location, $timeout, crmApi4, dialogService, searchMeta, formatForSelect2) {
 +    controller: function($scope, $element, $location, $timeout, crmApi4, dialogService, searchMeta) {
        var ts = $scope.ts = CRM.ts('org.civicrm.search_kit'),
          ctrl = this,
+         afformLoad,
          fieldsForJoinGetters = {};
  
        this.DEFAULT_AGGREGATE_FN = 'GROUP_CONCAT';

diff --cc ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.component.js
Simple merge

diff --cc ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchAfformTest.php
Simple merge