diff --git a/app-modules/engagement/database/migrations/2025_02_07_052340_data_activate_engagement_files_created_by_feature.php b/app-modules/engagement/database/migrations/2025_02_07_052340_data_activate_engagement_files_created_by_feature.php deleted file mode 100644 index 14f0584ebb..0000000000 --- a/app-modules/engagement/database/migrations/2025_02_07_052340_data_activate_engagement_files_created_by_feature.php +++ /dev/null @@ -1,50 +0,0 @@ - - - Copyright © 2016-2025, Canyon GBS LLC. All rights reserved. - - Advising App™ is licensed under the Elastic License 2.0. For more details, - see https://github.com/canyongbs/advisingapp/blob/main/LICENSE. - - Notice: - - - You may not provide the software to third parties as a hosted or managed - service, where the service provides users with access to any substantial set of - the features or functionality of the software. - - You may not move, change, disable, or circumvent the license key functionality - in the software, and you may not remove or obscure any functionality in the - software that is protected by the license key. - - You may not alter, remove, or obscure any licensing, copyright, or other notices - of the licensor in the software. Any use of the licensor’s trademarks is subject - to applicable law. - - Canyon GBS LLC respects the intellectual property rights of others and expects the - same in return. Canyon GBS™ and Advising App™ are registered trademarks of - Canyon GBS LLC, and we are committed to enforcing and protecting our trademarks - vigorously. - - The software solution, including services, infrastructure, and code, is offered as a - Software as a Service (SaaS) by Canyon GBS LLC. - - Use of this software implies agreement to the license terms and conditions as stated - in the Elastic License 2.0. - - For more information or inquiries please visit our website at - https://www.canyongbs.com or contact us via email at legal@canyongbs.com. - - -*/ - -use App\Features\EngagementFilesCreatedByFeature; -use Illuminate\Database\Migrations\Migration; - -return new class () extends Migration { - public function up(): void - { - EngagementFilesCreatedByFeature::activate(); - } - - public function down(): void - { - EngagementFilesCreatedByFeature::deactivate(); - } -}; diff --git a/app-modules/engagement/src/Filament/Resources/EngagementFileResource/RelationManagers/EngagementFilesRelationManager.php b/app-modules/engagement/src/Filament/Resources/EngagementFileResource/RelationManagers/EngagementFilesRelationManager.php index c25c51ec18..230bb14b59 100644 --- a/app-modules/engagement/src/Filament/Resources/EngagementFileResource/RelationManagers/EngagementFilesRelationManager.php +++ b/app-modules/engagement/src/Filament/Resources/EngagementFileResource/RelationManagers/EngagementFilesRelationManager.php @@ -39,7 +39,6 @@ use AdvisingApp\Engagement\Filament\Resources\EngagementFileResource; use AdvisingApp\Engagement\Models\EngagementFile; use AdvisingApp\Prospect\Models\Prospect; -use App\Features\EngagementFilesCreatedByFeature; use App\Filament\Tables\Columns\IdColumn; use Filament\Forms\Form; use Filament\Resources\RelationManagers\RelationManager; @@ -117,12 +116,10 @@ public function table(Table $table): Table }), TextColumn::make('created_at') ->label('Date Created') - ->sortable(query: fn ($query, $direction) => $query->orderBy('engagement_files.created_at', $direction)) - ->visible(fn (): bool => EngagementFilesCreatedByFeature::active()), + ->sortable(query: fn ($query, $direction) => $query->orderBy('engagement_files.created_at', $direction)), TextColumn::make('createdBy.name') ->label('Created By') - ->sortable(query: fn ($query, $direction) => $query->orderBy('engagement_files.created_by_id', $direction)) - ->visible(fn (): bool => EngagementFilesCreatedByFeature::active()), + ->sortable(query: fn ($query, $direction) => $query->orderBy('engagement_files.created_by_id', $direction)), ]) ->headerActions([ CreateAction::make() diff --git a/app-modules/engagement/src/Observers/EngagementFileObserver.php b/app-modules/engagement/src/Observers/EngagementFileObserver.php index 776c90192c..f7bdc44fa1 100644 --- a/app-modules/engagement/src/Observers/EngagementFileObserver.php +++ b/app-modules/engagement/src/Observers/EngagementFileObserver.php @@ -37,7 +37,6 @@ namespace AdvisingApp\Engagement\Observers; use AdvisingApp\Engagement\Models\EngagementFile; -use App\Features\EngagementFilesCreatedByFeature; class EngagementFileObserver { @@ -45,7 +44,7 @@ public function creating(EngagementFile $engagementFile): void { $user = auth()->user(); - if (EngagementFilesCreatedByFeature::active() && is_null($engagementFile->created_by_id)) { + if (is_null($engagementFile->created_by_id)) { $engagementFile->created_by_id = $user?->getKey(); $engagementFile->created_by_type = $user?->getMorphClass(); } diff --git a/app/Features/EngagementFilesCreatedByFeature.php b/app/Features/EngagementFilesCreatedByFeature.php deleted file mode 100644 index 616e1b209b..0000000000 --- a/app/Features/EngagementFilesCreatedByFeature.php +++ /dev/null @@ -1,47 +0,0 @@ - - - Copyright © 2016-2025, Canyon GBS LLC. All rights reserved. - - Advising App™ is licensed under the Elastic License 2.0. For more details, - see https://github.com/canyongbs/advisingapp/blob/main/LICENSE. - - Notice: - - - You may not provide the software to third parties as a hosted or managed - service, where the service provides users with access to any substantial set of - the features or functionality of the software. - - You may not move, change, disable, or circumvent the license key functionality - in the software, and you may not remove or obscure any functionality in the - software that is protected by the license key. - - You may not alter, remove, or obscure any licensing, copyright, or other notices - of the licensor in the software. Any use of the licensor’s trademarks is subject - to applicable law. - - Canyon GBS LLC respects the intellectual property rights of others and expects the - same in return. Canyon GBS™ and Advising App™ are registered trademarks of - Canyon GBS LLC, and we are committed to enforcing and protecting our trademarks - vigorously. - - The software solution, including services, infrastructure, and code, is offered as a - Software as a Service (SaaS) by Canyon GBS LLC. - - Use of this software implies agreement to the license terms and conditions as stated - in the Elastic License 2.0. - - For more information or inquiries please visit our website at - https://www.canyongbs.com or contact us via email at legal@canyongbs.com. - - -*/ - -namespace App\Features; - -use App\Support\AbstractFeatureFlag; - -class EngagementFilesCreatedByFeature extends AbstractFeatureFlag -{ - public function resolve(mixed $scope): mixed - { - return false; - } -}