Complete implement of select2 component, and replaced existing use of select2. Also deprecated CustomBlade definitions of select2/simplemde

app/Helpers/PageAssets.php

@@ -20,12 +20,13 @@ class PageAssets
 		'datatables' => [
 			'base' => [
 				'css' => [
-					'//cdn.datatables.net/2.1.2/css/dataTables.bootstrap4.css',
+					'//cdn.datatables.net/1.10.25/css/dataTables.bootstrap5.css',
 					//'//cdn.datatables.net/2.1.2/css/dataTables.dataTables.min.css',
+					'/plugin/dataTables/dataTables.bootstrap5.css',
 				],
 				'js' => [
-					'//cdn.datatables.net/2.1.2/js/dataTables.min.js',
-					'//cdn.datatables.net/2.1.2/js/dataTables.bootstrap4.min.js',
+					'//cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js',
+					'//cdn.datatables.net/1.10.25/js/dataTables.bootstrap5.min.js',
 				],
 			],
 			'buttons' => [
@@ -42,7 +43,8 @@ class PageAssets
 			],
 			'conditionalpaging' => [
 				'js' => [
-					'//cdn.datatables.net/plug-ins/2.0.5/features/conditionalPaging/dataTables.conditionalPaging.min.js',
+					//'//cdn.datatables.net/plug-ins/2.0.5/features/conditionalPaging/dataTables.conditionalPaging.min.js',
+					'/plugin/dataTables/dataTables.conditionalPaging.js',
 				],
 			],
 			'fixedheader' => [
@@ -69,13 +71,13 @@ class PageAssets
 			],
 			'rowgroup' => [
 				'css' => [
-					'//cdn.datatables.net/rowgroup/1.5.0/css/rowGroup.bootstrap4.min.css',
+					'//cdn.datatables.net/rowgroup/1.1.2/css/rowGroup.bootstrap4.min.css',
 					//'//cdn.datatables.net/rowgroup/1.5.0/css/rowGroup.dataTables.min.css',
 				],
 				'js' => [
-					'//cdn.datatables.net/rowgroup/1.5.0/js/dataTables.rowGroup.min.js',
+					'//cdn.datatables.net/rowgroup/1.1.2/js/dataTables.rowGroup.min.js',
 					//'//cdn.datatables.net/rowgroup/1.5.0/js/rowGroup.dataTables.min.js',
-					'//cdn.datatables.net/rowgroup/1.5.0/js/rowGroup.bootstrap4.min.js',
+					'//cdn.datatables.net/rowgroup/1.1.2/js/rowGroup.bootstrap5.min.js',
 				],
 			],
 			'searchpanes' => [

app/Http/Controllers/SystemController.php

@@ -684,9 +684,16 @@ class SystemController extends Controller
 		$this->authorize('update_nn',$o);
 		session()->flash('accordion','session');
 
+		// Remove the subscription to file/echo areas for each address affected
+		foreach ($o->akas->where('zone_id',$zo->id) as $ao) {
+			$ao->echoareas()->detach();
+			$ao->fileareas()->detach();
+		}
+
 		$o->sessions()->detach($zo);
 
-		return redirect()->to(sprintf('system/addedit/%d',$o->id));
+		return redirect()
+			->to(sprintf('system/addedit/%d',$o->id));
 	}
 	// @todo Can this be consolidated with system_register()
 

app/Models/System.php

@@ -118,7 +118,8 @@ class System extends Model
 			->select(['zones.id','zones.zone_id','domain_id','zones.active'])
 			->join('domains',['domains.id'=>'zones.domain_id'])
 			->withPivot(['sespass','pktpass','ticpass','fixpass','zt_ipv4','zt_ipv6','default'])
-			->orderBy('domains.name');
+			->orderBy('domains.name')
+			->dontCache();
 	}
 
 	/**

app/Providers/CustomBladeServiceProvider.php

@@ -32,14 +32,6 @@ class CustomBladeServiceProvider extends ServiceProvider
 						'<link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/1.10.25/css/dataTables.bootstrap5.min.css" media="screen">'.
 						'<link type="text/css" rel="stylesheet" href="'.asset('plugin/dataTables/dataTables.bootstrap5.css').'" media="screen">';
 
-				case 'select2':
-					return
-						'<link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css">';
-
-				case 'simplemde':
-					return
-						'<link type="text/css" rel="stylesheet" href="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">';
-
 				default:
 					throw new \Exception('Unknown CSS: '.$expression);
 			}
@@ -63,15 +55,6 @@ class CustomBladeServiceProvider extends ServiceProvider
 						'<script type="text/javascript" src="https://code.highcharts.com/modules/export-data.js"></script>'.
 						'<script type="text/javascript" src="https://code.highcharts.com/themes/dark-unica.js"></script>';
 
-				case 'select2':
-					return
-						'<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>'.
-						'<script type="text/javascript" src="'.asset('plugin/select2/fix-autofocus.js').'"></script>';
-
-				case 'simplemde':
-					return
-						'<script type="text/javascript" src="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js"></script>';
-
 				default:
 					throw new \Exception('Unknown JS: '.$expression);
 			}