Auto commit for release 'branch-v6.2' on 2024-12-18

Merge branch 'develop' into v6.2
# Conflicts: # composer.lock # config/firefly.php # package-lock.json
2025-12-01 02:21:45 +00:00 · 2024-12-18 16:45:41 +01:00 · 2024-12-18 16:39:22 +01:00 · 2024-12-18 16:36:08 +01:00 · 2024-12-18 16:31:37 +01:00 · 2024-12-18 16:29:19 +01:00
24 changed files with 486 additions and 364 deletions
--- a/.github/workflows/close-duplicates.yml
+++ b/.github/workflows/close-duplicates.yml
@@ -13,7 +13,7 @@ jobs:
  close_duplicates:
    runs-on: ubuntu-latest
    steps:
-      - uses: github/command@v1.2.2
+      - uses: github/command@v1.3.0
        id: command
        with:
          allowed_contexts: "issue"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -179,10 +179,10 @@ jobs:
          if [[ "$version" == branch* ]]; then
            [[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
            # branch builds overrule develop
-            releaseName=develop-$(date +'%Y%m%d')
+            releaseName=$version-$(date +'%Y%m%d')
            originalName=$releaseName
-            zipName=FireflyIII-develop.zip
-            tarName=FireflyIII-develop.tar.gz
+            zipName=FireflyIII-$version.zip
+            tarName=FireflyIII-$version.tar.gz
          fi

          # in both cases, if the release or tag already exists, add ".1" until it no longer exists.
@@ -226,12 +226,13 @@ jobs:
          gpg --armor --detach-sign $zipName
          gpg --armor --detach-sign $tarName

-          # create a development (nightly) release:
-          if [[ "develop" == "$version" ]] || [[ "$version" == branch* ]]; then
+          # describe the development release.
+          if [[ "develop" == "$version" ]]; then
            echo 'Develop release.'
-            # add text to output.txt (instructions)
            rm output.txt
-            echo "Bi-weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
+            touch output.txt
+            sudo chown -R runner:docker output.txt
+            echo "Weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
            echo "" >> output.txt
            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
            echo "" >> output.txt
@@ -239,15 +240,62 @@ jobs:
            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
            echo "" >> output.txt
            echo ":warning: Please be careful with this pre-release, as it may not work as expected." >> output.txt
+          fi
+          # describe a branch release
+          if [[ "$version" == branch* ]]; then
+            echo 'Branch release.'
+            rm output.txt
+            touch output.txt
+            sudo chown -R runner:docker output.txt
+            echo "Irregular BRANCH release of Firefly III. This release contains specific features or changes. Docker users can find this release under the \`$version\` tag." >> output.txt
+            echo "" >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+            echo "" >> output.txt
+            echo "* Please read the installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "" >> output.txt
+            echo ":warning: Please be careful with this branch pre-release, as it may not work as expected." >> output.txt
+          fi
+          # describe the main release
+          if [[ "develop" != "$version" ]] && [[ "$version" != branch* ]]; then
+            sudo chown -R runner:docker output.txt
+            echo 'Main release.'
+            echo '' >> output.txt
+            echo '### Instructions' >> output.txt
+            echo '' >> output.txt
+            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt

+          fi
+
+          # create a development release:
+          if [[ "develop" == "$version" ]]; then
            # create the release:
-            echo "Create nightly release."
-            git tag -a $releaseName -m "Nightly development release '$version' on $(date +'%Y-%m-%d')"
+            echo "Create develop release."
+            git tag -a $releaseName -m "Development release '$version' on $(date +'%Y-%m-%d')"
+
            git push origin $releaseName
            gh release create $releaseName -p --verify-tag \
              -t "Development release for $(date +'%Y-%m-%d')" \
              -F output.txt
+          fi

+          # create a branch release:
+          if [[ "$version" == branch* ]]; then
+
+            # create the release:
+            echo "Create branch release."
+            git tag -a $releaseName -m "Branch release '$version' on $(date +'%Y-%m-%d')"
+
+            git push origin $releaseName
+            gh release create $releaseName -p --verify-tag \
+              -t "Branch release for $(date +'%Y-%m-%d')" \
+              -F output.txt
+          fi
+
+          # create a development (nightly) release:
+          if [[ "develop" == "$version" ]] || [[ "$version" == branch* ]]; then
            # add zip file to release.
            gh release upload $releaseName $zipName
            gh release upload $releaseName $tarName
@@ -266,16 +314,6 @@ jobs:
            gh release upload $releaseName HEAD.txt
          else
            echo 'MAIN (real) release'
-            sudo chown -R runner:docker output.txt
-            # add text to output.txt (more instructions)
-            echo '' >> output.txt
-            echo '### Instructions' >> output.txt
-            echo '' >> output.txt
-            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
-            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
-            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
-
-            echo "Create default release."
            git tag -a $releaseName -m "Here be changelog"
            git push origin $releaseName
            gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag
--- a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php
+++ b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php
@@ -103,7 +103,7 @@ class PiggyBankController extends Controller
        /** @var PiggyBank $piggy */
        foreach ($piggies as $piggy) {
            $currency      = $piggy->transactionCurrency;
-            $currentAmount = $this->piggyRepository->getRepetition($piggy)->current_amount ?? '0';
+            $currentAmount = $this->piggyRepository->getCurrentAmount($piggy);
            $objectGroup   = $piggy->objectGroups()->first();
            $response[]    = [
                'id'                      => (string)$piggy->id,
--- a/app/Api/V1/Controllers/Search/AccountController.php
+++ b/app/Api/V1/Controllers/Search/AccountController.php
@@ -62,7 +62,6 @@ class AccountController extends Controller
     */
    public function search(Request $request): JsonResponse|Response
    {
-        app('log')->debug('Now in account search()');
        $manager     = $this->getManager();
        $query       = trim((string)$request->get('query'));
        $field       = trim((string)$request->get('field'));
@@ -70,6 +69,7 @@ class AccountController extends Controller
        if ('' === $query || !in_array($field, $this->validFields, true)) {
            return response(null, 422);
        }
+        app('log')->debug(sprintf('Now in account search("%s", "%s")', $field, $query));
        $types       = $this->mapAccountTypes($type);

        /** @var AccountSearch $search */
--- a/app/Api/V1/Requests/Models/Rule/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/Rule/StoreRequest.php
@@ -119,7 +119,7 @@ class StoreRequest extends FormRequest
            'description'                => 'min:1|max:32768|nullable',
            'rule_group_id'              => 'belongsToUser:rule_groups|required_without:rule_group_title',
            'rule_group_title'           => 'nullable|min:1|max:255|required_without:rule_group_id|belongsToUser:rule_groups,title',
-            'trigger'                    => 'required|in:store-journal,update-journal',
+            'trigger'                    => 'required|in:store-journal,update-journal,manual-activation',
            'triggers.*.type'            => 'required|in:'.implode(',', $validTriggers),
            'triggers.*.value'           => 'required_if:actions.*.type,'.$contextTriggers.'|min:1|ruleTriggerValue|max:1024',
            'triggers.*.stop_processing' => [new IsBoolean()],
--- a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php
@@ -138,7 +138,7 @@ class UpdateRequest extends FormRequest
            'description'                => 'min:1|max:32768|nullable',
            'rule_group_id'              => 'belongsToUser:rule_groups',
            'rule_group_title'           => 'nullable|min:1|max:255|belongsToUser:rule_groups,title',
-            'trigger'                    => 'in:store-journal,update-journal',
+            'trigger'                    => 'in:store-journal,update-journal.manual-activation',
            'triggers.*.type'            => 'required|in:'.implode(',', $validTriggers),
            'triggers.*.value'           => 'required_if:actions.*.type,'.$contextTriggers.'|min:1|ruleTriggerValue|max:1024',
            'triggers.*.stop_processing' => [new IsBoolean()],
--- a/app/Console/Commands/Correction/CorrectAmounts.php
+++ b/app/Console/Commands/Correction/CorrectAmounts.php
@@ -31,7 +31,6 @@ use FireflyIII\Models\Bill;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\CurrencyExchangeRate;
 use FireflyIII\Models\PiggyBank;
-use FireflyIII\Models\PiggyBankRepetition;
 use FireflyIII\Models\RecurrenceTransaction;
 use FireflyIII\Models\RuleTrigger;
 use Illuminate\Console\Command;
@@ -161,24 +160,6 @@ class CorrectAmounts extends Command
        $this->friendlyInfo(sprintf('Corrected %d currency exchange rate(s).', $count));
    }

-    private function fixRepetitions(): void
-    {
-        $set   = PiggyBankRepetition::where('current_amount', '<', 0)->get();
-        $count = $set->count();
-        if (0 === $count) {
-            $this->friendlyPositive('All piggy bank repetition amounts are positive.');
-
-            return;
-        }
-
-        /** @var PiggyBankRepetition $item */
-        foreach ($set as $item) {
-            $item->current_amount = app('steam')->positive($item->current_amount);
-            $item->save();
-        }
-        $this->friendlyInfo(sprintf('Corrected %d piggy bank repetition amount(s).', $count));
-    }
-
    private function fixPiggyBanks(): void
    {
        $set   = PiggyBank::where('target_amount', '<', 0)->get();
--- a/app/Factory/PiggyBankFactory.php
+++ b/app/Factory/PiggyBankFactory.php
@@ -32,6 +32,7 @@ use FireflyIII\Repositories\ObjectGroup\CreatesObjectGroups;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\Log;

 /**
 * Class PiggyBankFactory
@@ -221,7 +222,22 @@ class PiggyBankFactory

    public function linkToAccountIds(PiggyBank $piggyBank, array $accounts): void
    {
+        Log::debug(sprintf('Linking piggy bank #%d to %d accounts.', $piggyBank->id, count($accounts)), $accounts);
+        // collect current current_amount so the sync does not remove them.
+        // TODO this is a tedious check. Feels like a hack.
        $toBeLinked = [];
+        foreach($piggyBank->accounts as $account) {
+            foreach($accounts as $info) {
+                if($account->id === $info['account_id']) {
+                    if(array_key_exists($account->id, $accounts)) {
+                        $toBeLinked[$account->id] = ['current_amount' => $account->pivot->current_amount];
+                        Log::debug(sprintf('Prefilled for account #%d with amount %s', $account->id, $account->pivot->current_amount));
+                    }
+                }
+            }
+        }
+
+
        /** @var array $info */
        foreach ($accounts as $info) {
            $account = $this->accountRepository->find((int) ($info['account_id'] ?? 0));
@@ -230,13 +246,14 @@ class PiggyBankFactory
            }
            if (array_key_exists('current_amount', $info)) {
                $toBeLinked[$account->id] = ['current_amount' => $info['current_amount']];
-                //$piggyBank->accounts()->syncWithoutDetaching([$account->id => ['current_amount' => $info['current_amount'] ?? '0']]);
+                Log::debug(sprintf('Will link account #%d with amount %s', $account->id, $account->pivot->current_amount));
            }
            if (!array_key_exists('current_amount', $info)) {
-                $toBeLinked[$account->id] = [];
-                //$piggyBank->accounts()->syncWithoutDetaching([$account->id]);
+                $toBeLinked[$account->id] ??= [];
+                Log::debug(sprintf('Will link account #%d with info: ', $account->id), $toBeLinked[$account->id]);
            }
        }
+        Log::debug(sprintf('Link information: %s', json_encode($toBeLinked)));
        $piggyBank->accounts()->sync($toBeLinked);
    }
 }
--- a/app/Handlers/Observer/TransactionObserver.php
+++ b/app/Handlers/Observer/TransactionObserver.php
@@ -41,18 +41,22 @@ class TransactionObserver
    public function updated(Transaction $transaction): void
    {
        Log::debug('Observe "updated" of a transaction.');
-        if (1 === bccomp($transaction->amount, '0')) {
-            Log::debug('Trigger recalculateForJournal');
-            AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
+        if (config('firefly.feature_flags.running_balance_column')) {
+            if (1 === bccomp($transaction->amount, '0')) {
+                Log::debug('Trigger recalculateForJournal');
+                AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
+            }
        }
    }

    public function created(Transaction $transaction): void
    {
        Log::debug('Observe "created" of a transaction.');
-        if (1 === bccomp($transaction->amount, '0')) {
-            Log::debug('Trigger recalculateForJournal');
-            AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
+        if (config('firefly.feature_flags.running_balance_column')) {
+            if (1 === bccomp($transaction->amount, '0')) {
+                Log::debug('Trigger recalculateForJournal');
+                AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
+            }
        }
    }
 }
--- a/app/Http/Requests/RuleFormRequest.php
+++ b/app/Http/Requests/RuleFormRequest.php
@@ -144,7 +144,7 @@ class RuleFormRequest extends FormRequest
            'description'      => 'min:1|max:32768|nullable',
            'stop_processing'  => 'boolean',
            'rule_group_id'    => 'required|belongsToUser:rule_groups',
-            'trigger'          => 'required|in:store-journal,update-journal',
+            'trigger'          => 'required|in:store-journal,update-journal,manual-activation',
            'triggers.*.type'  => 'required|in:'.implode(',', $validTriggers),
            'triggers.*.value' => sprintf('required_if:triggers.*.type,%s|max:1024|min:1|ruleTriggerValue', $contextTriggers),
            'actions.*.type'   => 'required|in:'.implode(',', $validActions),
--- a/app/Notifications/Test/UserTestNotificationSlack.php
+++ b/app/Notifications/Test/UserTestNotificationSlack.php
@@ -24,7 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Notifications\Test;

-use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
+use FireflyIII\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
@@ -38,20 +38,17 @@ class UserTestNotificationSlack extends Notification
 {
    use Queueable;

-    private OwnerNotifiable $owner;
+    private User $user;

-    /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function __construct(OwnerNotifiable $owner)
+    public function __construct(User $user)
    {
-        $this->owner = $owner;
+        $this->user = $user;
    }

    /**
     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
-    public function toArray(OwnerNotifiable $notifiable)
+    public function toArray(User $user)
    {
        return [
        ];
@@ -60,7 +57,7 @@ class UserTestNotificationSlack extends Notification
    /**
     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
-    public function toSlack(OwnerNotifiable $notifiable)
+    public function toSlack(User $user)
    {
        return new SlackMessage()->content((string) trans('email.admin_test_subject'));
        // return new SlackMessage()->text((string) trans('email.admin_test_subject'))->to($url);
@@ -69,7 +66,7 @@ class UserTestNotificationSlack extends Notification
    /**
     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
     */
-    public function via(OwnerNotifiable $notifiable)
+    public function via(User $user)
    {
        return ['slack'];
    }
--- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
+++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
@@ -46,13 +46,13 @@ trait ModifiesPiggyBanks
    public function addAmountToRepetition(PiggyBankRepetition $repetition, string $amount, TransactionJournal $journal): void
    {
        throw new FireflyException('[a] Piggy bank repetitions are EOL.');
-        app('log')->debug(sprintf('addAmountToRepetition: %s', $amount));
+        Log::debug(sprintf('addAmountToRepetition: %s', $amount));
        if (-1 === bccomp($amount, '0')) {
-            app('log')->debug('Remove amount.');
+            Log::debug('Remove amount.');
            $this->removeAmount($repetition->piggyBank, bcmul($amount, '-1'), $journal);
        }
        if (1 === bccomp($amount, '0')) {
-            app('log')->debug('Add amount.');
+            Log::debug('Add amount.');
            $this->addAmount($repetition->piggyBank, $amount, $journal);
        }
    }
@@ -64,7 +64,7 @@ trait ModifiesPiggyBanks
        $pivot->current_amount = bcsub($currentAmount, $amount);
        $pivot->save();

-        app('log')->debug('removeAmount [a]: Trigger change for negative amount.');
+        Log::debug('ChangedAmount: removeAmount [a]: Trigger change for negative amount.');
        event(new ChangedAmount($piggyBank, bcmul($amount, '-1'), $journal, null));

        return true;
@@ -95,7 +95,7 @@ trait ModifiesPiggyBanks
        $pivot->current_amount = bcadd($currentAmount, $amount);
        $pivot->save();

-        app('log')->debug('addAmount [b]: Trigger change for positive amount.');
+        Log::debug('ChangedAmount: addAmount [b]: Trigger change for positive amount.');
        event(new ChangedAmount($piggyBank, $amount, $journal, null));

        return true;
@@ -109,21 +109,21 @@ trait ModifiesPiggyBanks
        $savedSoFar    = $this->getCurrentAmount($piggyBank);
        $maxAmount     = $leftOnAccount;

-        app('log')->debug(sprintf('Left on account: %s on %s', $leftOnAccount, $today->format('Y-m-d H:i:s')));
-        app('log')->debug(sprintf('Saved so far: %s', $savedSoFar));
+        Log::debug(sprintf('Left on account: %s on %s', $leftOnAccount, $today->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('Saved so far: %s', $savedSoFar));


        if (0 !== bccomp($piggyBank->target_amount, '0')) {
            $leftToSave = bcsub($piggyBank->target_amount, $savedSoFar);
            $maxAmount  = 1 === bccomp($leftOnAccount, $leftToSave) ? $leftToSave : $leftOnAccount;
-            app('log')->debug(sprintf('Left to save: %s', $leftToSave));
-            app('log')->debug(sprintf('Maximum amount: %s', $maxAmount));
+            Log::debug(sprintf('Left to save: %s', $leftToSave));
+            Log::debug(sprintf('Maximum amount: %s', $maxAmount));
        }

        $compare       = bccomp($amount, $maxAmount);
        $result        = $compare <= 0;

-        app('log')->debug(sprintf('Compare <= 0? %d, so canAddAmount is %s', $compare, var_export($result, true)));
+        Log::debug(sprintf('Compare <= 0? %d, so canAddAmount is %s', $compare, var_export($result, true)));

        return $result;
    }
@@ -168,11 +168,11 @@ trait ModifiesPiggyBanks
        $repetition->save();

        if (-1 === bccomp($difference, '0')) {
-            app('log')->debug('addAmount [c]: Trigger change for negative amount.');
+            Log::debug('ChangedAmount: addAmount [c]: Trigger change for negative amount.');
            event(new ChangedAmount($piggyBank, $difference, null, null));
        }
        if (1 === bccomp($difference, '0')) {
-            app('log')->debug('addAmount [d]: Trigger change for positive amount.');
+            Log::debug('ChangedAmount: addAmount [d]: Trigger change for positive amount.');
            event(new ChangedAmount($piggyBank, $difference, null, null));
        }

@@ -203,7 +203,7 @@ trait ModifiesPiggyBanks
    public function setOrder(PiggyBank $piggyBank, int $newOrder): bool
    {
        $oldOrder         = $piggyBank->order;
-        // app('log')->debug(sprintf('Will move piggy bank #%d ("%s") from %d to %d', $piggyBank->id, $piggyBank->name, $oldOrder, $newOrder));
+        // Log::debug(sprintf('Will move piggy bank #%d ("%s") from %d to %d', $piggyBank->id, $piggyBank->name, $oldOrder, $newOrder));
        if ($newOrder > $oldOrder) {
            PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
                ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
@@ -214,7 +214,7 @@ trait ModifiesPiggyBanks
            ;

            $piggyBank->order = $newOrder;
-            app('log')->debug(sprintf('[1] Order of piggy #%d ("%s") from %d to %d', $piggyBank->id, $piggyBank->name, $oldOrder, $newOrder));
+            Log::debug(sprintf('[1] Order of piggy #%d ("%s") from %d to %d', $piggyBank->id, $piggyBank->name, $oldOrder, $newOrder));
            $piggyBank->save();

            return true;
@@ -228,7 +228,7 @@ trait ModifiesPiggyBanks
        ;

        $piggyBank->order = $newOrder;
-        app('log')->debug(sprintf('[2] Order of piggy #%d ("%s") from %d to %d', $piggyBank->id, $piggyBank->name, $oldOrder, $newOrder));
+        Log::debug(sprintf('[2] Order of piggy #%d ("%s") from %d to %d', $piggyBank->id, $piggyBank->name, $oldOrder, $newOrder));
        $piggyBank->save();

        return true;
@@ -271,13 +271,15 @@ trait ModifiesPiggyBanks
        $factory->linkToAccountIds($piggyBank, $data['accounts']);


-        // if the piggy bank is now smaller than the current relevant rep,
-        // remove money from the rep.
+        // if the piggy bank is now smaller than the sum of the money saved,
+        // remove money from all accounts until the piggy bank is the right amount.
        $currentAmount = $this->getCurrentAmount($piggyBank);
-        if (1 === bccomp($currentAmount, '100') && 0 !== bccomp($piggyBank->target_amount, '0')) {
+        if (1 === bccomp($currentAmount, $piggyBank->target_amount) && 0 !== bccomp($piggyBank->target_amount, '0')) {
+            Log::debug(sprintf('Current amount is %s, target amount is %s', $currentAmount, $piggyBank->target_amount));
            $difference = bcsub($piggyBank->target_amount, $currentAmount);

            // an amount will be removed, create "negative" event:
+            Log::debug(sprintf('ChangedAmount: is triggered with difference "%s"', $difference));
            event(new ChangedAmount($piggyBank, $difference, null, null));

            // question is, from which account(s) to remove the difference?
--- a/app/Repositories/PiggyBank/PiggyBankRepository.php
+++ b/app/Repositories/PiggyBank/PiggyBankRepository.php
@@ -82,8 +82,11 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface

    public function find(int $piggyBankId): ?PiggyBank
    {
-        // phpstan doesn't get the Model.
-        return $this->user->piggyBanks()->find($piggyBankId); // @phpstan-ignore-line
+        return PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
+            ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
+            ->where('accounts.user_id', $this->user->id)
+            ->where('piggy_banks.id', $piggyBankId)->first(['piggy_banks.*'])
+        ;
    }

    /**
@@ -91,7 +94,11 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
     */
    public function findByName(string $name): ?PiggyBank
    {
-        return $this->user->piggyBanks()->where('piggy_banks.name', $name)->first(['piggy_banks.*']);
+        return PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
+            ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
+            ->where('accounts.user_id', $this->user->id)
+            ->where('piggy_banks.name', $name)->first(['piggy_banks.*'])
+        ;
    }

    public function getAttachments(PiggyBank $piggyBank): Collection
@@ -270,14 +277,12 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
     */
    public function getPiggyBanksWithAmount(): Collection
    {
-        $currency = app('amount')->getDefaultCurrency();
-
-        $set      = $this->getPiggyBanks();
+        $set = $this->getPiggyBanks();

        /** @var PiggyBank $piggy */
        foreach ($set as $piggy) {
-            $currentAmount = $this->getRepetition($piggy)->current_amount ?? '0';
-            $piggy->name   = $piggy->name.' ('.app('amount')->formatAnything($currency, $currentAmount, false).')';
+            $currentAmount = $this->getCurrentAmount($piggy);
+            $piggy->name   = sprintf('%s (%s)', $piggy->name, app('amount')->formatAnything($piggy->transactionCurrency, $currentAmount, false));
        }

        return $set;
@@ -287,7 +292,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
    {
        return PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
            ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
-            ->where('accounts.user_id', auth()->user()->id)
+            ->where('accounts.user_id', $this->user->id)
            ->with(
                [
                    'objectGroups',
@@ -349,7 +354,16 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface

    public function searchPiggyBank(string $query, int $limit): Collection
    {
-        $search = $this->user->piggyBanks();
+        $search = PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
+            ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
+            ->where('accounts.user_id', $this->user->id)
+            ->with(
+                [
+                    'objectGroups',
+                ]
+            )
+            ->orderBy('piggy_banks.order', 'ASC')->distinct()
+        ;
        if ('' !== $query) {
            $search->whereLike('piggy_banks.name', sprintf('%%%s%%', $query));
        }
@@ -357,13 +371,24 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
            ->orderBy('piggy_banks.name', 'ASC')
        ;

-        return $search->take($limit)->get();
+        return $search->take($limit)->get(['piggy_banks.*']);
    }

    #[\Override]
    public function purgeAll(): void
    {
-        throw new FireflyException('TODO Not implemented');
+        PiggyBank::withTrashed()
+            ->whereNotNull('piggy_banks.deleted_at')
+            ->leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
+            ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
+            ->where('accounts.user_id', $this->user->id)
+            ->with(
+                [
+                    'objectGroups',
+                ]
+            )
+            ->delete()
+        ;
    }

    #[\Override]
--- a/app/Repositories/Rule/RuleRepository.php
+++ b/app/Repositories/Rule/RuleRepository.php
@@ -484,6 +484,9 @@ class RuleRepository implements RuleRepositoryInterface
        if (array_key_exists('trigger', $data) && 'update-journal' === $data['trigger']) {
            $this->setRuleTrigger('update-journal', $rule);
        }
+        if (array_key_exists('trigger', $data) && 'manual-activation' === $data['trigger']) {
+            $this->setRuleTrigger('manual-activation', $rule);
+        }
        if (array_key_exists('trigger', $data) && 'store-journal' === $data['trigger']) {
            $this->setRuleTrigger('store-journal', $rule);
        }
--- a/app/Support/Twig/Rule.php
+++ b/app/Support/Twig/Rule.php
@@ -46,8 +46,9 @@ class Rule extends AbstractExtension
            'allJournalTriggers',
            static function () {
                return [
-                    'store-journal'  => (string)trans('firefly.rule_trigger_store_journal'),
-                    'update-journal' => (string)trans('firefly.rule_trigger_update_journal'),
+                    'store-journal'     => (string)trans('firefly.rule_trigger_store_journal'),
+                    'update-journal'    => (string)trans('firefly.rule_trigger_update_journal'),
+                    'manual-activation' => (string)trans('firefly.rule_trigger_manual'),
                ];
            }
        );
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 6.1.25 - 2024-12-19
+
+### Fixed
+
+- [Issue 9492](https://github.com/firefly-iii/firefly-iii/issues/9492) (API: `PUT /api/v1/transactions/ID` does not work with only `source_name`) reported by @dreautall
+- [Issue 9497](https://github.com/firefly-iii/firefly-iii/issues/9497) ('Attempt to read property "user" on null' error when running `php artisan firefly-iii:upgrade-database` on updating to v6.1.24) reported by @ChrisCarini
+- [Discussion 9546](https://github.com/orgs/firefly-iii/discussions/9546) (Using the Data Importer to import data is very slowly？) started by @shangyuok
+
 ## 6.1.24 - 2024-11-24

 ### Fixed
--- a/composer.json
+++ b/composer.json
@@ -88,7 +88,7 @@
        "guzzlehttp/guzzle": "^7.8",
        "jc5/google2fa-laravel": "^2.0",
        "jc5/recovery": "^2",
-        "laravel-json-api/laravel": "^4.0",
+        "laravel-json-api/laravel": "^5.0",
        "laravel-json-api/non-eloquent": "^4.0",
        "laravel-notification-channels/pushover": "^4.0",
        "laravel/framework": "^11",
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "a739782c3c7121d1e9c0d31105b5974a",
+    "content-hash": "232d05ea287cfd97dde3fb95805a9b5a",
    "packages": [
        {
            "name": "bacon/bacon-qr-code",
@@ -1809,20 +1809,20 @@
            },
            "type": "library",
            "extra": {
+                "laravel": {
+                    "aliases": {
+                        "Google2FA": "PragmaRX\\Google2FALaravel\\Facade"
+                    },
+                    "providers": [
+                        "PragmaRX\\Google2FALaravel\\ServiceProvider"
+                    ]
+                },
                "component": "package",
                "frameworks": [
                    "Laravel"
                ],
                "branch-alias": {
                    "dev-master": "0.2-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "PragmaRX\\Google2FALaravel\\ServiceProvider"
-                    ],
-                    "aliases": {
-                        "Google2FA": "PragmaRX\\Google2FALaravel\\Facade"
-                    }
                }
            },
            "autoload": {
@@ -1936,20 +1936,21 @@
        },
        {
            "name": "laravel-json-api/core",
-            "version": "v4.3.2",
+            "version": "v5.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel-json-api/core.git",
-                "reference": "9227259244ddc61cffd85e33102a91a5b25d7d70"
+                "reference": "e2f6696580166f7b6384318e28168252c2bd20f4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel-json-api/core/zipball/9227259244ddc61cffd85e33102a91a5b25d7d70",
-                "reference": "9227259244ddc61cffd85e33102a91a5b25d7d70",
+                "url": "https://api.github.com/repos/laravel-json-api/core/zipball/e2f6696580166f7b6384318e28168252c2bd20f4",
+                "reference": "e2f6696580166f7b6384318e28168252c2bd20f4",
                "shasum": ""
            },
            "require": {
                "ext-json": "*",
+                "illuminate/auth": "^11.0",
                "illuminate/contracts": "^11.0",
                "illuminate/http": "^11.0",
                "illuminate/support": "^11.0",
@@ -1961,7 +1962,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-4.x": "4.x-dev"
+                    "dev-develop": "5.x-dev"
                }
            },
            "autoload": {
@@ -1994,9 +1995,9 @@
            ],
            "support": {
                "issues": "https://github.com/laravel-json-api/core/issues",
-                "source": "https://github.com/laravel-json-api/core/tree/v4.3.2"
+                "source": "https://github.com/laravel-json-api/core/tree/v5.0.1"
            },
-            "time": "2024-11-30T16:23:18+00:00"
+            "time": "2024-11-30T16:31:42+00:00"
        },
        {
            "name": "laravel-json-api/eloquent",
@@ -2199,21 +2200,21 @@
        },
        {
            "name": "laravel-json-api/laravel",
-            "version": "v4.1.1",
+            "version": "v5.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel-json-api/laravel.git",
-                "reference": "5ef2e8588dd1310e644ff527cf82fb1150cdfc8d"
+                "reference": "53045c6a55b4923e3cfadc085fd5f0b7c8c79cfc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel-json-api/laravel/zipball/5ef2e8588dd1310e644ff527cf82fb1150cdfc8d",
-                "reference": "5ef2e8588dd1310e644ff527cf82fb1150cdfc8d",
+                "url": "https://api.github.com/repos/laravel-json-api/laravel/zipball/53045c6a55b4923e3cfadc085fd5f0b7c8c79cfc",
+                "reference": "53045c6a55b4923e3cfadc085fd5f0b7c8c79cfc",
                "shasum": ""
            },
            "require": {
                "ext-json": "*",
-                "laravel-json-api/core": "^4.3.2",
+                "laravel-json-api/core": "^5.0.1",
                "laravel-json-api/eloquent": "^4.4",
                "laravel-json-api/encoder-neomerx": "^4.1",
                "laravel-json-api/exceptions": "^3.1",
@@ -2239,7 +2240,7 @@
                    ]
                },
                "branch-alias": {
-                    "dev-develop": "4.x-dev"
+                    "dev-develop": "5.x-dev"
                }
            },
            "autoload": {
@@ -2271,9 +2272,9 @@
            ],
            "support": {
                "issues": "https://github.com/laravel-json-api/laravel/issues",
-                "source": "https://github.com/laravel-json-api/laravel/tree/v4.1.1"
+                "source": "https://github.com/laravel-json-api/laravel/tree/v5.0.2"
            },
-            "time": "2024-11-30T17:59:00+00:00"
+            "time": "2024-12-03T20:43:07+00:00"
        },
        {
            "name": "laravel-json-api/neomerx-json-api",
@@ -2609,16 +2610,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v11.35.1",
+            "version": "v11.36.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "dcfa130ede1a6fa4343dc113410963e791ad34fb"
+                "reference": "df06f5163f4550641fdf349ebc04916a61135a64"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/dcfa130ede1a6fa4343dc113410963e791ad34fb",
-                "reference": "dcfa130ede1a6fa4343dc113410963e791ad34fb",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/df06f5163f4550641fdf349ebc04916a61135a64",
+                "reference": "df06f5163f4550641fdf349ebc04916a61135a64",
                "shasum": ""
            },
            "require": {
@@ -2639,7 +2640,7 @@
                "guzzlehttp/uri-template": "^1.0",
                "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
                "laravel/serializable-closure": "^1.3|^2.0",
-                "league/commonmark": "^2.2.1",
+                "league/commonmark": "^2.6",
                "league/flysystem": "^3.25.1",
                "league/flysystem-local": "^3.25.1",
                "league/uri": "^7.5.1",
@@ -2654,7 +2655,7 @@
                "symfony/console": "^7.0.3",
                "symfony/error-handler": "^7.0.3",
                "symfony/finder": "^7.0.3",
-                "symfony/http-foundation": "^7.0.3",
+                "symfony/http-foundation": "^7.2.0",
                "symfony/http-kernel": "^7.0.3",
                "symfony/mailer": "^7.0.3",
                "symfony/mime": "^7.0.3",
@@ -2820,7 +2821,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2024-12-12T18:25:58+00:00"
+            "time": "2024-12-17T22:32:08+00:00"
        },
        {
            "name": "laravel/passport",
@@ -2959,16 +2960,16 @@
        },
        {
            "name": "laravel/sanctum",
-            "version": "v4.0.6",
+            "version": "v4.0.7",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/sanctum.git",
-                "reference": "9e069e36d90b1e1f41886efa0fe9800a6b354694"
+                "reference": "698064236a46df016e64a7eb059b1414e0b281df"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/9e069e36d90b1e1f41886efa0fe9800a6b354694",
-                "reference": "9e069e36d90b1e1f41886efa0fe9800a6b354694",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/698064236a46df016e64a7eb059b1414e0b281df",
+                "reference": "698064236a46df016e64a7eb059b1414e0b281df",
                "shasum": ""
            },
            "require": {
@@ -3019,20 +3020,20 @@
                "issues": "https://github.com/laravel/sanctum/issues",
                "source": "https://github.com/laravel/sanctum"
            },
-            "time": "2024-11-26T21:18:33+00:00"
+            "time": "2024-12-11T16:40:21+00:00"
        },
        {
            "name": "laravel/serializable-closure",
-            "version": "v2.0.0",
+            "version": "v2.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "0d8d3d8086984996df86596a86dea60398093a81"
+                "reference": "613b2d4998f85564d40497e05e89cb6d9bd1cbe8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/0d8d3d8086984996df86596a86dea60398093a81",
-                "reference": "0d8d3d8086984996df86596a86dea60398093a81",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/613b2d4998f85564d40497e05e89cb6d9bd1cbe8",
+                "reference": "613b2d4998f85564d40497e05e89cb6d9bd1cbe8",
                "shasum": ""
            },
            "require": {
@@ -3080,7 +3081,7 @@
                "issues": "https://github.com/laravel/serializable-closure/issues",
                "source": "https://github.com/laravel/serializable-closure"
            },
-            "time": "2024-11-19T01:38:44+00:00"
+            "time": "2024-12-16T15:26:28+00:00"
        },
        {
            "name": "laravel/slack-notification-channel",
@@ -3538,16 +3539,16 @@
        },
        {
            "name": "league/csv",
-            "version": "9.20.0",
+            "version": "9.20.1",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/csv.git",
-                "reference": "553579df208641ada6ffb450b3a151e2fcfa4f31"
+                "reference": "491d1e79e973a7370c7571dc0fe4a7241f4936ee"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/csv/zipball/553579df208641ada6ffb450b3a151e2fcfa4f31",
-                "reference": "553579df208641ada6ffb450b3a151e2fcfa4f31",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/491d1e79e973a7370c7571dc0fe4a7241f4936ee",
+                "reference": "491d1e79e973a7370c7571dc0fe4a7241f4936ee",
                "shasum": ""
            },
            "require": {
@@ -3621,7 +3622,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-12-13T15:49:27+00:00"
+            "time": "2024-12-18T10:11:15+00:00"
        },
        {
            "name": "league/event",
@@ -6596,16 +6597,16 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.14-dev"
-                },
                "laravel": {
-                    "providers": [
-                        "TwigBridge\\ServiceProvider"
-                    ],
                    "aliases": {
                        "Twig": "TwigBridge\\Facade\\Twig"
-                    }
+                    },
+                    "providers": [
+                        "TwigBridge\\ServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "0.14-dev"
                }
            },
            "autoload": {
@@ -6955,12 +6956,12 @@
            "type": "library",
            "extra": {
                "laravel": {
-                    "providers": [
-                        "Spatie\\Html\\HtmlServiceProvider"
-                    ],
                    "aliases": {
                        "Html": "Spatie\\Html\\Facades\\Html"
-                    }
+                    },
+                    "providers": [
+                        "Spatie\\Html\\HtmlServiceProvider"
+                    ]
                }
            },
            "autoload": {
@@ -10926,16 +10927,16 @@
        },
        {
            "name": "barryvdh/laravel-ide-helper",
-            "version": "v3.2.2",
+            "version": "v3.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/barryvdh/laravel-ide-helper.git",
-                "reference": "07e3bd8796f3d1414801a03d3783f9d3ec9efc08"
+                "reference": "b7675670f75914bf34afdea52a6c2fe3781f7c44"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/07e3bd8796f3d1414801a03d3783f9d3ec9efc08",
-                "reference": "07e3bd8796f3d1414801a03d3783f9d3ec9efc08",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/b7675670f75914bf34afdea52a6c2fe3781f7c44",
+                "reference": "b7675670f75914bf34afdea52a6c2fe3781f7c44",
                "shasum": ""
            },
            "require": {
@@ -11004,7 +11005,7 @@
            ],
            "support": {
                "issues": "https://github.com/barryvdh/laravel-ide-helper/issues",
-                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.2.2"
+                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.3.0"
            },
            "funding": [
                {
@@ -11016,7 +11017,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-10-29T14:00:16+00:00"
+            "time": "2024-12-18T08:24:19+00:00"
        },
        {
            "name": "barryvdh/reflection-docblock",
@@ -12349,16 +12350,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "1.12.12",
+            "version": "1.12.13",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0"
+                "reference": "9b469068840cfa031e1deaf2fa1886d00e20680f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
-                "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9b469068840cfa031e1deaf2fa1886d00e20680f",
+                "reference": "9b469068840cfa031e1deaf2fa1886d00e20680f",
                "shasum": ""
            },
            "require": {
@@ -12403,7 +12404,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-11-28T22:13:23+00:00"
+            "time": "2024-12-17T17:00:20+00:00"
        },
        {
            "name": "phpstan/phpstan-deprecation-rules",
--- a/package-lock.json
+++ b/package-lock.json
@@ -44,9 +44,9 @@
            }
        },
        "node_modules/@ag-grid-community/styles": {
-            "version": "32.3.3",
-            "resolved": "https://registry.npmjs.org/@ag-grid-community/styles/-/styles-32.3.3.tgz",
-            "integrity": "sha512-QAJc1CPbmFsAAq5M/8r0IOm8HL4Fb3eVK6tZXKzV9zibIereBjUwvvJRaSJa8iwtTlgxCtaULAQyE2gJcctphA==",
+            "version": "33.0.2",
+            "resolved": "https://registry.npmjs.org/@ag-grid-community/styles/-/styles-33.0.2.tgz",
+            "integrity": "sha512-oMUdolN8l34k6ubLQm3AiO53SqB59YbPDSanVDrwiN7xIq5NGczVQ2Yks032XWqa0bMYkLU9L9opCBSCwZdKsg==",
            "license": "MIT"
        },
        "node_modules/@ampproject/remapping": {
@@ -1709,9 +1709,9 @@
            }
        },
        "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-            "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz",
+            "integrity": "sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==",
            "cpu": [
                "ppc64"
            ],
@@ -1722,13 +1722,13 @@
                "aix"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/android-arm": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-            "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.0.tgz",
+            "integrity": "sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==",
            "cpu": [
                "arm"
            ],
@@ -1739,13 +1739,13 @@
                "android"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/android-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-            "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz",
+            "integrity": "sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==",
            "cpu": [
                "arm64"
            ],
@@ -1756,13 +1756,13 @@
                "android"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/android-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-            "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.0.tgz",
+            "integrity": "sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==",
            "cpu": [
                "x64"
            ],
@@ -1773,13 +1773,13 @@
                "android"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-            "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz",
+            "integrity": "sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==",
            "cpu": [
                "arm64"
            ],
@@ -1790,13 +1790,13 @@
                "darwin"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/darwin-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-            "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz",
+            "integrity": "sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==",
            "cpu": [
                "x64"
            ],
@@ -1807,13 +1807,13 @@
                "darwin"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-            "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz",
+            "integrity": "sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==",
            "cpu": [
                "arm64"
            ],
@@ -1824,13 +1824,13 @@
                "freebsd"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-            "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz",
+            "integrity": "sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==",
            "cpu": [
                "x64"
            ],
@@ -1841,13 +1841,13 @@
                "freebsd"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/linux-arm": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-            "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz",
+            "integrity": "sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==",
            "cpu": [
                "arm"
            ],
@@ -1858,13 +1858,13 @@
                "linux"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/linux-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-            "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz",
+            "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==",
            "cpu": [
                "arm64"
            ],
@@ -1875,13 +1875,13 @@
                "linux"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/linux-ia32": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-            "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz",
+            "integrity": "sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==",
            "cpu": [
                "ia32"
            ],
@@ -1892,13 +1892,13 @@
                "linux"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/linux-loong64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-            "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz",
+            "integrity": "sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==",
            "cpu": [
                "loong64"
            ],
@@ -1909,13 +1909,13 @@
                "linux"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-            "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz",
+            "integrity": "sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==",
            "cpu": [
                "mips64el"
            ],
@@ -1926,13 +1926,13 @@
                "linux"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-            "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz",
+            "integrity": "sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==",
            "cpu": [
                "ppc64"
            ],
@@ -1943,13 +1943,13 @@
                "linux"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-            "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz",
+            "integrity": "sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==",
            "cpu": [
                "riscv64"
            ],
@@ -1960,13 +1960,13 @@
                "linux"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/linux-s390x": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-            "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz",
+            "integrity": "sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==",
            "cpu": [
                "s390x"
            ],
@@ -1977,13 +1977,13 @@
                "linux"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/linux-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-            "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz",
+            "integrity": "sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==",
            "cpu": [
                "x64"
            ],
@@ -1994,13 +1994,13 @@
                "linux"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-            "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz",
+            "integrity": "sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==",
            "cpu": [
                "x64"
            ],
@@ -2011,13 +2011,30 @@
                "netbsd"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/openbsd-arm64": {
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.0.tgz",
+            "integrity": "sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openbsd"
+            ],
+            "engines": {
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-            "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz",
+            "integrity": "sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==",
            "cpu": [
                "x64"
            ],
@@ -2028,13 +2045,13 @@
                "openbsd"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/sunos-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-            "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz",
+            "integrity": "sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==",
            "cpu": [
                "x64"
            ],
@@ -2045,13 +2062,13 @@
                "sunos"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/win32-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-            "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz",
+            "integrity": "sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==",
            "cpu": [
                "arm64"
            ],
@@ -2062,13 +2079,13 @@
                "win32"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/win32-ia32": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-            "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz",
+            "integrity": "sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==",
            "cpu": [
                "ia32"
            ],
@@ -2079,13 +2096,13 @@
                "win32"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@esbuild/win32-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-            "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz",
+            "integrity": "sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==",
            "cpu": [
                "x64"
            ],
@@ -2096,13 +2113,13 @@
                "win32"
            ],
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            }
        },
        "node_modules/@fortawesome/fontawesome-free": {
-            "version": "6.7.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.1.tgz",
-            "integrity": "sha512-ALIk/MOh5gYe1TG/ieS5mVUsk7VUIJTJKPMK9rFFqOgfp0Q3d5QiBXbcOMwUvs37fyZVCz46YjOE6IFeOAXCHA==",
+            "version": "6.7.2",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz",
+            "integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==",
            "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)",
            "engines": {
                "node": ">=6"
@@ -4363,14 +4380,14 @@
            }
        },
        "node_modules/call-bound": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.2.tgz",
-            "integrity": "sha512-0lk0PHFe/uz0vl527fG9CgdE9WdafjDbCXvBbs+LUv000TVt2Jjhqbs4Jwm8gz070w8xXyEAxrPOMullsxXeGg==",
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
+            "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "call-bind": "^1.0.8",
-                "get-intrinsic": "^1.2.5"
+                "call-bind-apply-helpers": "^1.0.1",
+                "get-intrinsic": "^1.2.6"
            },
            "engines": {
                "node": ">= 0.4"
@@ -4414,9 +4431,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001688",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001688.tgz",
-            "integrity": "sha512-Nmqpru91cuABu/DTCXbM2NSRHzM2uVHfPnhJ/1zEAJx/ILBRVmz3pzH4N7DZqbdG0gWClsCC05Oj0mJ/1AWMbA==",
+            "version": "1.0.30001689",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001689.tgz",
+            "integrity": "sha512-CmeR2VBycfa+5/jOfnp/NpWPGd06nf1XYiefUvhXFfZE4GkRc9jv+eGPS4nT558WS/8lYCzV8SlANCIPvbWP1g==",
            "dev": true,
            "funding": [
                {
@@ -4484,9 +4501,9 @@
            }
        },
        "node_modules/chartjs-chart-sankey": {
-            "version": "0.13.0",
-            "resolved": "https://registry.npmjs.org/chartjs-chart-sankey/-/chartjs-chart-sankey-0.13.0.tgz",
-            "integrity": "sha512-RnmdWdVHj6vlwBsUfdxdO4LCguhzaUplun3Goudva4AgSCkicKS8Zt/gPQWi2i/FmBTYIOuNoYe6GtY+xleJiA==",
+            "version": "0.14.0",
+            "resolved": "https://registry.npmjs.org/chartjs-chart-sankey/-/chartjs-chart-sankey-0.14.0.tgz",
+            "integrity": "sha512-MrU3lE73TE9kALy4MjWFlfcwf4R1EN/DBvhHxmv9n4AHap//JLKjlJTLIZwHsUjDsYo0B8PuMkrJODwfirEZUA==",
            "license": "MIT",
            "peerDependencies": {
                "chart.js": ">=3.3.0"
@@ -4895,6 +4912,16 @@
                "node": ">=10"
            }
        },
+        "node_modules/cosmiconfig/node_modules/yaml": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
        "node_modules/create-ecdh": {
            "version": "4.0.4",
            "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
@@ -5224,6 +5251,16 @@
                "postcss": "^8.2.15"
            }
        },
+        "node_modules/cssnano/node_modules/yaml": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
        "node_modules/csso": {
            "version": "4.2.0",
            "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
@@ -5587,13 +5624,13 @@
            "license": "BSD-2-Clause"
        },
        "node_modules/dunder-proto": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.0.tgz",
-            "integrity": "sha512-9+Sj30DIu+4KvHqMfLUGLFYL2PkURSYMVXJyXe92nFRvlYq5hBjLEhblKB+vkd/WVlUYMWigiY07T91Fkk0+4A==",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+            "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "call-bind-apply-helpers": "^1.0.0",
+                "call-bind-apply-helpers": "^1.0.1",
                "es-errors": "^1.3.0",
                "gopd": "^1.2.0"
            },
