Release (2026-03-20)

.env.example

@@ -33,6 +33,7 @@ SESSION_LIFETIME=120
 SESSION_ENCRYPT=false
 SESSION_PATH=/
 SESSION_DOMAIN=null
+SESSION_SECURE_COOKIE=true
 
 BROADCAST_CONNECTION=log
 FILESYSTEM_DISK=local

.github/workflows/protect-prod-branch.yml

@@ -0,0 +1,21 @@
+name: "Protect Prod Branch"
+on:
+  pull_request:
+    branches: [ "prod" ]
+
+permissions: {}
+
+jobs:
+  check-source:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate Source Branch
+        run: |
+          SRC="${{ github.head_ref }}"
+          if [[ "$SRC" == "dev" || "$SRC" == hotfix* ]]; then
+            echo "Source branch $SRC is valid."
+            exit 0
+          else
+            echo "Error: Only 'dev' or 'hotfix*' branches can target 'prod'."
+            exit 1
+          fi

.github/workflows/release-button.yml

@@ -0,0 +1,28 @@
+name: "Trigger Release PR"
+on:
+  workflow_dispatch:
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Open PR from Dev to Prod
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          # Pulls unique commits in dev not yet in prod
+          LOG=$(git log origin/prod..origin/dev --oneline --no-merges)
+          DATE=$(date +'%Y-%m-%d')
+
+          gh pr create \
+            --base prod \
+            --head dev \
+            --title "Release ($DATE)" \
+            --body "### Changes in this release:
+            $LOG"

README.md

@@ -11,6 +11,12 @@ Polydock Engine is a Laravel-based application management and deployment platfor
 
 For detailed documentation including features, technical details, setup instructions, and more, please see the [Documentation](docs/README.md).
 
