Created the methods to save remote settings

ProcessMaker · Dec 6, 2024 · 46ca020 · 46ca020
1 parent 7c2516a
commit 46ca020
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 10 deletions.
diff --git a/ProcessMaker/Http/Controllers/Api/DevLinkController.php b/ProcessMaker/Http/Controllers/Api/DevLinkController.php
@@ -203,6 +203,11 @@ public function exportLocalBundle(Bundle $bundle)
         return ['payloads' => $bundle->export()];
     }
 
+    public function exportLocalBundleSettings(Bundle $bundle)
+    {
+        return ['settings' => $bundle->exportSettings()];
+    }
+
     public function exportLocalAsset(Request $request)
     {
         $asset = $request->input('class')::findOrFail($request->input('id'));

diff --git a/ProcessMaker/Models/Bundle.php b/ProcessMaker/Models/Bundle.php
@@ -77,6 +77,13 @@ public function export()
         return $exports;
     }
 
+    public function exportSettings()
+    {
+        return $this->settings()->get()->map(function ($setting) {
+            return $setting->export();
+        });
+    }
+
     public function syncAssets($assets)
     {
         $assetKeys = [];
@@ -135,14 +142,16 @@ public function addSettings($setting, $config)
     {
         $exists = $this->settings()->where('setting', $setting)->exists();
         if ($exists) {
-            throw ValidationException::withMessages(['*' => 'Setting already exists in bundle']);
+            $this->settings()->where('setting', $setting)->update([
+                'config' => $config,
+            ]);
+        } else {
+            BundleSetting::create([
+                'bundle_id' => $this->id,
+                'setting' => $setting,
+                'config' => $config,
+            ]);
         }
-
-        BundleSetting::create([
-            'bundle_id' => $this->id,
-            'setting' => $setting,
-            'config' => $config,
-        ]);
     }
 
     public function addAssetToBundles(ProcessMakerModel $asset)
@@ -204,6 +213,19 @@ public function savePayloadsToFile(array $payloads)
         }
     }
 
+    public function installSettings($settings)
+    {
+        $newSettingsKeys = collect($settings)->pluck('setting')->toArray();
+
+        $this->settings()
+            ->whereNotIn('setting', $newSettingsKeys)
+            ->delete();
+
+        foreach ($settings as $setting) {
+            $this->addSettings($setting['setting'], $setting['config']);
+        }
+    }
+
     public function install(array $payloads, $mode, $logger = null)
     {
         if ($logger === null) {

diff --git a/ProcessMaker/Models/BundleSetting.php b/ProcessMaker/Models/BundleSetting.php
@@ -23,4 +23,12 @@ public function bundle()
     {
         return $this->belongsTo(Bundle::class);
     }
+
+    public function export()
+    {
+        return [
+            'setting' => $this->setting,
+            'config' => $this->config,
+        ];
+    }
 }
diff --git a/ProcessMaker/Models/DevLink.php b/ProcessMaker/Models/DevLink.php
@@ -143,6 +143,10 @@ public function installRemoteBundle($remoteBundleId, $updateType)
             route('api.devlink.export-local-bundle', ['bundle' => $remoteBundleId], false)
         )->json();
 
+        $bundleSettingsExport = $this->client()->get(
+            route('api.devlink.export-local-bundle-settings', ['bundle' => $remoteBundleId], false)
+        )->json();
+
         $bundle = Bundle::updateOrCreate(
             [
                 'remote_id' => $remoteBundleId,
@@ -156,7 +160,7 @@ public function installRemoteBundle($remoteBundleId, $updateType)
         );
 
         $bundle->install($bundleExport['payloads'], $updateType, $this->logger);
-
+        $bundle->installSettings($bundleSettingsExport['settings']);
         $this->logger->setStatus('done');
     }
 

diff --git a/resources/js/admin/devlink/components/BundleDetail.vue b/resources/js/admin/devlink/components/BundleDetail.vue
@@ -1,8 +1,7 @@
 <template>
   <div class="main-content">
     <div class="tw-flex tw-items-center tw-justify-center" v-if="loading">
-      <div class="spinner-border text-primary" role="status">
-      </div>
+      <div class="spinner-border text-primary" role="status" />
       <span class="visually-hidden">Loading...</span>
     </div>
     <!-- Header -->

diff --git a/routes/api.php b/routes/api.php
@@ -403,6 +403,7 @@
         Route::delete('devlink/local-bundles/assets/{bundle_asset}', [DevLinkController::class, 'deleteBundleAsset'])->name('devlink.delete-bundle-asset');
         Route::delete('devlink/local-bundles/settings/{bundle_setting}', [DevLinkController::class, 'deleteBundleSetting'])->name('devlink.delete-bundle-setting');
         Route::get('devlink/export-local-bundle/{bundle}', [DevLinkController::class, 'exportLocalBundle'])->name('devlink.export-local-bundle');
+        Route::get('devlink/export-local-bundle/{bundle}/settings', [DevLinkController::class, 'exportLocalBundleSettings'])->name('devlink.export-local-bundle-settings');
         Route::get('devlink/export-local-asset', [DevLinkController::class, 'exportLocalAsset'])->name('devlink.export-local-asset');
 
         Route::post('devlink/{devLink}/remote-bundles/{remoteBundleId}/install', [DevLinkController::class, 'installRemoteBundle'])->name('devlink.install-remote-bundle');