feature/FOUR-20313 Apply an update of an existing bundle#7977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nolanpro merged 6 commits into from
Feb 10, 2025
Merged

feature/FOUR-20313 Apply an update of an existing bundle #7977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b3b404e
Apply an update of an existing bundle (reinstall a bundle)
gustavobascope Jan 31, 2025
f204576
Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…
gustavobascope Jan 31, 2025
a27e247
Edit platform configuration available settings
gustavobascope Jan 31, 2025
9f6427b
fixed php-unit tests
gustavobascope Feb 3, 2025
30acb33
ui_settings import export updated
gustavobascope Feb 3, 2025
6b55da2
added the refresh UI
gustavobascope Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 80 additions & 2 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,14 @@

use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Notification;
use Illuminate\Validation\Rule;
use ProcessMaker\Events\CustomizeUiUpdated;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Jobs\CompileSass;
use ProcessMaker\Jobs\DevLinkInstall;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\BundleAsset;
Expand DownExpand Up@@ -198,6 +201,8 @@ public function bundleUpdated($bundleId, $token)

public function deleteBundle(Bundle $bundle)
{
$bundle->assets()->delete();
$bundle->settings()->delete();
$bundle->delete();
}

Expand DownExpand Up@@ -255,7 +260,7 @@ public function exportLocalBundleSettings(Bundle $bundle)
public function exportLocalBundleSettingPayloads(Bundle $bundle)
{
if ($bundle->settings->isEmpty()) {
return ['payloads' => [0 => []]];
return ['payloads' => []];
}

return ['payloads' => $bundle->exportSettingPayloads()];
Expand DownExpand Up@@ -384,6 +389,79 @@ public function getBundleSetting(Bundle $bundle, $settingKey)

public function getBundleAllSettings($settingKey)
{
return Setting::where([['group_id', SettingsMenus::getId($settingKey)], ['hidden', 0]])->get();
if ($settingKey === 'ui_settings') {
return Setting::whereIn('key', ['css-override', 'login-footer', 'logo-alt-text'])
->get();
}

return Setting::where([
['group_id', SettingsMenus::getId($settingKey)],
['hidden', 0],
])->get();
}

public function refreshUi()
{
$cssOverride = Setting::where('key', 'css-override')->first();

$config = $cssOverride->config;
$variables = json_decode($config['variables']);
$sansSerif = json_decode($config['sansSerifFont'], true);

$this->writeColors($variables);
$this->writeFonts($sansSerif);
$this->compileSass(auth()->user()->id);
CustomizeUiUpdated::dispatch([], [], false);
}

private function writeColors($data)
{
// Now generate the _colors.scss file
$contents = "// Changed theme colors\n";
foreach ($data as $value) {
$contents .= $value->id . ': ' . $value->value . ";\n";
}
File::put(app()->resourcePath('sass') . '/_colors.scss', $contents);
}

/**
* Write variables font in file
*
* @param $sansSerif
* @param $serif
*/
private function writeFonts($sansSerif)
{
$sansSerif = $sansSerif ? $sansSerif : $this->sansSerifFontDefault();
// Generate the _fonts.scss file
$contents = "// Changed theme fonts\n";
$contents .= '$font-family-sans-serif: ' . $sansSerif['id'] . " !default;\n";
File::put(app()->resourcePath('sass') . '/_fonts.scss', $contents);
}

/**
* run jobs compile
*/
private function compileSass($userId)
{
// Compile the Sass files
$this->dispatch(new CompileSass([
'tag' => 'sidebar',
'origin' => 'resources/sass/sidebar/sidebar.scss',
'target' => 'public/css/sidebar.css',
'user' => $userId,
]));
$this->dispatch(new CompileSass([
'tag' => 'app',
'origin' => 'resources/sass/app.scss',
'target' => 'public/css/app.css',
'user' => $userId,
]));
$this->dispatch(new CompileSass([
'tag' => 'queues',
'origin' => 'resources/sass/admin/queues.scss',
'target' => 'public/css/admin/queues.css',
'user' => $userId,
]));
}
}
100 changes: 61 additions & 39 deletions ProcessMaker/Models/Bundle.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,11 @@ public function addSettings($setting, $newId, $type = null)
}
}

if ($type === 'ui_settings') {
$config['id'] = ['css-override', 'login-footer', 'logo-alt-text'];
$config['type'] = $type;
}

BundleSetting::create([
'bundle_id' => $this->id,
'setting' => $setting,
Expand DownExpand Up@@ -292,8 +297,14 @@ public function newestVersionFile()
return $this->filesSortedByVersion()->first();
}

public function savePayloadsToFile(array $payloads)
public function savePayloadsToFile(array $payloads, array $payloadsSettings, $logger = null)
{
if ($logger === null) {
$logger = new Logger();
}
$logger->status('Saving the bundle locally');
$payloads = array_merge($payloads, $payloadsSettings[0]);

$this->addMediaFromString(
gzencode(
json_encode($payloads)
Expand DownExpand Up@@ -338,51 +349,63 @@ public function installSettingsPayloads(array $payloads, $mode, $logger = null)
$logger->status('Installing bundle settings on the this instance');
$logger->setSteps($payloads[0]);
$assets[] = DevLink::import($payload[0], $options, $logger);
} else {
switch ($payload[0]['setting_type']) {
case 'auth_clients':
$clientRepository->create(
null,
$payload[0]['name'],
$payload[0]['redirect'],
$payload[0]['provider'],
$payload[0]['personal_access_client'],
$payload[0]['password_client']
);
break;
case 'User Settings':
case 'Email':
case 'Integrations':
case 'Log-In & Auth':
$settingsMenu = SettingsMenus::where('menu_group', $payload[0]['setting_type'])->first();
Setting::updateOrCreate([
'key' => $payload[0]['key'],
], [
'config' => $payload[0]['config'],
'name' => $payload[0]['name'],
'helper' => $payload[0]['helper'],
'format' => $payload[0]['format'],
'hidden' => $payload[0]['hidden'],
'readonly' => $payload[0]['readonly'],
'ui' => $payload[0]['ui'],
'group_id' => $settingsMenu->id,
'group' => $payload[0]['group'],
]);
break;
} elseif (isset($payload[0]['setting_type'])) {
foreach ($payload as $setting) {
switch ($setting['setting_type']) {
case 'auth_clients':
$clientRepository->create(
null,
$setting['name'],
$setting['redirect'],
$setting['provider'],
$setting['personal_access_client'],
$setting['password_client']
);
break;
case 'User Settings':
case 'Email':
case 'Integrations':
case 'Log-In & Auth':
$settingsMenu = SettingsMenus::where('menu_group', $setting['setting_type'])->first();
Setting::updateOrCreate([
'key' => $setting['key'],
], [
'config' => $setting['config'],
'name' => $setting['name'],
'helper' => $setting['helper'],
'format' => $setting['format'],
'hidden' => $setting['hidden'],
'readonly' => $setting['readonly'],
'ui' => $setting['ui'],
'group_id' => $settingsMenu->id,
'group' => $setting['group'],
]);
break;
case 'ui_settings':
Setting::updateOrCreate([
'key' => $setting['key'],
], [
'config' => $setting['config'],
'name' => $setting['name'],
'helper' => $setting['helper'],
'format' => $setting['format'],
'hidden' => $setting['hidden'],
'readonly' => $setting['readonly'],
'ui' => $setting['ui'],
]);
break;
}
}
}
}
}

public function install(array $payloads, $mode, $logger = null)
public function install(array $payloads, $mode, $logger = null, $reinstall = false)
{
if ($logger === null) {
$logger = new Logger();
}

$logger->status('Saving the bundle locally');
$this->savePayloadsToFile($payloads);

$logger->status('Installing bundle on the this instance');
$logger->setSteps($payloads);

Expand All@@ -394,7 +417,7 @@ public function install(array $payloads, $mode, $logger = null)
$assets[] = DevLink::import($payload, $options, $logger);
}

if ($mode === 'update') {
if ($mode === 'update' && $reinstall === false) {
$logger->status('Syncing bundle assets');
$this->syncAssets($assets);
}
Expand All@@ -406,8 +429,7 @@ public function reinstall(string $mode, Logger $logger = null)

$content = file_get_contents($media->getPath());
$payloads = json_decode(gzdecode($content), true);

$this->install($payloads, $mode, $logger);
$this->install($payloads, $mode, $logger, true);

$logger?->setStatus('done');
}
Expand Down
28 changes: 9 additions & 19 deletions ProcessMaker/Models/BundleSetting.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\Enums\ExporterMap;
use ProcessMaker\ImportExport\Exporter;
use ProcessMaker\ImportExport\Exporters\GroupExporter;
use ProcessMaker\ImportExport\Exporters\MediaExporter;
use ProcessMaker\ImportExport\Exporters\ScriptExecutorExporter;
use ProcessMaker\ImportExport\Exporters\UserExporter;
use ProcessMaker\Models\ProcessMakerModel;
Expand DownExpand Up@@ -91,31 +92,22 @@ public function export()
return $uiMenus->map(function ($uiMenu) {
return $this->exportHelper($uiMenu, MenuExporter::class);
});
case 'translations':
case 'public_files':
if (empty($this->config)) {
$translations = Translatable::all();
$publicFiles = Media::all()->filter(function ($media) {
return $media->isPublicFile();
});
} else {
$translations = Translatable::whereIn('key', $ids)->get();
$publicFiles = Media::whereIn('id', $ids)->get();
}

return $translations->map(function ($translation) {
return $this->exportHelper($translation, TranslatableExporter::class);
});
case 'auth_clients':
if (empty($this->config)) {
$authClients = \Laravel\Passport\Client::where('revoked', false)->get();
} else {
$authClients = \Laravel\Passport\Client::where('revoked', false)->whereIn('id', $ids)->get();
}

return $authClients->map(function ($authClient) {
$authClient->setting_type = $this->setting;

return $authClient;
return $publicFiles->map(function ($publicFile) {
return $this->exportHelper($publicFile, MediaExporter::class);
});
case 'Log-In & Auth':
case 'User Settings':
case 'Email':
case 'ui_settings':
case 'Integrations':
$bundleSettings = Setting::whereIn('key', $ids)->get();

Expand All@@ -125,8 +117,6 @@ public function export()
return $bundleSetting;
});
}

return [];
}

public function exportHelper($model, $exporterClass, $options = null, $ignoreExplicitExport = true)
Expand Down
2 changes: 2 additions & 0 deletions ProcessMaker/Models/DevLink.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,6 +172,8 @@ public function installRemoteBundle($remoteBundleId, $updateType)
]
);

$bundle->savePayloadsToFile($bundleExport['payloads'], $bundleSettingsPayloads['payloads']);

$bundle->install($bundleExport['payloads'], $updateType, $this->logger);
$bundle->installSettingsPayloads($bundleSettingsPayloads['payloads'], $updateType, $this->logger);
$bundle->installSettings($bundleSettingsExport['settings']);
Expand Down
3 changes: 3 additions & 0 deletions devhub/pm-font/svg/add-outlined.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feature/FOUR-20313 Apply an update of an existing bundle#7977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nolanpro
merged 6 commits into

from

Feb 10, 2025
 Merged


feature/FOUR-20313 Apply an update of an existing bundle
#7977
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b3b404e

Apply an update of an existing bundle (reinstall a bundle)


gustavobascope Jan 31, 2025
f204576

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 31, 2025
a27e247

Edit platform configuration available settings


gustavobascope Jan 31, 2025
9f6427b

fixed php-unit tests


gustavobascope Feb 3, 2025
30acb33

ui_settings import export updated


gustavobascope Feb 3, 2025
6b55da2

added the refresh UI


