Skip to content

Commit 85a0e23

Browse files
committed
refactoring: renaming variables and configuration keys
- config('log-viewer.defaults.log_sorting_method') -> config('log-viewer.defaults.file_sorting_method') - key 'log_sort_by_time' -> 'files_sort_by_time' in IndexController - LogViewer.log_sort_by_time -> LogViewer.files_sort_by_time in FileList.vue docker compose run --rm php composer test Tests: 4 failed, 248 passed (815 assertions) Duration: 2.78s Random Order Seed: 1757604409 FAIL Tests\Feature\LogFoldersControllerTest ⨯ it can get the log files ⨯ it folders are sorted alphabetically descending when configured FAIL Tests\Unit\LogIndex\LogIndexTest ⨯ it can save to the cache after building up the index ⨯ it compresses chunk if gzip is available
1 parent 132fc68 commit 85a0e23

File tree

11 files changed

+24
-24
lines changed

11 files changed

+24
-24
lines changed

config/log-viewer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@
288288
// Order to sort the folders. Other options: `Ascending`, `Descending`
289289
'folder_sorting_order' => SortingOrder::Descending,
290290

291-
// Method for sorting logs into directories. Other options: `Alphabetical`, `ModifiedTime`
292-
'log_sorting_method' => FolderSortingMethod::ModifiedTime,
291+
// Method for sorting log-files into directories. Other options: `Alphabetical`, `ModifiedTime`
292+
'file_sorting_method' => FolderSortingMethod::ModifiedTime,
293293

294294
// Order to sort the logs. Other options: `Ascending`, `Descending`
295295
'log_sorting_order' => SortingOrder::Descending,

public/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/mix-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"/app.js": "/app.js?id=0c810fdd27597f4d9fff94af639da625",
2+
"/app.js": "/app.js?id=64391c136df5323279f6bc14315c3654",
33
"/app.css": "/app.css?id=5593a0331dd40729ff41e32a6035d872",
44
"/img/log-viewer-128.png": "/img/log-viewer-128.png?id=d576c6d2e16074d3f064e60fe4f35166",
55
"/img/log-viewer-32.png": "/img/log-viewer-32.png?id=f8ec67d10f996aa8baf00df3b61eea6d",

resources/js/components/FileList.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
<div class="text-sm text-gray-500 dark:text-gray-400">
4646
<label for="file-sort-direction" class="sr-only">Sort direction</label>
4747
<select id="file-sort-direction" class="select" v-model="fileStore.direction">
48-
<option v-if="!LogViewer.log_sort_by_time" value="asc">From A to Z</option>
49-
<option v-if="!LogViewer.log_sort_by_time" value="desc">From Z to A</option>
50-
<option v-if="LogViewer.log_sort_by_time" value="desc">Newest first</option>
51-
<option v-if="LogViewer.log_sort_by_time" value="asc">Oldest first</option>
48+
<option v-if="!LogViewer.files_sort_by_time" value="asc">From A to Z</option>
49+
<option v-if="!LogViewer.files_sort_by_time" value="desc">From Z to A</option>
50+
<option v-if="LogViewer.files_sort_by_time" value="desc">Newest first</option>
51+
<option v-if="LogViewer.files_sort_by_time" value="asc">Oldest first</option>
5252
</select>
5353
</div>
5454
</div>

