mkrieger/byos_laravel
1
0
Fork 0
mirror of https://github.com/usetrmnl/byos_laravel.git synced 2026-01-13 15:07:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(#121): allow multiple instances of the same plugin

Browse source
This commit is contained in:
Benjamin Nussbaum 2026-01-06 14:28:39 +01:00
parent e3bb9ad4e2
commit dc676327c2
3 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/Services/PluginImportService.php
View file

@ -171,11 +171,12 @@ class PluginImportService
* @param string|null $zipEntryPath Optional path to specific plugin in monorepo * @param string|null $zipEntryPath Optional path to specific plugin in monorepo
* @param string|null $preferredRenderer Optional preferred renderer (e.g., 'trmnl-liquid') * @param string|null $preferredRenderer Optional preferred renderer (e.g., 'trmnl-liquid')
* @param string|null $iconUrl Optional icon URL to set on the plugin * @param string|null $iconUrl Optional icon URL to set on the plugin
* @param bool $allowDuplicate If true, generate a new UUID for trmnlp_id if a plugin with the same trmnlp_id already exists
* @return Plugin The created plugin instance * @return Plugin The created plugin instance
* *
* @throws Exception If the ZIP file is invalid or required files are missing * @throws Exception If the ZIP file is invalid or required files are missing
*/ */
public function importFromUrl(string $zipUrl, User $user, ?string $zipEntryPath = null, $preferredRenderer = null, ?string $iconUrl = null): Plugin public function importFromUrl(string $zipUrl, User $user, ?string $zipEntryPath = null, $preferredRenderer = null, ?string $iconUrl = null, bool $allowDuplicate = false): Plugin
{ {
// Download the ZIP file // Download the ZIP file
$response = Http::timeout(60)->get($zipUrl); $response = Http::timeout(60)->get($zipUrl);
@ -245,17 +246,26 @@ class PluginImportService
'custom_fields' => $settings['custom_fields'], 'custom_fields' => $settings['custom_fields'],
]; ];
$plugin_updated = isset($settings['id']) // Determine the trmnlp_id to use
$trmnlpId = $settings['id'] ?? Uuid::v7();
// If allowDuplicate is true and a plugin with this trmnlp_id already exists, generate a new UUID
if ($allowDuplicate && isset($settings['id']) && Plugin::where('user_id', $user->id)->where('trmnlp_id', $settings['id'])->exists()) {
$trmnlpId = Uuid::v7();
}
$plugin_updated = ! $allowDuplicate && isset($settings['id'])
&& Plugin::where('user_id', $user->id)->where('trmnlp_id', $settings['id'])->exists(); && Plugin::where('user_id', $user->id)->where('trmnlp_id', $settings['id'])->exists();
// Create a new plugin // Create a new plugin
$plugin = Plugin::updateOrCreate( $plugin = Plugin::updateOrCreate(
[ [
'user_id' => $user->id, 'trmnlp_id' => $settings['id'] ?? Uuid::v7(), 'user_id' => $user->id, 'trmnlp_id' => $trmnlpId,
], ],
[ [
'user_id' => $user->id, 'user_id' => $user->id,
'name' => $settings['name'] ?? 'Imported Plugin', 'name' => $settings['name'] ?? 'Imported Plugin',
'trmnlp_id' => $settings['id'] ?? Uuid::v7(), 'trmnlp_id' => $trmnlpId,
'data_stale_minutes' => $settings['refresh_interval'] ?? 15, 'data_stale_minutes' => $settings['refresh_interval'] ?? 15,
'data_strategy' => $settings['strategy'] ?? 'static', 'data_strategy' => $settings['strategy'] ?? 'static',
'polling_url' => $settings['polling_url'] ?? null, 'polling_url' => $settings['polling_url'] ?? null,

3
resources/views/livewire/catalog/index.blade.php
View file

@ -113,7 +113,8 @@ class extends Component
auth()->user(), auth()->user(),
$plugin['zip_entry_path'] ?? null, $plugin['zip_entry_path'] ?? null,
null, null,
$plugin['logo_url'] ?? null $plugin['logo_url'] ?? null,
allowDuplicate: true
); );
$this->dispatch('plugin-installed'); $this->dispatch('plugin-installed');

3
resources/views/livewire/catalog/trmnl.blade.php
View file

@ -164,7 +164,8 @@ class extends Component
auth()->user(), auth()->user(),
null, null,
config('services.trmnl.liquid_enabled') ? 'trmnl-liquid' : null, config('services.trmnl.liquid_enabled') ? 'trmnl-liquid' : null,
$recipe['icon_url'] ?? null $recipe['icon_url'] ?? null,
allowDuplicate: true
); );
$this->dispatch('plugin-installed'); $this->dispatch('plugin-installed');