gustavobascope Feb 3, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


82 changes: 80 additions & 2 deletions
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,14 @@

use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Notification;
use Illuminate\Validation\Rule;
use ProcessMaker\Events\CustomizeUiUpdated;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Jobs\CompileSass;
use ProcessMaker\Jobs\DevLinkInstall;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\BundleAsset;
Expand DownExpand Up@@ -198,6 +201,8 @@ public function bundleUpdated($bundleId, $token)

 public function deleteBundle(Bundle $bundle)
 {
 $bundle->assets()->delete();
 $bundle->settings()->delete();
 $bundle->delete();
 }

Expand DownExpand Up@@ -255,7 +260,7 @@ public function exportLocalBundleSettings(Bundle $bundle)
 public function exportLocalBundleSettingPayloads(Bundle $bundle)
 {
 if ($bundle->settings->isEmpty()) {
 return ['payloads' => [0 => []]];
 return ['payloads' => []];
 }

 return ['payloads' => $bundle->exportSettingPayloads()];
Expand DownExpand Up@@ -384,6 +389,79 @@ public function getBundleSetting(Bundle $bundle, $settingKey)

 public function getBundleAllSettings($settingKey)
 {
 return Setting::where([['group_id', SettingsMenus::getId($settingKey)], ['hidden', 0]])->get();
 if ($settingKey === 'ui_settings') {
 return Setting::whereIn('key', ['css-override', 'login-footer', 'logo-alt-text'])
 ->get();
 }

 return Setting::where([
 ['group_id', SettingsMenus::getId($settingKey)],
 ['hidden', 0],
 ])->get();
 }

 public function refreshUi()
 {
 $cssOverride = Setting::where('key', 'css-override')->first();

 $config = $cssOverride->config;
 $variables = json_decode($config['variables']);
 $sansSerif = json_decode($config['sansSerifFont'], true);

 $this->writeColors($variables);
 $this->writeFonts($sansSerif);
 $this->compileSass(auth()->user()->id);
 CustomizeUiUpdated::dispatch([], [], false);
 }

 private function writeColors($data)
 {
 // Now generate the _colors.scss file
 $contents = "// Changed theme colors\n";
 foreach ($data as $value) {
 $contents .= $value->id . ': ' . $value->value . ";\n";
 }
 File::put(app()->resourcePath('sass') . '/_colors.scss', $contents);
 }

 /**
 * Write variables font in file
 *
 * @param $sansSerif
 * @param $serif
 */
 private function writeFonts($sansSerif)
 {
 $sansSerif = $sansSerif ? $sansSerif : $this->sansSerifFontDefault();
 // Generate the _fonts.scss file
 $contents = "// Changed theme fonts\n";
 $contents .= '$font-family-sans-serif: ' . $sansSerif['id'] . " !default;\n";
 File::put(app()->resourcePath('sass') . '/_fonts.scss', $contents);
 }

 /**
 * run jobs compile
 */
 private function compileSass($userId)
 {
 // Compile the Sass files
 $this->dispatch(new CompileSass([
 'tag' => 'sidebar',
 'origin' => 'resources/sass/sidebar/sidebar.scss',
 'target' => 'public/css/sidebar.css',
 'user' => $userId,
 ]));
 $this->dispatch(new CompileSass([
 'tag' => 'app',
 'origin' => 'resources/sass/app.scss',
 'target' => 'public/css/app.css',
 'user' => $userId,
 ]));
 $this->dispatch(new CompileSass([
 'tag' => 'queues',
 'origin' => 'resources/sass/admin/queues.scss',
 'target' => 'public/css/admin/queues.css',
 'user' => $userId,
 ]));
 }
}

100 changes: 61 additions & 39 deletions
ProcessMaker/Models/Bundle.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,11 @@ public function addSettings($setting, $newId, $type = null)
 }
 }

 if ($type === 'ui_settings') {
 $config['id'] = ['css-override', 'login-footer', 'logo-alt-text'];
 $config['type'] = $type;
 }

 BundleSetting::create([
 'bundle_id' => $this->id,
 'setting' => $setting,
Expand DownExpand Up@@ -292,8 +297,14 @@ public function newestVersionFile()
 return $this->filesSortedByVersion()->first();
 }

 public function savePayloadsToFile(array $payloads)
 public function savePayloadsToFile(array $payloads, array $payloadsSettings, $logger = null)
 {
 if ($logger === null) {
 $logger = new Logger();
 }
 $logger->status('Saving the bundle locally');
 $payloads = array_merge($payloads, $payloadsSettings[0]);

 $this->addMediaFromString(
 gzencode(
 json_encode($payloads)
Expand DownExpand Up@@ -338,51 +349,63 @@ public function installSettingsPayloads(array $payloads, $mode, $logger = null)
 $logger->status('Installing bundle settings on the this instance');
 $logger->setSteps($payloads[0]);
 $assets[] = DevLink::import($payload[0], $options, $logger);
 } else {
 switch ($payload[0]['setting_type']) {
 case 'auth_clients':
 $clientRepository->create(
 null,
 $payload[0]['name'],
 $payload[0]['redirect'],
 $payload[0]['provider'],
 $payload[0]['personal_access_client'],
 $payload[0]['password_client']
 );
 break;
 case 'User Settings':
 case 'Email':
 case 'Integrations':
 case 'Log-In & Auth':
 $settingsMenu = SettingsMenus::where('menu_group', $payload[0]['setting_type'])->first();
 Setting::updateOrCreate([
 'key' => $payload[0]['key'],
 ], [
 'config' => $payload[0]['config'],
 'name' => $payload[0]['name'],
 'helper' => $payload[0]['helper'],
 'format' => $payload[0]['format'],
 'hidden' => $payload[0]['hidden'],
 'readonly' => $payload[0]['readonly'],
 'ui' => $payload[0]['ui'],
 'group_id' => $settingsMenu->id,
 'group' => $payload[0]['group'],
 ]);
 break;
 } elseif (isset($payload[0]['setting_type'])) {
 foreach ($payload as $setting) {
 switch ($setting['setting_type']) {
 case 'auth_clients':
 $clientRepository->create(
 null,
 $setting['name'],
 $setting['redirect'],
 $setting['provider'],
 $setting['personal_access_client'],
 $setting['password_client']
 );
 break;
 case 'User Settings':
 case 'Email':
 case 'Integrations':
 case 'Log-In & Auth':
 $settingsMenu = SettingsMenus::where('menu_group', $setting['setting_type'])->first();
 Setting::updateOrCreate([
 'key' => $setting['key'],
 ], [
 'config' => $setting['config'],
 'name' => $setting['name'],
 'helper' => $setting['helper'],
 'format' => $setting['format'],
 'hidden' => $setting['hidden'],
 'readonly' => $setting['readonly'],
 'ui' => $setting['ui'],
 'group_id' => $settingsMenu->id,
 'group' => $setting['group'],
 ]);
 break;
 case 'ui_settings':
 Setting::updateOrCreate([
 'key' => $setting['key'],
 ], [
 'config' => $setting['config'],
 'name' => $setting['name'],
 'helper' => $setting['helper'],
 'format' => $setting['format'],
 'hidden' => $setting['hidden'],
 'readonly' => $setting['readonly'],
 'ui' => $setting['ui'],
 ]);
 break;
 }
 }
 }
 }
 }

 public function install(array $payloads, $mode, $logger = null)
 public function install(array $payloads, $mode, $logger = null, $reinstall = false)
 {
 if ($logger === null) {
 $logger = new Logger();
 }

 $logger->status('Saving the bundle locally');
 $this->savePayloadsToFile($payloads);

 $logger->status('Installing bundle on the this instance');
 $logger->setSteps($payloads);

Expand All@@ -394,7 +417,7 @@ public function install(array $payloads, $mode, $logger = null)
 $assets[] = DevLink::import($payload, $options, $logger);
 }

 if ($mode === 'update') {
 if ($mode === 'update' && $reinstall === false) {
 $logger->status('Syncing bundle assets');
 $this->syncAssets($assets);
 }
Expand All@@ -406,8 +429,7 @@ public function reinstall(string $mode, Logger $logger = null)

 $content = file_get_contents($media->getPath());
 $payloads = json_decode(gzdecode($content), true);

 $this->install($payloads, $mode, $logger);
 $this->install($payloads, $mode, $logger, true);

 $logger?->setStatus('done');
 }
Expand Down

28 changes: 9 additions & 19 deletions
ProcessMaker/Models/BundleSetting.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\Enums\ExporterMap;
use ProcessMaker\ImportExport\Exporter;
use ProcessMaker\ImportExport\Exporters\GroupExporter;
use ProcessMaker\ImportExport\Exporters\MediaExporter;
use ProcessMaker\ImportExport\Exporters\ScriptExecutorExporter;
use ProcessMaker\ImportExport\Exporters\UserExporter;
use ProcessMaker\Models\ProcessMakerModel;
Expand DownExpand Up@@ -91,31 +92,22 @@ public function export()
 return $uiMenus->map(function ($uiMenu) {
 return $this->exportHelper($uiMenu, MenuExporter::class);
 });
 case 'translations':
 case 'public_files':
 if (empty($this->config)) {
 $translations = Translatable::all();
 $publicFiles = Media::all()->filter(function ($media) {
 return $media->isPublicFile();
 });
 } else {
 $translations = Translatable::whereIn('key', $ids)->get();
 $publicFiles = Media::whereIn('id', $ids)->get();
 }

 return $translations->map(function ($translation) {
 return $this->exportHelper($translation, TranslatableExporter::class);
 });
 case 'auth_clients':
 if (empty($this->config)) {
 $authClients = \Laravel\Passport\Client::where('revoked', false)->get();
 } else {
 $authClients = \Laravel\Passport\Client::where('revoked', false)->whereIn('id', $ids)->get();
 }

 return $authClients->map(function ($authClient) {
 $authClient->setting_type = $this->setting;

 return $authClient;
 return $publicFiles->map(function ($publicFile) {
 return $this->exportHelper($publicFile, MediaExporter::class);
 });
 case 'Log-In & Auth':
 case 'User Settings':
 case 'Email':
 case 'ui_settings':
 case 'Integrations':
 $bundleSettings = Setting::whereIn('key', $ids)->get();

Expand All@@ -125,8 +117,6 @@ public function export()
 return $bundleSetting;
 });
 }

 return [];
 }

 public function exportHelper($model, $exporterClass, $options = null, $ignoreExplicitExport = true)
Expand Down

2 changes: 2 additions & 0 deletions
ProcessMaker/Models/DevLink.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,6 +172,8 @@ public function installRemoteBundle($remoteBundleId, $updateType)
 ]
 );

 $bundle->savePayloadsToFile($bundleExport['payloads'], $bundleSettingsPayloads['payloads']);

 $bundle->install($bundleExport['payloads'], $updateType, $this->logger);
 $bundle->installSettingsPayloads($bundleSettingsPayloads['payloads'], $updateType, $this->logger);
 $bundle->installSettings($bundleSettingsExport['settings']);
Expand Down

3 changes: 3 additions & 0 deletions
devhub/pm-font/svg/add-outlined.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feature/FOUR-20313 Apply an update of an existing bundle#7977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nolanpro
merged 6 commits into

from

Feb 10, 2025
 Merged


feature/FOUR-20313 Apply an update of an existing bundle
#7977
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b3b404e

Apply an update of an existing bundle (reinstall a bundle)


gustavobascope Jan 31, 2025
f204576

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 31, 2025
a27e247

Edit platform configuration available settings


gustavobascope Jan 31, 2025
9f6427b

fixed php-unit tests


gustavobascope Feb 3, 2025
30acb33

