chore: remove dead code
This commit is contained in:
parent
446ac9f8db
commit
19c7d73444
6 changed files with 1 additions and 117 deletions
|
|
@ -474,8 +474,4 @@ function migrate (config, accounts) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = {
|
module.exports = { migrate }
|
||||||
migrateConfig,
|
|
||||||
migrateAccounts,
|
|
||||||
migrate
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,7 @@ const resolvers = {
|
||||||
},
|
},
|
||||||
Mutation: {
|
Mutation: {
|
||||||
saveAccounts: (...[, { accounts }]) => settingsLoader.saveAccounts(accounts),
|
saveAccounts: (...[, { accounts }]) => settingsLoader.saveAccounts(accounts),
|
||||||
// resetAccounts: (...[, { schemaVersion }]) => settingsLoader.resetAccounts(schemaVersion),
|
|
||||||
saveConfig: (...[, { config }]) => settingsLoader.saveConfig(config),
|
saveConfig: (...[, { config }]) => settingsLoader.saveConfig(config),
|
||||||
// resetConfig: (...[, { schemaVersion }]) => settingsLoader.resetConfig(schemaVersion),
|
|
||||||
// migrateConfigAndAccounts: () => settingsLoader.migrate()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,7 @@ const typeDef = gql`
|
||||||
|
|
||||||
type Mutation {
|
type Mutation {
|
||||||
saveAccounts(accounts: JSONObject): JSONObject @auth
|
saveAccounts(accounts: JSONObject): JSONObject @auth
|
||||||
# resetAccounts(schemaVersion: Int): JSONObject @auth
|
|
||||||
saveConfig(config: JSONObject): JSONObject @auth
|
saveConfig(config: JSONObject): JSONObject @auth
|
||||||
# resetConfig(schemaVersion: Int): JSONObject @auth
|
|
||||||
# migrateConfigAndAccounts: JSONObject @auth
|
|
||||||
}
|
}
|
||||||
`
|
`
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -80,17 +80,6 @@ function saveAccounts (accounts) {
|
||||||
}).catch(console.error)
|
}).catch(console.error)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
function resetAccounts (schemaVersion) {
|
|
||||||
return db.none(
|
|
||||||
accountsSql,
|
|
||||||
[
|
|
||||||
'accounts',
|
|
||||||
{ accounts: NEW_SETTINGS_LOADER_SCHEMA_VERSION ? {} : [] },
|
|
||||||
true,
|
|
||||||
schemaVersion
|
|
||||||
]
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function loadAccounts (schemaVersion) {
|
function loadAccounts (schemaVersion) {
|
||||||
const sql = `SELECT data
|
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) {
|
function loadLatest (schemaVersion) {
|
||||||
return Promise.all([loadLatestConfigOrNoneReturningVersion(schemaVersion), loadAccounts(schemaVersion)])
|
return Promise.all([loadLatestConfigOrNoneReturningVersion(schemaVersion), loadAccounts(schemaVersion)])
|
||||||
.then(([configObj, accounts]) => ({
|
.then(([configObj, accounts]) => ({
|
||||||
|
|
|
||||||
|
|
@ -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 (
|
|
||||||
<>
|
|
||||||
<Title>Config Migration</Title>
|
|
||||||
<Box display="flex" alignItems="center" flexDirection="column">
|
|
||||||
<Button
|
|
||||||
className={classes.button}
|
|
||||||
disabled={loading}
|
|
||||||
onClick={() => innerReset(OLD_SCHEMA_VERSION)}>
|
|
||||||
Reset old admin
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
className={classes.button}
|
|
||||||
disabled={loading}
|
|
||||||
onClick={() => innerReset(NEW_SCHEMA_VERSION)}>
|
|
||||||
Reset new admin
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
className={classes.button}
|
|
||||||
disabled={loading}
|
|
||||||
onClick={() => innerMigrate()}>
|
|
||||||
Migrate
|
|
||||||
</Button>
|
|
||||||
</Box>
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export default ConfigMigration
|
|
||||||
|
|
@ -143,7 +143,6 @@ const Routes = () => {
|
||||||
<PrivateRoute path="/machines" component={Machines} />
|
<PrivateRoute path="/machines" component={Machines} />
|
||||||
<PrivateRoute path="/wizard" component={Wizard} />
|
<PrivateRoute path="/wizard" component={Wizard} />
|
||||||
<PublicRoute path="/register" component={Register} />
|
<PublicRoute path="/register" component={Register} />
|
||||||
{/* <PublicRoute path="/configmigration" component={ConfigMigration} /> */}
|
|
||||||
<PublicRoute path="/login" restricted component={Login} />
|
<PublicRoute path="/login" restricted component={Login} />
|
||||||
<PublicRoute path="/resetpassword" component={ResetPassword} />
|
<PublicRoute path="/resetpassword" component={ResetPassword} />
|
||||||
<PublicRoute path="/reset2fa" component={Reset2FA} />
|
<PublicRoute path="/reset2fa" component={Reset2FA} />
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue