Skip to content

Commit e36ee9a

Browse files
nolanpronolanpro
authored
Merge pull request #8003 from ProcessMaker/observation/FOUR-21853
observation/FOUR-21853 Disable settings edit on remote bundles
2 parents 00d5e28 + 650043b commit e36ee9a

36 files changed

Lines changed: 604 additions & 446 deletions

‎ProcessMaker/Http/Controllers/Api/DevLinkController.php‎

Lines changed: 80 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44

55
use Illuminate\Database\Eloquent\ModelNotFoundException;
66
use Illuminate\Http\Request;
7+
use Illuminate\Support\Facades\File;
78
use Illuminate\Support\Facades\Notification;
89
use Illuminate\Validation\Rule;
10+
use ProcessMaker\Events\CustomizeUiUpdated;
911
use ProcessMaker\Exception\ValidationException;
1012
use ProcessMaker\Http\Controllers\Controller;
1113
use ProcessMaker\Http\Resources\ApiCollection;
14+
use ProcessMaker\Jobs\CompileSass;
1215
use ProcessMaker\Jobs\DevLinkInstall;
1316
use ProcessMaker\Models\Bundle;
1417
use ProcessMaker\Models\BundleAsset;
@@ -198,6 +201,8 @@ public function bundleUpdated($bundleId, $token)
198201

199202
public function deleteBundle(Bundle $bundle)
200203
{
204+
$bundle->assets()->delete();
205+
$bundle->settings()->delete();
201206
$bundle->delete();
202207
}
203208

@@ -255,7 +260,7 @@ public function exportLocalBundleSettings(Bundle $bundle)
255260
public function exportLocalBundleSettingPayloads(Bundle $bundle)
256261
{
257262
if ($bundle->settings->isEmpty()) {
258-
return ['payloads' => [0 => []]];
263+
return ['payloads' => []];
259264
}
260265

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

385390
public function getBundleAllSettings($settingKey)
386391
{
387-
return Setting::where([['group_id', SettingsMenus::getId($settingKey)], ['hidden', 0]])->get();
392+
if ($settingKey === 'ui_settings') {
393+
return Setting::whereIn('key', ['css-override', 'login-footer', 'logo-alt-text'])
394+
->get();
395+
}
396+
397+
return Setting::where([
398+
['group_id', SettingsMenus::getId($settingKey)],
399+
['hidden', 0],
400+
])->get();
401+
}
402+
403+
public function refreshUi()
404+
{
405+
$cssOverride = Setting::where('key', 'css-override')->first();
406+
407+
$config = $cssOverride->config;
408+
$variables = json_decode($config['variables']);
409+
$sansSerif = json_decode($config['sansSerifFont'], true);
410+
411+
$this->writeColors($variables);
412+
$this->writeFonts($sansSerif);
413+
$this->compileSass(auth()->user()->id);
414+
CustomizeUiUpdated::dispatch([], [], false);
415+
}
416+
417+
private function writeColors($data)
418+
{
419+
// Now generate the _colors.scss file
420+
$contents = "// Changed theme colors\n";
421+
foreach ($data as $value) {
422+
$contents .= $value->id . ': ' . $value->value . ";\n";
423+
}
424+
File::put(app()->resourcePath('sass') . '/_colors.scss', $contents);
425+
}
426+
427+
/**
428+
* Write variables font in file
429+
*
430+
* @param $sansSerif
431+
* @param $serif
432+
*/
433+
private function writeFonts($sansSerif)
434+
{
435+
$sansSerif = $sansSerif ? $sansSerif : $this->sansSerifFontDefault();
436+
// Generate the _fonts.scss file
437+
$contents = "// Changed theme fonts\n";
438+
$contents .= '$font-family-sans-serif: ' . $sansSerif['id'] . " !default;\n";
439+
File::put(app()->resourcePath('sass') . '/_fonts.scss', $contents);
440+
}
441+
442+
/**
443+
* run jobs compile
444+
*/
445+
private function compileSass($userId)
446+
{
447+
// Compile the Sass files
448+
$this->dispatch(new CompileSass([
449+
'tag' => 'sidebar',
450+
'origin' => 'resources/sass/sidebar/sidebar.scss',
451+
'target' => 'public/css/sidebar.css',
452+
'user' => $userId,
453+
]));
454+
$this->dispatch(new CompileSass([
455+
'tag' => 'app',
456+
'origin' => 'resources/sass/app.scss',
457+
'target' => 'public/css/app.css',
458+
'user' => $userId,
459+
]));
460+
$this->dispatch(new CompileSass([
461+
'tag' => 'queues',
462+
'origin' => 'resources/sass/admin/queues.scss',
463+
'target' => 'public/css/admin/queues.css',
464+
'user' => $userId,
465+
]));
388466
}
389467
}