ui_settings import export updated


gustavobascope Feb 3, 2025
6b55da2

added the refresh UI


gustavobascope Feb 3, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


82 changes: 80 additions & 2 deletions
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,14 @@

use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Notification;
use Illuminate\Validation\Rule;
use ProcessMaker\Events\CustomizeUiUpdated;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Jobs\CompileSass;
use ProcessMaker\Jobs\DevLinkInstall;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\BundleAsset;
Expand DownExpand Up@@ -198,6 +201,8 @@ public function bundleUpdated($bundleId, $token)

 public function deleteBundle(Bundle $bundle)
 {
 $bundle->assets()->delete();
 $bundle->settings()->delete();
 $bundle->delete();
 }

Expand DownExpand Up@@ -255,7 +260,7 @@ public function exportLocalBundleSettings(Bundle $bundle)
 public function exportLocalBundleSettingPayloads(Bundle $bundle)
 {
 if ($bundle->settings->isEmpty()) {
 return ['payloads' => [0 => []]];
 return ['payloads' => []];
 }

 return ['payloads' => $bundle->exportSettingPayloads()];
Expand DownExpand Up@@ -384,6 +389,79 @@ public function getBundleSetting(Bundle $bundle, $settingKey)

 public function getBundleAllSettings($settingKey)
 {
 return Setting::where([['group_id', SettingsMenus::getId($settingKey)], ['hidden', 0]])->get();
 if ($settingKey === 'ui_settings') {
 return Setting::whereIn('key', ['css-override', 'login-footer', 'logo-alt-text'])
 ->get();
 }

 return Setting::where([
 ['group_id', SettingsMenus::getId($settingKey)],
 ['hidden', 0],
 ])->get();
 }

 public function refreshUi()
 {
 $cssOverride = Setting::where('key', 'css-override')->first();

 $config = $cssOverride->config;
 $variables = json_decode($config['variables']);
 $sansSerif = json_decode($config['sansSerifFont'], true);

 $this->writeColors($variables);
 $this->writeFonts($sansSerif);
 $this->compileSass(auth()->user()->id);
 CustomizeUiUpdated::dispatch([], [], false);
 }

 private function writeColors($data)
 {
 // Now generate the _colors.scss file
 $contents = "// Changed theme colors\n";
 foreach ($data as $value) {
 $contents .= $value->id . ': ' . $value->value . ";\n";
 }
 File::put(app()->resourcePath('sass') . '/_colors.scss', $contents);
 }

 /**
 * Write variables font in file
 *
 * @param $sansSerif
 * @param $serif
 */
 private function writeFonts($sansSerif)
 {
 $sansSerif = $sansSerif ? $sansSerif : $this->sansSerifFontDefault();
 // Generate the _fonts.scss file
 $contents = "// Changed theme fonts\n";
 $contents .= '$font-family-sans-serif: ' . $sansSerif['id'] . " !default;\n";
 File::put(app()->resourcePath('sass') . '/_fonts.scss', $contents);
 }

 /**
 * run jobs compile
 */
 private function compileSass($userId)
 {
 // Compile the Sass files
 $this->dispatch(new CompileSass([
 'tag' => 'sidebar',
 'origin' => 'resources/sass/sidebar/sidebar.scss',
 'target' => 'public/css/sidebar.css',
 'user' => $userId,
 ]));
 $this->dispatch(new CompileSass([
 'tag' => 'app',
 'origin' => 'resources/sass/app.scss',
 'target' => 'public/css/app.css',
 'user' => $userId,
 ]));
 $this->dispatch(new CompileSass([
 'tag' => 'queues',
 'origin' => 'resources/sass/admin/queues.scss',
 'target' => 'public/css/admin/queues.css',
 'user' => $userId,
 ]));
 }
}

100 changes: 61 additions & 39 deletions
ProcessMaker/Models/Bundle.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,11 @@ public function addSettings($setting, $newId, $type = null)
 }
 }

 if ($type === 'ui_settings') {
 $config['id'] = ['css-override', 'login-footer', 'logo-alt-text'];
 $config['type'] = $type;
 }

 BundleSetting::create([
 'bundle_id' => $this->id,
 'setting' => $setting,
Expand DownExpand Up@@ -292,8 +297,14 @@ public function newestVersionFile()
 return $this->filesSortedByVersion()->first();
 }

 public function savePayloadsToFile(array $payloads)
 public function savePayloadsToFile(array $payloads, array $payloadsSettings, $logger = null)
 {
 if ($logger === null) {
 $logger = new Logger();
 }
 $logger->status('Saving the bundle locally');
 $payloads = array_merge($payloads, $payloadsSettings[0]);

 $this->addMediaFromString(
 gzencode(
 json_encode($payloads)
Expand DownExpand Up@@ -338,51 +349,63 @@ public function installSettingsPayloads(array $payloads, $mode, $logger = null)
 $logger->status('Installing bundle settings on the this instance');
 $logger->setSteps($payloads[0]);
 $assets[] = DevLink::import($payload[0], $options, $logger);
 } else {
 switch ($payload[0]['setting_type']) {
 case 'auth_clients':
 $clientRepository->create(
 null,
 $payload[0]['name'],
 $payload[0]['redirect'],
 $payload[0]['provider'],
 $payload[0]['personal_access_client'],
 $payload[0]['password_client']
 );
 break;
 case 'User Settings':
 case 'Email':
 case 'Integrations':
 case 'Log-In & Auth':
 $settingsMenu = SettingsMenus::where('menu_group', $payload[0]['setting_type'])->first();
 Setting::updateOrCreate([
 'key' => $payload[0]['key'],
 ], [
 'config' => $payload[0]['config'],
 'name' => $payload[0]['name'],
 'helper' => $payload[0]['helper'],
 'format' => $payload[0]['format'],
 'hidden' => $payload[0]['hidden'],
 'readonly' => $payload[0]['readonly'],
 'ui' => $payload[0]['ui'],
 'group_id' => $settingsMenu->id,
 'group' => $payload[0]['group'],
 ]);
 break;
 } elseif (isset($payload[0]['setting_type'])) {
 foreach ($payload as $setting) {
 switch ($setting['setting_type']) {
 case 'auth_clients':
 $clientRepository->create(
 null,
 $setting['name'],
 $setting['redirect'],
 $setting['provider'],
 $setting['personal_access_client'],
 $setting['password_client']
 );
 break;
 case 'User Settings':
 case 'Email':
 case 'Integrations':
 case 'Log-In & Auth':
 $settingsMenu = SettingsMenus::where('menu_group', $setting['setting_type'])->first();
 Setting::updateOrCreate([
 'key' => $setting['key'],
 ], [
 'config' => $setting['config'],
 'name' => $setting['name'],
 'helper' => $setting['helper'],
 'format' => $setting['format'],
 'hidden' => $setting['hidden'],
 'readonly' => $setting['readonly'],
 'ui' => $setting['ui'],
 'group_id' => $settingsMenu->id,
 'group' => $setting['group'],
 ]);
 break;
 case 'ui_settings':
 Setting::updateOrCreate([
 'key' => $setting['key'],
 ], [
 'config' => $setting['config'],
 'name' => $setting['name'],
 'helper' => $setting['helper'],
 'format' => $setting['format'],
 'hidden' => $setting['hidden'],
 'readonly' => $setting['readonly'],
 'ui' => $setting['ui'],
 ]);
 break;
 }
 }
 }
 }
 }

 public function install(array $payloads, $mode, $logger = null)
 public function install(array $payloads, $mode, $logger = null, $reinstall = false)
 {
 if ($logger === null) {
 $logger = new Logger();
 }

 $logger->status('Saving the bundle locally');
 $this->savePayloadsToFile($payloads);

 $logger->status('Installing bundle on the this instance');
 $logger->setSteps($payloads);

Expand All@@ -394,7 +417,7 @@ public function install(array $payloads, $mode, $logger = null)
 $assets[] = DevLink::import($payload, $options, $logger);
 }

 if ($mode === 'update') {
 if ($mode === 'update' && $reinstall === false) {
 $logger->status('Syncing bundle assets');
 $this->syncAssets($assets);
 }
Expand All@@ -406,8 +429,7 @@ public function reinstall(string $mode, Logger $logger = null)

 $content = file_get_contents($media->getPath());
 $payloads = json_decode(gzdecode($content), true);

 $this->install($payloads, $mode, $logger);
 $this->install($payloads, $mode, $logger, true);

 $logger?->setStatus('done');
 }
Expand Down

28 changes: 9 additions & 19 deletions
ProcessMaker/Models/BundleSetting.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\Enums\ExporterMap;
use ProcessMaker\ImportExport\Exporter;
use ProcessMaker\ImportExport\Exporters\GroupExporter;
use ProcessMaker\ImportExport\Exporters\MediaExporter;
use ProcessMaker\ImportExport\Exporters\ScriptExecutorExporter;
use ProcessMaker\ImportExport\Exporters\UserExporter;
use ProcessMaker\Models\ProcessMakerModel;
Expand DownExpand Up@@ -91,31 +92,22 @@ public function export()
 return $uiMenus->map(function ($uiMenu) {
 return $this->exportHelper($uiMenu, MenuExporter::class);
 });
 case 'translations':
 case 'public_files':
 if (empty($this->config)) {
 $translations = Translatable::all();
 $publicFiles = Media::all()->filter(function ($media) {
 return $media->isPublicFile();
 });
 } else {
 $translations = Translatable::whereIn('key', $ids)->get();
 $publicFiles = Media::whereIn('id', $ids)->get();
 }

 return $translations->map(function ($translation) {
 return $this->exportHelper($translation, TranslatableExporter::class);
 });
 case 'auth_clients':
 if (empty($this->config)) {
 $authClients = \Laravel\Passport\Client::where('revoked', false)->get();
 } else {
 $authClients = \Laravel\Passport\Client::where('revoked', false)->whereIn('id', $ids)->get();
 }

 return $authClients->map(function ($authClient) {
 $authClient->setting_type = $this->setting;

 return $authClient;
 return $publicFiles->map(function ($publicFile) {
 return $this->exportHelper($publicFile, MediaExporter::class);
 });
 case 'Log-In & Auth':
 case 'User Settings':
 case 'Email':
 case 'ui_settings':
 case 'Integrations':
 $bundleSettings = Setting::whereIn('key', $ids)->get();

Expand All@@ -125,8 +117,6 @@ public function export()
 return $bundleSetting;
 });
 }

 return [];
 }

 public function exportHelper($model, $exporterClass, $options = null, $ignoreExplicitExport = true)
Expand Down

2 changes: 2 additions & 0 deletions
ProcessMaker/Models/DevLink.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,6 +172,8 @@ public function installRemoteBundle($remoteBundleId, $updateType)
 ]
 );

 $bundle->savePayloadsToFile($bundleExport['payloads'], $bundleSettingsPayloads['payloads']);

 $bundle->install($bundleExport['payloads'], $updateType, $this->logger);
 $bundle->installSettingsPayloads($bundleSettingsPayloads['payloads'], $updateType, $this->logger);
 $bundle->installSettings($bundleSettingsExport['settings']);
Expand Down

3 changes: 3 additions & 0 deletions
devhub/pm-font/svg/add-outlined.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feature/FOUR-20313 Apply an update of an existing bundle#7977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nolanpro
merged 6 commits into

from

Feb 10, 2025
 Merged


feature/FOUR-20313 Apply an update of an existing bundle
#7977
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b3b404e

Apply an update of an existing bundle (reinstall a bundle)


gustavobascope Jan 31, 2025
f204576

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 31, 2025
a27e247

Edit platform configuration available settings


gustavobascope Jan 31, 2025
9f6427b

