From 783ddddafef57d5a6ec3677d43b2434fdbd2a457 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Mon, 10 May 2021 00:49:24 +0900
Subject: [PATCH] refs #2258 Add edit filter form
---
src/config/locales/en/translation.json | 29 ++-
src/renderer/components/Settings/Filters.vue | 24 +++
.../components/Settings/Filters/Edit.vue | 195 ++++++++++++++++++
src/renderer/router/index.ts | 6 +
src/renderer/store/Settings.ts | 4 +-
src/renderer/store/Settings/Filters.ts | 12 +-
src/renderer/store/Settings/Filters/Edit.ts | 86 ++++++++
7 files changed, 351 insertions(+), 5 deletions(-)
create mode 100644 src/renderer/components/Settings/Filters/Edit.vue
create mode 100644 src/renderer/store/Settings/Filters/Edit.ts
diff --git a/src/config/locales/en/translation.json b/src/config/locales/en/translation.json
index 1960585e..06405c53 100644
--- a/src/config/locales/en/translation.json
+++ b/src/config/locales/en/translation.json
@@ -116,7 +116,31 @@
}
},
"filters": {
- "title": "Filters"
+ "title": "Filters",
+ "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"
+ }
+ },
+ "delete": {
+ "title": "Delete"
+ }
}
},
"preferences": {
@@ -455,7 +479,8 @@
"domain_confirmed": "{{domain}} is confirmed, please login",
"domain_doesnt_exist": "Failed to connect {{domain}}, make sure the server URL",
"loading": "Loading...",
- "language_not_support_spellchecker_error": "This language is not supported by Spellchecker"
+ "language_not_support_spellchecker_error": "This language is not supported by Spellchecker",
+ "update_filter_error": "Failed to update the filter"
},
"validation": {
"login": {
diff --git a/src/renderer/components/Settings/Filters.vue b/src/renderer/components/Settings/Filters.vue
index 5da58ae4..4751e972 100644
--- a/src/renderer/components/Settings/Filters.vue
+++ b/src/renderer/components/Settings/Filters.vue
@@ -17,6 +17,22 @@
+
+
+
+
+ {{ $t('settings.filters.edit.title') }}
+
+
+
+
+
+
+
+ {{ $t('settings.filters.delete.title') }}
+
+
+
@@ -38,6 +54,14 @@ export default {
},
async created() {
await this.$store.dispatch('Settings/Filters/fetchFilters')
+ },
+ methods: {
+ id() {
+ return this.$route.params.id
+ },
+ deleteFilter(id) {
+ console.log(id)
+ }
}
}
diff --git a/src/renderer/components/Settings/Filters/Edit.vue b/src/renderer/components/Settings/Filters/Edit.vue
new file mode 100644
index 00000000..f5927fc2
--- /dev/null
+++ b/src/renderer/components/Settings/Filters/Edit.vue
@@ -0,0 +1,195 @@
+
+
+
{{ $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/router/index.ts b/src/renderer/router/index.ts
index 0cdc2ae5..a8f5418f 100644
--- a/src/renderer/router/index.ts
+++ b/src/renderer/router/index.ts
@@ -15,6 +15,7 @@ import Settings from '@/components/Settings.vue'
import SettingsGeneral from '@/components/Settings/General.vue'
import SettingsTimeline from '@/components/Settings/Timeline.vue'
import SettingsFilters from '@/components/Settings/Filters.vue'
+import SettingsFiltersEdit from '@/components/Settings/Filters/Edit.vue'
import TimelineSpace from '@/components/TimelineSpace.vue'
import TimelineSpaceContentsHome from '@/components/TimelineSpace/Contents/Home.vue'
import TimelineSpaceContentsNotifications from '@/components/TimelineSpace/Contents/Notifications.vue'
@@ -105,6 +106,11 @@ const router = new Router({
{
path: 'filters',
component: SettingsFilters
+ },
+ {
+ path: 'filters/:filter_id/edit',
+ component: SettingsFiltersEdit,
+ props: true
}
]
},
diff --git a/src/renderer/store/Settings.ts b/src/renderer/store/Settings.ts
index 431e2ba2..c0e28810 100644
--- a/src/renderer/store/Settings.ts
+++ b/src/renderer/store/Settings.ts
@@ -1,6 +1,6 @@
import General, { GeneralState } from './Settings/General'
import Timeline, { TimelineState } from './Settings/Timeline'
-import Filters, { FiltersState } from './Settings/Filters'
+import Filters, { FiltersModuleState } from './Settings/Filters'
import { Module, MutationTree } from 'vuex'
import { RootState } from '@/store'
@@ -25,7 +25,7 @@ const mutations: MutationTree = {
type SettingsModule = {
General: GeneralState
Timeline: TimelineState
- Filter: FiltersState
+ Filter: FiltersModuleState
}
export type SettingsModuleState = SettingsModule & SettingsState
diff --git a/src/renderer/store/Settings/Filters.ts b/src/renderer/store/Settings/Filters.ts
index ac5f1a58..93937189 100644
--- a/src/renderer/store/Settings/Filters.ts
+++ b/src/renderer/store/Settings/Filters.ts
@@ -1,6 +1,7 @@
import { Module, MutationTree, ActionTree } from 'vuex'
import generator, { Entity } from 'megalodon'
import { RootState } from '@/store'
+import EditFilters, { EditFiltersState } from './Filters/Edit'
export type FiltersState = {
filters: Array
@@ -44,11 +45,20 @@ export const actions: ActionTree = {
}
}
+type FiltersModule = {
+ Edit: EditFiltersState
+}
+
+export type FiltersModuleState = FiltersModule & FiltersState
+
const Filters: Module = {
namespaced: true,
state: state,
mutations: mutations,
- actions: actions
+ actions: actions,
+ modules: {
+ Edit: EditFilters
+ }
}
export default Filters
diff --git a/src/renderer/store/Settings/Filters/Edit.ts b/src/renderer/store/Settings/Filters/Edit.ts
new file mode 100644
index 00000000..ef387a37
--- /dev/null
+++ b/src/renderer/store/Settings/Filters/Edit.ts
@@ -0,0 +1,86 @@
+import generator, { Entity } from 'megalodon'
+import { Module, MutationTree, ActionTree } from 'vuex'
+import { RootState } from '@/store'
+
+export type EditFiltersState = {
+ filter: Entity.Filter | null
+ loading: boolean
+}
+
+const state = (): EditFiltersState => ({
+ filter: null,
+ loading: false
+})
+
+export const MUTATION_TYPES = {
+ UPDATE_FILTER: 'updateFilter',
+ CHANGE_LOADING: 'changeLoading'
+}
+
+export const mutations: MutationTree = {
+ [MUTATION_TYPES.UPDATE_FILTER]: (state, filter: Entity.Filter) => {
+ state.filter = filter
+ },
+ [MUTATION_TYPES.CHANGE_LOADING]: (state, loading: boolean) => {
+ state.loading = loading
+ }
+}
+
+export const actions: ActionTree = {
+ fetchFilter: async ({ commit, rootState }, id: string): Promise => {
+ const client = generator(
+ rootState.TimelineSpace.sns,
+ rootState.TimelineSpace.account.baseURL,
+ rootState.TimelineSpace.account.accessToken,
+ rootState.App.userAgent
+ )
+ try {
+ commit(MUTATION_TYPES.CHANGE_LOADING, true)
+ const res = await client.getFilter(id)
+ commit(MUTATION_TYPES.UPDATE_FILTER, res.data)
+ return res.data
+ } finally {
+ commit(MUTATION_TYPES.CHANGE_LOADING, false)
+ }
+ },
+ editFilter: ({ commit, state }, filter: any) => {
+ const newFilter = Object.assign({}, state.filter, filter)
+ commit(MUTATION_TYPES.UPDATE_FILTER, newFilter)
+ },
+ updateFilter: async ({ commit, state, rootState }): Promise => {
+ if (state.filter === null) {
+ throw new Error('filter is not set')
+ }
+ const client = generator(
+ rootState.TimelineSpace.sns,
+ rootState.TimelineSpace.account.baseURL,
+ rootState.TimelineSpace.account.accessToken,
+ rootState.App.userAgent
+ )
+ try {
+ commit(MUTATION_TYPES.CHANGE_LOADING, true)
+ let options = {
+ irreversible: state.filter.irreversible,
+ whole_word: state.filter.whole_word
+ }
+ if (state.filter.expires_at !== null) {
+ options = Object.assign({}, options, {
+ expires_in: state.filter.expires_at
+ })
+ }
+ const res = await client.updateFilter(state.filter.id, state.filter.phrase, state.filter.context, options)
+ return res.data
+ } finally {
+ commit(MUTATION_TYPES.CHANGE_LOADING, false)
+ }
+ }
+}
+
+const EditFilters: Module = {
+ namespaced: true,
+ state: state,
+ mutations: mutations,
+ actions: actions
+}
+
+export default EditFilters