Merge pull request #21 from newera-systems/add-empty-string-fields

Add empty string fields
newera-systems · Oct 15, 2023 · 86b6b2d · 86b6b2d
2 parents f474eb4 + b17c465
commit 86b6b2d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 1 deletion.
diff --git a/src/datagrid-bvue.ts b/src/datagrid-bvue.ts
@@ -114,6 +114,8 @@ export enum EngineSubOperators {
   ContainsAll = 'containsAll',
   Before = 'before',
   After = 'after',
+  Empty = 'empty',
+  NotEmpty = 'notEmpty',
 }
 
 export enum SimpleRuleType {
@@ -144,6 +146,8 @@ export const StringOperatorOptions: EngineSubOperators[] = [
   EngineSubOperators.StartsWith,
   EngineSubOperators.EndsWith,
   EngineSubOperators.Matches,
+  EngineSubOperators.Empty,
+  EngineSubOperators.NotEmpty,
 ];
 export const NumberOperatorOptions: EngineSubOperators[] = [
   EngineSubOperators.EqualTo,

diff --git a/src/rule/RuleInputs/StringRule.vue b/src/rule/RuleInputs/StringRule.vue
@@ -4,7 +4,12 @@
       <b-input-group-prepend>
         <OperatorDropdown v-model="operator" :options="operatorList" />
       </b-input-group-prepend>
-      <b-form-input v-model="content" autocomplete="off" trim />
+      <b-form-input
+        v-model="content"
+        :disabled="operator === 'empty' || operator === 'notEmpty'"
+        autocomplete="off"
+        trim
+      />
     </b-input-group>
     <p v-show="operator === 'matches'" class="m-0 p-0">
       Format:
@@ -30,6 +35,11 @@ import OperatorDropdown from '@/rule/RuleInputs/OperatorDropdown.vue';
 
 export default defineComponent({
   name: 'StringRule',
+  computed: {
+    EngineSubOperators() {
+      return EngineSubOperators;
+    },
+  },
   mixins: [fieldInput],
   components: {
     BFormGroup,

diff --git a/src/translation/filter.ts b/src/translation/filter.ts
@@ -33,6 +33,8 @@ export default {
         endsWith: 'Finit par',
         isNull: 'Est nul',
         isNotNull: "N'est pas nul",
+        empty: 'Est vide',
+        notEmpty: "N'est pas vide",
         and: 'Et',
         or: 'Ou',
         not: 'Non',
@@ -85,6 +87,8 @@ export default {
         endsWith: 'Ends with',
         isNull: 'Is null',
         isNotNull: 'Is not null',
+        empty: 'Empty',
+        notEmpty: 'Not empty',
         and: 'And',
         or: 'Or',
         not: 'Not',

diff --git a/src/translation/modal.ts b/src/translation/modal.ts
@@ -37,6 +37,8 @@ export default {
         endsWith: 'Finit par',
         isNull: 'Est nul',
         isNotNull: "N'est pas nul",
+        empty: 'Est vide',
+        notEmpty: "N'est pas vide",
         and: 'Et',
         or: 'Ou',
         not: 'Non',
@@ -97,6 +99,8 @@ export default {
         endsWith: 'Ends with',
         isNull: 'Is null',
         isNotNull: 'Is not null',
+        empty: 'Empty',
+        notEmpty: 'Not empty',
         and: 'And',
         or: 'Or',
         not: 'Not',

diff --git a/src/translation/table.ts b/src/translation/table.ts
@@ -37,6 +37,8 @@ export default {
         endsWith: 'Finit par',
         isNull: 'Est nul',
         isNotNull: "N'est pas nul",
+        empty: 'Est vide',
+        notEmpty: "N'est pas vide",
         and: 'Et',
         or: 'Ou',
         not: 'Non',
@@ -117,6 +119,8 @@ export default {
         endsWith: 'Ends with',
         isNull: 'Is null',
         isNotNull: 'Is not null',
+        empty: 'Empty',
+        notEmpty: 'Not empty',
         and: 'And',
         or: 'Or',
         not: 'Not',