fixed php-unit tests


gustavobascope Feb 3, 2025
30acb33

ui_settings import export updated


gustavobascope Feb 3, 2025
6b55da2

added the refresh UI


gustavobascope Feb 3, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


82 changes: 80 additions & 2 deletions
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,14 @@

use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Notification;
use Illuminate\Validation\Rule;
use ProcessMaker\Events\CustomizeUiUpdated;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Jobs\CompileSass;
use ProcessMaker\Jobs\DevLinkInstall;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\BundleAsset;
Expand DownExpand Up@@ -198,6 +201,8 @@ public function bundleUpdated($bundleId, $token)

 public function deleteBundle(Bundle $bundle)
 {
 $bundle->assets()->delete();
 $bundle->settings()->delete();
 $bundle->delete();
 }

Expand DownExpand Up@@ -255,7 +260,7 @@ public function exportLocalBundleSettings(Bundle $bundle)
 public function exportLocalBundleSettingPayloads(Bundle $bundle)
 {
 if ($bundle->settings->isEmpty()) {
 return ['payloads' => [0 => []]];
 return ['payloads' => []];
 }

 return ['payloads' => $bundle->exportSettingPayloads()];
Expand DownExpand Up@@ -384,6 +389,79 @@ public function getBundleSetting(Bundle $bundle, $settingKey)

 public function getBundleAllSettings($settingKey)
 {
 return Setting::where([['group_id', SettingsMenus::getId($settingKey)], ['hidden', 0]])->get();
 if ($settingKey === 'ui_settings') {
 return Setting::whereIn('key', ['css-override', 'login-footer', 'logo-alt-text'])
 ->get();
 }

 return Setting::where([
 ['group_id', SettingsMenus::getId($settingKey)],
 ['hidden', 0],
 ])->get();
 }

 public function refreshUi()
 {
 $cssOverride = Setting::where('key', 'css-override')->first();

 $config = $cssOverride->config;
 $variables = json_decode($config['variables']);
 $sansSerif = json_decode($config['sansSerifFont'], true);

 $this->writeColors($variables);
 $this->writeFonts($sansSerif);
 $this->compileSass(auth()->user()->id);
 CustomizeUiUpdated::dispatch([], [], false);
 }

 private function writeColors($data)
 {
 // Now generate the _colors.scss file
 $contents = "// Changed theme colors\n";
 foreach ($data as $value) {
 $contents .= $value->id . ': ' . $value->value . ";\n";
 }
 File::put(app()->resourcePath('sass') . '/_colors.scss', $contents);
 }

 /**
 * Write variables font in file
 *
 * @param $sansSerif
 * @param $serif
 */
 private function writeFonts($sansSerif)
 {
 $sansSerif = $sansSerif ? $sansSerif : $this->sansSerifFontDefault();
 // Generate the _fonts.scss file
 $contents = "// Changed theme fonts\n";
 $contents .= '$font-family-sans-serif: ' . $sansSerif['id'] . " !default;\n";
 File::put(app()->resourcePath('sass') . '/_fonts.scss', $contents);
 }

 /**
 * run jobs compile
 */
 private function compileSass($userId)
 {
 // Compile the Sass files
 $this->dispatch(new CompileSass([
 'tag' => 'sidebar',
 'origin' => 'resources/sass/sidebar/sidebar.scss',
 'target' => 'public/css/sidebar.css',
 'user' => $userId,
 ]));
 $this->dispatch(new CompileSass([
 'tag' => 'app',
 'origin' => 'resources/sass/app.scss',
 'target' => 'public/css/app.css',
 'user' => $userId,
 ]));
 $this->dispatch(new CompileSass([
 'tag' => 'queues',
 'origin' => 'resources/sass/admin/queues.scss',
 'target' => 'public/css/admin/queues.css',
 'user' => $userId,
 ]));
 }
}

100 changes: 61 additions & 39 deletions
ProcessMaker/Models/Bundle.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,11 @@ public function addSettings($setting, $newId, $type = null)
 }
 }

 if ($type === 'ui_settings') {
 $config['id'] = ['css-override', 'login-footer', 'logo-alt-text'];
 $config['type'] = $type;
 }

 BundleSetting::create([
 'bundle_id' => $this->id,
 'setting' => $setting,
Expand DownExpand Up@@ -292,8 +297,14 @@ public function newestVersionFile()
 return $this->filesSortedByVersion()->first();
 }

 public function savePayloadsToFile(array $payloads)
 public function savePayloadsToFile(array $payloads, array $payloadsSettings, $logger = null)
 {
 if ($logger === null) {
 $logger = new Logger();
 }
 $logger->status('Saving the bundle locally');
 $payloads = array_merge($payloads, $payloadsSettings[0]);

 $this->addMediaFromString(
 gzencode(
 json_encode($payloads)
Expand DownExpand Up@@ -338,51 +349,63 @@ public function installSettingsPayloads(array $payloads, $mode, $logger = null)
 $logger->status('Installing bundle settings on the this instance');
 $logger->setSteps($payloads[0]);
 $assets[] = DevLink::import($payload[0], $options, $logger);
 } else {
 switch ($payload[0]['setting_type']) {
 case 'auth_clients':
 $clientRepository->create(
 null,
 $payload[0]['name'],
 $payload[0]['redirect'],
 $payload[0]['provider'],
 $payload[0]['personal_access_client'],
 $payload[0]['password_client']
 );
 break;
 case 'User Settings':
 case 'Email':
 case 'Integrations':
 case 'Log-In & Auth':
 $settingsMenu = SettingsMenus::where('menu_group', $payload[0]['setting_type'])->first();
 Setting::updateOrCreate([
 'key' => $payload[0]['key'],
 ], [
 'config' => $payload[0]['config'],
 'name' => $payload[0]['name'],
 'helper' => $payload[0]['helper'],
 'format' => $payload[0]['format'],
 'hidden' => $payload[0]['hidden'],
 'readonly' => $payload[0]['readonly'],
 'ui' => $payload[0]['ui'],
 'group_id' => $settingsMenu->id,
 'group' => $payload[0]['group'],
 ]);
 break;
 } elseif (isset($payload[0]['setting_type'])) {
 foreach ($payload as $setting) {
 switch ($setting['setting_type']) {
 case 'auth_clients':
 $clientRepository->create(
 null,
 $setting['name'],
 $setting['redirect'],
 $setting['provider'],
 $setting['personal_access_client'],
 $setting['password_client']
 );
 break;
 case 'User Settings':
 case 'Email':
 case 'Integrations':
 case 'Log-In & Auth':
 $settingsMenu = SettingsMenus::where('menu_group', $setting['setting_type'])->first();
 Setting::updateOrCreate([
 'key' => $setting['key'],
 ], [
 'config' => $setting['config'],
 'name' => $setting['name'],
 'helper' => $setting['helper'],
 'format' => $setting['format'],
 'hidden' => $setting['hidden'],
 'readonly' => $setting['readonly'],
 'ui' => $setting['ui'],
 'group_id' => $settingsMenu->id,
 'group' => $setting['group'],
 ]);
 break;
 case 'ui_settings':
 Setting::updateOrCreate([
 'key' => $setting['key'],
 ], [
 'config' => $setting['config'],
 'name' => $setting['name'],
 'helper' => $setting['helper'],
 'format' => $setting['format'],
 'hidden' => $setting['hidden'],
 'readonly' => $setting['readonly'],
 'ui' => $setting['ui'],
 ]);
 break;
 }
 }
 }
 }
 }

 public function install(array $payloads, $mode, $logger = null)
 public function install(array $payloads, $mode, $logger = null, $reinstall = false)
 {
 if ($logger === null) {
 $logger = new Logger();
 }

 $logger->status('Saving the bundle locally');
 $this->savePayloadsToFile($payloads);

 $logger->status('Installing bundle on the this instance');
 $logger->setSteps($payloads);

Expand All@@ -394,7 +417,7 @@ public function install(array $payloads, $mode, $logger = null)
 $assets[] = DevLink::import($payload, $options, $logger);
 }

 if ($mode === 'update') {
 if ($mode === 'update' && $reinstall === false) {
 $logger->status('Syncing bundle assets');
 $this->syncAssets($assets);
 }
Expand All@@ -406,8 +429,7 @@ public function reinstall(string $mode, Logger $logger = null)

 $content = file_get_contents($media->getPath());
 $payloads = json_decode(gzdecode($content), true);

 $this->install($payloads, $mode, $logger);
 $this->install($payloads, $mode, $logger, true);

 $logger?->setStatus('done');
 }
Expand Down

28 changes: 9 additions & 19 deletions
ProcessMaker/Models/BundleSetting.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\Enums\ExporterMap;
use ProcessMaker\ImportExport\Exporter;
use ProcessMaker\ImportExport\Exporters\GroupExporter;
use ProcessMaker\ImportExport\Exporters\MediaExporter;
use ProcessMaker\ImportExport\Exporters\ScriptExecutorExporter;
use ProcessMaker\ImportExport\Exporters\UserExporter;
use ProcessMaker\Models\ProcessMakerModel;
Expand DownExpand Up@@ -91,31 +92,22 @@ public function export()
 return $uiMenus->map(function ($uiMenu) {
 return $this->exportHelper($uiMenu, MenuExporter::class);
 });
 case 'translations':
 case 'public_files':
 if (empty($this->config)) {
 $translations = Translatable::all();
 $publicFiles = Media::all()->filter(function ($media) {
 return $media->isPublicFile();
 });
 } else {
 $translations = Translatable::whereIn('key', $ids)->get();
 $publicFiles = Media::whereIn('id', $ids)->get();
 }

 return $translations->map(function ($translation) {
 return $this->exportHelper($translation, TranslatableExporter::class);
 });
 case 'auth_clients':
 if (empty($this->config)) {
 $authClients = \Laravel\Passport\Client::where('revoked', false)->get();
 } else {
 $authClients = \Laravel\Passport\Client::where('revoked', false)->whereIn('id', $ids)->get();
 }

 return $authClients->map(function ($authClient) {
 $authClient->setting_type = $this->setting;

 return $authClient;
 return $publicFiles->map(function ($publicFile) {
 return $this->exportHelper($publicFile, MediaExporter::class);
 });
 case 'Log-In & Auth':
 case 'User Settings':
 case 'Email':
 case 'ui_settings':
 case 'Integrations':
 $bundleSettings = Setting::whereIn('key', $ids)->get();

Expand All@@ -125,8 +117,6 @@ public function export()
 return $bundleSetting;
 });
 }

 return [];
 }

 public function exportHelper($model, $exporterClass, $options = null, $ignoreExplicitExport = true)
Expand Down

2 changes: 2 additions & 0 deletions
ProcessMaker/Models/DevLink.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,6 +172,8 @@ public function installRemoteBundle($remoteBundleId, $updateType)
 ]
 );

 $bundle->savePayloadsToFile($bundleExport['payloads'], $bundleSettingsPayloads['payloads']);

 $bundle->install($bundleExport['payloads'], $updateType, $this->logger);
 $bundle->installSettingsPayloads($bundleSettingsPayloads['payloads'], $updateType, $this->logger);
 $bundle->installSettings($bundleSettingsExport['settings']);
Expand Down

3 changes: 3 additions & 0 deletions
devhub/pm-font/svg/add-outlined.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feature/FOUR-20313 Apply an update of an existing bundle#7977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nolanpro
merged 6 commits into

from

Feb 10, 2025
 Merged


feature/FOUR-20313 Apply an update of an existing bundle
#7977
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b3b404e

Apply an update of an existing bundle (reinstall a bundle)


gustavobascope Jan 31, 2025
f204576

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 31, 2025
a27e247

