From 0b63ba26bb32a9511987617e08b5025e757818c3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 18 May 2024 05:51:02 +0200 Subject: [PATCH] Fix autocomplete entries. --- .../Autocomplete/AccountController.php | 47 +++++++++---------- .../Autocomplete/CategoryController.php | 2 +- .../Autocomplete/TagController.php | 12 ++--- .../Autocomplete/TransactionController.php | 4 +- package-lock.json | 44 ++++++++--------- resources/assets/v2/package.json | 2 +- .../v2/src/pages/transactions/create.js | 9 ++-- .../assets/v2/src/pages/transactions/edit.js | 7 ++- routes/api.php | 2 +- 9 files changed, 65 insertions(+), 64 deletions(-) diff --git a/app/Api/V2/Controllers/Autocomplete/AccountController.php b/app/Api/V2/Controllers/Autocomplete/AccountController.php index 79ac9c969a..3acca2b8be 100644 --- a/app/Api/V2/Controllers/Autocomplete/AccountController.php +++ b/app/Api/V2/Controllers/Autocomplete/AccountController.php @@ -29,24 +29,20 @@ use FireflyIII\Api\V2\Request\Autocomplete\AutocompleteRequest; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Account; use FireflyIII\Models\AccountBalance; -use FireflyIII\Models\AccountType; use FireflyIII\Models\TransactionCurrency; -use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface as AdminAccountRepositoryInterface; +use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface; use FireflyIII\Support\Http\Api\ExchangeRateConverter; use Illuminate\Http\JsonResponse; +use Illuminate\Support\Facades\Log; /** * Class AccountController */ class AccountController extends Controller { - // use AccountFilter; - private AdminAccountRepositoryInterface $adminRepository; - private TransactionCurrency $default; - private ExchangeRateConverter $converter; - - // private array $balanceTypes; - // private AccountRepositoryInterface $repository; + private AccountRepositoryInterface $repository; + private TransactionCurrency $default; + private ExchangeRateConverter $converter; /** * AccountController constructor. @@ -56,20 +52,14 @@ class AccountController extends Controller parent::__construct(); $this->middleware( function ($request, $next) { - // new way of user group validation - $userGroup = $this->validateUserGroup($request); - $this->adminRepository = app(AdminAccountRepositoryInterface::class); - $this->adminRepository->setUserGroup($userGroup); - $this->default = app('amount')->getDefaultCurrency(); - $this->converter = app(ExchangeRateConverter::class); - - // $this->repository = app(AccountRepositoryInterface::class); - // $this->adminRepository->setUserGroup($this->validateUserGroup($request)); - + $userGroup = $this->validateUserGroup($request); + $this->repository = app(AccountRepositoryInterface::class); + $this->repository->setUserGroup($userGroup); + $this->default = app('amount')->getDefaultCurrency(); + $this->converter = app(ExchangeRateConverter::class); return $next($request); } ); - // $this->balanceTypes = [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]; } /** @@ -80,13 +70,11 @@ class AccountController extends Controller * 3. Request includes user_group_id * 4. Endpoint is documented. * 5. Collector uses user_group_id - * - * @throws FireflyException */ public function accounts(AutocompleteRequest $request): JsonResponse { $queryParameters = $request->getParameters(); - $result = $this->adminRepository->searchAccount((string) $queryParameters['query'], $queryParameters['account_types'], $queryParameters['size']); + $result = $this->repository->searchAccount((string) $queryParameters['query'], $queryParameters['account_types'], $queryParameters['size']); $return = []; /** @var Account $account */ @@ -99,7 +87,7 @@ class AccountController extends Controller private function parseAccount(Account $account): array { - $currency = $this->adminRepository->getAccountCurrency($account); + $currency = $this->repository->getAccountCurrency($account); return [ 'id' => (string) $account->id, @@ -118,16 +106,23 @@ class AccountController extends Controller private function getAccountBalances(Account $account): array { $return = []; - $balances = $this->adminRepository->getAccountBalances($account); + $balances = $this->repository->getAccountBalances($account); /** @var AccountBalance $balance */ foreach ($balances as $balance) { - $return[] = $this->parseAccountBalance($balance); + try { + $return[] = $this->parseAccountBalance($balance); + } catch (FireflyException $e) { + Log::error(sprintf('Could not parse convert account balance: %s', $e->getMessage())); + } } return $return; } + /** + * @throws FireflyException + */ private function parseAccountBalance(AccountBalance $balance): array { $currency = $balance->transactionCurrency; diff --git a/app/Api/V2/Controllers/Autocomplete/CategoryController.php b/app/Api/V2/Controllers/Autocomplete/CategoryController.php index 1fac580dbc..0bde4bd6d7 100644 --- a/app/Api/V2/Controllers/Autocomplete/CategoryController.php +++ b/app/Api/V2/Controllers/Autocomplete/CategoryController.php @@ -64,7 +64,7 @@ class CategoryController extends Controller public function categories(AutocompleteRequest $request): JsonResponse { $queryParameters = $request->getParameters(); - $result = $this->repository->searchCategory($queryParameters['query'], $this->parameters->get('size')); + $result = $this->repository->searchCategory($queryParameters['query'], $queryParameters['size']); $filtered = $result->map( static function (Category $item) { return [ diff --git a/app/Api/V2/Controllers/Autocomplete/TagController.php b/app/Api/V2/Controllers/Autocomplete/TagController.php index 35fd46cc2d..5762cc2249 100644 --- a/app/Api/V2/Controllers/Autocomplete/TagController.php +++ b/app/Api/V2/Controllers/Autocomplete/TagController.php @@ -64,15 +64,15 @@ class TagController extends Controller public function tags(AutocompleteRequest $request): JsonResponse { $queryParameters = $request->getParameters(); - $result = $this->repository->searchTag($queryParameters['query'], $queryParameters['size']); - $filtered = $result->map( + $result = $this->repository->searchTag($queryParameters['query'], $queryParameters['size']); + $filtered = $result->map( static function (Tag $item) { return [ - 'id' => (string)$item->id, - 'name' => $item->tag, - 'title' => $item->tag, - 'value' => (string)$item->id, + 'id' => (string) $item->id, + 'title' => $item->tag, + 'value' => (string) $item->id, 'label' => $item->tag, + 'meta' => [], ]; } ); diff --git a/app/Api/V2/Controllers/Autocomplete/TransactionController.php b/app/Api/V2/Controllers/Autocomplete/TransactionController.php index c6f1da01ac..9fd206f0f9 100644 --- a/app/Api/V2/Controllers/Autocomplete/TransactionController.php +++ b/app/Api/V2/Controllers/Autocomplete/TransactionController.php @@ -64,7 +64,7 @@ class TransactionController extends Controller public function transactionDescriptions(AutocompleteRequest $request): JsonResponse { $queryParameters = $request->getParameters(); - $result = $this->repository->searchJournalDescriptions($queryParameters['query'], $queryParameters['limit']); + $result = $this->repository->searchJournalDescriptions($queryParameters['query'], $queryParameters['size']); // limit and unique $filtered = $result->unique('description'); @@ -76,9 +76,7 @@ class TransactionController extends Controller 'id' => (string) $journal->id, 'title' => $journal->description, 'meta' => [ - 'description' => $journal->description, 'transaction_group_id' => (string) $journal->transaction_group_id, - 'name' => $journal->description, ], ]; } diff --git a/package-lock.json b/package-lock.json index b7c8b17d87..ad1feacd2e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4020,9 +4020,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001618", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001618.tgz", - "integrity": "sha512-p407+D1tIkDvsEAPS22lJxLQQaG8OTBEqo0KhzfABGk0TU4juBNDSfH0hyAp/HRyx+M8L17z/ltyhxh27FTfQg==", + "version": "1.0.30001620", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001620.tgz", + "integrity": "sha512-WJvYsOjd1/BYUY6SNGUosK9DUidBPDTnOARHp3fSmFO1ekdxaY6nKRttEVrfMmYi80ctS0kz1wiWmm14fVc3ew==", "dev": true, "funding": [ { @@ -4065,9 +4065,9 @@ } }, "node_modules/chart.js": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.2.tgz", - "integrity": "sha512-6GD7iKwFpP5kbSD4MeRRRlTnQvxfQREy36uEtm1hzHzcOqwWx0YEHuspuoNlslu+nciLIB7fjjsHkUv/FzFcOg==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.3.tgz", + "integrity": "sha512-qK1gkGSRYcJzqrrzdR6a+I0vQ4/R+SoODXyAjscQ/4mzuNzySaMCd+hyVxitSY1+L2fjPD1Gbn+ibNqRmwQeLw==", "dependencies": { "@kurkle/color": "^0.3.0" }, @@ -5095,9 +5095,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.772", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.772.tgz", - "integrity": "sha512-jFfEbxR/abTTJA3ci+2ok1NTuOBBtB4jH+UT6PUmRN+DY3WSD4FFRsgoVQ+QNIJ0T7wrXwzsWCI2WKC46b++2A==", + "version": "1.4.774", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.774.tgz", + "integrity": "sha512-132O1XCd7zcTkzS3FgkAzKmnBuNJjK8WjcTtNuoylj7MYbqw5eXehjQ5OK91g0zm7OTKIPeaAG4CPoRfD9M1Mg==", "dev": true }, "node_modules/elliptic": { @@ -5213,9 +5213,9 @@ } }, "node_modules/es-module-lexer": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.2.tgz", - "integrity": "sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.3.tgz", + "integrity": "sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg==", "dev": true }, "node_modules/esbuild": { @@ -6305,9 +6305,9 @@ } }, "node_modules/i18next-http-backend": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.5.1.tgz", - "integrity": "sha512-+rNX1tghdVxdfjfPt0bI1sNg5ahGW9kA7OboG7b4t03Fp69NdDlRIze6yXhIbN8rbHxJ8IP4dzRm/okZ15lkQg==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.5.2.tgz", + "integrity": "sha512-+K8HbDfrvc1/2X8jpb7RLhI9ZxBDpx3xogYkQwGKlWAUXLSEGXzgdt3EcUjLlBCdMwdQY+K+EUF6oh8oB6rwHw==", "dependencies": { "cross-fetch": "4.0.0" } @@ -6945,9 +6945,9 @@ } }, "node_modules/laravel-vite-plugin": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.0.2.tgz", - "integrity": "sha512-Mcclml10khYzBVxDwJro8wnVDwD4i7XOSEMACQNnarvTnHjrjXLLL+B/Snif2wYAyElsOqagJZ7VAinb/2vF5g==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.0.4.tgz", + "integrity": "sha512-dEj8Q/Fsn0kKbOQ55bl/NmyJL+dD6OxnVaM/nNByw5XV4b00ky6FzXKVuHLDr4BvSJKH1y6oaOcEG5wKpCZ5+A==", "dev": true, "dependencies": { "picocolors": "^1.0.0", @@ -9074,9 +9074,9 @@ "dev": true }, "node_modules/sass": { - "version": "1.77.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.1.tgz", - "integrity": "sha512-OMEyfirt9XEfyvocduUIOlUSkWOXS/LAt6oblR/ISXCTukyavjex+zQNm51pPCOiFKY1QpWvEH1EeCkgyV3I6w==", + "version": "1.77.2", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.2.tgz", + "integrity": "sha512-eb4GZt1C3avsX3heBNlrc7I09nyT00IUuo4eFhAbeXWU2fvA7oXI53SxODVAA+zgZCk9aunAZgO+losjR3fAwA==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -10922,7 +10922,7 @@ "alpinejs": "^3.13.7", "bootstrap": "^5.3.0", "bootstrap5-autocomplete": "^1.1.22", - "bootstrap5-tags": "^1.6.15", + "bootstrap5-tags": "^1.7", "chart.js": "^4.4.0", "chartjs-adapter-date-fns": "^3.0.0", "chartjs-chart-sankey": "^0.12.1", diff --git a/resources/assets/v2/package.json b/resources/assets/v2/package.json index a8a63aee69..2033603580 100644 --- a/resources/assets/v2/package.json +++ b/resources/assets/v2/package.json @@ -26,7 +26,7 @@ "alpinejs": "^3.13.7", "bootstrap": "^5.3.0", "bootstrap5-autocomplete": "^1.1.22", - "bootstrap5-tags": "^1.6.15", + "bootstrap5-tags": "^1.7", "chart.js": "^4.4.0", "chartjs-adapter-date-fns": "^3.0.0", "chartjs-chart-sankey": "^0.12.1", diff --git a/resources/assets/v2/src/pages/transactions/create.js b/resources/assets/v2/src/pages/transactions/create.js index 7b8d9999e4..18682d0e98 100644 --- a/resources/assets/v2/src/pages/transactions/create.js +++ b/resources/assets/v2/src/pages/transactions/create.js @@ -470,7 +470,11 @@ let transactions = function () { server: urls.tag, liveServer: true, clearEnd: true, + labelField: 'title', + valueField: 'id', + queryParam: 'filter[query]', allowNew: true, + serverDataKey: 'data', notFoundMessage: i18next.t('firefly.nothing_found'), noCache: true, fetchOptions: { @@ -491,7 +495,6 @@ let transactions = function () { addAutocomplete({ selector: 'input.ac-source', serverUrl: urls.account, - // filters: this.filters.source, onRenderItem: renderAccount, valueField: 'id', labelField: 'title', @@ -513,7 +516,7 @@ let transactions = function () { selector: 'input.ac-category', serverUrl: urls.category, valueField: 'id', - labelField: 'name', + labelField: 'title', onChange: changeCategory, onSelectItem: changeCategory }); @@ -521,7 +524,7 @@ let transactions = function () { selector: 'input.ac-description', serverUrl: urls.description, valueField: 'id', - labelField: 'description', + labelField: 'title', onChange: changeDescription, onSelectItem: changeDescription, }); diff --git a/resources/assets/v2/src/pages/transactions/edit.js b/resources/assets/v2/src/pages/transactions/edit.js index 433520f951..9d3fcc38d7 100644 --- a/resources/assets/v2/src/pages/transactions/edit.js +++ b/resources/assets/v2/src/pages/transactions/edit.js @@ -216,6 +216,8 @@ let transactions = function () { addAutocomplete({ selector: 'input.ac-dest', serverUrl: urls.account, + valueField: 'id', + labelField: 'title', account_types: this.filters.destination, onRenderItem: renderAccount, onChange: changeDestinationAccount, @@ -233,7 +235,7 @@ let transactions = function () { selector: 'input.ac-description', serverUrl: urls.description, valueField: 'id', - labelField: 'description', + labelField: 'title', onChange: changeDescription, onSelectItem: changeDescription, }); @@ -304,6 +306,9 @@ let transactions = function () { liveServer: true, clearEnd: true, allowNew: true, + labelField: 'title', + valueField: 'id', + queryParam: 'filter[query]', notFoundMessage: i18next.t('firefly.nothing_found'), noCache: true, fetchOptions: { diff --git a/routes/api.php b/routes/api.php index a29522b67e..605e07b341 100644 --- a/routes/api.php +++ b/routes/api.php @@ -39,9 +39,9 @@ Route::group( static function (): void { // Auto complete routes Route::get('accounts', ['uses' => 'AccountController@accounts', 'as' => 'accounts']); - Route::get('transaction-descriptions', ['uses' => 'TransactionController@transactionDescriptions', 'as' => 'transaction-descriptions']); Route::get('categories', ['uses' => 'CategoryController@categories', 'as' => 'categories']); Route::get('tags', ['uses' => 'TagController@tags', 'as' => 'tags']); + Route::get('transaction-descriptions', ['uses' => 'TransactionController@transactionDescriptions', 'as' => 'transaction-descriptions']); } );