Refactor some parts of the column filtering functionality#6152

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

Refactor some parts of the column filtering functionality #6152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
205078e
Refactor
nolanpro Feb 3, 2024
a4f030c
Remove console log
nolanpro Feb 5, 2024
7ba1696
Remove console log
nolanpro Feb 5, 2024
609ab18
Remove mixin
nolanpro Feb 5, 2024
37a2589
Remove changes to PmqlInput.vue
nolanpro Feb 5, 2024
6ffa970
Add filter badges
nolanpro Feb 5, 2024
d54b5b7
Update task name
nolanpro Feb 5, 2024
7375f8e
Merge branch 'next' into observation/FOUR-13348
nolanpro Feb 6, 2024
6ef0644
Refactor to use column config for filtering
nolanpro Feb 6, 2024
c78aff2
Refactor column aliases
nolanpro Feb 6, 2024
9c46a72
Continue refactoring advanced filter
nolanpro Feb 7, 2024
35cf25d
Fix order column name
nolanpro Feb 7, 2024
25c7d22
Fix loading advanced filters
nolanpro Feb 7, 2024
2954590
Merge branch 'next' into observation/FOUR-13348
nolanpro Feb 7, 2024
c2f07f4
Remove debugging
nolanpro Feb 7, 2024
8c091a7
Fix default column filter subject type
nolanpro Feb 8, 2024
a4831b2
Update assignees column to search using input instead select
agustinbusso Feb 8, 2024
dea13ec
Remove json2array function
nolanpro Feb 8, 2024
8ca9f2e
Merge branch 'next' into observation/FOUR-13348
nolanpro Feb 8, 2024
61ec2c5
Merge branch 'next' into observation/FOUR-13348
nolanpro 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
5 changes: 5 additions & 0 deletions ProcessMaker/Filters/Filter.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@ class Filter

const TYPE_PARTICIPANTS_FULLNAME = 'ParticipantsFullName';

const TYPE_ASSIGNEES_FULLNAME = 'AssigneesFullName';

const TYPE_STATUS = 'Status';

const TYPE_FIELD = 'Field';
Expand DownExpand Up@@ -200,6 +202,9 @@ private function valueAliasMethod()
case self::TYPE_PARTICIPANTS_FULLNAME:
$method = 'valueAliasParticipantByFullName';
break;
case self::TYPE_ASSIGNEES_FULLNAME:
$method = 'valueAliasAssigneeByFullName';
break;
case self::TYPE_STATUS:
$method = 'valueAliasStatus';
break;
Expand Down
4 changes: 3 additions & 1 deletion ProcessMaker/Filters/SaveSession.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,9 @@ public static function getConfigFilter(String $name, Object $user)
{
$key = self::getKey($user, $name);

return self::get($key, []);
$default = ['filters' => []];

return self::get($key, $default);
}