Edit platform configuration available settings


gustavobascope Jan 31, 2025
9f6427b

fixed php-unit tests


gustavobascope Feb 3, 2025
30acb33

ui_settings import export updated


gustavobascope Feb 3, 2025
6b55da2

added the refresh UI


gustavobascope Feb 3, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


82 changes: 80 additions & 2 deletions
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,14 @@

use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Notification;
use Illuminate\Validation\Rule;
use ProcessMaker\Events\CustomizeUiUpdated;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Jobs\CompileSass;
use ProcessMaker\Jobs\DevLinkInstall;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\BundleAsset;
Expand DownExpand Up@@ -198,6 +201,8 @@ public function bundleUpdated($bundleId, $token)

 public function deleteBundle(Bundle $bundle)
 {
 $bundle->assets()->delete();
 $bundle->settings()->delete();
 $bundle->delete();
 }

Expand DownExpand Up@@ -255,7 +260,7 @@ public function exportLocalBundleSettings(Bundle $bundle)
 public function exportLocalBundleSettingPayloads(Bundle $bundle)
 {
 if ($bundle->settings->isEmpty()) {
 return ['payloads' => [0 => []]];
 return ['payloads' => []];
 }

 return ['payloads' => $bundle->exportSettingPayloads()];
Expand DownExpand Up@@ -384,6 +389,79 @@ public function getBundleSetting(Bundle $bundle, $settingKey)

 public function getBundleAllSettings($settingKey)
 {
 return Setting::where([['group_id', SettingsMenus::getId($settingKey)], ['hidden', 0]])->get();
 if ($settingKey === 'ui_settings') {
 return Setting::whereIn('key', ['css-override', 'login-footer', 'logo-alt-text'])
 ->get();
 }

 return Setting::where([
 ['group_id', SettingsMenus::getId($settingKey)],
 ['hidden', 0],
 ])->get();
 }

 public function refreshUi()
 {
 $cssOverride = Setting::where('key', 'css-override')->first();

 $config = $cssOverride->config;
 $variables = json_decode($config['variables']);
 $sansSerif = json_decode($config['sansSerifFont'], true);

 $this->writeColors($variables);
 $this->writeFonts($sansSerif);
 $this->compileSass(auth()->user()->id);
 CustomizeUiUpdated::dispatch([], [], false);
 }

 private function writeColors($data)
 {
 // Now generate the _colors.scss file
 $contents = "// Changed theme colors\n";
 foreach ($data as $value) {
 $contents .= $value->id . ': ' . $value->value . ";\n";
 }
 File::put(app()->resourcePath('sass') . '/_colors.scss', $contents);
 }

 /**
 * Write variables font in file
 *
 * @param $sansSerif
 * @param $serif
 */
 private function writeFonts($sansSerif)
 {
 $sansSerif = $sansSerif ? $sansSerif : $this->sansSerifFontDefault();
 // Generate the _fonts.scss file
 $contents = "// Changed theme fonts\n";
 $contents .= '$font-family-sans-serif: ' . $sansSerif['id'] . " !default;\n";
 File::put(app()->resourcePath('sass') . '/_fonts.scss', $contents);
 }

 /**
 * run jobs compile
 */
 private function compileSass($userId)
 {
 // Compile the Sass files
 $this->dispatch(new CompileSass([
 'tag' => 'sidebar',
 'origin' => 'resources/sass/sidebar/sidebar.scss',
 'target' => 'public/css/sidebar.css',
 'user' => $userId,
 ]));
 $this->dispatch(new CompileSass([
 'tag' => 'app',
 'origin' => 'resources/sass/app.scss',
 'target' => 'public/css/app.css',
 'user' => $userId,
 ]));
 $this->dispatch(new CompileSass([
 'tag' => 'queues',
 'origin' => 'resources/sass/admin/queues.scss',
 'target' => 'public/css/admin/queues.css',
 'user' => $userId,
 ]));
 }
}

100 changes: 61 additions & 39 deletions
ProcessMaker/Models/Bundle.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,11 @@ public function addSettings($setting, $newId, $type = null)
 }
 }

 if ($type === 'ui_settings') {
 $config['id'] = ['css-override', 'login-footer', 'logo-alt-text'];
 $config['type'] = $type;
 }

 BundleSetting::create([
 'bundle_id' => $this->id,
 'setting' => $setting,
Expand DownExpand Up@@ -292,8 +297,14 @@ public function newestVersionFile()
 return $this->filesSortedByVersion()->first();
 }

 public function savePayloadsToFile(array $payloads)
 public function savePayloadsToFile(array $payloads, array $payloadsSettings, $logger = null)
 {
 if ($logger === null) {
 $logger = new Logger();
 }
 $logger->status('Saving the bundle locally');
 $payloads = array_merge($payloads, $payloadsSettings[0]);

 $this->addMediaFromString(
 gzencode(
 json_encode($payloads)
Expand DownExpand Up@@ -338,51 +349,63 @@ public function installSettingsPayloads(array $payloads, $mode, $logger = null)
 $logger->status('Installing bundle settings on the this instance');
 $logger->setSteps($payloads[0]);
 $assets[] = DevLink::import($payload[0], $options, $logger);
 } else {
 switch ($payload[0]['setting_type']) {
 case 'auth_clients':
 $clientRepository->create(
 null,
 $payload[0]['name'],
 $payload[0]['redirect'],
 $payload[0]['provider'],
 $payload[0]['personal_access_client'],
 $payload[0]['password_client']
 );
 break;
 case 'User Settings':
 case 'Email':
 case 'Integrations':
 case 'Log-In & Auth':
 $settingsMenu = SettingsMenus::where('menu_group', $payload[0]['setting_type'])->first();
 Setting::updateOrCreate([
 'key' => $payload[0]['key'],
 ], [
 'config' => $payload[0]['config'],
 'name' => $payload[0]['name'],
 'helper' => $payload[0]['helper'],
 'format' => $payload[0]['format'],
 'hidden' => $payload[0]['hidden'],
 'readonly' => $payload[0]['readonly'],
 'ui' => $payload[0]['ui'],
 'group_id' => $settingsMenu->id,
 'group' => $payload[0]['group'],
 ]);
 break;
 } elseif (isset($payload[0]['setting_type'])) {
 foreach ($payload as $setting) {
 switch ($setting['setting_type']) {
 case 'auth_clients':
 $clientRepository->create(
 null,
 $setting['name'],
 $setting['redirect'],
 $setting['provider'],
 $setting['personal_access_client'],
 $setting['password_client']
 );
 break;
 case 'User Settings':
 case 'Email':
 case 'Integrations':
 case 'Log-In & Auth':
 $settingsMenu = SettingsMenus::where('menu_group', $setting['setting_type'])->first();
 Setting::updateOrCreate([
 'key' => $setting['key'],
 ], [
 'config' => $setting['config'],
 'name' => $setting['name'],
 'helper' => $setting['helper'],
 'format' => $setting['format'],
 'hidden' => $setting['hidden'],
 'readonly' => $setting['readonly'],
 'ui' => $setting['ui'],
 'group_id' => $settingsMenu->id,
 'group' => $setting['group'],
 ]);
 break;
 case 'ui_settings':
 Setting::updateOrCreate([
 'key' => $setting['key'],
 ], [
 'config' => $setting['config'],
 'name' => $setting['name'],
 'helper' => $setting['helper'],
 'format' => $setting['format'],
 'hidden' => $setting['hidden'],
 'readonly' => $setting['readonly'],
 'ui' => $setting['ui'],
 ]);
 break;
 }
 }
 }
 }
 }

 public function install(array $payloads, $mode, $logger = null)
 public function install(array $payloads, $mode, $logger = null, $reinstall = false)
 {
 if ($logger === null) {
 $logger = new Logger();
 }

 $logger->status('Saving the bundle locally');
 $this->savePayloadsToFile($payloads);

 $logger->status('Installing bundle on the this instance');
 $logger->setSteps($payloads);

Expand All@@ -394,7 +417,7 @@ public function install(array $payloads, $mode, $logger = null)
 $assets[] = DevLink::import($payload, $options, $logger);
 }

 if ($mode === 'update') {
 if ($mode === 'update' && $reinstall === false) {
 $logger->status('Syncing bundle assets');
 $this->syncAssets($assets);
 }
Expand All@@ -406,8 +429,7 @@ public function reinstall(string $mode, Logger $logger = null)

 $content = file_get_contents($media->getPath());
 $payloads = json_decode(gzdecode($content), true);

 $this->install($payloads, $mode, $logger);
 $this->install($payloads, $mode, $logger, true);

 $logger?->setStatus('done');
 }
Expand Down

28 changes: 9 additions & 19 deletions
ProcessMaker/Models/BundleSetting.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\Enums\ExporterMap;
use ProcessMaker\ImportExport\Exporter;
use ProcessMaker\ImportExport\Exporters\GroupExporter;
use ProcessMaker\ImportExport\Exporters\MediaExporter;
use ProcessMaker\ImportExport\Exporters\ScriptExecutorExporter;
use ProcessMaker\ImportExport\Exporters\UserExporter;
use ProcessMaker\Models\ProcessMakerModel;
Expand DownExpand Up@@ -91,31 +92,22 @@ public function export()
 return $uiMenus->map(function ($uiMenu) {
 return $this->exportHelper($uiMenu, MenuExporter::class);
 });
 case 'translations':
 case 'public_files':
 if (empty($this->config)) {
 $translations = Translatable::all();
 $publicFiles = Media::all()->filter(function ($media) {
 return $media->isPublicFile();
 });
 } else {
 $translations = Translatable::whereIn('key', $ids)->get();
 $publicFiles = Media::whereIn('id', $ids)->get();
 }

 return $translations->map(function ($translation) {
 return $this->exportHelper($translation, TranslatableExporter::class);
 });
 case 'auth_clients':
 if (empty($this->config)) {
 $authClients = \Laravel\Passport\Client::where('revoked', false)->get();
 } else {
 $authClients = \Laravel\Passport\Client::where('revoked', false)->whereIn('id', $ids)->get();
 }

 return $authClients->map(function ($authClient) {
 $authClient->setting_type = $this->setting;

 return $authClient;
 return $publicFiles->map(function ($publicFile) {
 return $this->exportHelper($publicFile, MediaExporter::class);
 });
 case 'Log-In & Auth':
 case 'User Settings':
 case 'Email':
 case 'ui_settings':
 case 'Integrations':
 $bundleSettings = Setting::whereIn('key', $ids)->get();

Expand All@@ -125,8 +117,6 @@ public function export()
 return $bundleSetting;
 });
 }

 return [];
 }

 public function exportHelper($model, $exporterClass, $options = null, $ignoreExplicitExport = true)
Expand Down

2 changes: 2 additions & 0 deletions
ProcessMaker/Models/DevLink.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,6 +172,8 @@ public function installRemoteBundle($remoteBundleId, $updateType)
 ]
 );

 $bundle->savePayloadsToFile($bundleExport['payloads'], $bundleSettingsPayloads['payloads']);

 $bundle->install($bundleExport['payloads'], $updateType, $this->logger);
 $bundle->installSettingsPayloads($bundleSettingsPayloads['payloads'], $updateType, $this->logger);
 $bundle->installSettings($bundleSettingsExport['settings']);
Expand Down

3 changes: 3 additions & 0 deletions
devhub/pm-font/svg/add-outlined.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feature/FOUR-20313 Apply an update of an existing bundle#7977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nolanpro
merged 6 commits into

from

Feb 10, 2025
 Merged


feature/FOUR-20313 Apply an update of an existing bundle
#7977
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b3b404e

Apply an update of an existing bundle (reinstall a bundle)


