Merge branch 'main' of github.com:canyongbs/aidingapp into Improvemen…

…t/AIDAPP-265

_ide_helper_models.php

@@ -327,8 +327,6 @@ class IdeHelperPronouns {}
  * @property mixed $payload
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read \Spatie\MediaLibrary\MediaCollections\Models\Collections\MediaCollection<int, \Spatie\MediaLibrary\MediaCollections\Models\Media> $media
- * @property-read int|null $media_count
  * @method static \Illuminate\Database\Eloquent\Builder|SettingsProperty newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|SettingsProperty newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|SettingsProperty query()
@@ -521,6 +519,8 @@ class IdeHelperTenant {}
  * @property-read int|null $roles_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \AidingApp\ServiceManagement\Models\ServiceRequestAssignment> $serviceRequestAssignments
  * @property-read int|null $service_request_assignments_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \AidingApp\ServiceManagement\Models\ServiceRequestType> $serviceRequestTypeIndividualAssignment
+ * @property-read int|null $service_request_type_individual_assignment_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \AidingApp\Notification\Models\Subscription> $subscriptions
  * @property-read int|null $subscriptions_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \AidingApp\Team\Models\Team> $teams
@@ -1261,6 +1261,8 @@ class IdeHelperContactStatus {}
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property array|null $domains
+ * @property bool $is_contact_generation_enabled
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \AidingApp\Audit\Models\Audit> $audits
  * @property-read int|null $audits_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \AidingApp\Contact\Models\Contact> $contacts
