merge main

GCTC-NTGC · Oct 3, 2024 · 5e9b25c · 5e9b25c
2 parents 2d9c5a2 + 1753c19
commit 5e9b25c
Show file tree

Hide file tree

Showing 70 changed files with 1,676 additions and 1,651 deletions.
diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
@@ -61,7 +61,7 @@ jobs:
           pnpm build
 
       - name: "Publish Storybook: all"
-        uses: chromaui/action@v11.10.4
+        uses: chromaui/action@v11.11.0
         with:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
           # Auto-accept UI Tests on Chromatic platform.

diff --git a/api/app/Builders/PoolBuilder.php b/api/app/Builders/PoolBuilder.php
@@ -88,7 +88,7 @@ public function statuses(?array $statuses): self
                 if (in_array(PoolStatus::CLOSED->name, $statuses)) {
                     $query->orWhere(function ($query) {
                         $query->whereClosed()
-                            ->whereNotArchived($query);
+                            ->whereNotArchived();
                     });
                 }
 
@@ -217,7 +217,7 @@ public function canAdmin(?bool $canAdmin): self
 
     public function authorizedToAdmin(): self
     {
-        /** @var \App\Models\User */
+        /** @var \App\Models\User | null */
         $user = Auth::user();
 
         // if they can view any, then nothing filtered out
@@ -255,7 +255,7 @@ public function authorizedToAdmin(): self
 
     public function authorizedToView(): self
     {
-        /** @var \App\Models\User */
+        /** @var \App\Models\User | null */
         $user = Auth::user();
 
         // can view any pool - return query with no filters added

diff --git a/api/app/GraphQL/Mutations/SendUserEmailVerification.php b/api/app/GraphQL/Mutations/SendUserEmailVerification.php
@@ -17,7 +17,7 @@ final class SendUserEmailVerification
     public function __invoke($_, array $args)
     {
         try {
-            /** @var \App\Models\User */
+            /** @var \App\Models\User | null */
             $user = Auth::user();
             $emailType = isset($args['emailType']) ? EmailType::fromName($args['emailType']) : EmailType::CONTACT;
             $user->sendEmailVerificationNotification($emailType);

diff --git a/api/app/GraphQL/Mutations/TogglePoolUserBookmark.php b/api/app/GraphQL/Mutations/TogglePoolUserBookmark.php
@@ -14,7 +14,7 @@ final class TogglePoolUserBookmark
      */
     public function __invoke($_, array $args)
     {
-        /** @var \App\Models\User */
+        /** @var \App\Models\User | null */
         $user = Auth::user();
         $pool = Pool::find($args['pool_id']);
         $user->poolBookmarks()->toggle($pool->id);

diff --git a/api/app/GraphQL/Mutations/UpdateSitewideAnnouncement.php b/api/app/GraphQL/Mutations/UpdateSitewideAnnouncement.php
@@ -14,7 +14,7 @@
     /** @param  array{}  $args */
     public function __invoke(null $_, array $args)
     {
-        /** @var \App\Models\User */
+        /** @var \App\Models\User | null */
         $user = Auth::user();
         throw_unless($user->isAbleTo('update-any-announcement'), AuthorizationException::class);
 

diff --git a/api/app/GraphQL/Mutations/VerifyUserEmail.php b/api/app/GraphQL/Mutations/VerifyUserEmail.php
@@ -16,7 +16,7 @@ final class VerifyUserEmail
      */
     public function __invoke($_, array $args)
     {
-        /** @var \App\Models\User */
+        /** @var \App\Models\User | null */
         $user = Auth::user();
         $emailType = isset($args['emailType']) ? EmailType::fromName($args['emailType']) : EmailType::CONTACT;
         $providedCode = $args['code'];

diff --git a/api/app/Models/PoolCandidate.php b/api/app/Models/PoolCandidate.php
@@ -746,7 +746,7 @@ public function isDraft()
      */
     public function scopeAuthorizedToView(Builder $query, ?array $args = null): void
     {
-        /** @var \App\Models\User */
+        /** @var \App\Models\User | null */
         $user = Auth::user();
 
         if (isset($args['userId'])) {

diff --git a/api/app/Models/PoolCandidateSearchRequest.php b/api/app/Models/PoolCandidateSearchRequest.php
@@ -62,7 +62,7 @@ class PoolCandidateSearchRequest extends Model
      */
     protected static function boot()
     {
-        /** @var \App\Models\User */
+        /** @var \App\Models\User | null */
         $user = Auth::user();
 
         parent::boot();
@@ -266,7 +266,7 @@ public static function scopeGeneralSearch(Builder $query, ?string $search): Buil
      */
     public function scopeAuthorizedToView(Builder $query)
     {
-        /** @var \App\Models\User */
+        /** @var \App\Models\User | null */
         $user = Auth::user();
 
         if ($user?->isAbleTo('view-any-searchRequest')) {

diff --git a/api/app/Models/User.php b/api/app/Models/User.php
@@ -1066,7 +1066,7 @@ public function getImproveBehaviouralSkillsRankingAttribute()
 
     public function scopeAuthorizedToView(Builder $query, ?array $args = null): void
     {
-        /** @var \App\Models\User */
+        /** @var \App\Models\User | null */
         $user = Auth::user();
 
         if (isset($args['userId'])) {
@@ -1122,7 +1122,7 @@ public function scopeAuthorizedToView(Builder $query, ?array $args = null): void
 
     public function scopeAuthorizedToViewBasicInfo(Builder $query): void
     {
-        /** @var \App\Models\User */
+        /** @var \App\Models\User | null */
         $user = Auth::user();
 
         // special case: can see any basic info - return all users with no filters added

diff --git a/api/app/Policies/PoolCandidatePolicy.php b/api/app/Policies/PoolCandidatePolicy.php
@@ -30,7 +30,7 @@ public function view(User $user, PoolCandidate $poolCandidate)
     {
 
         // If the user owns the application, we do not care about status
-        if ($user->id === $poolCandidate->user_id && $user?->isAbleTo('view-own-application')) {
+        if ($user->id === $poolCandidate->user_id && $user->isAbleTo('view-own-application')) {
             return true;
         }
 
@@ -47,7 +47,7 @@ public function view(User $user, PoolCandidate $poolCandidate)
             $poolCandidate->loadMissing(['pool.team', 'pool.legacyTeam', 'pool.community.team']);
             $teamPermission = ! is_null($poolCandidate->pool->team) && $user->isAbleTo('view-team-submittedApplication', $poolCandidate->pool->team);
             $legacyTeamPermission = ! is_null($poolCandidate->pool->legacyTeam) && $user->isAbleTo('view-team-submittedApplication', $poolCandidate->pool->legacyTeam);
-            $communityPermission = ! is_null($poolCandidate?->pool?->community?->team) && $user->isAbleTo('view-team-submittedApplication', $poolCandidate->pool->community->team);
+            $communityPermission = ! is_null($poolCandidate->pool?->community?->team) && $user->isAbleTo('view-team-submittedApplication', $poolCandidate->pool->community->team);
             if ($teamPermission || $legacyTeamPermission || $communityPermission) {
                 return true;
             }
@@ -178,7 +178,7 @@ public function viewStatus(User $user, PoolCandidate $poolCandidate)
         $poolCandidate->loadMissing(['pool.team', 'pool.legacyTeam', 'pool.community.team']);
         $teamPermission = ! is_null($poolCandidate->pool->team) && $user->isAbleTo('view-team-applicationStatus', $poolCandidate->pool->team);
         $legacyTeamPermission = ! is_null($poolCandidate->pool->legacyTeam) && $user->isAbleTo('view-team-applicationStatus', $poolCandidate->pool->legacyTeam);
-        $communityPermission = ! is_null($poolCandidate?->pool?->community?->team) && $user->isAbleTo('view-team-applicationStatus', $poolCandidate->pool->community->team);
+        $communityPermission = ! is_null($poolCandidate->pool?->community?->team) && $user->isAbleTo('view-team-applicationStatus', $poolCandidate->pool->community->team);
 
         return $teamPermission || $legacyTeamPermission || $communityPermission;
     }
@@ -197,7 +197,7 @@ public function updateStatus(User $user, PoolCandidate $poolCandidate)
         $poolCandidate->loadMissing(['pool.team', 'pool.legacyTeam', 'pool.community.team']);
         $teamPermission = ! is_null($poolCandidate->pool->team) && $user->isAbleTo('update-team-applicationStatus', $poolCandidate->pool->team);
         $legacyTeamPermission = ! is_null($poolCandidate->pool->legacyTeam) && $user->isAbleTo('update-team-applicationStatus', $poolCandidate->pool->legacyTeam);
-        $communityPermission = ! is_null($poolCandidate?->pool?->community?->team) && $user->isAbleTo('update-team-applicationStatus', $poolCandidate->pool->community->team);
+        $communityPermission = ! is_null($poolCandidate->pool?->community?->team) && $user->isAbleTo('update-team-applicationStatus', $poolCandidate->pool->community->team);
 
         return $teamPermission || $legacyTeamPermission || $communityPermission;
     }
@@ -211,7 +211,7 @@ public function updateBookmark(User $user, PoolCandidate $poolCandidate)
         $poolCandidate->loadMissing(['pool.team', 'pool.legacyTeam', 'pool.community.team']);
         $teamPermission = ! is_null($poolCandidate->pool->team) && $user->isAbleTo('update-team-applicationAssessment', $poolCandidate->pool->team);
         $legacyTeamPermission = ! is_null($poolCandidate->pool->legacyTeam) && $user->isAbleTo('update-team-applicationAssessment', $poolCandidate->pool->legacyTeam);
-        $communityPermission = ! is_null($poolCandidate?->pool?->community?->team) && $user->isAbleTo('update-team-applicationAssessment', $poolCandidate->pool->community->team);
+        $communityPermission = ! is_null($poolCandidate->pool?->community?->team) && $user->isAbleTo('update-team-applicationAssessment', $poolCandidate->pool->community->team);
 
         return $teamPermission || $legacyTeamPermission || $communityPermission;
     }
@@ -224,7 +224,7 @@ public function viewNotes(User $user, PoolCandidate $poolCandidate)
         $poolCandidate->loadMissing(['pool.team', 'pool.legacyTeam', 'pool.community.team']);
         $teamPermission = ! is_null($poolCandidate->pool->team) && $user->isAbleTo('view-team-applicationAssessment', $poolCandidate->pool->team);
         $legacyTeamPermission = ! is_null($poolCandidate->pool->legacyTeam) && $user->isAbleTo('view-team-applicationAssessment', $poolCandidate->pool->legacyTeam);
-        $communityPermission = ! is_null($poolCandidate?->pool?->community?->team) && $user->isAbleTo('view-team-applicationAssessment', $poolCandidate->pool->community->team);
+        $communityPermission = ! is_null($poolCandidate->pool?->community?->team) && $user->isAbleTo('view-team-applicationAssessment', $poolCandidate->pool->community->team);
 
         return $teamPermission || $legacyTeamPermission || $communityPermission;
     }
@@ -237,7 +237,7 @@ public function updateNotes(User $user, PoolCandidate $poolCandidate)
         $poolCandidate->loadMissing(['pool.team', 'pool.legacyTeam', 'pool.community.team']);
         $teamPermission = ! is_null($poolCandidate->pool->team) && $user->isAbleTo('update-team-applicationAssessment', $poolCandidate->pool->team);
         $legacyTeamPermission = ! is_null($poolCandidate->pool->legacyTeam) && $user->isAbleTo('update-team-applicationAssessment', $poolCandidate->pool->legacyTeam);
-        $communityPermission = ! is_null($poolCandidate?->pool?->community?->team) && $user->isAbleTo('update-team-applicationAssessment', $poolCandidate->pool->community->team);
+        $communityPermission = ! is_null($poolCandidate->pool?->community?->team) && $user->isAbleTo('update-team-applicationAssessment', $poolCandidate->pool->community->team);
 
         return $teamPermission || $legacyTeamPermission || $communityPermission;
     }
@@ -250,7 +250,7 @@ public function viewAssessment(User $user, PoolCandidate $poolCandidate)
         $poolCandidate->loadMissing(['pool.team', 'pool.legacyTeam', 'pool.community.team']);
         $teamPermission = ! is_null($poolCandidate->pool->team) && $user->isAbleTo('view-team-applicationAssessment', $poolCandidate->pool->team);
         $legacyTeamPermission = ! is_null($poolCandidate->pool->legacyTeam) && $user->isAbleTo('view-team-applicationAssessment', $poolCandidate->pool->legacyTeam);
-        $communityPermission = ! is_null($poolCandidate?->pool?->community?->team) && $user->isAbleTo('view-team-applicationAssessment', $poolCandidate->pool->community->team);
+        $communityPermission = ! is_null($poolCandidate->pool?->community?->team) && $user->isAbleTo('view-team-applicationAssessment', $poolCandidate->pool->community->team);
 
         return $teamPermission || $legacyTeamPermission || $communityPermission;
     }
@@ -263,7 +263,7 @@ public function updateAssessment(User $user, PoolCandidate $poolCandidate)
         $poolCandidate->loadMissing(['pool.team', 'pool.legacyTeam', 'pool.community.team']);
         $teamPermission = ! is_null($poolCandidate->pool->team) && $user->isAbleTo('update-team-applicationAssessment', $poolCandidate->pool->team);
         $legacyTeamPermission = ! is_null($poolCandidate->pool->legacyTeam) && $user->isAbleTo('update-team-applicationAssessment', $poolCandidate->pool->legacyTeam);
-        $communityPermission = ! is_null($poolCandidate?->pool?->community?->team) && $user->isAbleTo('update-team-applicationAssessment', $poolCandidate->pool->community->team);
+        $communityPermission = ! is_null($poolCandidate->pool?->community?->team) && $user->isAbleTo('update-team-applicationAssessment', $poolCandidate->pool->community->team);
 
         return $teamPermission || $legacyTeamPermission || $communityPermission;
     }
@@ -276,7 +276,7 @@ public function viewDecision(User $user, PoolCandidate $poolCandidate)
         $poolCandidate->loadMissing(['pool.team', 'pool.legacyTeam', 'pool.community.team']);
         $teamPermission = ! is_null($poolCandidate->pool->team) && $user->isAbleTo('view-team-applicationDecision', $poolCandidate->pool->team);
         $legacyTeamPermission = ! is_null($poolCandidate->pool->legacyTeam) && $user->isAbleTo('view-team-applicationDecision', $poolCandidate->pool->legacyTeam);
-        $communityPermission = ! is_null($poolCandidate?->pool?->community?->team) && $user->isAbleTo('view-team-applicationDecision', $poolCandidate->pool->community->team);
+        $communityPermission = ! is_null($poolCandidate->pool?->community?->team) && $user->isAbleTo('view-team-applicationDecision', $poolCandidate->pool->community->team);
 
         return $teamPermission || $legacyTeamPermission || $communityPermission;
     }
@@ -289,7 +289,7 @@ public function updateDecision(User $user, PoolCandidate $poolCandidate)
         $poolCandidate->loadMissing(['pool.team', 'pool.legacyTeam', 'pool.community.team']);
         $teamPermission = ! is_null($poolCandidate->pool->team) && $user->isAbleTo('update-team-applicationDecision', $poolCandidate->pool->team);
         $legacyTeamPermission = ! is_null($poolCandidate->pool->legacyTeam) && $user->isAbleTo('update-team-applicationDecision', $poolCandidate->pool->legacyTeam);
-        $communityPermission = ! is_null($poolCandidate?->pool?->community?->team) && $user->isAbleTo('update-team-applicationDecision', $poolCandidate->pool->community->team);
+        $communityPermission = ! is_null($poolCandidate->pool?->community?->team) && $user->isAbleTo('update-team-applicationDecision', $poolCandidate->pool->community->team);
 
         return $teamPermission || $legacyTeamPermission || $communityPermission;
     }
@@ -302,7 +302,7 @@ public function viewPlacement(User $user, PoolCandidate $poolCandidate)
         $poolCandidate->loadMissing(['pool.team', 'pool.legacyTeam', 'pool.community.team']);
         $teamPermission = ! is_null($poolCandidate->pool->team) && $user->isAbleTo('view-team-applicationPlacement', $poolCandidate->pool->team);
         $legacyTeamPermission = ! is_null($poolCandidate->pool->legacyTeam) && $user->isAbleTo('view-team-applicationPlacement', $poolCandidate->pool->legacyTeam);
-        $communityPermission = ! is_null($poolCandidate?->pool?->community?->team) && $user->isAbleTo('view-team-applicationPlacement', $poolCandidate->pool->community->team);
+        $communityPermission = ! is_null($poolCandidate->pool?->community?->team) && $user->isAbleTo('view-team-applicationPlacement', $poolCandidate->pool->community->team);
 
         return $teamPermission || $legacyTeamPermission || $communityPermission;
     }
@@ -315,7 +315,7 @@ public function updatePlacement(User $user, PoolCandidate $poolCandidate)
         $poolCandidate->loadMissing(['pool.team', 'pool.legacyTeam', 'pool.community.team']);
         $teamPermission = ! is_null($poolCandidate->pool->team) && $user->isAbleTo('update-team-applicationPlacement', $poolCandidate->pool->team);
         $legacyTeamPermission = ! is_null($poolCandidate->pool->legacyTeam) && $user->isAbleTo('update-team-applicationPlacement', $poolCandidate->pool->legacyTeam);
-        $communityPermission = ! is_null($poolCandidate?->pool?->community?->team) && $user->isAbleTo('update-team-applicationPlacement', $poolCandidate->pool->community->team);
+        $communityPermission = ! is_null($poolCandidate->pool?->community?->team) && $user->isAbleTo('update-team-applicationPlacement', $poolCandidate->pool->community->team);
 
         return $teamPermission || $legacyTeamPermission || $communityPermission;
     }

diff --git a/api/app/Rules/SkillLevelRequiredIfEssential.php b/api/app/Rules/SkillLevelRequiredIfEssential.php
@@ -54,8 +54,8 @@ public function validate(string $attribute, mixed $incomingLevel, Closure $fail)
         if (! is_null($templateId)) {
             $template = JobPosterTemplate::findOrFail($templateId);
             $model = $template->skills()->firstWhere('skill_id', $skillId);
-            $currentType = $model?->pivot->type;
-            $currentLevel = $model?->pivot->required_skill_level;
+            $currentType = $model->pivot->type;
+            $currentLevel = $model->pivot->required_skill_level;
         }
         $newType = isset($incomingType) ? $incomingType : $currentType;
         $newLevel = isset($incomingLevel) ? $incomingLevel : $currentLevel;

diff --git a/api/composer.json b/api/composer.json
@@ -10,8 +10,8 @@
   "license": "AGPL-3.0",
   "require": {
     "php": "^8.2",
-    "devnoiseconsulting/laravel-scout-postgres-tsvector": "^9.1",
     "doctrine/dbal": "^3.1",
+    "gctc-ntgc/laravel-scout-postgres-tsvector": "^1.0",
     "guzzlehttp/guzzle": "^7.4",
     "laravel/framework": "^10.0",
     "laravel/scout": "^10.5",
@@ -21,7 +21,7 @@
     "mll-lab/graphql-php-scalars": "^6.2",
     "mll-lab/laravel-graphiql": "^3.0",
     "nuwave/lighthouse": "^6.15",
-    "phpoffice/phpspreadsheet": "^2.0",
+    "phpoffice/phpspreadsheet": "^3.3",
     "phpoffice/phpword": "^1.2",
     "santigarcor/laratrust": "^8.3.0",
     "spatie/laravel-activitylog": "^4.7",