@@ -5609,9 +5646,9 @@
            "license": "MIT"
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.5.73",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.73.tgz",
-            "integrity": "sha512-8wGNxG9tAG5KhGd3eeA0o6ixhiNdgr0DcHWm85XPCphwZgD1lIEoi6t3VERayWao7SF7AAZTw6oARGJeVjH8Kg==",
+            "version": "1.5.74",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.74.tgz",
+            "integrity": "sha512-ck3//9RC+6oss/1Bh9tiAVFy5vfSKbRHAFh7Z3/eTRkEqJeWgymloShB17Vg3Z4nmDNp35vAd1BZ6CMW4Wt6Iw==",
            "dev": true,
            "license": "ISC"
        },
@@ -5756,9 +5793,9 @@
            }
        },
        "node_modules/esbuild": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-            "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+            "version": "0.24.0",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz",
+            "integrity": "sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==",
            "dev": true,
            "hasInstallScript": true,
            "license": "MIT",
@@ -5766,32 +5803,33 @@
                "esbuild": "bin/esbuild"
            },
            "engines": {
-                "node": ">=12"
+                "node": ">=18"
            },
            "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.21.5",
-                "@esbuild/android-arm": "0.21.5",
-                "@esbuild/android-arm64": "0.21.5",
-                "@esbuild/android-x64": "0.21.5",
-                "@esbuild/darwin-arm64": "0.21.5",
-                "@esbuild/darwin-x64": "0.21.5",
-                "@esbuild/freebsd-arm64": "0.21.5",
-                "@esbuild/freebsd-x64": "0.21.5",
-                "@esbuild/linux-arm": "0.21.5",
-                "@esbuild/linux-arm64": "0.21.5",
-                "@esbuild/linux-ia32": "0.21.5",
-                "@esbuild/linux-loong64": "0.21.5",
-                "@esbuild/linux-mips64el": "0.21.5",
-                "@esbuild/linux-ppc64": "0.21.5",
-                "@esbuild/linux-riscv64": "0.21.5",
-                "@esbuild/linux-s390x": "0.21.5",
-                "@esbuild/linux-x64": "0.21.5",
-                "@esbuild/netbsd-x64": "0.21.5",
-                "@esbuild/openbsd-x64": "0.21.5",
-                "@esbuild/sunos-x64": "0.21.5",
-                "@esbuild/win32-arm64": "0.21.5",
-                "@esbuild/win32-ia32": "0.21.5",
-                "@esbuild/win32-x64": "0.21.5"
+                "@esbuild/aix-ppc64": "0.24.0",
+                "@esbuild/android-arm": "0.24.0",
+                "@esbuild/android-arm64": "0.24.0",
+                "@esbuild/android-x64": "0.24.0",
+                "@esbuild/darwin-arm64": "0.24.0",
+                "@esbuild/darwin-x64": "0.24.0",
+                "@esbuild/freebsd-arm64": "0.24.0",
+                "@esbuild/freebsd-x64": "0.24.0",
+                "@esbuild/linux-arm": "0.24.0",
+                "@esbuild/linux-arm64": "0.24.0",
+                "@esbuild/linux-ia32": "0.24.0",
+                "@esbuild/linux-loong64": "0.24.0",
+                "@esbuild/linux-mips64el": "0.24.0",
+                "@esbuild/linux-ppc64": "0.24.0",
+                "@esbuild/linux-riscv64": "0.24.0",
+                "@esbuild/linux-s390x": "0.24.0",
+                "@esbuild/linux-x64": "0.24.0",
+                "@esbuild/netbsd-x64": "0.24.0",
+                "@esbuild/openbsd-arm64": "0.24.0",
+                "@esbuild/openbsd-x64": "0.24.0",
+                "@esbuild/sunos-x64": "0.24.0",
+                "@esbuild/win32-arm64": "0.24.0",
+                "@esbuild/win32-ia32": "0.24.0",
+                "@esbuild/win32-x64": "0.24.0"
            }
        },
        "node_modules/escalade": {
@@ -6894,9 +6932,9 @@
            }
        },
        "node_modules/i18next": {
-            "version": "24.1.0",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.1.0.tgz",
-            "integrity": "sha512-suKlX82AlptkMUO5YRfaAeH4FQyyKvR66jNaubTMiyPPMx7INU6PXAiy3PGULc0q6K+t9nxmDf/TRj9KjAivmw==",
+            "version": "24.1.2",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.1.2.tgz",
+            "integrity": "sha512-th/075GW0Ub1gYDMHLiZXMGSfGv1aP1VqjT3fma/12hNHCNlH8oJMftvlDzycT/R+KoULWk+xLU8H1JRwV85qw==",
            "funding": [
                {
                    "type": "individual",
@@ -7404,13 +7442,14 @@
            "license": "MIT"
        },
        "node_modules/json-stable-stringify": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz",
-            "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==",
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.2.0.tgz",
+            "integrity": "sha512-ex8jk9BZHBolvbd5cRnAgwyaYcYB0qZldy1e+LCOdcF6+AUmVZ6LcGUMzsRTW83QMeu+GxZGrcLqxqrgfXGvIw==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "call-bind": "^1.0.5",
+                "call-bind": "^1.0.8",
+                "call-bound": "^1.0.3",
                "isarray": "^2.0.5",
                "jsonify": "^0.0.1",
                "object-keys": "^1.1.1"
@@ -7770,9 +7809,9 @@
            }
        },
        "node_modules/magic-string": {
-            "version": "0.30.15",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.15.tgz",
-            "integrity": "sha512-zXeaYRgZ6ldS1RJJUrMrYgNJ4fdwnyI6tVqoiIhyCyv5IVTK9BU8Ic2l253GGETQHxI4HNUwhJ3fjDhKqEoaAw==",
+            "version": "0.30.17",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
+            "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -8649,19 +8688,6 @@
                "node": ">=6"
            }
        },
