From ee3ba1a155ef2ed52d8b2fcf2c27ffac71565cab Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Tue, 11 May 2021 23:11:34 +0900
Subject: [PATCH] refs #2258 Divide filter form from edit
---
src/config/locales/en/translation.json | 38 ++---
.../components/Settings/Filters/Edit.vue | 136 +---------------
.../components/Settings/Filters/form.vue | 152 ++++++++++++++++++
src/renderer/store/Settings/Filters/Edit.ts | 11 +-
4 files changed, 186 insertions(+), 151 deletions(-)
create mode 100644 src/renderer/components/Settings/Filters/form.vue
diff --git a/src/config/locales/en/translation.json b/src/config/locales/en/translation.json
index 50a6eb82..8c4556cb 100644
--- a/src/config/locales/en/translation.json
+++ b/src/config/locales/en/translation.json
@@ -117,26 +117,26 @@
},
"filters": {
"title": "Filters",
+ "form": {
+ "phrase": "Keyword or phrase",
+ "expire": "Expire after",
+ "context": "Filter contexts",
+ "irreversible": "Drop instead of hide",
+ "whole_word": "Whole word",
+ "submit": "Update",
+ "cancel": "Cancel"
+ },
+ "expires": {
+ "never": "Never",
+ "30_minutes": "30 minutes",
+ "1_hour": "1 hour",
+ "6_hours": "6 hours",
+ "12_hours": "12 hours",
+ "1_day": "1 day",
+ "1_week": "1 week"
+ },
"edit": {
- "title": "Edit",
- "form": {
- "phrase": "Keyword or phrase",
- "expire": "Expire after",
- "context": "Filter contexts",
- "irreversible": "Drop instead of hide",
- "whole_word": "Whole word",
- "submit": "Update",
- "cancel": "Cancel"
- },
- "expires": {
- "never": "Never",
- "30_minutes": "30 minutes",
- "1_hour": "1 hour",
- "6_hours": "6 hours",
- "12_hours": "12 hours",
- "1_day": "1 day",
- "1_week": "1 week"
- }
+ "title": "Edit"
},
"delete": {
"title": "Delete",
diff --git a/src/renderer/components/Settings/Filters/Edit.vue b/src/renderer/components/Settings/Filters/Edit.vue
index f5927fc2..3543464c 100644
--- a/src/renderer/components/Settings/Filters/Edit.vue
+++ b/src/renderer/components/Settings/Filters/Edit.vue
@@ -1,152 +1,28 @@
{{ $t('settings.filters.edit.title') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('settings.filters.edit.form.irreversible') }}
-
-
- {{ $t('settings.filters.edit.form.whole_word') }}
-
-
- {{ $t('settings.filters.edit.form.submit') }}
- {{ $t('settings.filters.edit.form.cancel') }}
-
-
+
+
+
diff --git a/src/renderer/store/Settings/Filters/Edit.ts b/src/renderer/store/Settings/Filters/Edit.ts
index ef387a37..4b743a57 100644
--- a/src/renderer/store/Settings/Filters/Edit.ts
+++ b/src/renderer/store/Settings/Filters/Edit.ts
@@ -3,12 +3,19 @@ import { Module, MutationTree, ActionTree } from 'vuex'
import { RootState } from '@/store'
export type EditFiltersState = {
- filter: Entity.Filter | null
+ filter: Entity.Filter
loading: boolean
}
const state = (): EditFiltersState => ({
- filter: null,
+ filter: {
+ id: '',
+ phrase: '',
+ expires_at: null,
+ context: [],
+ irreversible: false,
+ whole_word: true
+ } as Entity.Filter,
loading: false
})