‎ProcessMaker/Models/Bundle.php‎

Lines changed: 63 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,11 @@ public function addSettings($setting, $newId, $type = null)
233233
}
234234
}
235235

236+
if ($type === 'ui_settings') {
237+
$config['id'] = ['css-override', 'login-footer', 'logo-alt-text'];
238+
$config['type'] = $type;
239+
}
240+
236241
BundleSetting::create([
237242
'bundle_id' => $this->id,
238243
'setting' => $setting,
@@ -292,8 +297,16 @@ public function newestVersionFile()
292297
return $this->filesSortedByVersion()->first();
293298
}
294299

295-
public function savePayloadsToFile(array $payloads)
300+
public function savePayloadsToFile(array $payloads, array $payloadsSettings, $logger = null)
296301
{
302+
if ($logger === null) {
303+
$logger = new Logger();
304+
}
305+
$logger->status('Saving the bundle locally');
306+
if (isset($payloadsSettings[0])) {
307+
$payloads = array_merge($payloads, $payloadsSettings[0]);
308+
}
309+
297310
$this->addMediaFromString(
298311
gzencode(
299312
json_encode($payloads)
@@ -338,51 +351,63 @@ public function installSettingsPayloads(array $payloads, $mode, $logger = null)
338351
$logger->status('Installing bundle settings on the this instance');
339352
$logger->setSteps($payloads[0]);
340353
$assets[] = DevLink::import($payload[0], $options, $logger);
341-
} else {
342-
switch ($payload[0]['setting_type']) {
343-
case 'auth_clients':
344-
$clientRepository->create(
345-
null,
346-
$payload[0]['name'],
347-
$payload[0]['redirect'],
348-
$payload[0]['provider'],
349-
$payload[0]['personal_access_client'],
350-
$payload[0]['password_client']
351-
);
352-
break;
353-
case 'User Settings':
354-
case 'Email':
355-
case 'Integrations':
356-
case 'Log-In & Auth':
357-
$settingsMenu = SettingsMenus::where('menu_group', $payload[0]['setting_type'])->first();
358-
Setting::updateOrCreate([
359-
'key' => $payload[0]['key'],
360-
], [
361-
'config' => $payload[0]['config'],
362-
'name' => $payload[0]['name'],
363-
'helper' => $payload[0]['helper'],
364-
'format' => $payload[0]['format'],
365-
'hidden' => $payload[0]['hidden'],
366-
'readonly' => $payload[0]['readonly'],
367-
'ui' => $payload[0]['ui'],
368-
'group_id' => $settingsMenu->id,
369-
'group' => $payload[0]['group'],
370-
]);
371-
break;
354+
} elseif (isset($payload[0]['setting_type'])) {
355+
foreach ($payload as $setting) {
356+
switch ($setting['setting_type']) {
357+
case 'auth_clients':
358+
$clientRepository->create(
359+
null,
360+
$setting['name'],
361+
$setting['redirect'],
362+
$setting['provider'],
363+
$setting['personal_access_client'],
364+
$setting['password_client']
365+
);
366+
break;
367+
case 'User Settings':
368+
case 'Email':
369+
case 'Integrations':
370+
case 'Log-In & Auth':
371+
$settingsMenu = SettingsMenus::where('menu_group', $setting['setting_type'])->first();
372+
Setting::updateOrCreate([
373+
'key' => $setting['key'],
374+
], [
375+
'config' => $setting['config'],
376+
'name' => $setting['name'],
377+
'helper' => $setting['helper'],
378+
'format' => $setting['format'],
379+
'hidden' => $setting['hidden'],
380+
'readonly' => $setting['readonly'],
381+
'ui' => $setting['ui'],
382+
'group_id' => $settingsMenu->id,
383+
'group' => $setting['group'],
384+
]);
385+
break;
386+
case 'ui_settings':
387+
Setting::updateOrCreate([
388+
'key' => $setting['key'],
389+
], [
390+
'config' => $setting['config'],
391+
'name' => $setting['name'],
392+
'helper' => $setting['helper'],
393+
'format' => $setting['format'],
394+
'hidden' => $setting['hidden'],
395+
'readonly' => $setting['readonly'],
396+
'ui' => $setting['ui'],
397+
]);
398+
break;
399+
}
372400
}
373401
}
374402
}
375403
}
376404

377-
public function install(array $payloads, $mode, $logger = null)
405+
public function install(array $payloads, $mode, $logger = null, $reinstall = false)
378406
{
379407
if ($logger === null) {
380408
$logger = new Logger();
381409
}
382410

383-
$logger->status('Saving the bundle locally');
384-
$this->savePayloadsToFile($payloads);
385-
386411
$logger->status('Installing bundle on the this instance');
387412
$logger->setSteps($payloads);
388413

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

397-
if ($mode === 'update') {
422+
if ($mode === 'update' && $reinstall === false) {
398423
$logger->status('Syncing bundle assets');
399424
$this->syncAssets($assets);
400425
}
@@ -406,8 +431,7 @@ public function reinstall(string $mode, Logger $logger = null)
406431

407432
$content = file_get_contents($media->getPath());
408433
$payloads = json_decode(gzdecode($content), true);
409-
410-
$this->install($payloads, $mode, $logger);
434+
$this->install($payloads, $mode, $logger, true);
411435

412436
$logger?->setStatus('done');
413437
}

‎ProcessMaker/Models/BundleSetting.php‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use ProcessMaker\Enums\ExporterMap;
77
use ProcessMaker\ImportExport\Exporter;
88
use ProcessMaker\ImportExport\Exporters\GroupExporter;
9+
use ProcessMaker\ImportExport\Exporters\MediaExporter;
910
use ProcessMaker\ImportExport\Exporters\ScriptExecutorExporter;
1011
use ProcessMaker\ImportExport\Exporters\UserExporter;
1112
use ProcessMaker\Models\ProcessMakerModel;
@@ -91,31 +92,22 @@ public function export()
9192
return $uiMenus->map(function ($uiMenu) {
9293
return $this->exportHelper($uiMenu, MenuExporter::class);
9394
});
94-
case 'translations':
95+
case 'public_files':
9596
if (empty($this->config)) {
96-
$translations = Translatable::all();
97+
$publicFiles = Media::all()->filter(function ($media) {
98+
return $media->isPublicFile();
99+
});
97100
} else {
98-
$translations = Translatable::whereIn('key', $ids)->get();
101+
$publicFiles = Media::whereIn('id', $ids)->get();
99102
}
100103

101-
return $translations->map(function ($translation) {
102-
return $this->exportHelper($translation, TranslatableExporter::class);
103-
});
104-
case 'auth_clients':
105-
if (empty($this->config)) {
106-
$authClients = \Laravel\Passport\Client::where('revoked', false)->get();
107-
} else {
108-
$authClients = \Laravel\Passport\Client::where('revoked', false)->whereIn('id', $ids)->get();
109-
}
110-
111-
return $authClients->map(function ($authClient) {
112-
$authClient->setting_type = $this->setting;
113-
114-
return $authClient;
104+
return $publicFiles->map(function ($publicFile) {
105+
return $this->exportHelper($publicFile, MediaExporter::class);
115106
});
116107
case 'Log-In & Auth':
117108
case 'User Settings':
118109
case 'Email':
110+
case 'ui_settings':
119111
case 'Integrations':
120112
$bundleSettings = Setting::whereIn('key', $ids)->get();
121113

@@ -125,8 +117,6 @@ public function export()
125117
return $bundleSetting;
126118
});
127119
}
128-
129-
return [];
130120
}
131121

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

‎ProcessMaker/Models/DevLink.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,8 @@ public function installRemoteBundle($remoteBundleId, $updateType)
172172
]
173173
);
174174

175+
$bundle->savePayloadsToFile($bundleExport['payloads'], $bundleSettingsPayloads['payloads']);
176+
175177
$bundle->install($bundleExport['payloads'], $updateType, $this->logger);
176178
$bundle->installSettingsPayloads($bundleSettingsPayloads['payloads'], $updateType, $this->logger);
177179
$bundle->installSettings($bundleSettingsExport['settings']);

‎devhub/pm-font/svg/add-outlined.svg‎

Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)