-        "node_modules/patch-package/node_modules/yaml": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz",
-            "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==",
-            "dev": true,
-            "license": "ISC",
-            "bin": {
-                "yaml": "bin.mjs"
-            },
-            "engines": {
-                "node": ">= 14"
-            }
-        },
        "node_modules/path-browserify": {
            "version": "0.0.1",
            "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
@@ -8944,6 +8970,16 @@
                }
            }
        },
+        "node_modules/postcss-load-config/node_modules/yaml": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
        "node_modules/postcss-loader": {
            "version": "6.2.1",
            "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
@@ -10015,9 +10051,9 @@
            }
        },
        "node_modules/sass/node_modules/chokidar": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
-            "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.2.tgz",
+            "integrity": "sha512-/b57FK+bblSU+dfewfFe0rT1YjVDfOmeLQwCAuC+vwvgLkXboATqqmy+Ipux6JrF6L5joe5CBnFOw+gLWH6yKg==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -11214,21 +11250,21 @@
            }
        },
        "node_modules/vite": {
-            "version": "5.4.11",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz",
-            "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==",
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+            "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "esbuild": "^0.21.3",
-                "postcss": "^8.4.43",
-                "rollup": "^4.20.0"
+                "esbuild": "^0.24.0",
+                "postcss": "^8.4.49",
+                "rollup": "^4.23.0"
            },
            "bin": {
                "vite": "bin/vite.js"
            },
            "engines": {
-                "node": "^18.0.0 || >=20.0.0"
+                "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
            },
            "funding": {
                "url": "https://github.com/vitejs/vite?sponsor=1"
@@ -11237,19 +11273,25 @@
                "fsevents": "~2.3.3"
            },
            "peerDependencies": {
-                "@types/node": "^18.0.0 || >=20.0.0",
+                "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+                "jiti": ">=1.21.0",
                "less": "*",
                "lightningcss": "^1.21.0",
                "sass": "*",
                "sass-embedded": "*",
                "stylus": "*",
                "sugarss": "*",
-                "terser": "^5.4.0"
+                "terser": "^5.16.0",
+                "tsx": "^4.8.1",
+                "yaml": "^2.4.2"
            },
            "peerDependenciesMeta": {
                "@types/node": {
                    "optional": true
                },
+                "jiti": {
+                    "optional": true
+                },
                "less": {
                    "optional": true
                },
@@ -11270,6 +11312,12 @@
                },
                "terser": {
                    "optional": true
+                },
+                "tsx": {
+                    "optional": true
+                },
+                "yaml": {
+                    "optional": true
                }
            }
        },
