@@ -12,8 +12,9 @@
:placeholder="placeholder"
@input="onSearchChange"
@keyup.enter="onEnterPressed"
- @focus="setFocusedStyle"
- @blur="unsetFocusedStyle"
+ @focus="focused = true"
+ @blur="focused = false"
+ v-model.trim="search"
v-focus="focusOptions"
/>
@@ -37,7 +38,10 @@ export default {
name: 'search-field',
data() {
- return {}
+ return {
+ search: '',
+ focused: false
+ }
},
props: {
@@ -49,6 +53,7 @@ export default {
type: Boolean,
default: false
},
+ // FIXME:property no longer used in component
active: {
type: Boolean,
default: true
@@ -63,53 +68,36 @@ export default {
SearchIcon
},
- computed: {},
-
methods: {
onSearchChange() {
- this.$emit('change', this.$refs.input.value)
+ this.$emit('change', this.search)
},
onEnterPressed() {
- this.$emit('enter', this.$refs.input.value)
+ this.$emit('enter', this.search)
},
onSaveClicked() {
- const value = this.$refs.input.value.trim()
- if (value.length > 0) {
- if (this.canSave) this.$emit('save', value)
+ if (this.search && this.canSave) {
+ this.$emit('save', this.search)
}
},
getValue() {
- if (this.$refs.input) {
- return this.$refs.input.value
- } else {
- return ''
- }
+ return this.search
},
setValue(value) {
- this.$refs.input.value = value
+ this.search = value
},
focus(options) {
- if (this.$refs.input) {
- this.$refs.input.focus(options)
- }
+ this.$refs.input?.focus(options)
},
clearSearch() {
- this.setValue('')
+ this.search = ''
this.onSearchChange()
- },
-
- setFocusedStyle() {
- this.$refs.wrapper.className = 'flexrow search-field-wrapper focused'
- },
-
- unsetFocusedStyle() {
- this.$refs.wrapper.className = 'flexrow search-field-wrapper'
}
}
}
@@ -151,6 +139,8 @@ export default {
}
.search-icon {
+ width: 20px;
+ margin-top: 5px;
color: var(--text);
}
@@ -197,11 +187,6 @@ export default {
border-color: $green;
}
-.search-icon {
- width: 20px;
- margin-top: 5px;
-}
-
@media screen and (max-width: 768px) {
.search-input {
width: 200px;
diff --git a/src/store/api/people.js b/src/store/api/people.js
index 0817917ae7..c5119a8ee9 100644
--- a/src/store/api/people.js
+++ b/src/store/api/people.js
@@ -95,7 +95,7 @@ export default {
return client.pput(`/api/data/persons/${person.id}`, data)
},
- deletePerson(person, callback) {
+ deletePerson(person) {
return client.pdel(`/api/data/persons/${person.id}?force=true`)
},
@@ -105,14 +105,14 @@ export default {
password_2: form.password2
}
return client.ppost(
- `api/actions/persons/${person.id}/change-password`,
+ `/api/actions/persons/${person.id}/change-password`,
data
)
},
disableTwoFactorAuthenticationPerson(person) {
return client.pdel(
- `api/actions/persons/${person.id}/disable-two-factor-authentication`
+ `/api/actions/persons/${person.id}/disable-two-factor-authentication`
)
},
diff --git a/src/store/modules/people.js b/src/store/modules/people.js
index f99fa06e17..f4acbd635d 100644
--- a/src/store/modules/people.js
+++ b/src/store/modules/people.js
@@ -274,7 +274,6 @@ const actions = {
newPerson({ commit, state }, data) {
return peopleApi.createPerson(data).then(person => {
commit(EDIT_PEOPLE_END, person)
- Promise.resolve()
})
},
diff --git a/src/store/modules/productions.js b/src/store/modules/productions.js
index a62e72e378..d9f750dcc2 100644
--- a/src/store/modules/productions.js
+++ b/src/store/modules/productions.js
@@ -335,7 +335,7 @@ const actions = {
commit(EDIT_PRODUCTION_START, data)
return productionsApi.newProduction(data).then(production => {
commit(EDIT_PRODUCTION_END, production)
- return Promise.resolve(production)
+ return production
})
},
@@ -491,15 +491,11 @@ const actions = {
},
deleteMetadataDescriptor({ commit, state }, descriptorId) {
- return new Promise((resolve, reject) => {
- return productionsApi
- .deleteMetadataDescriptor(state.currentProduction.id, descriptorId)
- .then(() => {
- commit(DELETE_METADATA_DESCRIPTOR_END, { id: descriptorId })
- resolve()
- })
- .catch(reject)
- })
+ return productionsApi
+ .deleteMetadataDescriptor(state.currentProduction.id, descriptorId)
+ .then(() => {
+ commit(DELETE_METADATA_DESCRIPTOR_END, { id: descriptorId })
+ })
},
refreshMetadataDescriptor({ commit, state }, descriptorId) {
@@ -524,7 +520,6 @@ const actions = {
descriptor
})
}
- return Promise.resolve()
})
}
}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index e0e712c175..49fd8f00c7 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -419,11 +419,11 @@ const mutations = {
state.user = peopleStore.helpers.addAdditionalInformation(user)
state.isAuthenticated = true
},
- [USER_LOGOUT](state, user) {
+ [USER_LOGOUT](state) {
state.user = null
state.isAuthenticated = false
},
- [USER_LOGIN_FAIL](state, user) {
+ [USER_LOGIN_FAIL](state) {
state.user = null
state.isAuthenticated = false
},
diff --git a/src/store/mutation-types.js b/src/store/mutation-types.js
index f0cfed8c97..99a1d6a0aa 100644
--- a/src/store/mutation-types.js
+++ b/src/store/mutation-types.js
@@ -24,9 +24,6 @@ export const IMPORT_PEOPLE_END = 'IMPORT_PEOPLE_END'
export const IMPORT_PEOPLE_ERROR = 'IMPORT_PEOPLE_ERROR'
export const DELETE_PEOPLE_END = 'DELETE_PEOPLE_END'
-export const DELETE_PEOPLE_ERROR = 'DELETE_PEOPLE_ERROR'
-export const SHOW_DELETE_PEOPLE_MODAL = 'SHOW_DELETE_PEOPLE_MODAL'
-export const HIDE_DELETE_PEOPLE_MODAL = 'HIDE_DELETE_PEOPLE_MODAL'
export const EDIT_PEOPLE_START = 'EDIT_PEOPLE_START'
export const EDIT_PEOPLE_END = 'EDIT_PEOPLE_END'