Skip to content

FOUR-13922 Configure Request List tables #6169

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
ryancooley merged 9 commits into from
Feb 8, 2024
Merged

FOUR-13922 Configure Request List tables #6169

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4fb2e4b
Get default columns from saved search
caleeli Feb 6, 2024
ab8f195
Setup columns
caleeli Feb 6, 2024
900c5fb
Config column properties
caleeli Feb 6, 2024
792d589
Add button to edit default request list
caleeli Feb 7, 2024
5dd528c
When columns is null show the default columns
caleeli Feb 7, 2024
d34e7fb
Merge remote-tracking branch 'origin/next' into FOUR-13922
caleeli Feb 7, 2024
ad3991e
Fix code smells
caleeli Feb 7, 2024
122a23b
Add custom columns for Tasks
caleeli Feb 7, 2024
3c2cd94
Fix advanced filter and order
caleeli Feb 8, 2024
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
Get default columns from saved search
  • Loading branch information
@caleeli
caleeli committed Feb 6, 2024
commit 4fb2e4b7da365fbcd7c611d40baefb88bca9398b
15 changes: 14 additions & 1 deletion ProcessMaker/Http/Controllers/RequestController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
use ProcessMaker\Models\ScreenVersion;
use ProcessMaker\Models\UserResourceView;
use ProcessMaker\Package\PackageComments\PackageServiceProvider;
use ProcessMaker\Package\SavedSearch\Http\Controllers\SavedSearchController;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
use ProcessMaker\RetryProcessRequest;
use ProcessMaker\Traits\HasControllerAddons;
use ProcessMaker\Traits\SearchAutocompleteTrait;
Expand Down Expand Up @@ -61,8 +63,19 @@ public function index($type = null)

$userFilter = SaveSession::getConfigFilter('requestFilter', Auth::user());

// Get default Saved search config
$defaultSavedSearch = SavedSearch::firstSystemSearchFor(
Auth::user(),
SavedSearch::KEY_REQUESTS,
);
if ($defaultSavedSearch) {
$defaultColumns = SavedSearchController::adjustColumnsOf($defaultSavedSearch->columns);
} else {
$defaultColumns = null;
}

return view('requests.index', compact(
['type', 'title', 'currentUser', 'userFilter']
['type', 'title', 'currentUser', 'userFilter', 'defaultColumns']
));
}

Expand Down
3 changes: 2 additions & 1 deletion resources/js/requests/components/RequestsListing.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,8 @@ export default {
},
};
},
transform(data) {
transform(dataInput) {
const data = _.cloneDeep(dataInput);
// Clean up fields for meta pagination so vue table pagination can understand
data.meta.last_page = data.meta.total_pages;
data.meta.from = (data.meta.current_page - 1) * data.meta.per_page;
Expand Down
3 changes: 2 additions & 1 deletion resources/js/requests/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ new Vue({
CounterCard, CounterCardGroup, RequestsListing
},
data: {
columns: window.Processmaker.defaultColumns || [],
filter: "",
pmql: "",
urlPmql: "",
Expand All @@ -22,7 +23,7 @@ new Vue({
additions: [],
},
created() {
const params = {};
let status;

switch (Processmaker.status) {
case "":
Expand Down
3 changes: 2 additions & 1 deletion resources/views/requests/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function() use ($title) { return [__($title), null]; }
</div>
</div>
</div>
<requests-listing ref="requestList" :filter="filter" :pmql="fullPmql"></requests-listing>
<requests-listing ref="requestList" :filter="filter" :columns="columns" :pmql="fullPmql"></requests-listing>
</div>

</div>
Expand All @@ -110,6 +110,7 @@ function() use ($title) { return [__($title), null]; }
window.Processmaker.user = @json($currentUser);
window.Processmaker.status = '{{ $type }}';
window.Processmaker.filter_user = @json($userFilter);
window.Processmaker.defaultColumns = @json($defaultColumns);
</script>
<script src="{{mix('js/requests/index.js')}}"></script>
@endsection
Expand Down