diff --git a/lib/config-migration.js b/lib/config-migration.js index b6f16e10..493bc4ea 100644 --- a/lib/config-migration.js +++ b/lib/config-migration.js @@ -474,8 +474,4 @@ function migrate (config, accounts) { } } -module.exports = { - migrateConfig, - migrateAccounts, - migrate -} +module.exports = { migrate } diff --git a/lib/new-admin/graphql/resolvers/settings.resolver.js b/lib/new-admin/graphql/resolvers/settings.resolver.js index 383f9309..e0453511 100644 --- a/lib/new-admin/graphql/resolvers/settings.resolver.js +++ b/lib/new-admin/graphql/resolvers/settings.resolver.js @@ -7,10 +7,7 @@ const resolvers = { }, Mutation: { saveAccounts: (...[, { accounts }]) => settingsLoader.saveAccounts(accounts), - // resetAccounts: (...[, { schemaVersion }]) => settingsLoader.resetAccounts(schemaVersion), saveConfig: (...[, { config }]) => settingsLoader.saveConfig(config), - // resetConfig: (...[, { schemaVersion }]) => settingsLoader.resetConfig(schemaVersion), - // migrateConfigAndAccounts: () => settingsLoader.migrate() } } diff --git a/lib/new-admin/graphql/types/settings.type.js b/lib/new-admin/graphql/types/settings.type.js index 3385a585..8079b18a 100644 --- a/lib/new-admin/graphql/types/settings.type.js +++ b/lib/new-admin/graphql/types/settings.type.js @@ -8,10 +8,7 @@ const typeDef = gql` type Mutation { saveAccounts(accounts: JSONObject): JSONObject @auth - # resetAccounts(schemaVersion: Int): JSONObject @auth saveConfig(config: JSONObject): JSONObject @auth - # resetConfig(schemaVersion: Int): JSONObject @auth - # migrateConfigAndAccounts: JSONObject @auth } ` diff --git a/lib/new-settings-loader.js b/lib/new-settings-loader.js index ec830209..eb9def63 100644 --- a/lib/new-settings-loader.js +++ b/lib/new-settings-loader.js @@ -80,17 +80,6 @@ function saveAccounts (accounts) { }).catch(console.error) }) } -function resetAccounts (schemaVersion) { - return db.none( - accountsSql, - [ - 'accounts', - { accounts: NEW_SETTINGS_LOADER_SCHEMA_VERSION ? {} : [] }, - true, - schemaVersion - ] - ) -} function loadAccounts (schemaVersion) { const sql = `SELECT data @@ -149,18 +138,6 @@ function migrationSaveConfig (config) { }) } -function resetConfig (schemaVersion) { - return db.none( - configSql, - [ - 'config', - { config: schemaVersion === NEW_SETTINGS_LOADER_SCHEMA_VERSION ? {} : [] }, - true, - schemaVersion - ] - ) -} - function loadLatest (schemaVersion) { return Promise.all([loadLatestConfigOrNoneReturningVersion(schemaVersion), loadAccounts(schemaVersion)]) .then(([configObj, accounts]) => ({ diff --git a/new-lamassu-admin/src/pages/ConfigMigration.js b/new-lamassu-admin/src/pages/ConfigMigration.js deleted file mode 100644 index 6da89560..00000000 --- a/new-lamassu-admin/src/pages/ConfigMigration.js +++ /dev/null @@ -1,82 +0,0 @@ -import { useMutation } from '@apollo/react-hooks' -import { Box } from '@material-ui/core' -import { makeStyles } from '@material-ui/core/styles' -import gql from 'graphql-tag' -import React, { useState } from 'react' - -import Title from 'src/components/Title' -import { Button } from 'src/components/buttons' - -const styles = { - button: { - marginBottom: 10 - } -} -const useStyles = makeStyles(styles) - -const RESET = gql` - mutation Reset($schemaVersion: Int) { - resetConfig(schemaVersion: $schemaVersion) - resetAccounts(schemaVersion: $schemaVersion) - } -` - -const MIGRATE = gql` - mutation Migrate { - migrateConfigAndAccounts - } -` - -const OLD_SCHEMA_VERSION = 1 -const NEW_SCHEMA_VERSION = 2 - -const ConfigMigration = () => { - const [loading, setLoading] = useState(false) - const [reset] = useMutation(RESET, { - onCompleted: () => setLoading(false) - }) - - const [migrate] = useMutation(MIGRATE, { - onCompleted: () => setLoading(false) - }) - - const classes = useStyles() - - const innerReset = schemaVersion => { - setLoading(true) - reset({ variables: { schemaVersion } }) - } - - const innerMigrate = () => { - setLoading(true) - migrate() - } - - return ( - <> - Config Migration - - - - - - - ) -} - -export default ConfigMigration diff --git a/new-lamassu-admin/src/routing/routes.js b/new-lamassu-admin/src/routing/routes.js index 18876686..78f5edcf 100644 --- a/new-lamassu-admin/src/routing/routes.js +++ b/new-lamassu-admin/src/routing/routes.js @@ -143,7 +143,6 @@ const Routes = () => { - {/* */}