Skip to content

Commit 3212a89

Browse files
cz-lucascz-lucas
authored
Merge pull request #123 from imbus/and-more-codestyle-improvements
And more codestyle improvements
2 parents ee9a325 + 01171a2 commit 3212a89

File tree

22 files changed

+135
-114
lines changed

22 files changed

+135
-114
lines changed

‎app/Http/Controllers/Api/AssetsController.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -588,8 +588,14 @@ public function show(Request $request, $id): JsonResponse|array
588588
{
589589
if (
590590
$asset = Asset::with('assetstatus')
591-
->with('assignedTo')->withTrashed()
592-
->withCount('checkins as checkins_count', 'checkouts as checkouts_count', 'userRequests as user_requests_count')->find($id)
591+
->with('assignedTo')
592+
->withTrashed()
593+
->withCount(
594+
'checkins as checkins_count',
595+
'checkouts as checkouts_count',
596+
'userRequests as user_requests_count'
597+
)
598+
->find($id)
593599
) {
594600
$this->authorize('view', $asset);
595601

‎app/Http/Controllers/Api/PredefinedFilterController.php‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function show(int $id)
6767
return response()->json(['message' => trans('admin/predefinedFilters/message.does_not_exist')], 404);
6868
}
6969

70-
if ($filter->userHasPermission(Auth::user(), 'view')){
70+
if ($filter->userHasPermission(Auth::user(), 'view')) {
7171
return response()->json($filter->toArray());
7272
}
7373

@@ -124,16 +124,9 @@ public function update(Request $request, int $id): JsonResponse
124124

125125
$validated = $validator->validated();
126126

127-
$newIsPublic = $validated['is_public'] ?? $filter->is_public;
128-
$currentIsPublic = $filter->is_public;
129-
130-
if (!$filter->userHasPermission($user, 'edit')){
131-
return response()->json(['message' => trans('admin/predefinedFilters/message.not_allowed_to_edit')], 403);
132-
}
133-
134-
//create permission
135-
if ((!$currentIsPublic && $newIsPublic) && !$filter->userHasPermission($user, 'create')){
136-
return response()->json(['message' => trans('admin/predefinedFilters/message.update.not_allowed_to_change_isPublic')], 403);
127+
$updatedPermission = $this->updatePermissions($validated, $filter, $user);
128+
if($updatedPermission !== null) {
129+
return $updatedPermission;
137130
}
138131

139132
$updated = $this->service->updateFilter($filter, $validated);
@@ -143,6 +136,7 @@ public function update(Request $request, int $id): JsonResponse
143136
'filter_data' => $updated,
144137
]);
145138
}
139+
146140
public function destroy(int $id)
147141
{
148142
$user = auth()->user();
@@ -165,4 +159,21 @@ public function selectlist(Request $request)
165159
$filters = $this->service->selectList($request, true);
166160
return (new SelectlistTransformer)->transformSelectlist($filters);
167161
}
162+
163+
private function updatePermissions($validated, $filter, $user) {
164+
$newIsPublic = $validated['is_public'] ?? $filter->is_public;
165+
$currentIsPublic = $filter->is_public;
166+
167+
if (!$filter->userHasPermission($user, 'edit')) {
168+
return response()->json(['message' => trans('admin/predefinedFilters/message.not_allowed_to_edit')], 403);
169+
}
170+
171+
//create permission
172+
if ((!$currentIsPublic && $newIsPublic)
173+
&& !$filter->userHasPermission($user, 'create')) {
174+
return response()->json(['message' => trans('admin/predefinedFilters/message.update.not_allowed_to_change_isPublic')], 403);
175+
}
176+
177+
return null;
178+
}
168179
}

