andras/vault-link
1
0
Fork 0
Code Issues Pull requests 18 Projects Releases 55 Packages Wiki Activity Actions 1

WIP: Smart create call #184

Draft
schmelczer wants to merge 46 commits from asch/smart-create into main
pull from: asch/smart-create
merge into: andras:main
Conversation 1 Commits 46 Files changed 195 +9 -6
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 722e7af3e2 - Show all commits

2
frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
View file

@ -299,7 +299,7 @@ export class UnrestrictedSyncer {
remoteVersion.vaultUpdateId
) {
this.logger.debug(
`Document ${remoteVersion.relativePath} is already at least as up to date as the fetched version`
`Document ${document.relativePath} is already at least as up-to-date as the fetched version`
);
return;

13
frontend/test-client/src/agent/mock-agent.ts
View file

@ -17,6 +17,7 @@ export class MockAgent extends MockClient {
// The renamed file finding algorithm isn't too smart so we can't both update and rename the same file
private readonly doNotTouchWhileOffline: string[] = [];
private lastSyncEnabledState: boolean = true;
public constructor(
initialSettings: Partial<SyncSettings>,
@ -113,7 +114,7 @@ export class MockAgent extends MockClient {
];
if (
this.client.getSettings().isSyncEnabled &&
this.lastSyncEnabledState &&
this.doNotTouchWhileOffline.length === 0
) {
options.push(this.disableSyncAction.bind(this));
@ -287,7 +288,7 @@ export class MockAgent extends MockClient {
const file = this.getFileName();
if (
(!this.client.getSettings().isSyncEnabled &&
(!this.lastSyncEnabledState &&
this.doNotTouchWhileOffline.includes(file)) ||
(await this.exists(file))
) {
@ -306,12 +307,14 @@ export class MockAgent extends MockClient {
private async disableSyncAction(): Promise<void> {
this.client.logger.info(`Decided to disable sync`);
this.lastSyncEnabledState = false;
await this.client.setSetting("isSyncEnabled", false);
}
private async enableSyncAction(): Promise<void> {
this.client.logger.info(`Decided to enable sync`);
await this.client.setSetting("isSyncEnabled", true);
this.lastSyncEnabledState = true;
}
private async renameFileAction(files: RelativePath[]): Promise<void> {
@ -320,7 +323,7 @@ export class MockAgent extends MockClient {
// We can't edit files offline that have been updated while offline.
// Otherwise, the resolution logic couldn't handle it.
if (
!this.client.getSettings().isSyncEnabled &&
!this.lastSyncEnabledState &&
this.doNotTouchWhileOffline.includes(file)
) {
this.client.logger.info(
@ -332,7 +335,7 @@ export class MockAgent extends MockClient {
const newName = this.getFileName();
if (
(!this.client.getSettings().isSyncEnabled &&
(!this.lastSyncEnabledState &&
this.doNotTouchWhileOffline.includes(newName)) ||
(await this.exists(newName))
) {
@ -351,7 +354,7 @@ export class MockAgent extends MockClient {
// We can't edit files offline that have been updated while offline.
// Otherwise, the resolution logic couldn't handle it.
if (
!this.client.getSettings().isSyncEnabled &&
!this.lastSyncEnabledState &&
this.doNotTouchWhileOffline.includes(file)
) {
this.client.logger.info(