@@ -12043,13 +12091,16 @@
            "license": "ISC"
        },
        "node_modules/yaml": {
-            "version": "1.10.2",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+            "version": "2.6.1",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz",
+            "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==",
            "dev": true,
            "license": "ISC",
+            "bin": {
+                "yaml": "bin.mjs"
+            },
            "engines": {
-                "node": ">= 6"
+                "node": ">= 14"
            }
        },
        "node_modules/yargs": {
@@ -12109,7 +12160,7 @@
                "@ag-grid-community/client-side-row-model": "^32.0.2",
                "@ag-grid-community/core": "^32.0.2",
                "@ag-grid-community/infinite-row-model": "^32.0.2",
-                "@ag-grid-community/styles": "^32.0.0",
+                "@ag-grid-community/styles": "^33.0.2",
                "@fortawesome/fontawesome-free": "^6.4.0",
                "@popperjs/core": "^2.11.8",
                "admin-lte": "^4.0.0-alpha3",
@@ -12119,7 +12170,7 @@
                "bootstrap5-tags": "^1.7",
                "chart.js": "^4.4.0",
                "chartjs-adapter-date-fns": "^3.0.0",
-                "chartjs-chart-sankey": "^0.13.0",
+                "chartjs-chart-sankey": "^0.14.0",
                "date-fns": "^4.0.0",
                "i18next": "^24.0.0",
                "i18next-chained-backend": "^4.6.2",
@@ -12133,7 +12184,7 @@
                "laravel-vite-plugin": "^1.0.5",
                "patch-package": "^8.0.0",
                "sass": "^1.78.0",
-                "vite": "^5",
+                "vite": "^6",
                "vite-plugin-manifest-sri": "^0.2.0"
            }
        }
