Skip to content

A free open source IT asset/license management system

Added #18920 - sorting by EULA in category view

sniped21ccdfcbf27
diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php
index b43f6da80f..2a4d34490c 100644
--- a/app/Http/Controllers/Api/CategoriesController.php
+++ b/app/Http/Controllers/Api/CategoriesController.php
@@ -129,6 +129,11 @@ class CategoriesController extends Controller
case 'created_by':
$categories = $categories->OrderByCreatedBy($order);
break;
+ // This is annoying, since it's not a real relationship, which is what we usually use these switches for, but
+ // we call the field has_eula, not eula_text, so there won't be a matching field
+ case 'has_eula':
+ $categories = $categories->orderBy('eula_text', $order);
+ break;
default:
$categories = $categories->orderBy($column_sort, $order);
break;
diff --git a/app/Http/Transformers/CategoriesTransformer.php b/app/Http/Transformers/CategoriesTransformer.php
index dc0ec3cfbe..412ccb0023 100644
--- a/app/Http/Transformers/CategoriesTransformer.php
+++ b/app/Http/Transformers/CategoriesTransformer.php
@@ -51,7 +51,7 @@ class CategoriesTransformer
'name' => e($category->name),
'image' => ($category->image) ? Storage::disk('public')->url('categories/'.e($category->image)) : null,
'category_type' => Helper::categoryTypeList($category->category_type),
- 'has_eula' => ($category->getEula() ? true : false),
+ 'has_eula' => ($category->eula_text) ? true : false,
'use_default_eula' => ($category->use_default_eula == '1' ? true : false),
'eula' => ($category->getEula()),
'checkin_email' => ($category->checkin_email == '1'),
diff --git a/app/Presenters/CategoryPresenter.php b/app/Presenters/CategoryPresenter.php
index ee12eb8d67..5c5d620c57 100644
--- a/app/Presenters/CategoryPresenter.php
+++ b/app/Presenters/CategoryPresenter.php
@@ -59,10 +59,18 @@ class CategoryPresenter extends Presenter
], [
'field' => 'has_eula',
'searchable' => false,
- 'sortable' => false,
+ 'sortable' => true,
'title' => trans('admin/categories/table.eula_text'),
'visible' => false,
'formatter' => 'trueFalseFormatter',
+ ],
+ [
+ 'field' => 'use_default_eula',
+ 'searchable' => false,
+ 'sortable' => true,
+ 'title' => trans('admin/settings/general.default_eula_text'),
+ 'visible' => false,
+ 'formatter' => 'trueFalseFormatter',
], [
'field' => 'checkin_email',
'searchable' => false,
@@ -78,13 +86,6 @@ class CategoryPresenter extends Presenter
'title' => trans('admin/categories/table.require_acceptance'),
'visible' => true,
'formatter' => 'trueFalseFormatter',
- ], [
- 'field' => 'use_default_eula',
- 'searchable' => false,
- 'sortable' => true,
- 'title' => trans('admin/categories/general.use_default_eula_column'),
- 'visible' => true,
- 'formatter' => 'trueFalseFormatter',
], [
'field' => 'tag_color',
'searchable' => true,
diff --git a/tests/Feature/Categories/Api/IndexCategoriesTest.php b/tests/Feature/Categories/Api/IndexCategoriesTest.php
index fc6ddb3b18..e03fcdd764 100644
--- a/tests/Feature/Categories/Api/IndexCategoriesTest.php
+++ b/tests/Feature/Categories/Api/IndexCategoriesTest.php
@@ -63,4 +63,66 @@ class IndexCategoriesTest extends TestCase
]);
}
+
+ public function test_category_index_can_sort_by_has_eula_ascending()
+ {
+ $searchPrefix = 'has-eula-asc-'.uniqid();
+
+ $withoutEula = Category::factory()->forAssets()->create([
+ 'name' => $searchPrefix.'-without',
+ 'eula_text' => '',
+ ]);
+
+ $withEula = Category::factory()->forAssets()->create([
+ 'name' => $searchPrefix.'-with',
+ 'eula_text' => 'This category has a EULA.',
+ ]);
+
+ $this->actingAsForApi(User::factory()->superuser()->create())
+ ->getJson(
+ route('api.categories.index', [
+ 'search' => $searchPrefix,
+ 'sort' => 'has_eula',
+ 'order' => 'asc',
+ 'offset' => '0',
+ 'limit' => '20',
+ ]))
+ ->assertOk()
+ ->assertJson([
+ 'total' => 2,
+ ])
+ ->assertJsonPath('rows.0.id', $withoutEula->id)
+ ->assertJsonPath('rows.1.id', $withEula->id);
+ }
+
+ public function test_category_index_can_sort_by_has_eula_descending()
+ {
+ $searchPrefix = 'has-eula-desc-'.uniqid();
+
+ $withoutEula = Category::factory()->forAssets()->create([
+ 'name' => $searchPrefix.'-without',
+ 'eula_text' => '',
+ ]);
+
+ $withEula = Category::factory()->forAssets()->create([
+ 'name' => $searchPrefix.'-with',
+ 'eula_text' => 'This category has a EULA.',
+ ]);
+
+ $this->actingAsForApi(User::factory()->superuser()->create())
+ ->getJson(
+ route('api.categories.index', [
+ 'search' => $searchPrefix,
+ 'sort' => 'has_eula',
+ 'order' => 'desc',
+ 'offset' => '0',
+ 'limit' => '20',
+ ]))
+ ->assertOk()
+ ->assertJson([
+ 'total' => 2,
+ ])
+ ->assertJsonPath('rows.0.id', $withEula->id)
+ ->assertJsonPath('rows.1.id', $withoutEula->id);
+ }
}