@@ -1280,10 +1282,12 @@ class IdeHelperContactStatus {}
  * @method static \Illuminate\Database\Eloquent\Builder|Organization whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Organization whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Organization whereDescription($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Organization whereDomains($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Organization whereEmail($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Organization whereFacebookUrl($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Organization whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Organization whereIndustryId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Organization whereIsContactGenerationEnabled($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Organization whereLinkedinUrl($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Organization whereName($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Organization whereNumberOfEmployees($value)
@@ -2158,6 +2162,7 @@ class IdeHelperKnowledgeBaseCategory {}
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property int $portal_view_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \AidingApp\Audit\Models\Audit> $audits
  * @property-read int|null $audits_count
  * @property-read \AidingApp\KnowledgeBase\Models\KnowledgeBaseCategory|null $category
@@ -2181,6 +2186,7 @@ class IdeHelperKnowledgeBaseCategory {}
  * @method static \Illuminate\Database\Eloquent\Builder|KnowledgeBaseItem whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|KnowledgeBaseItem whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|KnowledgeBaseItem whereNotes($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|KnowledgeBaseItem wherePortalViewCount($value)
  * @method static \Illuminate\Database\Eloquent\Builder|KnowledgeBaseItem wherePublic($value)
  * @method static \Illuminate\Database\Eloquent\Builder|KnowledgeBaseItem whereQualityId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|KnowledgeBaseItem whereStatusId($value)
@@ -2963,6 +2969,7 @@ class IdeHelperServiceRequestPriority {}
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property bool $is_system_protected
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \AidingApp\Audit\Models\Audit> $audits
  * @property-read int|null $audits_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \AidingApp\ServiceManagement\Models\ServiceRequest> $serviceRequests
@@ -2977,6 +2984,7 @@ class IdeHelperServiceRequestPriority {}
  * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestStatus whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestStatus whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestStatus whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestStatus whereIsSystemProtected($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestStatus whereName($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestStatus whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestStatus withTrashed()
@@ -3001,9 +3009,16 @@ class IdeHelperServiceRequestStatus {}
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \AidingApp\ServiceManagement\Enums\ServiceRequestTypeAssignmentTypes $assignment_type
+ * @property string|null $assignment_type_individual_id
+ * @property-read \App\Models\User|null $assignmentTypeIndividual
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \AidingApp\Team\Models\Team> $auditors
+ * @property-read int|null $auditors_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \AidingApp\Audit\Models\Audit> $audits
  * @property-read int|null $audits_count
  * @property-read \AidingApp\ServiceManagement\Models\ServiceRequestForm|null $form
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \AidingApp\Team\Models\Team> $managers
+ * @property-read int|null $managers_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \AidingApp\ServiceManagement\Models\ServiceRequestPriority> $priorities
  * @property-read int|null $priorities_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \AidingApp\ServiceManagement\Models\ServiceRequest> $serviceRequests
@@ -3013,6 +3028,8 @@ class IdeHelperServiceRequestStatus {}
  * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestType newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestType onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestType query()
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestType whereAssignmentType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestType whereAssignmentTypeIndividualId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestType whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestType whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestType whereDescription($value)
@@ -3031,6 +3048,58 @@ class IdeHelperServiceRequestStatus {}
 	class IdeHelperServiceRequestType {}
 }
 
+namespace AidingApp\ServiceManagement\Models{
+/**
+ * AidingApp\ServiceManagement\Models\ServiceRequestTypeAuditor
+ *
+ * @property string $id
+ * @property string $service_request_type_id
+ * @property string $team_id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \AidingApp\ServiceManagement\Models\ServiceRequestType $serviceRequestType
+ * @property-read \AidingApp\Team\Models\Team $team
+ * @method static \AidingApp\ServiceManagement\Database\Factories\ServiceRequestTypeAuditorFactory factory($count = null, $state = [])
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestTypeAuditor newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestTypeAuditor newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestTypeAuditor query()
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestTypeAuditor whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestTypeAuditor whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestTypeAuditor whereServiceRequestTypeId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestTypeAuditor whereTeamId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestTypeAuditor whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
+	#[\AllowDynamicProperties]
+	class IdeHelperServiceRequestTypeAuditor {}
+}
+
+namespace AidingApp\ServiceManagement\Models{
+/**
+ * AidingApp\ServiceManagement\Models\ServiceRequestTypeManager
+ *
+ * @property string $id
+ * @property string $service_request_type_id
+ * @property string $team_id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \AidingApp\ServiceManagement\Models\ServiceRequestType $serviceRequestType
+ * @property-read \AidingApp\Team\Models\Team $team
+ * @method static \AidingApp\ServiceManagement\Database\Factories\ServiceRequestTypeManagerFactory factory($count = null, $state = [])
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestTypeManager newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestTypeManager newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestTypeManager query()
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestTypeManager whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestTypeManager whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestTypeManager whereServiceRequestTypeId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestTypeManager whereTeamId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ServiceRequestTypeManager whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
+	#[\AllowDynamicProperties]
+	class IdeHelperServiceRequestTypeManager {}
+}
+
 namespace AidingApp\ServiceManagement\Models{
 /**
  * AidingApp\ServiceManagement\Models\ServiceRequestUpdate
@@ -3164,7 +3233,11 @@ class IdeHelperTask {}
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property string|null $deleted_at
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \AidingApp\ServiceManagement\Models\ServiceRequestType> $auditableServiceRequestTypes
+ * @property-read int|null $auditable_service_request_types_count
  * @property-read \AidingApp\Division\Models\Division|null $division
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \AidingApp\ServiceManagement\Models\ServiceRequestType> $managableServiceRequestTypes
+ * @property-read int|null $managable_service_request_types_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $users
  * @property-read int|null $users_count
  * @method static \AidingApp\Team\Database\Factories\TeamFactory factory($count = null, $state = [])

app-modules/knowledge-base/src/Filament/Resources/KnowledgeBaseItemResource.php

@@ -53,13 +53,13 @@ class KnowledgeBaseItemResource extends Resource
 
     protected static ?int $navigationSort = 20;
 
-    protected static ?string $breadcrumb = 'Knowledge Management';
+    protected static ?string $breadcrumb = 'Knowledge Base';
 
     protected static ?string $modelLabel = 'knowledge base article';
 
     protected static ?string $navigationIcon = 'heroicon-o-book-open';
 
-    protected static ?string $navigationLabel = 'Knowledge Management';
+    protected static ?string $navigationLabel = 'Knowledge Base';
 
     protected static ?string $recordTitleAttribute = 'title';
 

app-modules/knowledge-base/src/Filament/Resources/KnowledgeBaseItemResource/Pages/ListKnowledgeBaseItems.php

@@ -66,7 +66,7 @@
 
 class ListKnowledgeBaseItems extends ListRecords
 {
-    protected ?string $heading = 'Knowledge Management';
+    protected ?string $heading = 'Knowledge Base';
 
     protected static string $resource = KnowledgeBaseItemResource::class;
 

app-modules/service-management/database/migrations/2024_10_11_154630_add_assignment_type_columns_to_service_request_types_table.php

@@ -0,0 +1,57 @@
+<?php
+
+/*
+<COPYRIGHT>
+
+    Copyright © 2016-2024, Canyon GBS LLC. All rights reserved.
+
+    Aiding App™ is licensed under the Elastic License 2.0. For more details,
+    see <https://github.com/canyongbs/aidingapp/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 Aiding 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.
+
+</COPYRIGHT>
+*/
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+return new class () extends Migration {
+    public function up(): void
+    {
+        Schema::table('service_request_types', function (Blueprint $table) {
+            $table->string('assignment_type')->default('none');
+            $table->foreignUuid('assignment_type_individual_id')->nullable()->constrained('users')->nullOnDelete();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('service_request_types', function (Blueprint $table) {
+            $table->dropColumn('assignment_type');
+            $table->dropConstrainedForeignId(['assignment_type_individual_id']);
+        });
+    }
+};

app-modules/service-management/database/migrations/2024_10_11_163839_data_activate_feature_flag_service_request_types_assignments.php

@@ -0,0 +1,50 @@
+<?php
+
+/*
+<COPYRIGHT>
+
+    Copyright © 2016-2024, Canyon GBS LLC. All rights reserved.
+
+    Aiding App™ is licensed under the Elastic License 2.0. For more details,
+    see <https://github.com/canyongbs/aidingapp/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 Aiding 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.
+
+</COPYRIGHT>
+*/
+
+use Illuminate\Database\Migrations\Migration;
+use App\Features\ServiceRequestTypeAssignments;
+
+return new class () extends Migration {
+    public function up(): void
+    {
+        ServiceRequestTypeAssignments::activate();
+    }
+
+    public function down(): void
+    {
+        ServiceRequestTypeAssignments::deactivate();
+    }
+};

app-modules/service-management/resources/views/filament/forms/assignment-type-label.blade.php

@@ -0,0 +1,34 @@
+{{--
+<COPYRIGHT>
+
+    Copyright © 2016-2024, Canyon GBS LLC. All rights reserved.
+
+    Aiding App™ is licensed under the Elastic License 2.0. For more details,
+    see <https://github.com/canyongbs/aidingapp/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 Aiding 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.
+
+</COPYRIGHT>
+--}}
+<span class="text-xl font-semibold text-gray-950 dark:text-white sm:text-2xl">Assignment Type</span>