lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/release-7.5.0' into merge-release-7.5.0-into-dev

Browse source
This commit is contained in:
Taranto 2021-04-21 17:43:13 +01:00
commit 7b3b2fb72d
47 changed files with 374 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/new-admin/graphql/resolvers/settings.resolver.js
View file

@ -12,13 +12,13 @@ const resolvers = {
},
Mutation: {
saveAccounts: (...[, { accounts }]) => settingsLoader.saveAccounts(accounts),
resetAccounts: (...[, { schemaVersion }]) => settingsLoader.resetAccounts(schemaVersion),
// resetAccounts: (...[, { schemaVersion }]) => settingsLoader.resetAccounts(schemaVersion),
saveConfig: (...[, { config }]) => settingsLoader.saveConfig(config).then(it => {
notify()
return it
}),
resetConfig: (...[, { schemaVersion }]) => settingsLoader.resetConfig(schemaVersion),
migrateConfigAndAccounts: () => settingsLoader.migrate()
// resetConfig: (...[, { schemaVersion }]) => settingsLoader.resetConfig(schemaVersion),
// migrateConfigAndAccounts: () => settingsLoader.migrate()
}
}

6
lib/new-admin/graphql/types/settings.type.js
View file

@ -8,10 +8,10 @@ const typeDef = gql`
type Mutation {
saveAccounts(accounts: JSONObject): JSONObject
resetAccounts(schemaVersion: Int): JSONObject
# resetAccounts(schemaVersion: Int): JSONObject
saveConfig(config: JSONObject): JSONObject
resetConfig(schemaVersion: Int): JSONObject
migrateConfigAndAccounts: JSONObject
# resetConfig(schemaVersion: Int): JSONObject
# migrateConfigAndAccounts: JSONObject
}
`