rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore: remove the option to trigger transition from the UI (#2489)

Browse Source
This commit is contained in:
Karol Sójko
2023-09-12 09:25:05 +02:00
committed by GitHub
parent e50cc591c0
commit d6a3e69d8c
14 changed files with 1 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/services/src/Domain/Application/ApplicationInterface.ts
View File

@@ -13,8 +13,6 @@ import {
MfaServiceInterface,
GenerateUuid,
CreateDecryptedBackupFile,
GetTransitionStatus,
StartTransition,
} from '@standardnotes/services'
import { VaultLockServiceInterface } from './../VaultLock/VaultLockServiceInterface'
import { HistoryServiceInterface } from './../History/HistoryServiceInterface'
@@ -78,8 +76,6 @@ export interface ApplicationInterface {
get generateUuid(): GenerateUuid
get getHost(): GetHost
get setHost(): SetHost
get getTransitionStatus(): GetTransitionStatus
get startTransition(): StartTransition
// Services
get alerts(): AlertService

1
packages/services/src/Domain/InternalFeatures/InternalFeature.ts
View File

@@ -1,5 +1,4 @@
export enum InternalFeature {
Vaults = 'vaults',
HomeServer = 'home-server',
Transition = 'transition',
}

34
packages/services/src/Domain/UseCase/Transition/GetTransitionStatus/GetTransitionStatus.spec.ts
View File

@@ -1,34 +0,0 @@
import { HttpServiceInterface } from '@standardnotes/api'
import { GetTransitionStatus } from './GetTransitionStatus'
describe('GetTransitionStatus', () => {
let httpService: HttpServiceInterface
const createUseCase = () => new GetTransitionStatus(httpService)
beforeEach(() => {
httpService = {
get: jest.fn(),
} as unknown as HttpServiceInterface
})
it('should get transition status', async () => {
const useCase = createUseCase()
;(httpService.get as jest.Mock).mockResolvedValueOnce({ status: 200, data: { status: 'TO-DO' } })
const result = await useCase.execute()
expect(result.isFailed()).toBe(false)
expect(result.getValue()).toBe('TO-DO')
})
it('should fail to get transition status', async () => {
const useCase = createUseCase()
;(httpService.get as jest.Mock).mockResolvedValueOnce({ status: 400 })
const result = await useCase.execute()
expect(result.isFailed()).toBe(true)
})
})

17
packages/services/src/Domain/UseCase/Transition/GetTransitionStatus/GetTransitionStatus.ts
View File

@@ -1,17 +0,0 @@
import { Result, UseCaseInterface } from '@standardnotes/domain-core'
import { HttpServiceInterface } from '@standardnotes/api'
import { HttpStatusCode } from '@standardnotes/responses'
export class GetTransitionStatus implements UseCaseInterface<'TO-DO' | 'STARTED' | 'FINISHED' | 'FAILED'> {
constructor(private httpService: HttpServiceInterface) {}
async execute(): Promise<Result<'TO-DO' | 'STARTED' | 'FINISHED' | 'FAILED'>> {
const response = await this.httpService.get('/v1/users/transition-status')
if (response.status !== HttpStatusCode.Success) {
return Result.fail('Failed to get transition status')
}
return Result.ok((response.data as { status: 'TO-DO' | 'STARTED' | 'FINISHED' | 'FAILED' }).status)
}
}

33
packages/services/src/Domain/UseCase/Transition/StartTransition/StartTransition.spec.ts
View File

@@ -1,33 +0,0 @@
import { HttpServiceInterface } from '@standardnotes/api'
import { StartTransition } from './StartTransition'
describe('StartTransition', () => {
let httpService: HttpServiceInterface
const createUseCase = () => new StartTransition(httpService)
beforeEach(() => {
httpService = {
post: jest.fn(),
} as unknown as HttpServiceInterface
})
it('should start transition', async () => {
const useCase = createUseCase()
;(httpService.post as jest.Mock).mockResolvedValueOnce({ status: 200 })
const result = await useCase.execute()
expect(result.isFailed()).toBe(false)
})
it('should fail to start transition', async () => {
const useCase = createUseCase()
;(httpService.post as jest.Mock).mockResolvedValueOnce({ status: 400 })
const result = await useCase.execute()
expect(result.isFailed()).toBe(true)
})
})

17
packages/services/src/Domain/UseCase/Transition/StartTransition/StartTransition.ts
View File

@@ -1,17 +0,0 @@
import { HttpServiceInterface } from '@standardnotes/api'
import { Result, UseCaseInterface } from '@standardnotes/domain-core'
import { HttpStatusCode } from '@standardnotes/responses'
export class StartTransition implements UseCaseInterface<void> {
constructor(private httpService: HttpServiceInterface) {}
async execute(): Promise<Result<void>> {
const response = await this.httpService.post('/v1/items/transition')
if (response.status !== HttpStatusCode.Success) {
return Result.fail('Failed to start transition')
}
return Result.ok()
}
}

2
packages/services/src/Domain/index.ts
View File

@@ -187,8 +187,6 @@ export * from './Sync/SyncOptions'
export * from './Sync/SyncQueueStrategy'
export * from './Sync/SyncServiceInterface'
export * from './Sync/SyncSource'
export * from './UseCase/Transition/GetTransitionStatus/GetTransitionStatus'
export * from './UseCase/Transition/StartTransition/StartTransition'
export * from './UseCase/ChangeAndSaveItem'
export * from './UseCase/DiscardItemsLocally'
export * from './UseCase/GenerateUuid'

10
packages/snjs/lib/Application/Application.ts
View File

@@ -80,8 +80,6 @@ import {
GenerateUuid,
CreateDecryptedBackupFile,
CreateEncryptedBackupFile,
GetTransitionStatus,
StartTransition,
WebSocketsService,
} from '@standardnotes/services'
import {
@@ -1140,14 +1138,6 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
return this.dependencies.get<SetHost>(TYPES.SetHost)
}
get getTransitionStatus(): GetTransitionStatus {
return this.dependencies.get<GetTransitionStatus>(TYPES.GetTransitionStatus)
}
get startTransition(): StartTransition {
return this.dependencies.get<StartTransition>(TYPES.StartTransition)
}
public get legacyApi(): LegacyApiService {
return this.dependencies.get<LegacyApiService>(TYPES.LegacyApiService)
}

11
packages/snjs/lib/Application/Dependencies/Dependencies.ts
View File

@@ -140,8 +140,6 @@ import {
CreateDecryptedBackupFile,
CreateEncryptedBackupFile,
SyncLocalVaultsWithRemoteSharedVaults,
GetTransitionStatus,
StartTransition,
WebSocketsService,
} from '@standardnotes/services'
import { ItemManager } from '../../Services/Items/ItemManager'
@@ -155,7 +153,6 @@ import {
AuthenticatorApiService,
AuthenticatorServer,
HttpService,
HttpServiceInterface,
RevisionApiService,
RevisionServer,
SharedVaultInvitesServer,
@@ -1027,14 +1024,6 @@ export class Dependencies {
)
})
this.factory.set(TYPES.GetTransitionStatus, () => {
return new GetTransitionStatus(this.get<HttpServiceInterface>(TYPES.HttpService))
})
this.factory.set(TYPES.StartTransition, () => {
return new StartTransition(this.get<HttpServiceInterface>(TYPES.HttpService))
})
this.factory.set(TYPES.ListRevisions, () => {
return new ListRevisions(this.get<RevisionManager>(TYPES.RevisionManager))
})

2
packages/snjs/lib/Application/Dependencies/Types.ts
View File

@@ -171,8 +171,6 @@ export const TYPES = {
AuthorizeVaultDeletion: Symbol.for('AuthorizeVaultDeletion'),
CreateDecryptedBackupFile: Symbol.for('CreateDecryptedBackupFile'),
CreateEncryptedBackupFile: Symbol.for('CreateEncryptedBackupFile'),
GetTransitionStatus: Symbol.for('GetTransitionStatus'),
StartTransition: Symbol.for('StartTransition'),
// Mappers
SessionStorageMapper: Symbol.for('SessionStorageMapper'),

4
packages/snjs/mocha/lib/factory.js
View File

@@ -245,8 +245,6 @@ export async function awaitFunctionInvokation(object, functionName) {
})
}
export const ServerTransitionDelay = 1.5
/**
* Signing out of an application deinits it.
* A new one must be created.
@@ -254,7 +252,6 @@ export const ServerTransitionDelay = 1.5
export async function signOutApplicationAndReturnNew(application) {
const isRealCrypto = application.crypto instanceof SNWebCrypto
await application.user.signOut()
await sleep(ServerTransitionDelay, 'transition triggered during sign out')
if (isRealCrypto) {
return createInitAppWithRealCrypto()
} else {
@@ -265,7 +262,6 @@ export async function signOutApplicationAndReturnNew(application) {
export async function signOutAndBackIn(application, email, password) {
const isRealCrypto = application.crypto instanceof SNWebCrypto
await application.user.signOut()
await sleep(ServerTransitionDelay, 'transition triggered during sign out')
const newApplication = isRealCrypto ? await createInitAppWithRealCrypto() : await createInitAppWithFakeCrypto()
await this.loginToApplication({
application: newApplication,

1
packages/web/src/javascripts/Application/DevMode.ts
View File

@@ -5,7 +5,6 @@ export class DevMode {
constructor(private application: WebApplicationInterface) {
InternalFeatureService.get().enableFeature(InternalFeature.Vaults)
InternalFeatureService.get().enableFeature(InternalFeature.HomeServer)
InternalFeatureService.get().enableFeature(InternalFeature.Transition)
}
/** Valid only when running a mock event publisher on port 3124 */

