Skip to content

Bugfix/FOUR-21804: Error 404 on Available Columns in Launchpad settings #7992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nolanpro merged 8 commits into from
Feb 10, 2025
Merged

Bugfix/FOUR-21804: Error 404 on Available Columns in Launchpad settings #7992

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ed3c6d7
saving progress
CarliPinell Feb 5, 2025
0fb4089
Adding defaultSavedSearchId
CarliPinell Feb 5, 2025
b6c4cbc
applying php-cs-fixer
CarliPinell Feb 5, 2025
d02d702
fixing observation
CarliPinell Feb 5, 2025
1e0ca0f
refactoring code to optimize traits
CarliPinell Feb 6, 2025
3a64b31
new fix applied
CarliPinell Feb 6, 2025
d335bcb
Validating empty Default Task columns configuration
CarliPinell Feb 6, 2025
287738e
adding missing bracket
CarliPinell Feb 7, 2025
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
Next Next commit
saving progress
  • Loading branch information
@CarliPinell
CarliPinell committed Feb 5, 2025
commit ed3c6d7e5bb338a10080d8047be7273214e7cee8
4 changes: 3 additions & 1 deletion ProcessMaker/Http/Controllers/TaskController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ public function index()

$currentUser = Auth::user();

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled', 'userConfiguration', 'showOldTaskScreen', 'currentUser', 'selectedProcess'));
$defaultSavedSearchId = $this->getDefaultSavedSearchId();

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled', 'userConfiguration', 'showOldTaskScreen', 'currentUser', 'selectedProcess', 'defaultSavedSearchId'));
}

public function edit(ProcessRequestToken $task, string $preview = '')
Expand Down
20 changes: 20 additions & 0 deletions ProcessMaker/Traits/SearchAutocompleteTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use ProcessMaker\Models\ProcessRequestToken;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Projects\Models\ProjectCategory;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;

trait SearchAutocompleteTrait
{
Expand Down Expand Up @@ -259,4 +260,23 @@ private function searchProjectCategories($query)
return $request->only(['id', 'name']);
});
}

/**
* Get the ID of the default saved search for tasks.
*
* @return int|null
*/
private function getDefaultSavedSearchId()
{
$id = null;
if (class_exists(SavedSearch::class)) {
$savedSearch = SavedSearch::firstSystemSearchFor(
Auth::user(),
SavedSearch::KEY_TASKS,
);
$id = $savedSearch->id;
}

return $id;
}
}
2 changes: 1 addition & 1 deletion resources/js/components/shared/LaunchpadSettingsModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ export default {
},
async getMyTasksColumns() {
this.myTasks.currentColumns = this.myTasksColumns;
let defaultSavedSearch = window.ProcessMaker.defaultSavedSearch || null;
let defaultSavedSearch = window.ProcessMaker.defaultSavedSearchId || window.Processmaker.defaultSavedSearchId || null;
await ProcessMaker.apiClient.get(`saved-searches/${defaultSavedSearch}/columns?include=default`)
.then((response) => {
if (response.data && response.data.default) {
Expand Down
1 change: 1 addition & 0 deletions resources/views/tasks/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@
window.ProcessMaker.showOldTaskScreen = @json($showOldTaskScreen);
window.Processmaker.user = @json($currentUser);
window.Processmaker.selectedProcess = @json($selectedProcess);
window.Processmaker.defaultSavedSearchId = @json($defaultSavedSearchId);
</script>
<script>
window.ProcessMaker.ellipsisPermission = {{
Expand Down