diff --git a/.github/workflows/monorepo-split-packages.yml b/.github/workflows/monorepo-split-packages.yml index d19cab594..a602be51b 100644 --- a/.github/workflows/monorepo-split-packages.yml +++ b/.github/workflows/monorepo-split-packages.yml @@ -7,7 +7,7 @@ on: env: GITHUB_TOKEN: ${{ secrets.BOT }} - CORE_VERSION: "^2.1.8" + CORE_VERSION: "^2.1.9" jobs: packages_split: @@ -40,7 +40,7 @@ jobs: steps: - uses: actions/checkout@v4 - # Search and replace "moox/core": "*" with "moox/core": "^2.1.8" in composer.json + # Search and replace "moox/core": "*" with "moox/core": "^2.1.9" in composer.json - name: Replace core version in composer.json working-directory: packages/${{ matrix.package }} run: | @@ -57,7 +57,7 @@ jobs: git config --global user.name "mooxbot" git config --global user.email "bot@moox.org" git add composer.json - git commit -m "Update moox/core dependency to ^^2.1.8" || echo "No changes to commit" + git commit -m "Update moox/core dependency to ^^2.1.9" || echo "No changes to commit" fi - if: "!startsWith(github.ref, 'refs/tags/')" diff --git a/packages/core/resources/lang/de/expiry.php b/packages/core/resources/lang/de/expiry.php index 3513e5654..b2f47742e 100644 --- a/packages/core/resources/lang/de/expiry.php +++ b/packages/core/resources/lang/de/expiry.php @@ -15,6 +15,8 @@ 'expired_at' => 'Abgelaufen', 'processing_deadline' => 'Bearbeitungsfrist', + 'escalated_at' => 'Eskaliert am', + 'escalated_to' => 'Eskaliert an', 'cycle' => 'Turnus', 'notifyUser' => 'Verantwortlicher', 'expiry_job' => 'Typ', diff --git a/packages/core/resources/lang/en/expiry.php b/packages/core/resources/lang/en/expiry.php index 32f0124a6..01f6e206a 100644 --- a/packages/core/resources/lang/en/expiry.php +++ b/packages/core/resources/lang/en/expiry.php @@ -19,6 +19,8 @@ 'expired_at' => 'Expired', 'processing_deadline' => 'Processing deadline', + 'escalated_at' => 'Escalated at', + 'escalated_to' => 'Escalated to', 'cycle' => 'Cycle', 'notifyUser' => 'Verantwortlicher', 'expiry_job' => 'Type', diff --git a/packages/expiry/src/Resources/ExpiryResource.php b/packages/expiry/src/Resources/ExpiryResource.php index 9af1c4dd2..71e8c521c 100644 --- a/packages/expiry/src/Resources/ExpiryResource.php +++ b/packages/expiry/src/Resources/ExpiryResource.php @@ -54,7 +54,16 @@ public static function table(Table $table): Table ->label(__('core::expiry.processing_deadline')) ->toggleable() ->sortable() - ->since(), + ->since() + ->visible(fn () => Expiry::query()->whereNotNull('processing_deadline')->exists()), + Tables\Columns\TextColumn::make('escalated_at') + ->label(__('core::expiry.escalated_at')) + ->toggleable() + ->sortable() + ->date() + ->icon('gmdi-warning') + ->color('warning') + ->visible(fn () => Expiry::query()->whereNotNull('escalated_at')->exists()), Tables\Columns\TextColumn::make('cycle') ->label(__('core::expiry.cycle')) ->toggleable()