Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ProcessMaker/Http/Controllers/Api/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,6 @@ public function getFilterConfiguration(String $name, Request $request)
*/
public function storeFilterConfiguration(String $name, Request $request)
{
$request->json()->all();
$filter = SaveSession::setConfigFilter($name, $request->user(), $request->json()->all());

return response(['data' => $filter], 200);
Expand Down
55 changes: 53 additions & 2 deletions tests/Feature/Api/UsersTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
use ProcessMaker\Models\Process;
use ProcessMaker\Models\ProcessRequest;
use ProcessMaker\Models\ProcessRequestToken;
use ProcessMaker\Models\ProcessTaskAssignment;
use ProcessMaker\Models\Recommendation;
use ProcessMaker\Models\RecommendationUser;
use ProcessMaker\Models\Setting;
use ProcessMaker\Models\User;
Expand Down Expand Up @@ -885,4 +883,57 @@ public function testGetUsersTaskCount()
// Assert the list of users now contains the admin user
$this->assertContains($admin->id, collect($users)->pluck('id')->toArray());
}

/**
* Test save and get filters per user saved in cache
*/
public function testGetDefaultUserConfiguration()
{
// Define an example of filters to save
$values = [
'filters' => [
[
'subject' => [
'type' => 'Field',
'value' => 'case_number',
],
'operator' => '=',
'value' => '885',
],
[
'subject' => [
'type' => 'Field',
'value' => 'case_title',
],
'operator' => '=',
'value' => 'TCP4_Case_title',
],
],
'order' => [
'by' => 'id',
'dir' => 'ASC',
],
];
// Define the page filter to save
$pagesSaveFilters = [
'casesFilter',
'casesFilter|in_progress',
'casesFilter|completed',
'casesFilter|all',
];
$randomKey = array_rand($pagesSaveFilters);
$name = $pagesSaveFilters[$randomKey];
// Call the api PUT
$response = $this->apiCall('PUT', '/users/store_filter_configuration/' . $name, $values);
// Validate the header status code
$response->assertStatus(200);
$this->assertNotEmpty($response);

// Call the api GET
$response = $this->apiCall('GET', '/users/get_filter_configuration/' . $name);
// Validate the header status code
$response->assertStatus(200);
$this->assertNotEmpty($response);
$response->assertJson(['data' => $values]);
}
}