mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-10-17 18:23:19 +01:00
Compare commits
19 Commits
feature/co
...
ded56c0798
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ded56c0798 | ||
|
|
349623d537 | ||
|
|
a9d016d773 | ||
|
|
2ebbbceefb | ||
|
|
e85058aefd | ||
|
|
a86c18ad2d | ||
|
|
f683c03ff9 | ||
|
|
fa0bbc8cfd | ||
|
|
fff3502e53 | ||
|
|
e801c4311c | ||
|
|
2dadf1ef02 | ||
|
|
12cc3f27f8 | ||
|
|
06a2048771 | ||
|
|
a12ee1b029 | ||
|
|
54dc0dbabc | ||
|
|
08f9edbc96 | ||
|
|
0551c633a3 | ||
|
|
37579b1e5c | ||
|
|
b33cf00788 |
19
.github/workflows/build-onpremise.yml
vendored
19
.github/workflows/build-onpremise.yml
vendored
@@ -103,6 +103,8 @@ jobs:
|
|||||||
{
|
{
|
||||||
echo "invoicing_repository=$(jq -r '.Invoicing.repository' extensions/manifest.json)"
|
echo "invoicing_repository=$(jq -r '.Invoicing.repository' extensions/manifest.json)"
|
||||||
echo "invoicing_ref=$(jq -r '.Invoicing.ref' extensions/manifest.json)"
|
echo "invoicing_ref=$(jq -r '.Invoicing.ref' extensions/manifest.json)"
|
||||||
|
echo "auditing_repository=$(jq -r '.Auditing.repository' extensions/manifest.json)"
|
||||||
|
echo "auditing_ref=$(jq -r '.Auditing.ref' extensions/manifest.json)"
|
||||||
} >> "$GITHUB_OUTPUT"
|
} >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: "Checkout invoicing extension"
|
- name: "Checkout invoicing extension"
|
||||||
@@ -119,9 +121,26 @@ jobs:
|
|||||||
- name: "Install npm dependencies in invoicing extension"
|
- name: "Install npm dependencies in invoicing extension"
|
||||||
run: cd extensions/Invoicing && npm ci
|
run: cd extensions/Invoicing && npm ci
|
||||||
|
|
||||||
|
- name: "Checkout auditing extension"
|
||||||
|
uses: actions/checkout@v7
|
||||||
|
with:
|
||||||
|
repository: ${{ steps.extension-manifest.outputs.auditing_repository }}
|
||||||
|
ref: ${{ steps.extension-manifest.outputs.auditing_ref }}
|
||||||
|
path: extensions/Auditing
|
||||||
|
ssh-key: ${{ secrets.SSH_PRIVATE_KEY_AUDITING_EXTENSION }}
|
||||||
|
|
||||||
|
- name: "Install composer dependencies in auditing extension"
|
||||||
|
run: cd extensions/Auditing && composer install --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
|
||||||
|
|
||||||
|
- name: "Install npm dependencies in auditing extension"
|
||||||
|
run: cd extensions/Auditing && npm ci
|
||||||
|
|
||||||
- name: "Activate invoicing extension"
|
- name: "Activate invoicing extension"
|
||||||
run: php artisan module:enable Invoicing
|
run: php artisan module:enable Invoicing
|
||||||
|
|
||||||
|
- name: "Activate auditing extension"
|
||||||
|
run: php artisan module:enable Auditing
|
||||||
|
|
||||||
- name: "Install npm dependencies"
|
- name: "Install npm dependencies"
|
||||||
run: npm ci
|
run: npm ci
|
||||||
|
|
||||||
|
|||||||
24
.github/workflows/build-private.yml
vendored
24
.github/workflows/build-private.yml
vendored
@@ -84,6 +84,8 @@ jobs:
|
|||||||
echo "services_ref=$(jq -r '.Services.ref' extensions/manifest.json)"
|
echo "services_ref=$(jq -r '.Services.ref' extensions/manifest.json)"
|
||||||
echo "invoicing_repository=$(jq -r '.Invoicing.repository' extensions/manifest.json)"
|
echo "invoicing_repository=$(jq -r '.Invoicing.repository' extensions/manifest.json)"
|
||||||
echo "invoicing_ref=$(jq -r '.Invoicing.ref' extensions/manifest.json)"
|
echo "invoicing_ref=$(jq -r '.Invoicing.ref' extensions/manifest.json)"
|
||||||
|
echo "auditing_repository=$(jq -r '.Auditing.repository' extensions/manifest.json)"
|
||||||
|
echo "auditing_ref=$(jq -r '.Auditing.ref' extensions/manifest.json)"
|
||||||
} >> "$GITHUB_OUTPUT"
|
} >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: "Checkout billing extension"
|
- name: "Checkout billing extension"
|
||||||
@@ -145,6 +147,25 @@ jobs:
|
|||||||
- name: "Install npm dependencies in invoicing extension"
|
- name: "Install npm dependencies in invoicing extension"
|
||||||
run: cd extensions/Invoicing && npm ci
|
run: cd extensions/Invoicing && npm ci
|
||||||
|
|
||||||
|
- name: "Checkout auditing extension"
|
||||||
|
uses: actions/checkout@v7
|
||||||
|
with:
|
||||||
|
repository: ${{ steps.extension-manifest.outputs.auditing_repository }}
|
||||||
|
ref: ${{ steps.extension-manifest.outputs.auditing_ref }}
|
||||||
|
path: extensions/Auditing
|
||||||
|
ssh-key: ${{ secrets.SSH_PRIVATE_KEY_AUDITING_EXTENSION }}
|
||||||
|
|
||||||
|
- name: "Install composer dependencies in auditing extension"
|
||||||
|
uses: php-actions/composer@v6
|
||||||
|
with:
|
||||||
|
working_dir: "extensions/Auditing"
|
||||||
|
command: install
|
||||||
|
only_args: --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
|
||||||
|
php_version: 8.3
|
||||||
|
|
||||||
|
- name: "Install npm dependencies in auditing extension"
|
||||||
|
run: cd extensions/Auditing && npm ci
|
||||||
|
|
||||||
- name: "Setup PHP with PECL extension"
|
- name: "Setup PHP with PECL extension"
|
||||||
uses: shivammathur/setup-php@v2
|
uses: shivammathur/setup-php@v2
|
||||||
with:
|
with:
|
||||||
@@ -168,6 +189,9 @@ jobs:
|
|||||||
- name: "Activate invoicing extension"
|
- name: "Activate invoicing extension"
|
||||||
run: php artisan module:enable Invoicing
|
run: php artisan module:enable Invoicing
|
||||||
|
|
||||||
|
- name: "Activate auditing extension"
|
||||||
|
run: php artisan module:enable Auditing
|
||||||
|
|
||||||
- name: "Install npm dependencies"
|
- name: "Install npm dependencies"
|
||||||
run: npm ci
|
run: npm ci
|
||||||
|
|
||||||
|
|||||||
2
.github/workflows/npm-format-check.yml
vendored
2
.github/workflows/npm-format-check.yml
vendored
@@ -1,6 +1,8 @@
|
|||||||
name: NPM Format Check
|
name: NPM Format Check
|
||||||
|
|
||||||
on: [push]
|
on: [push]
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
format-check:
|
format-check:
|
||||||
|
|||||||
@@ -1,99 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace App\Filament\Resources;
|
|
||||||
|
|
||||||
use App\Filament\Resources\AuditResource\Pages\CreateAudit;
|
|
||||||
use App\Filament\Resources\AuditResource\Pages\ListAudits;
|
|
||||||
use App\Filament\Resources\AuditResource\Pages\ViewAudit;
|
|
||||||
use App\Models\Audit;
|
|
||||||
use Filament\Actions\ViewAction;
|
|
||||||
use Filament\Forms\Components\Textarea;
|
|
||||||
use Filament\Forms\Components\TextInput;
|
|
||||||
use Filament\Resources\Resource;
|
|
||||||
use Filament\Schemas\Schema;
|
|
||||||
use Filament\Tables\Columns\IconColumn;
|
|
||||||
use Filament\Tables\Columns\TextColumn;
|
|
||||||
use Filament\Tables\Table;
|
|
||||||
use Illuminate\Support\Str;
|
|
||||||
use Novadaemon\FilamentPrettyJson\Form\PrettyJsonField;
|
|
||||||
|
|
||||||
class AuditResource extends Resource
|
|
||||||
{
|
|
||||||
protected static ?string $model = Audit::class;
|
|
||||||
|
|
||||||
protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-archive-box';
|
|
||||||
|
|
||||||
protected static string|\UnitEnum|null $navigationGroup = 'System';
|
|
||||||
|
|
||||||
public static function form(Schema $schema): Schema
|
|
||||||
{
|
|
||||||
return $schema
|
|
||||||
->components([
|
|
||||||
TextInput::make('user_type')
|
|
||||||
->maxLength(255),
|
|
||||||
TextInput::make('user_id'),
|
|
||||||
TextInput::make('event')
|
|
||||||
->required()
|
|
||||||
->maxLength(255),
|
|
||||||
TextInput::make('auditable_type')
|
|
||||||
->required()
|
|
||||||
->maxLength(255),
|
|
||||||
TextInput::make('auditable_id')
|
|
||||||
->required(),
|
|
||||||
PrettyJsonField::make('old_values'),
|
|
||||||
PrettyJsonField::make('new_values'),
|
|
||||||
Textarea::make('url'),
|
|
||||||
TextInput::make('ip_address'),
|
|
||||||
TextInput::make('user_agent')
|
|
||||||
->maxLength(1023),
|
|
||||||
TextInput::make('tags')
|
|
||||||
->maxLength(255),
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function table(Table $table): Table
|
|
||||||
{
|
|
||||||
return $table
|
|
||||||
->columns([
|
|
||||||
TextColumn::make('user.name'),
|
|
||||||
TextColumn::make('event'),
|
|
||||||
TextColumn::make('auditable_type'),
|
|
||||||
TextColumn::make('auditable_id'),
|
|
||||||
IconColumn::make('was_command')
|
|
||||||
->getStateUsing(fn (Audit $record) => Str::startsWith($record->url, 'artisan '))
|
|
||||||
->boolean(),
|
|
||||||
TextColumn::make('created_at')
|
|
||||||
->sortable()
|
|
||||||
->dateTime(),
|
|
||||||
TextColumn::make('updated_at')
|
|
||||||
->sortable()
|
|
||||||
->dateTime(),
|
|
||||||
])
|
|
||||||
->filters([
|
|
||||||
//
|
|
||||||
])
|
|
||||||
->recordActions([
|
|
||||||
ViewAction::make(),
|
|
||||||
])
|
|
||||||
->toolbarActions([
|
|
||||||
])
|
|
||||||
->defaultSort('created_at', 'desc');
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function getRelations(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function getPages(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
'index' => ListAudits::route('/'),
|
|
||||||
'create' => CreateAudit::route('/create'),
|
|
||||||
'view' => ViewAudit::route('/{record}'),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace App\Filament\Resources\AuditResource\Pages;
|
|
||||||
|
|
||||||
use App\Filament\Resources\AuditResource;
|
|
||||||
use Filament\Resources\Pages\CreateRecord;
|
|
||||||
|
|
||||||
class CreateAudit extends CreateRecord
|
|
||||||
{
|
|
||||||
protected static string $resource = AuditResource::class;
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace App\Filament\Resources\AuditResource\Pages;
|
|
||||||
|
|
||||||
use App\Filament\Resources\AuditResource;
|
|
||||||
use Filament\Resources\Pages\ListRecords;
|
|
||||||
|
|
||||||
class ListAudits extends ListRecords
|
|
||||||
{
|
|
||||||
protected static string $resource = AuditResource::class;
|
|
||||||
|
|
||||||
protected function getHeaderActions(): array
|
|
||||||
{
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace App\Filament\Resources\AuditResource\Pages;
|
|
||||||
|
|
||||||
use App\Filament\Resources\AuditResource;
|
|
||||||
use Filament\Resources\Pages\ViewRecord;
|
|
||||||
|
|
||||||
class ViewAudit extends ViewRecord
|
|
||||||
{
|
|
||||||
protected static string $resource = AuditResource::class;
|
|
||||||
}
|
|
||||||
@@ -11,6 +11,7 @@ use App\Models\Client;
|
|||||||
use App\Models\Member;
|
use App\Models\Member;
|
||||||
use App\Models\Organization;
|
use App\Models\Organization;
|
||||||
use App\Models\OrganizationInvitation;
|
use App\Models\OrganizationInvitation;
|
||||||
|
use App\Models\Passport\RefreshToken;
|
||||||
use App\Models\Project;
|
use App\Models\Project;
|
||||||
use App\Models\ProjectMember;
|
use App\Models\ProjectMember;
|
||||||
use App\Models\Report;
|
use App\Models\Report;
|
||||||
@@ -169,6 +170,10 @@ class DeletionService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Refresh tokens are not linked to the user directly, so they need to be deleted via their access tokens.
|
||||||
|
// Otherwise a still-valid refresh token could be used to issue a new access token for a deleted user,
|
||||||
|
// which fails with a foreign key violation on oauth_access_tokens.user_id.
|
||||||
|
RefreshToken::query()->whereIn('access_token_id', $user->accessTokens()->pluck('id'))->delete();
|
||||||
$user->accessTokens()->delete();
|
$user->accessTokens()->delete();
|
||||||
$user->authCodes()->delete();
|
$user->authCodes()->delete();
|
||||||
|
|
||||||
|
|||||||
@@ -117,13 +117,13 @@ class ReportPropertiesDto implements Castable
|
|||||||
$dto->end = $data->end !== null ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $data->end) : null;
|
$dto->end = $data->end !== null ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $data->end) : null;
|
||||||
$dto->start = $data->start !== null ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $data->start) : null;
|
$dto->start = $data->start !== null ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $data->start) : null;
|
||||||
$dto->active = $data->active;
|
$dto->active = $data->active;
|
||||||
$dto->memberIds = $data->memberIds !== null ? ReportPropertiesDto::idArrayToCollection($data->memberIds) : null;
|
$dto->setMemberIds($data->memberIds !== null ? (array) $data->memberIds : null);
|
||||||
$dto->billable = $data->billable;
|
$dto->billable = $data->billable;
|
||||||
$dto->clientIds = $data->clientIds !== null ? ReportPropertiesDto::idArrayToCollection($data->clientIds) : null;
|
$dto->setClientIds($data->clientIds !== null ? (array) $data->clientIds : null);
|
||||||
$dto->projectIds = $data->projectIds !== null ? ReportPropertiesDto::idArrayToCollection($data->projectIds) : null;
|
$dto->setProjectIds($data->projectIds !== null ? (array) $data->projectIds : null);
|
||||||
$dto->tagIds = $data->tagIds !== null ? ReportPropertiesDto::idArrayToCollection($data->tagIds) : null;
|
$dto->setTagIds($data->tagIds !== null ? (array) $data->tagIds : null);
|
||||||
$dto->tagMatchType = isset($data->tagMatchType) ? TagMatchType::from($data->tagMatchType) : null;
|
$dto->tagMatchType = isset($data->tagMatchType) ? TagMatchType::from($data->tagMatchType) : null;
|
||||||
$dto->taskIds = $data->taskIds ? ReportPropertiesDto::idArrayToCollection($data->taskIds) : null;
|
$dto->setTaskIds($data->taskIds !== null ? (array) $data->taskIds : null);
|
||||||
$dto->group = TimeEntryAggregationType::from($data->group);
|
$dto->group = TimeEntryAggregationType::from($data->group);
|
||||||
$dto->subGroup = TimeEntryAggregationType::from($data->subGroup);
|
$dto->subGroup = TimeEntryAggregationType::from($data->subGroup);
|
||||||
$dto->historyGroup = TimeEntryAggregationTypeInterval::from($data->historyGroup);
|
$dto->historyGroup = TimeEntryAggregationTypeInterval::from($data->historyGroup);
|
||||||
@@ -205,7 +205,7 @@ class ReportPropertiesDto implements Castable
|
|||||||
*/
|
*/
|
||||||
public function setMemberIds(?array $memberIds): void
|
public function setMemberIds(?array $memberIds): void
|
||||||
{
|
{
|
||||||
$this->memberIds = $memberIds !== null ? ReportPropertiesDto::idArrayToCollection($memberIds) : null;
|
$this->memberIds = $memberIds !== null && count($memberIds) > 0 ? ReportPropertiesDto::idArrayToCollection($memberIds) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -213,7 +213,7 @@ class ReportPropertiesDto implements Castable
|
|||||||
*/
|
*/
|
||||||
public function setClientIds(?array $clientIds): void
|
public function setClientIds(?array $clientIds): void
|
||||||
{
|
{
|
||||||
$this->clientIds = $clientIds !== null ? ReportPropertiesDto::idArrayToCollection($clientIds) : null;
|
$this->clientIds = $clientIds !== null && count($clientIds) > 0 ? ReportPropertiesDto::idArrayToCollection($clientIds) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -221,7 +221,7 @@ class ReportPropertiesDto implements Castable
|
|||||||
*/
|
*/
|
||||||
public function setProjectIds(?array $projectIds): void
|
public function setProjectIds(?array $projectIds): void
|
||||||
{
|
{
|
||||||
$this->projectIds = $projectIds !== null ? ReportPropertiesDto::idArrayToCollection($projectIds) : null;
|
$this->projectIds = $projectIds !== null && count($projectIds) > 0 ? ReportPropertiesDto::idArrayToCollection($projectIds) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -229,7 +229,7 @@ class ReportPropertiesDto implements Castable
|
|||||||
*/
|
*/
|
||||||
public function setTagIds(?array $tagIds): void
|
public function setTagIds(?array $tagIds): void
|
||||||
{
|
{
|
||||||
$this->tagIds = $tagIds !== null ? ReportPropertiesDto::idArrayToCollection($tagIds) : null;
|
$this->tagIds = $tagIds !== null && count($tagIds) > 0 ? ReportPropertiesDto::idArrayToCollection($tagIds) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setTagMatchType(?TagMatchType $tagMatchType): void
|
public function setTagMatchType(?TagMatchType $tagMatchType): void
|
||||||
@@ -242,6 +242,6 @@ class ReportPropertiesDto implements Castable
|
|||||||
*/
|
*/
|
||||||
public function setTaskIds(?array $taskIds): void
|
public function setTaskIds(?array $taskIds): void
|
||||||
{
|
{
|
||||||
$this->taskIds = $taskIds !== null ? ReportPropertiesDto::idArrayToCollection($taskIds) : null;
|
$this->taskIds = $taskIds !== null && count($taskIds) > 0 ? ReportPropertiesDto::idArrayToCollection($taskIds) : null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -229,7 +229,6 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
|
|||||||
'Project',
|
'Project',
|
||||||
'Description',
|
'Description',
|
||||||
'User',
|
'User',
|
||||||
'Group',
|
|
||||||
'Email',
|
'Email',
|
||||||
'Tags',
|
'Tags',
|
||||||
'Start Date',
|
'Start Date',
|
||||||
|
|||||||
@@ -111,7 +111,8 @@ class TimeEntryFilter
|
|||||||
*/
|
*/
|
||||||
public function addMemberIdsFilter(?array $memberIds): self
|
public function addMemberIdsFilter(?array $memberIds): self
|
||||||
{
|
{
|
||||||
if ($memberIds === null) {
|
// An empty selection is no constraint, the same as null
|
||||||
|
if ($memberIds === null || count($memberIds) === 0) {
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
$this->builder->whereIn('member_id', $memberIds);
|
$this->builder->whereIn('member_id', $memberIds);
|
||||||
@@ -181,6 +182,10 @@ class TimeEntryFilter
|
|||||||
}
|
}
|
||||||
$includeNone = in_array(self::NONE_VALUE, $clientIds, true);
|
$includeNone = in_array(self::NONE_VALUE, $clientIds, true);
|
||||||
$clientIds = array_values(array_filter($clientIds, fn (string $id): bool => $id !== self::NONE_VALUE));
|
$clientIds = array_values(array_filter($clientIds, fn (string $id): bool => $id !== self::NONE_VALUE));
|
||||||
|
// An empty selection (no client IDs and not filtering for "none") is no constraint, so apply nothing
|
||||||
|
if (count($clientIds) === 0 && ! $includeNone) {
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
$this->builder->where(function (Builder $builder) use ($clientIds, $includeNone): void {
|
$this->builder->where(function (Builder $builder) use ($clientIds, $includeNone): void {
|
||||||
if (count($clientIds) > 0) {
|
if (count($clientIds) > 0) {
|
||||||
@@ -204,6 +209,10 @@ class TimeEntryFilter
|
|||||||
}
|
}
|
||||||
$includeNone = in_array(self::NONE_VALUE, $projectIds, true);
|
$includeNone = in_array(self::NONE_VALUE, $projectIds, true);
|
||||||
$projectIds = array_values(array_filter($projectIds, fn (string $id): bool => $id !== self::NONE_VALUE));
|
$projectIds = array_values(array_filter($projectIds, fn (string $id): bool => $id !== self::NONE_VALUE));
|
||||||
|
// An empty selection (no project IDs and not filtering for "none") is no constraint, so apply nothing
|
||||||
|
if (count($projectIds) === 0 && ! $includeNone) {
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
$this->builder->where(function (Builder $builder) use ($projectIds, $includeNone): void {
|
$this->builder->where(function (Builder $builder) use ($projectIds, $includeNone): void {
|
||||||
if (count($projectIds) > 0) {
|
if (count($projectIds) > 0) {
|
||||||
@@ -269,6 +278,10 @@ class TimeEntryFilter
|
|||||||
}
|
}
|
||||||
$includeNone = in_array(self::NONE_VALUE, $taskIds, true);
|
$includeNone = in_array(self::NONE_VALUE, $taskIds, true);
|
||||||
$taskIds = array_values(array_filter($taskIds, fn (string $id): bool => $id !== self::NONE_VALUE));
|
$taskIds = array_values(array_filter($taskIds, fn (string $id): bool => $id !== self::NONE_VALUE));
|
||||||
|
// An empty selection (no task IDs and not filtering for "none") is no constraint, so apply nothing
|
||||||
|
if (count($taskIds) === 0 && ! $includeNone) {
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
$this->builder->where(function (Builder $builder) use ($taskIds, $includeNone): void {
|
$this->builder->where(function (Builder $builder) use ($taskIds, $includeNone): void {
|
||||||
if (count($taskIds) > 0) {
|
if (count($taskIds) > 0) {
|
||||||
|
|||||||
79
composer.lock
generated
79
composer.lock
generated
@@ -429,23 +429,24 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "brick/math",
|
"name": "brick/math",
|
||||||
"version": "0.19.1",
|
"version": "1.0.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/brick/math.git",
|
"url": "https://github.com/brick/math.git",
|
||||||
"reference": "a89bc96a7cf3d7b59e725afe57ccb95eb03cf6ce"
|
"reference": "2effe05d2177c451b86c6a073196a4034c02f211"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/brick/math/zipball/a89bc96a7cf3d7b59e725afe57ccb95eb03cf6ce",
|
"url": "https://api.github.com/repos/brick/math/zipball/2effe05d2177c451b86c6a073196a4034c02f211",
|
||||||
"reference": "a89bc96a7cf3d7b59e725afe57ccb95eb03cf6ce",
|
"reference": "2effe05d2177c451b86c6a073196a4034c02f211",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^8.2"
|
"php": "^8.2"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpstan/phpstan": "2.1.22",
|
"phpstan/phpstan": "2.2.13",
|
||||||
|
"phpstan/phpstan-phpunit": "2.0.18",
|
||||||
"phpunit/phpunit": "^11.5"
|
"phpunit/phpunit": "^11.5"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
@@ -476,7 +477,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/brick/math/issues",
|
"issues": "https://github.com/brick/math/issues",
|
||||||
"source": "https://github.com/brick/math/tree/0.19.1"
|
"source": "https://github.com/brick/math/tree/1.0.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -484,7 +485,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2026-08-08T23:03:16+00:00"
|
"time": "2026-09-12T10:28:18+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "brick/money",
|
"name": "brick/money",
|
||||||
@@ -4218,16 +4219,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/fortify",
|
"name": "laravel/fortify",
|
||||||
"version": "v1.39.0",
|
"version": "v1.40.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/fortify.git",
|
"url": "https://github.com/laravel/fortify.git",
|
||||||
"reference": "b1fc50707bbe007fd92165d8b7d460ab549b355a"
|
"reference": "fe0fce8814660317df0684f2c7be3b573def67d3"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/fortify/zipball/b1fc50707bbe007fd92165d8b7d460ab549b355a",
|
"url": "https://api.github.com/repos/laravel/fortify/zipball/fe0fce8814660317df0684f2c7be3b573def67d3",
|
||||||
"reference": "b1fc50707bbe007fd92165d8b7d460ab549b355a",
|
"reference": "fe0fce8814660317df0684f2c7be3b573def67d3",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -4278,24 +4279,24 @@
|
|||||||
"issues": "https://github.com/laravel/fortify/issues",
|
"issues": "https://github.com/laravel/fortify/issues",
|
||||||
"source": "https://github.com/laravel/fortify"
|
"source": "https://github.com/laravel/fortify"
|
||||||
},
|
},
|
||||||
"time": "2026-08-23T07:46:41+00:00"
|
"time": "2026-09-10T11:52:08+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/framework",
|
"name": "laravel/framework",
|
||||||
"version": "v13.32.0",
|
"version": "v13.33.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/framework.git",
|
"url": "https://github.com/laravel/framework.git",
|
||||||
"reference": "cdd8b33c246719acdd118c705ce8c7ab5ef48a96"
|
"reference": "91188a17ceaa3dbace6e8a5f7abd0d042e466359"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/framework/zipball/cdd8b33c246719acdd118c705ce8c7ab5ef48a96",
|
"url": "https://api.github.com/repos/laravel/framework/zipball/91188a17ceaa3dbace6e8a5f7abd0d042e466359",
|
||||||
"reference": "cdd8b33c246719acdd118c705ce8c7ab5ef48a96",
|
"reference": "91188a17ceaa3dbace6e8a5f7abd0d042e466359",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"brick/math": "^0.14.2 || ^0.15 || ^0.16 || ^0.17 || ^0.18 || ^0.19",
|
"brick/math": "^0.14.2 || ^0.15 || ^0.16 || ^0.17 || ^0.18 || ^0.19 || ^0.20 || ^1.0",
|
||||||
"composer-runtime-api": "^2.2",
|
"composer-runtime-api": "^2.2",
|
||||||
"doctrine/inflector": "^2.0.5",
|
"doctrine/inflector": "^2.0.5",
|
||||||
"dragonmantank/cron-expression": "^3.4",
|
"dragonmantank/cron-expression": "^3.4",
|
||||||
@@ -4509,20 +4510,20 @@
|
|||||||
"issues": "https://github.com/laravel/framework/issues",
|
"issues": "https://github.com/laravel/framework/issues",
|
||||||
"source": "https://github.com/laravel/framework"
|
"source": "https://github.com/laravel/framework"
|
||||||
},
|
},
|
||||||
"time": "2026-09-15T14:55:30+00:00"
|
"time": "2026-09-22T14:12:33+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/octane",
|
"name": "laravel/octane",
|
||||||
"version": "v2.19.1",
|
"version": "v2.20.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/octane.git",
|
"url": "https://github.com/laravel/octane.git",
|
||||||
"reference": "68a2516a0318baba0de0e4648f61e335c5e69dca"
|
"reference": "df4c38dcddc5f51e36e7f1d788841130c4fb8f45"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/octane/zipball/68a2516a0318baba0de0e4648f61e335c5e69dca",
|
"url": "https://api.github.com/repos/laravel/octane/zipball/df4c38dcddc5f51e36e7f1d788841130c4fb8f45",
|
||||||
"reference": "68a2516a0318baba0de0e4648f61e335c5e69dca",
|
"reference": "df4c38dcddc5f51e36e7f1d788841130c4fb8f45",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -4598,7 +4599,7 @@
|
|||||||
"issues": "https://github.com/laravel/octane/issues",
|
"issues": "https://github.com/laravel/octane/issues",
|
||||||
"source": "https://github.com/laravel/octane"
|
"source": "https://github.com/laravel/octane"
|
||||||
},
|
},
|
||||||
"time": "2026-08-13T13:58:52+00:00"
|
"time": "2026-08-23T17:25:20+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/passkeys",
|
"name": "laravel/passkeys",
|
||||||
@@ -4804,16 +4805,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/serializable-closure",
|
"name": "laravel/serializable-closure",
|
||||||
"version": "v2.0.16",
|
"version": "v2.1.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/serializable-closure.git",
|
"url": "https://github.com/laravel/serializable-closure.git",
|
||||||
"reference": "7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed"
|
"reference": "2d5869a838bbcf37e0d8b0568fc41914e81374b5"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed",
|
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/2d5869a838bbcf37e0d8b0568fc41914e81374b5",
|
||||||
"reference": "7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed",
|
"reference": "2d5869a838bbcf37e0d8b0568fc41914e81374b5",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -4861,7 +4862,7 @@
|
|||||||
"issues": "https://github.com/laravel/serializable-closure/issues",
|
"issues": "https://github.com/laravel/serializable-closure/issues",
|
||||||
"source": "https://github.com/laravel/serializable-closure"
|
"source": "https://github.com/laravel/serializable-closure"
|
||||||
},
|
},
|
||||||
"time": "2026-08-18T20:28:54+00:00"
|
"time": "2026-09-22T14:32:34+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/tinker",
|
"name": "laravel/tinker",
|
||||||
@@ -15337,16 +15338,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/sail",
|
"name": "laravel/sail",
|
||||||
"version": "v1.67.0",
|
"version": "v1.68.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/sail.git",
|
"url": "https://github.com/laravel/sail.git",
|
||||||
"reference": "639e03ac12cf23def171770bcab05758045b2642"
|
"reference": "2bc304083d515065b03944e425e62cb3c526c33e"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/sail/zipball/639e03ac12cf23def171770bcab05758045b2642",
|
"url": "https://api.github.com/repos/laravel/sail/zipball/2bc304083d515065b03944e425e62cb3c526c33e",
|
||||||
"reference": "639e03ac12cf23def171770bcab05758045b2642",
|
"reference": "2bc304083d515065b03944e425e62cb3c526c33e",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -15396,7 +15397,7 @@
|
|||||||
"issues": "https://github.com/laravel/sail/issues",
|
"issues": "https://github.com/laravel/sail/issues",
|
||||||
"source": "https://github.com/laravel/sail"
|
"source": "https://github.com/laravel/sail"
|
||||||
},
|
},
|
||||||
"time": "2026-08-12T13:55:56+00:00"
|
"time": "2026-09-18T14:34:46+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/sentinel",
|
"name": "laravel/sentinel",
|
||||||
@@ -15456,16 +15457,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/telescope",
|
"name": "laravel/telescope",
|
||||||
"version": "v5.24.0",
|
"version": "v5.25.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/telescope.git",
|
"url": "https://github.com/laravel/telescope.git",
|
||||||
"reference": "50cbcf4553ddfd8d4bd456b04f97dfed923007d9"
|
"reference": "65fe6724f8688de01dfa74b28a0edc191bc3caa8"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/telescope/zipball/50cbcf4553ddfd8d4bd456b04f97dfed923007d9",
|
"url": "https://api.github.com/repos/laravel/telescope/zipball/65fe6724f8688de01dfa74b28a0edc191bc3caa8",
|
||||||
"reference": "50cbcf4553ddfd8d4bd456b04f97dfed923007d9",
|
"reference": "65fe6724f8688de01dfa74b28a0edc191bc3caa8",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -15518,9 +15519,9 @@
|
|||||||
"monitoring"
|
"monitoring"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/laravel/telescope/tree/v5.24.0"
|
"source": "https://github.com/laravel/telescope/tree/v5.25.0"
|
||||||
},
|
},
|
||||||
"time": "2026-09-08T16:15:16+00:00"
|
"time": "2026-09-09T14:16:19+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "mockery/mockery",
|
"name": "mockery/mockery",
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ const resourcePages = [
|
|||||||
{ path: '/admin/project-members', heading: 'Project Members' },
|
{ path: '/admin/project-members', heading: 'Project Members' },
|
||||||
{ path: '/admin/tokens', heading: 'Tokens' },
|
{ path: '/admin/tokens', heading: 'Tokens' },
|
||||||
{ path: '/admin/failed-jobs', heading: 'Failed Jobs' },
|
{ path: '/admin/failed-jobs', heading: 'Failed Jobs' },
|
||||||
{ path: '/admin/audits', heading: 'Audits' },
|
|
||||||
];
|
];
|
||||||
|
|
||||||
test.describe('Admin Panel Access', () => {
|
test.describe('Admin Panel Access', () => {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"Billing": {
|
"Billing": {
|
||||||
"repository": "solidtime-io/extension-billing",
|
"repository": "solidtime-io/extension-billing",
|
||||||
"ref": "v0.0.7"
|
"ref": "v0.0.8"
|
||||||
},
|
},
|
||||||
"Services": {
|
"Services": {
|
||||||
"repository": "solidtime-io/extension-services",
|
"repository": "solidtime-io/extension-services",
|
||||||
@@ -10,5 +10,9 @@
|
|||||||
"Invoicing": {
|
"Invoicing": {
|
||||||
"repository": "solidtime-io/extension-invoicing",
|
"repository": "solidtime-io/extension-invoicing",
|
||||||
"ref": "v0.0.7"
|
"ref": "v0.0.7"
|
||||||
|
},
|
||||||
|
"Auditing": {
|
||||||
|
"repository": "solidtime-io/extension-auditing",
|
||||||
|
"ref": "v0.0.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -111,6 +111,8 @@ export function useEventResize(params: {
|
|||||||
edge: 'start' | 'end',
|
edge: 'start' | 'end',
|
||||||
dayStr: string
|
dayStr: string
|
||||||
) {
|
) {
|
||||||
|
if (e.button !== 0) return;
|
||||||
|
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
|
||||||
|
|||||||
@@ -168,6 +168,10 @@ defineExpose({ submit, focusAfterStart });
|
|||||||
data-testid="time_entry_description"
|
data-testid="time_entry_description"
|
||||||
class="w-full rounded-l-lg py-4 sm:py-2.5 px-3.5 border-b border-b-card-background-separator @2xl:px-4 text-base text-text-primary bg-transparent border-none placeholder-text-secondary focus:ring-0 transition"
|
class="w-full rounded-l-lg py-4 sm:py-2.5 px-3.5 border-b border-b-card-background-separator @2xl:px-4 text-base text-text-primary bg-transparent border-none placeholder-text-secondary focus:ring-0 transition"
|
||||||
type="text"
|
type="text"
|
||||||
|
autocomplete="off"
|
||||||
|
data-1p-ignore
|
||||||
|
data-lpignore="true"
|
||||||
|
data-form-type="other"
|
||||||
@keydown.enter="submit"
|
@keydown.enter="submit"
|
||||||
@keydown.esc="showDropdown = false"
|
@keydown.esc="showDropdown = false"
|
||||||
@blur="updateTimeEntryDescription" />
|
@blur="updateTimeEntryDescription" />
|
||||||
|
|||||||
@@ -170,6 +170,10 @@ function closeAndFocusInput() {
|
|||||||
: 'text-text-primary bg-card-background border-border-secondary border border-none'
|
: 'text-text-primary bg-card-background border-border-secondary border border-none'
|
||||||
"
|
"
|
||||||
type="text"
|
type="text"
|
||||||
|
autocomplete="off"
|
||||||
|
data-1p-ignore
|
||||||
|
data-lpignore="true"
|
||||||
|
data-form-type="other"
|
||||||
@focusin="openModalOnTab"
|
@focusin="openModalOnTab"
|
||||||
@click="openModalOnClick"
|
@click="openModalOnClick"
|
||||||
@keydown.exact.tab="focusNextElement"
|
@keydown.exact.tab="focusNextElement"
|
||||||
|
|||||||
@@ -606,6 +606,51 @@ class ReportEndpointTest extends ApiEndpointTestAbstract
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_store_endpoint_stores_empty_id_filters_as_null(): void
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
$data = $this->createUserWithPermission([
|
||||||
|
'reports:create',
|
||||||
|
]);
|
||||||
|
Passport::actingAs($data->user);
|
||||||
|
|
||||||
|
// Act
|
||||||
|
$response = $this->postJson(route('api.v1.reports.store', [$data->organization->getKey()]), [
|
||||||
|
'name' => 'Test Report with empty Filters',
|
||||||
|
'is_public' => false,
|
||||||
|
'properties' => [
|
||||||
|
'start' => Carbon::now()->subDays(30)->toIso8601ZuluString(),
|
||||||
|
'end' => Carbon::now()->toIso8601ZuluString(),
|
||||||
|
'group' => TimeEntryAggregationType::Project->value,
|
||||||
|
'sub_group' => TimeEntryAggregationType::Task->value,
|
||||||
|
'history_group' => TimeEntryAggregationType::Day->value,
|
||||||
|
'member_ids' => [],
|
||||||
|
'project_ids' => [],
|
||||||
|
'client_ids' => [],
|
||||||
|
'tag_ids' => [],
|
||||||
|
'task_ids' => [],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
$response->assertStatus(201);
|
||||||
|
$response->assertJson(fn (AssertableJson $json) => $json
|
||||||
|
->where('data.properties.member_ids', null)
|
||||||
|
->where('data.properties.project_ids', null)
|
||||||
|
->where('data.properties.client_ids', null)
|
||||||
|
->where('data.properties.tag_ids', null)
|
||||||
|
->where('data.properties.task_ids', null)
|
||||||
|
->etc()
|
||||||
|
);
|
||||||
|
/** @var Report $report */
|
||||||
|
$report = Report::query()->findOrFail($response->json('data.id'));
|
||||||
|
$this->assertNull($report->properties->memberIds);
|
||||||
|
$this->assertNull($report->properties->projectIds);
|
||||||
|
$this->assertNull($report->properties->clientIds);
|
||||||
|
$this->assertNull($report->properties->tagIds);
|
||||||
|
$this->assertNull($report->properties->taskIds);
|
||||||
|
}
|
||||||
|
|
||||||
public function test_store_endpoint_creates_report_with_none_filter_values(): void
|
public function test_store_endpoint_creates_report_with_none_filter_values(): void
|
||||||
{
|
{
|
||||||
// Arrange
|
// Arrange
|
||||||
|
|||||||
@@ -1,59 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace Tests\Unit\Filament\Resources;
|
|
||||||
|
|
||||||
use App\Filament\Resources\AuditResource;
|
|
||||||
use App\Models\Audit;
|
|
||||||
use App\Models\TimeEntry;
|
|
||||||
use App\Models\User;
|
|
||||||
use Illuminate\Support\Facades\Config;
|
|
||||||
use Illuminate\Support\Facades\DB;
|
|
||||||
use Livewire\Livewire;
|
|
||||||
use PHPUnit\Framework\Attributes\UsesClass;
|
|
||||||
use Tests\Unit\Filament\FilamentTestCase;
|
|
||||||
|
|
||||||
#[UsesClass(AuditResource::class)]
|
|
||||||
class AuditResourceTest extends FilamentTestCase
|
|
||||||
{
|
|
||||||
protected function setUp(): void
|
|
||||||
{
|
|
||||||
parent::setUp();
|
|
||||||
Config::set('auth.super_admins', ['admin@example.com']);
|
|
||||||
$user = User::factory()->withPersonalOrganization()->create([
|
|
||||||
'email' => 'admin@example.com',
|
|
||||||
]);
|
|
||||||
|
|
||||||
$this->actingAs($user);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function test_can_list_audits(): void
|
|
||||||
{
|
|
||||||
// Arrange
|
|
||||||
$user = $this->createUserWithPermission();
|
|
||||||
$timeEntry = TimeEntry::factory()->forMember($user->member)->create();
|
|
||||||
DB::table((new Audit)->getTable())->delete();
|
|
||||||
$audits = Audit::factory()->auditFor($timeEntry)->auditUser($user->user)->createMany(5);
|
|
||||||
|
|
||||||
// Act
|
|
||||||
$response = Livewire::test(AuditResource\Pages\ListAudits::class);
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
$response->assertSuccessful();
|
|
||||||
$response->assertCanSeeTableRecords($audits);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function test_can_see_view_page_of_audit(): void
|
|
||||||
{
|
|
||||||
// Arrange
|
|
||||||
DB::table((new Audit)->getTable())->delete();
|
|
||||||
$audit = Audit::factory()->create();
|
|
||||||
|
|
||||||
// Act
|
|
||||||
$response = Livewire::test(AuditResource\Pages\ViewAudit::class, ['record' => $audit->getKey()]);
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
$response->assertSuccessful();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -10,6 +10,9 @@ use App\Exceptions\Api\CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembe
|
|||||||
use App\Models\Client;
|
use App\Models\Client;
|
||||||
use App\Models\Member;
|
use App\Models\Member;
|
||||||
use App\Models\Organization;
|
use App\Models\Organization;
|
||||||
|
use App\Models\Passport\Client as PassportClient;
|
||||||
|
use App\Models\Passport\RefreshToken;
|
||||||
|
use App\Models\Passport\Token;
|
||||||
use App\Models\Project;
|
use App\Models\Project;
|
||||||
use App\Models\ProjectMember;
|
use App\Models\ProjectMember;
|
||||||
use App\Models\Report;
|
use App\Models\Report;
|
||||||
@@ -23,6 +26,7 @@ use Illuminate\Support\Collection;
|
|||||||
use Illuminate\Support\Facades\Event;
|
use Illuminate\Support\Facades\Event;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
use PHPUnit\Framework\Attributes\CoversClass;
|
use PHPUnit\Framework\Attributes\CoversClass;
|
||||||
use Tests\TestCaseWithDatabase;
|
use Tests\TestCaseWithDatabase;
|
||||||
use TiMacDonald\Log\LogEntry;
|
use TiMacDonald\Log\LogEntry;
|
||||||
@@ -424,4 +428,45 @@ class DeletionServiceTest extends TestCaseWithDatabase
|
|||||||
'role' => Role::Placeholder->value,
|
'role' => Role::Placeholder->value,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_delete_user_deletes_access_tokens_and_their_refresh_tokens_but_does_not_delete_tokens_of_other_users(): void
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
$user = User::factory()->create();
|
||||||
|
$otherUser = User::factory()->create();
|
||||||
|
$passportClient = PassportClient::factory()->create();
|
||||||
|
|
||||||
|
$userToken = Token::factory()->forUser($user)->forClient($passportClient)->create();
|
||||||
|
$userRefreshToken = RefreshToken::query()->create([
|
||||||
|
'id' => Str::random(100),
|
||||||
|
'access_token_id' => $userToken->getKey(),
|
||||||
|
'revoked' => false,
|
||||||
|
'expires_at' => now()->addDays(30),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$otherUserToken = Token::factory()->forUser($otherUser)->forClient($passportClient)->create();
|
||||||
|
$otherUserRefreshToken = RefreshToken::query()->create([
|
||||||
|
'id' => Str::random(100),
|
||||||
|
'access_token_id' => $otherUserToken->getKey(),
|
||||||
|
'revoked' => false,
|
||||||
|
'expires_at' => now()->addDays(30),
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Act
|
||||||
|
$this->deletionService->deleteUser($user);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
$this->assertDatabaseMissing(Token::class, [
|
||||||
|
'id' => $userToken->getKey(),
|
||||||
|
]);
|
||||||
|
$this->assertDatabaseMissing(RefreshToken::class, [
|
||||||
|
'id' => $userRefreshToken->getKey(),
|
||||||
|
]);
|
||||||
|
$this->assertDatabaseHas(Token::class, [
|
||||||
|
'id' => $otherUserToken->getKey(),
|
||||||
|
]);
|
||||||
|
$this->assertDatabaseHas(RefreshToken::class, [
|
||||||
|
'id' => $otherUserRefreshToken->getKey(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -88,4 +88,25 @@ class ReportPropertiesDtoTest extends TestCase
|
|||||||
$this->assertSame(TimeEntryType::Work, $dtoWork->timeEntryType);
|
$this->assertSame(TimeEntryType::Work, $dtoWork->timeEntryType);
|
||||||
$this->assertSame(TimeEntryType::Break, $dtoBreak->timeEntryType);
|
$this->assertSame(TimeEntryType::Break, $dtoBreak->timeEntryType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_empty_id_filters_of_a_persisted_report_are_read_as_null(): void
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
$properties = $this->getBaseProperties();
|
||||||
|
$properties['memberIds'] = [];
|
||||||
|
$properties['clientIds'] = [];
|
||||||
|
$properties['projectIds'] = [];
|
||||||
|
$properties['tagIds'] = [];
|
||||||
|
$properties['taskIds'] = [];
|
||||||
|
|
||||||
|
// Act
|
||||||
|
$dto = $this->castFromJson($properties);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
$this->assertNull($dto->memberIds);
|
||||||
|
$this->assertNull($dto->clientIds);
|
||||||
|
$this->assertNull($dto->projectIds);
|
||||||
|
$this->assertNull($dto->tagIds);
|
||||||
|
$this->assertNull($dto->taskIds);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -416,6 +416,81 @@ class TimeEntryFilterTest extends TestCaseWithDatabase
|
|||||||
$this->assertCount(3, $builderContains->get());
|
$this->assertCount(3, $builderContains->get());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_add_member_ids_filter_with_empty_array_applies_no_filter(): void
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
TimeEntry::factory()->createMany(2);
|
||||||
|
|
||||||
|
$builder = TimeEntry::query();
|
||||||
|
$filter = new TimeEntryFilter($builder);
|
||||||
|
|
||||||
|
// Act
|
||||||
|
$filter->addMemberIdsFilter([]);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
$this->assertCount(2, $builder->get());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_add_project_ids_filter_with_empty_array_applies_no_filter(): void
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
$project = Project::factory()->create();
|
||||||
|
TimeEntry::factory()->create([
|
||||||
|
'project_id' => $project->getKey(),
|
||||||
|
'organization_id' => $project->organization_id,
|
||||||
|
]);
|
||||||
|
TimeEntry::factory()->create(['project_id' => null]);
|
||||||
|
|
||||||
|
$builder = TimeEntry::query();
|
||||||
|
$filter = new TimeEntryFilter($builder);
|
||||||
|
|
||||||
|
// Act
|
||||||
|
$filter->addProjectIdsFilter([]);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
$this->assertCount(2, $builder->get());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_add_task_ids_filter_with_empty_array_applies_no_filter(): void
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
$task = Task::factory()->create();
|
||||||
|
TimeEntry::factory()->create([
|
||||||
|
'task_id' => $task->getKey(),
|
||||||
|
'organization_id' => $task->organization_id,
|
||||||
|
]);
|
||||||
|
TimeEntry::factory()->create(['task_id' => null]);
|
||||||
|
|
||||||
|
$builder = TimeEntry::query();
|
||||||
|
$filter = new TimeEntryFilter($builder);
|
||||||
|
|
||||||
|
// Act
|
||||||
|
$filter->addTaskIdsFilter([]);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
$this->assertCount(2, $builder->get());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_add_client_ids_filter_with_empty_array_applies_no_filter(): void
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
$client = Client::factory()->create();
|
||||||
|
TimeEntry::factory()->create([
|
||||||
|
'client_id' => $client->getKey(),
|
||||||
|
'organization_id' => $client->organization_id,
|
||||||
|
]);
|
||||||
|
TimeEntry::factory()->create(['client_id' => null]);
|
||||||
|
|
||||||
|
$builder = TimeEntry::query();
|
||||||
|
$filter = new TimeEntryFilter($builder);
|
||||||
|
|
||||||
|
// Act
|
||||||
|
$filter->addClientIdsFilter([]);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
$this->assertCount(2, $builder->get());
|
||||||
|
}
|
||||||
|
|
||||||
public function test_add_tag_ids_filter_with_null_match_type_defaults_to_contains(): void
|
public function test_add_tag_ids_filter_with_null_match_type_defaults_to_contains(): void
|
||||||
{
|
{
|
||||||
// Arrange
|
// Arrange
|
||||||
|
|||||||
Reference in New Issue
Block a user