gustavobascope Jan 31, 2025
f204576

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 31, 2025
a27e247

Edit platform configuration available settings


gustavobascope Jan 31, 2025
9f6427b

fixed php-unit tests


gustavobascope Feb 3, 2025
30acb33

ui_settings import export updated


gustavobascope Feb 3, 2025
6b55da2

added the refresh UI


gustavobascope Feb 3, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


82 changes: 80 additions & 2 deletions
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,14 @@

use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Notification;
use Illuminate\Validation\Rule;
use ProcessMaker\Events\CustomizeUiUpdated;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Jobs\CompileSass;
use ProcessMaker\Jobs\DevLinkInstall;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\BundleAsset;
Expand DownExpand Up@@ -198,6 +201,8 @@ public function bundleUpdated($bundleId, $token)

 public function deleteBundle(Bundle $bundle)
 {
 $bundle->assets()->delete();
 $bundle->settings()->delete();
 $bundle->delete();
 }

Expand DownExpand Up@@ -255,7 +260,7 @@ public function exportLocalBundleSettings(Bundle $bundle)
 public function exportLocalBundleSettingPayloads(Bundle $bundle)
 {
 if ($bundle->settings->isEmpty()) {
 return ['payloads' => [0 => []]];
 return ['payloads' => []];
 }

 return ['payloads' => $bundle->exportSettingPayloads()];
Expand DownExpand Up@@ -384,6 +389,79 @@ public function getBundleSetting(Bundle $bundle, $settingKey)

 public function getBundleAllSettings($settingKey)
 {
 return Setting::where([['group_id', SettingsMenus::getId($settingKey)], ['hidden', 0]])->get();
 if ($settingKey === 'ui_settings') {
 return Setting::whereIn('key', ['css-override', 'login-footer', 'logo-alt-text'])
 ->get();
 }

 return Setting::where([
 ['group_id', SettingsMenus::getId($settingKey)],
 ['hidden', 0],
 ])->get();
 }

 public function refreshUi()
 {
 $cssOverride = Setting::where('key', 'css-override')->first();

 $config = $cssOverride->config;
 $variables = json_decode($config['variables']);
 $sansSerif = json_decode($config['sansSerifFont'], true);

 $this->writeColors($variables);
 $this->writeFonts($sansSerif);
 $this->compileSass(auth()->user()->id);
 CustomizeUiUpdated::dispatch([], [], false);
 }

 private function writeColors($data)
 {
 // Now generate the _colors.scss file
 $contents = "// Changed theme colors\n";
 foreach ($data as $value) {
 $contents .= $value->id . ': ' . $value->value . ";\n";
 }
 File::put(app()->resourcePath('sass') . '/_colors.scss', $contents);
 }

 /**
 * Write variables font in file
 *
 * @param $sansSerif
 * @param $serif
 */
 private function writeFonts($sansSerif)
 {
 $sansSerif = $sansSerif ? $sansSerif : $this->sansSerifFontDefault();
 // Generate the _fonts.scss file
 $contents = "// Changed theme fonts\n";
 $contents .= '$font-family-sans-serif: ' . $sansSerif['id'] . " !default;\n";
 File::put(app()->resourcePath('sass') . '/_fonts.scss', $contents);
 }

 /**
 * run jobs compile
 */
 private function compileSass($userId)
 {
 // Compile the Sass files
 $this->dispatch(new CompileSass([
 'tag' => 'sidebar',
 'origin' => 'resources/sass/sidebar/sidebar.scss',
 'target' => 'public/css/sidebar.css',
 'user' => $userId,
 ]));
 $this->dispatch(new CompileSass([
 'tag' => 'app',
 'origin' => 'resources/sass/app.scss',
 'target' => 'public/css/app.css',
 'user' => $userId,
 ]));
 $this->dispatch(new CompileSass([
 'tag' => 'queues',
 'origin' => 'resources/sass/admin/queues.scss',
 'target' => 'public/css/admin/queues.css',
 'user' => $userId,
 ]));
 }
}

100 changes: 61 additions & 39 deletions
ProcessMaker/Models/Bundle.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,11 @@ public function addSettings($setting, $newId, $type = null)
 }
 }

 if ($type === 'ui_settings') {
 $config['id'] = ['css-override', 'login-footer', 'logo-alt-text'];
 $config['type'] = $type;
 }

 BundleSetting::create([
 'bundle_id' => $this->id,
 'setting' => $setting,
Expand DownExpand Up@@ -292,8 +297,14 @@ public function newestVersionFile()
 return $this->filesSortedByVersion()->first();
 }

 public function savePayloadsToFile(array $payloads)
 public function savePayloadsToFile(array $payloads, array $payloadsSettings, $logger = null)
 {
 if ($logger === null) {
 $logger = new Logger();
 }
 $logger->status('Saving the bundle locally');
 $payloads = array_merge($payloads, $payloadsSettings[0]);

 $this->addMediaFromString(
 gzencode(
 json_encode($payloads)
Expand DownExpand Up@@ -338,51 +349,63 @@ public function installSettingsPayloads(array $payloads, $mode, $logger = null)
 $logger->status('Installing bundle settings on the this instance');
 $logger->setSteps($payloads[0]);
 $assets[] = DevLink::import($payload[0], $options, $logger);
 } else {
 switch ($payload[0]['setting_type']) {
 case 'auth_clients':
 $clientRepository->create(
 null,
 $payload[0]['name'],
 $payload[0]['redirect'],
 $payload[0]['provider'],
 $payload[0]['personal_access_client'],
 $payload[0]['password_client']
 );
 break;
 case 'User Settings':
 case 'Email':
 case 'Integrations':
 case 'Log-In & Auth':
 $settingsMenu = SettingsMenus::where('menu_group', $payload[0]['setting_type'])->first();
 Setting::updateOrCreate([
 'key' => $payload[0]['key'],
 ], [
 'config' => $payload[0]['config'],
 'name' => $payload[0]['name'],
 'helper' => $payload[0]['helper'],
 'format' => $payload[0]['format'],
 'hidden' => $payload[0]['hidden'],
 'readonly' => $payload[0]['readonly'],
 'ui' => $payload[0]['ui'],
 'group_id' => $settingsMenu->id,
 'group' => $payload[0]['group'],
 ]);
 break;
 } elseif (isset($payload[0]['setting_type'])) {
 foreach ($payload as $setting) {
 switch ($setting['setting_type']) {
 case 'auth_clients':
 $clientRepository->create(
 null,
 $setting['name'],
 $setting['redirect'],
 $setting['provider'],
 $setting['personal_access_client'],
 $setting['password_client']
 );
 break;
 case 'User Settings':
 case 'Email':
 case 'Integrations':
 case 'Log-In & Auth':
 $settingsMenu = SettingsMenus::where('menu_group', $setting['setting_type'])->first();
 Setting::updateOrCreate([
 'key' => $setting['key'],
 ], [
 'config' => $setting['config'],
 'name' => $setting['name'],
 'helper' => $setting['helper'],
 'format' => $setting['format'],
 'hidden' => $setting['hidden'],
 'readonly' => $setting['readonly'],
 'ui' => $setting['ui'],
 'group_id' => $settingsMenu->id,
 'group' => $setting['group'],
 ]);
 break;
 case 'ui_settings':
 Setting::updateOrCreate([
 'key' => $setting['key'],
 ], [
 'config' => $setting['config'],
 'name' => $setting['name'],
 'helper' => $setting['helper'],
 'format' => $setting['format'],
 'hidden' => $setting['hidden'],
 'readonly' => $setting['readonly'],
 'ui' => $setting['ui'],
 ]);
 break;
 }
 }
 }
 }
 }

 public function install(array $payloads, $mode, $logger = null)
 public function install(array $payloads, $mode, $logger = null, $reinstall = false)
 {
 if ($logger === null) {
 $logger = new Logger();
 }

 $logger->status('Saving the bundle locally');
 $this->savePayloadsToFile($payloads);

 $logger->status('Installing bundle on the this instance');
 $logger->setSteps($payloads);

Expand All@@ -394,7 +417,7 @@ public function install(array $payloads, $mode, $logger = null)
 $assets[] = DevLink::import($payload, $options, $logger);
 }

 if ($mode === 'update') {
 if ($mode === 'update' && $reinstall === false) {
 $logger->status('Syncing bundle assets');
 $this->syncAssets($assets);
 }
Expand All@@ -406,8 +429,7 @@ public function reinstall(string $mode, Logger $logger = null)

 $content = file_get_contents($media->getPath());
 $payloads = json_decode(gzdecode($content), true);

 $this->install($payloads, $mode, $logger);
 $this->install($payloads, $mode, $logger, true);

 $logger?->setStatus('done');
 }
Expand Down

28 changes: 9 additions & 19 deletions
ProcessMaker/Models/BundleSetting.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\Enums\ExporterMap;
use ProcessMaker\ImportExport\Exporter;
use ProcessMaker\ImportExport\Exporters\GroupExporter;
use ProcessMaker\ImportExport\Exporters\MediaExporter;
use ProcessMaker\ImportExport\Exporters\ScriptExecutorExporter;
use ProcessMaker\ImportExport\Exporters\UserExporter;
use ProcessMaker\Models\ProcessMakerModel;
Expand DownExpand Up@@ -91,31 +92,22 @@ public function export()
 return $uiMenus->map(function ($uiMenu) {
 return $this->exportHelper($uiMenu, MenuExporter::class);
 });
 case 'translations':
 case 'public_files':
 if (empty($this->config)) {
 $translations = Translatable::all();
 $publicFiles = Media::all()->filter(function ($media) {
 return $media->isPublicFile();
 });
 } else {
 $translations = Translatable::whereIn('key', $ids)->get();
 $publicFiles = Media::whereIn('id', $ids)->get();
 }

 return $translations->map(function ($translation) {
 return $this->exportHelper($translation, TranslatableExporter::class);
 });
 case 'auth_clients':
 if (empty($this->config)) {
 $authClients = \Laravel\Passport\Client::where('revoked', false)->get();
 } else {
 $authClients = \Laravel\Passport\Client::where('revoked', false)->whereIn('id', $ids)->get();
 }

 return $authClients->map(function ($authClient) {
 $authClient->setting_type = $this->setting;

 return $authClient;
 return $publicFiles->map(function ($publicFile) {
 return $this->exportHelper($publicFile, MediaExporter::class);
 });
 case 'Log-In & Auth':
 case 'User Settings':
 case 'Email':
 case 'ui_settings':
 case 'Integrations':
 $bundleSettings = Setting::whereIn('key', $ids)->get();

Expand All@@ -125,8 +117,6 @@ public function export()
 return $bundleSetting;
 });
 }

 return [];
 }

 public function exportHelper($model, $exporterClass, $options = null, $ignoreExplicitExport = true)
Expand Down

2 changes: 2 additions & 0 deletions
ProcessMaker/Models/DevLink.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,6 +172,8 @@ public function installRemoteBundle($remoteBundleId, $updateType)
 ]
 );

 $bundle->savePayloadsToFile($bundleExport['payloads'], $bundleSettingsPayloads['payloads']);

 $bundle->install($bundleExport['payloads'], $updateType, $this->logger);
 $bundle->installSettingsPayloads($bundleSettingsPayloads['payloads'], $updateType, $this->logger);
 $bundle->installSettings($bundleSettingsExport['settings']);
Expand Down

3 changes: 3 additions & 0 deletions
devhub/pm-font/svg/add-outlined.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feature/FOUR-20313 Apply an update of an existing bundle#7977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nolanpro
merged 6 commits into

from

Feb 10, 2025
 Merged


feature/FOUR-20313 Apply an update of an existing bundle
#7977
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b3b404e

