From 5d3b20523f2789f01f382107e59b02421807b78b Mon Sep 17 00:00:00 2001 From: Tony Wu Date: Tue, 17 Mar 2020 17:35:43 +0000 Subject: [PATCH 1/2] Adds lt/lte/gte/gt back to the filter conditions --- dist/app.js | 38 +++++++++++++++++--------------------- src/libs/scope.js | 40 ++++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 41 deletions(-) diff --git a/dist/app.js b/dist/app.js index bb2dda2..4f4fd1b 100644 --- a/dist/app.js +++ b/dist/app.js @@ -5416,27 +5416,23 @@ var filterTypes = [{ name: 'notempty', label: 'Is not empty', labelVerbose: 'is not empty' -} // { -// name: 'gt', -// label: 'Greater than', -// labelVerbose: 'is greater than' -// }, -// { -// name: 'gte', -// label: 'Greater than or equal to', -// labelVerbose: 'is greater than or equal to' -// }, -// { -// name: 'lt', -// label: 'Less than', -// labelVerbose: 'is less than' -// }, -// { -// name: 'lte', -// label: 'Less than or equal to', -// labelVerbose: 'is less than or equal to' -// } -]; +}, { + name: 'gt', + label: 'Greater than', + labelVerbose: 'is greater than' +}, { + name: 'gte', + label: 'Greater than or equal to', + labelVerbose: 'is greater than or equal to' +}, { + name: 'lt', + label: 'Less than', + labelVerbose: 'is less than' +}, { + name: 'lte', + label: 'Less than or equal to', + labelVerbose: 'is less than or equal to' +}]; function getFilterScope(filter) { filter = filter || {}; var column = filter.column; diff --git a/src/libs/scope.js b/src/libs/scope.js index a71aabe..a0995b8 100644 --- a/src/libs/scope.js +++ b/src/libs/scope.js @@ -38,27 +38,27 @@ export const filterTypes = [ name: 'notempty', label: 'Is not empty', labelVerbose: 'is not empty' + }, + { + name: 'gt', + label: 'Greater than', + labelVerbose: 'is greater than' + }, + { + name: 'gte', + label: 'Greater than or equal to', + labelVerbose: 'is greater than or equal to' + }, + { + name: 'lt', + label: 'Less than', + labelVerbose: 'is less than' + }, + { + name: 'lte', + label: 'Less than or equal to', + labelVerbose: 'is less than or equal to' } - // { - // name: 'gt', - // label: 'Greater than', - // labelVerbose: 'is greater than' - // }, - // { - // name: 'gte', - // label: 'Greater than or equal to', - // labelVerbose: 'is greater than or equal to' - // }, - // { - // name: 'lt', - // label: 'Less than', - // labelVerbose: 'is less than' - // }, - // { - // name: 'lte', - // label: 'Less than or equal to', - // labelVerbose: 'is less than or equal to' - // } ]; export function getFilterScope(filter) { filter = filter || {}; From 51fe9e90946069c6bef45caa848a4e78e3019080 Mon Sep 17 00:00:00 2001 From: Tony Wu Date: Fri, 20 Mar 2020 15:16:30 +0000 Subject: [PATCH 2/2] Cleans up unused property --- dist/app.js | 1 - src/store/index.js | 1 - 2 files changed, 2 deletions(-) diff --git a/dist/app.js b/dist/app.js index 4f4fd1b..d27bfda 100644 --- a/dist/app.js +++ b/dist/app.js @@ -1525,7 +1525,6 @@ function getDefaultNotification() { audience: '', _metadata: { filters: [], - subscriptions: [], schedule: 'now', notes: '' } diff --git a/src/store/index.js b/src/store/index.js index f442fd8..d015968 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -15,7 +15,6 @@ export function getDefaultNotification() { audience: '', _metadata: { filters: [], - subscriptions: [], schedule: 'now', notes: '' }