From 6189d24b98b41a9b4d9ef826c050ff5aa93064b8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 1 Apr 2024 20:26:02 +0200 Subject: [PATCH] Replace variable names. --- .../Controllers/Chart/AccountController.php | 12 +++++----- .../Controllers/Chart/AccountController.php | 10 ++++---- .../Correction/FixFrontpageAccounts.php | 4 ++-- .../Controllers/Account/CreateController.php | 10 ++++---- .../Controllers/Chart/AccountController.php | 12 +++++----- .../Controllers/Chart/CategoryController.php | 4 ++-- app/Http/Controllers/HomeController.php | 12 +++++----- app/Http/Controllers/NewUserController.php | 2 +- .../Controllers/PreferencesController.php | 24 +++++++++---------- config/firefly.php | 4 ++-- .../assets/v2/pages/dashboard/piggies.js | 1 + resources/assets/v2/support/get-cache-key.js | 4 +++- .../views/v2/administrations/index.blade.php | 2 +- 13 files changed, 52 insertions(+), 49 deletions(-) diff --git a/app/Api/V1/Controllers/Chart/AccountController.php b/app/Api/V1/Controllers/Chart/AccountController.php index de628ffcfb..3d093e0bba 100644 --- a/app/Api/V1/Controllers/Chart/AccountController.php +++ b/app/Api/V1/Controllers/Chart/AccountController.php @@ -83,17 +83,17 @@ class AccountController extends Controller // user's preferences $defaultSet = $this->repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray(); - /** @var Preference $frontPage */ - $frontPage = app('preferences')->get('frontPageAccounts', $defaultSet); + /** @var Preference $frontpage */ + $frontpage = app('preferences')->get('frontpageAccounts', $defaultSet); $default = app('amount')->getDefaultCurrency(); - if (!(is_array($frontPage->data) && count($frontPage->data) > 0)) { - $frontPage->data = $defaultSet; - $frontPage->save(); + if (!(is_array($frontpage->data) && count($frontpage->data) > 0)) { + $frontpage->data = $defaultSet; + $frontpage->save(); } // get accounts: - $accounts = $this->repository->getAccountsById($frontPage->data); + $accounts = $this->repository->getAccountsById($frontpage->data); $chartData = []; /** @var Account $account */ diff --git a/app/Api/V2/Controllers/Chart/AccountController.php b/app/Api/V2/Controllers/Chart/AccountController.php index 0df13c4e0e..40f3906b9d 100644 --- a/app/Api/V2/Controllers/Chart/AccountController.php +++ b/app/Api/V2/Controllers/Chart/AccountController.php @@ -98,14 +98,14 @@ class AccountController extends Controller // user's preferences if (0 === $accounts->count()) { $defaultSet = $this->repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT])->pluck('id')->toArray(); - $frontPage = app('preferences')->get('frontPageAccounts', $defaultSet); + $frontpage = app('preferences')->get('frontpageAccounts', $defaultSet); - if (!(is_array($frontPage->data) && count($frontPage->data) > 0)) { - $frontPage->data = $defaultSet; - $frontPage->save(); + if (!(is_array($frontpage->data) && count($frontpage->data) > 0)) { + $frontpage->data = $defaultSet; + $frontpage->save(); } - $accounts = $this->repository->getAccountsById($frontPage->data); + $accounts = $this->repository->getAccountsById($frontpage->data); } // both options are overruled by "preselected" diff --git a/app/Console/Commands/Correction/FixFrontpageAccounts.php b/app/Console/Commands/Correction/FixFrontpageAccounts.php index 66c9348504..883520e397 100644 --- a/app/Console/Commands/Correction/FixFrontpageAccounts.php +++ b/app/Console/Commands/Correction/FixFrontpageAccounts.php @@ -50,7 +50,7 @@ class FixFrontpageAccounts extends Command /** @var User $user */ foreach ($users as $user) { - $preference = app('preferences')->getForUser($user, 'frontPageAccounts'); + $preference = app('preferences')->getForUser($user, 'frontpageAccounts'); if (null !== $preference) { $this->fixPreference($preference); } @@ -83,6 +83,6 @@ class FixFrontpageAccounts extends Command } } } - app('preferences')->setForUser($preference->user, 'frontPageAccounts', $fixed); + app('preferences')->setForUser($preference->user, 'frontpageAccounts', $fixed); } } diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php index 82e8b110e4..6b29b6fe0e 100644 --- a/app/Http/Controllers/Account/CreateController.php +++ b/app/Http/Controllers/Account/CreateController.php @@ -145,13 +145,13 @@ class CreateController extends Controller Log::channel('audit')->info('Stored new account.', $data); // update preferences if necessary: - $frontPage = app('preferences')->get('frontPageAccounts', [])->data; - if (!is_array($frontPage)) { - $frontPage = []; + $frontpage = app('preferences')->get('frontpageAccounts', [])->data; + if (!is_array($frontpage)) { + $frontpage = []; } if (AccountType::ASSET === $account->accountType->type) { - $frontPage[] = $account->id; - app('preferences')->set('frontPageAccounts', $frontPage); + $frontpage[] = $account->id; + app('preferences')->set('frontpageAccounts', $frontpage); } // store attachment(s): diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index 3482d02195..1c2a660b65 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -301,14 +301,14 @@ class AccountController extends Controller $end = clone session('end', today(config('app.timezone'))->endOfMonth()); $defaultSet = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray(); app('log')->debug('Default set is ', $defaultSet); - $frontPage = app('preferences')->get('frontPageAccounts', $defaultSet); - $frontPageArray = !is_array($frontPage->data) ? [] : $frontPage->data; - app('log')->debug('Frontpage preference set is ', $frontPageArray); - if (0 === count($frontPageArray)) { - app('preferences')->set('frontPageAccounts', $defaultSet); + $frontpage = app('preferences')->get('frontpageAccounts', $defaultSet); + $frontpageArray = !is_array($frontpage->data) ? [] : $frontpage->data; + app('log')->debug('Frontpage preference set is ', $frontpageArray); + if (0 === count($frontpageArray)) { + app('preferences')->set('frontpageAccounts', $defaultSet); app('log')->debug('frontpage set is empty!'); } - $accounts = $repository->getAccountsById($frontPageArray); + $accounts = $repository->getAccountsById($frontpageArray); return response()->json($this->accountBalanceChart($accounts, $start, $end)); } diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index 42be033f2b..af3b0f8938 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -116,8 +116,8 @@ class CategoryController extends Controller return response()->json($cache->get()); } - $frontPageGenerator = new FrontpageChartGenerator($start, $end); - $chartData = $frontPageGenerator->generate(); + $frontpageGenerator = new FrontpageChartGenerator($start, $end); + $chartData = $frontpageGenerator->generate(); $data = $this->generator->multiSet($chartData); $cache->store($data); diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index f68361d6bd..4365498a60 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -129,10 +129,10 @@ class HomeController extends Controller } $subTitle = (string)trans('firefly.welcome_back'); $transactions = []; - $frontPage = app('preferences')->getFresh('frontPageAccounts', $repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray()); - $frontPageArray = $frontPage->data; - if (!is_array($frontPageArray)) { - $frontPageArray = []; + $frontpage = app('preferences')->getFresh('frontpageAccounts', $repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray()); + $frontpageArray = $frontpage->data; + if (!is_array($frontpageArray)) { + $frontpageArray = []; } /** @var Carbon $start */ @@ -140,13 +140,13 @@ class HomeController extends Controller /** @var Carbon $end */ $end = session('end', today(config('app.timezone'))->endOfMonth()); - $accounts = $repository->getAccountsById($frontPageArray); + $accounts = $repository->getAccountsById($frontpageArray); $today = today(config('app.timezone')); // sort frontpage accounts by order $accounts = $accounts->sortBy('order'); - app('log')->debug('Frontpage accounts are ', $frontPageArray); + app('log')->debug('Frontpage accounts are ', $frontpageArray); /** @var BillRepositoryInterface $billRepository */ $billRepository = app(BillRepositoryInterface::class); diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index 18b422872b..2fd5e1e70b 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/app/Http/Controllers/NewUserController.php @@ -115,7 +115,7 @@ class NewUserController extends Controller // store frontpage preferences: $accounts = $this->repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray(); - app('preferences')->set('frontPageAccounts', $accounts); + app('preferences')->set('frontpageAccounts', $accounts); // mark. app('preferences')->mark(); diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index 90e5421f57..77c27abd94 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -89,10 +89,10 @@ class PreferencesController extends Controller /** @var array $accountIds */ $accountIds = $accounts->pluck('id')->toArray(); $viewRange = app('navigation')->getViewRange(false); - $frontPageAccountsPref = app('preferences')->get('frontPageAccounts', $accountIds); - $frontPageAccounts = $frontPageAccountsPref->data; - if (!is_array($frontPageAccounts)) { - $frontPageAccounts = $accountIds; + $frontpageAccountsPref = app('preferences')->get('frontpageAccounts', $accountIds); + $frontpageAccounts = $frontpageAccountsPref->data; + if (!is_array($frontpageAccounts)) { + $frontpageAccounts = $accountIds; } $language = app('steam')->getLanguage(); $languages = config('firefly.languages'); @@ -128,8 +128,8 @@ class PreferencesController extends Controller $locales = ['equal' => (string)trans('firefly.equal_to_language')] + $locales; // an important fallback is that the frontPageAccount array gets refilled automatically // when it turns up empty. - if (0 === count($frontPageAccounts)) { - $frontPageAccounts = $accountIds; + if (0 === count($frontpageAccounts)) { + $frontpageAccounts = $accountIds; } // for the demo user, the slackUrl is automatically emptied. @@ -139,7 +139,7 @@ class PreferencesController extends Controller $slackUrl = ''; } - return view('preferences.index', compact('language', 'groupedAccounts', 'isDocker', 'frontPageAccounts', 'languages', 'darkMode', 'availableDarkModes', 'notifications', 'slackUrl', 'locales', 'locale', 'tjOptionalFields', 'viewRange', 'customFiscalYear', 'listPageSize', 'fiscalYearStart')); + return view('preferences.index', compact('language', 'groupedAccounts', 'isDocker', 'frontpageAccounts', 'languages', 'darkMode', 'availableDarkModes', 'notifications', 'slackUrl', 'locales', 'locale', 'tjOptionalFields', 'viewRange', 'customFiscalYear', 'listPageSize', 'fiscalYearStart')); } /** @@ -155,12 +155,12 @@ class PreferencesController extends Controller public function postIndex(Request $request) { // front page accounts - $frontPageAccounts = []; - if (is_array($request->get('frontPageAccounts')) && count($request->get('frontPageAccounts')) > 0) { - foreach ($request->get('frontPageAccounts') as $id) { - $frontPageAccounts[] = (int)$id; + $frontpageAccounts = []; + if (is_array($request->get('frontpageAccounts')) && count($request->get('frontpageAccounts')) > 0) { + foreach ($request->get('frontpageAccounts') as $id) { + $frontpageAccounts[] = (int)$id; } - app('preferences')->set('frontPageAccounts', $frontPageAccounts); + app('preferences')->set('frontpageAccounts', $frontpageAccounts); } // extract notifications: diff --git a/config/firefly.php b/config/firefly.php index 9ec7bb1fb5..8219a4f364 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -216,13 +216,13 @@ return [ ], // administration specific preferences - 'admin_specific_prefs' => ['frontPageAccounts', 'lastActivity'], + 'admin_specific_prefs' => ['frontpageAccounts', 'lastActivity'], // default user-related values 'darkMode' => 'browser', 'list_length' => 10, // to be removed if v1 is cancelled. 'default_preferences' => [ - 'frontPageAccounts' => [], + 'frontpageAccounts' => [], 'listPageSize' => 50, 'currencyPreference' => 'EUR', 'language' => 'en_US', diff --git a/resources/assets/v2/pages/dashboard/piggies.js b/resources/assets/v2/pages/dashboard/piggies.js index 3b949d3e05..9fd1392769 100644 --- a/resources/assets/v2/pages/dashboard/piggies.js +++ b/resources/assets/v2/pages/dashboard/piggies.js @@ -35,6 +35,7 @@ export default () => ({ getFreshData() { const start = new Date(window.store.get('start')); const end = new Date(window.store.get('end')); + // needs user data. const cacheKey = getCacheKey(PIGGY_CACHE_KEY, start, end); const cacheValid = window.store.get('cacheValid'); diff --git a/resources/assets/v2/support/get-cache-key.js b/resources/assets/v2/support/get-cache-key.js index 8bd22e67d6..9d4e5b12c8 100644 --- a/resources/assets/v2/support/get-cache-key.js +++ b/resources/assets/v2/support/get-cache-key.js @@ -19,9 +19,11 @@ */ import {format} from "date-fns"; +import store from "store"; function getCacheKey(string, start, end) { - const cacheKey = format(start, 'y-MM-dd') + '_' + format(end, 'y-MM-dd') + '_' + string; + const localValue = store.get('lastActivity'); + const cacheKey = format(start, 'y-MM-dd') + '_' + format(end, 'y-MM-dd') + '_' + string + localValue; console.log('getCacheKey: ' + cacheKey); return String(cacheKey); } diff --git a/resources/views/v2/administrations/index.blade.php b/resources/views/v2/administrations/index.blade.php index 8aef215a61..eb09e95ac3 100644 --- a/resources/views/v2/administrations/index.blade.php +++ b/resources/views/v2/administrations/index.blade.php @@ -17,7 +17,7 @@