Apply an update of an existing bundle (reinstall a bundle)


gustavobascope Jan 31, 2025
f204576

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 31, 2025
a27e247

Edit platform configuration available settings


gustavobascope Jan 31, 2025
9f6427b

fixed php-unit tests


gustavobascope Feb 3, 2025
30acb33

ui_settings import export updated


gustavobascope Feb 3, 2025
6b55da2

added the refresh UI


gustavobascope Feb 3, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


82 changes: 80 additions & 2 deletions
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,14 @@

use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Notification;
use Illuminate\Validation\Rule;
use ProcessMaker\Events\CustomizeUiUpdated;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Jobs\CompileSass;
use ProcessMaker\Jobs\DevLinkInstall;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\BundleAsset;
Expand DownExpand Up@@ -198,6 +201,8 @@ public function bundleUpdated($bundleId, $token)

 public function deleteBundle(Bundle $bundle)
 {
 $bundle->assets()->delete();
 $bundle->settings()->delete();
 $bundle->delete();
 }

Expand DownExpand Up@@ -255,7 +260,7 @@ public function exportLocalBundleSettings(Bundle $bundle)
 public function exportLocalBundleSettingPayloads(Bundle $bundle)
 {
 if ($bundle->settings->isEmpty()) {
 return ['payloads' => [0 => []]];
 return ['payloads' => []];
 }

 return ['payloads' => $bundle->exportSettingPayloads()];
Expand DownExpand Up@@ -384,6 +389,79 @@ public function getBundleSetting(Bundle $bundle, $settingKey)

 public function getBundleAllSettings($settingKey)
 {
 return Setting::where([['group_id', SettingsMenus::getId($settingKey)], ['hidden', 0]])->get();
 if ($settingKey === 'ui_settings') {
 return Setting::whereIn('key', ['css-override', 'login-footer', 'logo-alt-text'])
 ->get();
 }

 return Setting::where([
 ['group_id', SettingsMenus::getId($settingKey)],
 ['hidden', 0],
 ])->get();
 }

 public function refreshUi()
 {
 $cssOverride = Setting::where('key', 'css-override')->first();

 $config = $cssOverride->config;
 $variables = json_decode($config['variables']);
 $sansSerif = json_decode($config['sansSerifFont'], true);

 $this->writeColors($variables);
 $this->writeFonts($sansSerif);
 $this->compileSass(auth()->user()->id);
 CustomizeUiUpdated::dispatch([], [], false);
 }

 private function writeColors($data)
 {
 // Now generate the _colors.scss file
 $contents = "// Changed theme colors\n";
 foreach ($data as $value) {
 $contents .= $value->id . ': ' . $value->value . ";\n";
 }
 File::put(app()->resourcePath('sass') . '/_colors.scss', $contents);
 }

 /**
 * Write variables font in file
 *
 * @param $sansSerif
 * @param $serif
 */
 private function writeFonts($sansSerif)
 {
 $sansSerif = $sansSerif ? $sansSerif : $this->sansSerifFontDefault();
 // Generate the _fonts.scss file
 $contents = "// Changed theme fonts\n";
 $contents .= '$font-family-sans-serif: ' . $sansSerif['id'] . " !default;\n";
 File::put(app()->resourcePath('sass') . '/_fonts.scss', $contents);
 }

 /**
 * run jobs compile
 */
 private function compileSass($userId)
 {
 // Compile the Sass files
 $this->dispatch(new CompileSass([
 'tag' => 'sidebar',
 'origin' => 'resources/sass/sidebar/sidebar.scss',
 'target' => 'public/css/sidebar.css',
 'user' => $userId,
 ]));
 $this->dispatch(new CompileSass([
 'tag' => 'app',
 'origin' => 'resources/sass/app.scss',
 'target' => 'public/css/app.css',
 'user' => $userId,
 ]));
 $this->dispatch(new CompileSass([
 'tag' => 'queues',
 'origin' => 'resources/sass/admin/queues.scss',
 'target' => 'public/css/admin/queues.css',
 'user' => $userId,
 ]));
 }
}

100 changes: 61 additions & 39 deletions
ProcessMaker/Models/Bundle.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,11 @@ public function addSettings($setting, $newId, $type = null)
 }
 }

 if ($type === 'ui_settings') {
 $config['id'] = ['css-override', 'login-footer', 'logo-alt-text'];
 $config['type'] = $type;
 }

 BundleSetting::create([
 'bundle_id' => $this->id,
 'setting' => $setting,
Expand DownExpand Up@@ -292,8 +297,14 @@ public function newestVersionFile()
 return $this->filesSortedByVersion()->first();
 }

 public function savePayloadsToFile(array $payloads)
 public function savePayloadsToFile(array $payloads, array $payloadsSettings, $logger = null)
 {
 if ($logger === null) {
 $logger = new Logger();
 }
 $logger->status('Saving the bundle locally');
 $payloads = array_merge($payloads, $payloadsSettings[0]);

 $this->addMediaFromString(
 gzencode(
 json_encode($payloads)
Expand DownExpand Up@@ -338,51 +349,63 @@ public function installSettingsPayloads(array $payloads, $mode, $logger = null)
 $logger->status('Installing bundle settings on the this instance');
 $logger->setSteps($payloads[0]);
 $assets[] = DevLink::import($payload[0], $options, $logger);
 } else {
 switch ($payload[0]['setting_type']) {
 case 'auth_clients':
 $clientRepository->create(
 null,
 $payload[0]['name'],
 $payload[0]['redirect'],
 $payload[0]['provider'],
 $payload[0]['personal_access_client'],
 $payload[0]['password_client']
 );
 break;
 case 'User Settings':
 case 'Email':
 case 'Integrations':
 case 'Log-In & Auth':
 $settingsMenu = SettingsMenus::where('menu_group', $payload[0]['setting_type'])->first();
 Setting::updateOrCreate([
 'key' => $payload[0]['key'],
 ], [
 'config' => $payload[0]['config'],
 'name' => $payload[0]['name'],
 'helper' => $payload[0]['helper'],
 'format' => $payload[0]['format'],
 'hidden' => $payload[0]['hidden'],
 'readonly' => $payload[0]['readonly'],
 'ui' => $payload[0]['ui'],
 'group_id' => $settingsMenu->id,
 'group' => $payload[0]['group'],
 ]);
 break;
 } elseif (isset($payload[0]['setting_type'])) {
 foreach ($payload as $setting) {
 switch ($setting['setting_type']) {
 case 'auth_clients':
 $clientRepository->create(
 null,
 $setting['name'],
 $setting['redirect'],
 $setting['provider'],
 $setting['personal_access_client'],
 $setting['password_client']
 );
 break;
 case 'User Settings':
 case 'Email':
 case 'Integrations':
 case 'Log-In & Auth':
 $settingsMenu = SettingsMenus::where('menu_group', $setting['setting_type'])->first();
 Setting::updateOrCreate([
 'key' => $setting['key'],
 ], [
 'config' => $setting['config'],
 'name' => $setting['name'],
 'helper' => $setting['helper'],
 'format' => $setting['format'],
 'hidden' => $setting['hidden'],
 'readonly' => $setting['readonly'],
 'ui' => $setting['ui'],
 'group_id' => $settingsMenu->id,
 'group' => $setting['group'],
 ]);
 break;
 case 'ui_settings':
 Setting::updateOrCreate([
 'key' => $setting['key'],
 ], [
 'config' => $setting['config'],
 'name' => $setting['name'],
 'helper' => $setting['helper'],
 'format' => $setting['format'],
 'hidden' => $setting['hidden'],
 'readonly' => $setting['readonly'],
 'ui' => $setting['ui'],
 ]);
 break;
 }
 }
 }
 }
 }

 public function install(array $payloads, $mode, $logger = null)
 public function install(array $payloads, $mode, $logger = null, $reinstall = false)
 {
 if ($logger === null) {
 $logger = new Logger();
 }

 $logger->status('Saving the bundle locally');
 $this->savePayloadsToFile($payloads);

 $logger->status('Installing bundle on the this instance');
 $logger->setSteps($payloads);

Expand All@@ -394,7 +417,7 @@ public function install(array $payloads, $mode, $logger = null)
 $assets[] = DevLink::import($payload, $options, $logger);
 }

 if ($mode === 'update') {
 if ($mode === 'update' && $reinstall === false) {
 $logger->status('Syncing bundle assets');
 $this->syncAssets($assets);
 }
Expand All@@ -406,8 +429,7 @@ public function reinstall(string $mode, Logger $logger = null)

 $content = file_get_contents($media->getPath());
 $payloads = json_decode(gzdecode($content), true);

 $this->install($payloads, $mode, $logger);
 $this->install($payloads, $mode, $logger, true);

 $logger?->setStatus('done');
 }
Expand Down

28 changes: 9 additions & 19 deletions
ProcessMaker/Models/BundleSetting.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\Enums\ExporterMap;
use ProcessMaker\ImportExport\Exporter;
use ProcessMaker\ImportExport\Exporters\GroupExporter;
use ProcessMaker\ImportExport\Exporters\MediaExporter;
use ProcessMaker\ImportExport\Exporters\ScriptExecutorExporter;
use ProcessMaker\ImportExport\Exporters\UserExporter;
use ProcessMaker\Models\ProcessMakerModel;
Expand DownExpand Up@@ -91,31 +92,22 @@ public function export()
 return $uiMenus->map(function ($uiMenu) {
 return $this->exportHelper($uiMenu, MenuExporter::class);
 });
 case 'translations':
 case 'public_files':
 if (empty($this->config)) {
 $translations = Translatable::all();
 $publicFiles = Media::all()->filter(function ($media) {
 return $media->isPublicFile();
 });
 } else {
 $translations = Translatable::whereIn('key', $ids)->get();
 $publicFiles = Media::whereIn('id', $ids)->get();
 }

 return $translations->map(function ($translation) {
 return $this->exportHelper($translation, TranslatableExporter::class);
 });
 case 'auth_clients':
 if (empty($this->config)) {
 $authClients = \Laravel\Passport\Client::where('revoked', false)->get();
 } else {
 $authClients = \Laravel\Passport\Client::where('revoked', false)->whereIn('id', $ids)->get();
 }

 return $authClients->map(function ($authClient) {
 $authClient->setting_type = $this->setting;

 return $authClient;
 return $publicFiles->map(function ($publicFile) {
 return $this->exportHelper($publicFile, MediaExporter::class);
 });
 case 'Log-In & Auth':
 case 'User Settings':
 case 'Email':
 case 'ui_settings':
 case 'Integrations':
 $bundleSettings = Setting::whereIn('key', $ids)->get();

Expand All@@ -125,8 +117,6 @@ public function export()
 return $bundleSetting;
 });
 }

 return [];
 }

 public function exportHelper($model, $exporterClass, $options = null, $ignoreExplicitExport = true)
Expand Down

2 changes: 2 additions & 0 deletions
ProcessMaker/Models/DevLink.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,6 +172,8 @@ public function installRemoteBundle($remoteBundleId, $updateType)
 ]
 );

 $bundle->savePayloadsToFile($bundleExport['payloads'], $bundleSettingsPayloads['payloads']);

 $bundle->install($bundleExport['payloads'], $updateType, $this->logger);
 $bundle->installSettingsPayloads($bundleSettingsPayloads['payloads'], $updateType, $this->logger);
 $bundle->installSettings($bundleSettingsExport['settings']);
Expand Down

3 changes: 3 additions & 0 deletions
devhub/pm-font/svg/add-outlined.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feature/FOUR-20313 Apply an update of an existing bundle#7977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nolanpro
merged 6 commits into

from

