feature/FOUR-20310 Add Assets to a Bundle from the ellipsis

ProcessMaker/Http/Controllers/Api/DevLinkController.php

@@ -4,12 +4,13 @@
 
 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\BundleSetting;
 use ProcessMaker\Models\DevLink;
 use ProcessMaker\Models\Setting;
 
@@ -119,7 +120,7 @@ public function localBundles(Request $request)
 
     public function showBundle(Bundle $bundle)
     {
-        return $bundle->load('assets');
+        return $bundle->load('assets')->load('settings');
     }
 
     public function remoteBundles(Request $request, DevLink $devLink)
@@ -131,6 +132,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 +145,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 +215,12 @@ public function addAsset(Request $request, Bundle $bundle)
         $asset = $request->input('type')::findOrFail($request->input('id'));
         $bundle->addAsset($asset);
     }
-
+
+    public function addSettings(Request $request, Bundle $bundle)
+    {
+        $bundle->addSettings($request->input('setting'), $request->input('config'));
+    }
+
     public function addAssetToBundles(Request $request)
     {
         $bundles = $request->input('bundles');
@@ -290,4 +298,11 @@ public function deleteBundleAsset(BundleAsset $bundleAsset)
 
         return response()->json(['message' => 'Bundle asset association deleted.'], 200);
     }
+
+    public function deleteBundleSetting(BundleSetting $bundleSetting)
+    {
+        $bundleSetting->delete();
+
+        return response()->json(['message' => 'Bundle setting deleted.'], 200);
+    }
 }

ProcessMaker/Models/Bundle.php

@@ -45,6 +45,11 @@ public function assets()
         return $this->hasMany(BundleAsset::class);
     }
 
+    public function settings()
+    {
+        return $this->hasMany(BundleSetting::class);
+    }
+
     public function devLink()
     {
         return $this->belongsTo(DevLink::class, 'dev_link_id');
@@ -125,7 +130,21 @@ public function addAsset(ProcessMakerModel $asset)
             'asset_id' => $asset->id,
         ]);
     }
-
+
+    public function addSettings($setting, $config)
+    {
+        $exists = $this->settings()->where('setting', $setting)->exists();
+        if ($exists) {
+            throw ValidationException::withMessages(['*' => 'Setting already exists in bundle']);
+        }
+
+        BundleSetting::create([
+            'bundle_id' => $this->id,
+            'setting' => $setting,
+            'config' => $config,
+        ]);
+    }
+
     public function addAssetToBundles(ProcessMakerModel $asset)
     {
         $message = null;
@@ -134,6 +153,7 @@ public function addAssetToBundles(ProcessMakerModel $asset)
         } catch (ValidationException $ve) {
             $message = $ve->getMessage();
         }
+
         return $message;
     }
 

ProcessMaker/Models/BundleAsset.php

@@ -11,7 +11,15 @@ class BundleAsset extends ProcessMakerModel
 
     protected $guarded = ['id'];
 
-    protected $appends = ['name', 'url', 'type'];
+    protected $appends = ['name', 'url', 'type', 'owner_name', 'categories'];
+
+    const DATA_SOURCE_CLASS = 'ProcessMaker\Packages\Connectors\DataSources\Models\DataSource';
+
+    const COLLECTION_CLASS = 'ProcessMaker\Plugins\Collections\Models\Collection';
+
+    const DECISION_TABLE_CLASS = 'ProcessMaker\Package\PackageDecisionEngine\Models\DecisionTable';
+
+    const FLOW_GENIE_CLASS = 'ProcessMaker\Package\PackageAi\Models\FlowGenie';
 
     protected static function boot()
     {
@@ -53,7 +61,7 @@ public function getNameAttribute()
             $this->asset_type === Screen::class ||
             $this->asset_type === Script::class
         ) {
-            return $this->title;
+            return $this->asset->title;
         }
 
         return $this->asset->name;
@@ -68,6 +76,14 @@ public function getUrlAttribute()
                 return "/designer/scripts/{$this->asset_id}/builder";
             case Process::class:
                 return "/modeler/{$this->asset_id}";
+            case self::DATA_SOURCE_CLASS:
+                return "/designer/data-sources/{$this->asset_id}/edit";
+            case self::COLLECTION_CLASS:
+                return "/collections/{$this->asset_id}/edit";
+            case self::DECISION_TABLE_CLASS:
+                return "/designer/decision-tables/table-builder/{$this->asset_id}/edit";
+            case self::FLOW_GENIE_CLASS:
+                return "/designer/flow-genies/{$this->asset_id}/edit";
             default:
                 return null;
         }
@@ -82,8 +98,38 @@ public function getTypeAttribute()
                 return 'Script';
             case Process::class:
                 return 'Process';
+            case self::DATA_SOURCE_CLASS:
+                return 'data_source';
+            case self::COLLECTION_CLASS:
+                return 'collection';
+            case self::DECISION_TABLE_CLASS:
+                return 'decision_table';
+            case self::FLOW_GENIE_CLASS:
+                return 'flow_genie';
             default:
                 return null;
         }
     }
+
+    public function getOwnerNameAttribute()
+    {
+        if ($this->asset && method_exists($this->asset, 'user')) {
+            return $this->asset->user->firstname . ' ' . $this->asset->user->lastname;
+        }
+
+        return null;
+    }
+
+    public function getCategoriesAttribute()
+    {
+        if ($this->asset_type === self::COLLECTION_CLASS) {
+            return [];
+        }
+
+        if ($this->asset && method_exists($this->asset, 'categories')) {
+            return $this->asset->categories->pluck('name')->toArray();
+        }
+
+        return [];
+    }
 }

ProcessMaker/Models/BundleSetting.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace ProcessMaker\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use ProcessMaker\Models\ProcessMakerModel;
+
+class BundleSetting extends ProcessMakerModel
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'bundle_id',
+        'setting',
+        'config',
+    ];
+
+    protected $casts = [
+        'config' => 'array',
+    ];
+
+    public function bundle()
+    {
+        return $this->belongsTo(Bundle::class);
+    }
+}

database/migrations/2024_11_26_145144_add_description_to_bundles_table.php

@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('bundles', function (Blueprint $table) {
+            $table->text('description')->after('name')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('bundles', function (Blueprint $table) {
+            $table->dropColumn('description');
+        });
+    }
+};

database/migrations/2024_12_03_140610_create_bundle_settings_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('bundle_settings', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('bundle_id');
+            $table->string('setting');
+            $table->json('config')->nullable();
+            $table->timestamps();
+
+            $table->index(['bundle_id', 'setting']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('bundle_settings');
+    }
+};

resources/fonts/pm-font/index.html

@@ -103,7 +103,7 @@
 
   <div class="header">
 
-    <h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
+    <h1>ProcessMaker Icons<sup>4.12.0+beta-5</sup></h1>
     <div class="info">
       Icons generated with svgtofont. For add new icons, please check the README file
     </div>
@@ -115,7 +115,7 @@ <h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
   </div>
   <div class="icons">
     <ul>
-      <li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
+      <li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-edit-outline"></i><p class="name">edit-outline</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-link-icon"></i><p class="name">link-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus-thin"></i><p class="name">plus-thin</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-remove-outlined"></i><p class="name">remove-outlined</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
     </ul>
   </div>
   <p class="links">