+## Development Workflow
+
+- **Branching**: Always branch from the `dev` branch for new features, bug fixes, or improvements.
+- **Pull Requests**: Create Pull Requests (PRs) back into the `dev` branch for review and testing.
+- **Releases**: Releases are performed by merging the `dev` branch into the `prod` branch.
+
 ## Sponsoring Organizations
 
 - [Workshop Orange](https://www.workshoporange.co) - Project Delivery Professionals

app/Console/Commands/RemoveAppInstancesByEmail.php

@@ -37,9 +37,10 @@ public function handle()
 
         // Check if this is a pattern (contains %) or exact email
         $isPattern = str_contains($email, '%');
-        
+
         if (! $isPattern && ! filter_var($email, FILTER_VALIDATE_EMAIL)) {
             $this->error('Invalid email address provided. Use % for wildcard patterns (e.g., %@example.com).');
+
             return 1;
         }
 
@@ -60,6 +61,7 @@ public function handle()
 
         if ($instances->isEmpty()) {
             $this->info("No app instances found matching {$searchType}: {$email}");
+
             return 0;
         }
 

app/Enums/PolydockStoreAppStatusEnum.php

@@ -4,12 +4,15 @@
 
 namespace App\Enums;
 
+use App\Traits\HasEnumOptions;
 use Filament\Support\Contracts\HasColor;
 use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
 
 enum PolydockStoreAppStatusEnum: string implements HasColor, HasIcon, HasLabel
 {
+    use HasEnumOptions;
+
     case AVAILABLE = 'available';
     case UNAVAILABLE = 'unavailable';
 

app/Enums/PolydockStoreStatusEnum.php

@@ -4,12 +4,15 @@
 
 namespace App\Enums;
 
+use App\Traits\HasEnumOptions;
 use Filament\Support\Contracts\HasColor;
 use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
 
 enum PolydockStoreStatusEnum: string implements HasColor, HasIcon, HasLabel
 {
+    use HasEnumOptions;
+
     case UNAVAILABLE = 'unavailable';
     case PUBLIC = 'public';
     case PRIVATE = 'private';

app/Enums/PolydockStoreWebhookCallStatusEnum.php

@@ -4,12 +4,15 @@
 
 namespace App\Enums;
 
+use App\Traits\HasEnumOptions;
 use Filament\Support\Contracts\HasColor;
 use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
 
 enum PolydockStoreWebhookCallStatusEnum: string implements HasColor, HasIcon, HasLabel
 {
+    use HasEnumOptions;
+
     case PENDING = 'pending';
     case PROCESSING = 'processing';
     case SUCCESS = 'success';

app/Enums/PolydockVariableScopeEnum.php

@@ -4,12 +4,15 @@
 
 namespace App\Enums;
 
+use App\Traits\HasEnumOptions;
 use Filament\Support\Contracts\HasColor;
 use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
 
 enum PolydockVariableScopeEnum: string implements HasColor, HasIcon, HasLabel
 {
+    use HasEnumOptions;
+
     case GLOBAL = 'global';
     case BUILD = 'build';
     case RUNTIME = 'runtime';

app/Enums/UserGroupRoleEnum.php

@@ -2,12 +2,15 @@
 
 namespace App\Enums;
 
+use App\Traits\HasEnumOptions;
 use Filament\Support\Contracts\HasColor;
 use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
 
 enum UserGroupRoleEnum: string implements HasColor, HasIcon, HasLabel
 {
+    use HasEnumOptions;
+
     case OWNER = 'owner';
     case MEMBER = 'member';
     case VIEWER = 'viewer';
@@ -43,12 +46,4 @@ public static function getValues(): array
     {
         return array_column(self::cases(), 'value');
     }
-
-    public static function getOptions(): array
-    {
-        return collect(self::cases())
-            ->mapWithKeys(fn ($role) => [
-                $role->value => $role->getLabel(),
-            ])->all();
-    }
 }

app/Enums/UserRemoteRegistrationStatusEnum.php

@@ -2,12 +2,15 @@
 
 namespace App\Enums;
 
+use App\Traits\HasEnumOptions;
 use Filament\Support\Contracts\HasColor;
 use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
 
 enum UserRemoteRegistrationStatusEnum: string implements HasColor, HasIcon, HasLabel
 {
+    use HasEnumOptions;
+
     case PENDING = 'pending';
     case PROCESSING = 'processing';
     case SUCCESS = 'success';
@@ -47,12 +50,4 @@ public static function getValues(): array
     {
         return array_column(self::cases(), 'value');
     }
-
-    public static function getOptions(): array
-    {
-        return collect(self::cases())
-            ->mapWithKeys(fn ($status) => [
-                $status->value => $status->getLabel(),
-            ])->all();
-    }
 }

app/Enums/UserRemoteRegistrationType.php

@@ -4,12 +4,15 @@
 
 namespace App\Enums;
 
+use App\Traits\HasEnumOptions;
 use Filament\Support\Contracts\HasColor;
 use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
 
 enum UserRemoteRegistrationType: string implements HasColor, HasIcon, HasLabel
 {
+    use HasEnumOptions;
+
     case TEST_FAIL = 'TEST_FAIL';
     case REQUEST_TRIAL = 'REQUEST_TRIAL';
     case REQUEST_TRIAL_UNLISTED_REGION = 'REQUEST_TRIAL_UNLISTED_REGION';

app/Filament/Admin/Resources/PolydockAppInstanceResource.php

@@ -12,6 +12,7 @@
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Infolists\Components\Grid;
+use Filament\Infolists\Components\KeyValueEntry;
 use Filament\Infolists\Components\Section;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Infolists\Infolist;
@@ -245,6 +246,15 @@ public static function infolist(Infolist $infolist): Infolist
                                         ),
                                     ),
                             ]),
+                        Grid::make(2)
+                            ->schema([
+                                TextEntry::make('app_url')
+                                    ->label('App URL')
+                                    ->url(fn ($record) => $record->app_url)
+                                    ->openUrlInNewTab()
+                                    ->icon('heroicon-m-link')
+                                    ->iconColor('primary'),
+                            ]),
                     ])
                     ->columnSpan(2),
 
@@ -266,14 +276,14 @@ public static function infolist(Infolist $infolist): Infolist
 
                 Section::make('Instance Configuration')
                     ->description('Instance-specific settings configured at creation.')
-                    ->schema(fn ($record) => self::getRenderedInstanceConfigForRecord($record))
-                    ->visible(fn ($record) => self::hasInstanceConfigFields($record))
+                    ->schema(self::getRenderedInstanceConfigForRecord(...))
+                    ->visible(self::hasInstanceConfigFields(...))
                     ->columnSpan(3)
                     ->collapsible(),
 
                 Section::make('Instance Data')
                     ->description('Safe data that can be shared with webhooks')
