Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make service actions options args vue demi #583

Merged
merged 4 commits into from
Apr 10, 2021
Merged

Make service actions options args vue demi #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
978dae1
Pass options to makeActions in make-service-module to have access to …
dallinbjohnson Mar 8, 2021
127cf51
Merge pull request #2 from feathersjs-ecosystem/vue-demi
dallinbjohnson Mar 8, 2021
4b9b311
Merge branch 'vue-demi' of github.com:dallinbjohnson/feathers-vuex in…
dallinbjohnson Mar 8, 2021
0df1029
Finish updating missed service.FeathersVuexModel to options.Model
dallinbjohnson Mar 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/feathers-vuex-commons/src/service-module/make-service-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default function makeServiceModule(
state: makeDefaultState(options),
getters: makeGetters(),
mutations: options.makeServiceMutations(),
actions: makeActions(service),
actions: makeActions({service, options}),
}
const merged = _merge({}, defaults, fromOptions)
const extended = options.extend({ store, module: merged })
Expand Down
20 changes: 13 additions & 7 deletions packages/feathers-vuex-commons/src/service-module/service-module.actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@ eslint
import fastCopy from 'fast-copy'
import { getId } from '../utils'
import { Service } from '@feathersjs/feathers'
import { MakeServicePluginOptions } from './types'

export default function makeServiceActions(service: Service<any>) {
interface serviceAndOptions {
service: Service<any>
options: MakeServicePluginOptions
}

export default function makeServiceActions({service, options}: serviceAndOptions) {
const serviceActions = {
find({ commit, dispatch }, params) {
params = params || {}
Expand Down Expand Up @@ -167,8 +173,8 @@ export default function makeServiceActions(service: Service<any>) {

params = fastCopy(params)

if (service.FeathersVuexModel && (!params || !params.data)) {
data = service.FeathersVuexModel.diffOnPatch(data)
if (options.Model && (!params || !params.data)) {
data = options.Model.diffOnPatch(data)
}
if (params && params.data) {
data = params.data
Expand Down Expand Up @@ -316,9 +322,9 @@ export default function makeServiceActions(service: Service<any>) {
commit('removeItems', toRemove) // commit removal
}

if (service.FeathersVuexModel) {
if (options.Model) {
toAdd.forEach((item, index) => {
toAdd[index] = new service.FeathersVuexModel(item, { commit: false })
toAdd[index] = new options.Model(item, { commit: false })
})
}

Expand All @@ -341,8 +347,8 @@ export default function makeServiceActions(service: Service<any>) {

const isIdOk = id !== null && id !== undefined

if (service.FeathersVuexModel && !(item instanceof service.FeathersVuexModel)) {
item = new service.FeathersVuexModel(item, { commit: false })
if (options.Model && !(item instanceof options.Model)) {
item = new options.Model(item, { commit: false })
}

if (isIdOk) {
Expand Down