/**
Expand Down
3 changes: 2 additions & 1 deletion ProcessMaker/Http/Controllers/TaskController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -131,8 +131,9 @@ public function edit(ProcessRequestToken $task, string $preview = '')
'lastname',
'avatar',
'timezone',
'datetime_format'
'datetime_format',
]);

return view('tasks.edit', [
'task' => $task,
'dueLabels' => self::$dueLabels,
Expand Down
40 changes: 27 additions & 13 deletions ProcessMaker/Models/ProcessRequestToken.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,12 +34,12 @@
* @property string $element_id
* @property string $element_type
* @property string $status
* @property \Carbon\Carbon $completed_at
* @property \Carbon\Carbon $due_at
* @property \Carbon\Carbon $initiated_at
* @property \Carbon\Carbon $riskchanges_at
* @property \Carbon\Carbon $updated_at
* @property \Carbon\Carbon $created_at
* @property Carbon $completed_at
* @property Carbon $due_at
* @property Carbon $initiated_at
* @property Carbon $riskchanges_at
* @property Carbon $updated_at
* @property Carbon $created_at
* @property ProcessRequest $processRequest
*
* @OA\Schema(
Expand DownExpand Up@@ -332,7 +332,7 @@ public function getScreen(): ?Screen
// It uses a try-catch block to handle any exceptions that might occur, for example in test environments.
try {
$localName = $this->getBpmnDefinition()->localName;
} catch (\Throwable $t) {
} catch (Throwable $t) {
$localName = null;
}
$isManualTask = $localName === 'manualTask';
Expand DownExpand Up@@ -457,7 +457,7 @@ public function getAdvanceStatusAttribute()
/**
* Check if the user has access to reassign this task
*
* @param \ProcessMaker\Models\User $user
* @param User $user
*/
public function authorizeReassignment(User $user)
{
Expand DownExpand Up@@ -616,7 +616,7 @@ public function fieldAliasCompleted()

public function fieldAliasUser_Id()
{
return 'user_id';
return 'process_request_tokens.user_id';
}

/**
Expand DownExpand Up@@ -665,9 +665,9 @@ public function valueAliasStatus($value, $expression, $callback = null, User $us
} elseif (array_key_exists($value, $statusMap)) {
$query->where('is_self_service', 0);
if ($expression->operator == '=') {
$query->whereIn('status', $statusMap[$value]);
$query->whereIn('process_request_tokens.status', $statusMap[$value]);
} elseif ($expression->operator == '!=') {
$query->whereNotIn('status', $statusMap[$value]);
$query->whereNotIn('process_request_tokens.status', $statusMap[$value]);
}
} else {
$query->where('status', $expression->operator, $value)
Expand DownExpand Up@@ -758,6 +758,20 @@ public function valueAliasProcess_Name(string $value, Expression $expression): c
};
}

/**
* PMQL value alias for assignee field by fullname.
* @param string $value
* @return callable
*/
public function valueAliasAssigneeByFullName($value, $expression)
{
return function ($query) use ($expression, $value) {
$query->whereHas('user', function ($query) use ($expression, $value) {
$query->whereRaw("CONCAT(firstname, ' ', lastname) " . $expression->operator . ' ?', [$value]);
});
};
}

/**
* PMQL wildcard for process request & data fields
*
Expand DownExpand Up@@ -909,8 +923,8 @@ public function persistUserData($user)
/**
* Log an error when executing the token
*
* @param \Throwable $error
* @param \ProcessMaker\Nayra\Contracts\Bpmn\FlowElementInterface $bpmnElement
* @param Throwable $error
* @param FlowElementInterface $bpmnElement
*/
public function logError(Throwable $error, FlowElementInterface $bpmnElement)
{
Expand Down
114 changes: 75 additions & 39 deletions resources/js/common/PMColumnFilterPopoverCommonMixin.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { get, cloneDeep } from "lodash";

const PMColumnFilterCommonMixin = {
data() {
return {
Expand All@@ -9,6 +11,22 @@ const PMColumnFilterCommonMixin = {
};
},
methods: {
storeFilterConfiguration() {
const { order, type } = this.filterConfiguration();
let url = "users/store_filter_configuration/";
if (this.$props.columns && this.savedSearch) {
url += "savedSearch|" + this.savedSearch;
} else {
url += type;
}
let config = {
filters: this.formattedFilter(),
order
};
ProcessMaker.apiClient.put(url, config);
window.ProcessMaker.advanced_filter = config;
window.ProcessMaker.EventBus.$emit("advanced-filter-updated");
},
getViewConfigFilter() {
return [
{
Expand DownExpand Up@@ -67,15 +85,31 @@ const PMColumnFilterCommonMixin = {
}
];
},
onApply(json, index) {
let oldValue, type, value;
addAliases(json, key, label) {
let type, value;
for (let i in json) {
oldValue = json[i].subject.value;
type = this.getTypeColumnFilter(oldValue);
value = this.getAliasColumnForFilter(oldValue);
type = this.getTypeColumnFilter(key, json[i].subject.type);
value = this.getAliasColumnForFilter(key, json[i].subject.value);
json[i].subject.type = type;
json[i].subject.value = value;
json[i]._column_field = key;
json[i]._column_label = label;

if (json[i].or && json[i].or.length > 0) {
this.addAliases(json[i].or, key, label);
}
}
},
getTypeColumnFilter(field, defaultType = 'Field') {
return this.tableHeaders.find(column => column.field === field)?.filter_subject?.type || defaultType;
},
getAliasColumnForFilter(field, defaultValue) {
return this.tableHeaders.find(column => column.field === field)?.filter_subject?.value || defaultValue;
},
getAliasColumnForOrderBy(value) {
return this.tableHeaders.find(column => column.field === value)?.order_column || value;
},
onApply(json, index) {
this.advancedFilterInit();
this.advancedFilter[index] = json;
this.markStyleWhenColumnSetAFilter();
Expand All@@ -101,9 +135,20 @@ const PMColumnFilterCommonMixin = {
object.$refs.pmColumnFilterForm.setValues(this.advancedFilter[index]);
}
},
formattedFilter() {
const filterCopy = cloneDeep(this.advancedFilter);
Object.keys(filterCopy).forEach((key) => {
if (filterCopy[key].length === 0) {
delete filterCopy[key];
}
const label = this.tableHeaders.find(column => column.field === key)?.label;
this.addAliases(filterCopy[key], key, label);
});
return Object.values(filterCopy).flat(1);
},
getAdvancedFilter() {
let flat = this.json2Array(this.advancedFilter).flat(1);
return flat.length > 0 ? "&advanced_filter=" + encodeURIComponent(JSON.stringify(flat)) : "";
let formattedFilter = this.formattedFilter();
return formattedFilter.length > 0 ? "&advanced_filter=" + encodeURIComponent(JSON.stringify(formattedFilter)) : "";
},
getUrlUsers(filter) {
let page = 1;
Expand All@@ -122,8 +167,12 @@ const PMColumnFilterCommonMixin = {
let format = "string";
if (column.format) {
format = column.format;
if (format === "int") {
// We don't have a field for integers
format = "string";
}
}
if (column.field === "status" || column.field === "assignee") {
if (column.field === "status") {
format = "stringSelect";
}
return format;
Expand All@@ -133,17 +182,14 @@ const PMColumnFilterCommonMixin = {
if (column.field === "status") {
formatRange = this.getStatus();
}
if (column.field === "assignee") {
formatRange = this.viewAssignee;
}
return formatRange;
},
getOperators(column) {
let operators = [];
if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name" || column.field === "participants") {
if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name" || column.field === "participants" || column.field === "assignee") {
operators = ["=", "in", "contains", "regex"];
}
if (column.field === "status" || column.field === "assignee") {
if (column.field === "status") {
operators = ["=", "in"];
}
if (column.field === "initiated_at" || column.field === "completed_at" || column.field === "due_at") {
Expand DownExpand Up@@ -208,35 +254,25 @@ const PMColumnFilterCommonMixin = {
}
}
},
getFilterConfiguration(name) {
if ("filter_user" in window.Processmaker) {
this.setFilterPropsFromConfig(window.Processmaker.filter_user);
return;
}
let url = "users/get_filter_configuration/" + name;
ProcessMaker.apiClient.get(url).then(response => {
this.setFilterPropsFromConfig(response.data.data);
getFilterConfiguration() {
const filters = {};
get(window, 'ProcessMaker.advanced_filter.filters', []).forEach((filter) => {
const key = filter._column_field;
if (!(key in filters)) {
filters[key] = [];
}
filters[key].push(filter);
});
},
setFilterPropsFromConfig(config) {
if (typeof config !== "object") {
config = {};
}
if ("filter" in config && typeof config.filter === "object") {
this.advancedFilter = config.filter;
}
if (config?.order?.by && config?.order?.direction) {
this.setOrderByProps(config.order.by, config.order.direction);
this.advancedFilter = filters;

const order = get(window, 'ProcessMaker.advanced_filter.order');
if (order?.by && order?.direction) {
this.setOrderByProps(order.by, order.direction);
}

this.markStyleWhenColumnSetAFilter();
window.ProcessMaker.EventBus.$emit("advanced-filter-updated");
},
json2Array(json) {
let result = [];
for (let i in json) {
result.push(json[i]);
}
return result;
}
}
};
export default PMColumnFilterCommonMixin;
export default PMColumnFilterCommonMixin;
48 changes: 48 additions & 0 deletions resources/js/common/advancedFilterStatusMixin.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
import { get } from "lodash";

export default {
data() {
return {
advancedFilter: [],
};
},
mounted() {
this.setAdvancedFilter();
window.ProcessMaker.EventBus.$on('advanced-filter-updated', this.setAdvancedFilter);
},
methods: {
setAdvancedFilter() {
this.advancedFilter = get(window, 'ProcessMaker.advanced_filter.filters', []);
},
formatForBadge(filters, result) {
for(const filter of filters) {
result.push([
this.formatBadgeSubject(filter),
[{name: this.formatBadgeValue(filter), advanced_filter: true}]
]);

if (filter.or && filter.or.length > 0) {
this.formatForBadge(filter.or, result);
}
}
},
formatBadgeSubject(filter) {
return get(filter, '_column_label', '');
},
formatBadgeValue(filter) {
let result = filter.operator;
result = result + " " + filter.value;
return result;
},
},
computed: {
formatAdvancedFilterForBadges() {
if (!this.advancedFilter || this.advancedFilter.length === 0) {
return [];
}
const result = [];
this.formatForBadge(this.advancedFilter, result);
return result;
},
},
}
4 changes: 1 addition & 3 deletions resources/js/components/PMColumnFilterPopover/PMColumnFilterPopover.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,9 @@
popoverShow: false
};
},
updated() {
this.$emit("onUpdate", this);
},
methods: {
onShown() {
this.$emit("onUpdate", this);
this.focusCancelButton();
this.closeOnBlur();
},
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Refactor some parts of the column filtering functionality#6152

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 20 commits into

from

Feb 8, 2024
 Merged


Refactor some parts of the column filtering functionality
#6152
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


20 commits


Select commit
Hold shift + click to select a range
205078e

Refactor


nolanpro Feb 3, 2024
a4f030c

Remove console log


nolanpro Feb 5, 2024
7ba1696

Remove console log


nolanpro Feb 5, 2024
609ab18

Remove mixin


nolanpro Feb 5, 2024
37a2589

Remove changes to PmqlInput.vue


nolanpro Feb 5, 2024
6ffa970

Add filter badges


nolanpro Feb 5, 2024
d54b5b7

Update task name


nolanpro Feb 5, 2024
7375f8e

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 6, 2024
6ef0644

Refactor to use column config for filtering


nolanpro Feb 6, 2024
c78aff2

Refactor column aliases


nolanpro Feb 6, 2024
9c46a72

Continue refactoring advanced filter


nolanpro Feb 7, 2024
35cf25d

Fix order column name


nolanpro Feb 7, 2024
25c7d22

Fix loading advanced filters


nolanpro Feb 7, 2024
2954590

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 7, 2024
c2f07f4

Remove debugging


nolanpro Feb 7, 2024
8c091a7

Fix default column filter subject type


nolanpro Feb 8, 2024
a4831b2

Update assignees column to search using input instead select


agustinbusso Feb 8, 2024
dea13ec

Remove json2array function


nolanpro Feb 8, 2024
8ca9f2e

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 8, 2024
61ec2c5

Merge branch 'next' into observation/FOUR-13348


nolanpro 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


5 changes: 5 additions & 0 deletions
ProcessMaker/Filters/Filter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@ class Filter

 const TYPE_PARTICIPANTS_FULLNAME = 'ParticipantsFullName';

 const TYPE_ASSIGNEES_FULLNAME = 'AssigneesFullName';

 const TYPE_STATUS = 'Status';

 const TYPE_FIELD = 'Field';
Expand DownExpand Up@@ -200,6 +202,9 @@ private function valueAliasMethod()
 case self::TYPE_PARTICIPANTS_FULLNAME:
 $method = 'valueAliasParticipantByFullName';
 break;
 case self::TYPE_ASSIGNEES_FULLNAME:
 $method = 'valueAliasAssigneeByFullName';
 break;
 case self::TYPE_STATUS:
 $method = 'valueAliasStatus';
 break;
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/Filters/SaveSession.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,9 @@ public static function getConfigFilter(String $name, Object $user)
 {
 $key = self::getKey($user, $name);

 return self::get($key, []);
 $default = ['filters' => []];

 return self::get($key, $default);
 }

 /**
Expand Down

3 changes: 2 additions & 1 deletion
ProcessMaker/Http/Controllers/TaskController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,8 +131,9 @@ public function edit(ProcessRequestToken $task, string $preview = '')
 'lastname',
 'avatar',
 'timezone',
 'datetime_format'
 'datetime_format',
 ]);

 return view('tasks.edit', [
 'task' => $task,
 'dueLabels' => self::$dueLabels,
Expand Down

40 changes: 27 additions & 13 deletions
ProcessMaker/Models/ProcessRequestToken.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,12 +34,12 @@
 * @property string $element_id
 * @property string $element_type
 * @property string $status
 * @property \Carbon\Carbon $completed_at
 * @property \Carbon\Carbon $due_at
 * @property \Carbon\Carbon $initiated_at
 * @property \Carbon\Carbon $riskchanges_at
 * @property \Carbon\Carbon $updated_at
 * @property \Carbon\Carbon $created_at
 * @property Carbon $completed_at
 * @property Carbon $due_at
 * @property Carbon $initiated_at
 * @property Carbon $riskchanges_at
 * @property Carbon $updated_at
 * @property Carbon $created_at
 * @property ProcessRequest $processRequest
 *
 * @OA\Schema(
Expand DownExpand Up@@ -332,7 +332,7 @@ public function getScreen(): ?Screen
 // It uses a try-catch block to handle any exceptions that might occur, for example in test environments.
 try {
 $localName = $this->getBpmnDefinition()->localName;
 } catch (\Throwable $t) {
 } catch (Throwable $t) {
 $localName = null;
 }
 $isManualTask = $localName === 'manualTask';
Expand DownExpand Up@@ -457,7 +457,7 @@ public function getAdvanceStatusAttribute()
 /**
 * Check if the user has access to reassign this task
 *
 * @param \ProcessMaker\Models\User $user
 * @param User $user
 */
 public function authorizeReassignment(User $user)
 {
Expand DownExpand Up@@ -616,7 +616,7 @@ public function fieldAliasCompleted()

 public function fieldAliasUser_Id()
 {
 return 'user_id';
 return 'process_request_tokens.user_id';
 }

 /**
Expand DownExpand Up@@ -665,9 +665,9 @@ public function valueAliasStatus($value, $expression, $callback = null, User $us
 } elseif (array_key_exists($value, $statusMap)) {
 $query->where('is_self_service', 0);
 if ($expression->operator == '=') {
 $query->whereIn('status', $statusMap[$value]);
 $query->whereIn('process_request_tokens.status', $statusMap[$value]);
 } elseif ($expression->operator == '!=') {
 $query->whereNotIn('status', $statusMap[$value]);
 $query->whereNotIn('process_request_tokens.status', $statusMap[$value]);
 }
 } else {
 $query->where('status', $expression->operator, $value)
Expand DownExpand Up@@ -758,6 +758,20 @@ public function valueAliasProcess_Name(string $value, Expression $expression): c
 };
 }

 /**
 * PMQL value alias for assignee field by fullname.
 * @param string $value
 * @return callable
 */
 public function valueAliasAssigneeByFullName($value, $expression)
 {
 return function ($query) use ($expression, $value) {
 $query->whereHas('user', function ($query) use ($expression, $value) {
 $query->whereRaw("CONCAT(firstname, ' ', lastname) " . $expression->operator . ' ?', [$value]);
 });
 };
 }

 /**
 * PMQL wildcard for process request & data fields
 *
Expand DownExpand Up@@ -909,8 +923,8 @@ public function persistUserData($user)
 /**
 * Log an error when executing the token
 *
 * @param \Throwable $error
 * @param \ProcessMaker\Nayra\Contracts\Bpmn\FlowElementInterface $bpmnElement
 * @param Throwable $error
 * @param FlowElementInterface $bpmnElement
 */
 public function logError(Throwable $error, FlowElementInterface $bpmnElement)
 {
Expand Down

114 changes: 75 additions & 39 deletions
resources/js/common/PMColumnFilterPopoverCommonMixin.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { get, cloneDeep } from "lodash";

const PMColumnFilterCommonMixin = {
 data() {
 return {
Expand All@@ -9,6 +11,22 @@ const PMColumnFilterCommonMixin = {
 };
 },
 methods: {
 storeFilterConfiguration() {
 const { order, type } = this.filterConfiguration();
 let url = "users/store_filter_configuration/";
 if (this.$props.columns && this.savedSearch) {
 url += "savedSearch|" + this.savedSearch;
 } else {
 url += type;
 }
 let config = {
 filters: this.formattedFilter(),
 order
 };
 ProcessMaker.apiClient.put(url, config);
 window.ProcessMaker.advanced_filter = config;
 window.ProcessMaker.EventBus.$emit("advanced-filter-updated");
 },
 getViewConfigFilter() {
 return [
 {
Expand DownExpand Up@@ -67,15 +85,31 @@ const PMColumnFilterCommonMixin = {
 }
 ];
 },
onApply(json, index) {
 let oldValue, type, value;
addAliases(json, key, label) {
 let type, value;
 for (let i in json) {
 oldValue = json[i].subject.value;
 type = this.getTypeColumnFilter(oldValue);
 value = this.getAliasColumnForFilter(oldValue);
 type = this.getTypeColumnFilter(key, json[i].subject.type);
 value = this.getAliasColumnForFilter(key, json[i].subject.value);
 json[i].subject.type = type;
 json[i].subject.value = value;
 json[i]._column_field = key;
 json[i]._column_label = label;

 if (json[i].or && json[i].or.length > 0) {
 this.addAliases(json[i].or, key, label);
 }
 }
 },
 getTypeColumnFilter(field, defaultType = 'Field') {
 return this.tableHeaders.find(column => column.field === field)?.filter_subject?.type || defaultType;
 },
 getAliasColumnForFilter(field, defaultValue) {
 return this.tableHeaders.find(column => column.field === field)?.filter_subject?.value || defaultValue;
 },
 getAliasColumnForOrderBy(value) {
 return this.tableHeaders.find(column => column.field === value)?.order_column || value;
 },
 onApply(json, index) {
 this.advancedFilterInit();
 this.advancedFilter[index] = json;
 this.markStyleWhenColumnSetAFilter();
Expand All@@ -101,9 +135,20 @@ const PMColumnFilterCommonMixin = {
 object.$refs.pmColumnFilterForm.setValues(this.advancedFilter[index]);
 }
 },
 formattedFilter() {
 const filterCopy = cloneDeep(this.advancedFilter);
 Object.keys(filterCopy).forEach((key) => {
 if (filterCopy[key].length === 0) {
 delete filterCopy[key];
 }
 const label = this.tableHeaders.find(column => column.field === key)?.label;
 this.addAliases(filterCopy[key], key, label);
 });
 return Object.values(filterCopy).flat(1);
 },
 getAdvancedFilter() {
 let flat = this.json2Array(this.advancedFilter).flat(1);
 return flat.length > 0 ? "&advanced_filter=" + encodeURIComponent(JSON.stringify(flat)) : "";
 let formattedFilter = this.formattedFilter();
 return formattedFilter.length > 0 ? "&advanced_filter=" + encodeURIComponent(JSON.stringify(formattedFilter)) : "";
 },
 getUrlUsers(filter) {
 let page = 1;
Expand All@@ -122,8 +167,12 @@ const PMColumnFilterCommonMixin = {
 let format = "string";
 if (column.format) {
 format = column.format;
 if (format === "int") {
 // We don't have a field for integers
 format = "string";
 }
 }
 if (column.field === "status" || column.field === "assignee") {
 if (column.field === "status") {
 format = "stringSelect";
 }
 return format;
Expand All@@ -133,17 +182,14 @@ const PMColumnFilterCommonMixin = {
 if (column.field === "status") {
 formatRange = this.getStatus();
 }
 if (column.field === "assignee") {
 formatRange = this.viewAssignee;
 }
 return formatRange;
 },
 getOperators(column) {
 let operators = [];
 if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name" || column.field === "participants") {
 if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name" || column.field === "participants" || column.field === "assignee") {
 operators = ["=", "in", "contains", "regex"];
 }
 if (column.field === "status" || column.field === "assignee") {
 if (column.field === "status") {
 operators = ["=", "in"];
 }
 if (column.field === "initiated_at" || column.field === "completed_at" || column.field === "due_at") {
Expand DownExpand Up@@ -208,35 +254,25 @@ const PMColumnFilterCommonMixin = {
 }
 }
 },
 getFilterConfiguration(name) {
if ("filter_user" in window.Processmaker) {
 this.setFilterPropsFromConfig(window.Processmaker.filter_user);
return;
}
let url = "users/get_filter_configuration/" + name;
ProcessMaker.apiClient.get(url).then(response => {
this.setFilterPropsFromConfig(response.data.data);
 getFilterConfiguration() {
const filters = {};
get(window, 'ProcessMaker.advanced_filter.filters', []).forEach((filter) => {
const key = filter._column_field;
 if (!(key in filters)) {
 filters[key] = [];
 }
filters[key].push(filter);
 });
 },
 setFilterPropsFromConfig(config) {
 if (typeof config !== "object") {
 config = {};
 }
 if ("filter" in config && typeof config.filter === "object") {
 this.advancedFilter = config.filter;
 }
 if (config?.order?.by && config?.order?.direction) {
 this.setOrderByProps(config.order.by, config.order.direction);
 this.advancedFilter = filters;

 const order = get(window, 'ProcessMaker.advanced_filter.order');
 if (order?.by && order?.direction) {
 this.setOrderByProps(order.by, order.direction);
 }

 this.markStyleWhenColumnSetAFilter();
 window.ProcessMaker.EventBus.$emit("advanced-filter-updated");
 },
 json2Array(json) {
 let result = [];
 for (let i in json) {
 result.push(json[i]);
 }
 return result;
 }
 }
};
export default PMColumnFilterCommonMixin;
export default PMColumnFilterCommonMixin;

48 changes: 48 additions & 0 deletions
resources/js/common/advancedFilterStatusMixin.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
import { get } from "lodash";

export default {
 data() {
 return {
 advancedFilter: [],
 };
 },
 mounted() {
 this.setAdvancedFilter();
 window.ProcessMaker.EventBus.$on('advanced-filter-updated', this.setAdvancedFilter);
 },
 methods: {
 setAdvancedFilter() {
 this.advancedFilter = get(window, 'ProcessMaker.advanced_filter.filters', []);
 },
 formatForBadge(filters, result) {
 for(const filter of filters) {
 result.push([
 this.formatBadgeSubject(filter),
 [{name: this.formatBadgeValue(filter), advanced_filter: true}]
 ]);

 if (filter.or && filter.or.length > 0) {
 this.formatForBadge(filter.or, result);
 }
 }
 },
 formatBadgeSubject(filter) {
 return get(filter, '_column_label', '');
 },
 formatBadgeValue(filter) {
 let result = filter.operator;
 result = result + " " + filter.value;
 return result;
 },
 },
 computed: {
 formatAdvancedFilterForBadges() {
 if (!this.advancedFilter || this.advancedFilter.length === 0) {
 return [];
 }
 const result = [];
 this.formatForBadge(this.advancedFilter, result);
 return result;
 },
 },
}

4 changes: 1 addition & 3 deletions
resources/js/components/PMColumnFilterPopover/PMColumnFilterPopover.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,9 @@
 popoverShow: false
 };
 },
 updated() {
 this.$emit("onUpdate", this);
 },
 methods: {
 onShown() {
 this.$emit("onUpdate", this);
 this.focusCancelButton();
 this.closeOnBlur();
 },
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor some parts of the column filtering functionality#6152

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 20 commits into

from

Feb 8, 2024
 Merged


Refactor some parts of the column filtering functionality
#6152
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


20 commits


Select commit
Hold shift + click to select a range
205078e

Refactor


nolanpro Feb 3, 2024
a4f030c

Remove console log


nolanpro Feb 5, 2024
7ba1696

Remove console log


nolanpro Feb 5, 2024
609ab18

Remove mixin


nolanpro Feb 5, 2024
37a2589

Remove changes to PmqlInput.vue


nolanpro Feb 5, 2024
6ffa970

Add filter badges


nolanpro Feb 5, 2024
d54b5b7

Update task name


nolanpro Feb 5, 2024
7375f8e

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 6, 2024
6ef0644

Refactor to use column config for filtering


nolanpro Feb 6, 2024
c78aff2

Refactor column aliases


nolanpro Feb 6, 2024
9c46a72

Continue refactoring advanced filter


nolanpro Feb 7, 2024
35cf25d

Fix order column name


nolanpro Feb 7, 2024
25c7d22

Fix loading advanced filters


nolanpro Feb 7, 2024
2954590

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 7, 2024
c2f07f4

Remove debugging


nolanpro Feb 7, 2024
8c091a7

Fix default column filter subject type


nolanpro Feb 8, 2024
a4831b2

Update assignees column to search using input instead select


agustinbusso Feb 8, 2024
dea13ec

Remove json2array function


nolanpro Feb 8, 2024
8ca9f2e

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 8, 2024
61ec2c5

Merge branch 'next' into observation/FOUR-13348


nolanpro 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


5 changes: 5 additions & 0 deletions
ProcessMaker/Filters/Filter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@ class Filter

 const TYPE_PARTICIPANTS_FULLNAME = 'ParticipantsFullName';

 const TYPE_ASSIGNEES_FULLNAME = 'AssigneesFullName';

 const TYPE_STATUS = 'Status';

 const TYPE_FIELD = 'Field';
Expand DownExpand Up@@ -200,6 +202,9 @@ private function valueAliasMethod()
 case self::TYPE_PARTICIPANTS_FULLNAME:
 $method = 'valueAliasParticipantByFullName';
 break;
 case self::TYPE_ASSIGNEES_FULLNAME:
 $method = 'valueAliasAssigneeByFullName';
 break;
 case self::TYPE_STATUS:
 $method = 'valueAliasStatus';
 break;
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/Filters/SaveSession.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,9 @@ public static function getConfigFilter(String $name, Object $user)
 {
 $key = self::getKey($user, $name);

 return self::get($key, []);
 $default = ['filters' => []];

 return self::get($key, $default);
 }

 /**
Expand Down

3 changes: 2 additions & 1 deletion
ProcessMaker/Http/Controllers/TaskController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,8 +131,9 @@ public function edit(ProcessRequestToken $task, string $preview = '')
 'lastname',
 'avatar',
 'timezone',
 'datetime_format'
 'datetime_format',
 ]);

 return view('tasks.edit', [
 'task' => $task,
 'dueLabels' => self::$dueLabels,
Expand Down

40 changes: 27 additions & 13 deletions
ProcessMaker/Models/ProcessRequestToken.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,12 +34,12 @@
 * @property string $element_id
 * @property string $element_type
 * @property string $status
 * @property \Carbon\Carbon $completed_at
 * @property \Carbon\Carbon $due_at
 * @property \Carbon\Carbon $initiated_at
 * @property \Carbon\Carbon $riskchanges_at
 * @property \Carbon\Carbon $updated_at
 * @property \Carbon\Carbon $created_at
 * @property Carbon $completed_at
 * @property Carbon $due_at
 * @property Carbon $initiated_at
 * @property Carbon $riskchanges_at
 * @property Carbon $updated_at
 * @property Carbon $created_at
 * @property ProcessRequest $processRequest
 *
 * @OA\Schema(
Expand DownExpand Up@@ -332,7 +332,7 @@ public function getScreen(): ?Screen
 // It uses a try-catch block to handle any exceptions that might occur, for example in test environments.
 try {
 $localName = $this->getBpmnDefinition()->localName;
 } catch (\Throwable $t) {
 } catch (Throwable $t) {
 $localName = null;
 }
 $isManualTask = $localName === 'manualTask';
Expand DownExpand Up@@ -457,7 +457,7 @@ public function getAdvanceStatusAttribute()
 /**
 * Check if the user has access to reassign this task
 *
 * @param \ProcessMaker\Models\User $user
 * @param User $user
 */
 public function authorizeReassignment(User $user)
 {
Expand DownExpand Up@@ -616,7 +616,7 @@ public function fieldAliasCompleted()

 public function fieldAliasUser_Id()
 {
 return 'user_id';
 return 'process_request_tokens.user_id';
 }

 /**
Expand DownExpand Up@@ -665,9 +665,9 @@ public function valueAliasStatus($value, $expression, $callback = null, User $us
 } elseif (array_key_exists($value, $statusMap)) {
 $query->where('is_self_service', 0);
 if ($expression->operator == '=') {
 $query->whereIn('status', $statusMap[$value]);
 $query->whereIn('process_request_tokens.status', $statusMap[$value]);
 } elseif ($expression->operator == '!=') {
 $query->whereNotIn('status', $statusMap[$value]);
 $query->whereNotIn('process_request_tokens.status', $statusMap[$value]);
 }
 } else {
 $query->where('status', $expression->operator, $value)
Expand DownExpand Up@@ -758,6 +758,20 @@ public function valueAliasProcess_Name(string $value, Expression $expression): c
 };
 }

 /**
 * PMQL value alias for assignee field by fullname.
 * @param string $value
 * @return callable
 */
 public function valueAliasAssigneeByFullName($value, $expression)
 {
 return function ($query) use ($expression, $value) {
 $query->whereHas('user', function ($query) use ($expression, $value) {
 $query->whereRaw("CONCAT(firstname, ' ', lastname) " . $expression->operator . ' ?', [$value]);
 });
 };
 }

 /**
 * PMQL wildcard for process request & data fields
 *
Expand DownExpand Up@@ -909,8 +923,8 @@ public function persistUserData($user)
 /**
 * Log an error when executing the token
 *
 * @param \Throwable $error
 * @param \ProcessMaker\Nayra\Contracts\Bpmn\FlowElementInterface $bpmnElement
 * @param Throwable $error
 * @param FlowElementInterface $bpmnElement
 */
 public function logError(Throwable $error, FlowElementInterface $bpmnElement)
 {
Expand Down

114 changes: 75 additions & 39 deletions
resources/js/common/PMColumnFilterPopoverCommonMixin.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { get, cloneDeep } from "lodash";

const PMColumnFilterCommonMixin = {
 data() {
 return {
Expand All@@ -9,6 +11,22 @@ const PMColumnFilterCommonMixin = {
 };
 },
 methods: {
 storeFilterConfiguration() {
 const { order, type } = this.filterConfiguration();
 let url = "users/store_filter_configuration/";
 if (this.$props.columns && this.savedSearch) {
 url += "savedSearch|" + this.savedSearch;
 } else {
 url += type;
 }
 let config = {
 filters: this.formattedFilter(),
 order
 };
 ProcessMaker.apiClient.put(url, config);
 window.ProcessMaker.advanced_filter = config;
 window.ProcessMaker.EventBus.$emit("advanced-filter-updated");
 },
 getViewConfigFilter() {
 return [
 {
Expand DownExpand Up@@ -67,15 +85,31 @@ const PMColumnFilterCommonMixin = {
 }
 ];
 },
onApply(json, index) {
 let oldValue, type, value;
addAliases(json, key, label) {
 let type, value;
 for (let i in json) {
 oldValue = json[i].subject.value;
 type = this.getTypeColumnFilter(oldValue);
 value = this.getAliasColumnForFilter(oldValue);
 type = this.getTypeColumnFilter(key, json[i].subject.type);
 value = this.getAliasColumnForFilter(key, json[i].subject.value);
 json[i].subject.type = type;
 json[i].subject.value = value;
 json[i]._column_field = key;
 json[i]._column_label = label;

 if (json[i].or && json[i].or.length > 0) {
 this.addAliases(json[i].or, key, label);
 }
 }
 },
 getTypeColumnFilter(field, defaultType = 'Field') {
 return this.tableHeaders.find(column => column.field === field)?.filter_subject?.type || defaultType;
 },
 getAliasColumnForFilter(field, defaultValue) {
 return this.tableHeaders.find(column => column.field === field)?.filter_subject?.value || defaultValue;
 },
 getAliasColumnForOrderBy(value) {
 return this.tableHeaders.find(column => column.field === value)?.order_column || value;
 },
 onApply(json, index) {
 this.advancedFilterInit();
 this.advancedFilter[index] = json;
 this.markStyleWhenColumnSetAFilter();
Expand All@@ -101,9 +135,20 @@ const PMColumnFilterCommonMixin = {
 object.$refs.pmColumnFilterForm.setValues(this.advancedFilter[index]);
 }
 },
 formattedFilter() {
 const filterCopy = cloneDeep(this.advancedFilter);
 Object.keys(filterCopy).forEach((key) => {
 if (filterCopy[key].length === 0) {
 delete filterCopy[key];
 }
 const label = this.tableHeaders.find(column => column.field === key)?.label;
 this.addAliases(filterCopy[key], key, label);
 });
 return Object.values(filterCopy).flat(1);
 },
 getAdvancedFilter() {
 let flat = this.json2Array(this.advancedFilter).flat(1);
 return flat.length > 0 ? "&advanced_filter=" + encodeURIComponent(JSON.stringify(flat)) : "";
 let formattedFilter = this.formattedFilter();
 return formattedFilter.length > 0 ? "&advanced_filter=" + encodeURIComponent(JSON.stringify(formattedFilter)) : "";
 },
 getUrlUsers(filter) {
 let page = 1;
Expand All@@ -122,8 +167,12 @@ const PMColumnFilterCommonMixin = {
 let format = "string";
 if (column.format) {
 format = column.format;
 if (format === "int") {
 // We don't have a field for integers
 format = "string";
 }
 }
 if (column.field === "status" || column.field === "assignee") {
 if (column.field === "status") {
 format = "stringSelect";
 }
 return format;
Expand All@@ -133,17 +182,14 @@ const PMColumnFilterCommonMixin = {
 if (column.field === "status") {
 formatRange = this.getStatus();
 }
 if (column.field === "assignee") {
 formatRange = this.viewAssignee;
 }
 return formatRange;
 },
 getOperators(column) {
 let operators = [];
 if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name" || column.field === "participants") {
 if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name" || column.field === "participants" || column.field === "assignee") {
 operators = ["=", "in", "contains", "regex"];
 }
 if (column.field === "status" || column.field === "assignee") {
 if (column.field === "status") {
 operators = ["=", "in"];
 }
 if (column.field === "initiated_at" || column.field === "completed_at" || column.field === "due_at") {
Expand DownExpand Up@@ -208,35 +254,25 @@ const PMColumnFilterCommonMixin = {
 }
 }
 },
 getFilterConfiguration(name) {
if ("filter_user" in window.Processmaker) {
 this.setFilterPropsFromConfig(window.Processmaker.filter_user);
return;
}
let url = "users/get_filter_configuration/" + name;
ProcessMaker.apiClient.get(url).then(response => {
this.setFilterPropsFromConfig(response.data.data);
 getFilterConfiguration() {
const filters = {};
get(window, 'ProcessMaker.advanced_filter.filters', []).forEach((filter) => {
const key = filter._column_field;
 if (!(key in filters)) {
 filters[key] = [];
 }
filters[key].push(filter);
 });
 },
 setFilterPropsFromConfig(config) {
 if (typeof config !== "object") {
 config = {};
 }
 if ("filter" in config && typeof config.filter === "object") {
 this.advancedFilter = config.filter;
 }
 if (config?.order?.by && config?.order?.direction) {
 this.setOrderByProps(config.order.by, config.order.direction);
 this.advancedFilter = filters;

 const order = get(window, 'ProcessMaker.advanced_filter.order');
 if (order?.by && order?.direction) {
 this.setOrderByProps(order.by, order.direction);
 }

 this.markStyleWhenColumnSetAFilter();
 window.ProcessMaker.EventBus.$emit("advanced-filter-updated");
 },
 json2Array(json) {
 let result = [];
 for (let i in json) {
 result.push(json[i]);
 }
 return result;
 }
 }
};
export default PMColumnFilterCommonMixin;
export default PMColumnFilterCommonMixin;

48 changes: 48 additions & 0 deletions
resources/js/common/advancedFilterStatusMixin.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
import { get } from "lodash";

export default {
 data() {
 return {
 advancedFilter: [],
 };
 },
 mounted() {
 this.setAdvancedFilter();
 window.ProcessMaker.EventBus.$on('advanced-filter-updated', this.setAdvancedFilter);
 },
 methods: {
 setAdvancedFilter() {
 this.advancedFilter = get(window, 'ProcessMaker.advanced_filter.filters', []);
 },
 formatForBadge(filters, result) {
 for(const filter of filters) {
 result.push([
 this.formatBadgeSubject(filter),
 [{name: this.formatBadgeValue(filter), advanced_filter: true}]
 ]);

 if (filter.or && filter.or.length > 0) {
 this.formatForBadge(filter.or, result);
 }
 }
 },
 formatBadgeSubject(filter) {
 return get(filter, '_column_label', '');
 },
 formatBadgeValue(filter) {
 let result = filter.operator;
 result = result + " " + filter.value;
 return result;
 },
 },
 computed: {
 formatAdvancedFilterForBadges() {
 if (!this.advancedFilter || this.advancedFilter.length === 0) {
 return [];
 }
 const result = [];
 this.formatForBadge(this.advancedFilter, result);
 return result;
 },
 },
}

4 changes: 1 addition & 3 deletions
resources/js/components/PMColumnFilterPopover/PMColumnFilterPopover.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,9 @@
 popoverShow: false
 };
 },
 updated() {
 this.$emit("onUpdate", this);
 },
 methods: {
 onShown() {
 this.$emit("onUpdate", this);
 this.focusCancelButton();
 this.closeOnBlur();
 },
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor some parts of the column filtering functionality#6152

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 20 commits into

from

Feb 8, 2024
 Merged


Refactor some parts of the column filtering functionality
#6152
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


20 commits


Select commit
Hold shift + click to select a range
205078e

Refactor


nolanpro Feb 3, 2024
a4f030c

Remove console log


nolanpro Feb 5, 2024
7ba1696

Remove console log


nolanpro Feb 5, 2024
609ab18

Remove mixin


nolanpro Feb 5, 2024
37a2589

Remove changes to PmqlInput.vue


nolanpro Feb 5, 2024
6ffa970

Add filter badges


nolanpro Feb 5, 2024
d54b5b7

Update task name


nolanpro Feb 5, 2024
7375f8e

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 6, 2024
6ef0644

Refactor to use column config for filtering


nolanpro Feb 6, 2024
c78aff2

Refactor column aliases


nolanpro Feb 6, 2024
9c46a72

Continue refactoring advanced filter


nolanpro Feb 7, 2024
35cf25d

Fix order column name


nolanpro Feb 7, 2024
25c7d22

Fix loading advanced filters


nolanpro Feb 7, 2024
2954590

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 7, 2024
c2f07f4

Remove debugging


nolanpro Feb 7, 2024
8c091a7

Fix default column filter subject type


nolanpro Feb 8, 2024
a4831b2

Update assignees column to search using input instead select


agustinbusso Feb 8, 2024
dea13ec

Remove json2array function


nolanpro Feb 8, 2024
8ca9f2e

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 8, 2024
61ec2c5

Merge branch 'next' into observation/FOUR-13348


nolanpro 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


5 changes: 5 additions & 0 deletions
ProcessMaker/Filters/Filter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@ class Filter

 const TYPE_PARTICIPANTS_FULLNAME = 'ParticipantsFullName';

 const TYPE_ASSIGNEES_FULLNAME = 'AssigneesFullName';

 const TYPE_STATUS = 'Status';

 const TYPE_FIELD = 'Field';
Expand DownExpand Up@@ -200,6 +202,9 @@ private function valueAliasMethod()
 case self::TYPE_PARTICIPANTS_FULLNAME:
 $method = 'valueAliasParticipantByFullName';
 break;
 case self::TYPE_ASSIGNEES_FULLNAME:
 $method = 'valueAliasAssigneeByFullName';
 break;
 case self::TYPE_STATUS:
 $method = 'valueAliasStatus';
 break;
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/Filters/SaveSession.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,9 @@ public static function getConfigFilter(String $name, Object $user)
 {
 $key = self::getKey($user, $name);

 return self::get($key, []);
 $default = ['filters' => []];

 return self::get($key, $default);
 }

 /**
Expand Down

3 changes: 2 additions & 1 deletion
ProcessMaker/Http/Controllers/TaskController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,8 +131,9 @@ public function edit(ProcessRequestToken $task, string $preview = '')
 'lastname',
 'avatar',
 'timezone',
 'datetime_format'
 'datetime_format',
 ]);

 return view('tasks.edit', [
 'task' => $task,
 'dueLabels' => self::$dueLabels,
Expand Down

40 changes: 27 additions & 13 deletions
ProcessMaker/Models/ProcessRequestToken.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,12 +34,12 @@
 * @property string $element_id
 * @property string $element_type
 * @property string $status
 * @property \Carbon\Carbon $completed_at
 * @property \Carbon\Carbon $due_at
 * @property \Carbon\Carbon $initiated_at
 * @property \Carbon\Carbon $riskchanges_at
 * @property \Carbon\Carbon $updated_at
 * @property \Carbon\Carbon $created_at
 * @property Carbon $completed_at
 * @property Carbon $due_at
 * @property Carbon $initiated_at
 * @property Carbon $riskchanges_at
 * @property Carbon $updated_at
 * @property Carbon $created_at
 * @property ProcessRequest $processRequest
 *
 * @OA\Schema(
Expand DownExpand Up@@ -332,7 +332,7 @@ public function getScreen(): ?Screen
 // It uses a try-catch block to handle any exceptions that might occur, for example in test environments.
 try {
 $localName = $this->getBpmnDefinition()->localName;
 } catch (\Throwable $t) {
 } catch (Throwable $t) {
 $localName = null;
 }
 $isManualTask = $localName === 'manualTask';
Expand DownExpand Up@@ -457,7 +457,7 @@ public function getAdvanceStatusAttribute()
 /**
 * Check if the user has access to reassign this task
 *
 * @param \ProcessMaker\Models\User $user
 * @param User $user
 */
 public function authorizeReassignment(User $user)
 {
Expand DownExpand Up@@ -616,7 +616,7 @@ public function fieldAliasCompleted()

 public function fieldAliasUser_Id()
 {
 return 'user_id';
 return 'process_request_tokens.user_id';
 }

 /**
Expand DownExpand Up@@ -665,9 +665,9 @@ public function valueAliasStatus($value, $expression, $callback = null, User $us
 } elseif (array_key_exists($value, $statusMap)) {
 $query->where('is_self_service', 0);
 if ($expression->operator == '=') {
 $query->whereIn('status', $statusMap[$value]);
 $query->whereIn('process_request_tokens.status', $statusMap[$value]);
 } elseif ($expression->operator == '!=') {
 $query->whereNotIn('status', $statusMap[$value]);
 $query->whereNotIn('process_request_tokens.status', $statusMap[$value]);
 }
 } else {
 $query->where('status', $expression->operator, $value)
Expand DownExpand Up@@ -758,6 +758,20 @@ public function valueAliasProcess_Name(string $value, Expression $expression): c
 };
 }

 /**
 * PMQL value alias for assignee field by fullname.
 * @param string $value
 * @return callable
 */
 public function valueAliasAssigneeByFullName($value, $expression)
 {
 return function ($query) use ($expression, $value) {
 $query->whereHas('user', function ($query) use ($expression, $value) {
 $query->whereRaw("CONCAT(firstname, ' ', lastname) " . $expression->operator . ' ?', [$value]);
 });
 };
 }

 /**
 * PMQL wildcard for process request & data fields
 *
Expand DownExpand Up@@ -909,8 +923,8 @@ public function persistUserData($user)
 /**
 * Log an error when executing the token
 *
 * @param \Throwable $error
 * @param \ProcessMaker\Nayra\Contracts\Bpmn\FlowElementInterface $bpmnElement
 * @param Throwable $error
 * @param FlowElementInterface $bpmnElement
 */
 public function logError(Throwable $error, FlowElementInterface $bpmnElement)
 {
Expand Down

114 changes: 75 additions & 39 deletions
resources/js/common/PMColumnFilterPopoverCommonMixin.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { get, cloneDeep } from "lodash";

const PMColumnFilterCommonMixin = {
 data() {
 return {
Expand All@@ -9,6 +11,22 @@ const PMColumnFilterCommonMixin = {
 };
 },
 methods: {
 storeFilterConfiguration() {
 const { order, type } = this.filterConfiguration();
 let url = "users/store_filter_configuration/";
 if (this.$props.columns && this.savedSearch) {
 url += "savedSearch|" + this.savedSearch;
 } else {
 url += type;
 }
 let config = {
 filters: this.formattedFilter(),
 order
 };
 ProcessMaker.apiClient.put(url, config);
 window.ProcessMaker.advanced_filter = config;
 window.ProcessMaker.EventBus.$emit("advanced-filter-updated");
 },
 getViewConfigFilter() {
 return [
 {
Expand DownExpand Up@@ -67,15 +85,31 @@ const PMColumnFilterCommonMixin = {
 }
 ];
 },
onApply(json, index) {
 let oldValue, type, value;
addAliases(json, key, label) {
 let type, value;
 for (let i in json) {
 oldValue = json[i].subject.value;
 type = this.getTypeColumnFilter(oldValue);
 value = this.getAliasColumnForFilter(oldValue);
 type = this.getTypeColumnFilter(key, json[i].subject.type);
 value = this.getAliasColumnForFilter(key, json[i].subject.value);
 json[i].subject.type = type;
 json[i].subject.value = value;
 json[i]._column_field = key;
 json[i]._column_label = label;

 if (json[i].or && json[i].or.length > 0) {
 this.addAliases(json[i].or, key, label);
 }
 }
 },
 getTypeColumnFilter(field, defaultType = 'Field') {
 return this.tableHeaders.find(column => column.field === field)?.filter_subject?.type || defaultType;
 },
 getAliasColumnForFilter(field, defaultValue) {
 return this.tableHeaders.find(column => column.field === field)?.filter_subject?.value || defaultValue;
 },
 getAliasColumnForOrderBy(value) {
 return this.tableHeaders.find(column => column.field === value)?.order_column || value;
 },
 onApply(json, index) {
 this.advancedFilterInit();
 this.advancedFilter[index] = json;
 this.markStyleWhenColumnSetAFilter();
Expand All@@ -101,9 +135,20 @@ const PMColumnFilterCommonMixin = {
 object.$refs.pmColumnFilterForm.setValues(this.advancedFilter[index]);
 }
 },
 formattedFilter() {
 const filterCopy = cloneDeep(this.advancedFilter);
 Object.keys(filterCopy).forEach((key) => {
 if (filterCopy[key].length === 0) {
 delete filterCopy[key];
 }
 const label = this.tableHeaders.find(column => column.field === key)?.label;
 this.addAliases(filterCopy[key], key, label);
 });
 return Object.values(filterCopy).flat(1);
 },
 getAdvancedFilter() {
 let flat = this.json2Array(this.advancedFilter).flat(1);
 return flat.length > 0 ? "&advanced_filter=" + encodeURIComponent(JSON.stringify(flat)) : "";
 let formattedFilter = this.formattedFilter();
 return formattedFilter.length > 0 ? "&advanced_filter=" + encodeURIComponent(JSON.stringify(formattedFilter)) : "";
 },
 getUrlUsers(filter) {
 let page = 1;
Expand All@@ -122,8 +167,12 @@ const PMColumnFilterCommonMixin = {
 let format = "string";
 if (column.format) {
 format = column.format;
 if (format === "int") {
 // We don't have a field for integers
 format = "string";
 }
 }
 if (column.field === "status" || column.field === "assignee") {
 if (column.field === "status") {
 format = "stringSelect";
 }
 return format;
Expand All@@ -133,17 +182,14 @@ const PMColumnFilterCommonMixin = {
 if (column.field === "status") {
 formatRange = this.getStatus();
 }
 if (column.field === "assignee") {
 formatRange = this.viewAssignee;
 }
 return formatRange;
 },
 getOperators(column) {
 let operators = [];
 if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name" || column.field === "participants") {
 if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name" || column.field === "participants" || column.field === "assignee") {
 operators = ["=", "in", "contains", "regex"];
 }
 if (column.field === "status" || column.field === "assignee") {
 if (column.field === "status") {
 operators = ["=", "in"];
 }
 if (column.field === "initiated_at" || column.field === "completed_at" || column.field === "due_at") {
Expand DownExpand Up@@ -208,35 +254,25 @@ const PMColumnFilterCommonMixin = {
 }
 }
 },
 getFilterConfiguration(name) {
if ("filter_user" in window.Processmaker) {
 this.setFilterPropsFromConfig(window.Processmaker.filter_user);
return;
}
let url = "users/get_filter_configuration/" + name;
ProcessMaker.apiClient.get(url).then(response => {
this.setFilterPropsFromConfig(response.data.data);
 getFilterConfiguration() {
const filters = {};
get(window, 'ProcessMaker.advanced_filter.filters', []).forEach((filter) => {
const key = filter._column_field;
 if (!(key in filters)) {
 filters[key] = [];
 }
filters[key].push(filter);
 });
 },
 setFilterPropsFromConfig(config) {
 if (typeof config !== "object") {
 config = {};
 }
 if ("filter" in config && typeof config.filter === "object") {
 this.advancedFilter = config.filter;
 }
 if (config?.order?.by && config?.order?.direction) {
 this.setOrderByProps(config.order.by, config.order.direction);
 this.advancedFilter = filters;

 const order = get(window, 'ProcessMaker.advanced_filter.order');
 if (order?.by && order?.direction) {
 this.setOrderByProps(order.by, order.direction);
 }

 this.markStyleWhenColumnSetAFilter();
 window.ProcessMaker.EventBus.$emit("advanced-filter-updated");
 },
 json2Array(json) {
 let result = [];
 for (let i in json) {
 result.push(json[i]);
 }
 return result;
 }
 }
};
export default PMColumnFilterCommonMixin;
export default PMColumnFilterCommonMixin;

48 changes: 48 additions & 0 deletions
resources/js/common/advancedFilterStatusMixin.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
import { get } from "lodash";

export default {
 data() {
 return {
 advancedFilter: [],
 };
 },
 mounted() {
 this.setAdvancedFilter();
 window.ProcessMaker.EventBus.$on('advanced-filter-updated', this.setAdvancedFilter);
 },
 methods: {
 setAdvancedFilter() {
 this.advancedFilter = get(window, 'ProcessMaker.advanced_filter.filters', []);
 },
 formatForBadge(filters, result) {
 for(const filter of filters) {
 result.push([
 this.formatBadgeSubject(filter),
 [{name: this.formatBadgeValue(filter), advanced_filter: true}]
 ]);

 if (filter.or && filter.or.length > 0) {
 this.formatForBadge(filter.or, result);
 }
 }
 },
 formatBadgeSubject(filter) {
 return get(filter, '_column_label', '');
 },
 formatBadgeValue(filter) {
 let result = filter.operator;
 result = result + " " + filter.value;
 return result;
 },
 },
 computed: {
 formatAdvancedFilterForBadges() {
 if (!this.advancedFilter || this.advancedFilter.length === 0) {
 return [];
 }
 const result = [];
 this.formatForBadge(this.advancedFilter, result);
 return result;
 },
 },
}

4 changes: 1 addition & 3 deletions
resources/js/components/PMColumnFilterPopover/PMColumnFilterPopover.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,9 @@
 popoverShow: false
 };
 },
 updated() {
 this.$emit("onUpdate", this);
 },
 methods: {
 onShown() {
 this.$emit("onUpdate", this);
 this.focusCancelButton();
 this.closeOnBlur();
 },
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Refactor some parts of the column filtering functionality#6152

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 20 commits into

from

Feb 8, 2024
 Merged


Refactor some parts of the column filtering functionality
#6152
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


20 commits


Select commit
Hold shift + click to select a range
205078e

Refactor


nolanpro Feb 3, 2024
a4f030c

Remove console log


nolanpro Feb 5, 2024
7ba1696

Remove console log


nolanpro Feb 5, 2024
609ab18

Remove mixin


nolanpro Feb 5, 2024
37a2589

Remove changes to PmqlInput.vue


nolanpro Feb 5, 2024
6ffa970

Add filter badges


nolanpro Feb 5, 2024
d54b5b7

Update task name


nolanpro Feb 5, 2024
7375f8e

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 6, 2024
6ef0644

Refactor to use column config for filtering


nolanpro Feb 6, 2024
c78aff2

Refactor column aliases


nolanpro Feb 6, 2024
9c46a72

Continue refactoring advanced filter


nolanpro Feb 7, 2024
35cf25d

Fix order column name


nolanpro Feb 7, 2024
25c7d22

Fix loading advanced filters


nolanpro Feb 7, 2024
2954590

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 7, 2024
c2f07f4

Remove debugging


nolanpro Feb 7, 2024
8c091a7

Fix default column filter subject type


nolanpro Feb 8, 2024
a4831b2

Update assignees column to search using input instead select


agustinbusso Feb 8, 2024
dea13ec

Remove json2array function


nolanpro Feb 8, 2024
8ca9f2e

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 8, 2024
61ec2c5

Merge branch 'next' into observation/FOUR-13348


nolanpro 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


5 changes: 5 additions & 0 deletions
ProcessMaker/Filters/Filter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@ class Filter

 const TYPE_PARTICIPANTS_FULLNAME = 'ParticipantsFullName';

 const TYPE_ASSIGNEES_FULLNAME = 'AssigneesFullName';

 const TYPE_STATUS = 'Status';

 const TYPE_FIELD = 'Field';
Expand DownExpand Up@@ -200,6 +202,9 @@ private function valueAliasMethod()
 case self::TYPE_PARTICIPANTS_FULLNAME:
 $method = 'valueAliasParticipantByFullName';
 break;
 case self::TYPE_ASSIGNEES_FULLNAME:
 $method = 'valueAliasAssigneeByFullName';
 break;
 case self::TYPE_STATUS:
 $method = 'valueAliasStatus';
 break;
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/Filters/SaveSession.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,9 @@ public static function getConfigFilter(String $name, Object $user)
 {
 $key = self::getKey($user, $name);

 return self::get($key, []);
 $default = ['filters' => []];

 return self::get($key, $default);
 }

 /**
Expand Down

3 changes: 2 additions & 1 deletion
ProcessMaker/Http/Controllers/TaskController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,8 +131,9 @@ public function edit(ProcessRequestToken $task, string $preview = '')
 'lastname',
 'avatar',
 'timezone',
 'datetime_format'
 'datetime_format',
 ]);

 return view('tasks.edit', [
 'task' => $task,
 'dueLabels' => self::$dueLabels,
Expand Down

40 changes: 27 additions & 13 deletions
ProcessMaker/Models/ProcessRequestToken.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,12 +34,12 @@
 * @property string $element_id
 * @property string $element_type
 * @property string $status
 * @property \Carbon\Carbon $completed_at
 * @property \Carbon\Carbon $due_at
 * @property \Carbon\Carbon $initiated_at
 * @property \Carbon\Carbon $riskchanges_at
 * @property \Carbon\Carbon $updated_at
 * @property \Carbon\Carbon $created_at
 * @property Carbon $completed_at
 * @property Carbon $due_at
 * @property Carbon $initiated_at
 * @property Carbon $riskchanges_at
 * @property Carbon $updated_at
 * @property Carbon $created_at
 * @property ProcessRequest $processRequest
 *
 * @OA\Schema(
Expand DownExpand Up@@ -332,7 +332,7 @@ public function getScreen(): ?Screen
 // It uses a try-catch block to handle any exceptions that might occur, for example in test environments.
 try {
 $localName = $this->getBpmnDefinition()->localName;
 } catch (\Throwable $t) {
 } catch (Throwable $t) {
 $localName = null;
 }
 $isManualTask = $localName === 'manualTask';
Expand DownExpand Up@@ -457,7 +457,7 @@ public function getAdvanceStatusAttribute()
 /**
 * Check if the user has access to reassign this task
 *
 * @param \ProcessMaker\Models\User $user
 * @param User $user
 */
 public function authorizeReassignment(User $user)
 {
Expand DownExpand Up@@ -616,7 +616,7 @@ public function fieldAliasCompleted()

 public function fieldAliasUser_Id()
 {
 return 'user_id';
 return 'process_request_tokens.user_id';
 }

 /**
Expand DownExpand Up@@ -665,9 +665,9 @@ public function valueAliasStatus($value, $expression, $callback = null, User $us
 } elseif (array_key_exists($value, $statusMap)) {
 $query->where('is_self_service', 0);
 if ($expression->operator == '=') {
 $query->whereIn('status', $statusMap[$value]);
 $query->whereIn('process_request_tokens.status', $statusMap[$value]);
 } elseif ($expression->operator == '!=') {
 $query->whereNotIn('status', $statusMap[$value]);
 $query->whereNotIn('process_request_tokens.status', $statusMap[$value]);
 }
 } else {
 $query->where('status', $expression->operator, $value)
Expand DownExpand Up@@ -758,6 +758,20 @@ public function valueAliasProcess_Name(string $value, Expression $expression): c
 };
 }

 /**
 * PMQL value alias for assignee field by fullname.
 * @param string $value
 * @return callable
 */
 public function valueAliasAssigneeByFullName($value, $expression)
 {
 return function ($query) use ($expression, $value) {
 $query->whereHas('user', function ($query) use ($expression, $value) {
 $query->whereRaw("CONCAT(firstname, ' ', lastname) " . $expression->operator . ' ?', [$value]);
 });
 };
 }

 /**
 * PMQL wildcard for process request & data fields
 *
Expand DownExpand Up@@ -909,8 +923,8 @@ public function persistUserData($user)
 /**
 * Log an error when executing the token
 *
 * @param \Throwable $error
 * @param \ProcessMaker\Nayra\Contracts\Bpmn\FlowElementInterface $bpmnElement
 * @param Throwable $error
 * @param FlowElementInterface $bpmnElement
 */
 public function logError(Throwable $error, FlowElementInterface $bpmnElement)
 {
Expand Down

114 changes: 75 additions & 39 deletions
resources/js/common/PMColumnFilterPopoverCommonMixin.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { get, cloneDeep } from "lodash";

const PMColumnFilterCommonMixin = {
 data() {
 return {
Expand All@@ -9,6 +11,22 @@ const PMColumnFilterCommonMixin = {
 };
 },
 methods: {
 storeFilterConfiguration() {
 const { order, type } = this.filterConfiguration();
 let url = "users/store_filter_configuration/";
 if (this.$props.columns && this.savedSearch) {
 url += "savedSearch|" + this.savedSearch;
 } else {
 url += type;
 }
 let config = {
 filters: this.formattedFilter(),
 order
 };
 ProcessMaker.apiClient.put(url, config);
 window.ProcessMaker.advanced_filter = config;
 window.ProcessMaker.EventBus.$emit("advanced-filter-updated");
 },
 getViewConfigFilter() {
 return [
 {
Expand DownExpand Up@@ -67,15 +85,31 @@ const PMColumnFilterCommonMixin = {
 }
 ];
 },
onApply(json, index) {
 let oldValue, type, value;
addAliases(json, key, label) {
 let type, value;
 for (let i in json) {
 oldValue = json[i].subject.value;
 type = this.getTypeColumnFilter(oldValue);
 value = this.getAliasColumnForFilter(oldValue);
 type = this.getTypeColumnFilter(key, json[i].subject.type);
 value = this.getAliasColumnForFilter(key, json[i].subject.value);
 json[i].subject.type = type;
 json[i].subject.value = value;
 json[i]._column_field = key;
 json[i]._column_label = label;

 if (json[i].or && json[i].or.length > 0) {
 this.addAliases(json[i].or, key, label);
 }
 }
 },
 getTypeColumnFilter(field, defaultType = 'Field') {
 return this.tableHeaders.find(column => column.field === field)?.filter_subject?.type || defaultType;
 },
 getAliasColumnForFilter(field, defaultValue) {
 return this.tableHeaders.find(column => column.field === field)?.filter_subject?.value || defaultValue;
 },
 getAliasColumnForOrderBy(value) {
 return this.tableHeaders.find(column => column.field === value)?.order_column || value;
 },
 onApply(json, index) {
 this.advancedFilterInit();
 this.advancedFilter[index] = json;
 this.markStyleWhenColumnSetAFilter();
Expand All@@ -101,9 +135,20 @@ const PMColumnFilterCommonMixin = {
 object.$refs.pmColumnFilterForm.setValues(this.advancedFilter[index]);
 }
 },
 formattedFilter() {
 const filterCopy = cloneDeep(this.advancedFilter);
 Object.keys(filterCopy).forEach((key) => {
 if (filterCopy[key].length === 0) {
 delete filterCopy[key];
 }
 const label = this.tableHeaders.find(column => column.field === key)?.label;
 this.addAliases(filterCopy[key], key, label);
 });
 return Object.values(filterCopy).flat(1);
 },
 getAdvancedFilter() {
 let flat = this.json2Array(this.advancedFilter).flat(1);
 return flat.length > 0 ? "&advanced_filter=" + encodeURIComponent(JSON.stringify(flat)) : "";
 let formattedFilter = this.formattedFilter();
 return formattedFilter.length > 0 ? "&advanced_filter=" + encodeURIComponent(JSON.stringify(formattedFilter)) : "";
 },
 getUrlUsers(filter) {
 let page = 1;
Expand All@@ -122,8 +167,12 @@ const PMColumnFilterCommonMixin = {
 let format = "string";
 if (column.format) {
 format = column.format;
 if (format === "int") {
 // We don't have a field for integers
 format = "string";
 }
 }
 if (column.field === "status" || column.field === "assignee") {
 if (column.field === "status") {
 format = "stringSelect";
 }
 return format;
Expand All@@ -133,17 +182,14 @@ const PMColumnFilterCommonMixin = {
 if (column.field === "status") {
 formatRange = this.getStatus();
 }
 if (column.field === "assignee") {
 formatRange = this.viewAssignee;
 }
 return formatRange;
 },
 getOperators(column) {
 let operators = [];
 if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name" || column.field === "participants") {
 if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name" || column.field === "participants" || column.field === "assignee") {
 operators = ["=", "in", "contains", "regex"];
 }
 if (column.field === "status" || column.field === "assignee") {
 if (column.field === "status") {
 operators = ["=", "in"];
 }
 if (column.field === "initiated_at" || column.field === "completed_at" || column.field === "due_at") {
Expand DownExpand Up@@ -208,35 +254,25 @@ const PMColumnFilterCommonMixin = {
 }
 }
 },
 getFilterConfiguration(name) {
if ("filter_user" in window.Processmaker) {
 this.setFilterPropsFromConfig(window.Processmaker.filter_user);
return;
}
let url = "users/get_filter_configuration/" + name;
ProcessMaker.apiClient.get(url).then(response => {
this.setFilterPropsFromConfig(response.data.data);
 getFilterConfiguration() {
const filters = {};
get(window, 'ProcessMaker.advanced_filter.filters', []).forEach((filter) => {
const key = filter._column_field;
 if (!(key in filters)) {
 filters[key] = [];
 }
filters[key].push(filter);
 });
 },
 setFilterPropsFromConfig(config) {
 if (typeof config !== "object") {
 config = {};
 }
 if ("filter" in config && typeof config.filter === "object") {
 this.advancedFilter = config.filter;
 }
 if (config?.order?.by && config?.order?.direction) {
 this.setOrderByProps(config.order.by, config.order.direction);
 this.advancedFilter = filters;

 const order = get(window, 'ProcessMaker.advanced_filter.order');
 if (order?.by && order?.direction) {
 this.setOrderByProps(order.by, order.direction);
 }

 this.markStyleWhenColumnSetAFilter();
 window.ProcessMaker.EventBus.$emit("advanced-filter-updated");
 },
 json2Array(json) {
 let result = [];
 for (let i in json) {
 result.push(json[i]);
 }
 return result;
 }
 }
};
export default PMColumnFilterCommonMixin;
export default PMColumnFilterCommonMixin;

48 changes: 48 additions & 0 deletions
resources/js/common/advancedFilterStatusMixin.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
import { get } from "lodash";

export default {
 data() {
 return {
 advancedFilter: [],
 };
 },
 mounted() {
 this.setAdvancedFilter();
 window.ProcessMaker.EventBus.$on('advanced-filter-updated', this.setAdvancedFilter);
 },
 methods: {
 setAdvancedFilter() {
 this.advancedFilter = get(window, 'ProcessMaker.advanced_filter.filters', []);
 },
 formatForBadge(filters, result) {
 for(const filter of filters) {
 result.push([
 this.formatBadgeSubject(filter),
 [{name: this.formatBadgeValue(filter), advanced_filter: true}]
 ]);

 if (filter.or && filter.or.length > 0) {
 this.formatForBadge(filter.or, result);
 }
 }
 },
 formatBadgeSubject(filter) {
 return get(filter, '_column_label', '');
 },
 formatBadgeValue(filter) {
 let result = filter.operator;
 result = result + " " + filter.value;
 return result;
 },
 },
 computed: {
 formatAdvancedFilterForBadges() {
 if (!this.advancedFilter || this.advancedFilter.length === 0) {
 return [];
 }
 const result = [];
 this.formatForBadge(this.advancedFilter, result);
 return result;
 },
 },
}

4 changes: 1 addition & 3 deletions
resources/js/components/PMColumnFilterPopover/PMColumnFilterPopover.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,9 @@
 popoverShow: false
 };
 },
 updated() {
 this.$emit("onUpdate", this);
 },
 methods: {
 onShown() {
 this.$emit("onUpdate", this);
 this.focusCancelButton();
 this.closeOnBlur();
 },
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor some parts of the column filtering functionality#6152

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 20 commits into

from

Feb 8, 2024
 Merged


Refactor some parts of the column filtering functionality
#6152
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


20 commits


Select commit
Hold shift + click to select a range
205078e

Refactor


nolanpro Feb 3, 2024
a4f030c

Remove console log


nolanpro Feb 5, 2024
7ba1696

Remove console log


nolanpro Feb 5, 2024
609ab18

Remove mixin


nolanpro Feb 5, 2024
37a2589

Remove changes to PmqlInput.vue


nolanpro Feb 5, 2024
6ffa970

Add filter badges


nolanpro Feb 5, 2024
d54b5b7

Update task name


nolanpro Feb 5, 2024
7375f8e

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 6, 2024
6ef0644

Refactor to use column config for filtering


nolanpro Feb 6, 2024
c78aff2

Refactor column aliases


nolanpro Feb 6, 2024
9c46a72

Continue refactoring advanced filter


nolanpro Feb 7, 2024
35cf25d

Fix order column name


nolanpro Feb 7, 2024
25c7d22

Fix loading advanced filters


nolanpro Feb 7, 2024
2954590

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 7, 2024
c2f07f4

Remove debugging


nolanpro Feb 7, 2024
8c091a7

Fix default column filter subject type


nolanpro Feb 8, 2024
a4831b2

Update assignees column to search using input instead select


agustinbusso Feb 8, 2024
dea13ec

Remove json2array function


nolanpro Feb 8, 2024
8ca9f2e

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 8, 2024
61ec2c5

Merge branch 'next' into observation/FOUR-13348


nolanpro 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


5 changes: 5 additions & 0 deletions
ProcessMaker/Filters/Filter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@ class Filter

 const TYPE_PARTICIPANTS_FULLNAME = 'ParticipantsFullName';

 const TYPE_ASSIGNEES_FULLNAME = 'AssigneesFullName';

 const TYPE_STATUS = 'Status';

 const TYPE_FIELD = 'Field';
Expand DownExpand Up@@ -200,6 +202,9 @@ private function valueAliasMethod()
 case self::TYPE_PARTICIPANTS_FULLNAME:
 $method = 'valueAliasParticipantByFullName';
 break;
 case self::TYPE_ASSIGNEES_FULLNAME:
 $method = 'valueAliasAssigneeByFullName';
 break;
 case self::TYPE_STATUS:
 $method = 'valueAliasStatus';
 break;
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/Filters/SaveSession.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,9 @@ public static function getConfigFilter(String $name, Object $user)
 {
 $key = self::getKey($user, $name);

 return self::get($key, []);
 $default = ['filters' => []];

 return self::get($key, $default);
 }

 /**
Expand Down

3 changes: 2 additions & 1 deletion
ProcessMaker/Http/Controllers/TaskController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,8 +131,9 @@ public function edit(ProcessRequestToken $task, string $preview = '')
 'lastname',
 'avatar',
 'timezone',
 'datetime_format'
 'datetime_format',
 ]);

 return view('tasks.edit', [
 'task' => $task,
 'dueLabels' => self::$dueLabels,
Expand Down

40 changes: 27 additions & 13 deletions
ProcessMaker/Models/ProcessRequestToken.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,12 +34,12 @@
 * @property string $element_id
 * @property string $element_type
 * @property string $status
 * @property \Carbon\Carbon $completed_at
 * @property \Carbon\Carbon $due_at
 * @property \Carbon\Carbon $initiated_at
 * @property \Carbon\Carbon $riskchanges_at
 * @property \Carbon\Carbon $updated_at
 * @property \Carbon\Carbon $created_at
 * @property Carbon $completed_at
 * @property Carbon $due_at
 * @property Carbon $initiated_at
 * @property Carbon $riskchanges_at
 * @property Carbon $updated_at
 * @property Carbon $created_at
 * @property ProcessRequest $processRequest
 *
 * @OA\Schema(
Expand DownExpand Up@@ -332,7 +332,7 @@ public function getScreen(): ?Screen
 // It uses a try-catch block to handle any exceptions that might occur, for example in test environments.
 try {
 $localName = $this->getBpmnDefinition()->localName;
 } catch (\Throwable $t) {
 } catch (Throwable $t) {
 $localName = null;
 }
 $isManualTask = $localName === 'manualTask';
Expand DownExpand Up@@ -457,7 +457,7 @@ public function getAdvanceStatusAttribute()
 /**
 * Check if the user has access to reassign this task
 *
 * @param \ProcessMaker\Models\User $user
 * @param User $user
 */
 public function authorizeReassignment(User $user)
 {
Expand DownExpand Up@@ -616,7 +616,7 @@ public function fieldAliasCompleted()

 public function fieldAliasUser_Id()
 {
 return 'user_id';
 return 'process_request_tokens.user_id';
 }

 /**
Expand DownExpand Up@@ -665,9 +665,9 @@ public function valueAliasStatus($value, $expression, $callback = null, User $us
 } elseif (array_key_exists($value, $statusMap)) {
 $query->where('is_self_service', 0);
 if ($expression->operator == '=') {
 $query->whereIn('status', $statusMap[$value]);
 $query->whereIn('process_request_tokens.status', $statusMap[$value]);
 } elseif ($expression->operator == '!=') {
 $query->whereNotIn('status', $statusMap[$value]);
 $query->whereNotIn('process_request_tokens.status', $statusMap[$value]);
 }
 } else {
 $query->where('status', $expression->operator, $value)
Expand DownExpand Up@@ -758,6 +758,20 @@ public function valueAliasProcess_Name(string $value, Expression $expression): c
 };
 }

 /**
 * PMQL value alias for assignee field by fullname.
 * @param string $value
 * @return callable
 */
 public function valueAliasAssigneeByFullName($value, $expression)
 {
 return function ($query) use ($expression, $value) {
 $query->whereHas('user', function ($query) use ($expression, $value) {
 $query->whereRaw("CONCAT(firstname, ' ', lastname) " . $expression->operator . ' ?', [$value]);
 });
 };
 }

 /**
 * PMQL wildcard for process request & data fields
 *
Expand DownExpand Up@@ -909,8 +923,8 @@ public function persistUserData($user)
 /**
 * Log an error when executing the token
 *
 * @param \Throwable $error
 * @param \ProcessMaker\Nayra\Contracts\Bpmn\FlowElementInterface $bpmnElement
 * @param Throwable $error
 * @param FlowElementInterface $bpmnElement
 */
 public function logError(Throwable $error, FlowElementInterface $bpmnElement)
 {
Expand Down

114 changes: 75 additions & 39 deletions
resources/js/common/PMColumnFilterPopoverCommonMixin.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { get, cloneDeep } from "lodash";

const PMColumnFilterCommonMixin = {
 data() {
 return {
Expand All@@ -9,6 +11,22 @@ const PMColumnFilterCommonMixin = {
 };
 },
 methods: {
 storeFilterConfiguration() {
 const { order, type } = this.filterConfiguration();
 let url = "users/store_filter_configuration/";
 if (this.$props.columns && this.savedSearch) {
 url += "savedSearch|" + this.savedSearch;
 } else {
 url += type;
 }
 let config = {
 filters: this.formattedFilter(),
 order
 };
 ProcessMaker.apiClient.put(url, config);
 window.ProcessMaker.advanced_filter = config;
 window.ProcessMaker.EventBus.$emit("advanced-filter-updated");
 },
 getViewConfigFilter() {
 return [
 {
Expand DownExpand Up@@ -67,15 +85,31 @@ const PMColumnFilterCommonMixin = {
 }
 ];
 },
onApply(json, index) {
 let oldValue, type, value;
addAliases(json, key, label) {
 let type, value;
 for (let i in json) {
 oldValue = json[i].subject.value;
 type = this.getTypeColumnFilter(oldValue);
 value = this.getAliasColumnForFilter(oldValue);
 type = this.getTypeColumnFilter(key, json[i].subject.type);
 value = this.getAliasColumnForFilter(key, json[i].subject.value);
 json[i].subject.type = type;
 json[i].subject.value = value;
 json[i]._column_field = key;
 json[i]._column_label = label;

 if (json[i].or && json[i].or.length > 0) {
 this.addAliases(json[i].or, key, label);
 }
 }
 },
 getTypeColumnFilter(field, defaultType = 'Field') {
 return this.tableHeaders.find(column => column.field === field)?.filter_subject?.type || defaultType;
 },
 getAliasColumnForFilter(field, defaultValue) {
 return this.tableHeaders.find(column => column.field === field)?.filter_subject?.value || defaultValue;
 },
 getAliasColumnForOrderBy(value) {
 return this.tableHeaders.find(column => column.field === value)?.order_column || value;
 },
 onApply(json, index) {
 this.advancedFilterInit();
 this.advancedFilter[index] = json;
 this.markStyleWhenColumnSetAFilter();
Expand All@@ -101,9 +135,20 @@ const PMColumnFilterCommonMixin = {
 object.$refs.pmColumnFilterForm.setValues(this.advancedFilter[index]);
 }
 },
 formattedFilter() {
 const filterCopy = cloneDeep(this.advancedFilter);
 Object.keys(filterCopy).forEach((key) => {
 if (filterCopy[key].length === 0) {
 delete filterCopy[key];
 }
 const label = this.tableHeaders.find(column => column.field === key)?.label;
 this.addAliases(filterCopy[key], key, label);
 });
 return Object.values(filterCopy).flat(1);
 },
 getAdvancedFilter() {
 let flat = this.json2Array(this.advancedFilter).flat(1);
 return flat.length > 0 ? "&advanced_filter=" + encodeURIComponent(JSON.stringify(flat)) : "";
 let formattedFilter = this.formattedFilter();
 return formattedFilter.length > 0 ? "&advanced_filter=" + encodeURIComponent(JSON.stringify(formattedFilter)) : "";
 },
 getUrlUsers(filter) {
 let page = 1;
Expand All@@ -122,8 +167,12 @@ const PMColumnFilterCommonMixin = {
 let format = "string";
 if (column.format) {
 format = column.format;
 if (format === "int") {
 // We don't have a field for integers
 format = "string";
 }
 }
 if (column.field === "status" || column.field === "assignee") {
 if (column.field === "status") {
 format = "stringSelect";
 }
 return format;
Expand All@@ -133,17 +182,14 @@ const PMColumnFilterCommonMixin = {
 if (column.field === "status") {
 formatRange = this.getStatus();
 }
 if (column.field === "assignee") {
 formatRange = this.viewAssignee;
 }
 return formatRange;
 },
 getOperators(column) {
 let operators = [];
 if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name" || column.field === "participants") {
 if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name" || column.field === "participants" || column.field === "assignee") {
 operators = ["=", "in", "contains", "regex"];
 }
 if (column.field === "status" || column.field === "assignee") {
 if (column.field === "status") {
 operators = ["=", "in"];
 }
 if (column.field === "initiated_at" || column.field === "completed_at" || column.field === "due_at") {
Expand DownExpand Up@@ -208,35 +254,25 @@ const PMColumnFilterCommonMixin = {
 }
 }
 },
 getFilterConfiguration(name) {
if ("filter_user" in window.Processmaker) {
 this.setFilterPropsFromConfig(window.Processmaker.filter_user);
return;
}
let url = "users/get_filter_configuration/" + name;
ProcessMaker.apiClient.get(url).then(response => {
this.setFilterPropsFromConfig(response.data.data);
 getFilterConfiguration() {
const filters = {};
get(window, 'ProcessMaker.advanced_filter.filters', []).forEach((filter) => {
const key = filter._column_field;
 if (!(key in filters)) {
 filters[key] = [];
 }
filters[key].push(filter);
 });
 },
 setFilterPropsFromConfig(config) {
 if (typeof config !== "object") {
 config = {};
 }
 if ("filter" in config && typeof config.filter === "object") {
 this.advancedFilter = config.filter;
 }
 if (config?.order?.by && config?.order?.direction) {
 this.setOrderByProps(config.order.by, config.order.direction);
 this.advancedFilter = filters;

 const order = get(window, 'ProcessMaker.advanced_filter.order');
 if (order?.by && order?.direction) {
 this.setOrderByProps(order.by, order.direction);
 }

 this.markStyleWhenColumnSetAFilter();
 window.ProcessMaker.EventBus.$emit("advanced-filter-updated");
 },
 json2Array(json) {
 let result = [];
 for (let i in json) {
 result.push(json[i]);
 }
 return result;
 }
 }
};
export default PMColumnFilterCommonMixin;
export default PMColumnFilterCommonMixin;

48 changes: 48 additions & 0 deletions
resources/js/common/advancedFilterStatusMixin.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
import { get } from "lodash";

export default {
 data() {
 return {
 advancedFilter: [],
 };
 },
 mounted() {
 this.setAdvancedFilter();
 window.ProcessMaker.EventBus.$on('advanced-filter-updated', this.setAdvancedFilter);
 },
 methods: {
 setAdvancedFilter() {
 this.advancedFilter = get(window, 'ProcessMaker.advanced_filter.filters', []);
 },
 formatForBadge(filters, result) {
 for(const filter of filters) {
 result.push([
 this.formatBadgeSubject(filter),
 [{name: this.formatBadgeValue(filter), advanced_filter: true}]
 ]);

 if (filter.or && filter.or.length > 0) {
 this.formatForBadge(filter.or, result);
 }
 }
 },
 formatBadgeSubject(filter) {
 return get(filter, '_column_label', '');
 },
 formatBadgeValue(filter) {
 let result = filter.operator;
 result = result + " " + filter.value;
 return result;
 },
 },
 computed: {
 formatAdvancedFilterForBadges() {
 if (!this.advancedFilter || this.advancedFilter.length === 0) {
 return [];
 }
 const result = [];
 this.formatForBadge(this.advancedFilter, result);
 return result;
 },
 },
}

4 changes: 1 addition & 3 deletions
resources/js/components/PMColumnFilterPopover/PMColumnFilterPopover.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,9 @@
 popoverShow: false
 };
 },
 updated() {
 this.$emit("onUpdate", this);
 },
 methods: {
 onShown() {
 this.$emit("onUpdate", this);
 this.focusCancelButton();
 this.closeOnBlur();
 },
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor some parts of the column filtering functionality#6152

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 20 commits into

from

Feb 8, 2024
 Merged


Refactor some parts of the column filtering functionality
#6152
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


20 commits


Select commit
Hold shift + click to select a range
205078e

Refactor


nolanpro Feb 3, 2024
a4f030c

Remove console log


nolanpro Feb 5, 2024
7ba1696

Remove console log


nolanpro Feb 5, 2024
609ab18

Remove mixin


nolanpro Feb 5, 2024
37a2589

Remove changes to PmqlInput.vue


nolanpro Feb 5, 2024
6ffa970

Add filter badges


nolanpro Feb 5, 2024
d54b5b7

Update task name


nolanpro Feb 5, 2024
7375f8e

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 6, 2024
6ef0644

Refactor to use column config for filtering


nolanpro Feb 6, 2024
c78aff2

Refactor column aliases


nolanpro Feb 6, 2024
9c46a72

Continue refactoring advanced filter


nolanpro Feb 7, 2024
35cf25d

Fix order column name


nolanpro Feb 7, 2024
25c7d22

Fix loading advanced filters


nolanpro Feb 7, 2024
2954590

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 7, 2024
c2f07f4

Remove debugging


nolanpro Feb 7, 2024
8c091a7

Fix default column filter subject type


nolanpro Feb 8, 2024
a4831b2

Update assignees column to search using input instead select


agustinbusso Feb 8, 2024
dea13ec

Remove json2array function


nolanpro Feb 8, 2024
8ca9f2e

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 8, 2024
61ec2c5

Merge branch 'next' into observation/FOUR-13348


nolanpro 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


5 changes: 5 additions & 0 deletions
ProcessMaker/Filters/Filter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@ class Filter

 const TYPE_PARTICIPANTS_FULLNAME = 'ParticipantsFullName';

 const TYPE_ASSIGNEES_FULLNAME = 'AssigneesFullName';

 const TYPE_STATUS = 'Status';

 const TYPE_FIELD = 'Field';
Expand DownExpand Up@@ -200,6 +202,9 @@ private function valueAliasMethod()
 case self::TYPE_PARTICIPANTS_FULLNAME:
 $method = 'valueAliasParticipantByFullName';
 break;
 case self::TYPE_ASSIGNEES_FULLNAME:
 $method = 'valueAliasAssigneeByFullName';
 break;
 case self::TYPE_STATUS:
 $method = 'valueAliasStatus';
 break;
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/Filters/SaveSession.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,9 @@ public static function getConfigFilter(String $name, Object $user)
 {
 $key = self::getKey($user, $name);

 return self::get($key, []);
 $default = ['filters' => []];

 return self::get($key, $default);
 }

 /**
Expand Down

3 changes: 2 additions & 1 deletion
ProcessMaker/Http/Controllers/TaskController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,8 +131,9 @@ public function edit(ProcessRequestToken $task, string $preview = '')
 'lastname',
 'avatar',
 'timezone',
 'datetime_format'
 'datetime_format',
 ]);

 return view('tasks.edit', [
 'task' => $task,
 'dueLabels' => self::$dueLabels,
Expand Down

40 changes: 27 additions & 13 deletions
ProcessMaker/Models/ProcessRequestToken.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,12 +34,12 @@
 * @property string $element_id
 * @property string $element_type
 * @property string $status
 * @property \Carbon\Carbon $completed_at
 * @property \Carbon\Carbon $due_at
 * @property \Carbon\Carbon $initiated_at
 * @property \Carbon\Carbon $riskchanges_at
 * @property \Carbon\Carbon $updated_at
 * @property \Carbon\Carbon $created_at
 * @property Carbon $completed_at
 * @property Carbon $due_at
 * @property Carbon $initiated_at
 * @property Carbon $riskchanges_at
 * @property Carbon $updated_at
 * @property Carbon $created_at
 * @property ProcessRequest $processRequest
 *
 * @OA\Schema(
Expand DownExpand Up@@ -332,7 +332,7 @@ public function getScreen(): ?Screen
 // It uses a try-catch block to handle any exceptions that might occur, for example in test environments.
 try {
 $localName = $this->getBpmnDefinition()->localName;
 } catch (\Throwable $t) {
 } catch (Throwable $t) {
 $localName = null;
 }
 $isManualTask = $localName === 'manualTask';
Expand DownExpand Up@@ -457,7 +457,7 @@ public function getAdvanceStatusAttribute()
 /**
 * Check if the user has access to reassign this task
 *
 * @param \ProcessMaker\Models\User $user
 * @param User $user
 */
 public function authorizeReassignment(User $user)
 {
Expand DownExpand Up@@ -616,7 +616,7 @@ public function fieldAliasCompleted()

 public function fieldAliasUser_Id()
 {
 return 'user_id';
 return 'process_request_tokens.user_id';
 }

 /**
Expand DownExpand Up@@ -665,9 +665,9 @@ public function valueAliasStatus($value, $expression, $callback = null, User $us
 } elseif (array_key_exists($value, $statusMap)) {
 $query->where('is_self_service', 0);
 if ($expression->operator == '=') {
 $query->whereIn('status', $statusMap[$value]);
 $query->whereIn('process_request_tokens.status', $statusMap[$value]);
 } elseif ($expression->operator == '!=') {
 $query->whereNotIn('status', $statusMap[$value]);
 $query->whereNotIn('process_request_tokens.status', $statusMap[$value]);
 }
 } else {
 $query->where('status', $expression->operator, $value)
Expand DownExpand Up@@ -758,6 +758,20 @@ public function valueAliasProcess_Name(string $value, Expression $expression): c
 };
 }

 /**
 * PMQL value alias for assignee field by fullname.
 * @param string $value
 * @return callable
 */
 public function valueAliasAssigneeByFullName($value, $expression)
 {
 return function ($query) use ($expression, $value) {
 $query->whereHas('user', function ($query) use ($expression, $value) {
 $query->whereRaw("CONCAT(firstname, ' ', lastname) " . $expression->operator . ' ?', [$value]);
 });
 };
 }

 /**
 * PMQL wildcard for process request & data fields
 *
Expand DownExpand Up@@ -909,8 +923,8 @@ public function persistUserData($user)
 /**
 * Log an error when executing the token
 *
 * @param \Throwable $error
 * @param \ProcessMaker\Nayra\Contracts\Bpmn\FlowElementInterface $bpmnElement
 * @param Throwable $error
 * @param FlowElementInterface $bpmnElement
 */
 public function logError(Throwable $error, FlowElementInterface $bpmnElement)
 {
Expand Down

114 changes: 75 additions & 39 deletions
resources/js/common/PMColumnFilterPopoverCommonMixin.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { get, cloneDeep } from "lodash";

const PMColumnFilterCommonMixin = {
 data() {
 return {
Expand All@@ -9,6 +11,22 @@ const PMColumnFilterCommonMixin = {
 };
 },
 methods: {
 storeFilterConfiguration() {
 const { order, type } = this.filterConfiguration();
 let url = "users/store_filter_configuration/";
 if (this.$props.columns && this.savedSearch) {
 url += "savedSearch|" + this.savedSearch;
 } else {
 url += type;
 }
 let config = {
 filters: this.formattedFilter(),
 order
 };
 ProcessMaker.apiClient.put(url, config);
 window.ProcessMaker.advanced_filter = config;
 window.ProcessMaker.EventBus.$emit("advanced-filter-updated");
 },
 getViewConfigFilter() {
 return [
 {
Expand DownExpand Up@@ -67,15 +85,31 @@ const PMColumnFilterCommonMixin = {
 }
 ];
 },
onApply(json, index) {
 let oldValue, type, value;
addAliases(json, key, label) {
 let type, value;
 for (let i in json) {
 oldValue = json[i].subject.value;
 type = this.getTypeColumnFilter(oldValue);
 value = this.getAliasColumnForFilter(oldValue);
 type = this.getTypeColumnFilter(key, json[i].subject.type);
 value = this.getAliasColumnForFilter(key, json[i].subject.value);
 json[i].subject.type = type;
 json[i].subject.value = value;
 json[i]._column_field = key;
 json[i]._column_label = label;

 if (json[i].or && json[i].or.length > 0) {
 this.addAliases(json[i].or, key, label);
 }
 }
 },
 getTypeColumnFilter(field, defaultType = 'Field') {
 return this.tableHeaders.find(column => column.field === field)?.filter_subject?.type || defaultType;
 },
 getAliasColumnForFilter(field, defaultValue) {
 return this.tableHeaders.find(column => column.field === field)?.filter_subject?.value || defaultValue;
 },
 getAliasColumnForOrderBy(value) {
 return this.tableHeaders.find(column => column.field === value)?.order_column || value;
 },
 onApply(json, index) {
 this.advancedFilterInit();
 this.advancedFilter[index] = json;
 this.markStyleWhenColumnSetAFilter();
Expand All@@ -101,9 +135,20 @@ const PMColumnFilterCommonMixin = {
 object.$refs.pmColumnFilterForm.setValues(this.advancedFilter[index]);
 }
 },
 formattedFilter() {
 const filterCopy = cloneDeep(this.advancedFilter);
 Object.keys(filterCopy).forEach((key) => {
 if (filterCopy[key].length === 0) {
 delete filterCopy[key];
 }
 const label = this.tableHeaders.find(column => column.field === key)?.label;
 this.addAliases(filterCopy[key], key, label);
 });
 return Object.values(filterCopy).flat(1);
 },
 getAdvancedFilter() {
 let flat = this.json2Array(this.advancedFilter).flat(1);
 return flat.length > 0 ? "&advanced_filter=" + encodeURIComponent(JSON.stringify(flat)) : "";
 let formattedFilter = this.formattedFilter();
 return formattedFilter.length > 0 ? "&advanced_filter=" + encodeURIComponent(JSON.stringify(formattedFilter)) : "";
 },
 getUrlUsers(filter) {
 let page = 1;
Expand All@@ -122,8 +167,12 @@ const PMColumnFilterCommonMixin = {
 let format = "string";
 if (column.format) {
 format = column.format;
 if (format === "int") {
 // We don't have a field for integers
 format = "string";
 }
 }
 if (column.field === "status" || column.field === "assignee") {
 if (column.field === "status") {
 format = "stringSelect";
 }
 return format;
Expand All@@ -133,17 +182,14 @@ const PMColumnFilterCommonMixin = {
 if (column.field === "status") {
 formatRange = this.getStatus();
 }
 if (column.field === "assignee") {
 formatRange = this.viewAssignee;
 }
 return formatRange;
 },
 getOperators(column) {
 let operators = [];
 if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name" || column.field === "participants") {
 if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name" || column.field === "participants" || column.field === "assignee") {
 operators = ["=", "in", "contains", "regex"];
 }
 if (column.field === "status" || column.field === "assignee") {
 if (column.field === "status") {
 operators = ["=", "in"];
 }
 if (column.field === "initiated_at" || column.field === "completed_at" || column.field === "due_at") {
Expand DownExpand Up@@ -208,35 +254,25 @@ const PMColumnFilterCommonMixin = {
 }
 }
 },
 getFilterConfiguration(name) {
if ("filter_user" in window.Processmaker) {
 this.setFilterPropsFromConfig(window.Processmaker.filter_user);
return;
}
let url = "users/get_filter_configuration/" + name;
ProcessMaker.apiClient.get(url).then(response => {
this.setFilterPropsFromConfig(response.data.data);
 getFilterConfiguration() {
const filters = {};
get(window, 'ProcessMaker.advanced_filter.filters', []).forEach((filter) => {
const key = filter._column_field;
 if (!(key in filters)) {
 filters[key] = [];
 }
filters[key].push(filter);
 });
 },
 setFilterPropsFromConfig(config) {
 if (typeof config !== "object") {
 config = {};
 }
 if ("filter" in config && typeof config.filter === "object") {
 this.advancedFilter = config.filter;
 }
 if (config?.order?.by && config?.order?.direction) {
 this.setOrderByProps(config.order.by, config.order.direction);
 this.advancedFilter = filters;

 const order = get(window, 'ProcessMaker.advanced_filter.order');
 if (order?.by && order?.direction) {
 this.setOrderByProps(order.by, order.direction);
 }

 this.markStyleWhenColumnSetAFilter();
 window.ProcessMaker.EventBus.$emit("advanced-filter-updated");
 },
 json2Array(json) {
 let result = [];
 for (let i in json) {
 result.push(json[i]);
 }
 return result;
 }
 }
};
export default PMColumnFilterCommonMixin;
export default PMColumnFilterCommonMixin;

48 changes: 48 additions & 0 deletions
resources/js/common/advancedFilterStatusMixin.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
import { get } from "lodash";

export default {
 data() {
 return {
 advancedFilter: [],
 };
 },
 mounted() {
 this.setAdvancedFilter();
 window.ProcessMaker.EventBus.$on('advanced-filter-updated', this.setAdvancedFilter);
 },
 methods: {
 setAdvancedFilter() {
 this.advancedFilter = get(window, 'ProcessMaker.advanced_filter.filters', []);
 },
 formatForBadge(filters, result) {
 for(const filter of filters) {
 result.push([
 this.formatBadgeSubject(filter),
 [{name: this.formatBadgeValue(filter), advanced_filter: true}]
 ]);

 if (filter.or && filter.or.length > 0) {
 this.formatForBadge(filter.or, result);
 }
 }
 },
 formatBadgeSubject(filter) {
 return get(filter, '_column_label', '');
 },
 formatBadgeValue(filter) {
 let result = filter.operator;
 result = result + " " + filter.value;
 return result;
 },
 },
 computed: {
 formatAdvancedFilterForBadges() {
 if (!this.advancedFilter || this.advancedFilter.length === 0) {
 return [];
 }
 const result = [];
 this.formatForBadge(this.advancedFilter, result);
 return result;
 },
 },
}

4 changes: 1 addition & 3 deletions
resources/js/components/PMColumnFilterPopover/PMColumnFilterPopover.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,9 @@
 popoverShow: false
 };
 },
 updated() {
 this.$emit("onUpdate", this);
 },
 methods: {
 onShown() {
 this.$emit("onUpdate", this);
 this.focusCancelButton();
 this.closeOnBlur();
 },
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Refactor some parts of the column filtering functionality#6152

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 20 commits into

from

Feb 8, 2024
 Merged


Refactor some parts of the column filtering functionality
#6152
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


20 commits


Select commit
Hold shift + click to select a range
205078e

Refactor


nolanpro Feb 3, 2024
a4f030c

Remove console log


nolanpro Feb 5, 2024
7ba1696

Remove console log


nolanpro Feb 5, 2024
609ab18

Remove mixin


nolanpro Feb 5, 2024
37a2589

Remove changes to PmqlInput.vue


nolanpro Feb 5, 2024
6ffa970

Add filter badges


nolanpro Feb 5, 2024
d54b5b7

Update task name


nolanpro Feb 5, 2024
7375f8e

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 6, 2024
6ef0644

Refactor to use column config for filtering


nolanpro Feb 6, 2024
c78aff2

Refactor column aliases


nolanpro Feb 6, 2024
9c46a72

Continue refactoring advanced filter


nolanpro Feb 7, 2024
35cf25d

Fix order column name


nolanpro Feb 7, 2024
25c7d22

Fix loading advanced filters


nolanpro Feb 7, 2024
2954590

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 7, 2024
c2f07f4

Remove debugging


nolanpro Feb 7, 2024
8c091a7

Fix default column filter subject type


nolanpro Feb 8, 2024
a4831b2

Update assignees column to search using input instead select


agustinbusso Feb 8, 2024
dea13ec

Remove json2array function


nolanpro Feb 8, 2024
8ca9f2e

Merge branch 'next' into observation/FOUR-13348


nolanpro Feb 8, 2024
61ec2c5

Merge branch 'next' into observation/FOUR-13348


nolanpro 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


5 changes: 5 additions & 0 deletions
ProcessMaker/Filters/Filter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,8 @@ class Filter

 const TYPE_PARTICIPANTS_FULLNAME = 'ParticipantsFullName';

 const TYPE_ASSIGNEES_FULLNAME = 'AssigneesFullName';

 const TYPE_STATUS = 'Status';

 const TYPE_FIELD = 'Field';
Expand DownExpand Up@@ -200,6 +202,9 @@ private function valueAliasMethod()
 case self::TYPE_PARTICIPANTS_FULLNAME:
 $method = 'valueAliasParticipantByFullName';
 break;
 case self::TYPE_ASSIGNEES_FULLNAME:
 $method = 'valueAliasAssigneeByFullName';
 break;
 case self::TYPE_STATUS:
 $method = 'valueAliasStatus';
 break;
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/Filters/SaveSession.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,9 @@ public static function getConfigFilter(String $name, Object $user)
 {
 $key = self::getKey($user, $name);

 return self::get($key, []);
 $default = ['filters' => []];

 return self::get($key, $default);
 }

 /**
Expand Down

3 changes: 2 additions & 1 deletion
ProcessMaker/Http/Controllers/TaskController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,8 +131,9 @@ public function edit(ProcessRequestToken $task, string $preview = '')
 'lastname',
 'avatar',
 'timezone',
 'datetime_format'
 'datetime_format',
 ]);

 return view('tasks.edit', [
 'task' => $task,
 'dueLabels' => self::$dueLabels,
Expand Down

40 changes: 27 additions & 13 deletions
ProcessMaker/Models/ProcessRequestToken.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,12 +34,12 @@
 * @property string $element_id
 * @property string $element_type
 * @property string $status
 * @property \Carbon\Carbon $completed_at
 * @property \Carbon\Carbon $due_at
 * @property \Carbon\Carbon $initiated_at
 * @property \Carbon\Carbon $riskchanges_at
 * @property \Carbon\Carbon $updated_at
 * @property \Carbon\Carbon $created_at
 * @property Carbon $completed_at
 * @property Carbon $due_at
 * @property Carbon $initiated_at
 * @property Carbon $riskchanges_at
 * @property Carbon $updated_at
 * @property Carbon $created_at
 * @property ProcessRequest $processRequest
 *
 * @OA\Schema(
Expand DownExpand Up@@ -332,7 +332,7 @@ public function getScreen(): ?Screen
 // It uses a try-catch block to handle any exceptions that might occur, for example in test environments.
 try {
 $localName = $this->getBpmnDefinition()->localName;
 } catch (\Throwable $t) {
 } catch (Throwable $t) {
 $localName = null;
 }
 $isManualTask = $localName === 'manualTask';
Expand DownExpand Up@@ -457,7 +457,7 @@ public function getAdvanceStatusAttribute()
 /**
 * Check if the user has access to reassign this task
 *
 * @param \ProcessMaker\Models\User $user
 * @param User $user
 */
 public function authorizeReassignment(User $user)
 {
Expand DownExpand Up@@ -616,7 +616,7 @@ public function fieldAliasCompleted()

 public function fieldAliasUser_Id()
 {
 return 'user_id';
 return 'process_request_tokens.user_id';
 }

 /**
Expand DownExpand Up@@ -665,9 +665,9 @@ public function valueAliasStatus($value, $expression, $callback = null, User $us
 } elseif (array_key_exists($value, $statusMap)) {
 $query->where('is_self_service', 0);
 if ($expression->operator == '=') {
 $query->whereIn('status', $statusMap[$value]);
 $query->whereIn('process_request_tokens.status', $statusMap[$value]);
 } elseif ($expression->operator == '!=') {
 $query->whereNotIn('status', $statusMap[$value]);
 $query->whereNotIn('process_request_tokens.status', $statusMap[$value]);
 }
 } else {
 $query->where('status', $expression->operator, $value)
Expand DownExpand Up@@ -758,6 +758,20 @@ public function valueAliasProcess_Name(string $value, Expression $expression): c
 };
 }

 /**
 * PMQL value alias for assignee field by fullname.
 * @param string $value
 * @return callable
 */
 public function valueAliasAssigneeByFullName($value, $expression)
 {
 return function ($query) use ($expression, $value) {
 $query->whereHas('user', function ($query) use ($expression, $value) {
 $query->whereRaw("CONCAT(firstname, ' ', lastname) " . $expression->operator . ' ?', [$value]);
 });
 };
 }

 /**
 * PMQL wildcard for process request & data fields
 *
Expand DownExpand Up@@ -909,8 +923,8 @@ public function persistUserData($user)
 /**
 * Log an error when executing the token
 *
 * @param \Throwable $error
 * @param \ProcessMaker\Nayra\Contracts\Bpmn\FlowElementInterface $bpmnElement
 * @param Throwable $error
 * @param FlowElementInterface $bpmnElement
 */
 public function logError(Throwable $error, FlowElementInterface $bpmnElement)
 {
Expand Down

114 changes: 75 additions & 39 deletions
resources/js/common/PMColumnFilterPopoverCommonMixin.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { get, cloneDeep } from "lodash";

const PMColumnFilterCommonMixin = {
 data() {
 return {
Expand All@@ -9,6 +11,22 @@ const PMColumnFilterCommonMixin = {
 };
 },
 methods: {
 storeFilterConfiguration() {
 const { order, type } = this.filterConfiguration();
 let url = "users/store_filter_configuration/";
 if (this.$props.columns && this.savedSearch) {
 url += "savedSearch|" + this.savedSearch;
 } else {
 url += type;
 }
 let config = {
 filters: this.formattedFilter(),
 order
 };
 ProcessMaker.apiClient.put(url, config);
 window.ProcessMaker.advanced_filter = config;
 window.ProcessMaker.EventBus.$emit("advanced-filter-updated");
 },
 getViewConfigFilter() {
 return [
 {
Expand DownExpand Up@@ -67,15 +85,31 @@ const PMColumnFilterCommonMixin = {
 }
 ];
 },
onApply(json, index) {
 let oldValue, type, value;
addAliases(json, key, label) {
 let type, value;
 for (let i in json) {
 oldValue = json[i].subject.value;
 type = this.getTypeColumnFilter(oldValue);
 value = this.getAliasColumnForFilter(oldValue);
 type = this.getTypeColumnFilter(key, json[i].subject.type);
 value = this.getAliasColumnForFilter(key, json[i].subject.value);
 json[i].subject.type = type;
 json[i].subject.value = value;
 json[i]._column_field = key;
 json[i]._column_label = label;

 if (json[i].or && json[i].or.length > 0) {
 this.addAliases(json[i].or, key, label);
 }
 }
 },
 getTypeColumnFilter(field, defaultType = 'Field') {
 return this.tableHeaders.find(column => column.field === field)?.filter_subject?.type || defaultType;
 },
 getAliasColumnForFilter(field, defaultValue) {
 return this.tableHeaders.find(column => column.field === field)?.filter_subject?.value || defaultValue;
 },
 getAliasColumnForOrderBy(value) {
 return this.tableHeaders.find(column => column.field === value)?.order_column || value;
 },
 onApply(json, index) {
 this.advancedFilterInit();
 this.advancedFilter[index] = json;
 this.markStyleWhenColumnSetAFilter();
Expand All@@ -101,9 +135,20 @@ const PMColumnFilterCommonMixin = {
 object.$refs.pmColumnFilterForm.setValues(this.advancedFilter[index]);
 }
 },
 formattedFilter() {
 const filterCopy = cloneDeep(this.advancedFilter);
 Object.keys(filterCopy).forEach((key) => {
 if (filterCopy[key].length === 0) {
 delete filterCopy[key];
 }
 const label = this.tableHeaders.find(column => column.field === key)?.label;
 this.addAliases(filterCopy[key], key, label);
 });
 return Object.values(filterCopy).flat(1);
 },
 getAdvancedFilter() {
 let flat = this.json2Array(this.advancedFilter).flat(1);
 return flat.length > 0 ? "&advanced_filter=" + encodeURIComponent(JSON.stringify(flat)) : "";
 let formattedFilter = this.formattedFilter();
 return formattedFilter.length > 0 ? "&advanced_filter=" + encodeURIComponent(JSON.stringify(formattedFilter)) : "";
 },
 getUrlUsers(filter) {
 let page = 1;
Expand All@@ -122,8 +167,12 @@ const PMColumnFilterCommonMixin = {
 let format = "string";
 if (column.format) {
 format = column.format;
 if (format === "int") {
 // We don't have a field for integers
 format = "string";
 }
 }
 if (column.field === "status" || column.field === "assignee") {
 if (column.field === "status") {
 format = "stringSelect";
 }
 return format;
Expand All@@ -133,17 +182,14 @@ const PMColumnFilterCommonMixin = {
 if (column.field === "status") {
 formatRange = this.getStatus();
 }
 if (column.field === "assignee") {
 formatRange = this.viewAssignee;
 }
 return formatRange;
 },
 getOperators(column) {
 let operators = [];
 if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name" || column.field === "participants") {
 if (column.field === "case_title" || column.field === "name" || column.field === "process" || column.field === "task_name" || column.field === "participants" || column.field === "assignee") {
 operators = ["=", "in", "contains", "regex"];
 }
 if (column.field === "status" || column.field === "assignee") {
 if (column.field === "status") {
 operators = ["=", "in"];
 }
 if (column.field === "initiated_at" || column.field === "completed_at" || column.field === "due_at") {
Expand DownExpand Up@@ -208,35 +254,25 @@ const PMColumnFilterCommonMixin = {
 }
 }
 },
 getFilterConfiguration(name) {
if ("filter_user" in window.Processmaker) {
 this.setFilterPropsFromConfig(window.Processmaker.filter_user);
return;
}
let url = "users/get_filter_configuration/" + name;
ProcessMaker.apiClient.get(url).then(response => {
this.setFilterPropsFromConfig(response.data.data);
 getFilterConfiguration() {
const filters = {};
get(window, 'ProcessMaker.advanced_filter.filters', []).forEach((filter) => {
const key = filter._column_field;
 if (!(key in filters)) {
 filters[key] = [];
 }
filters[key].push(filter);
 });
 },
 setFilterPropsFromConfig(config) {
 if (typeof config !== "object") {
 config = {};
 }
 if ("filter" in config && typeof config.filter === "object") {
 this.advancedFilter = config.filter;
 }
 if (config?.order?.by && config?.order?.direction) {
 this.setOrderByProps(config.order.by, config.order.direction);
 this.advancedFilter = filters;

 const order = get(window, 'ProcessMaker.advanced_filter.order');
 if (order?.by && order?.direction) {
 this.setOrderByProps(order.by, order.direction);
 }

 this.markStyleWhenColumnSetAFilter();
 window.ProcessMaker.EventBus.$emit("advanced-filter-updated");
 },
 json2Array(json) {
 let result = [];
 for (let i in json) {
 result.push(json[i]);
 }
 return result;
 }
 }
};
export default PMColumnFilterCommonMixin;
export default PMColumnFilterCommonMixin;

48 changes: 48 additions & 0 deletions
resources/js/common/advancedFilterStatusMixin.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
import { get } from "lodash";

export default {
 data() {
 return {
 advancedFilter: [],
 };
 },
 mounted() {
 this.setAdvancedFilter();
 window.ProcessMaker.EventBus.$on('advanced-filter-updated', this.setAdvancedFilter);
 },
 methods: {
 setAdvancedFilter() {
 this.advancedFilter = get(window, 'ProcessMaker.advanced_filter.filters', []);
 },
 formatForBadge(filters, result) {
 for(const filter of filters) {
 result.push([
 this.formatBadgeSubject(filter),
 [{name: this.formatBadgeValue(filter), advanced_filter: true}]
 ]);

 if (filter.or && filter.or.length > 0) {
 this.formatForBadge(filter.or, result);
 }
 }
 },
 formatBadgeSubject(filter) {
 return get(filter, '_column_label', '');
 },
 formatBadgeValue(filter) {
 let result = filter.operator;
 result = result + " " + filter.value;
 return result;
 },
 },
 computed: {
 formatAdvancedFilterForBadges() {
 if (!this.advancedFilter || this.advancedFilter.length === 0) {
 return [];
 }
 const result = [];
 this.formatForBadge(this.advancedFilter, result);
 return result;
 },
 },
}

4 changes: 1 addition & 3 deletions
resources/js/components/PMColumnFilterPopover/PMColumnFilterPopover.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,9 @@
 popoverShow: false
 };
 },
 updated() {
 this.$emit("onUpdate", this);
 },
 methods: {
 onShown() {
 this.$emit("onUpdate", this);
 this.focusCancelButton();
 this.closeOnBlur();
 },
Expand Down
Loading