-                    ->schema(fn ($record) => self::getRenderedSafeDataForRecord($record))
+                    ->schema(self::getRenderedSafeDataForRecord(...))
                     ->columnSpan(3)
                     ->collapsible(),
             ])
@@ -282,35 +292,46 @@ public static function infolist(Infolist $infolist): Infolist
 
     public static function getRenderedSafeDataForRecord(PolydockAppInstance $record): array
     {
-        $safeData = $record->data;
-        $sensitiveKeys = $record->getSensitiveDataKeys();
-        $renderedArray = [];
-        foreach ($safeData as $key => $value) {
-            if ($record->shouldFilterKey($key, $sensitiveKeys)) {
-                $value = 'REDACTED';
-            }
-
-            if ($value === null) {
-                $value = 'N/A';
-            }
-
-            $renderKey = 'webhook_data_'.$key;
-            $renderedItem = TextEntry::make($renderKey)
-                ->label($key)
-                ->markdown()
-                ->columnSpanFull()
-                ->bulleted();
-
-            if (is_array($value)) {
-                $renderedItem->state($value);
-            } else {
-                $renderedItem->state([$value]);
-            }
-
-            $renderedArray[] = $renderedItem;
-        }
-
-        return $renderedArray;
+        return [
+            Grid::make()
+                ->schema([
+                    KeyValueEntry::make('data')
+                        ->label('')
+                        ->state(function (PolydockAppInstance $record) {
+                            $safeData = $record->data ?? [];
+                            $sensitiveKeys = $record->getSensitiveDataKeys();
+                            $redactedData = [];
+
+                            foreach ($safeData as $key => $value) {
+                                // Split combined key-value strings like "instance_config_VAR=VALUE"
+                                // but skip if it's a URL or if the key is already a non-numeric string.
+                                if (\is_int($key) && \is_string($value) && str_contains($value, '=') && ! str_starts_with($value, 'http')) {
+                                    [$newKey, $newValue] = explode('=', (string) $value, 2);
+                                    $key = $newKey;
+                                    $value = $newValue;
+                                }
+
+                                if ($record->shouldFilterKey($key, $sensitiveKeys)) {
+                                    $value = 'REDACTED';
+                                }
+
+                                if ($value === null) {
+                                    $value = 'N/A';
+                                }
+
+                                if (\is_array($value)) {
+                                    $value = json_encode($value);
+                                }
+
+                                $redactedData[$key] = $value;
+                            }
+
+                            return $redactedData;
+                        })
+                        ->columnSpan(2),
+                ])
+                ->columns(3),
+        ];
     }
 
     /**
@@ -363,7 +384,7 @@ public static function getRenderedInstanceConfigForRecord(PolydockAppInstance $r
             // Check if value should be masked (for encrypted fields)
             $isEncrypted = $record->isPolydockVariableEncrypted($fieldName);
 
-            $renderedItem = TextEntry::make('instance_config_display_'.$fieldName)
+            $renderedItem = TextEntry::make("instance_config_display_{$fieldName}")
                 ->label($labelName);
 
             if ($isEncrypted && $value !== null && $value !== '') {

app/Filament/Admin/Resources/PolydockAppInstanceResource/Pages/CreatePolydockAppInstance.php

@@ -4,7 +4,6 @@
 
 use App\Enums\PolydockStoreAppStatusEnum;
 use App\Filament\Admin\Resources\PolydockAppInstanceResource;
-use App\Jobs\ProcessUserRemoteRegistration;
 use App\Models\PolydockStoreApp;
 use App\Models\UserRemoteRegistration;
 use App\Services\PolydockAppClassDiscovery;
@@ -217,9 +216,6 @@ public function create(): void
                 'registration_uuid' => $registration->uuid,
             ]);
 
-            // Dispatch the job to process the registration
-            ProcessUserRemoteRegistration::dispatch($registration);
-
             Notification::make()
                 ->title('Instance creation started')
                 ->body('The app instance is being created. You can track its progress in the App Instances list.')