112
packages/web/src/javascripts/Components/Preferences/Panes/Account/Sync.tsx
View File

@@ -1,4 +1,4 @@
import { FunctionComponent, useCallback, useEffect, useState } from 'react'
import { FunctionComponent, useState } from 'react'
import { observer } from 'mobx-react-lite'
import { Text, Title } from '@/Components/Preferences/PreferencesComponents/Content'
@@ -9,83 +9,15 @@ import { WebApplication } from '@/Application/WebApplication'
import { formatLastSyncDate } from '@/Utils/DateUtils'
import PreferencesGroup from '../../PreferencesComponents/PreferencesGroup'
import PreferencesSegment from '../../PreferencesComponents/PreferencesSegment'
import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator'
import { featureTrunkTransitionEnabled } from '@/FeatureTrunk'
type Props = {
application: WebApplication
}
const Sync: FunctionComponent<Props> = ({ application }: Props) => {
const TRANSITION_STATUS_REFRESH_INTERVAL = 5000
const [isSyncingInProgress, setIsSyncingInProgress] = useState(false)
const [isTransitionInProgress, setIsTransitionInProgress] = useState(false)
const [showTransitionSegment, setShowTransitionSegment] = useState(false)
const [transitionStatus, setTransitionStatus] = useState('')
const [transitionStatusIntervalRef, setTransitionStatusIntervalRef] = useState<NodeJS.Timer | null>(null)
const [lastSyncDate, setLastSyncDate] = useState(formatLastSyncDate(application.sync.getLastSyncDate() as Date))
const setupTransitionStatusRefresh = useCallback(async () => {
const interval = setInterval(async () => {
const statusOrError = await application.getTransitionStatus.execute()
if (statusOrError.isFailed()) {
await application.alerts.alert(statusOrError.getError())
return
}
const status = statusOrError.getValue()
setTransitionStatus(status)
}, TRANSITION_STATUS_REFRESH_INTERVAL)
setTransitionStatusIntervalRef(interval)
}, [application, setTransitionStatus, setTransitionStatusIntervalRef])
useEffect(() => {
if (!featureTrunkTransitionEnabled()) {
return
}
async function checkTransitionStatus() {
const statusOrError = await application.getTransitionStatus.execute()
if (statusOrError.isFailed()) {
await application.alerts.alert(statusOrError.getError())
return
}
const status = statusOrError.getValue()
if (status === 'FINISHED') {
if (transitionStatusIntervalRef) {
clearInterval(transitionStatusIntervalRef)
}
setIsTransitionInProgress(false)
setTransitionStatus(status)
setShowTransitionSegment(false)
return
}
setShowTransitionSegment(true)
setTransitionStatus(status)
if (status === 'STARTED') {
setIsTransitionInProgress(true)
if (!transitionStatusIntervalRef) {
await setupTransitionStatusRefresh()
}
}
}
void checkTransitionStatus()
}, [
application,
setIsTransitionInProgress,
setTransitionStatus,
setShowTransitionSegment,
setupTransitionStatusRefresh,
transitionStatusIntervalRef,
])
const doSynchronization = async () => {
setIsSyncingInProgress(true)
@@ -101,19 +33,6 @@ const Sync: FunctionComponent<Props> = ({ application }: Props) => {
}
}
const doTransition = useCallback(async () => {
const resultOrError = await application.startTransition.execute()
if (resultOrError.isFailed()) {
await application.alerts.alert(resultOrError.getError())
return
}
setIsTransitionInProgress(true)
await setupTransitionStatusRefresh()
}, [application, setupTransitionStatusRefresh])
return (
<PreferencesGroup>
<PreferencesSegment>
@@ -132,35 +51,6 @@ const Sync: FunctionComponent<Props> = ({ application }: Props) => {
</div>
</div>
</PreferencesSegment>
{showTransitionSegment && (
<>
<HorizontalSeparator classes="my-4" />
<PreferencesSegment>
<div className="flex flex-row items-center">
<div className="flex flex-grow flex-col">
<Title>Transition Account</Title>
<Text>
Transition your account to our new infrastructure in order to enable new features and improve your
overall experience. Depending on the amount of data you have, this process may take a few moments.
</Text>
{isTransitionInProgress && (
<Text>
<span className="font-bold">Transition status:</span> {transitionStatus}
</Text>
)}
{!isTransitionInProgress && (
<Button
className="mt-3 min-w-20"
label="Start transition"
disabled={isTransitionInProgress}
onClick={doTransition}
/>
)}
</div>
</div>
</PreferencesSegment>
</>
)}
</PreferencesGroup>
)
}

4
packages/web/src/javascripts/FeatureTrunk.ts
View File

@@ -15,7 +15,3 @@ export function featureTrunkVaultsEnabled(): boolean {
export function featureTrunkHomeServerEnabled(): boolean {
return InternalFeatureService.get().isFeatureEnabled(InternalFeature.HomeServer)
}
export function featureTrunkTransitionEnabled(): boolean {
return InternalFeatureService.get().isFeatureEnabled(InternalFeature.Transition)
}