Feb 10, 2025
 Merged


feature/FOUR-20313 Apply an update of an existing bundle
#7977
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b3b404e

Apply an update of an existing bundle (reinstall a bundle)


gustavobascope Jan 31, 2025
f204576

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 31, 2025
a27e247

Edit platform configuration available settings


gustavobascope Jan 31, 2025
9f6427b

fixed php-unit tests


gustavobascope Feb 3, 2025
30acb33

ui_settings import export updated


gustavobascope Feb 3, 2025
6b55da2

added the refresh UI


gustavobascope Feb 3, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


82 changes: 80 additions & 2 deletions
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,14 @@

use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Notification;
use Illuminate\Validation\Rule;
use ProcessMaker\Events\CustomizeUiUpdated;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Jobs\CompileSass;
use ProcessMaker\Jobs\DevLinkInstall;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\BundleAsset;
Expand DownExpand Up@@ -198,6 +201,8 @@ public function bundleUpdated($bundleId, $token)

 public function deleteBundle(Bundle $bundle)
 {
 $bundle->assets()->delete();
 $bundle->settings()->delete();
 $bundle->delete();
 }

Expand DownExpand Up@@ -255,7 +260,7 @@ public function exportLocalBundleSettings(Bundle $bundle)
 public function exportLocalBundleSettingPayloads(Bundle $bundle)
 {
 if ($bundle->settings->isEmpty()) {
 return ['payloads' => [0 => []]];
 return ['payloads' => []];
 }

 return ['payloads' => $bundle->exportSettingPayloads()];
Expand DownExpand Up@@ -384,6 +389,79 @@ public function getBundleSetting(Bundle $bundle, $settingKey)

 public function getBundleAllSettings($settingKey)
 {
 return Setting::where([['group_id', SettingsMenus::getId($settingKey)], ['hidden', 0]])->get();
 if ($settingKey === 'ui_settings') {
 return Setting::whereIn('key', ['css-override', 'login-footer', 'logo-alt-text'])
 ->get();
 }

 return Setting::where([
 ['group_id', SettingsMenus::getId($settingKey)],
 ['hidden', 0],
 ])->get();
 }

 public function refreshUi()
 {
 $cssOverride = Setting::where('key', 'css-override')->first();

 $config = $cssOverride->config;
 $variables = json_decode($config['variables']);
 $sansSerif = json_decode($config['sansSerifFont'], true);

 $this->writeColors($variables);
 $this->writeFonts($sansSerif);
 $this->compileSass(auth()->user()->id);
 CustomizeUiUpdated::dispatch([], [], false);
 }

 private function writeColors($data)
 {
 // Now generate the _colors.scss file
 $contents = "// Changed theme colors\n";
 foreach ($data as $value) {
 $contents .= $value->id . ': ' . $value->value . ";\n";
 }
 File::put(app()->resourcePath('sass') . '/_colors.scss', $contents);
 }

 /**
 * Write variables font in file
 *
 * @param $sansSerif
 * @param $serif
 */
 private function writeFonts($sansSerif)
 {
 $sansSerif = $sansSerif ? $sansSerif : $this->sansSerifFontDefault();
 // Generate the _fonts.scss file
 $contents = "// Changed theme fonts\n";
 $contents .= '$font-family-sans-serif: ' . $sansSerif['id'] . " !default;\n";
 File::put(app()->resourcePath('sass') . '/_fonts.scss', $contents);
 }

 /**
 * run jobs compile
 */
 private function compileSass($userId)
 {
 // Compile the Sass files
 $this->dispatch(new CompileSass([
 'tag' => 'sidebar',
 'origin' => 'resources/sass/sidebar/sidebar.scss',
 'target' => 'public/css/sidebar.css',
 'user' => $userId,
 ]));
 $this->dispatch(new CompileSass([
 'tag' => 'app',
 'origin' => 'resources/sass/app.scss',
 'target' => 'public/css/app.css',
 'user' => $userId,
 ]));
 $this->dispatch(new CompileSass([
 'tag' => 'queues',
 'origin' => 'resources/sass/admin/queues.scss',
 'target' => 'public/css/admin/queues.css',
 'user' => $userId,
 ]));
 }
}

100 changes: 61 additions & 39 deletions
ProcessMaker/Models/Bundle.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -233,6 +233,11 @@ public function addSettings($setting, $newId, $type = null)
 }
 }

 if ($type === 'ui_settings') {
 $config['id'] = ['css-override', 'login-footer', 'logo-alt-text'];
 $config['type'] = $type;
 }

 BundleSetting::create([
 'bundle_id' => $this->id,
 'setting' => $setting,
Expand DownExpand Up@@ -292,8 +297,14 @@ public function newestVersionFile()
 return $this->filesSortedByVersion()->first();
 }

 public function savePayloadsToFile(array $payloads)
 public function savePayloadsToFile(array $payloads, array $payloadsSettings, $logger = null)
 {
 if ($logger === null) {
 $logger = new Logger();
 }
 $logger->status('Saving the bundle locally');
 $payloads = array_merge($payloads, $payloadsSettings[0]);

 $this->addMediaFromString(
 gzencode(
 json_encode($payloads)
Expand DownExpand Up@@ -338,51 +349,63 @@ public function installSettingsPayloads(array $payloads, $mode, $logger = null)
 $logger->status('Installing bundle settings on the this instance');
 $logger->setSteps($payloads[0]);
 $assets[] = DevLink::import($payload[0], $options, $logger);
 } else {
 switch ($payload[0]['setting_type']) {
 case 'auth_clients':
 $clientRepository->create(
 null,
 $payload[0]['name'],
 $payload[0]['redirect'],
 $payload[0]['provider'],
 $payload[0]['personal_access_client'],
 $payload[0]['password_client']
 );
 break;
 case 'User Settings':
 case 'Email':
 case 'Integrations':
 case 'Log-In & Auth':
 $settingsMenu = SettingsMenus::where('menu_group', $payload[0]['setting_type'])->first();
 Setting::updateOrCreate([
 'key' => $payload[0]['key'],
 ], [
 'config' => $payload[0]['config'],
 'name' => $payload[0]['name'],
 'helper' => $payload[0]['helper'],
 'format' => $payload[0]['format'],
 'hidden' => $payload[0]['hidden'],
 'readonly' => $payload[0]['readonly'],
 'ui' => $payload[0]['ui'],
 'group_id' => $settingsMenu->id,
 'group' => $payload[0]['group'],
 ]);
 break;
 } elseif (isset($payload[0]['setting_type'])) {
 foreach ($payload as $setting) {
 switch ($setting['setting_type']) {
 case 'auth_clients':
 $clientRepository->create(
 null,
 $setting['name'],
 $setting['redirect'],
 $setting['provider'],
 $setting['personal_access_client'],
 $setting['password_client']
 );
 break;
 case 'User Settings':
 case 'Email':
 case 'Integrations':
 case 'Log-In & Auth':
 $settingsMenu = SettingsMenus::where('menu_group', $setting['setting_type'])->first();
 Setting::updateOrCreate([
 'key' => $setting['key'],
 ], [
 'config' => $setting['config'],
 'name' => $setting['name'],
 'helper' => $setting['helper'],
 'format' => $setting['format'],
 'hidden' => $setting['hidden'],
 'readonly' => $setting['readonly'],
 'ui' => $setting['ui'],
 'group_id' => $settingsMenu->id,
 'group' => $setting['group'],
 ]);
 break;
 case 'ui_settings':
 Setting::updateOrCreate([
 'key' => $setting['key'],
 ], [
 'config' => $setting['config'],
 'name' => $setting['name'],
 'helper' => $setting['helper'],
 'format' => $setting['format'],
 'hidden' => $setting['hidden'],
 'readonly' => $setting['readonly'],
 'ui' => $setting['ui'],
 ]);
 break;
 }
 }
 }
 }
 }

 public function install(array $payloads, $mode, $logger = null)
 public function install(array $payloads, $mode, $logger = null, $reinstall = false)
 {
 if ($logger === null) {
 $logger = new Logger();
 }

 $logger->status('Saving the bundle locally');
 $this->savePayloadsToFile($payloads);

 $logger->status('Installing bundle on the this instance');
 $logger->setSteps($payloads);

Expand All@@ -394,7 +417,7 @@ public function install(array $payloads, $mode, $logger = null)
 $assets[] = DevLink::import($payload, $options, $logger);
 }

 if ($mode === 'update') {
 if ($mode === 'update' && $reinstall === false) {
 $logger->status('Syncing bundle assets');
 $this->syncAssets($assets);
 }
Expand All@@ -406,8 +429,7 @@ public function reinstall(string $mode, Logger $logger = null)

 $content = file_get_contents($media->getPath());
 $payloads = json_decode(gzdecode($content), true);

 $this->install($payloads, $mode, $logger);
 $this->install($payloads, $mode, $logger, true);

 $logger?->setStatus('done');
 }
Expand Down

28 changes: 9 additions & 19 deletions
ProcessMaker/Models/BundleSetting.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\Enums\ExporterMap;
use ProcessMaker\ImportExport\Exporter;
use ProcessMaker\ImportExport\Exporters\GroupExporter;
use ProcessMaker\ImportExport\Exporters\MediaExporter;
use ProcessMaker\ImportExport\Exporters\ScriptExecutorExporter;
use ProcessMaker\ImportExport\Exporters\UserExporter;
use ProcessMaker\Models\ProcessMakerModel;
Expand DownExpand Up@@ -91,31 +92,22 @@ public function export()
 return $uiMenus->map(function ($uiMenu) {
 return $this->exportHelper($uiMenu, MenuExporter::class);
 });
 case 'translations':
 case 'public_files':
 if (empty($this->config)) {
 $translations = Translatable::all();
 $publicFiles = Media::all()->filter(function ($media) {
 return $media->isPublicFile();
 });
 } else {
 $translations = Translatable::whereIn('key', $ids)->get();
 $publicFiles = Media::whereIn('id', $ids)->get();
 }

 return $translations->map(function ($translation) {
 return $this->exportHelper($translation, TranslatableExporter::class);
 });
 case 'auth_clients':
 if (empty($this->config)) {
 $authClients = \Laravel\Passport\Client::where('revoked', false)->get();
 } else {
 $authClients = \Laravel\Passport\Client::where('revoked', false)->whereIn('id', $ids)->get();
 }

 return $authClients->map(function ($authClient) {
 $authClient->setting_type = $this->setting;

 return $authClient;
 return $publicFiles->map(function ($publicFile) {
 return $this->exportHelper($publicFile, MediaExporter::class);
 });
 case 'Log-In & Auth':
 case 'User Settings':
 case 'Email':
 case 'ui_settings':
 case 'Integrations':
 $bundleSettings = Setting::whereIn('key', $ids)->get();

Expand All@@ -125,8 +117,6 @@ public function export()
 return $bundleSetting;
 });
 }

 return [];
 }

 public function exportHelper($model, $exporterClass, $options = null, $ignoreExplicitExport = true)
Expand Down

2 changes: 2 additions & 0 deletions
ProcessMaker/Models/DevLink.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,6 +172,8 @@ public function installRemoteBundle($remoteBundleId, $updateType)
 ]
 );

 $bundle->savePayloadsToFile($bundleExport['payloads'], $bundleSettingsPayloads['payloads']);

 $bundle->install($bundleExport['payloads'], $updateType, $this->logger);
 $bundle->installSettingsPayloads($bundleSettingsPayloads['payloads'], $updateType, $this->logger);
 $bundle->installSettings($bundleSettingsExport['settings']);
Expand Down

3 changes: 3 additions & 0 deletions
devhub/pm-font/svg/add-outlined.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading