Merge branch 'release/v7.3.1'

Author: Omranic

CHANGELOG.md

@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](CONTRIBUTING.md).
 
 
+## [v7.3.1] - 2023-08-30
+- Support new accessarea file-based structure
+
 ## [v7.3.0] - 2023-08-28
 - Support multiple themes
 - Remove `/vendor` from namespaced view paths to simplify the path
@@ -320,6 +323,7 @@ This project adheres to [Semantic Versioning](CONTRIBUTING.md).
 ## v0.0.1 - 2016-12-20
 - Tag first release
 
+[v7.3.1]: https://github.com/rinvex/laravel-support/compare/v7.3.0...v7.3.1
 [v7.3.0]: https://github.com/rinvex/laravel-support/compare/v7.2.6...v7.3.0
 [v7.2.6]: https://github.com/rinvex/laravel-support/compare/v7.2.5...v7.2.6
 [v7.2.5]: https://github.com/rinvex/laravel-support/compare/v7.2.4...v7.2.5

src/Traits/HashidsTrait.php

@@ -58,7 +58,7 @@ public function unhashId($value)
      */
     protected function shouldBeHashed(): bool
     {
-        $accessareas = (array) $this->obscure + app('accessareas')->where('is_obscured', true)->pluck('slug')->toArray();
+        $accessareas = app('accessareas')->active()->obscured()->keys()->when($this->obscure, fn($collection) => $collection->merge(collect($this->obscure)->intersect(app('accessareas')->active()->keys()))->unique())->toArray();
 
         return in_array(request()->accessarea(), $accessareas) && in_array($this->getRouteKeyName(), config('cortex.foundation.obscure.hashed_keys'));
     }