From 82012df437d783fcb00808510626eb2f8c848b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Bascop=C3=A9?= Date: Tue, 26 Nov 2024 13:29:29 -0400 Subject: [PATCH 1/2] Added the description field to bundles --- .../Controllers/Api/DevLinkController.php | 6 +++-- ...45144_add_description_to_bundles_table.php | 27 +++++++++++++++++++ .../admin/devlink/components/BundleModal.vue | 8 ++++++ .../admin/devlink/components/LocalBundles.vue | 1 + 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 database/migrations/2024_11_26_145144_add_description_to_bundles_table.php diff --git a/ProcessMaker/Http/Controllers/Api/DevLinkController.php b/ProcessMaker/Http/Controllers/Api/DevLinkController.php index 634ddac124..bec0058ceb 100644 --- a/ProcessMaker/Http/Controllers/Api/DevLinkController.php +++ b/ProcessMaker/Http/Controllers/Api/DevLinkController.php @@ -4,10 +4,10 @@ use Illuminate\Http\Request; use Illuminate\Validation\Rule; +use ProcessMaker\Exception\ValidationException; use ProcessMaker\Http\Controllers\Controller; use ProcessMaker\Http\Resources\ApiCollection; use ProcessMaker\Jobs\DevLinkInstall; -use ProcessMaker\Exception\ValidationException; use ProcessMaker\Models\Bundle; use ProcessMaker\Models\BundleAsset; use ProcessMaker\Models\DevLink; @@ -131,6 +131,7 @@ public function createBundle(Request $request) { $bundle = new Bundle(); $bundle->name = $request->input('name'); + $bundle->description = $request->input('description'); $bundle->published = (bool) $request->input('published', false); $bundle->version = 1; $bundle->saveOrFail(); @@ -143,6 +144,7 @@ public function updateBundle(Request $request, Bundle $bundle) $bundle->validateEditable(); $bundle->name = $request->input('name'); + $bundle->description = $request->input('description'); $bundle->published = (bool) $request->input('published', false); $bundle->saveOrFail(); @@ -212,7 +214,7 @@ public function addAsset(Request $request, Bundle $bundle) $asset = $request->input('type')::findOrFail($request->input('id')); $bundle->addAsset($asset); } - + public function addAssetToBundles(Request $request) { $bundles = $request->input('bundles'); diff --git a/database/migrations/2024_11_26_145144_add_description_to_bundles_table.php b/database/migrations/2024_11_26_145144_add_description_to_bundles_table.php new file mode 100644 index 0000000000..c487bd55fb --- /dev/null +++ b/database/migrations/2024_11_26_145144_add_description_to_bundles_table.php @@ -0,0 +1,27 @@ +text('description')->after('name'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('bundles', function (Blueprint $table) { + $table->dropColumn('description'); + }); + } +}; diff --git a/resources/js/admin/devlink/components/BundleModal.vue b/resources/js/admin/devlink/components/BundleModal.vue index abc1c3ae41..2f83ff1b3d 100644 --- a/resources/js/admin/devlink/components/BundleModal.vue +++ b/resources/js/admin/devlink/components/BundleModal.vue @@ -10,6 +10,14 @@ + + + diff --git a/resources/js/admin/devlink/components/LocalBundles.vue b/resources/js/admin/devlink/components/LocalBundles.vue index 6a0bba8bed..047a768a7b 100644 --- a/resources/js/admin/devlink/components/LocalBundles.vue +++ b/resources/js/admin/devlink/components/LocalBundles.vue @@ -85,6 +85,7 @@ const fields = [ const bundleAttributes = { id: null, name: '', + description: '', published: false, }; From 820133f55c93495eeb0a74697a40125f2dadb760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Bascop=C3=A9?= Date: Thu, 28 Nov 2024 11:17:16 -0400 Subject: [PATCH 2/2] Added nulleable to the new field description --- .../2024_11_26_145144_add_description_to_bundles_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2024_11_26_145144_add_description_to_bundles_table.php b/database/migrations/2024_11_26_145144_add_description_to_bundles_table.php index c487bd55fb..26f93cef62 100644 --- a/database/migrations/2024_11_26_145144_add_description_to_bundles_table.php +++ b/database/migrations/2024_11_26_145144_add_description_to_bundles_table.php @@ -11,7 +11,7 @@ public function up(): void { Schema::table('bundles', function (Blueprint $table) { - $table->text('description')->after('name'); + $table->text('description')->after('name')->nullable(); }); }