src/Http/Controllers/FilesController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class FilesController
1414
public function index(Request $request)
1515
{
1616
$files = LogViewer::getFiles();
17-
$sortingMethod = config('log-viewer.defaults.log_sorting_method', FolderSortingMethod::ModifiedTime);
17+
$sortingMethod = config('log-viewer.defaults.file_sorting_method', FolderSortingMethod::ModifiedTime);
1818

1919
if ($sortingMethod === FolderSortingMethod::ModifiedTime) {
2020
if ($request->query('direction', 'desc') === 'asc') {

src/Http/Controllers/FoldersController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function index(Request $request)
2020
$sortingMethod = config('log-viewer.defaults.folder_sorting_method', FolderSortingMethod::ModifiedTime);
2121
$sortingOrder = config('log-viewer.defaults.folder_sorting_order', SortingOrder::Descending);
2222

23-
$fileSortingMethod = config('log-viewer.defaults.log_sorting_method', FolderSortingMethod::ModifiedTime);
23+
$fileSortingMethod = config('log-viewer.defaults.file_sorting_method', FolderSortingMethod::ModifiedTime);
2424
$fileSortingOrder = $request->query('direction', 'desc');
2525

2626
if ($sortingMethod === FolderSortingMethod::Alphabetical) {

src/Http/Controllers/IndexController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function __invoke()
1515
abort(404);
1616
}
1717

18-
$log_sort_by_time = config('log-viewer.defaults.log_sorting_method') === FolderSortingMethod::ModifiedTime;
18+
$files_sort_by_time = config('log-viewer.defaults.file_sorting_method') === FolderSortingMethod::ModifiedTime;
1919

2020
return view(LogViewer::getViewLayout(), [
2121
'logViewerScriptVariables' => [
@@ -26,7 +26,7 @@ public function __invoke()
2626
'path' => config('log-viewer.route_path'),
2727
'back_to_system_url' => config('log-viewer.back_to_system_url'),
2828
'back_to_system_label' => config('log-viewer.back_to_system_label'),
29-
'log_sort_by_time' => $log_sort_by_time,
29+
'files_sort_by_time' => $files_sort_by_time,
3030
'max_log_size_formatted' => Utils::bytesForHumans(LogViewer::maxLogSize()),
3131
'show_support_link' => config('log-viewer.show_support_link', true),
3232

tests/Feature/LogFilesControllerAlphaSortTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
});
1010

1111
it('you can get alphabetically sorted default desc logs files controller', function () {
12-
config(['log-viewer.defaults.log_sorting_method' => FolderSortingMethod::Alphabetical]);
12+
config(['log-viewer.defaults.file_sorting_method' => FolderSortingMethod::Alphabetical]);
1313

1414
generateLogFiles([
1515
'one.log',
@@ -29,7 +29,7 @@
2929
});
3030

3131
it('you can get alphabetically sorted asc logs files controller', function () {
32-
config(['log-viewer.defaults.log_sorting_method' => FolderSortingMethod::Alphabetical]);
32+
config(['log-viewer.defaults.file_sorting_method' => FolderSortingMethod::Alphabetical]);
3333

3434
generateLogFiles([
3535
'one.log',
@@ -49,7 +49,7 @@
4949
});
5050

5151
it('you can get alphabetically sorted desc logs files controller', function () {
52-
config(['log-viewer.defaults.log_sorting_method' => FolderSortingMethod::Alphabetical]);
52+
config(['log-viewer.defaults.file_sorting_method' => FolderSortingMethod::Alphabetical]);
5353

5454
generateLogFiles([
5555
'one.log',

tests/Feature/LogFilesControllerTimeSortTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
});
1010

1111
it('you can get time sorted default desc logs files controller', function () {
12-
config(['log-viewer.defaults.log_sorting_method' => FolderSortingMethod::ModifiedTime]);
12+
config(['log-viewer.defaults.file_sorting_method' => FolderSortingMethod::ModifiedTime]);
1313

1414
$names = [
1515
'one.log',
@@ -32,7 +32,7 @@
3232
});
3333

3434
it('you can get time sorted desc logs files controller', function () {
35-
config(['log-viewer.defaults.log_sorting_method' => FolderSortingMethod::ModifiedTime]);
35+
config(['log-viewer.defaults.file_sorting_method' => FolderSortingMethod::ModifiedTime]);
3636

3737
$names = [
3838
'one.log',
@@ -56,7 +56,7 @@
5656
});
5757

5858
it('you can get time sorted asc logs files controller', function () {
59-
config(['log-viewer.defaults.log_sorting_method' => FolderSortingMethod::ModifiedTime]);
59+
config(['log-viewer.defaults.file_sorting_method' => FolderSortingMethod::ModifiedTime]);
6060

6161
$names = [
6262
'one.log',

tests/Feature/LogFoldersControllerAlphaSortTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
});
1111

1212
it('you can get alphabetically sorted default desc logs folders controller', function () {
13-
config(['log-viewer.defaults.log_sorting_method' => FolderSortingMethod::Alphabetical]);
13+
config(['log-viewer.defaults.file_sorting_method' => FolderSortingMethod::Alphabetical]);
1414

1515
generateLogFiles([
1616
'sub/one.log',
@@ -30,7 +30,7 @@
3030
});
3131

3232
it('you can get alphabetically sorted asc logs folders controller', function () {
33-
config(['log-viewer.defaults.log_sorting_method' => FolderSortingMethod::Alphabetical]);
33+
config(['log-viewer.defaults.file_sorting_method' => FolderSortingMethod::Alphabetical]);
3434

3535
generateLogFiles([
3636
'sub/one.log',
@@ -50,7 +50,7 @@
5050
});
5151

5252
it('you can get alphabetically sorted desc logs folders controller', function () {
53-
config(['log-viewer.defaults.log_sorting_method' => FolderSortingMethod::Alphabetical]);
53+
config(['log-viewer.defaults.file_sorting_method' => FolderSortingMethod::Alphabetical]);
5454

5555
generateLogFiles([
5656
'sub/one.log',

0 commit comments

Comments
 (0)