IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix autocomplete entries.

Browse Source
This commit is contained in:
James Cole 2024-05-18 05:51:02 +02:00
parent 94d70cdb62
commit 0b63ba26bb
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
9 changed files with 65 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
app/Api/V2/Controllers/Autocomplete/AccountController.php
View File

@ -29,24 +29,20 @@ use FireflyIII\Api\V2\Request\Autocomplete\AutocompleteRequest;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\AccountBalance; use FireflyIII\Models\AccountBalance;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\TransactionCurrency; 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 FireflyIII\Support\Http\Api\ExchangeRateConverter;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Log;
/** /**
* Class AccountController * Class AccountController
*/ */
class AccountController extends Controller class AccountController extends Controller
{ {
// use AccountFilter; private AccountRepositoryInterface $repository;
private AdminAccountRepositoryInterface $adminRepository; private TransactionCurrency $default;
private TransactionCurrency $default; private ExchangeRateConverter $converter;
private ExchangeRateConverter $converter;
// private array $balanceTypes;
// private AccountRepositoryInterface $repository;
/** /**
* AccountController constructor. * AccountController constructor.
@ -56,20 +52,14 @@ class AccountController extends Controller
parent::__construct(); parent::__construct();
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
// new way of user group validation $userGroup = $this->validateUserGroup($request);
$userGroup = $this->validateUserGroup($request); $this->repository = app(AccountRepositoryInterface::class);
$this->adminRepository = app(AdminAccountRepositoryInterface::class); $this->repository->setUserGroup($userGroup);
$this->adminRepository->setUserGroup($userGroup); $this->default = app('amount')->getDefaultCurrency();
$this->default = app('amount')->getDefaultCurrency(); $this->converter = app(ExchangeRateConverter::class);
$this->converter = app(ExchangeRateConverter::class);
// $this->repository = app(AccountRepositoryInterface::class);
// $this->adminRepository->setUserGroup($this->validateUserGroup($request));
return $next($request); 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 * 3. Request includes user_group_id
* 4. Endpoint is documented. * 4. Endpoint is documented.
* 5. Collector uses user_group_id * 5. Collector uses user_group_id
*
* @throws FireflyException
*/ */
public function accounts(AutocompleteRequest $request): JsonResponse public function accounts(AutocompleteRequest $request): JsonResponse
{ {
$queryParameters = $request->getParameters(); $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 = []; $return = [];
/** @var Account $account */ /** @var Account $account */
@ -99,7 +87,7 @@ class AccountController extends Controller
private function parseAccount(Account $account): array private function parseAccount(Account $account): array
{ {
$currency = $this->adminRepository->getAccountCurrency($account); $currency = $this->repository->getAccountCurrency($account);
return [ return [
'id' => (string) $account->id, 'id' => (string) $account->id,
@ -118,16 +106,23 @@ class AccountController extends Controller
private function getAccountBalances(Account $account): array private function getAccountBalances(Account $account): array
{ {
$return = []; $return = [];
$balances = $this->adminRepository->getAccountBalances($account); $balances = $this->repository->getAccountBalances($account);
/** @var AccountBalance $balance */ /** @var AccountBalance $balance */
foreach ($balances as $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; return $return;
} }
/**
* @throws FireflyException
*/
private function parseAccountBalance(AccountBalance $balance): array private function parseAccountBalance(AccountBalance $balance): array
{ {
$currency = $balance->transactionCurrency; $currency = $balance->transactionCurrency;

2
app/Api/V2/Controllers/Autocomplete/CategoryController.php
View File

@ -64,7 +64,7 @@ class CategoryController extends Controller
public function categories(AutocompleteRequest $request): JsonResponse public function categories(AutocompleteRequest $request): JsonResponse
{ {
$queryParameters = $request->getParameters(); $queryParameters = $request->getParameters();
$result = $this->repository->searchCategory($queryParameters['query'], $this->parameters->get('size')); $result = $this->repository->searchCategory($queryParameters['query'], $queryParameters['size']);
$filtered = $result->map( $filtered = $result->map(
static function (Category $item) { static function (Category $item) {
return [ return [

12
app/Api/V2/Controllers/Autocomplete/TagController.php
View File

@ -64,15 +64,15 @@ class TagController extends Controller
public function tags(AutocompleteRequest $request): JsonResponse public function tags(AutocompleteRequest $request): JsonResponse
{ {
$queryParameters = $request->getParameters(); $queryParameters = $request->getParameters();
$result = $this->repository->searchTag($queryParameters['query'], $queryParameters['size']); $result = $this->repository->searchTag($queryParameters['query'], $queryParameters['size']);
$filtered = $result->map( $filtered = $result->map(
static function (Tag $item) { static function (Tag $item) {
return [ return [
'id' => (string)$item->id, 'id' => (string) $item->id,
'name' => $item->tag, 'title' => $item->tag,
'title' => $item->tag, 'value' => (string) $item->id,
'value' => (string)$item->id,
'label' => $item->tag, 'label' => $item->tag,
'meta' => [],
]; ];
} }
); );

4
app/Api/V2/Controllers/Autocomplete/TransactionController.php
View File

@ -64,7 +64,7 @@ class TransactionController extends Controller
public function transactionDescriptions(AutocompleteRequest $request): JsonResponse public function transactionDescriptions(AutocompleteRequest $request): JsonResponse
{ {
$queryParameters = $request->getParameters(); $queryParameters = $request->getParameters();
$result = $this->repository->searchJournalDescriptions($queryParameters['query'], $queryParameters['limit']); $result = $this->repository->searchJournalDescriptions($queryParameters['query'], $queryParameters['size']);
// limit and unique // limit and unique
$filtered = $result->unique('description'); $filtered = $result->unique('description');
@ -76,9 +76,7 @@ class TransactionController extends Controller
'id' => (string) $journal->id, 'id' => (string) $journal->id,
'title' => $journal->description, 'title' => $journal->description,
'meta' => [ 'meta' => [
'description' => $journal->description,
'transaction_group_id' => (string) $journal->transaction_group_id, 'transaction_group_id' => (string) $journal->transaction_group_id,
'name' => $journal->description,
], ],
]; ];
} }

44
package-lock.json generated
View File

@ -4020,9 +4020,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001618", "version": "1.0.30001620",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001618.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001620.tgz",
"integrity": "sha512-p407+D1tIkDvsEAPS22lJxLQQaG8OTBEqo0KhzfABGk0TU4juBNDSfH0hyAp/HRyx+M8L17z/ltyhxh27FTfQg==", "integrity": "sha512-WJvYsOjd1/BYUY6SNGUosK9DUidBPDTnOARHp3fSmFO1ekdxaY6nKRttEVrfMmYi80ctS0kz1wiWmm14fVc3ew==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@ -4065,9 +4065,9 @@
} }
}, },
"node_modules/chart.js": { "node_modules/chart.js": {
"version": "4.4.2", "version": "4.4.3",
"resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.2.tgz", "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.3.tgz",
"integrity": "sha512-6GD7iKwFpP5kbSD4MeRRRlTnQvxfQREy36uEtm1hzHzcOqwWx0YEHuspuoNlslu+nciLIB7fjjsHkUv/FzFcOg==", "integrity": "sha512-qK1gkGSRYcJzqrrzdR6a+I0vQ4/R+SoODXyAjscQ/4mzuNzySaMCd+hyVxitSY1+L2fjPD1Gbn+ibNqRmwQeLw==",
"dependencies": { "dependencies": {
"@kurkle/color": "^0.3.0" "@kurkle/color": "^0.3.0"
}, },
@ -5095,9 +5095,9 @@
"dev": true "dev": true
}, },
"node_modules/electron-to-chromium": { "node_modules/electron-to-chromium": {
"version": "1.4.772", "version": "1.4.774",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.772.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.774.tgz",
"integrity": "sha512-jFfEbxR/abTTJA3ci+2ok1NTuOBBtB4jH+UT6PUmRN+DY3WSD4FFRsgoVQ+QNIJ0T7wrXwzsWCI2WKC46b++2A==", "integrity": "sha512-132O1XCd7zcTkzS3FgkAzKmnBuNJjK8WjcTtNuoylj7MYbqw5eXehjQ5OK91g0zm7OTKIPeaAG4CPoRfD9M1Mg==",
"dev": true "dev": true
}, },
"node_modules/elliptic": { "node_modules/elliptic": {
@ -5213,9 +5213,9 @@
} }
}, },
"node_modules/es-module-lexer": { "node_modules/es-module-lexer": {
"version": "1.5.2", "version": "1.5.3",
"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.2.tgz", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.3.tgz",
"integrity": "sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA==", "integrity": "sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg==",
"dev": true "dev": true
}, },
"node_modules/esbuild": { "node_modules/esbuild": {
@ -6305,9 +6305,9 @@
} }
}, },
"node_modules/i18next-http-backend": { "node_modules/i18next-http-backend": {
"version": "2.5.1", "version": "2.5.2",
"resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.5.1.tgz", "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.5.2.tgz",
"integrity": "sha512-+rNX1tghdVxdfjfPt0bI1sNg5ahGW9kA7OboG7b4t03Fp69NdDlRIze6yXhIbN8rbHxJ8IP4dzRm/okZ15lkQg==", "integrity": "sha512-+K8HbDfrvc1/2X8jpb7RLhI9ZxBDpx3xogYkQwGKlWAUXLSEGXzgdt3EcUjLlBCdMwdQY+K+EUF6oh8oB6rwHw==",
"dependencies": { "dependencies": {
"cross-fetch": "4.0.0" "cross-fetch": "4.0.0"
} }
@ -6945,9 +6945,9 @@
} }
}, },
"node_modules/laravel-vite-plugin": { "node_modules/laravel-vite-plugin": {
"version": "1.0.2", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.0.2.tgz", "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.0.4.tgz",
"integrity": "sha512-Mcclml10khYzBVxDwJro8wnVDwD4i7XOSEMACQNnarvTnHjrjXLLL+B/Snif2wYAyElsOqagJZ7VAinb/2vF5g==", "integrity": "sha512-dEj8Q/Fsn0kKbOQ55bl/NmyJL+dD6OxnVaM/nNByw5XV4b00ky6FzXKVuHLDr4BvSJKH1y6oaOcEG5wKpCZ5+A==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
@ -9074,9 +9074,9 @@
"dev": true "dev": true
}, },
"node_modules/sass": { "node_modules/sass": {
"version": "1.77.1", "version": "1.77.2",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.77.1.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.2.tgz",
"integrity": "sha512-OMEyfirt9XEfyvocduUIOlUSkWOXS/LAt6oblR/ISXCTukyavjex+zQNm51pPCOiFKY1QpWvEH1EeCkgyV3I6w==", "integrity": "sha512-eb4GZt1C3avsX3heBNlrc7I09nyT00IUuo4eFhAbeXWU2fvA7oXI53SxODVAA+zgZCk9aunAZgO+losjR3fAwA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"chokidar": ">=3.0.0 <4.0.0", "chokidar": ">=3.0.0 <4.0.0",
@ -10922,7 +10922,7 @@
"alpinejs": "^3.13.7", "alpinejs": "^3.13.7",
"bootstrap": "^5.3.0", "bootstrap": "^5.3.0",
"bootstrap5-autocomplete": "^1.1.22", "bootstrap5-autocomplete": "^1.1.22",
"bootstrap5-tags": "^1.6.15", "bootstrap5-tags": "^1.7",
"chart.js": "^4.4.0", "chart.js": "^4.4.0",
"chartjs-adapter-date-fns": "^3.0.0", "chartjs-adapter-date-fns": "^3.0.0",
"chartjs-chart-sankey": "^0.12.1", "chartjs-chart-sankey": "^0.12.1",

2
resources/assets/v2/package.json
View File

@ -26,7 +26,7 @@
"alpinejs": "^3.13.7", "alpinejs": "^3.13.7",
"bootstrap": "^5.3.0", "bootstrap": "^5.3.0",
"bootstrap5-autocomplete": "^1.1.22", "bootstrap5-autocomplete": "^1.1.22",
"bootstrap5-tags": "^1.6.15", "bootstrap5-tags": "^1.7",
"chart.js": "^4.4.0", "chart.js": "^4.4.0",
"chartjs-adapter-date-fns": "^3.0.0", "chartjs-adapter-date-fns": "^3.0.0",
"chartjs-chart-sankey": "^0.12.1", "chartjs-chart-sankey": "^0.12.1",

9
resources/assets/v2/src/pages/transactions/create.js
View File

@ -470,7 +470,11 @@ let transactions = function () {
server: urls.tag, server: urls.tag,
liveServer: true, liveServer: true,
clearEnd: true, clearEnd: true,
labelField: 'title',
valueField: 'id',
queryParam: 'filter[query]',
allowNew: true, allowNew: true,
serverDataKey: 'data',
notFoundMessage: i18next.t('firefly.nothing_found'), notFoundMessage: i18next.t('firefly.nothing_found'),
noCache: true, noCache: true,
fetchOptions: { fetchOptions: {
@ -491,7 +495,6 @@ let transactions = function () {
addAutocomplete({ addAutocomplete({
selector: 'input.ac-source', selector: 'input.ac-source',
serverUrl: urls.account, serverUrl: urls.account,
// filters: this.filters.source,
onRenderItem: renderAccount, onRenderItem: renderAccount,
valueField: 'id', valueField: 'id',
labelField: 'title', labelField: 'title',
@ -513,7 +516,7 @@ let transactions = function () {
selector: 'input.ac-category', selector: 'input.ac-category',
serverUrl: urls.category, serverUrl: urls.category,
valueField: 'id', valueField: 'id',
labelField: 'name', labelField: 'title',
onChange: changeCategory, onChange: changeCategory,
onSelectItem: changeCategory onSelectItem: changeCategory
}); });
@ -521,7 +524,7 @@ let transactions = function () {
selector: 'input.ac-description', selector: 'input.ac-description',
serverUrl: urls.description, serverUrl: urls.description,
valueField: 'id', valueField: 'id',
labelField: 'description', labelField: 'title',
onChange: changeDescription, onChange: changeDescription,
onSelectItem: changeDescription, onSelectItem: changeDescription,
}); });

7
resources/assets/v2/src/pages/transactions/edit.js
View File

@ -216,6 +216,8 @@ let transactions = function () {
addAutocomplete({ addAutocomplete({
selector: 'input.ac-dest', selector: 'input.ac-dest',
serverUrl: urls.account, serverUrl: urls.account,
valueField: 'id',
labelField: 'title',
account_types: this.filters.destination, account_types: this.filters.destination,
onRenderItem: renderAccount, onRenderItem: renderAccount,
onChange: changeDestinationAccount, onChange: changeDestinationAccount,
@ -233,7 +235,7 @@ let transactions = function () {
selector: 'input.ac-description', selector: 'input.ac-description',
serverUrl: urls.description, serverUrl: urls.description,
valueField: 'id', valueField: 'id',
labelField: 'description', labelField: 'title',
onChange: changeDescription, onChange: changeDescription,
onSelectItem: changeDescription, onSelectItem: changeDescription,
}); });
@ -304,6 +306,9 @@ let transactions = function () {
liveServer: true, liveServer: true,
clearEnd: true, clearEnd: true,
allowNew: true, allowNew: true,
labelField: 'title',
valueField: 'id',
queryParam: 'filter[query]',
notFoundMessage: i18next.t('firefly.nothing_found'), notFoundMessage: i18next.t('firefly.nothing_found'),
noCache: true, noCache: true,
fetchOptions: { fetchOptions: {

2
routes/api.php
View File

@ -39,9 +39,9 @@ Route::group(
static function (): void { static function (): void {
// Auto complete routes // Auto complete routes
Route::get('accounts', ['uses' => 'AccountController@accounts', 'as' => 'accounts']); 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('categories', ['uses' => 'CategoryController@categories', 'as' => 'categories']);
Route::get('tags', ['uses' => 'TagController@tags', 'as' => 'tags']); Route::get('tags', ['uses' => 'TagController@tags', 'as' => 'tags']);
Route::get('transaction-descriptions', ['uses' => 'TransactionController@transactionDescriptions', 'as' => 'transaction-descriptions']);
} }
); );