DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Add user object to all evaluatePrefilter variables

Browse Source
This commit is contained in:
Jože Fortun
2024-03-18 15:39:58 +01:00
parent 7fc4ca9211
commit eb9cce2428
29 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/web/compose/src/components/Chart/Report/ReportEdit.vue
+1 -1
View File
@@ -70,7 +70,7 @@
<code>${record.values.fieldName}</code>
<code>${recordID}</code>
<code>${ownerID}</code>
<code>${userID}</code>
<code>${userID}, ${user.name}</code>
</i18next>
</b-form-group>
</b-col>
client/web/compose/src/components/ModuleFields/Configurator/Record.vue
+1 -1
View File
@@ -80,7 +80,7 @@
<code>${record.values.fieldName}</code>
<code>${recordID}</code>
<code>${ownerID}</code>
<code>${userID}</code>
<code>${userID}, ${user.name}</code>
</i18next>
</b-form-group>
</template>
client/web/compose/src/components/ModuleFields/Editor/Record.vue
+1
View File
@@ -377,6 +377,7 @@ export default {
if (this.field.options.prefilter) {
const pf = evaluatePrefilter(this.field.options.prefilter, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
client/web/compose/src/components/PageBlocks/CalendarBase.vue
+1
View File
@@ -324,6 +324,7 @@ export default {
if (ff.options.prefilter) {
ff.options.prefilter = evaluatePrefilter(ff.options.prefilter, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
client/web/compose/src/components/PageBlocks/ChartBase.vue
+1
View File
@@ -104,6 +104,7 @@ export default {
filter = evaluatePrefilter(filter, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
client/web/compose/src/components/PageBlocks/CommentBase.vue
+1
View File
@@ -340,6 +340,7 @@ export default {
if (this.options.filter) {
return evaluatePrefilter(this.options.filter, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
client/web/compose/src/components/PageBlocks/CommentConfigurator.vue
+1 -1
View File
@@ -59,7 +59,7 @@
<code>${record.values.fieldName}</code>
<code>${recordID}</code>
<code>${ownerID}</code>
<code>${userID}</code>
<code>${userID}, ${user.name}</code>
</i18next>
</b-form-group>
client/web/compose/src/components/PageBlocks/Configurator.vue
+2 -2
View File
@@ -44,7 +44,7 @@
<code>${record.values.fieldName}</code>
<code>${recordID}</code>
<code>${ownerID}</code>
<code>${userID}</code>
<code>${userID}, ${user.name}</code>
</i18next>
</b-form-group>
</b-col>
@@ -81,7 +81,7 @@
<code>${record.values.fieldName}</code>
<code>${recordID}</code>
<code>${ownerID}</code>
<code>${userID}</code>
<code>${userID}, ${user.name}</code>
</i18next>
</b-form-group>
</b-col>
client/web/compose/src/components/PageBlocks/ContentBase.vue
+1
View File
@@ -27,6 +27,7 @@ export default {
return evaluatePrefilter(body, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
client/web/compose/src/components/PageBlocks/ContentConfigurator.vue
+1 -1
View File
@@ -18,7 +18,7 @@
<code>${record.values.fieldName}</code>
<code>${recordID}</code>
<code>${ownerID}</code>
<code>${userID}</code>
<code>${userID}, ${user.name}</code>
</i18next>
</b-form-group>
</b-tab>
client/web/compose/src/components/PageBlocks/GeometryBase.vue
+1
View File
@@ -178,6 +178,7 @@ export default {
if (feed.options.prefilter) {
feed.options.prefilter = evaluatePrefilter(feed.options.prefilter, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
client/web/compose/src/components/PageBlocks/IFrameBase.vue
+1
View File
@@ -34,6 +34,7 @@ export default {
const interpolatedURL = evaluatePrefilter(url, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
client/web/compose/src/components/PageBlocks/IFrameConfigurator.vue
+1 -1
View File
@@ -30,7 +30,7 @@
<code>${record.values.fieldName}</code>
<code>${recordID}</code>
<code>${ownerID}</code>
<code>${userID}</code>
<code>${userID}, ${user.name}</code>
</i18next>
</b-form-group>
</b-tab>
client/web/compose/src/components/PageBlocks/MetricBase.vue
+2
View File
@@ -157,6 +157,7 @@ export default {
if (auxM.filter) {
auxM.filter = evaluatePrefilter(auxM.filter, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
@@ -166,6 +167,7 @@ export default {
if (auxM.transformFx) {
auxM.transformFx = evaluatePrefilter(auxM.transformFx, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
client/web/compose/src/components/PageBlocks/MetricConfigurator/index.vue
+2 -2
View File
@@ -161,7 +161,7 @@
<code>${record.values.fieldName}</code>
<code>${recordID}</code>
<code>${ownerID}</code>
<code>${userID}</code>
<code>${userID}, ${user.name}</code>
</i18next>
</b-form-group>
</fieldset>
@@ -218,7 +218,7 @@
<code>${record.values.fieldName}</code>
<code>${recordID}</code>
<code>${ownerID}</code>
<code>${userID}</code>
<code>${userID}, ${user.name}</code>
</i18next>
</b-form-group>
client/web/compose/src/components/PageBlocks/ProgressBase.vue
+3
View File
@@ -99,6 +99,7 @@ export default {
value: {
filter: evaluatePrefilter(this.options.value.filter, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
@@ -107,6 +108,7 @@ export default {
minValue: {
filter: evaluatePrefilter(this.options.minValue.filter, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
@@ -115,6 +117,7 @@ export default {
maxValue: {
filter: evaluatePrefilter(this.options.maxValue.filter, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
client/web/compose/src/components/PageBlocks/ProgressConfigurator.vue
+3 -3
View File
@@ -65,7 +65,7 @@
<code>${record.values.fieldName}</code>
<code>${recordID}</code>
<code>${ownerID}</code>
<code>${userID}</code>
<code>${userID}, ${user.name}</code>
</i18next>
</b-form-group>
</b-col>
@@ -176,7 +176,7 @@
<code>${record.values.fieldName}</code>
<code>${recordID}</code>
<code>${ownerID}</code>
<code>${userID}</code>
<code>${userID}, ${user.name}</code>
</i18next>
</b-form-group>
</b-col>
@@ -287,7 +287,7 @@
<code>${record.values.fieldName}</code>
<code>${recordID}</code>
<code>${ownerID}</code>
<code>${userID}</code>
<code>${userID}, ${user.name}</code>
</i18next>
</b-form-group>
</b-col>
client/web/compose/src/components/PageBlocks/RecordListBase.vue
+1
View File
@@ -1366,6 +1366,7 @@ export default {
if (prefilter) {
const pf = evaluatePrefilter(prefilter, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
client/web/compose/src/components/PageBlocks/RecordListConfigurator.vue
+1 -1
View File
@@ -271,7 +271,7 @@
<code>${record.values.fieldName}</code>
<code>${recordID}</code>
<code>${ownerID}</code>
<code>${userID}</code>
<code>${userID}, ${user.name}</code>
</i18next>
</b-form-group>
</b-col>
client/web/compose/src/components/PageBlocks/RecordOrganizerBase.vue
+1
View File
@@ -374,6 +374,7 @@ export default {
// hence the /hanging/ record, recordID, ownerID and userID variables
filter.push(`(${evaluatePrefilter(this.options.filter, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
client/web/compose/src/components/PageBlocks/RecordOrganizerConfigurator.vue
+1 -1
View File
@@ -58,7 +58,7 @@
<code>${record.values.fieldName}</code>
<code>${recordID}</code>
<code>${ownerID}</code>
<code>${userID}</code>
<code>${userID}, ${user.name}</code>
</i18next>
</b-form-group>
client/web/compose/src/components/PageBlocks/Shared/AutomationButtons.vue
+1
View File
@@ -186,6 +186,7 @@ export default {
buttonLabel (label = '') {
return evaluatePrefilter(label, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
client/web/compose/src/components/PageBlocks/Shared/AutomationTabButtonEditor.vue
+1 -1
View File
@@ -19,7 +19,7 @@
<code>${record.values.fieldName}</code>
<code>${recordID}</code>
<code>${ownerID}</code>
<code>${userID}</code>
<code>${userID}, ${user.name}</code>
</i18next>
</b-form-group>
client/web/compose/src/components/PageBlocks/TabsBase.vue
+2
View File
@@ -239,6 +239,7 @@ export default {
const { title: blockTitle, kind } = block
const interpolatedTitle = evaluatePrefilter(blockTitle, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
@@ -246,6 +247,7 @@ export default {
title = evaluatePrefilter(title, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
client/web/compose/src/components/PageBlocks/Wrap/base.vue
+2
View File
@@ -90,6 +90,7 @@ export default {
blockTitle () {
return evaluatePrefilter(this.block.title, {
record: this.$attrs.record,
user: this.$auth.user || {},
recordID: (this.$attrs.record || {}).recordID || NoID,
ownerID: (this.$attrs.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
@@ -99,6 +100,7 @@ export default {
blockDescription () {
return evaluatePrefilter(this.block.description, {
record: this.$attrs.record,
user: this.$auth.user || {},
recordID: (this.$attrs.record || {}).recordID || NoID,
ownerID: (this.$attrs.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
client/web/compose/src/lib/record-filter.js
+1 -1
View File
@@ -194,7 +194,7 @@ export function queryToFilter (searchQuery = '', prefilter = '', fields = [], re
// Evaluates the given prefilter. Allows JS template literal expressions
// such as id = ${recordID}
export function evaluatePrefilter (prefilter, { record, recordID, ownerID, userID }) {
export function evaluatePrefilter (prefilter, { record, user, recordID, ownerID, userID }) {
return (function (prefilter) {
/* eslint-disable no-eval */
return eval('`' + prefilter + '`')
client/web/compose/src/views/Admin/Charts/Edit.vue
+1
View File
@@ -747,6 +747,7 @@ export default {
if (nr.filter) {
nr.filter = evaluatePrefilter(nr.filter, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,
client/web/compose/src/views/Admin/Pages/Edit.vue
+1 -1
View File
@@ -466,7 +466,7 @@
<code>${record.values.fieldName}</code>
<code>${recordID}</code>
<code>${ownerID}</code>
<code>${userID}</code>
<code>${userID}, ${user.name}</code>
</i18next>
</b-form-group>
client/web/compose/src/views/Public/Pages/Records/View.vue
+1
View File
@@ -277,6 +277,7 @@ export default {
try {
return evaluatePrefilter(meta.title, {
record: this.record,
user: this.$auth.user || {},
recordID: (this.record || {}).recordID || NoID,
ownerID: (this.record || {}).ownedBy || NoID,
userID: (this.$auth.user || {}).userID || NoID,