--- a/resources/assets/v1/src/locales/ru.json
+++ b/resources/assets/v1/src/locales/ru.json
@@ -129,7 +129,7 @@
        "logs": "\u041b\u043e\u0433\u0438",
        "response": "\u041e\u0442\u0432\u0435\u0442",
        "visit_webhook_url": "\u041f\u043e\u0441\u0435\u0442\u0438\u0442\u044c URL \u0432\u0435\u0431\u0445\u0443\u043a\u0430",
-        "reset_webhook_secret": "\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u0441\u0435\u043a\u0440\u0435\u0442 webhook"
+        "reset_webhook_secret": ""
    },
    "form": {
        "url": "\u0421\u0441\u044b\u043b\u043a\u0430",
--- a/resources/assets/v2/package.json
+++ b/resources/assets/v2/package.json
@@ -12,14 +12,14 @@
        "laravel-vite-plugin": "^1.0.5",
        "patch-package": "^8.0.0",
        "sass": "^1.78.0",
-        "vite": "^5",
+        "vite": "^6",
        "vite-plugin-manifest-sri": "^0.2.0"
    },
    "dependencies": {
        "@ag-grid-community/client-side-row-model": "^32.0.2",
        "@ag-grid-community/core": "^32.0.2",
        "@ag-grid-community/infinite-row-model": "^32.0.2",
-        "@ag-grid-community/styles": "^32.0.0",
+        "@ag-grid-community/styles": "^33.0.2",
        "@fortawesome/fontawesome-free": "^6.4.0",
        "@popperjs/core": "^2.11.8",
        "admin-lte": "^4.0.0-alpha3",
@@ -29,7 +29,7 @@
        "bootstrap5-tags": "^1.7",
        "chart.js": "^4.4.0",
        "chartjs-adapter-date-fns": "^3.0.0",
-        "chartjs-chart-sankey": "^0.13.0",
+        "chartjs-chart-sankey": "^0.14.0",
        "date-fns": "^4.0.0",
        "i18next": "^24.0.0",
        "i18next-chained-backend": "^4.6.2",
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -793,6 +793,7 @@ return [
    // actions and triggers
    'rule_trigger_store_journal'                          => 'When a transaction is created',
    'rule_trigger_update_journal'                         => 'When a transaction is updated',
+    'rule_trigger_manual'                                 => 'Only when user-activated',
    'rule_trigger_user_action'                            => 'User action is ":trigger_value"',

    // OLD values (remove non-doubles later):
--- a/resources/views/rules/index.twig
+++ b/resources/views/rules/index.twig
@@ -96,10 +96,9 @@
                                        </td>
                                        <td>
                                            <div class="btn-group btn-group-xs test_buttons">
+                                                {# show which transactions would match #}
+                                                <a href="{{ route('rules.search',rule.id) }}" class="btn btn-default {% if false == rule.strict %}test_rule_triggers{% endif %}" data-id="{{ rule.id }}" title="{{ 'test_rule_triggers'|_ }}"><span data-id="{{ rule.id }}" class="fa fa-fw fa-flask"></span></a>
                                                {% if rule.active %}
-                                                    {# show which transactions would match #}
-                                                    <a href="{{ route('rules.search',rule.id) }}" class="btn btn-default {% if false == rule.strict %}test_rule_triggers{% endif %}" data-id="{{ rule.id }}" title="{{ 'test_rule_triggers'|_ }}"><span data-id="{{ rule.id }}" class="fa fa-fw fa-flask"></span></a>
-
                                                    {# actually execute rule #}
                                                    <a href="{{ route('rules.select-transactions',rule.id) }}" class="btn btn-default" title=" {{ trans('firefly.apply_rule_selection', {title: rule.title}) }}"><span class="fa fa-fw fa-power-off "></span></a>
                                                {% endif %}
--- a/routes/web.php
+++ b/routes/web.php
@@ -284,19 +284,13 @@ Route::group(
        Route::get('show/{budget}', ['uses' => 'Budget\ShowController@show', 'as' => 'show']);
        Route::get('show/{budget}/{budgetLimit}', ['uses' => 'Budget\ShowController@showByBudgetLimit', 'as' => 'show.limit']);
        Route::get('list/no-budget/all', ['uses' => 'Budget\ShowController@noBudgetAll', 'as' => 'no-budget-all']);
-        Route::get('list/no-budget/{start_date?}/{end_date?}', ['uses' => 'Budget\ShowController@noBudget', 'as' => 'no-budget'])
-            ->where(['start_date' => DATEFORMAT])
-            ->where(['end_date' => DATEFORMAT])
-        ;
+        Route::get('list/no-budget/{start_date?}/{end_date?}', ['uses' => 'Budget\ShowController@noBudget', 'as' => 'no-budget']);

        // reorder budgets
        Route::post('reorder', ['uses' => 'Budget\IndexController@reorder', 'as' => 'reorder']);

        // index
-        Route::get('{start_date?}/{end_date?}', ['uses' => 'Budget\IndexController@index', 'as' => 'index'])
-            ->where(['start_date' => DATEFORMAT])
-            ->where(['end_date' => DATEFORMAT])
-        ;
+        Route::get('{start_date?}/{end_date?}', ['uses' => 'Budget\IndexController@index', 'as' => 'index']);
    }
 );
Author	SHA1	Message	Date
github-actions	76cc27a267	Auto commit for release 'branch-v6.2' on 2024-12-18	2024-12-18 16:45:41 +01:00
James Cole	e8a6f30e4e	Merge branch 'develop' into v6.2 # Conflicts: # composer.lock # config/firefly.php # package-lock.json	2024-12-18 16:39:22 +01:00
github-actions	fe6021a3d6	Auto commit for release 'v6.1.25' on 2024-12-18	2024-12-18 16:36:08 +01:00
James Cole	563c54702b	Update changelog.	2024-12-18 16:31:37 +01:00
James Cole	4d67d27ba0	Fix #9546	2024-12-18 16:29:19 +01:00
James Cole	edf3876a57	Merge branch 'main' into develop	2024-12-18 16:26:35 +01:00
James Cole	2d10f255c2	Fix reference to old method.	2024-12-18 16:18:06 +01:00
James Cole	ee76cc6761	Fix methods	2024-12-18 16:13:32 +01:00
James Cole	f197e6623b	Merge pull request #9551 from firefly-iii/dependabot/github_actions/github/command-1.3.0	2024-12-16 06:59:19 +01:00
James Cole	42a9809450	Merge pull request #9550 from firefly-iii/dependabot/npm_and_yarn/develop/chartjs-chart-sankey-0.14.0	2024-12-16 06:59:10 +01:00
James Cole	444f80a933	Merge pull request #9549 from firefly-iii/dependabot/npm_and_yarn/develop/ag-grid-community/styles-33.0.2	2024-12-16 06:59:01 +01:00
dependabot[bot]	4b985c818a	Bump github/command from 1.2.2 to 1.3.0 Bumps [github/command](https://github.com/github/command) from 1.2.2 to 1.3.0. - [Release notes](https://github.com/github/command/releases) - [Commits](https://github.com/github/command/compare/v1.2.2...v1.3.0) --- updated-dependencies: - dependency-name: github/command dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 03:49:31 +00:00
github-actions	2e62fe7b72	Auto commit for release 'develop' on 2024-12-16	2024-12-16 04:22:19 +01:00
dependabot[bot]	ccd182aed9	Bump chartjs-chart-sankey from 0.13.0 to 0.14.0 Bumps [chartjs-chart-sankey](https://github.com/kurkle/chartjs-chart-sankey) from 0.13.0 to 0.14.0. - [Release notes](https://github.com/kurkle/chartjs-chart-sankey/releases) - [Commits](https://github.com/kurkle/chartjs-chart-sankey/compare/v0.13.0...v0.14.0) --- updated-dependencies: - dependency-name: chartjs-chart-sankey dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 03:06:22 +00:00
dependabot[bot]	615eef3fdd	Bump @ag-grid-community/styles from 32.3.3 to 33.0.2 Bumps [@ag-grid-community/styles](https://github.com/ag-grid/ag-grid) from 32.3.3 to 33.0.2. - [Release notes](https://github.com/ag-grid/ag-grid/releases) - [Commits](https://github.com/ag-grid/ag-grid/compare/v32.3.3...v33.0.2) --- updated-dependencies: - dependency-name: "@ag-grid-community/styles" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 03:06:13 +00:00
James Cole	d4e4907363	Add option for manual activation.	2024-12-15 19:59:36 +01:00
James Cole	c205e93876	Fix https://github.com/firefly-iii/firefly-iii/issues/7288	2024-12-15 19:51:46 +01:00
James Cole	3b24bb99bb	Merge branch 'v6.2' of github.com:firefly-iii/firefly-iii into v6.2	2024-12-15 19:51:37 +01:00
James Cole	2814cd1b2a	Better name	2024-12-15 19:51:30 +01:00
github-actions	5285e1ac14	Auto commit for release 'branch-v6.2' on 2024-12-15	2024-12-15 16:16:13 +01:00
James Cole	48a999cf91	Fix old reference.	2024-12-15 16:11:48 +01:00
James Cole	3117c8846e	Rename branch release.	2024-12-15 12:31:36 +01:00
github-actions	6bb297e76f	Auto commit for release 'branch-v6.2' on 2024-12-15	2024-12-15 10:32:00 +01:00
James Cole	bc698f67ea	Merge branch 'main' into v6.2	2024-12-15 09:07:04 +01:00
James Cole	f1c859aaa3	Update build job	2024-12-15 08:57:55 +01:00
James Cole	2d0aa207d4	Fix various piggy bank errors	2024-12-15 08:50:57 +01:00
James Cole	4a75e9c262	Merge branch 'v6.2' of github.com:firefly-iii/firefly-iii into v6.2	2024-12-15 08:20:52 +01:00
James Cole	ee7c4b8863	Fix user test notification.	2024-12-15 08:20:42 +01:00
github-actions	f782979d6c	Auto commit for release 'develop' on 2024-12-15	2024-12-15 04:09:28 +01:00
github-actions	53252b84fd	Auto commit for release 'develop' on 2024-12-14	2024-12-14 22:13:19 +01:00
github-actions	69b2c1f4d2	Auto commit for release 'develop' on 2024-12-09	2024-12-09 04:21:46 +01:00
James Cole	1ccda0b598	Merge pull request #9516 from firefly-iii/dependabot/npm_and_yarn/develop/vite-6.0.1 Bump vite from 5.4.11 to 6.0.1	2024-12-04 06:54:15 +01:00
James Cole	eb3b67ffd6	Merge pull request #9515 from firefly-iii/dependabot/composer/develop/laravel-json-api/laravel-5.0.0 Bump laravel-json-api/laravel from 4.1.1 to 5.0.0	2024-12-04 06:39:04 +01:00
dependabot[bot]	591b795aa3	Bump vite from 5.4.11 to 6.0.1 Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.11 to 6.0.1. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/create-vite@6.0.1/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-02 03:59:55 +00:00
dependabot[bot]	ac21ed7d18	Bump laravel-json-api/laravel from 4.1.1 to 5.0.0 Bumps [laravel-json-api/laravel](https://github.com/laravel-json-api/laravel) from 4.1.1 to 5.0.0. - [Release notes](https://github.com/laravel-json-api/laravel/releases) - [Changelog](https://github.com/laravel-json-api/laravel/blob/develop/CHANGELOG.md) - [Commits](https://github.com/laravel-json-api/laravel/compare/v4.1.1...v5.0.0) --- updated-dependencies: - dependency-name: laravel-json-api/laravel dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-02 03:55:52 +00:00
github-actions	d9c66a2db0	Auto commit for release 'develop' on 2024-12-02	2024-12-02 04:21:56 +01:00
github-actions	6f02eff020	Auto commit for release 'develop' on 2024-11-29	2024-11-29 06:56:47 +01:00