diff --git a/app/Domain/Nodes/Actions/CreateNodeAction.php b/app/Domain/Nodes/Actions/CreateNodeAction.php index bb384ee..cf7ead5 100644 --- a/app/Domain/Nodes/Actions/CreateNodeAction.php +++ b/app/Domain/Nodes/Actions/CreateNodeAction.php @@ -34,8 +34,9 @@ public function execute( $nodeName, $destinationCluster, $destinationNode, - $chart, + $charts, ) { + // ========================= // Validate User Permissions // ========================= @@ -72,10 +73,13 @@ public function execute( "name" => $nodeName . '/' . $destinationCluster . '/' . $destinationNode, ]); + // Split the $charts string (comma-delimited) into an array of UUIDs + $charts = explode(',', $charts); + // Create an entry in the Edge Agent Deployment app to trigger the deployment of the edge agent $configDB->putConfig(App::EdgeAgentDeployment, $uuid, [ "name" => $nodeName, - "charts" => [$chart], + "charts" => $charts, "cluster" => $destinationCluster, "hostname" => $destinationNode, ]); diff --git a/app/Http/Controllers/NodeController.php b/app/Http/Controllers/NodeController.php index 0d256b1..6b77a82 100644 --- a/app/Http/Controllers/NodeController.php +++ b/app/Http/Controllers/NodeController.php @@ -51,7 +51,7 @@ public function store(CreateNodeRequest $request) nodeName: $validated['node_name'], destinationCluster: $validated['destination_cluster'], destinationNode: $validated['destination_node'], - chart: $validated['chart'], + charts: $validated['charts'], ) ); } diff --git a/app/Http/Requests/CreateNodeRequest.php b/app/Http/Requests/CreateNodeRequest.php index 4b8b954..714148c 100644 --- a/app/Http/Requests/CreateNodeRequest.php +++ b/app/Http/Requests/CreateNodeRequest.php @@ -49,7 +49,7 @@ public function rules() { return [ 'node_name' => ['required', 'string', 'min:5', 'regex:/^\w+$/i'], - 'chart' => ['required', 'uuid', 'string',], + 'charts' => ['required', 'string'], 'destination_cluster' => ['required', 'string'], 'destination_node' => ['required', 'string'], ]; diff --git a/resources/js/components/FormControls/Checkbox.vue b/resources/js/components/FormControls/Checkbox.vue index 49d11e9..c51e3d1 100644 --- a/resources/js/components/FormControls/Checkbox.vue +++ b/resources/js/components/FormControls/Checkbox.vue @@ -4,24 +4,25 @@ --> \ No newline at end of file + localValue: !!this.value, + } + }, +} + diff --git a/resources/js/components/FormControls/FormWrapper.vue b/resources/js/components/FormControls/FormWrapper.vue index 71e47b4..f58f917 100644 --- a/resources/js/components/FormControls/FormWrapper.vue +++ b/resources/js/components/FormControls/FormWrapper.vue @@ -9,7 +9,7 @@ {{ control.description }}
-
+

{{ control.name }}

@@ -50,4 +50,4 @@ export default { return {}; }, } - \ No newline at end of file + diff --git a/resources/js/components/FormControls/Input.vue b/resources/js/components/FormControls/Input.vue index b30c832..e2902f9 100644 --- a/resources/js/components/FormControls/Input.vue +++ b/resources/js/components/FormControls/Input.vue @@ -9,7 +9,7 @@ {{ control.description }}
-
+

{{ control.name }}

diff --git a/resources/js/components/FormControls/MultiSelection.vue b/resources/js/components/FormControls/MultiSelection.vue index 05f9d83..1be7846 100644 --- a/resources/js/components/FormControls/MultiSelection.vue +++ b/resources/js/components/FormControls/MultiSelection.vue @@ -4,7 +4,7 @@ -->