‎app/Http/Controllers/Api/PredefinedFilterPermissionController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
class PredefinedFilterPermissionController extends Controller
1313
{
14+
1415
protected PredefinedFilterPermissionService $service;
1516

1617
public function __construct(PredefinedFilterPermissionService $service)

‎app/Http/Controllers/Assets/AssetsController.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@
4747
class AssetsController extends Controller
4848
{
4949
protected $qrCodeDimensions = ['height' => 3.5, 'width' => 3.5];
50+
5051
protected $barCodeDimensions = ['height' => 2, 'width' => 22];
52+
5153
protected PredefinedFilterService $predefinedFilterService;
5254

5355
public function __construct(PredefinedFilterService $predefinedFilterService)

‎app/Http/Controllers/PredefinedFilterController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function view(PredefinedFilter $filter) : View|RedirectResponse
5555
/**
5656
* Delete the given Predefined Filter.
5757
*
58-
* @param int $Id
58+
* @param int $id
5959
*/
6060
public function destroy($id) : RedirectResponse
6161
{

‎app/Http/Transformers/PredefinedFiltersTransformer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function transformPredefinedFilter($filter)
2525
'id' => (int) $filter->id,
2626
'name'=> e($filter->name),
2727
'filter_data' => json_decode($filter->filter_data),
28-
'is_public' => (bool)$filter->is_public,
28+
'is_public' => (bool) $filter->is_public,
2929
'object_type' => e($filter->object_type),
3030
'created_by' => $filter->createdBy ? [
3131
'id' => (int) $filter->createdBy->id,

‎app/Livewire/Notifications.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Notifications extends Component
5858
*
5959
* @var array<int, array<string,mixed>>
6060
*/
61-
public array $liveAlerts = [];
61+
public array $liveAlerts=[];
6262

6363
/**
6464
* Main notification listener.
@@ -67,14 +67,14 @@ class Notifications extends Component
6767
#[On('showNotification')]
6868
#[On('notify')]
6969
public function notify(
70-
$type = null,
71-
$message = null,
72-
$title = null,
73-
$description = null,
74-
$icon = null,
75-
$html = null,
76-
$tag = null,
77-
$payload = null // wrapper form: { payload: { ... } }
70+
$type=null,
71+
$message=null,
72+
$title=null,
73+
$description=null,
74+
$icon=null,
75+
$html=null,
76+
$tag=null,
77+
$payload=null // wrapper form: { payload: { ... } }
7878
): void {
7979
// Wrapper form: { payload: { ...full data... } }
8080
if (is_array($payload)) {

‎app/Livewire/Partials/AdvancedSearch/Modal.php‎

Lines changed: 50 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@ enum AdvancedsearchModalAction: string
2525

2626
class Modal extends Component
2727
{
28-
public $showModal = false;
28+
public $showModal=false;
2929
public AdvancedsearchModalAction $modalActionType;
3030

3131
#[Validate("required")]
3232
public FilterVisibility $visibility = FilterVisibility::Private;
3333

3434
#[Validate("required")]
35-
public ?string $name = "";
35+
public ?string $name="";
3636

3737
#[Validate("sometimes")]
38-
public $groupSelect = [];
38+
public $groupSelect=[];
3939

4040
#[Validate("sometimes")]
41-
public array $groupSelectOtherOptions = [];
41+
public array $groupSelectOtherOptions=[];
4242

43-
protected $listeners = ["groupSelect"];
43+
protected $listeners=["groupSelect"];
4444

4545
public ?int $filterId;
4646

@@ -75,42 +75,45 @@ public function openPredefinedFiltersModal(
7575
}
7676

7777
if (
78-
$this->modalActionType === AdvancedsearchModalAction::Edit &&
79-
$predefinedFilterId !== null
78+
$this->modalActionType === AdvancedsearchModalAction::Edit
79+
&& $predefinedFilterId !== null
8080
) {
81-
$predefinedFilter = $predefinedFilterService->getFilterWithOptionalPermissionsById(
82-
$predefinedFilterId
83-
);
81+
$this->openPredefinedFiltersEditModal($predefinedFilterId);
82+
}
83+
84+
$this->dispatch("openPredefinedFiltersModalEvent");
85+
}
86+
87+
private function openPredefinedFiltersEditModal($predefinedFilterId) {
88+
$predefinedFilter = $predefinedFilterService->getFilterWithOptionalPermissionsById(
89+
$predefinedFilterId
90+
);
8491

85-
if ($predefinedFilter === null) {
86-
$this->showModal = false;
87-
$this->dispatchNotFoundNotification();
88-
return;
89-
}
92+
if ($predefinedFilter === null) {
93+
$this->showModal = false;
94+
$this->dispatchNotFoundNotification();
95+
return;
96+
}
9097

91-
$this->name = $predefinedFilter["name"];
92-
93-
if ($predefinedFilter["is_public"] == 1) {
94-
$this->visibility = FilterVisibility::Public;
95-
} else {
96-
$this->visibility = FilterVisibility::Private;
97-
}
98+
$this->name = $predefinedFilter["name"];
9899

99-
foreach ($predefinedFilter["permissions"] as $permission) {
100-
array_push(
101-
$this->groupSelect,
102-
$permission->permission_group_id
103-
);
104-
}
100+
if ($predefinedFilter["is_public"] == 1) {
101+
$this->visibility = FilterVisibility::Public;
102+
} else {
103+
$this->visibility = FilterVisibility::Private;
104+
}
105105

106-
$this->groupSelectOtherOptions = array_diff(
107-
$this->groupSelectOtherOptions,
108-
$this->groupSelect
106+
foreach ($predefinedFilter["permissions"] as $permission) {
107+
array_push(
108+
$this->groupSelect,
109+
$permission->permission_group_id
109110
);
110111
}
111-
// end if
112112

113-
$this->dispatch("openPredefinedFiltersModalEvent");
113+
$this->groupSelectOtherOptions = array_diff(
114+
$this->groupSelectOtherOptions,
115+
$this->groupSelect
116+
);
114117
}
115118

116119
#[On("closePredefinedFiltersModal")]
@@ -131,13 +134,7 @@ public function savePredefinedFiltersModal(
131134
) {
132135
$this->validate();
133136

134-
if ($this->validateMaxLenghtForFiltername()) {
135-
$this->dispatch('showNotificationInFrontend', [
136-
'type' => 'error',
137-
'title' => trans('general.notification_error'),
138-
'message' => trans('admin/predefinedFilters/message.name_too_long'),
139-
'tag' => 'predefinedFilter',
140-
]);
137+
if(!$this->validateMaxLenghtForFiltername()) {
141138
return;
142139
}
143140

@@ -210,13 +207,7 @@ public function updatePredefinedFiltersModal(
210207
'groupSelect.*' => 'required|integer|exists:permission_groups,id',
211208
]);
212209

213-
if($this->validateMaxLenghtForFiltername()) {
214-
$this->dispatch('showNotificationInFrontend', [
215-
'type' => 'error',
216-
'title' => trans('general.notification_error'),
217-
'message' => trans('admin/predefinedFilters/message.name_too_long'),
218-
'tag' => 'predefinedFilter',
219-
]);
210+
if(!$this->validateMaxLenghtForFiltername()) {
220211
return;
221212
}
222213

@@ -316,7 +307,7 @@ public function deletePredefinedFiltersModal(
316307

317308
$predefinedFilter = $predefinedFilterService->getFilterWithOptionalPermissionsById($this->filterId);
318309

319-
if ($predefinedFilter === null){
310+
if ($predefinedFilter === null) {
320311
$this->dispatchNotFoundNotification();
321312
return;
322313
}
@@ -414,6 +405,16 @@ private function dispatchNotFoundNotification()
414405
}
415406

416407
private function validateMaxLenghtForFiltername(): bool {
417-
return mb_strlen($this->name) > 190;
408+
if (mb_strlen($this->name) > 190) {
409+
$this->dispatch('showNotificationInFrontend', [
410+
'type' => 'error',
411+
'title' => trans('general.notification_error'),
412+
'message' => trans('admin/predefinedFilters/message.name_too_long'),
413+
'tag' => 'predefinedFilter',
414+
]);
415+
return false;
416+
}
417+
return true;
418418
}
419+
419420
}

‎app/Models/Asset.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
*/
3939
class Asset extends Depreciable
4040
{
41+
4142
protected ?FilterService $filterService = null;
4243

4344
public function filterService(): FilterService
@@ -451,17 +452,16 @@ public function company()
451452
*/
452453
public function availableForCheckout()
453454
{
454-
455455
// This asset is not currently assigned to anyone and is not deleted...
456456
if ((!$this->assigned_to) && (!$this->deleted_at)) {
457-
457+
458458
// The asset status is not archived and is deployable
459459
if (
460-
($this->assetstatus) && ($this->assetstatus->archived == '0')
461-
&& ($this->assetstatus->deployable == '1')
460+
($this->assetstatus) &&
461+
($this->assetstatus->archived == '0') &&
462+
($this->assetstatus->deployable == '1')
462463
) {
463464
return true;
464-
465465
}
466466
}
467467
return false;

‎app/Policies/PredefinedFilterPolicy.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ protected function columnName()
1313
}
1414

1515

16-
public function view(User $user, $filter = null)
16+
public function view(User $user, $filter=null)
1717
{
1818
// Global permission
1919
if (parent::view($user, $filter)) {
@@ -33,7 +33,7 @@ public function view(User $user, $filter = null)
3333
return false;
3434
}
3535

36-
public function update(User $user, $filter = null)
36+
public function update(User $user, $filter=null)
3737
{
3838
if (parent::update($user, $filter)) {
3939
return true;
@@ -46,7 +46,7 @@ public function update(User $user, $filter = null)
4646
return false;
4747
}
4848

49-
public function delete(User $user, $filter = null)
49+
public function delete(User $user, $filter=null)
5050
{
5151
if (parent::delete($user, $filter)) {
5252
return true;

0 commit comments

Comments
 (0)