Skip to content

Persist and Display updated_by / updated_at for Cases Retention Policy #8736

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
sanjacornelius merged 3 commits into from
Feb 20, 2026
+56 −11
Merged

Persist and Display updated_by / updated_at for Cases Retention Policy #8736

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7225c0
store retention_updated_by property
sanjacornelius Feb 18, 2026
b3397b7
Display updated_by details
sanjacornelius Feb 19, 2026
db48c03
Format the last modified date to the users datetime settings
sanjacornelius Feb 20, 2026
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
67 changes: 56 additions & 11 deletions resources/views/processes/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,9 @@ class="collapse show"
</multiselect>
</div>
<div class="retention-text retention-body default-retention p-2">
<span class="d-flex align-items-center"><i class="fp-check-circle-outline default-retention-icon"></i><span class="ml-1">{{ __('The default retention period is in effect.')}}</span></span>
<span v-if="!retentionUpdatedBy.id && !retentionUpdatedBy.fullname" class="d-flex align-items-center font-italic"><i class="fp-check-circle-outline default-retention-icon"></i><span class="ml-1">{{ __('The default retention period is in effect.')}}</span></span>
<!-- This should display the retention updated by and the retention updated at in the format of "Updated by <fullname> on <date>" -->
<span v-if="retentionUpdatedBy.id && retentionUpdatedBy.fullname" class="d-flex align-items-center"><strong class="mr-1">{{ __('Last modified by: ') }}</strong>@{{ retentionUpdatedBy.fullname.trim() }}{{ __(', at') }} @{{formatDateUser(retentionUpdatedBy.date) }}</span>
</div>
<b-modal
v-model="showRetentionConfirmModal"
Expand Down Expand Up @@ -688,6 +690,12 @@ class="custom-control-input">
pendingRetentionPeriod: null,
caseRetentionPolicyEnabled: @json(config('app.case_retention_policy_enabled')),
lastConfirmedRetentionPeriod: null,
originalRetentionPeriodId: null,
retentionUpdatedBy: {
id: null,
fullname: null,
date: null,
},
}
},
mounted() {
Expand Down Expand Up @@ -723,6 +731,12 @@ class="custom-control-input">
}

this.lastConfirmedRetentionPeriod = this.canSelectRetentionPeriod;
this.originalRetentionPeriodId = this.canSelectRetentionPeriod ? this.canSelectRetentionPeriod.id : null;
this.retentionUpdatedBy = {
id: _.get(this.formData, 'properties.retention_updated_by.id'),
fullname: _.get(this.formData, 'properties.retention_updated_by.fullname'),
date: _.get(this.formData, 'properties.retention_updated_at'),
};
},
computed: {
retentionPeriodSelectOptions() {
Expand Down Expand Up @@ -835,6 +849,23 @@ class="custom-control-input">
? this.canSelectRetentionPeriod.id
: this.getDefaultRetentionPeriodId();
this.formData.properties.retention_period = retentionPeriod;
// Log retention period update only if the retention period is changed from the original value
if (this.formData.properties.retention_period !== this.originalRetentionPeriodId) {
// The logged in user is the one who updated the retention period
const userID = document.head.querySelector("meta[name=\"user-id\"]");
const userFullName = document.head.querySelector("meta[name=\"user-full-name\"]");
this.formData.properties.retention_updated_by = {
id: userID.content,
fullname: userFullName.content,
};
const updatedAt = new Date().toISOString();
this.formData.properties.retention_updated_at = updatedAt;
this.retentionUpdatedBy = {
id: parseInt(userID?.content ?? 0),
fullname: userFullName?.content ?? '',
date: updatedAt,
};
}
}

ProcessMaker.apiClient.put('processes/' + that.formData.id, that.formData)
Expand Down Expand Up @@ -871,7 +902,7 @@ class="custom-control-input">
return allowed.includes('one_year') ? 'one_year' : (allowed[0] || null);
},
onRetentionPeriodSelect(newVal) {
if (!newVal || !this.lastConfirmedRetentionPeriod) {
if (!newVal || !this.lastConfirmedRetentionPeriod) {
return;
}

Expand All @@ -884,15 +915,15 @@ class="custom-control-input">
this.showRetentionConfirmModal = true;
},
confirmRetentionChange() {
if (this.pendingRetentionPeriod) {
this.canSelectRetentionPeriod = this.pendingRetentionPeriod;
this.lastConfirmedRetentionPeriod = this.pendingRetentionPeriod;
if (this.pendingRetentionPeriod) {
this.canSelectRetentionPeriod = this.pendingRetentionPeriod;
this.lastConfirmedRetentionPeriod = this.pendingRetentionPeriod;

this.formData.properties = this.formData.properties || {};
this.formData.properties.retention_period = this.pendingRetentionPeriod.id;
}
this.formData.properties = this.formData.properties || {};
this.formData.properties.retention_period = this.pendingRetentionPeriod.id;
}

this.retentionModalStep = 'success';
this.retentionModalStep = 'success';
},
cancelRetentionChange() {
this.canSelectRetentionPeriod = this.lastConfirmedRetentionPeriod;
Expand All @@ -908,11 +939,26 @@ class="custom-control-input">
if (this.retentionModalStep === 'confirm') {
this.cancelRetentionChange();
}
},
formatDateUser(value) {
let config = "";
if (typeof ProcessMaker !== "undefined" && ProcessMaker.user && ProcessMaker.user.datetime_format) {
config = ProcessMaker.user.datetime_format;
}

if (value) {
if (moment(value).isValid()) {
return window.moment(value)
.format(config);
}
return value;
}
return "n/a";
}
},

});
});

</script>
@endsection

Expand Down Expand Up @@ -1095,7 +1141,6 @@ class="custom-control-input">
}

.default-retention {
font-style: italic;
background-color: #F1F2F4;
border-radius: 8px;
}
Expand Down
Loading