From cfaae4fc50c2d15ef3f47fbf12ca99d3ec6d4009 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 11 Sep 2023 19:30:30 +0200 Subject: [PATCH 001/186] Created empty version_control resource --- backend/src/version_control/version_control.module.ts | 0 backend/src/version_control/version_control.service.spec.ts | 0 backend/src/version_control/version_control.service.ts | 0 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 backend/src/version_control/version_control.module.ts create mode 100644 backend/src/version_control/version_control.service.spec.ts create mode 100644 backend/src/version_control/version_control.service.ts diff --git a/backend/src/version_control/version_control.module.ts b/backend/src/version_control/version_control.module.ts new file mode 100644 index 00000000..e69de29b diff --git a/backend/src/version_control/version_control.service.spec.ts b/backend/src/version_control/version_control.service.spec.ts new file mode 100644 index 00000000..e69de29b diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts new file mode 100644 index 00000000..e69de29b From 6df880a57bdb395921200c44e971e2afffca792b Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 12 Sep 2023 13:15:16 +0200 Subject: [PATCH 002/186] Updated file with boilerplate code --- .../version_control.service.spec.ts | 22 +++++++++++++++++++ .../version_control.service.ts | 7 ++++++ 2 files changed, 29 insertions(+) diff --git a/backend/src/version_control/version_control.service.spec.ts b/backend/src/version_control/version_control.service.spec.ts index e69de29b..1eac65a3 100644 --- a/backend/src/version_control/version_control.service.spec.ts +++ b/backend/src/version_control/version_control.service.spec.ts @@ -0,0 +1,22 @@ +import { + Test, + TestingModule, +} from '@nestjs/testing'; +import { VersionControlService } from './version_control.service'; + + +describe('ConversionService', () => { + let service: VersionControlService; + + beforeEach(async () => { + const module: TestingModule = + await Test.createTestingModule({ + providers: [VersionControlService], + }).compile(); + + service = module.get( + VersionControlService, + ); + }); + +}); \ No newline at end of file diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index e69de29b..c39f3998 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -0,0 +1,7 @@ +import { Injectable } from '@nestjs/common'; + +@Injectable() +export class VersionControlService { + + +} From 8d9ee9e13373cd11d7841d8601e608c7a9ca5ff8 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 12 Sep 2023 13:15:39 +0200 Subject: [PATCH 003/186] Deleted module file for version_control service --- backend/src/version_control/version_control.module.ts | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 backend/src/version_control/version_control.module.ts diff --git a/backend/src/version_control/version_control.module.ts b/backend/src/version_control/version_control.module.ts deleted file mode 100644 index e69de29b..00000000 From afab34930e7edda8305b5e55d62c7cf366a13cb4 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 12 Sep 2023 16:26:42 +0200 Subject: [PATCH 004/186] Added snapshot array creation --- backend/src/s3/s3.service.ts | 69 ++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 3 deletions(-) diff --git a/backend/src/s3/s3.service.ts b/backend/src/s3/s3.service.ts index 69d69e4d..8edf8a9c 100644 --- a/backend/src/s3/s3.service.ts +++ b/backend/src/s3/s3.service.ts @@ -22,6 +22,9 @@ export class S3Service { awsS3SecretAccessKey = process.env.AWS_S3_SECRET_ACCESS_KEY; + MAX_DIFFS = 10; + MAX_SNAPSHOTS = 5; + private readonly s3Client = new S3Client({ credentials: { accessKeyId: this.awsS3AccessKeyId, @@ -57,7 +60,6 @@ export class S3Service { console.log('Delete Error: ' + err); return undefined; } - return markdownFileDTO; } @@ -103,7 +105,8 @@ export class S3Service { return undefined; } - for (let i = 0; i < 10; i++) { + // Create diff objects + for (let i = 0; i < this.MAX_DIFFS; i++) { try { await this.s3Client.send( new PutObjectCommand({ @@ -114,12 +117,30 @@ export class S3Service { ); } catch (err) { console.log( - `S3 diff ${i} file creation error: ` + + `S3 diff ${i} object creation error: ` + err, ); return undefined; } } + + // Create snapshot objects + for (let j = 0; j < this.MAX_SNAPSHOTS; j++) { + try { + await this.s3Client.send( + new PutObjectCommand({ + Bucket: this.awsS3BucketName, + Key: `${filePath}/snapshot/${j}`, + Body: new Uint8Array(Buffer.from('')), + }), + ); + } catch (err) { + console.log( + `S3 snapshot ${j} object creation error`, + ); + return undefined; + } + } markdownFileDTO.Content = ''; markdownFileDTO.Size = 0; return markdownFileDTO; @@ -222,6 +243,48 @@ export class S3Service { return markdownFileDTO; } + async deleteAllDiffs( + markdownFileDTO: MarkdownFileDTO, + ) { + const filePath = `${markdownFileDTO.UserID}/${markdownFileDTO.MarkdownID}`; + for (let i = 0; i < this.MAX_DIFFS; i++) { + try { + // await fs.unlink(`./storage/${filePath}`); + /*const response = */ await this.s3Client.send( + new DeleteObjectCommand({ + Bucket: this.awsS3BucketName, + Key: `${filePath}/diff/${i}`, + }), + ); + } catch (err) { + console.log('Delete all diffs error: ' + err); + return undefined; + } + } + } + + async deleteAllSnapshots( + markdownFileDTO: MarkdownFileDTO, + ) { + const filePath = `${markdownFileDTO.UserID}/${markdownFileDTO.MarkdownID}`; + for (let i = 0; i < this.MAX_SNAPSHOTS; i++) { + try { + // await fs.unlink(`./storage/${filePath}`); + /*const response = */ await this.s3Client.send( + new DeleteObjectCommand({ + Bucket: this.awsS3BucketName, + Key: `${filePath}/snapshot/${i}`, + }), + ); + } catch (err) { + console.log( + 'Delete all diffs error: ' + err, + ); + return undefined; + } + } + } + async createAsset(assetDTO: AssetDTO) { // Generate new AssetID const newAssetDTO = new AssetDTO(); From e0c7c21d58e857a180bdc055e442a1befa65dc0b Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 12 Sep 2023 16:28:38 +0200 Subject: [PATCH 005/186] Added calls to delete all diffs and snapshots --- .../src/file_manager/__mocks__/file_manager.service.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/backend/src/file_manager/__mocks__/file_manager.service.ts b/backend/src/file_manager/__mocks__/file_manager.service.ts index bfdf62a9..abd1329c 100644 --- a/backend/src/file_manager/__mocks__/file_manager.service.ts +++ b/backend/src/file_manager/__mocks__/file_manager.service.ts @@ -233,6 +233,14 @@ export class FileManagerServiceMock { markdownFileDTO, ); + await this.s3service.deleteAllDiffs( + markdownFileDTO, + ); + + await this.s3service.deleteAllSnapshots( + markdownFileDTO, + ); + return this.markdownFilesService.remove( markdownFileDTO, ); From 1b3917eb623396538af784ef25cd2ed29356b763 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 12 Sep 2023 16:29:01 +0200 Subject: [PATCH 006/186] Laid out plan for getters and setters --- .../version_control/version_control.service.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index c39f3998..9b22cbf5 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -2,6 +2,19 @@ import { Injectable } from '@nestjs/common'; @Injectable() export class VersionControlService { + saveDiff() {} - + getDiff() {} + + getAllDiffs() {} + + //==----------------------------------------------------- + + createSnapshot() {} + + saveSnapshot() {} + + getSnapshot() {} + + getAllSnapshots() {} } From 772d3edb89ba43ad41ec116740668fc3dbe4fb80 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 12 Sep 2023 16:39:12 +0200 Subject: [PATCH 007/186] Updated error message --- backend/src/s3/s3.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/s3/s3.service.ts b/backend/src/s3/s3.service.ts index 8edf8a9c..301b8cbd 100644 --- a/backend/src/s3/s3.service.ts +++ b/backend/src/s3/s3.service.ts @@ -278,7 +278,7 @@ export class S3Service { ); } catch (err) { console.log( - 'Delete all diffs error: ' + err, + 'Delete all snapshots error: ' + err, ); return undefined; } From df79785f3d87c9605dec157e26ca3aaa7dbc88c8 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 12 Sep 2023 17:10:58 +0200 Subject: [PATCH 008/186] Added calls to delete all diffs and snapshots --- backend/src/file_manager/file_manager.service.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/backend/src/file_manager/file_manager.service.ts b/backend/src/file_manager/file_manager.service.ts index 5d1699e3..f62457ee 100644 --- a/backend/src/file_manager/file_manager.service.ts +++ b/backend/src/file_manager/file_manager.service.ts @@ -257,10 +257,21 @@ export class FileManagerService { await this.s3ServiceMock.deleteFile( markdownFileDTO, ); + + // TODO: decide on a return value here, otherwise two calls to remove md file are made + // OR remove the mdservice.remove call from s3serviceMock.deleteFile } else { await this.s3service.deleteFile( markdownFileDTO, ); + + await this.s3service.deleteAllDiffs( + markdownFileDTO, + ); + + await this.s3service.deleteAllSnapshots( + markdownFileDTO, + ); } return this.markdownFilesService.remove( From fdd0b147e813c9492031418815dbc70958e17b37 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 12 Sep 2023 17:11:27 +0200 Subject: [PATCH 009/186] Removed debugging statements --- backend/src/s3/s3.service.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/s3/s3.service.ts b/backend/src/s3/s3.service.ts index 301b8cbd..c2501d8f 100644 --- a/backend/src/s3/s3.service.ts +++ b/backend/src/s3/s3.service.ts @@ -249,15 +249,16 @@ export class S3Service { const filePath = `${markdownFileDTO.UserID}/${markdownFileDTO.MarkdownID}`; for (let i = 0; i < this.MAX_DIFFS; i++) { try { - // await fs.unlink(`./storage/${filePath}`); - /*const response = */ await this.s3Client.send( + await this.s3Client.send( new DeleteObjectCommand({ Bucket: this.awsS3BucketName, Key: `${filePath}/diff/${i}`, }), ); } catch (err) { - console.log('Delete all diffs error: ' + err); + console.log( + 'Delete all diffs error: ' + err, + ); return undefined; } } @@ -269,8 +270,7 @@ export class S3Service { const filePath = `${markdownFileDTO.UserID}/${markdownFileDTO.MarkdownID}`; for (let i = 0; i < this.MAX_SNAPSHOTS; i++) { try { - // await fs.unlink(`./storage/${filePath}`); - /*const response = */ await this.s3Client.send( + await this.s3Client.send( new DeleteObjectCommand({ Bucket: this.awsS3BucketName, Key: `${filePath}/snapshot/${i}`, From 3a4e2b31f17337b216c0cd9b079b73581fe23ef2 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Fri, 15 Sep 2023 16:21:17 +0200 Subject: [PATCH 010/186] Added functions for finding logical order of circular array --- .../version_control.service.ts | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index 9b22cbf5..b832be5e 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -1,20 +1,48 @@ import { Injectable } from '@nestjs/common'; +import { DiffDTO } from './dto/diff.dto'; @Injectable() export class VersionControlService { - saveDiff() {} + saveDiff(diffDTO: DiffDTO) {} - getDiff() {} + getDiff(diffDTO: DiffDTO) {} getAllDiffs() {} //==----------------------------------------------------- - createSnapshot() {} - saveSnapshot() {} getSnapshot() {} getAllSnapshots() {} + + ///===---------------------------------------------------- + // Helpers + + getLogicalIndex( + idx: number, + head: number, + arr_len: number, + ): number { + return (idx - head + arr_len) % arr_len; + } + + reorderArray( + arr: number[], + head: number, + ): number[] { + const logicalOrder: number[] = new Array( + arr.length, + ).fill(0); + for (let idx = 0; idx < arr.length; idx++) { + const logicalIndex = this.getLogicalIndex( + idx, + head, + arr.length, + ); + logicalOrder[logicalIndex] = arr[idx]; + } + return logicalOrder; + } } From b1b9f328d08507bcd45d40f82f2565f7bccae65f Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Fri, 15 Sep 2023 16:26:43 +0200 Subject: [PATCH 011/186] Updated function name to be more descriptive --- backend/src/version_control/version_control.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index b832be5e..18874d9f 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -28,7 +28,7 @@ export class VersionControlService { return (idx - head + arr_len) % arr_len; } - reorderArray( + getLogicalOrder( arr: number[], head: number, ): number[] { From 8e6d3662fc6d2d59cd7af923a18f8011b1838d85 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Fri, 15 Sep 2023 16:54:26 +0200 Subject: [PATCH 012/186] Updated function calls to match new s3service names --- backend/src/file_manager/file_manager.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/file_manager/file_manager.service.ts b/backend/src/file_manager/file_manager.service.ts index f62457ee..37eab51e 100644 --- a/backend/src/file_manager/file_manager.service.ts +++ b/backend/src/file_manager/file_manager.service.ts @@ -265,11 +265,11 @@ export class FileManagerService { markdownFileDTO, ); - await this.s3service.deleteAllDiffs( + await this.s3service.deleteAllDiffsForFile( markdownFileDTO, ); - await this.s3service.deleteAllSnapshots( + await this.s3service.deleteAllSnapshotsForFile( markdownFileDTO, ); } From a71e61a17d9844af7e216b4d9fb10048eb7fb345 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Fri, 15 Sep 2023 16:55:06 +0200 Subject: [PATCH 013/186] Separated one function into two --- backend/src/s3/s3.service.ts | 90 +++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 38 deletions(-) diff --git a/backend/src/s3/s3.service.ts b/backend/src/s3/s3.service.ts index c2501d8f..d43f6fbc 100644 --- a/backend/src/s3/s3.service.ts +++ b/backend/src/s3/s3.service.ts @@ -22,7 +22,7 @@ export class S3Service { awsS3SecretAccessKey = process.env.AWS_S3_SECRET_ACCESS_KEY; - MAX_DIFFS = 10; + MAX_DIFFS = 50; MAX_SNAPSHOTS = 5; private readonly s3Client = new S3Client({ @@ -105,42 +105,9 @@ export class S3Service { return undefined; } - // Create diff objects - for (let i = 0; i < this.MAX_DIFFS; i++) { - try { - await this.s3Client.send( - new PutObjectCommand({ - Bucket: this.awsS3BucketName, - Key: `${filePath}/diff/${i}`, - Body: new Uint8Array(Buffer.from('')), - }), - ); - } catch (err) { - console.log( - `S3 diff ${i} object creation error: ` + - err, - ); - return undefined; - } - } + this.createDiffsForFile(markdownFileDTO); + this.createSnapshotsForFile(markdownFileDTO); - // Create snapshot objects - for (let j = 0; j < this.MAX_SNAPSHOTS; j++) { - try { - await this.s3Client.send( - new PutObjectCommand({ - Bucket: this.awsS3BucketName, - Key: `${filePath}/snapshot/${j}`, - Body: new Uint8Array(Buffer.from('')), - }), - ); - } catch (err) { - console.log( - `S3 snapshot ${j} object creation error`, - ); - return undefined; - } - } markdownFileDTO.Content = ''; markdownFileDTO.Size = 0; return markdownFileDTO; @@ -243,7 +210,30 @@ export class S3Service { return markdownFileDTO; } - async deleteAllDiffs( + async createDiffsForFile( + markdownFileDTO: MarkdownFileDTO, + ) { + const filePath = `${markdownFileDTO.UserID}/${markdownFileDTO.MarkdownID}`; + for (let i = 0; i < this.MAX_DIFFS; i++) { + try { + await this.s3Client.send( + new PutObjectCommand({ + Bucket: this.awsS3BucketName, + Key: `${filePath}/diff/${i}`, + Body: new Uint8Array(Buffer.from('')), + }), + ); + } catch (err) { + console.log( + `S3 diff ${i} object creation error: ` + + err, + ); + return undefined; + } + } + } + + async deleteAllDiffsForFile( markdownFileDTO: MarkdownFileDTO, ) { const filePath = `${markdownFileDTO.UserID}/${markdownFileDTO.MarkdownID}`; @@ -264,7 +254,31 @@ export class S3Service { } } - async deleteAllSnapshots( + async createSnapshotsForFile( + markdownFileDTO: MarkdownFileDTO, + ) { + const filePath = `${markdownFileDTO.UserID}/${markdownFileDTO.MarkdownID}`; + + // Create snapshot objects + for (let j = 0; j < this.MAX_SNAPSHOTS; j++) { + try { + await this.s3Client.send( + new PutObjectCommand({ + Bucket: this.awsS3BucketName, + Key: `${filePath}/snapshot/${j}`, + Body: new Uint8Array(Buffer.from('')), + }), + ); + } catch (err) { + console.log( + `S3 snapshot ${j} object creation error`, + ); + return undefined; + } + } + } + + async deleteAllSnapshotsForFile( markdownFileDTO: MarkdownFileDTO, ) { const filePath = `${markdownFileDTO.UserID}/${markdownFileDTO.MarkdownID}`; From 924451a0b15ac31d621f45c60e2c431350fcf016 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Fri, 15 Sep 2023 16:55:33 +0200 Subject: [PATCH 014/186] Added conceptual skeletion of what controller will offer --- .../version_control.controller.ts | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 backend/src/version_control/version_control.controller.ts diff --git a/backend/src/version_control/version_control.controller.ts b/backend/src/version_control/version_control.controller.ts new file mode 100644 index 00000000..5b1ba03a --- /dev/null +++ b/backend/src/version_control/version_control.controller.ts @@ -0,0 +1,36 @@ +import { + Body, + Controller, + Post, +} from '@nestjs/common'; +import { VersionControlService } from './version_control.service'; +import { DiffDTO } from './dto/diff.dto'; + +@Controller('version_control') +export class VersionControlController { + constructor( + private readonly versionControlService: VersionControlService, + ) {} + + @Post('save_diff') + saveDiff(@Body() diffDTO: DiffDTO) { + this.versionControlService.saveDiff(diffDTO); + } + + @Post('get_diff') + getDiff(@Body() diffDTO: DiffDTO) { + return this.versionControlService.getDiff( + diffDTO, + ); + } + + @Post('get_all_diffs') + getAllDiffs() { + return this.versionControlService.getAllDiffs(); + } + + @Post('save_snapshot') + saveSnapshot() { + this.versionControlService.saveSnapshot(); + } +} From 9411ed2cc07cf02c05909b350d629baa5b19572c Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Fri, 15 Sep 2023 16:55:57 +0200 Subject: [PATCH 015/186] Added docs for getAllSnapshots --- .../src/version_control/version_control.service.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index 18874d9f..131bfe3b 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -15,7 +15,19 @@ export class VersionControlService { getSnapshot() {} - getAllSnapshots() {} + /** + * @dev frontend calls retrieveOne for file opened by user + * @dev frontend needs to render all snapshots for the file + * as dropdown options + * + * @returns all snapshots for this file, in logical order + */ + getAllSnapshots() { + + // calls s3Service.getAllSnapshots() + // reorders snapshots in logical order + // return logically ordered snapshots + } ///===---------------------------------------------------- // Helpers From ad84e19741e12f5fc0bf8f8a85ee537e88fd88d0 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Sat, 16 Sep 2023 06:18:35 +0200 Subject: [PATCH 016/186] Diff and Snapshot array getters --- frontend/src/app/services/version.control.service.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index 6cf7787e..0fdb1618 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -42,6 +42,14 @@ export class VersionControlService { this.diffArr[0] = new DiffDTO(); } + getDiffArr(): DiffDTO[] { + return this.diffArr; + } + + getSnapshotArr(): SnapshotDTO[] { + return this.snapshotArr; + } + createDiff(fileDTO: FileDTO): DiffDTO { const latestSnapshot = this.getLatestSnapshot(); let snapshotContent = latestSnapshot.content; From d459414e90c6a5d47204b2d38b044ca32afb8021 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Sat, 16 Sep 2023 06:19:43 +0200 Subject: [PATCH 017/186] Diff and Snapshot array setters --- frontend/src/app/services/version.control.service.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index 0fdb1618..672aa93b 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -50,6 +50,16 @@ export class VersionControlService { return this.snapshotArr; } + setDiffArr(inArr: DiffDTO[]): DiffDTO[] { + this.diffArr = inArr; + return this.diffArr; + } + + setSnapshotArr(inArr: SnapshotDTO[]): SnapshotDTO[] { + this.snapshotArr = inArr; + return this.snapshotArr; + } + createDiff(fileDTO: FileDTO): DiffDTO { const latestSnapshot = this.getLatestSnapshot(); let snapshotContent = latestSnapshot.content; From 2e39213163c4febb706f63bc79f8265dc466611e Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Sat, 16 Sep 2023 06:21:16 +0200 Subject: [PATCH 018/186] Push to Diff and Snapshot arrays --- .../app/services/version.control.service.ts | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index 672aa93b..f47faee5 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -46,20 +46,30 @@ export class VersionControlService { return this.diffArr; } - getSnapshotArr(): SnapshotDTO[] { - return this.snapshotArr; - } - setDiffArr(inArr: DiffDTO[]): DiffDTO[] { this.diffArr = inArr; return this.diffArr; } + pushToDiffArr(element: DiffDTO): DiffDTO[] { + this.diffArr.push(element); + return this.diffArr; + } + + getSnapshotArr(): SnapshotDTO[] { + return this.snapshotArr; + } + setSnapshotArr(inArr: SnapshotDTO[]): SnapshotDTO[] { this.snapshotArr = inArr; return this.snapshotArr; } + pushToSnapshotArr(element: SnapshotDTO): SnapshotDTO[] { + this.snapshotArr.push(element); + return this.snapshotArr; + } + createDiff(fileDTO: FileDTO): DiffDTO { const latestSnapshot = this.getLatestSnapshot(); let snapshotContent = latestSnapshot.content; From 6be1492e6fdd35e3e021380b699b07df38ac6818 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Sat, 16 Sep 2023 06:29:09 +0200 Subject: [PATCH 019/186] MockData for testing created --- frontend/src/assets/MockData/VersionControl/abc123_d1 | 2 ++ frontend/src/assets/MockData/VersionControl/abc123_d2 | 3 +++ frontend/src/assets/MockData/VersionControl/abc123_d3 | 3 +++ frontend/src/assets/MockData/VersionControl/abc123_d4 | 3 +++ frontend/src/assets/MockData/VersionControl/abc123_s0 | 0 5 files changed, 11 insertions(+) create mode 100644 frontend/src/assets/MockData/VersionControl/abc123_d1 create mode 100644 frontend/src/assets/MockData/VersionControl/abc123_d2 create mode 100644 frontend/src/assets/MockData/VersionControl/abc123_d3 create mode 100644 frontend/src/assets/MockData/VersionControl/abc123_d4 create mode 100644 frontend/src/assets/MockData/VersionControl/abc123_s0 diff --git a/frontend/src/assets/MockData/VersionControl/abc123_d1 b/frontend/src/assets/MockData/VersionControl/abc123_d1 new file mode 100644 index 00000000..0ec105d5 --- /dev/null +++ b/frontend/src/assets/MockData/VersionControl/abc123_d1 @@ -0,0 +1,2 @@ +@@ -0,0 +1,67 @@ ++Hamlet: Do you see yonder cloud that's almost in shape of a camel?%0A \ No newline at end of file diff --git a/frontend/src/assets/MockData/VersionControl/abc123_d2 b/frontend/src/assets/MockData/VersionControl/abc123_d2 new file mode 100644 index 00000000..6d36f9af --- /dev/null +++ b/frontend/src/assets/MockData/VersionControl/abc123_d2 @@ -0,0 +1,3 @@ +@@ -59,8 +59,63 @@ + a camel? ++%0APolonius: By the mass, and 'tis like a camel, indeed.%0A \ No newline at end of file diff --git a/frontend/src/assets/MockData/VersionControl/abc123_d3 b/frontend/src/assets/MockData/VersionControl/abc123_d3 new file mode 100644 index 00000000..70f86249 --- /dev/null +++ b/frontend/src/assets/MockData/VersionControl/abc123_d3 @@ -0,0 +1,3 @@ +@@ -113,8 +113,47 @@ + indeed. ++%0AHamlet: Methinks it is like a weasel.%0A \ No newline at end of file diff --git a/frontend/src/assets/MockData/VersionControl/abc123_d4 b/frontend/src/assets/MockData/VersionControl/abc123_d4 new file mode 100644 index 00000000..a90a5003 --- /dev/null +++ b/frontend/src/assets/MockData/VersionControl/abc123_d4 @@ -0,0 +1,3 @@ +@@ -151,8 +151,115 @@ + weasel. ++%0APolonius: It is backed like a weasel.%0AHamlet: Or like a whale?%0APolonius: Very like a whale.%0A-- Shakespeare \ No newline at end of file diff --git a/frontend/src/assets/MockData/VersionControl/abc123_s0 b/frontend/src/assets/MockData/VersionControl/abc123_s0 new file mode 100644 index 00000000..e69de29b From 3e5034030f270430595e6856506da54b1ad18207 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Sat, 16 Sep 2023 06:32:06 +0200 Subject: [PATCH 020/186] Hijacked login button for testing --- frontend/src/app/login/login.component.ts | 40 ++++++++++--------- .../app/services/version.control.service.ts | 1 + 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/frontend/src/app/login/login.component.ts b/frontend/src/app/login/login.component.ts index 68927572..26da70b5 100644 --- a/frontend/src/app/login/login.component.ts +++ b/frontend/src/app/login/login.component.ts @@ -6,6 +6,7 @@ import { MessageService } from 'primeng/api'; import { environment } from 'src/environments/environment'; import { CredentialResponse, PromptMomentNotification } from 'google-one-tap'; +import { VersionControlService } from '../services/version.control.service'; // import { HttpClient, HttpHeaders } from '@angular/common/http'; @@ -33,7 +34,8 @@ export class LoginComponent { private elementRef: ElementRef, private userService: UserService, @Inject(ActivatedRoute) private route: ActivatedRoute, - private messageService: MessageService + private messageService: MessageService, + private versionControlService: VersionControlService ) {} ngOnInit(): void { const data = history.state; @@ -93,23 +95,25 @@ export class LoginComponent { } async login(): Promise { - if (!this.email || this.email === '') { - this.messageService.add({ - severity: 'error', - summary: 'Error', - detail: `Email field empty`, - }); - } else if (!this.password || this.password === '') { - this.messageService.add({ - severity: 'error', - summary: 'Error', - detail: `Password field empty`, - }); - } else { - if (await this.userService.login(this.email, this.password)) { - this.navigateToPage('home'); - } - } + // if (!this.email || this.email === '') { + // this.messageService.add({ + // severity: 'error', + // summary: 'Error', + // detail: `Email field empty`, + // }); + // } else if (!this.password || this.password === '') { + // this.messageService.add({ + // severity: 'error', + // summary: 'Error', + // detail: `Password field empty`, + // }); + // } else { + // if (await this.userService.login(this.email, this.password)) { + // this.navigateToPage('home'); + // } + // } + + this.versionControlService.init(); } async autoLogin(): Promise { diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index f47faee5..acca0ed9 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -38,6 +38,7 @@ export class VersionControlService { // } init(): void { + // TODO: Un-hijack login this.snapshotArr[0] = new SnapshotDTO(); this.diffArr[0] = new DiffDTO(); } From 11f199c6b9e8c2524a42eab167c9abad78603c09 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Sat, 16 Sep 2023 06:46:16 +0200 Subject: [PATCH 021/186] Initialising of MockData --- frontend/src/app/login/login.component.ts | 2 +- .../app/services/version.control.service.ts | 43 +++++++++++++++++-- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/login/login.component.ts b/frontend/src/app/login/login.component.ts index 26da70b5..439f6b30 100644 --- a/frontend/src/app/login/login.component.ts +++ b/frontend/src/app/login/login.component.ts @@ -113,7 +113,7 @@ export class LoginComponent { // } // } - this.versionControlService.init(); + await this.versionControlService.init(); } async autoLogin(): Promise { diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index acca0ed9..456bec61 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -37,10 +37,47 @@ export class VersionControlService { // }); // } - init(): void { + async init(): Promise { // TODO: Un-hijack login - this.snapshotArr[0] = new SnapshotDTO(); - this.diffArr[0] = new DiffDTO(); + this.snapshotArr = []; + this.diffArr = []; + + let text1: string = ''; + let text2: string = ''; + const diffPathArr: string[] = []; + diffPathArr.push('../assets/MockData/VersionControl/abc123_d1'); + diffPathArr.push('../assets/MockData/VersionControl/abc123_d2'); + diffPathArr.push('../assets/MockData/VersionControl/abc123_d3'); + diffPathArr.push('../assets/MockData/VersionControl/abc123_d4'); + + const snapshotPathArr: string[] = []; + snapshotPathArr.push('../assets/MockData/VersionControl/abc123_s0'); + + for (let element of snapshotPathArr) { + this.http.get(element, { responseType: 'text' }).subscribe((data) => { + var tempDTO = new SnapshotDTO(); + tempDTO.fileID = 'abc123'; + tempDTO.snapshotNumber = +element.charAt(element.length - 1); + tempDTO.content = data; + this.snapshotArr.push(tempDTO); + }); + } + + for (let element of diffPathArr) { + this.http.get(element, { responseType: 'text' }).subscribe((data) => { + var tempDTO = new DiffDTO(); + tempDTO.fileID = 'abc123'; + tempDTO.snapshotNumber = +element.charAt(element.length - 1); + tempDTO.content = data; + this.diffArr.push(tempDTO); + }); + } + + await new Promise((f) => setTimeout(f, 10)); + + for (let element of this.diffArr) { + console.log(element); + } } getDiffArr(): DiffDTO[] { From 81d6f6c94876caf01faec045ac5f766e8d512f08 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Sat, 16 Sep 2023 06:47:17 +0200 Subject: [PATCH 022/186] mini refactor to use setter --- frontend/src/app/services/version.control.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index 456bec61..1b7fb990 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -59,7 +59,7 @@ export class VersionControlService { tempDTO.fileID = 'abc123'; tempDTO.snapshotNumber = +element.charAt(element.length - 1); tempDTO.content = data; - this.snapshotArr.push(tempDTO); + this.pushToSnapshotArr(tempDTO); }); } @@ -69,7 +69,7 @@ export class VersionControlService { tempDTO.fileID = 'abc123'; tempDTO.snapshotNumber = +element.charAt(element.length - 1); tempDTO.content = data; - this.diffArr.push(tempDTO); + this.pushToDiffArr(tempDTO); }); } From fe45386d741422db65410a6978399da8f313858d Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Sat, 16 Sep 2023 06:54:58 +0200 Subject: [PATCH 023/186] Building version from snapshot --- frontend/src/app/services/dto/version.dto.ts | 13 +++++++++++++ .../src/app/services/version.control.service.ts | 12 ++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 frontend/src/app/services/dto/version.dto.ts diff --git a/frontend/src/app/services/dto/version.dto.ts b/frontend/src/app/services/dto/version.dto.ts new file mode 100644 index 00000000..7b2ba5aa --- /dev/null +++ b/frontend/src/app/services/dto/version.dto.ts @@ -0,0 +1,13 @@ +export class VersionDTO { + fileID: string; + diff: boolean; + content: string; + prevContent: string; + + constructor() { + this.fileID = ''; + this.diff = true; + this.content = ''; + this.prevContent = ''; + } +} diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index 1b7fb990..6ddcace9 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -8,6 +8,7 @@ import { SnapshotDTO } from './dto/snapshot.dto'; import { FileDTO } from './dto/file.dto'; import { FileService } from './file.service'; +import { VersionDTO } from './dto/version.dto'; @Injectable({ providedIn: 'root', @@ -108,6 +109,17 @@ export class VersionControlService { return this.snapshotArr; } + buildSnapshotVersion(snapshot: SnapshotDTO): VersionDTO { + const tempDTO = new VersionDTO(); + + tempDTO.content = snapshot.content; + tempDTO.diff = false; + tempDTO.fileID = snapshot.fileID; + tempDTO.prevContent = ''; + + return tempDTO; + } + createDiff(fileDTO: FileDTO): DiffDTO { const latestSnapshot = this.getLatestSnapshot(); let snapshotContent = latestSnapshot.content; From d7f8082514429a36397c36b49a092f78fd8b160b Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Sat, 16 Sep 2023 07:31:25 +0200 Subject: [PATCH 024/186] Building of diff version and context --- frontend/src/app/services/dto/version.dto.ts | 4 +- .../app/services/version.control.service.ts | 52 +++++++++++++++++-- .../assets/MockData/VersionControl/abc123_d1 | 4 +- .../assets/MockData/VersionControl/abc123_d2 | 4 +- .../assets/MockData/VersionControl/abc123_d3 | 4 +- 5 files changed, 55 insertions(+), 13 deletions(-) diff --git a/frontend/src/app/services/dto/version.dto.ts b/frontend/src/app/services/dto/version.dto.ts index 7b2ba5aa..b6deb105 100644 --- a/frontend/src/app/services/dto/version.dto.ts +++ b/frontend/src/app/services/dto/version.dto.ts @@ -1,12 +1,12 @@ export class VersionDTO { fileID: string; - diff: boolean; + isDiff: boolean; content: string; prevContent: string; constructor() { this.fileID = ''; - this.diff = true; + this.isDiff = true; this.content = ''; this.prevContent = ''; } diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index 6ddcace9..98d40ba4 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -18,6 +18,7 @@ export class VersionControlService { public snapshotArr: SnapshotDTO[] = []; public diffArr: DiffDTO[] = []; + public versionArr: VersionDTO[] = []; private DiffPatchService = new DiffMatchPatch(); // async test(): Promise { @@ -42,6 +43,7 @@ export class VersionControlService { // TODO: Un-hijack login this.snapshotArr = []; this.diffArr = []; + this.versionArr = []; let text1: string = ''; let text2: string = ''; @@ -68,7 +70,8 @@ export class VersionControlService { this.http.get(element, { responseType: 'text' }).subscribe((data) => { var tempDTO = new DiffDTO(); tempDTO.fileID = 'abc123'; - tempDTO.snapshotNumber = +element.charAt(element.length - 1); + tempDTO.diffNumber = +element.charAt(element.length - 1); + tempDTO.snapshotNumber = this.snapshotArr[0].snapshotNumber; tempDTO.content = data; this.pushToDiffArr(tempDTO); }); @@ -76,7 +79,15 @@ export class VersionControlService { await new Promise((f) => setTimeout(f, 10)); + for (let element of this.snapshotArr) { + this.versionArr.push(this.buildSnapshotVersion(element)); + } + for (let element of this.diffArr) { + this.versionArr.push(this.buildDiffVersion(element, this.snapshotArr[0])); + } + + for (let element of this.versionArr) { console.log(element); } } @@ -113,13 +124,44 @@ export class VersionControlService { const tempDTO = new VersionDTO(); tempDTO.content = snapshot.content; - tempDTO.diff = false; + tempDTO.isDiff = false; tempDTO.fileID = snapshot.fileID; tempDTO.prevContent = ''; return tempDTO; } + buildDiffVersion(diff: DiffDTO, snapshot: SnapshotDTO): VersionDTO { + const tempDTO = new VersionDTO(); + + tempDTO.content = diff.content; + tempDTO.isDiff = true; + tempDTO.fileID = diff.fileID; + tempDTO.prevContent = this.buildDiffContext(diff, snapshot); + + return tempDTO; + } + + buildDiffContext(diff: DiffDTO, snapshot: SnapshotDTO): string { + let retString = snapshot.content; + + const tempArr = this.diffArr.filter((ele) => { + return ele.diffNumber < diff.diffNumber; + }); + + tempArr.sort( + (a, b) => + a.diffNumber > b.diffNumber ? 1 : a.diffNumber < b.diffNumber ? -1 : 0 // Ascending sort on diffNumber + ); + + for (let element of tempArr) { + let patches = this.DiffPatchService.patch_fromText(element.content); + retString = this.DiffPatchService.patch_apply(patches, retString)[0]; + } + + return retString; + } + createDiff(fileDTO: FileDTO): DiffDTO { const latestSnapshot = this.getLatestSnapshot(); let snapshotContent = latestSnapshot.content; @@ -128,9 +170,9 @@ export class VersionControlService { const latestDiffNumber = latestDiff.diffNumber; // Get all relevant diffs - const relevantDiffs = this.diffArr.filter( - (a) => a.snapshotNumber === latestSnapshot.snapshotNumber - ); + const relevantDiffs = this.diffArr.filter((ele) => { + return ele.snapshotNumber === latestSnapshot.snapshotNumber; + }); // Patch all relevant diffs for (let diff of relevantDiffs) { diff --git a/frontend/src/assets/MockData/VersionControl/abc123_d1 b/frontend/src/assets/MockData/VersionControl/abc123_d1 index 0ec105d5..508c7604 100644 --- a/frontend/src/assets/MockData/VersionControl/abc123_d1 +++ b/frontend/src/assets/MockData/VersionControl/abc123_d1 @@ -1,2 +1,2 @@ -@@ -0,0 +1,67 @@ -+Hamlet: Do you see yonder cloud that's almost in shape of a camel?%0A \ No newline at end of file +@@ -0,0 +1,66 @@ ++Hamlet: Do you see yonder cloud that's almost in shape of a camel? \ No newline at end of file diff --git a/frontend/src/assets/MockData/VersionControl/abc123_d2 b/frontend/src/assets/MockData/VersionControl/abc123_d2 index 6d36f9af..7ba84a89 100644 --- a/frontend/src/assets/MockData/VersionControl/abc123_d2 +++ b/frontend/src/assets/MockData/VersionControl/abc123_d2 @@ -1,3 +1,3 @@ -@@ -59,8 +59,63 @@ +@@ -59,8 +59,62 @@ a camel? -+%0APolonius: By the mass, and 'tis like a camel, indeed.%0A \ No newline at end of file ++%0APolonius: By the mass, and 'tis like a camel, indeed. \ No newline at end of file diff --git a/frontend/src/assets/MockData/VersionControl/abc123_d3 b/frontend/src/assets/MockData/VersionControl/abc123_d3 index 70f86249..55f51240 100644 --- a/frontend/src/assets/MockData/VersionControl/abc123_d3 +++ b/frontend/src/assets/MockData/VersionControl/abc123_d3 @@ -1,3 +1,3 @@ -@@ -113,8 +113,47 @@ +@@ -113,8 +113,46 @@ indeed. -+%0AHamlet: Methinks it is like a weasel.%0A \ No newline at end of file ++%0AHamlet: Methinks it is like a weasel. \ No newline at end of file From 2288601a57ef5703549cb06ac70c3468aeb6c8e4 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Sat, 16 Sep 2023 07:51:36 +0200 Subject: [PATCH 025/186] Visualise complete? --- .../app/services/version.control.service.ts | 50 ++++++++++++++----- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index 98d40ba4..1498aa7f 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -79,17 +79,7 @@ export class VersionControlService { await new Promise((f) => setTimeout(f, 10)); - for (let element of this.snapshotArr) { - this.versionArr.push(this.buildSnapshotVersion(element)); - } - - for (let element of this.diffArr) { - this.versionArr.push(this.buildDiffVersion(element, this.snapshotArr[0])); - } - - for (let element of this.versionArr) { - console.log(element); - } + this.visualise(); } getDiffArr(): DiffDTO[] { @@ -120,6 +110,37 @@ export class VersionControlService { return this.snapshotArr; } + visualise(): void { + // Build snapshot version + for (let element of this.snapshotArr) { + this.versionArr.push(this.buildSnapshotVersion(element)); + } + + // Build diff version + for (let element of this.diffArr) { + this.versionArr.push(this.buildDiffVersion(element, this.snapshotArr[0])); + } + + // Visualise snapshot + const snapshotVersions = this.versionArr.filter((ele) => { + return !ele.isDiff; + }); + console.log(snapshotVersions); + + //Visualise diff + const diffVersions = this.versionArr.filter((ele) => { + return ele.isDiff; + }); + + for (let element of diffVersions) { + let dpsDiff = this.DiffPatchService.diff_main( + element.prevContent, + element.content + ); + console.log(this.DiffPatchService.diff_prettyHtml(dpsDiff)); + } + } + buildSnapshotVersion(snapshot: SnapshotDTO): VersionDTO { const tempDTO = new VersionDTO(); @@ -134,11 +155,16 @@ export class VersionControlService { buildDiffVersion(diff: DiffDTO, snapshot: SnapshotDTO): VersionDTO { const tempDTO = new VersionDTO(); - tempDTO.content = diff.content; tempDTO.isDiff = true; tempDTO.fileID = diff.fileID; tempDTO.prevContent = this.buildDiffContext(diff, snapshot); + const patches = this.DiffPatchService.patch_fromText(diff.content); + tempDTO.content = this.DiffPatchService.patch_apply( + patches, + tempDTO.prevContent + )[0]; + return tempDTO; } From fc40ddccd6c9477047de7dca34ee042ec9dd3c78 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Sat, 16 Sep 2023 07:54:22 +0200 Subject: [PATCH 026/186] Removed old functionality --- .../app/services/version.control.service.ts | 88 +------------------ 1 file changed, 1 insertion(+), 87 deletions(-) diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index 1498aa7f..0532a384 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -132,6 +132,7 @@ export class VersionControlService { return ele.isDiff; }); + // Could optimise by saving pretty html somewhere on save for (let element of diffVersions) { let dpsDiff = this.DiffPatchService.diff_main( element.prevContent, @@ -187,91 +188,4 @@ export class VersionControlService { return retString; } - - createDiff(fileDTO: FileDTO): DiffDTO { - const latestSnapshot = this.getLatestSnapshot(); - let snapshotContent = latestSnapshot.content; - - const latestDiff = this.getLatestDiff(); // TODO: Check what we need when there are no diffs - const latestDiffNumber = latestDiff.diffNumber; - - // Get all relevant diffs - const relevantDiffs = this.diffArr.filter((ele) => { - return ele.snapshotNumber === latestSnapshot.snapshotNumber; - }); - - // Patch all relevant diffs - for (let diff of relevantDiffs) { - snapshotContent = this.patchDiff(snapshotContent, diff); - } - - // Create newest diff and readable patch - const diff = this.DiffPatchService.diff_main( - snapshotContent, - fileDTO.content - ); - const patches = this.DiffPatchService.patch_make(diff); - - // Create and set new DTO - const readableDiff = new DiffDTO(); - readableDiff.diffNumber = latestDiffNumber + 1; - readableDiff.fileID = fileDTO.fileID; - readableDiff.snapshotNumber = latestSnapshot.snapshotNumber; // TODO: Doesn't take into account squashing of diffs - readableDiff.content = this.DiffPatchService.patch_toText(patches); - return readableDiff; - } - - getLatestSnapshot(): SnapshotDTO { - // TODO: No need to sort - // Get latest snapshot - this.snapshotArr.sort((a, b) => - a.snapshotNumber > b.snapshotNumber - ? 1 - : a.snapshotNumber < b.snapshotNumber - ? -1 - : 0 - ); - - return this.snapshotArr[0]; - } - - getLatestDiff(): DiffDTO { - // Get latest diff number - this.diffArr.sort((a, b) => - a.diffNumber > b.diffNumber ? 1 : a.diffNumber < b.diffNumber ? -1 : 0 - ); - - return this.diffArr[0]; - } - - patchDiff(content: string, diffDTO: DiffDTO): string { - const patches = this.DiffPatchService.patch_fromText(diffDTO.content); - const patchResult = this.DiffPatchService.patch_apply(patches, content); - return patchResult[0]; - } - - patchVersion(fileDTO: FileDTO, diffDTO: DiffDTO[]): string { - return ''; - } - - patchSnapshot(fileDTO: FileDTO, snapshotDTO: SnapshotDTO): string { - return ''; - } - - squashDiffs(diffDTOs: DiffDTO[]): SnapshotDTO { - const latestSnapshot = this.getLatestSnapshot(); - let snapshotContent = latestSnapshot.content; - - // Patch all diffs - for (let diff of diffDTOs) { - snapshotContent = this.patchDiff(snapshotContent, diff); - } - - const newSnapshot = new SnapshotDTO(); - newSnapshot.content = snapshotContent; - newSnapshot.fileID = latestSnapshot.fileID; - newSnapshot.snapshotNumber = latestSnapshot.snapshotNumber + 1; - - return newSnapshot; - } } From 58e40b90db7774ba306e0e9e8313d00d2ff33617 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Sat, 16 Sep 2023 08:02:34 +0200 Subject: [PATCH 027/186] Modularised getting of a readable patch --- frontend/src/app/services/dto/file.dto.ts | 9 --------- frontend/src/app/services/version.control.service.ts | 10 ++++++++-- 2 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 frontend/src/app/services/dto/file.dto.ts diff --git a/frontend/src/app/services/dto/file.dto.ts b/frontend/src/app/services/dto/file.dto.ts deleted file mode 100644 index 2dbbdef9..00000000 --- a/frontend/src/app/services/dto/file.dto.ts +++ /dev/null @@ -1,9 +0,0 @@ -export class FileDTO { - fileID: string; - content: string; - - constructor() { - this.fileID = ''; - this.content = ''; - } -} diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index 0532a384..c256bf10 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import { UserService } from './user.service'; // import DiffMatchPatch from 'diff-match-patch'; -import { Diff, diff_match_patch as DiffMatchPatch } from 'diff-match-patch'; +import { diff_match_patch as DiffMatchPatch } from 'diff-match-patch'; import { HttpClient } from '@angular/common/http'; import { DiffDTO } from './dto/diff.dto'; import { SnapshotDTO } from './dto/snapshot.dto'; -import { FileDTO } from './dto/file.dto'; +import { MarkdownFileDTO } from './dto/markdown_file.dto'; import { FileService } from './file.service'; import { VersionDTO } from './dto/version.dto'; @@ -188,4 +188,10 @@ export class VersionControlService { return retString; } + + getReadablePatch(text1: string, text2: string): string { + const dpsDiff = this.DiffPatchService.diff_main(text1, text2); + const patches = this.DiffPatchService.patch_make(dpsDiff); + return this.DiffPatchService.patch_toText(patches); + } } From 3c4be2f3af7a64c76a632b7f710447d64898ce82 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Sat, 16 Sep 2023 08:13:54 +0200 Subject: [PATCH 028/186] Modularised sorting --- .../app/services/version.control.service.ts | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index c256bf10..d457fece 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -176,10 +176,7 @@ export class VersionControlService { return ele.diffNumber < diff.diffNumber; }); - tempArr.sort( - (a, b) => - a.diffNumber > b.diffNumber ? 1 : a.diffNumber < b.diffNumber ? -1 : 0 // Ascending sort on diffNumber - ); + this.sortDiffArr(tempArr); for (let element of tempArr) { let patches = this.DiffPatchService.patch_fromText(element.content); @@ -194,4 +191,22 @@ export class VersionControlService { const patches = this.DiffPatchService.patch_make(dpsDiff); return this.DiffPatchService.patch_toText(patches); } + + sortSnapshotArr(inArr: SnapshotDTO[]): void { + // Ascending sort on snapshotNumber + inArr.sort((a, b) => + a.snapshotNumber > b.snapshotNumber + ? 1 + : a.snapshotNumber < b.snapshotNumber + ? -1 + : 0 + ); + } + + sortDiffArr(inArr: DiffDTO[]): void { + // Ascending sort on diffNumber + inArr.sort((a, b) => + a.diffNumber > b.diffNumber ? 1 : a.diffNumber < b.diffNumber ? -1 : 0 + ); + } } From 68de4fb764c2b894ef79881836e12a375665ecc8 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Sat, 16 Sep 2023 08:17:38 +0200 Subject: [PATCH 029/186] Theoretical restore functionality --- .../app/services/version.control.service.ts | 64 ++++++++++++------- 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index d457fece..749d5138 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -86,11 +86,6 @@ export class VersionControlService { return this.diffArr; } - setDiffArr(inArr: DiffDTO[]): DiffDTO[] { - this.diffArr = inArr; - return this.diffArr; - } - pushToDiffArr(element: DiffDTO): DiffDTO[] { this.diffArr.push(element); return this.diffArr; @@ -100,16 +95,29 @@ export class VersionControlService { return this.snapshotArr; } - setSnapshotArr(inArr: SnapshotDTO[]): SnapshotDTO[] { - this.snapshotArr = inArr; - return this.snapshotArr; - } - pushToSnapshotArr(element: SnapshotDTO): SnapshotDTO[] { this.snapshotArr.push(element); return this.snapshotArr; } + sortSnapshotArr(inArr: SnapshotDTO[]): void { + // Ascending sort on snapshotNumber + inArr.sort((a, b) => + a.snapshotNumber > b.snapshotNumber + ? 1 + : a.snapshotNumber < b.snapshotNumber + ? -1 + : 0 + ); + } + + sortDiffArr(inArr: DiffDTO[]): void { + // Ascending sort on diffNumber + inArr.sort((a, b) => + a.diffNumber > b.diffNumber ? 1 : a.diffNumber < b.diffNumber ? -1 : 0 + ); + } + visualise(): void { // Build snapshot version for (let element of this.snapshotArr) { @@ -192,21 +200,29 @@ export class VersionControlService { return this.DiffPatchService.patch_toText(patches); } - sortSnapshotArr(inArr: SnapshotDTO[]): void { - // Ascending sort on snapshotNumber - inArr.sort((a, b) => - a.snapshotNumber > b.snapshotNumber - ? 1 - : a.snapshotNumber < b.snapshotNumber - ? -1 - : 0 - ); + snapshotRestore(snapshot: SnapshotDTO): void { + this.snapshotArr = this.snapshotArr.filter((ele) => { + return ele.snapshotNumber <= snapshot.snapshotNumber; + }); + + this.diffArr = this.diffArr.filter((ele) => { + return ele.snapshotNumber <= snapshot.snapshotNumber; + }); + + this.sortSnapshotArr(this.snapshotArr); + this.sortDiffArr(this.diffArr); } - sortDiffArr(inArr: DiffDTO[]): void { - // Ascending sort on diffNumber - inArr.sort((a, b) => - a.diffNumber > b.diffNumber ? 1 : a.diffNumber < b.diffNumber ? -1 : 0 - ); + diffRestore(diff: DiffDTO): void { + this.snapshotArr = this.snapshotArr.filter((ele) => { + return ele.snapshotNumber <= diff.snapshotNumber; + }); + + this.diffArr = this.diffArr.filter((ele) => { + return ele.snapshotNumber <= diff.snapshotNumber; + }); + + this.sortSnapshotArr(this.snapshotArr); + this.sortDiffArr(this.diffArr); } } From f6c84abbe1c5033bac0dfaf42c818db010829635 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sat, 16 Sep 2023 16:15:01 +0200 Subject: [PATCH 030/186] Created new diff dto --- backend/src/diffs/dto/diffs.dto.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 backend/src/diffs/dto/diffs.dto.ts diff --git a/backend/src/diffs/dto/diffs.dto.ts b/backend/src/diffs/dto/diffs.dto.ts new file mode 100644 index 00000000..b2d9edbb --- /dev/null +++ b/backend/src/diffs/dto/diffs.dto.ts @@ -0,0 +1,19 @@ +export class DiffDTO { + DiffID: string; + MarkdownID: string; + UserID: string; + DisplayID: number; + S3DiffID: number; + LastModified: Date; + Content: string; + + constructor() { + this.DiffID = undefined; + this.MarkdownID = undefined; + this.UserID = undefined; + this.DisplayID = undefined; + this.S3DiffID = undefined; + this.LastModified = undefined; + this.Content = undefined; + } +} \ No newline at end of file From f929a0e0ba92d8d6ecae17bd63166d0a7161e2a6 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sat, 16 Sep 2023 16:21:00 +0200 Subject: [PATCH 031/186] Updated names to new s3service naming scheme --- backend/src/file_manager/__mocks__/file_manager.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/file_manager/__mocks__/file_manager.service.ts b/backend/src/file_manager/__mocks__/file_manager.service.ts index abd1329c..6c5ae77d 100644 --- a/backend/src/file_manager/__mocks__/file_manager.service.ts +++ b/backend/src/file_manager/__mocks__/file_manager.service.ts @@ -233,11 +233,11 @@ export class FileManagerServiceMock { markdownFileDTO, ); - await this.s3service.deleteAllDiffs( + await this.s3service.deleteAllDiffsForFile( markdownFileDTO, ); - await this.s3service.deleteAllSnapshots( + await this.s3service.deleteAllSnapshotsForFile( markdownFileDTO, ); From 84c6d2b5df80ced2140a528d82f9146dea9402cf Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sat, 16 Sep 2023 16:21:31 +0200 Subject: [PATCH 032/186] Imported new diff dto --- backend/src/version_control/version_control.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index 131bfe3b..ee333719 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { DiffDTO } from './dto/diff.dto'; +import { DiffDTO } from 'src/diffs/dto/diffs.dto'; @Injectable() export class VersionControlService { From eb75bccfc3def209d8a1331a69fcf095b041c8ec Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sat, 16 Sep 2023 16:21:54 +0200 Subject: [PATCH 033/186] Imported new diff dto --- backend/src/version_control/version_control.controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/version_control/version_control.controller.ts b/backend/src/version_control/version_control.controller.ts index 5b1ba03a..6e4ee679 100644 --- a/backend/src/version_control/version_control.controller.ts +++ b/backend/src/version_control/version_control.controller.ts @@ -4,7 +4,7 @@ import { Post, } from '@nestjs/common'; import { VersionControlService } from './version_control.service'; -import { DiffDTO } from './dto/diff.dto'; +import { DiffDTO } from 'src/diffs/dto/diffs.dto'; @Controller('version_control') export class VersionControlController { From c2aae464f122f10752c4a6ae5abe132d6df879fa Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Sat, 16 Sep 2023 16:26:16 +0200 Subject: [PATCH 034/186] Un-hijacked the login button --- frontend/src/app/login/login.component.ts | 38 +++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/frontend/src/app/login/login.component.ts b/frontend/src/app/login/login.component.ts index 439f6b30..f970d7b8 100644 --- a/frontend/src/app/login/login.component.ts +++ b/frontend/src/app/login/login.component.ts @@ -95,25 +95,25 @@ export class LoginComponent { } async login(): Promise { - // if (!this.email || this.email === '') { - // this.messageService.add({ - // severity: 'error', - // summary: 'Error', - // detail: `Email field empty`, - // }); - // } else if (!this.password || this.password === '') { - // this.messageService.add({ - // severity: 'error', - // summary: 'Error', - // detail: `Password field empty`, - // }); - // } else { - // if (await this.userService.login(this.email, this.password)) { - // this.navigateToPage('home'); - // } - // } - - await this.versionControlService.init(); + if (!this.email || this.email === '') { + this.messageService.add({ + severity: 'error', + summary: 'Error', + detail: `Email field empty`, + }); + } else if (!this.password || this.password === '') { + this.messageService.add({ + severity: 'error', + summary: 'Error', + detail: `Password field empty`, + }); + } else { + if (await this.userService.login(this.email, this.password)) { + this.navigateToPage('home'); + } + } + + // await this.versionControlService.init(); } async autoLogin(): Promise { From 5521d367f6c5ee6d6d317d510fb6c12d7632d211 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sat, 16 Sep 2023 18:09:31 +0200 Subject: [PATCH 035/186] Added functions for logical to s3 array conversion --- .../version_control.service.ts | 47 +++++++++++++++++-- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index ee333719..0ea481c1 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -1,20 +1,44 @@ import { Injectable } from '@nestjs/common'; +import { DiffsService } from 'src/diffs/diffs.service'; import { DiffDTO } from 'src/diffs/dto/diffs.dto'; +import { S3ServiceMock } from 'src/s3/__mocks__/s3.service'; +import { S3Service } from 'src/s3/s3.service'; @Injectable() export class VersionControlService { - saveDiff(diffDTO: DiffDTO) {} + constructor( + private diffService: DiffsService, + private s3service: S3Service, + private s3ServiceMock: S3ServiceMock, + ) {} + + ///===----------------------------------------------------- + + saveDiff(diffDTO: DiffDTO) { + // get nextDiffID + // calls s3Service.saveDiff() + // check if snapshot needs to be created + // update diff metadata in table + } + + ///===----------------------------------------------------- getDiff(diffDTO: DiffDTO) {} + ///===----------------------------------------------------- + getAllDiffs() {} - //==----------------------------------------------------- + ///===----------------------------------------------------- saveSnapshot() {} + ///===----------------------------------------------------- + getSnapshot() {} + ///===----------------------------------------------------- + /** * @dev frontend calls retrieveOne for file opened by user * @dev frontend needs to render all snapshots for the file @@ -23,7 +47,6 @@ export class VersionControlService { * @returns all snapshots for this file, in logical order */ getAllSnapshots() { - // calls s3Service.getAllSnapshots() // reorders snapshots in logical order // return logically ordered snapshots @@ -33,13 +56,27 @@ export class VersionControlService { // Helpers getLogicalIndex( - idx: number, + s3Index: number, head: number, arr_len: number, ): number { - return (idx - head + arr_len) % arr_len; + return (s3Index - head + arr_len) % arr_len; } + ///===----------------------------------------------------- + + getIndexInS3( + logicalIndex: number, + arr_len: number, + head: number, + ) { + return ( + (logicalIndex + head - arr_len) % arr_len + ); + } + + ///===----------------------------------------------------- + getLogicalOrder( arr: number[], head: number, From febabc0538da0a412b611012f86b05daa7e56f7a Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sat, 16 Sep 2023 19:22:00 +0200 Subject: [PATCH 036/186] Updated data type of UserID to number --- backend/src/diffs/dto/diffs.dto.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/diffs/dto/diffs.dto.ts b/backend/src/diffs/dto/diffs.dto.ts index b2d9edbb..10f2bd1e 100644 --- a/backend/src/diffs/dto/diffs.dto.ts +++ b/backend/src/diffs/dto/diffs.dto.ts @@ -1,7 +1,7 @@ export class DiffDTO { DiffID: string; MarkdownID: string; - UserID: string; + UserID: number; DisplayID: number; S3DiffID: number; LastModified: Date; @@ -16,4 +16,4 @@ export class DiffDTO { this.LastModified = undefined; this.Content = undefined; } -} \ No newline at end of file +} From fa0869d838ec0196387b2b75313977a073876c98 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sat, 16 Sep 2023 19:22:28 +0200 Subject: [PATCH 037/186] Updated UserID data type to number --- backend/src/diffs/entities/diffs.entity.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/diffs/entities/diffs.entity.ts b/backend/src/diffs/entities/diffs.entity.ts index 274f9562..28f7e745 100644 --- a/backend/src/diffs/entities/diffs.entity.ts +++ b/backend/src/diffs/entities/diffs.entity.ts @@ -13,7 +13,7 @@ export class Diff { MarkdownID: string; @Column() - UserID: string; + UserID: number; @Column() DisplayID: string; From b734bf8fe2f18e6998dbd5e13a0ff4f247636d20 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sat, 16 Sep 2023 19:22:55 +0200 Subject: [PATCH 038/186] Updated names of function calls --- backend/src/file_manager/file_manager.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/file_manager/file_manager.service.ts b/backend/src/file_manager/file_manager.service.ts index 37eab51e..c49cf1e1 100644 --- a/backend/src/file_manager/file_manager.service.ts +++ b/backend/src/file_manager/file_manager.service.ts @@ -265,11 +265,11 @@ export class FileManagerService { markdownFileDTO, ); - await this.s3service.deleteAllDiffsForFile( + await this.s3service.deleteDiffObjectsForFile( markdownFileDTO, ); - await this.s3service.deleteAllSnapshotsForFile( + await this.s3service.deleteSnapshotObjectsForFile( markdownFileDTO, ); } From 9eb669b564d9d33f45c7aafbb36612dccb2b034a Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sat, 16 Sep 2023 19:24:27 +0200 Subject: [PATCH 039/186] Updated the names of function calls --- backend/src/file_manager/__mocks__/file_manager.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/file_manager/__mocks__/file_manager.service.ts b/backend/src/file_manager/__mocks__/file_manager.service.ts index 6c5ae77d..1a52d088 100644 --- a/backend/src/file_manager/__mocks__/file_manager.service.ts +++ b/backend/src/file_manager/__mocks__/file_manager.service.ts @@ -233,11 +233,11 @@ export class FileManagerServiceMock { markdownFileDTO, ); - await this.s3service.deleteAllDiffsForFile( + await this.s3service.deleteDiffObjectsForFile( markdownFileDTO, ); - await this.s3service.deleteAllSnapshotsForFile( + await this.s3service.deleteSnapshotObjectsForFile( markdownFileDTO, ); From add3ab1970872dec27fb198a3c750277d24a4ab9 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sat, 16 Sep 2023 19:24:47 +0200 Subject: [PATCH 040/186] Changed UserID data type to number --- backend/src/s3/s3.service.ts | 99 +++++++++++++++++++++++++++++++----- 1 file changed, 87 insertions(+), 12 deletions(-) diff --git a/backend/src/s3/s3.service.ts b/backend/src/s3/s3.service.ts index d43f6fbc..617273f6 100644 --- a/backend/src/s3/s3.service.ts +++ b/backend/src/s3/s3.service.ts @@ -10,6 +10,7 @@ import { import * as fs from 'fs/promises'; // for local storage import * as CryptoJS from 'crypto-js'; import { AssetDTO } from '../assets/dto/asset.dto'; +import { DiffDTO } from 'src/diffs/dto/diffs.dto'; @Injectable() export class S3Service { @@ -22,8 +23,7 @@ export class S3Service { awsS3SecretAccessKey = process.env.AWS_S3_SECRET_ACCESS_KEY; - MAX_DIFFS = 50; - MAX_SNAPSHOTS = 5; + ///===---------------------------------------------------- private readonly s3Client = new S3Client({ credentials: { @@ -33,6 +33,8 @@ export class S3Service { region: this.awsS3BucketRegion, }); + ///===---------------------------------------------------- + async deleteFile( markdownFileDTO: MarkdownFileDTO, ) { @@ -63,6 +65,8 @@ export class S3Service { return markdownFileDTO; } + ///===---------------------------------------------------- + async createFile( markdownFileDTO: MarkdownFileDTO, ) { @@ -105,14 +109,20 @@ export class S3Service { return undefined; } - this.createDiffsForFile(markdownFileDTO); - this.createSnapshotsForFile(markdownFileDTO); + this.createDiffObjectsForFile( + markdownFileDTO, + ); + this.createSnapshotObjectsForFile( + markdownFileDTO, + ); markdownFileDTO.Content = ''; markdownFileDTO.Size = 0; return markdownFileDTO; } + ///===---------------------------------------------------- + async saveFile( markdownFileDTO: MarkdownFileDTO, ) { @@ -168,6 +178,8 @@ export class S3Service { return markdownFileDTO; } + ///===---------------------------------------------------- + async retrieveFile( markdownFileDTO: MarkdownFileDTO, ) { @@ -210,11 +222,17 @@ export class S3Service { return markdownFileDTO; } - async createDiffsForFile( + ///===---------------------------------------------------- + + async createDiffObjectsForFile( markdownFileDTO: MarkdownFileDTO, ) { const filePath = `${markdownFileDTO.UserID}/${markdownFileDTO.MarkdownID}`; - for (let i = 0; i < this.MAX_DIFFS; i++) { + for ( + let i = 0; + i < parseInt(process.env.MAX_DIFFS); + i++ + ) { try { await this.s3Client.send( new PutObjectCommand({ @@ -233,11 +251,42 @@ export class S3Service { } } - async deleteAllDiffsForFile( + ///===---------------------------------------------------- + + async saveDiff(diffDTO: DiffDTO) { + const filePath = `${diffDTO.UserID}/${diffDTO.MarkdownID}`; + + try { + // await fs.writeFile( + // `./storage/${filePath}/diff/${diffDTO.S3DiffID}`, + // diffDTO.Content, + // 'utf-8', + // ); + /*const response = */ await this.s3Client.send( + new PutObjectCommand({ + Bucket: this.awsS3BucketName, + Key: `${filePath}/diff/${diffDTO.S3DiffID}`, + Body: diffDTO.Content, + }), + ); + } catch (err) { + console.log('Write File Error: ' + err); + return undefined; + } + return diffDTO; + } + + ///===---------------------------------------------------- + + async deleteDiffObjectsForFile( markdownFileDTO: MarkdownFileDTO, ) { const filePath = `${markdownFileDTO.UserID}/${markdownFileDTO.MarkdownID}`; - for (let i = 0; i < this.MAX_DIFFS; i++) { + for ( + let i = 0; + i < parseInt(process.env.MAX_DIFFS); + i++ + ) { try { await this.s3Client.send( new DeleteObjectCommand({ @@ -254,13 +303,19 @@ export class S3Service { } } - async createSnapshotsForFile( + ///===---------------------------------------------------- + + async createSnapshotObjectsForFile( markdownFileDTO: MarkdownFileDTO, ) { const filePath = `${markdownFileDTO.UserID}/${markdownFileDTO.MarkdownID}`; // Create snapshot objects - for (let j = 0; j < this.MAX_SNAPSHOTS; j++) { + for ( + let j = 0; + j < parseInt(process.env.MAX_SNAPSHOTS); + j++ + ) { try { await this.s3Client.send( new PutObjectCommand({ @@ -278,11 +333,17 @@ export class S3Service { } } - async deleteAllSnapshotsForFile( + ///===---------------------------------------------------- + + async deleteSnapshotObjectsForFile( markdownFileDTO: MarkdownFileDTO, ) { const filePath = `${markdownFileDTO.UserID}/${markdownFileDTO.MarkdownID}`; - for (let i = 0; i < this.MAX_SNAPSHOTS; i++) { + for ( + let i = 0; + i < parseInt(process.env.SNAPSHOTS); + i++ + ) { try { await this.s3Client.send( new DeleteObjectCommand({ @@ -299,6 +360,8 @@ export class S3Service { } } + ///===---------------------------------------------------- + async createAsset(assetDTO: AssetDTO) { // Generate new AssetID const newAssetDTO = new AssetDTO(); @@ -328,6 +391,8 @@ export class S3Service { return newAssetDTO; } + ///===---------------------------------------------------- + async saveTextractResponse( saveAssetDTO: AssetDTO, textractResponse: any, @@ -376,6 +441,8 @@ export class S3Service { return saveAssetDTO; } + ///===---------------------------------------------------- + async saveImageAsset(saveAssetDTO: AssetDTO) { let filePath = `${saveAssetDTO.UserID}`; @@ -422,6 +489,8 @@ export class S3Service { return saveAssetDTO; } + ///===---------------------------------------------------- + async saveTextAssetImage( saveAssetDTO: AssetDTO, ) { @@ -470,6 +539,8 @@ export class S3Service { return saveAssetDTO; } + ///===---------------------------------------------------- + async retrieveAssetByID( assetID: string, userID: number, @@ -523,6 +594,8 @@ export class S3Service { } } + ///===---------------------------------------------------- + async retrieveAsset( retrieveAssetDTO: AssetDTO, ) { @@ -570,6 +643,8 @@ export class S3Service { return retrieveAssetDTO; } + ///===---------------------------------------------------- + async deleteAsset(assetDTO: AssetDTO) { console.log('Delete Asset (s3)'); let filePath = `${assetDTO.UserID}`; From fbc2029d0d0b0c340a26f12ff39723c1943a1d9e Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sat, 16 Sep 2023 19:25:20 +0200 Subject: [PATCH 041/186] Changed UserID data type to number --- backend/src/snapshots/entities/snapshots.entity.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/snapshots/entities/snapshots.entity.ts b/backend/src/snapshots/entities/snapshots.entity.ts index 0b128556..ba45d58d 100644 --- a/backend/src/snapshots/entities/snapshots.entity.ts +++ b/backend/src/snapshots/entities/snapshots.entity.ts @@ -13,7 +13,7 @@ export class Snapshot { MarkdownID: string; @Column() - UserID: string; + UserID: number; @Column() DisplayID: string; From a89e52597e76c5a89d24907002865309866273b8 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sat, 16 Sep 2023 19:41:50 +0200 Subject: [PATCH 042/186] Added functions to get head diff/snapshot in array --- .../markdown_files/markdown_files.service.ts | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/backend/src/markdown_files/markdown_files.service.ts b/backend/src/markdown_files/markdown_files.service.ts index 4de622da..b5075cd7 100644 --- a/backend/src/markdown_files/markdown_files.service.ts +++ b/backend/src/markdown_files/markdown_files.service.ts @@ -120,4 +120,24 @@ export class MarkdownFilesService { markdownToUpdate, ); } + + async getNextDiffID(markdownID: string) { + const markdownFile = + await this.markdownFileRepository.findOneBy( + { + MarkdownID: markdownID, + }, + ); + return markdownFile.NextDiffID; + } + + async getNextSnapshotID(markdownID: string) { + const markdownFile = + await this.markdownFileRepository.findOneBy( + { + MarkdownID: markdownID, + }, + ); + return markdownFile.NextSnapshotID; + } } From 3cced63ee6b64fa938eb493569bed06033796e39 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sun, 17 Sep 2023 21:01:15 +0200 Subject: [PATCH 043/186] Increased timeout for jest tests --- backend/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/package.json b/backend/package.json index 5ab21ba4..8707c867 100644 --- a/backend/package.json +++ b/backend/package.json @@ -103,6 +103,7 @@ "**/*.(t|j)s" ], "coverageDirectory": "../coverage", - "testEnvironment": "node" + "testEnvironment": "node", + "testTimeout": 30000 } } From 441f76530bf67b7be48c21acd713fb22a6cc78e3 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sun, 17 Sep 2023 21:10:34 +0200 Subject: [PATCH 044/186] Added function: updateDiff to update diff metadata --- backend/src/diffs/diffs.service.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/backend/src/diffs/diffs.service.ts b/backend/src/diffs/diffs.service.ts index b6ccc3a5..e5ab6b88 100644 --- a/backend/src/diffs/diffs.service.ts +++ b/backend/src/diffs/diffs.service.ts @@ -9,4 +9,13 @@ export class DiffsService { @InjectRepository(Diff) private diffRepository: Repository, ) {} + + async updateDiff(nextDiffID: number) { + const diff = await this.diffRepository.findOne({ + where: { S3DiffID: nextDiffID }, + }); + + diff.LastModified = new Date(); + await this.diffRepository.save(diff); + } } From d897bec7accb98dc300439e0d44d83175cebbaf5 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sun, 17 Sep 2023 21:11:10 +0200 Subject: [PATCH 045/186] Removed redundant column from diff entity --- backend/src/diffs/entities/diffs.entity.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/backend/src/diffs/entities/diffs.entity.ts b/backend/src/diffs/entities/diffs.entity.ts index 28f7e745..3d69ad46 100644 --- a/backend/src/diffs/entities/diffs.entity.ts +++ b/backend/src/diffs/entities/diffs.entity.ts @@ -15,9 +15,6 @@ export class Diff { @Column() UserID: number; - @Column() - DisplayID: string; - @Column() S3DiffID: number; From e71642fff74567f4ffb176ebd552bb51d8875ecd Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sun, 17 Sep 2023 21:11:34 +0200 Subject: [PATCH 046/186] Added function to increment head of circular array --- .../markdown_files/markdown_files.service.ts | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/backend/src/markdown_files/markdown_files.service.ts b/backend/src/markdown_files/markdown_files.service.ts index b5075cd7..a69f0b3a 100644 --- a/backend/src/markdown_files/markdown_files.service.ts +++ b/backend/src/markdown_files/markdown_files.service.ts @@ -3,6 +3,7 @@ import { HttpStatus, Injectable, } from '@nestjs/common'; +import 'dotenv/config'; import { MarkdownFileDTO } from './dto/markdown_file.dto'; import { MarkdownFile } from './entities/markdown_file.entity'; import { InjectRepository } from '@nestjs/typeorm'; @@ -121,6 +122,8 @@ export class MarkdownFilesService { ); } + ///===---------------------------------------------------- + async getNextDiffID(markdownID: string) { const markdownFile = await this.markdownFileRepository.findOneBy( @@ -131,6 +134,8 @@ export class MarkdownFilesService { return markdownFile.NextDiffID; } + ///===---------------------------------------------------- + async getNextSnapshotID(markdownID: string) { const markdownFile = await this.markdownFileRepository.findOneBy( @@ -140,4 +145,40 @@ export class MarkdownFilesService { ); return markdownFile.NextSnapshotID; } + + ///===---------------------------------------------------- + + async incrementNextDiffID(markdownID: string) { + const markdownFile = + await this.markdownFileRepository.findOneBy( + { + MarkdownID: markdownID, + }, + ); + markdownFile.NextDiffID = + (markdownFile.NextDiffID + 1) % + parseInt(process.env.MAX_DIFFS); + return this.markdownFileRepository.save( + markdownFile, + ); + } + + ///===---------------------------------------------------- + + async incrementNextSnapshotID( + markdownID: string, + ) { + const markdownFile = + await this.markdownFileRepository.findOneBy( + { + MarkdownID: markdownID, + }, + ); + markdownFile.NextSnapshotID = + (markdownFile.NextSnapshotID + 1) % + parseInt(process.env.MAX_SNAPSHOTS); + return this.markdownFileRepository.save( + markdownFile, + ); + } } From 44dd81c75baf3860ed533d2ea525b629bfa94bce Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sun, 17 Sep 2023 21:12:04 +0200 Subject: [PATCH 047/186] Added function: getAllDiffsForSnapshot --- backend/src/s3/s3.service.ts | 88 ++++++++++++++++++++++++++++++++---- 1 file changed, 79 insertions(+), 9 deletions(-) diff --git a/backend/src/s3/s3.service.ts b/backend/src/s3/s3.service.ts index 617273f6..1fa219ed 100644 --- a/backend/src/s3/s3.service.ts +++ b/backend/src/s3/s3.service.ts @@ -10,7 +10,8 @@ import { import * as fs from 'fs/promises'; // for local storage import * as CryptoJS from 'crypto-js'; import { AssetDTO } from '../assets/dto/asset.dto'; -import { DiffDTO } from 'src/diffs/dto/diffs.dto'; +import { DiffDTO } from '../diffs/dto/diffs.dto'; +import { SnapshotDTO } from '../snapshots/dto/snapshot.dto'; @Injectable() export class S3Service { @@ -253,19 +254,17 @@ export class S3Service { ///===---------------------------------------------------- - async saveDiff(diffDTO: DiffDTO) { + async saveDiff( + diffDTO: DiffDTO, + nextDiffID: number, + ) { const filePath = `${diffDTO.UserID}/${diffDTO.MarkdownID}`; try { - // await fs.writeFile( - // `./storage/${filePath}/diff/${diffDTO.S3DiffID}`, - // diffDTO.Content, - // 'utf-8', - // ); - /*const response = */ await this.s3Client.send( + await this.s3Client.send( new PutObjectCommand({ Bucket: this.awsS3BucketName, - Key: `${filePath}/diff/${diffDTO.S3DiffID}`, + Key: `${filePath}/diff/${nextDiffID}`, Body: diffDTO.Content, }), ); @@ -278,6 +277,54 @@ export class S3Service { ///===---------------------------------------------------- + /** + * @notes every snapshot is associated with n previous diffs. + * The IDs of the associated diffs do not change unless + * a change is made to the relevant versioning env variables. + */ + + async getAllDiffsForSnapshot( + snapshotDTO: SnapshotDTO, + ) { + const filePath = `${snapshotDTO.UserID}/${snapshotDTO.MarkdownID}`; + + let diffDTOs: DiffDTO[] = []; + + const firstDiffID = + snapshotDTO.S3SnapshotID * + parseInt(process.env.DIFFS_PER_SNAPSHOT); + + for ( + let j = firstDiffID; + j < + firstDiffID + + parseInt(process.env.DIFFS_PER_SNAPSHOT); + j++ + ) { + try { + const response = await this.s3Client.send( + new GetObjectCommand({ + Bucket: this.awsS3BucketName, + Key: `${filePath}/diff/${j}`, + }), + ); + + const diffDTO = new DiffDTO(); + diffDTO.Content = + await response.Body.transformToString(); + diffDTOs.push(diffDTO); + } catch (err) { + console.log( + `S3 diff ${j} read error: ` + err, + ); + return undefined; + } + } + return diffDTOs; + } + + ///===---------------------------------------------------- + async deleteDiffObjectsForFile( markdownFileDTO: MarkdownFileDTO, ) { @@ -362,6 +409,29 @@ export class S3Service { ///===---------------------------------------------------- + async saveSnapshot( + snapshotDTO: SnapshotDTO, + nextSnapshotID: number, + ) { + const filePath = `${snapshotDTO.UserID}/${snapshotDTO.MarkdownID}`; + + try { + await this.s3Client.send( + new PutObjectCommand({ + Bucket: this.awsS3BucketName, + Key: `${filePath}/snapshot/${nextSnapshotID}`, + Body: snapshotDTO.Content, + }), + ); + } catch (err) { + console.log('Write File Error: ' + err); + return undefined; + } + return snapshotDTO; + } + + ///===---------------------------------------------------- + async createAsset(assetDTO: AssetDTO) { // Generate new AssetID const newAssetDTO = new AssetDTO(); From 0e367ede5b9399a5e1b4b770cd6ca3f6b54d6956 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sun, 17 Sep 2023 21:12:17 +0200 Subject: [PATCH 048/186] Created dto for single snapshot --- backend/src/snapshots/dto/snapshot.dto.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 backend/src/snapshots/dto/snapshot.dto.ts diff --git a/backend/src/snapshots/dto/snapshot.dto.ts b/backend/src/snapshots/dto/snapshot.dto.ts new file mode 100644 index 00000000..1cb34e81 --- /dev/null +++ b/backend/src/snapshots/dto/snapshot.dto.ts @@ -0,0 +1,19 @@ +export class SnapshotDTO { + SnapshotID: string; + MarkdownID: string; + UserID: number; + DisplayID: number; + S3SnapshotID: number; + LastModified: Date; + Content: string; + + constructor() { + this.SnapshotID = undefined; + this.MarkdownID = undefined; + this.UserID = undefined; + this.DisplayID = undefined; + this.S3SnapshotID = undefined; + this.LastModified = undefined; + this.Content = undefined; + } +} \ No newline at end of file From e366dd4b5a606b5db3cce31ff6df9a05712aa6eb Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sun, 17 Sep 2023 21:12:32 +0200 Subject: [PATCH 049/186] Updated parameters of various functions --- .../version_control.controller.ts | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/backend/src/version_control/version_control.controller.ts b/backend/src/version_control/version_control.controller.ts index 6e4ee679..b4fda562 100644 --- a/backend/src/version_control/version_control.controller.ts +++ b/backend/src/version_control/version_control.controller.ts @@ -4,7 +4,8 @@ import { Post, } from '@nestjs/common'; import { VersionControlService } from './version_control.service'; -import { DiffDTO } from 'src/diffs/dto/diffs.dto'; +import { DiffDTO } from '../diffs/dto/diffs.dto'; +import { SnapshotDTO } from '../snapshots/dto/snapshot.dto'; @Controller('version_control') export class VersionControlController { @@ -12,11 +13,15 @@ export class VersionControlController { private readonly versionControlService: VersionControlService, ) {} + ///===---------------------------------------------------- + @Post('save_diff') saveDiff(@Body() diffDTO: DiffDTO) { this.versionControlService.saveDiff(diffDTO); } + ///===---------------------------------------------------- + @Post('get_diff') getDiff(@Body() diffDTO: DiffDTO) { return this.versionControlService.getDiff( @@ -24,13 +29,21 @@ export class VersionControlController { ); } + ///===---------------------------------------------------- + @Post('get_all_diffs') - getAllDiffs() { - return this.versionControlService.getAllDiffs(); + getAllDiffs(@Body() snapshotDTO: SnapshotDTO) { + return this.versionControlService.getAllDiffsForSnapshot( + snapshotDTO, + ); } + ///===---------------------------------------------------- + @Post('save_snapshot') - saveSnapshot() { - this.versionControlService.saveSnapshot(); + saveSnapshot(@Body() snapshotDTO: SnapshotDTO) { + this.versionControlService.saveSnapshot( + snapshotDTO, + ); } } From df54ba7b69bcb1a25f00fd5628d16d6766007c3d Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sun, 17 Sep 2023 21:13:01 +0200 Subject: [PATCH 050/186] Fixed repository dependency issues --- .../version_control.service.spec.ts | 51 +++++++++++++++++-- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/backend/src/version_control/version_control.service.spec.ts b/backend/src/version_control/version_control.service.spec.ts index 1eac65a3..119f6f42 100644 --- a/backend/src/version_control/version_control.service.spec.ts +++ b/backend/src/version_control/version_control.service.spec.ts @@ -3,20 +3,63 @@ import { TestingModule, } from '@nestjs/testing'; import { VersionControlService } from './version_control.service'; +import { DiffsService } from '../diffs/diffs.service'; +import { MarkdownFilesService } from '../markdown_files/markdown_files.service'; +import { S3Service } from '../s3/s3.service'; +import { S3ServiceMock } from '../s3/__mocks__/s3.service'; +import { getRepositoryToken } from '@nestjs/typeorm'; +import { Diff } from '../diffs/entities/diffs.entity'; +import { Repository } from 'typeorm'; +import { MarkdownFile } from '../markdown_files/entities/markdown_file.entity'; - -describe('ConversionService', () => { +describe('VersionControlService', () => { let service: VersionControlService; + let diffsService: DiffsService; + let markdownFilesService: MarkdownFilesService; + let s3Service: S3Service; + let s3ServiceMock: S3ServiceMock; beforeEach(async () => { const module: TestingModule = await Test.createTestingModule({ - providers: [VersionControlService], + providers: [ + VersionControlService, + DiffsService, + MarkdownFilesService, + S3Service, + S3ServiceMock, + { + provide: getRepositoryToken(Diff), + useClass: Repository, + }, + { + provide: + getRepositoryToken(MarkdownFile), + useClass: Repository, + }, + ], }).compile(); service = module.get( VersionControlService, ); + + diffsService = + module.get(DiffsService); + + markdownFilesService = + module.get( + MarkdownFilesService, + ); + + s3Service = module.get(S3Service); + + s3ServiceMock = module.get( + S3ServiceMock, + ); }); -}); \ No newline at end of file + it('should be defined', () => { + expect(service).toBeDefined(); + }); +}); From 591c28deb9f711a8d216ecddba29ac70ba510463 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Sun, 17 Sep 2023 21:13:21 +0200 Subject: [PATCH 051/186] Added logic to saveDiff/Snapshot functions --- .../version_control.service.ts | 64 +++++++++++++++---- 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index 0ea481c1..66d13ccb 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -1,24 +1,45 @@ import { Injectable } from '@nestjs/common'; -import { DiffsService } from 'src/diffs/diffs.service'; -import { DiffDTO } from 'src/diffs/dto/diffs.dto'; -import { S3ServiceMock } from 'src/s3/__mocks__/s3.service'; -import { S3Service } from 'src/s3/s3.service'; +import { DiffsService } from '../diffs/diffs.service'; +import { DiffDTO } from '../diffs/dto/diffs.dto'; +import { MarkdownFilesService } from '../markdown_files/markdown_files.service'; +import { S3ServiceMock } from '../s3/__mocks__/s3.service'; +import { S3Service } from '../s3/s3.service'; +import { SnapshotDTO } from '../snapshots/dto/snapshot.dto'; @Injectable() export class VersionControlService { constructor( private diffService: DiffsService, - private s3service: S3Service, + private markdownFileService: MarkdownFilesService, + private s3Service: S3Service, private s3ServiceMock: S3ServiceMock, ) {} ///===----------------------------------------------------- - saveDiff(diffDTO: DiffDTO) { - // get nextDiffID - // calls s3Service.saveDiff() - // check if snapshot needs to be created - // update diff metadata in table + async saveDiff(diffDTO: DiffDTO) { + const nextDiffID = + await this.markdownFileService.getNextDiffID( + diffDTO.MarkdownID, + ); + + this.s3Service.saveDiff(diffDTO, nextDiffID); + + if ( + nextDiffID % + parseInt( + process.env.DIFFS_PER_SNAPSHOT, + ) === + 0 && + nextDiffID !== 0 + ) { + // create snapshot + } + + await this.diffService.updateDiff(nextDiffID); + await this.markdownFileService.incrementNextDiffID( + diffDTO.MarkdownID, + ); } ///===----------------------------------------------------- @@ -27,11 +48,30 @@ export class VersionControlService { ///===----------------------------------------------------- - getAllDiffs() {} + getAllDiffsForSnapshot( + snapshotDTO: SnapshotDTO, + ) {} ///===----------------------------------------------------- - saveSnapshot() {} + async saveSnapshot(snapshotDTO: SnapshotDTO) { + const nextSnapshotID = + await this.markdownFileService.getNextSnapshotID( + snapshotDTO.MarkdownID, + ); + + this.s3Service.saveSnapshot( + snapshotDTO, + nextSnapshotID, + ); + + await this.diffService.updateDiff( + nextSnapshotID, + ); + await this.markdownFileService.incrementNextDiffID( + snapshotDTO.MarkdownID, + ); + } ///===----------------------------------------------------- From a48964f64bef68ab39431946ca3da7a7097ff584 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 14:14:32 +0200 Subject: [PATCH 052/186] Solved dependency issues --- backend/src/app.module.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/backend/src/app.module.ts b/backend/src/app.module.ts index 9669ee9e..68a2691c 100644 --- a/backend/src/app.module.ts +++ b/backend/src/app.module.ts @@ -28,6 +28,10 @@ import { TextractService } from './textract/textract.service'; import { ResetPasswordModule } from './reset_password/reset_password.module'; import { ResetPasswordRequest } from './reset_password/entities/reset_password_request.entity'; import { MailService } from './mail/mail.service'; +import { DiffsService } from './diffs/diffs.service'; +import { SnapshotService } from './snapshots/snapshots.service'; +import { Diff } from './diffs/entities/diffs.entity'; +import { Snapshot } from './snapshots/entities/snapshots.entity'; @Module({ imports: [ @@ -41,6 +45,8 @@ import { MailService } from './mail/mail.service'; TypeOrmModule.forFeature([ ResetPasswordRequest, ]), + TypeOrmModule.forFeature([Diff]), + TypeOrmModule.forFeature([Snapshot]), MarkdownFilesModule, FoldersModule, S3Module, @@ -62,6 +68,8 @@ import { MailService } from './mail/mail.service'; ConversionService, TextractService, MailService, + DiffsService, + SnapshotService, ], }) export class AppModule {} From 0902137324465090e6195907c3b650b88c37ec8f Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 14:14:52 +0200 Subject: [PATCH 053/186] Added function: createDiffs in database --- backend/src/diffs/diffs.service.ts | 49 +++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/backend/src/diffs/diffs.service.ts b/backend/src/diffs/diffs.service.ts index e5ab6b88..1d6002d3 100644 --- a/backend/src/diffs/diffs.service.ts +++ b/backend/src/diffs/diffs.service.ts @@ -1,7 +1,10 @@ -import { Injectable } from "@nestjs/common"; -import { InjectRepository } from "@nestjs/typeorm"; -import { Repository } from "typeorm"; -import { Diff } from "./entities/diffs.entity"; +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { Diff } from './entities/diffs.entity'; +import 'dotenv/config'; +import * as CryptoJS from 'crypto-js'; +import { MarkdownFileDTO } from '../markdown_files/dto/markdown_file.dto'; @Injectable() export class DiffsService { @@ -11,11 +14,43 @@ export class DiffsService { ) {} async updateDiff(nextDiffID: number) { - const diff = await this.diffRepository.findOne({ - where: { S3DiffID: nextDiffID }, - }); + const diff = + await this.diffRepository.findOne({ + where: { S3DiffID: nextDiffID }, + }); diff.LastModified = new Date(); await this.diffRepository.save(diff); } + + async createDiffs( + markdownFileDTO: MarkdownFileDTO, + ) { + const diffRecords = []; + for ( + let i = 0; + i < parseInt(process.env.MAX_DIFFS); + i++ + ) { + const diffID = CryptoJS.SHA256( + markdownFileDTO.UserID.toString() + + new Date().getTime().toString() + + i.toString(), + ).toString(); + + diffRecords.push({ + DiffID: diffID, + MarkdownID: markdownFileDTO.MarkdownID, + UserID: markdownFileDTO.UserID, + S3DiffID: i, + }); + } + await this.diffRepository.insert(diffRecords); + } + + async deleteDiffs(markdownFileDTO: MarkdownFileDTO) { + await this.diffRepository.delete({ + MarkdownID: markdownFileDTO.MarkdownID, + }); + } } From 9bb209361d30520740df88723786d59cd5e8ea60 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Mon, 18 Sep 2023 14:15:06 +0200 Subject: [PATCH 054/186] Basic test for saving diffs --- frontend/src/app/edit/edit.component.ts | 14 +++- frontend/src/app/services/dto/diff.dto.ts | 18 +++--- .../app/services/version.control.service.ts | 64 ++++++++++++++----- 3 files changed, 70 insertions(+), 26 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 90966930..25e87331 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -15,6 +15,7 @@ import { DialogService } from 'primeng/dynamicdialog'; import { FileService } from '../services/file.service'; import { EditService } from '../services/edit.service'; import { AssetService } from '../services/asset.service'; +import { VersionControlService } from '../services/version.control.service'; import { Inject } from '@angular/core'; import { MessageService } from 'primeng/api'; import { set } from 'cypress/types/lodash'; @@ -44,6 +45,7 @@ export class EditComponent implements AfterViewInit, OnInit { noAssetsAvailable: boolean = false; isTouchScreen: boolean = false; sideBarTab: boolean = false; + prevVersion: string = ''; public editor: DecoupledEditor = {} as DecoupledEditor; public globalAreaReference!: HTMLElement; @@ -55,7 +57,8 @@ export class EditComponent implements AfterViewInit, OnInit { private editService: EditService, private assetService: AssetService, private clipboard: Clipboard, - private messageService: MessageService + private messageService: MessageService, + private versionControlService: VersionControlService ) {} @HostListener('window:beforeunload', ['$event']) @@ -84,7 +87,7 @@ export class EditComponent implements AfterViewInit, OnInit { } async ngOnInit(): Promise { - + this.prevVersion = this.editService.getContent() as string; this.speedDialItems = [ { icon: 'pi pi-pencil', @@ -249,6 +252,13 @@ export class EditComponent implements AfterViewInit, OnInit { saveDocumentContents() { // Save the document quill content to localStorage when changes occur // const editableArea: HTMLElement = this.elementRef.nativeElement.querySelector('.document-editor__editable'); + + console.log(this.prevVersion) + console.log(this.editor.getData()); + const diff = this.versionControlService.getReadablePatch(this.prevVersion as string, this.editor.getData()); + console.log(diff); + this.versionControlService.saveDiff(this.editService.getMarkdownID() as string,diff); + this.prevVersion = this.editor.getData(); let contents = this.editor.getData(); let pass = this.editService.getDocumentPassword(); if(pass != '' && pass != undefined) { diff --git a/frontend/src/app/services/dto/diff.dto.ts b/frontend/src/app/services/dto/diff.dto.ts index 416a110c..de2bd12c 100644 --- a/frontend/src/app/services/dto/diff.dto.ts +++ b/frontend/src/app/services/dto/diff.dto.ts @@ -1,13 +1,15 @@ export class DiffDTO { - fileID: string; - diffNumber: number; - snapshotNumber: number; - content: string; + UserID: string; + FileID: string; + DiffNumber: number; + SnapshotNumber: number; + Content: string; constructor() { - this.fileID = ''; - this.diffNumber = 0; - this.snapshotNumber = 0; - this.content = ''; + this.UserID = ''; + this.FileID = ''; + this.DiffNumber = 0; + this.SnapshotNumber = 0; + this.Content = ''; } } diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index 749d5138..e907d7c7 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -2,19 +2,22 @@ import { Injectable } from '@angular/core'; import { UserService } from './user.service'; // import DiffMatchPatch from 'diff-match-patch'; import { diff_match_patch as DiffMatchPatch } from 'diff-match-patch'; -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http'; +import { Observable } from 'rxjs'; import { DiffDTO } from './dto/diff.dto'; import { SnapshotDTO } from './dto/snapshot.dto'; import { MarkdownFileDTO } from './dto/markdown_file.dto'; import { FileService } from './file.service'; import { VersionDTO } from './dto/version.dto'; +import { environment } from 'src/environments/environment'; @Injectable({ providedIn: 'root', }) export class VersionControlService { - constructor(private http: HttpClient, private fileService: FileService) {} + userService: any; + constructor(private http: HttpClient, private fileService: FileService) { } public snapshotArr: SnapshotDTO[] = []; public diffArr: DiffDTO[] = []; @@ -69,10 +72,10 @@ export class VersionControlService { for (let element of diffPathArr) { this.http.get(element, { responseType: 'text' }).subscribe((data) => { var tempDTO = new DiffDTO(); - tempDTO.fileID = 'abc123'; - tempDTO.diffNumber = +element.charAt(element.length - 1); - tempDTO.snapshotNumber = this.snapshotArr[0].snapshotNumber; - tempDTO.content = data; + tempDTO.FileID = 'abc123'; + tempDTO.DiffNumber = +element.charAt(element.length - 1); + tempDTO.SnapshotNumber = this.snapshotArr[0].snapshotNumber; + tempDTO.Content = data; this.pushToDiffArr(tempDTO); }); } @@ -106,15 +109,15 @@ export class VersionControlService { a.snapshotNumber > b.snapshotNumber ? 1 : a.snapshotNumber < b.snapshotNumber - ? -1 - : 0 + ? -1 + : 0 ); } sortDiffArr(inArr: DiffDTO[]): void { // Ascending sort on diffNumber inArr.sort((a, b) => - a.diffNumber > b.diffNumber ? 1 : a.diffNumber < b.diffNumber ? -1 : 0 + a.DiffNumber > b.DiffNumber ? 1 : a.DiffNumber < b.DiffNumber ? -1 : 0 ); } @@ -165,10 +168,10 @@ export class VersionControlService { const tempDTO = new VersionDTO(); tempDTO.isDiff = true; - tempDTO.fileID = diff.fileID; + tempDTO.fileID = diff.FileID; tempDTO.prevContent = this.buildDiffContext(diff, snapshot); - const patches = this.DiffPatchService.patch_fromText(diff.content); + const patches = this.DiffPatchService.patch_fromText(diff.Content); tempDTO.content = this.DiffPatchService.patch_apply( patches, tempDTO.prevContent @@ -181,13 +184,13 @@ export class VersionControlService { let retString = snapshot.content; const tempArr = this.diffArr.filter((ele) => { - return ele.diffNumber < diff.diffNumber; + return ele.DiffNumber < diff.DiffNumber; }); this.sortDiffArr(tempArr); for (let element of tempArr) { - let patches = this.DiffPatchService.patch_fromText(element.content); + let patches = this.DiffPatchService.patch_fromText(element.Content); retString = this.DiffPatchService.patch_apply(patches, retString)[0]; } @@ -206,7 +209,7 @@ export class VersionControlService { }); this.diffArr = this.diffArr.filter((ele) => { - return ele.snapshotNumber <= snapshot.snapshotNumber; + return ele.SnapshotNumber <= snapshot.snapshotNumber; }); this.sortSnapshotArr(this.snapshotArr); @@ -215,14 +218,43 @@ export class VersionControlService { diffRestore(diff: DiffDTO): void { this.snapshotArr = this.snapshotArr.filter((ele) => { - return ele.snapshotNumber <= diff.snapshotNumber; + return ele.snapshotNumber <= diff.SnapshotNumber; }); this.diffArr = this.diffArr.filter((ele) => { - return ele.snapshotNumber <= diff.snapshotNumber; + return ele.SnapshotNumber <= diff.SnapshotNumber; }); this.sortSnapshotArr(this.snapshotArr); this.sortDiffArr(this.diffArr); } + + saveDiff(fileID: string, content: string): Promise { + return new Promise((resolve, reject) => { + this.sendSaveDiff(fileID, content).subscribe({ + next: (response: HttpResponse) => { + if (response.status === 200) { + resolve(true); + } else { + resolve(false); + } + }, + }); + }); + } + + sendSaveDiff(fileId: string, content: string): Observable> { + const environmentURL = environment.apiURL; + const url = `${environmentURL}version_control/save_diff`; + const body = new DiffDTO(); + + body.UserID = this.userService.getUserID(); + body.Content = content; + body.FileID = fileId; + const headers = new HttpHeaders().set( + 'Authorization', + 'Bearer ' + this.userService.getAuthToken() + ); + return this.http.post(url, body, { headers, observe: 'response' }); + } } From bc0eff39569671ee3715a24ec658568fe316e8ee Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 14:15:06 +0200 Subject: [PATCH 055/186] Solved dependency issues --- backend/src/file_manager/file_manager.module.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/backend/src/file_manager/file_manager.module.ts b/backend/src/file_manager/file_manager.module.ts index bca97939..eef6af36 100644 --- a/backend/src/file_manager/file_manager.module.ts +++ b/backend/src/file_manager/file_manager.module.ts @@ -15,6 +15,10 @@ import { S3ServiceMock } from '../s3/__mocks__/s3.service'; import { ResetPasswordService } from '../reset_password/reset_password.service'; import { ResetPasswordRequest } from '../reset_password/entities/reset_password_request.entity'; import { MailService } from '../mail/mail.service'; +import { DiffsService } from '../diffs/diffs.service'; +import { SnapshotService } from '../snapshots/snapshots.service'; +import { Diff } from '../diffs/entities/diffs.entity'; +import { Snapshot } from '../snapshots/entities/snapshots.entity'; @Module({ imports: [ @@ -24,6 +28,8 @@ import { MailService } from '../mail/mail.service'; TypeOrmModule.forFeature([ ResetPasswordRequest, ]), + TypeOrmModule.forFeature([Diff]), + TypeOrmModule.forFeature([Snapshot]), ], controllers: [FileManagerController], providers: [ @@ -37,6 +43,8 @@ import { MailService } from '../mail/mail.service'; S3ServiceMock, ResetPasswordService, MailService, + DiffsService, + SnapshotService, ], }) export class FileManagerModule {} From 8c6e52902cfb6b0eb47c4089a8987b35828f9702 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 14:15:27 +0200 Subject: [PATCH 056/186] Added calls to versioning functions --- .../src/file_manager/file_manager.service.ts | 37 +++++++++++++++---- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/backend/src/file_manager/file_manager.service.ts b/backend/src/file_manager/file_manager.service.ts index c49cf1e1..44ca08d3 100644 --- a/backend/src/file_manager/file_manager.service.ts +++ b/backend/src/file_manager/file_manager.service.ts @@ -18,6 +18,8 @@ import { ExportDTO } from './dto/export.dto'; import * as CryptoJS from 'crypto-js'; import { ConversionService } from '../conversion/conversion.service'; import { ImportDTO } from './dto/import.dto'; +import { DiffsService } from '../diffs/diffs.service'; +import { SnapshotService } from '../snapshots/snapshots.service'; @Injectable() export class FileManagerService { @@ -28,14 +30,11 @@ export class FileManagerService { private conversionService: ConversionService, private userService: UsersService, private s3ServiceMock: S3ServiceMock, + private diffsService: DiffsService, + private snapshotService: SnapshotService, ) {} // File operations: ########################################################### - - // DB Requires the following fields to be initialised in the DTO: - // Path: string; .. TO PLACE THE FILE IN S3 - // Name: string; .. THE NEW NAME OF THE FILE - // Size: number; .. THE SIZE OF THE FILE IN MEGABYTES async createFile( markdownFileDTO: MarkdownFileDTO, isTest = false, @@ -78,13 +77,27 @@ export class FileManagerService { ); } + await this.s3service.createDiffObjectsForFile( + markdownFileDTO, + ); + + await this.s3service.createSnapshotObjectsForFile( + markdownFileDTO, + ); + + await this.diffsService.createDiffs( + markdownFileDTO, + ); + + await this.snapshotService.createSnapshots( + markdownFileDTO, + ); + return await this.markdownFilesService.create( markdownFileDTO, - ); // return the file to know ID; + ); } - // This function will need to return the latest diffs for - // the specified file (at most, 10 diffs) async retrieveFile( markdownFileDTO: MarkdownFileDTO, isTest = false, @@ -272,6 +285,14 @@ export class FileManagerService { await this.s3service.deleteSnapshotObjectsForFile( markdownFileDTO, ); + + await this.diffsService.deleteDiffs( + markdownFileDTO, + ); + + await this.snapshotService.deleteSnapshots( + markdownFileDTO, + ); } return this.markdownFilesService.remove( From 23bca5528b3b73ed2b592e82aad83fbbc25ed393 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 14:16:03 +0200 Subject: [PATCH 057/186] Added calls to versioning functions --- .../file_manager/__mocks__/file_manager.service.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/backend/src/file_manager/__mocks__/file_manager.service.ts b/backend/src/file_manager/__mocks__/file_manager.service.ts index 1a52d088..23268ab4 100644 --- a/backend/src/file_manager/__mocks__/file_manager.service.ts +++ b/backend/src/file_manager/__mocks__/file_manager.service.ts @@ -17,6 +17,8 @@ import { ExportDTO } from '../dto/export.dto'; import * as CryptoJS from 'crypto-js'; import { ConversionService } from '../../conversion/conversion.service'; import { ImportDTO } from '../dto/import.dto'; +import { DiffsService } from '../../diffs/diffs.service'; +import { SnapshotService } from '../../snapshots/snapshots.service'; @Injectable() export class FileManagerServiceMock { @@ -26,6 +28,8 @@ export class FileManagerServiceMock { private s3service: S3Service, private conversionService: ConversionService, private userService: UsersService, + private diffsService: DiffsService, + private snapshotService: SnapshotService, ) {} // File operations: ########################################################### @@ -241,6 +245,14 @@ export class FileManagerServiceMock { markdownFileDTO, ); + await this.diffsService.deleteDiffs( + markdownFileDTO, + ); + + await this.snapshotService.deleteSnapshots( + markdownFileDTO, + ); + return this.markdownFilesService.remove( markdownFileDTO, ); From 9c4c7c9435b59810439963ddf77b9e154d769437 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 14:16:32 +0200 Subject: [PATCH 058/186] Removed functions from createFile function --- backend/src/s3/s3.service.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/backend/src/s3/s3.service.ts b/backend/src/s3/s3.service.ts index 1fa219ed..566d9faa 100644 --- a/backend/src/s3/s3.service.ts +++ b/backend/src/s3/s3.service.ts @@ -108,14 +108,7 @@ export class S3Service { 'S3 content file creation error: ' + err, ); return undefined; - } - - this.createDiffObjectsForFile( - markdownFileDTO, - ); - this.createSnapshotObjectsForFile( - markdownFileDTO, - ); + }; markdownFileDTO.Content = ''; markdownFileDTO.Size = 0; From a4a64081ad275677e2ed6c262c4f4f30e1af5f63 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 14:16:57 +0200 Subject: [PATCH 059/186] Added function createSnapshots to create refs in db --- backend/src/snapshots/snapshots.service.ts | 45 ++++++++++++++++++++-- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/backend/src/snapshots/snapshots.service.ts b/backend/src/snapshots/snapshots.service.ts index f5841b30..64406dd6 100644 --- a/backend/src/snapshots/snapshots.service.ts +++ b/backend/src/snapshots/snapshots.service.ts @@ -1,7 +1,9 @@ -import { Injectable } from "@nestjs/common"; -import { InjectRepository } from "@nestjs/typeorm"; -import { Repository } from "typeorm"; -import { Snapshot } from "./entities/snapshots.entity"; +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { Snapshot } from './entities/snapshots.entity'; +import { MarkdownFileDTO } from '../markdown_files/dto/markdown_file.dto'; +import * as CryptoJS from 'crypto-js'; @Injectable() export class SnapshotService { @@ -9,4 +11,39 @@ export class SnapshotService { @InjectRepository(Snapshot) private snapshotRepository: Repository, ) {} + + async createSnapshots( + markdownFileDTO: MarkdownFileDTO, + ) { + const snapshotRecords = []; + for ( + let i = 0; + i < parseInt(process.env.MAX_SNAPSHOTS); + i++ + ) { + const snapshotID = CryptoJS.SHA256( + markdownFileDTO.UserID.toString() + + new Date().getTime().toString() + + i.toString(), + ).toString(); + + snapshotRecords.push({ + SnapshotID: snapshotID, + MarkdownID: markdownFileDTO.MarkdownID, + UserID: markdownFileDTO.UserID, + S3SnapshotID: i, + }); + } + await this.snapshotRepository.insert( + snapshotRecords, + ); + } + + async deleteSnapshots( + markdownFileDTO: MarkdownFileDTO, + ) { + await this.snapshotRepository.delete({ + MarkdownID: markdownFileDTO.MarkdownID, + }); + } } From 48501eb6f1877d4f939565991d0b1ea502de558d Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 14:17:09 +0200 Subject: [PATCH 060/186] Removed redundant DisplayID field --- backend/src/snapshots/entities/snapshots.entity.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/backend/src/snapshots/entities/snapshots.entity.ts b/backend/src/snapshots/entities/snapshots.entity.ts index ba45d58d..11f80275 100644 --- a/backend/src/snapshots/entities/snapshots.entity.ts +++ b/backend/src/snapshots/entities/snapshots.entity.ts @@ -15,9 +15,6 @@ export class Snapshot { @Column() UserID: number; - @Column() - DisplayID: string; - @Column() S3SnapshotID: number; From 9190d9a1a112af04da0291053d1b890049c85eac Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Mon, 18 Sep 2023 14:25:06 +0200 Subject: [PATCH 061/186] Fixes to saving diff --- frontend/src/app/services/dto/diff.dto.ts | 4 ++-- frontend/src/app/services/version.control.service.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/services/dto/diff.dto.ts b/frontend/src/app/services/dto/diff.dto.ts index de2bd12c..3d584e22 100644 --- a/frontend/src/app/services/dto/diff.dto.ts +++ b/frontend/src/app/services/dto/diff.dto.ts @@ -1,12 +1,12 @@ export class DiffDTO { - UserID: string; + UserID: number; FileID: string; DiffNumber: number; SnapshotNumber: number; Content: string; constructor() { - this.UserID = ''; + this.UserID = 0; this.FileID = ''; this.DiffNumber = 0; this.SnapshotNumber = 0; diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index e907d7c7..c8614e01 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -16,8 +16,7 @@ import { environment } from 'src/environments/environment'; providedIn: 'root', }) export class VersionControlService { - userService: any; - constructor(private http: HttpClient, private fileService: FileService) { } + constructor(private http: HttpClient, private fileService: FileService, private userService: UserService) { } public snapshotArr: SnapshotDTO[] = []; public diffArr: DiffDTO[] = []; @@ -246,9 +245,10 @@ export class VersionControlService { sendSaveDiff(fileId: string, content: string): Observable> { const environmentURL = environment.apiURL; const url = `${environmentURL}version_control/save_diff`; + console.log(url); const body = new DiffDTO(); - body.UserID = this.userService.getUserID(); + body.UserID = this.userService.getUserID() as number; body.Content = content; body.FileID = fileId; const headers = new HttpHeaders().set( From a6bbcbd1815d304b572a65bca005a0b16db4b46f Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 14:39:18 +0200 Subject: [PATCH 062/186] Created module file for VersionControl --- .../version_control/version_control.module.ts | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 backend/src/version_control/version_control.module.ts diff --git a/backend/src/version_control/version_control.module.ts b/backend/src/version_control/version_control.module.ts new file mode 100644 index 00000000..b66a72c2 --- /dev/null +++ b/backend/src/version_control/version_control.module.ts @@ -0,0 +1,30 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { DiffsService } from '../diffs/diffs.service'; +import { SnapshotService } from '../snapshots/snapshots.service'; +import { Diff } from '../diffs/entities/diffs.entity'; +import { Snapshot } from '../snapshots/entities/snapshots.entity'; +import { VersionControlController } from './version_control.controller'; +import { VersionControlService } from './version_control.service'; +import { MarkdownFilesService } from '../markdown_files/markdown_files.service'; +import { S3Service } from '../s3/s3.service'; +import { S3ServiceMock } from '../s3/__mocks__/s3.service'; +import { MarkdownFile } from '../markdown_files/entities/markdown_file.entity'; + +@Module({ + imports: [ + TypeOrmModule.forFeature([Diff]), + TypeOrmModule.forFeature([Snapshot]), + TypeOrmModule.forFeature([MarkdownFile]), + ], + controllers: [VersionControlController], + providers: [ + DiffsService, + SnapshotService, + VersionControlService, + MarkdownFilesService, + S3Service, + S3ServiceMock, + ], +}) +export class VersionControlModule {} From 7e660d75dd0a142ce01d9263ed7429a2e2d13ffa Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 14:39:40 +0200 Subject: [PATCH 063/186] Linked VersionControl endpoints --- backend/src/app.module.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/src/app.module.ts b/backend/src/app.module.ts index 68a2691c..358b9e0f 100644 --- a/backend/src/app.module.ts +++ b/backend/src/app.module.ts @@ -32,6 +32,9 @@ import { DiffsService } from './diffs/diffs.service'; import { SnapshotService } from './snapshots/snapshots.service'; import { Diff } from './diffs/entities/diffs.entity'; import { Snapshot } from './snapshots/entities/snapshots.entity'; +import { VersionControlModule } from './version_control/version_control.module'; +import { VersionControlService } from './version_control/version_control.service'; +import { VersionControlController } from './version_control/version_control.controller'; @Module({ imports: [ @@ -52,12 +55,14 @@ import { Snapshot } from './snapshots/entities/snapshots.entity'; S3Module, FileManagerModule, AssetManagerModule, + VersionControlModule, ResetPasswordModule, ], controllers: [ AuthController, S3Controller, FileManagerController, + VersionControlController ], providers: [ FileManagerService, @@ -70,6 +75,7 @@ import { Snapshot } from './snapshots/entities/snapshots.entity'; MailService, DiffsService, SnapshotService, + VersionControlService, ], }) export class AppModule {} From 0677f4d39af12a7e525a0a034a79510cf1471223 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 14:59:09 +0200 Subject: [PATCH 064/186] Added debugging statements --- .../src/version_control/version_control.service.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index 66d13ccb..bda22efc 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -25,6 +25,10 @@ export class VersionControlService { this.s3Service.saveDiff(diffDTO, nextDiffID); + console.log( + '[versionControlService.saveDiff] Saved diff in s3', + ); + if ( nextDiffID % parseInt( @@ -37,9 +41,18 @@ export class VersionControlService { } await this.diffService.updateDiff(nextDiffID); + + console.log( + '[versionControlService.saveDiff] Updated diff in db', + ); + await this.markdownFileService.incrementNextDiffID( diffDTO.MarkdownID, ); + + console.log( + '[versionControlService.saveDiff] Incremented nextDiffID in db', + ); } ///===----------------------------------------------------- From 9dae74e9c11d9953126749f95b3b3475bcc3ae0e Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 14:59:19 +0200 Subject: [PATCH 065/186] Removed stale comment --- backend/src/file_manager/file_manager.service.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/src/file_manager/file_manager.service.ts b/backend/src/file_manager/file_manager.service.ts index 44ca08d3..216dc3a4 100644 --- a/backend/src/file_manager/file_manager.service.ts +++ b/backend/src/file_manager/file_manager.service.ts @@ -249,8 +249,6 @@ export class FileManagerService { ); } - // Assuming frontend will send the NextDiffID - return await this.markdownFilesService.updateAfterModification( markdownFileDTO, ); From ec2b3741b328229a22d0f8f309e2ea8df7c85ebc Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Mon, 18 Sep 2023 15:31:40 +0200 Subject: [PATCH 066/186] Retrieve all snapshots --- frontend/src/app/edit/edit.component.ts | 5 +++- .../app/services/version.control.service.ts | 28 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 25e87331..1cb362e8 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -230,6 +230,7 @@ export class EditComponent implements AfterViewInit, OnInit { this.elementRef.nativeElement.ownerDocument.body.style.backgroundColor = '#E3E3E3'; this.elementRef.nativeElement.ownerDocument.body.style.overflow = 'hidden'; + this.refreshSidebarHistory(); this.refreshSidebar(); } @@ -495,7 +496,9 @@ export class EditComponent implements AfterViewInit, OnInit { } async refreshSidebarHistory() { - console.log('refreshing history'); + this.history = []; + this.history=await this.versionControlService.retrieveAllSnapshots(this.editService.getMarkdownID() as string); + } pageBreak() { diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index c8614e01..18652708 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -257,4 +257,32 @@ export class VersionControlService { ); return this.http.post(url, body, { headers, observe: 'response' }); } + + retrieveAllSnapshots(fileID: string): Promise { + return new Promise((resolve, reject) => { + this.sendRetrieveAllSnapshots(fileID).subscribe({ + next: (response: HttpResponse) => { + if (response.status === 200) { + resolve(response.body); + } else { + resolve(null); + } + }, + }); + }); + } + + sendRetrieveAllSnapshots(fileID: string): Observable> { + const environmentURL = environment.apiURL; + const url = `${environmentURL}version_control/get_all_snapshots`; + console.log(url); + const body = new SnapshotDTO(); + + body.fileID = fileID; + const headers = new HttpHeaders().set( + 'Authorization', + 'Bearer ' + this.userService.getAuthToken() + ); + return this.http.post(url, body, { headers, observe: 'response' }); + } } From 81a0493f5a7dad8c7c1336c95466aafdf8599796 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Mon, 18 Sep 2023 15:41:05 +0200 Subject: [PATCH 067/186] Fixed snapshot dto --- frontend/src/app/services/dto/snapshot.dto.ts | 14 +++++----- .../app/services/version.control.service.ts | 27 ++++++++++--------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/frontend/src/app/services/dto/snapshot.dto.ts b/frontend/src/app/services/dto/snapshot.dto.ts index bd10d116..421d3b4c 100644 --- a/frontend/src/app/services/dto/snapshot.dto.ts +++ b/frontend/src/app/services/dto/snapshot.dto.ts @@ -1,11 +1,13 @@ export class SnapshotDTO { - fileID: string; - snapshotNumber: number; - content: string; + UserID: number; + FileID: string; + SnapshotNumber: number; + Content: string; constructor() { - this.fileID = ''; - this.snapshotNumber = 0; - this.content = ''; + this.UserID = 0; + this.FileID = ''; + this.SnapshotNumber = 0; + this.Content = ''; } } diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index 18652708..ff761936 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -61,9 +61,9 @@ export class VersionControlService { for (let element of snapshotPathArr) { this.http.get(element, { responseType: 'text' }).subscribe((data) => { var tempDTO = new SnapshotDTO(); - tempDTO.fileID = 'abc123'; - tempDTO.snapshotNumber = +element.charAt(element.length - 1); - tempDTO.content = data; + tempDTO.FileID = 'abc123'; + tempDTO.SnapshotNumber = +element.charAt(element.length - 1); + tempDTO.Content = data; this.pushToSnapshotArr(tempDTO); }); } @@ -73,7 +73,7 @@ export class VersionControlService { var tempDTO = new DiffDTO(); tempDTO.FileID = 'abc123'; tempDTO.DiffNumber = +element.charAt(element.length - 1); - tempDTO.SnapshotNumber = this.snapshotArr[0].snapshotNumber; + tempDTO.SnapshotNumber = this.snapshotArr[0].SnapshotNumber; tempDTO.Content = data; this.pushToDiffArr(tempDTO); }); @@ -105,9 +105,9 @@ export class VersionControlService { sortSnapshotArr(inArr: SnapshotDTO[]): void { // Ascending sort on snapshotNumber inArr.sort((a, b) => - a.snapshotNumber > b.snapshotNumber + a.SnapshotNumber > b.SnapshotNumber ? 1 - : a.snapshotNumber < b.snapshotNumber + : a.SnapshotNumber < b.SnapshotNumber ? -1 : 0 ); @@ -155,9 +155,9 @@ export class VersionControlService { buildSnapshotVersion(snapshot: SnapshotDTO): VersionDTO { const tempDTO = new VersionDTO(); - tempDTO.content = snapshot.content; + tempDTO.content = snapshot.Content; tempDTO.isDiff = false; - tempDTO.fileID = snapshot.fileID; + tempDTO.fileID = snapshot.FileID; tempDTO.prevContent = ''; return tempDTO; @@ -180,7 +180,7 @@ export class VersionControlService { } buildDiffContext(diff: DiffDTO, snapshot: SnapshotDTO): string { - let retString = snapshot.content; + let retString = snapshot.Content; const tempArr = this.diffArr.filter((ele) => { return ele.DiffNumber < diff.DiffNumber; @@ -204,11 +204,11 @@ export class VersionControlService { snapshotRestore(snapshot: SnapshotDTO): void { this.snapshotArr = this.snapshotArr.filter((ele) => { - return ele.snapshotNumber <= snapshot.snapshotNumber; + return ele.SnapshotNumber <= snapshot.SnapshotNumber; }); this.diffArr = this.diffArr.filter((ele) => { - return ele.SnapshotNumber <= snapshot.snapshotNumber; + return ele.SnapshotNumber <= snapshot.SnapshotNumber; }); this.sortSnapshotArr(this.snapshotArr); @@ -217,7 +217,7 @@ export class VersionControlService { diffRestore(diff: DiffDTO): void { this.snapshotArr = this.snapshotArr.filter((ele) => { - return ele.snapshotNumber <= diff.SnapshotNumber; + return ele.SnapshotNumber <= diff.SnapshotNumber; }); this.diffArr = this.diffArr.filter((ele) => { @@ -278,7 +278,8 @@ export class VersionControlService { console.log(url); const body = new SnapshotDTO(); - body.fileID = fileID; + body.UserID = this.userService.getUserID() as number; + body.FileID = fileID; const headers = new HttpHeaders().set( 'Authorization', 'Bearer ' + this.userService.getAuthToken() From 871a5c6e9751ec216e947cf9cd76ffaa75473e6a Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Mon, 18 Sep 2023 16:51:33 +0200 Subject: [PATCH 068/186] FileID refactored to markdownID --- frontend/src/app/services/dto/diff.dto.ts | 4 ++-- frontend/src/app/services/dto/snapshot.dto.ts | 4 ++-- .../app/services/version.control.service.ts | 20 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/frontend/src/app/services/dto/diff.dto.ts b/frontend/src/app/services/dto/diff.dto.ts index 3d584e22..f2ab2948 100644 --- a/frontend/src/app/services/dto/diff.dto.ts +++ b/frontend/src/app/services/dto/diff.dto.ts @@ -1,13 +1,13 @@ export class DiffDTO { UserID: number; - FileID: string; + MarkdownID: string; DiffNumber: number; SnapshotNumber: number; Content: string; constructor() { this.UserID = 0; - this.FileID = ''; + this.MarkdownID = ''; this.DiffNumber = 0; this.SnapshotNumber = 0; this.Content = ''; diff --git a/frontend/src/app/services/dto/snapshot.dto.ts b/frontend/src/app/services/dto/snapshot.dto.ts index 421d3b4c..49eca70b 100644 --- a/frontend/src/app/services/dto/snapshot.dto.ts +++ b/frontend/src/app/services/dto/snapshot.dto.ts @@ -1,12 +1,12 @@ export class SnapshotDTO { UserID: number; - FileID: string; + MarkdownID: string; SnapshotNumber: number; Content: string; constructor() { this.UserID = 0; - this.FileID = ''; + this.MarkdownID = ''; this.SnapshotNumber = 0; this.Content = ''; } diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index ff761936..70558e04 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -61,7 +61,7 @@ export class VersionControlService { for (let element of snapshotPathArr) { this.http.get(element, { responseType: 'text' }).subscribe((data) => { var tempDTO = new SnapshotDTO(); - tempDTO.FileID = 'abc123'; + tempDTO.MarkdownID = 'abc123'; tempDTO.SnapshotNumber = +element.charAt(element.length - 1); tempDTO.Content = data; this.pushToSnapshotArr(tempDTO); @@ -71,7 +71,7 @@ export class VersionControlService { for (let element of diffPathArr) { this.http.get(element, { responseType: 'text' }).subscribe((data) => { var tempDTO = new DiffDTO(); - tempDTO.FileID = 'abc123'; + tempDTO.MarkdownID = 'abc123'; tempDTO.DiffNumber = +element.charAt(element.length - 1); tempDTO.SnapshotNumber = this.snapshotArr[0].SnapshotNumber; tempDTO.Content = data; @@ -157,7 +157,7 @@ export class VersionControlService { tempDTO.content = snapshot.Content; tempDTO.isDiff = false; - tempDTO.fileID = snapshot.FileID; + tempDTO.fileID = snapshot.MarkdownID; tempDTO.prevContent = ''; return tempDTO; @@ -167,7 +167,7 @@ export class VersionControlService { const tempDTO = new VersionDTO(); tempDTO.isDiff = true; - tempDTO.fileID = diff.FileID; + tempDTO.fileID = diff.MarkdownID; tempDTO.prevContent = this.buildDiffContext(diff, snapshot); const patches = this.DiffPatchService.patch_fromText(diff.Content); @@ -242,7 +242,7 @@ export class VersionControlService { }); } - sendSaveDiff(fileId: string, content: string): Observable> { + sendSaveDiff(markdownID: string, content: string): Observable> { const environmentURL = environment.apiURL; const url = `${environmentURL}version_control/save_diff`; console.log(url); @@ -250,7 +250,7 @@ export class VersionControlService { body.UserID = this.userService.getUserID() as number; body.Content = content; - body.FileID = fileId; + body.MarkdownID = markdownID; const headers = new HttpHeaders().set( 'Authorization', 'Bearer ' + this.userService.getAuthToken() @@ -258,9 +258,9 @@ export class VersionControlService { return this.http.post(url, body, { headers, observe: 'response' }); } - retrieveAllSnapshots(fileID: string): Promise { + retrieveAllSnapshots(markdownID: string): Promise { return new Promise((resolve, reject) => { - this.sendRetrieveAllSnapshots(fileID).subscribe({ + this.sendRetrieveAllSnapshots(markdownID).subscribe({ next: (response: HttpResponse) => { if (response.status === 200) { resolve(response.body); @@ -272,14 +272,14 @@ export class VersionControlService { }); } - sendRetrieveAllSnapshots(fileID: string): Observable> { + sendRetrieveAllSnapshots(markdownID: string): Observable> { const environmentURL = environment.apiURL; const url = `${environmentURL}version_control/get_all_snapshots`; console.log(url); const body = new SnapshotDTO(); body.UserID = this.userService.getUserID() as number; - body.FileID = fileID; + body.MarkdownID = markdownID; const headers = new HttpHeaders().set( 'Authorization', 'Bearer ' + this.userService.getAuthToken() From 445c3e1acdf48a4d7e6b6eb219f69442607fe956 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 16:56:55 +0200 Subject: [PATCH 069/186] Updated nomenclature --- frontend/src/app/services/dto/version.dto.ts | 16 ++++++------ .../app/services/version.control.service.ts | 26 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/frontend/src/app/services/dto/version.dto.ts b/frontend/src/app/services/dto/version.dto.ts index b6deb105..4cb051cf 100644 --- a/frontend/src/app/services/dto/version.dto.ts +++ b/frontend/src/app/services/dto/version.dto.ts @@ -1,13 +1,13 @@ export class VersionDTO { - fileID: string; - isDiff: boolean; - content: string; - prevContent: string; + MarkdownID: string; + IsDiff: boolean; + Content: string; + PrevContent: string; constructor() { - this.fileID = ''; - this.isDiff = true; - this.content = ''; - this.prevContent = ''; + this.MarkdownID = ''; + this.IsDiff = true; + this.Content = ''; + this.PrevContent = ''; } } diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index 70558e04..cdf28c60 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -133,20 +133,20 @@ export class VersionControlService { // Visualise snapshot const snapshotVersions = this.versionArr.filter((ele) => { - return !ele.isDiff; + return !ele.IsDiff; }); console.log(snapshotVersions); //Visualise diff const diffVersions = this.versionArr.filter((ele) => { - return ele.isDiff; + return ele.IsDiff; }); // Could optimise by saving pretty html somewhere on save for (let element of diffVersions) { let dpsDiff = this.DiffPatchService.diff_main( - element.prevContent, - element.content + element.PrevContent, + element.Content ); console.log(this.DiffPatchService.diff_prettyHtml(dpsDiff)); } @@ -155,10 +155,10 @@ export class VersionControlService { buildSnapshotVersion(snapshot: SnapshotDTO): VersionDTO { const tempDTO = new VersionDTO(); - tempDTO.content = snapshot.Content; - tempDTO.isDiff = false; - tempDTO.fileID = snapshot.MarkdownID; - tempDTO.prevContent = ''; + tempDTO.Content = snapshot.Content; + tempDTO.IsDiff = false; + tempDTO.MarkdownID = snapshot.MarkdownID; + tempDTO.PrevContent = ''; return tempDTO; } @@ -166,14 +166,14 @@ export class VersionControlService { buildDiffVersion(diff: DiffDTO, snapshot: SnapshotDTO): VersionDTO { const tempDTO = new VersionDTO(); - tempDTO.isDiff = true; - tempDTO.fileID = diff.MarkdownID; - tempDTO.prevContent = this.buildDiffContext(diff, snapshot); + tempDTO.IsDiff = true; + tempDTO.MarkdownID = diff.MarkdownID; + tempDTO.PrevContent = this.buildDiffContext(diff, snapshot); const patches = this.DiffPatchService.patch_fromText(diff.Content); - tempDTO.content = this.DiffPatchService.patch_apply( + tempDTO.Content = this.DiffPatchService.patch_apply( patches, - tempDTO.prevContent + tempDTO.PrevContent )[0]; return tempDTO; From a04062bb57ca23dc7c620da48aeaafbdafd3fc9b Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Mon, 18 Sep 2023 17:00:36 +0200 Subject: [PATCH 070/186] Logging response from retrieve all snapshots --- frontend/src/app/services/version.control.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index cdf28c60..a5961393 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -262,6 +262,7 @@ export class VersionControlService { return new Promise((resolve, reject) => { this.sendRetrieveAllSnapshots(markdownID).subscribe({ next: (response: HttpResponse) => { + console.log(response); if (response.status === 200) { resolve(response.body); } else { From 95d9c1fa8034c22cc6254d083e84a94640fd56ce Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 17:35:53 +0200 Subject: [PATCH 071/186] Created version_history dto --- .../src/version_control/dto/version_history.dto.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 backend/src/version_control/dto/version_history.dto.ts diff --git a/backend/src/version_control/dto/version_history.dto.ts b/backend/src/version_control/dto/version_history.dto.ts new file mode 100644 index 00000000..70d728d8 --- /dev/null +++ b/backend/src/version_control/dto/version_history.dto.ts @@ -0,0 +1,12 @@ +import { DiffDTO } from '../../diffs/dto/diffs.dto'; +import { SnapshotDTO } from '../../snapshots/dto/snapshot.dto'; + +export class VersionHistoryDTO { + DiffHistory: DiffDTO[]; + SnapshotHistory: SnapshotDTO[]; + + constructor() { + this.DiffHistory = undefined; + this.SnapshotHistory = undefined; + } +} From c3c5d9a966db9ac880aa7ad391fdecb7636a4e1d Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Mon, 18 Sep 2023 17:41:52 +0200 Subject: [PATCH 072/186] Refactored obj naming --- frontend/src/app/edit/edit.component.html | 4 ++-- frontend/src/app/edit/edit.component.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/edit/edit.component.html b/frontend/src/app/edit/edit.component.html index ea3901c6..921fea19 100644 --- a/frontend/src/app/edit/edit.component.html +++ b/frontend/src/app/edit/edit.component.html @@ -248,8 +248,8 @@

History

-

{{obj.name}}

-

{{obj.date}}

+

{{obj.Name}}

+

{{obj.DateCreated}}

diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 1cb362e8..8236017a 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -498,7 +498,7 @@ export class EditComponent implements AfterViewInit, OnInit { async refreshSidebarHistory() { this.history = []; this.history=await this.versionControlService.retrieveAllSnapshots(this.editService.getMarkdownID() as string); - + } pageBreak() { @@ -606,13 +606,13 @@ export class EditComponent implements AfterViewInit, OnInit { insertContent(obj: any) { this.deselectAllHistory(); obj.isCurrent = true; - if(obj.id === 'LATEST') { + if(obj.SnapshotID === 'LATEST') { this.disableReadOnly(); - this.editor.setData(obj.html); + this.editor.setData(obj.Content); return; } this.enableReadOnly(); - this.editor.setData(obj.html); + this.editor.setData(obj.Content); } deselectAllHistory() { From aa48b652e04e13a9fbc2e914334da09324cdb8bd Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Mon, 18 Sep 2023 17:42:08 +0200 Subject: [PATCH 073/186] Added retrieve all history endpoint --- .../app/services/version.control.service.ts | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index a5961393..bc649112 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -287,4 +287,33 @@ export class VersionControlService { ); return this.http.post(url, body, { headers, observe: 'response' }); } + + retrieveAllHistory(markdownID: string): Promise { + return new Promise((resolve, reject) => { + this.sendRetrieveAllHistory(markdownID).subscribe({ + next: (response: HttpResponse) => { + console.log(response); + if (response.status === 200) { + resolve(response.body); + } else { + resolve(null); + } + }, + }); + }); + } + + sendRetrieveAllHistory(markdownID: string): Observable> { + const environmentURL = environment.apiURL; + const url = `${environmentURL}version_control/load_history`; + console.log(url); + const body = new MarkdownFileDTO(); + + body.MarkdownID = markdownID; + const headers = new HttpHeaders().set( + 'Authorization', + 'Bearer ' + this.userService.getAuthToken() + ); + return this.http.post(url, body, { headers, observe: 'response' }); + } } From 4dcc3b92efb7567715b69fa01c1fe5c57b835c30 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Mon, 18 Sep 2023 18:06:08 +0200 Subject: [PATCH 074/186] Calling retrieve all history --- frontend/src/app/edit/edit.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 8236017a..76c2f47e 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -497,7 +497,7 @@ export class EditComponent implements AfterViewInit, OnInit { async refreshSidebarHistory() { this.history = []; - this.history=await this.versionControlService.retrieveAllSnapshots(this.editService.getMarkdownID() as string); + this.history=await this.versionControlService.retrieveAllHistory(this.editService.getMarkdownID() as string); } From f0687d2e1a073f3927e010fb42d80419dae58f9b Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Mon, 18 Sep 2023 18:20:35 +0200 Subject: [PATCH 075/186] Added userid field to retrieve all history --- frontend/src/app/services/version.control.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index bc649112..c4259069 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -309,6 +309,7 @@ export class VersionControlService { console.log(url); const body = new MarkdownFileDTO(); + body.UserID = this.userService.getUserID() as number; body.MarkdownID = markdownID; const headers = new HttpHeaders().set( 'Authorization', From 52233dde02f99a68cecf80f0d9ab2bce6f7dd177 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 18:22:27 +0200 Subject: [PATCH 076/186] Changed parameter for updateDiff --- backend/src/diffs/diffs.service.ts | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/backend/src/diffs/diffs.service.ts b/backend/src/diffs/diffs.service.ts index 1d6002d3..eb1a6ad1 100644 --- a/backend/src/diffs/diffs.service.ts +++ b/backend/src/diffs/diffs.service.ts @@ -13,10 +13,10 @@ export class DiffsService { private diffRepository: Repository, ) {} - async updateDiff(nextDiffID: number) { + async updateDiff(diffID: string) { const diff = await this.diffRepository.findOne({ - where: { S3DiffID: nextDiffID }, + where: { DiffID: diffID }, }); diff.LastModified = new Date(); @@ -48,9 +48,21 @@ export class DiffsService { await this.diffRepository.insert(diffRecords); } - async deleteDiffs(markdownFileDTO: MarkdownFileDTO) { + async deleteDiffs( + markdownFileDTO: MarkdownFileDTO, + ) { await this.diffRepository.delete({ MarkdownID: markdownFileDTO.MarkdownID, }); } + + async getAllDiffs( + markdownFileDTO: MarkdownFileDTO, + ) { + return await this.diffRepository.find({ + where: { + MarkdownID: markdownFileDTO.MarkdownID, + }, + }); + } } From 417ef525b0cbbf47f22bcc64f1640f8326dd0ac7 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 18:23:10 +0200 Subject: [PATCH 077/186] Added function: retrieveAllSnapshots --- backend/src/s3/s3.service.ts | 43 +++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/backend/src/s3/s3.service.ts b/backend/src/s3/s3.service.ts index 566d9faa..a9092c12 100644 --- a/backend/src/s3/s3.service.ts +++ b/backend/src/s3/s3.service.ts @@ -108,7 +108,7 @@ export class S3Service { 'S3 content file creation error: ' + err, ); return undefined; - }; + } markdownFileDTO.Content = ''; markdownFileDTO.Size = 0; @@ -425,6 +425,47 @@ export class S3Service { ///===---------------------------------------------------- + async retrieveAllSnapshots( + logicalOrder: number[], + snapshotDTO: SnapshotDTO, + ) { + const filePath = `${snapshotDTO.UserID}/${snapshotDTO.MarkdownID}`; + + let snapshotDTOs: SnapshotDTO[] = []; + + for ( + let i = 0; + i < logicalOrder.length; + i++ + ) { + console.log( + 'Trying to retrieve snapshot on path ', + `${filePath}/snapshot/${logicalOrder[i]}`, + ); + try { + const response = await this.s3Client.send( + new GetObjectCommand({ + Bucket: this.awsS3BucketName, + Key: `${filePath}/snapshot/${logicalOrder[i]}`, + }), + ); + + const snapshotDTO = new SnapshotDTO(); + snapshotDTO.Content = + await response.Body.transformToString(); + snapshotDTOs.push(snapshotDTO); + } catch (err) { + console.log( + `S3 snapshot ${i} read error: ` + err, + ); + return undefined; + } + } + return snapshotDTOs; + } + + ///===---------------------------------------------------- + async createAsset(assetDTO: AssetDTO) { // Generate new AssetID const newAssetDTO = new AssetDTO(); From 516d8c8a2cf314e927c355aa3b94ed09d257d806 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 18:24:21 +0200 Subject: [PATCH 078/186] Implemented load_history endpoint --- .../version_control.controller.ts | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/backend/src/version_control/version_control.controller.ts b/backend/src/version_control/version_control.controller.ts index b4fda562..40ef745b 100644 --- a/backend/src/version_control/version_control.controller.ts +++ b/backend/src/version_control/version_control.controller.ts @@ -1,16 +1,25 @@ import { Body, Controller, + HttpCode, + HttpStatus, Post, } from '@nestjs/common'; import { VersionControlService } from './version_control.service'; import { DiffDTO } from '../diffs/dto/diffs.dto'; import { SnapshotDTO } from '../snapshots/dto/snapshot.dto'; +import { MarkdownFileDTO } from 'src/markdown_files/dto/markdown_file.dto'; +import { VersionHistoryDTO } from './dto/version_history.dto'; +import { version } from 'os'; +import { SnapshotService } from '../snapshots/snapshots.service'; +import { DiffsService } from '../diffs/diffs.service'; @Controller('version_control') export class VersionControlController { constructor( private readonly versionControlService: VersionControlService, + private readonly snapshotService: SnapshotService, + private readonly diffService: DiffsService, ) {} ///===---------------------------------------------------- @@ -46,4 +55,53 @@ export class VersionControlController { snapshotDTO, ); } + + ///===---------------------------------------------------- + + @Post('get_all_snapshots') + @HttpCode(HttpStatus.OK) + getAllSnapshots( + @Body() snapshotDTO: SnapshotDTO, + ) { + return this.versionControlService.getAllSnapshots( + snapshotDTO, + ); + } + + ///===---------------------------------------------------- + + @Post('load_history') + @HttpCode(HttpStatus.OK) + async loadHistory( + @Body() markdownFileDTO: MarkdownFileDTO, + ) { + const versionHistoryDTO = + new VersionHistoryDTO(); + + const snapshots = + await this.snapshotService.getAllSnapshots( + markdownFileDTO, + ); + + const snapshotDTOs = + await this.versionControlService.convertSnapshotsToSnapshotDTOs( + snapshots, + ); + + versionHistoryDTO.SnapshotHistory = + snapshotDTOs; + + const diffs = + await this.diffService.getAllDiffs( + markdownFileDTO, + ); + + const diffDTOs = + await this.versionControlService.convertDiffsToDiffDTOs( + diffs, + ); + + versionHistoryDTO.DiffHistory = diffDTOs; + return versionHistoryDTO; + } } From de6a8a40f79304e9f9f265df2b63cf12813dc149 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 18:24:39 +0200 Subject: [PATCH 079/186] Added function: getAllSnapshots --- .../version_control.service.ts | 107 ++++++++++++++---- 1 file changed, 88 insertions(+), 19 deletions(-) diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index bda22efc..b6f89a6d 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -5,11 +5,15 @@ import { MarkdownFilesService } from '../markdown_files/markdown_files.service'; import { S3ServiceMock } from '../s3/__mocks__/s3.service'; import { S3Service } from '../s3/s3.service'; import { SnapshotDTO } from '../snapshots/dto/snapshot.dto'; +import { SnapshotService } from '../snapshots/snapshots.service'; +import { Snapshot } from '../snapshots/entities/snapshots.entity'; +import { Diff } from '../diffs/entities/diffs.entity'; @Injectable() export class VersionControlService { constructor( private diffService: DiffsService, + private snapshotService: SnapshotService, private markdownFileService: MarkdownFilesService, private s3Service: S3Service, private s3ServiceMock: S3ServiceMock, @@ -25,10 +29,6 @@ export class VersionControlService { this.s3Service.saveDiff(diffDTO, nextDiffID); - console.log( - '[versionControlService.saveDiff] Saved diff in s3', - ); - if ( nextDiffID % parseInt( @@ -37,22 +37,16 @@ export class VersionControlService { 0 && nextDiffID !== 0 ) { - // create snapshot + // TODO @Dylan create snapshot } - await this.diffService.updateDiff(nextDiffID); - - console.log( - '[versionControlService.saveDiff] Updated diff in db', + await this.diffService.updateDiff( + diffDTO.DiffID, ); await this.markdownFileService.incrementNextDiffID( diffDTO.MarkdownID, ); - - console.log( - '[versionControlService.saveDiff] Incremented nextDiffID in db', - ); } ///===----------------------------------------------------- @@ -78,9 +72,10 @@ export class VersionControlService { nextSnapshotID, ); - await this.diffService.updateDiff( - nextSnapshotID, + await this.snapshotService.updateSnapshot( + snapshotDTO.SnapshotID, ); + await this.markdownFileService.incrementNextDiffID( snapshotDTO.MarkdownID, ); @@ -99,10 +94,38 @@ export class VersionControlService { * * @returns all snapshots for this file, in logical order */ - getAllSnapshots() { - // calls s3Service.getAllSnapshots() - // reorders snapshots in logical order - // return logically ordered snapshots + async getAllSnapshots( + snapshotDTO: SnapshotDTO, + ) { + const snapshotRange = Array.from( + { + length: parseInt( + process.env.MAX_SNAPSHOTS, + ), + }, + (_, index) => index, + ); + + const nextSnapshotID = + await this.markdownFileService.getNextSnapshotID( + snapshotDTO.MarkdownID, + ); + + const logicalOrder = this.getLogicalOrder( + snapshotRange, + nextSnapshotID, + ); + + let snapshots = + await this.s3Service.retrieveAllSnapshots( + logicalOrder, + snapshotDTO, + ); + + snapshots = + this.pruneEmptySnapshots(snapshots); + + return snapshots; } ///===---------------------------------------------------- @@ -147,4 +170,50 @@ export class VersionControlService { } return logicalOrder; } + + ///===----------------------------------------------------- + + pruneEmptySnapshots(snapshots: SnapshotDTO[]) { + return snapshots.filter((snapshot) => { + return ( + snapshot.Content !== undefined && + snapshot.Content !== null && + snapshot.Content !== '' + ); + }); + } + + ///===---------------------------------------------------- + + async convertSnapshotsToSnapshotDTOs(snapshots: Snapshot[]) { + const snapshotDTOs = []; + for (let i = 0; i < snapshots.length; i++) { + const snapshot = snapshots[i]; + const snapshotDTO = new SnapshotDTO(); + snapshotDTO.SnapshotID = snapshot.SnapshotID; + snapshotDTO.MarkdownID = snapshot.MarkdownID; + snapshotDTO.UserID = snapshot.UserID; + snapshotDTO.S3SnapshotID = snapshot.S3SnapshotID; + snapshotDTO.LastModified = snapshot.LastModified; + snapshotDTOs.push(snapshotDTO); + } + return snapshotDTOs; + } + + ///===---------------------------------------------------- + + async convertDiffsToDiffDTOs(diffs: Diff[]) { + const diffDTOs = []; + for (let i = 0; i < diffs.length; i++) { + const diff = diffs[i]; + const diffDTO = new DiffDTO(); + diffDTO.DiffID = diff.DiffID; + diffDTO.MarkdownID = diff.MarkdownID; + diffDTO.UserID = diff.UserID; + diffDTO.S3DiffID = diff.S3DiffID; + diffDTO.LastModified = diff.LastModified; + diffDTOs.push(diffDTO); + } + return diffDTOs; + } } From b3e806270601f18fcd146afc28408d0bd8398ebd Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Mon, 18 Sep 2023 18:24:57 +0200 Subject: [PATCH 080/186] Added function: getAllSnapshots --- backend/src/snapshots/snapshots.service.ts | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/backend/src/snapshots/snapshots.service.ts b/backend/src/snapshots/snapshots.service.ts index 64406dd6..c1f113f7 100644 --- a/backend/src/snapshots/snapshots.service.ts +++ b/backend/src/snapshots/snapshots.service.ts @@ -12,6 +12,8 @@ export class SnapshotService { private snapshotRepository: Repository, ) {} + ///===----------------------------------------------------- + async createSnapshots( markdownFileDTO: MarkdownFileDTO, ) { @@ -39,6 +41,28 @@ export class SnapshotService { ); } + ///===----------------------------------------------------- + + async updateSnapshot( + snapshotID: string, + ) { + + } + + ///===----------------------------------------------------- + + async getAllSnapshots( + markdownFileDTO: MarkdownFileDTO, + ) { + return await this.snapshotRepository.find({ + where: { + MarkdownID: markdownFileDTO.MarkdownID, + }, + }); + } + + ///===----------------------------------------------------- + async deleteSnapshots( markdownFileDTO: MarkdownFileDTO, ) { From 5939bd976cde971a2fcbb20b5d4211ea9ae614ea Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Mon, 18 Sep 2023 18:36:20 +0200 Subject: [PATCH 081/186] Outputting all history in one array --- frontend/src/app/edit/edit.component.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 76c2f47e..3f4723c4 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -497,8 +497,9 @@ export class EditComponent implements AfterViewInit, OnInit { async refreshSidebarHistory() { this.history = []; - this.history=await this.versionControlService.retrieveAllHistory(this.editService.getMarkdownID() as string); - + const data=await this.versionControlService.retrieveAllHistory(this.editService.getMarkdownID() as string); + this.history=data.SnapshotHistory.concat(data.DiffHistory); + } pageBreak() { From bc50ed187d08787b1e368252ebc348874891bec3 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 19 Sep 2023 08:04:35 +0200 Subject: [PATCH 082/186] Added HasBeenUsed attribute --- backend/src/diffs/entities/diffs.entity.ts | 5 ++++- backend/src/snapshots/entities/snapshots.entity.ts | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/src/diffs/entities/diffs.entity.ts b/backend/src/diffs/entities/diffs.entity.ts index 3d69ad46..bef3518c 100644 --- a/backend/src/diffs/entities/diffs.entity.ts +++ b/backend/src/diffs/entities/diffs.entity.ts @@ -23,5 +23,8 @@ export class Diff { default: () => 'CURRENT_TIMESTAMP(3)', onUpdate: 'CURRENT_TIMESTAMP(3)', }) - LastModified: Date; + LastModified: Date; + + @Column() + HasBeenUsed: boolean; } diff --git a/backend/src/snapshots/entities/snapshots.entity.ts b/backend/src/snapshots/entities/snapshots.entity.ts index 11f80275..47892d59 100644 --- a/backend/src/snapshots/entities/snapshots.entity.ts +++ b/backend/src/snapshots/entities/snapshots.entity.ts @@ -24,4 +24,7 @@ export class Snapshot { onUpdate: 'CURRENT_TIMESTAMP(3)', }) LastModified: Date; + + @Column() + HasBeenUsed: boolean; } From 4edd44791bf7d678e869f602de28acdafce34a54 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 19 Sep 2023 08:08:33 +0200 Subject: [PATCH 083/186] Retrieve only initialised diffs --- backend/src/diffs/diffs.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/diffs/diffs.service.ts b/backend/src/diffs/diffs.service.ts index eb1a6ad1..586f333d 100644 --- a/backend/src/diffs/diffs.service.ts +++ b/backend/src/diffs/diffs.service.ts @@ -62,6 +62,7 @@ export class DiffsService { return await this.diffRepository.find({ where: { MarkdownID: markdownFileDTO.MarkdownID, + HasBeenUsed: true, }, }); } From 74e2f4c540293444f120eb8ce2bf879f707e1a48 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 19 Sep 2023 08:08:45 +0200 Subject: [PATCH 084/186] Retrieve only initialised snapshots --- backend/src/snapshots/snapshots.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/snapshots/snapshots.service.ts b/backend/src/snapshots/snapshots.service.ts index c1f113f7..32e43d21 100644 --- a/backend/src/snapshots/snapshots.service.ts +++ b/backend/src/snapshots/snapshots.service.ts @@ -68,6 +68,7 @@ export class SnapshotService { ) { await this.snapshotRepository.delete({ MarkdownID: markdownFileDTO.MarkdownID, + HasBeenUsed: true, }); } } From ca84fd7a20061042a78bf953acf303e43ab5c99a Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 19 Sep 2023 12:16:27 +0200 Subject: [PATCH 085/186] Fixed .env reference to MAX_SNAPSHOTS --- backend/src/s3/s3.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/s3/s3.service.ts b/backend/src/s3/s3.service.ts index a9092c12..de153f08 100644 --- a/backend/src/s3/s3.service.ts +++ b/backend/src/s3/s3.service.ts @@ -381,7 +381,7 @@ export class S3Service { const filePath = `${markdownFileDTO.UserID}/${markdownFileDTO.MarkdownID}`; for ( let i = 0; - i < parseInt(process.env.SNAPSHOTS); + i < parseInt(process.env.MAX_SNAPSHOTS); i++ ) { try { From 30c0db2e7b6b64fb5f9417ba93e2ad9de53a690b Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 19 Sep 2023 12:38:31 +0200 Subject: [PATCH 086/186] Provided default value for new attribute: HasBeenUsed --- backend/src/diffs/diffs.service.ts | 1 + backend/src/snapshots/snapshots.service.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/backend/src/diffs/diffs.service.ts b/backend/src/diffs/diffs.service.ts index 586f333d..41d0eb19 100644 --- a/backend/src/diffs/diffs.service.ts +++ b/backend/src/diffs/diffs.service.ts @@ -43,6 +43,7 @@ export class DiffsService { MarkdownID: markdownFileDTO.MarkdownID, UserID: markdownFileDTO.UserID, S3DiffID: i, + HasBeenUsed: false, }); } await this.diffRepository.insert(diffRecords); diff --git a/backend/src/snapshots/snapshots.service.ts b/backend/src/snapshots/snapshots.service.ts index 32e43d21..6bd466df 100644 --- a/backend/src/snapshots/snapshots.service.ts +++ b/backend/src/snapshots/snapshots.service.ts @@ -34,6 +34,7 @@ export class SnapshotService { MarkdownID: markdownFileDTO.MarkdownID, UserID: markdownFileDTO.UserID, S3SnapshotID: i, + HasBeenUsed: false, }); } await this.snapshotRepository.insert( From 6ea96755abda7ad5906d71647a18f76a8957fa6b Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 19 Sep 2023 12:45:12 +0200 Subject: [PATCH 087/186] On first update, set HasBeenUsed to true --- backend/src/diffs/diffs.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/diffs/diffs.service.ts b/backend/src/diffs/diffs.service.ts index 41d0eb19..faba8741 100644 --- a/backend/src/diffs/diffs.service.ts +++ b/backend/src/diffs/diffs.service.ts @@ -20,6 +20,7 @@ export class DiffsService { }); diff.LastModified = new Date(); + diff.HasBeenUsed = true; await this.diffRepository.save(diff); } From ff1968b384cb9329242e89ef5f7478618efe7e53 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 19 Sep 2023 12:48:26 +0200 Subject: [PATCH 088/186] Added support for new attribute HasBeenUsed --- backend/src/snapshots/snapshots.service.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/backend/src/snapshots/snapshots.service.ts b/backend/src/snapshots/snapshots.service.ts index 6bd466df..a9bcd2c1 100644 --- a/backend/src/snapshots/snapshots.service.ts +++ b/backend/src/snapshots/snapshots.service.ts @@ -44,10 +44,15 @@ export class SnapshotService { ///===----------------------------------------------------- - async updateSnapshot( - snapshotID: string, - ) { - + async updateSnapshot(snapshotID: string) { + const snapshot = + await this.snapshotRepository.findOne({ + where: { SnapshotID: snapshotID }, + }); + + snapshot.LastModified = new Date(); + snapshot.HasBeenUsed = true; + await this.snapshotRepository.save(snapshot); } ///===----------------------------------------------------- @@ -58,6 +63,7 @@ export class SnapshotService { return await this.snapshotRepository.find({ where: { MarkdownID: markdownFileDTO.MarkdownID, + HasBeenUsed: true, }, }); } From 44dc482ce441b4451376037145cf6b8f3af6c66d Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Tue, 19 Sep 2023 12:53:37 +0200 Subject: [PATCH 089/186] Now using last modified field --- frontend/src/app/edit/edit.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/edit/edit.component.html b/frontend/src/app/edit/edit.component.html index 921fea19..14131593 100644 --- a/frontend/src/app/edit/edit.component.html +++ b/frontend/src/app/edit/edit.component.html @@ -249,7 +249,7 @@

History

{{obj.Name}}

-

{{obj.DateCreated}}

+

{{obj.LastModified}}

From e5e160c1a1ec59b9a05dbac74f3655edb24e46a4 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Tue, 19 Sep 2023 13:03:25 +0200 Subject: [PATCH 090/186] Testing data sent on save_diff --- frontend/src/app/services/version.control.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index c4259069..f1356af2 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -255,6 +255,7 @@ export class VersionControlService { 'Authorization', 'Bearer ' + this.userService.getAuthToken() ); + console.log(body); return this.http.post(url, body, { headers, observe: 'response' }); } From e6eeae5067db05a3800ac7c4721331ea9101aafd Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Tue, 19 Sep 2023 13:04:21 +0200 Subject: [PATCH 091/186] Reformatted the way in which history gets stored --- frontend/src/app/edit/edit.component.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 3f4723c4..bc07509f 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -498,7 +498,21 @@ export class EditComponent implements AfterViewInit, OnInit { async refreshSidebarHistory() { this.history = []; const data=await this.versionControlService.retrieveAllHistory(this.editService.getMarkdownID() as string); - this.history=data.SnapshotHistory.concat(data.DiffHistory); + const snapshot=data.SnapshotHistory; + const diff=data.DiffHistory; + + for(let i = 0; i < snapshot.length; i++) { + snapshot[i].LastModified = this.formatDate(snapshot[i].LastModified); + snapshot[i].Name = "Snapshot " + i; + for(let j = 0; j < diff.length; j++) { + if(snapshot[i].SnapshotID === diff[j].SnapshotID) { + snapshot[i].ChildDiff = diff[j]; + diff[j].LastModified = this.formatDate(diff[j].LastModified); + diff[j].Name = "Diff " + j; + } + } + } + this.history=snapshot; } From dc71036776752c40ed4b2222d5cea13375d84054 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Tue, 19 Sep 2023 13:44:00 +0200 Subject: [PATCH 092/186] Update to dto --- frontend/src/app/services/dto/diff.dto.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/app/services/dto/diff.dto.ts b/frontend/src/app/services/dto/diff.dto.ts index f2ab2948..b4cd40c3 100644 --- a/frontend/src/app/services/dto/diff.dto.ts +++ b/frontend/src/app/services/dto/diff.dto.ts @@ -4,6 +4,7 @@ export class DiffDTO { DiffNumber: number; SnapshotNumber: number; Content: string; + SnapshotPayload: string; constructor() { this.UserID = 0; @@ -11,5 +12,6 @@ export class DiffDTO { this.DiffNumber = 0; this.SnapshotNumber = 0; this.Content = ''; + this.SnapshotPayload = ''; } } From 8d45e005cd2e29f42ef50fecb5ce68ebe0908914 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Tue, 19 Sep 2023 13:47:44 +0200 Subject: [PATCH 093/186] Now sending snapshotpayload on save diff --- frontend/src/app/edit/edit.component.ts | 2 +- frontend/src/app/services/version.control.service.ts | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index bc07509f..db452195 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -258,7 +258,7 @@ export class EditComponent implements AfterViewInit, OnInit { console.log(this.editor.getData()); const diff = this.versionControlService.getReadablePatch(this.prevVersion as string, this.editor.getData()); console.log(diff); - this.versionControlService.saveDiff(this.editService.getMarkdownID() as string,diff); + this.versionControlService.saveDiff(this.editService.getMarkdownID() as string,diff, this.editor.getData()); this.prevVersion = this.editor.getData(); let contents = this.editor.getData(); let pass = this.editService.getDocumentPassword(); diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index f1356af2..d27e1d06 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -228,9 +228,9 @@ export class VersionControlService { this.sortDiffArr(this.diffArr); } - saveDiff(fileID: string, content: string): Promise { + saveDiff(fileID: string, content: string, snapshotPayload:string): Promise { return new Promise((resolve, reject) => { - this.sendSaveDiff(fileID, content).subscribe({ + this.sendSaveDiff(fileID, content, snapshotPayload).subscribe({ next: (response: HttpResponse) => { if (response.status === 200) { resolve(true); @@ -242,7 +242,7 @@ export class VersionControlService { }); } - sendSaveDiff(markdownID: string, content: string): Observable> { + sendSaveDiff(markdownID: string, content: string, snapshotPayload:string): Observable> { const environmentURL = environment.apiURL; const url = `${environmentURL}version_control/save_diff`; console.log(url); @@ -251,6 +251,7 @@ export class VersionControlService { body.UserID = this.userService.getUserID() as number; body.Content = content; body.MarkdownID = markdownID; + body.SnapshotPayload = snapshotPayload; const headers = new HttpHeaders().set( 'Authorization', 'Bearer ' + this.userService.getAuthToken() From 2283f8ceee9965c5298939f1e5b6b4a29c15bc1a Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 19 Sep 2023 14:04:46 +0200 Subject: [PATCH 094/186] Added SnapshotID field in dto --- backend/src/diffs/dto/diffs.dto.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backend/src/diffs/dto/diffs.dto.ts b/backend/src/diffs/dto/diffs.dto.ts index 10f2bd1e..4cdad6c3 100644 --- a/backend/src/diffs/dto/diffs.dto.ts +++ b/backend/src/diffs/dto/diffs.dto.ts @@ -6,6 +6,8 @@ export class DiffDTO { S3DiffID: number; LastModified: Date; Content: string; + SnapshotPayload: string; + SnapshotID: string; constructor() { this.DiffID = undefined; @@ -15,5 +17,7 @@ export class DiffDTO { this.S3DiffID = undefined; this.LastModified = undefined; this.Content = undefined; + this.SnapshotPayload = undefined; + this.SnapshotID = undefined; } } From 3d8db8f81d6cd0a419597eeba77b0e5f49887cb4 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 19 Sep 2023 14:14:23 +0200 Subject: [PATCH 095/186] Added logic for returning snapshots to the frontend --- backend/src/diffs/diffs.service.ts | 11 +++- backend/src/s3/s3.service.ts | 8 +-- backend/src/snapshots/snapshots.service.ts | 10 +++- .../version_control.controller.ts | 39 ++++++++------ .../version_control.service.ts | 51 ++++++++++++++----- 5 files changed, 82 insertions(+), 37 deletions(-) diff --git a/backend/src/diffs/diffs.service.ts b/backend/src/diffs/diffs.service.ts index faba8741..82334c75 100644 --- a/backend/src/diffs/diffs.service.ts +++ b/backend/src/diffs/diffs.service.ts @@ -5,6 +5,7 @@ import { Diff } from './entities/diffs.entity'; import 'dotenv/config'; import * as CryptoJS from 'crypto-js'; import { MarkdownFileDTO } from '../markdown_files/dto/markdown_file.dto'; +import { DiffDTO } from './dto/diffs.dto'; @Injectable() export class DiffsService { @@ -13,10 +14,16 @@ export class DiffsService { private diffRepository: Repository, ) {} - async updateDiff(diffID: string) { + async updateDiff( + diffDTO: DiffDTO, + nextDiffID: number, + ) { const diff = await this.diffRepository.findOne({ - where: { DiffID: diffID }, + where: { + MarkdownID: diffDTO.MarkdownID, + S3DiffID: nextDiffID, + }, }); diff.LastModified = new Date(); diff --git a/backend/src/s3/s3.service.ts b/backend/src/s3/s3.service.ts index de153f08..5d490b8e 100644 --- a/backend/src/s3/s3.service.ts +++ b/backend/src/s3/s3.service.ts @@ -403,24 +403,24 @@ export class S3Service { ///===---------------------------------------------------- async saveSnapshot( - snapshotDTO: SnapshotDTO, + diffDTO: DiffDTO, nextSnapshotID: number, ) { - const filePath = `${snapshotDTO.UserID}/${snapshotDTO.MarkdownID}`; + const filePath = `${diffDTO.UserID}/${diffDTO.MarkdownID}`; try { await this.s3Client.send( new PutObjectCommand({ Bucket: this.awsS3BucketName, Key: `${filePath}/snapshot/${nextSnapshotID}`, - Body: snapshotDTO.Content, + Body: diffDTO.SnapshotPayload, }), ); } catch (err) { console.log('Write File Error: ' + err); return undefined; } - return snapshotDTO; + return diffDTO; } ///===---------------------------------------------------- diff --git a/backend/src/snapshots/snapshots.service.ts b/backend/src/snapshots/snapshots.service.ts index a9bcd2c1..599a2419 100644 --- a/backend/src/snapshots/snapshots.service.ts +++ b/backend/src/snapshots/snapshots.service.ts @@ -44,10 +44,16 @@ export class SnapshotService { ///===----------------------------------------------------- - async updateSnapshot(snapshotID: string) { + async updateSnapshot( + markdownID: string, + nextSnapshotID: number, + ) { const snapshot = await this.snapshotRepository.findOne({ - where: { SnapshotID: snapshotID }, + where: { + MarkdownID: markdownID, + S3SnapshotID: nextSnapshotID, + }, }); snapshot.LastModified = new Date(); diff --git a/backend/src/version_control/version_control.controller.ts b/backend/src/version_control/version_control.controller.ts index 40ef745b..44f8c167 100644 --- a/backend/src/version_control/version_control.controller.ts +++ b/backend/src/version_control/version_control.controller.ts @@ -31,30 +31,39 @@ export class VersionControlController { ///===---------------------------------------------------- - @Post('get_diff') - getDiff(@Body() diffDTO: DiffDTO) { - return this.versionControlService.getDiff( - diffDTO, - ); - } + // @Post('get_diff') + // getDiff(@Body() diffDTO: DiffDTO) { + // return this.versionControlService.getDiff( + // diffDTO, + // ); + // } + + // ///===---------------------------------------------------- + + // @Post('get_all_diffs') + // getAllDiffs(@Body() snapshotDTO: SnapshotDTO) { + // return this.versionControlService.getAllDiffsForSnapshot( + // snapshotDTO, + // ); + // } ///===---------------------------------------------------- - @Post('get_all_diffs') - getAllDiffs(@Body() snapshotDTO: SnapshotDTO) { - return this.versionControlService.getAllDiffsForSnapshot( + @Post('get_diff_set') + getDiffSet(@Body() snapshotDTO: SnapshotDTO) { + return this.versionControlService.getDiffSetForSnapshot( snapshotDTO, ); } ///===---------------------------------------------------- - @Post('save_snapshot') - saveSnapshot(@Body() snapshotDTO: SnapshotDTO) { - this.versionControlService.saveSnapshot( - snapshotDTO, - ); - } + // @Post('save_snapshot') + // saveSnapshot(@Body() snapshotDTO: SnapshotDTO) { + // this.versionControlService.saveSnapshot( + // snapshotDTO, + // ); + // } ///===---------------------------------------------------- diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index b6f89a6d..288dfc00 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -37,11 +37,12 @@ export class VersionControlService { 0 && nextDiffID !== 0 ) { - // TODO @Dylan create snapshot + this.saveSnapshot(diffDTO); } await this.diffService.updateDiff( - diffDTO.DiffID, + diffDTO, + nextDiffID, ); await this.markdownFileService.incrementNextDiffID( @@ -61,29 +62,30 @@ export class VersionControlService { ///===----------------------------------------------------- - async saveSnapshot(snapshotDTO: SnapshotDTO) { + async saveSnapshot(diffDTO: DiffDTO) { const nextSnapshotID = await this.markdownFileService.getNextSnapshotID( - snapshotDTO.MarkdownID, + diffDTO.MarkdownID, ); this.s3Service.saveSnapshot( - snapshotDTO, + diffDTO, nextSnapshotID, ); await this.snapshotService.updateSnapshot( - snapshotDTO.SnapshotID, + diffDTO.MarkdownID, + nextSnapshotID, ); - await this.markdownFileService.incrementNextDiffID( - snapshotDTO.MarkdownID, + await this.markdownFileService.incrementNextSnapshotID( + diffDTO.MarkdownID, ); } ///===----------------------------------------------------- - getSnapshot() {} + getDiffSetForSnapshot(snapshot: SnapshotDTO) {} ///===----------------------------------------------------- @@ -131,6 +133,21 @@ export class VersionControlService { ///===---------------------------------------------------- // Helpers + getDiffSetIndices(snapshotID: number) { + const diffsPerSnap = parseInt( + process.env.DIFFS_PER_SNAPSHOT, + ); + const first = snapshotID * diffsPerSnap; + const last = first + diffsPerSnap; + const indices = Array.from( + { length: last - first }, + (_, index) => index + first, + ); + return indices; + } + + ///===---------------------------------------------------- + getLogicalIndex( s3Index: number, head: number, @@ -185,16 +202,22 @@ export class VersionControlService { ///===---------------------------------------------------- - async convertSnapshotsToSnapshotDTOs(snapshots: Snapshot[]) { + async convertSnapshotsToSnapshotDTOs( + snapshots: Snapshot[], + ) { const snapshotDTOs = []; for (let i = 0; i < snapshots.length; i++) { const snapshot = snapshots[i]; const snapshotDTO = new SnapshotDTO(); - snapshotDTO.SnapshotID = snapshot.SnapshotID; - snapshotDTO.MarkdownID = snapshot.MarkdownID; + snapshotDTO.SnapshotID = + snapshot.SnapshotID; + snapshotDTO.MarkdownID = + snapshot.MarkdownID; snapshotDTO.UserID = snapshot.UserID; - snapshotDTO.S3SnapshotID = snapshot.S3SnapshotID; - snapshotDTO.LastModified = snapshot.LastModified; + snapshotDTO.S3SnapshotID = + snapshot.S3SnapshotID; + snapshotDTO.LastModified = + snapshot.LastModified; snapshotDTOs.push(snapshotDTO); } return snapshotDTOs; From 77c349a940c7f5fc6fbcdd21453790abf713089d Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Tue, 19 Sep 2023 15:15:01 +0200 Subject: [PATCH 096/186] Added functionality to match diffs to snapshots --- backend/src/diffs/diffs.service.ts | 14 ++++++++++++++ backend/src/diffs/entities/diffs.entity.ts | 3 +++ backend/src/file_manager/file_manager.service.ts | 5 +++-- backend/src/snapshots/snapshots.service.ts | 5 +++++ .../src/version_control/version_control.service.ts | 1 + 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/backend/src/diffs/diffs.service.ts b/backend/src/diffs/diffs.service.ts index 82334c75..bfa83b2b 100644 --- a/backend/src/diffs/diffs.service.ts +++ b/backend/src/diffs/diffs.service.ts @@ -33,8 +33,10 @@ export class DiffsService { async createDiffs( markdownFileDTO: MarkdownFileDTO, + snapshotIDs: string[], ) { const diffRecords = []; + let snapshotIndex = 0; for ( let i = 0; i < parseInt(process.env.MAX_DIFFS); @@ -46,12 +48,24 @@ export class DiffsService { i.toString(), ).toString(); + if ( + i % + parseInt( + process.env.DIFFS_PER_SNAPSHOT, + ) === + 0 && + i !== 0 + ) { + snapshotIndex++; + } + diffRecords.push({ DiffID: diffID, MarkdownID: markdownFileDTO.MarkdownID, UserID: markdownFileDTO.UserID, S3DiffID: i, HasBeenUsed: false, + SnapshotID: snapshotIDs[snapshotIndex], }); } await this.diffRepository.insert(diffRecords); diff --git a/backend/src/diffs/entities/diffs.entity.ts b/backend/src/diffs/entities/diffs.entity.ts index bef3518c..a128dca7 100644 --- a/backend/src/diffs/entities/diffs.entity.ts +++ b/backend/src/diffs/entities/diffs.entity.ts @@ -27,4 +27,7 @@ export class Diff { @Column() HasBeenUsed: boolean; + + @Column() + SnapshotID: string; } diff --git a/backend/src/file_manager/file_manager.service.ts b/backend/src/file_manager/file_manager.service.ts index 216dc3a4..bc1aa003 100644 --- a/backend/src/file_manager/file_manager.service.ts +++ b/backend/src/file_manager/file_manager.service.ts @@ -85,12 +85,13 @@ export class FileManagerService { markdownFileDTO, ); - await this.diffsService.createDiffs( + const snapshotIDs: string[] = await this.snapshotService.createSnapshots( markdownFileDTO, ); - await this.snapshotService.createSnapshots( + await this.diffsService.createDiffs( markdownFileDTO, + snapshotIDs, ); return await this.markdownFilesService.create( diff --git a/backend/src/snapshots/snapshots.service.ts b/backend/src/snapshots/snapshots.service.ts index 599a2419..69a5d783 100644 --- a/backend/src/snapshots/snapshots.service.ts +++ b/backend/src/snapshots/snapshots.service.ts @@ -17,6 +17,7 @@ export class SnapshotService { async createSnapshots( markdownFileDTO: MarkdownFileDTO, ) { + const snapshotIDs = []; const snapshotRecords = []; for ( let i = 0; @@ -36,10 +37,14 @@ export class SnapshotService { S3SnapshotID: i, HasBeenUsed: false, }); + + snapshotIDs.push(snapshotID); } await this.snapshotRepository.insert( snapshotRecords, ); + + return snapshotIDs; } ///===----------------------------------------------------- diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index 288dfc00..8f1762ec 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -235,6 +235,7 @@ export class VersionControlService { diffDTO.UserID = diff.UserID; diffDTO.S3DiffID = diff.S3DiffID; diffDTO.LastModified = diff.LastModified; + diffDTO.SnapshotID = diff.SnapshotID; diffDTOs.push(diffDTO); } return diffDTOs; From 95bb3cbf0252b91b2beebc5054f3dea1d5093e42 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:35:50 +0200 Subject: [PATCH 097/186] Handling of initial diffs --- frontend/src/app/edit/edit.component.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index db452195..b3b563c8 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -509,11 +509,18 @@ export class EditComponent implements AfterViewInit, OnInit { snapshot[i].ChildDiff = diff[j]; diff[j].LastModified = this.formatDate(diff[j].LastModified); diff[j].Name = "Diff " + j; + diff[j].hasSnapshot = true; } } } this.history=snapshot; - + for(let i=0;i Date: Tue, 19 Sep 2023 17:43:11 +0200 Subject: [PATCH 098/186] Changing to deep copy of response --- .../version_control.controller.ts | 1 + frontend/src/app/edit/edit.component.ts | 69 ++++++++++--------- .../app/services/version.control.service.ts | 2 +- 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/backend/src/version_control/version_control.controller.ts b/backend/src/version_control/version_control.controller.ts index 44f8c167..75d429c1 100644 --- a/backend/src/version_control/version_control.controller.ts +++ b/backend/src/version_control/version_control.controller.ts @@ -111,6 +111,7 @@ export class VersionControlController { ); versionHistoryDTO.DiffHistory = diffDTOs; + console.log(versionHistoryDTO); return versionHistoryDTO; } } diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index b3b563c8..fcc50353 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -59,7 +59,7 @@ export class EditComponent implements AfterViewInit, OnInit { private clipboard: Clipboard, private messageService: MessageService, private versionControlService: VersionControlService - ) {} + ) { } @HostListener('window:beforeunload', ['$event']) beforeUnloadHandler(event: BeforeUnloadEvent) { @@ -119,9 +119,9 @@ export class EditComponent implements AfterViewInit, OnInit { ]; //get window width - this.isTouchScreen=window.matchMedia('(pointer: coarse)').matches; + this.isTouchScreen = window.matchMedia('(pointer: coarse)').matches; const width = window.innerWidth; - if (width < 800) + if (width < 800) this.hideSideBar(); const c = localStorage.getItem('content'); const m = localStorage.getItem('markdownID'); @@ -136,8 +136,8 @@ export class EditComponent implements AfterViewInit, OnInit { this.fileName = this.editService.getName(); this.history.push({ name: 'Latest', date: 'now', html: this.editService.getContent(), id: 'LATEST', isCurrent: true }); - this.history.push({name: 'Version 7', date: '01-01-1977', html: '', id: '8'}); - this.history.push({name: 'Version 6', date: '01-01-1976', html: '

Text added from V0 to V1.

More Text added from V1 to V2.

Addition from V3 to V4

', id: '7'}); + this.history.push({ name: 'Version 7', date: '01-01-1977', html: '', id: '8' }); + this.history.push({ name: 'Version 6', date: '01-01-1976', html: '

Text added from V0 to V1.

More Text added from V1 to V2.

Addition from V3 to V4

', id: '7' }); this.history.push({ name: 'Version 5', date: '01-01-1975', html: '

Text to be removed soon.

Text added from V0 to V1.

More Text added from V1 to V2.

Addition from V3 to V4

', id: '6' }); this.history.push({ name: 'Version 4', date: '01-01-1974', html: '

Text to be removed soon.

Text added from V0 to V1.

More Text added from V1 to V2.

Addition from V3 to V4

', id: '5' }); this.history.push({ name: 'Version 3', date: '01-01-1973', html: '

Text to be removed soon.

Text added from V0 to V1.

More Text added from V1 to V2.

', id: '4' }); @@ -258,17 +258,17 @@ export class EditComponent implements AfterViewInit, OnInit { console.log(this.editor.getData()); const diff = this.versionControlService.getReadablePatch(this.prevVersion as string, this.editor.getData()); console.log(diff); - this.versionControlService.saveDiff(this.editService.getMarkdownID() as string,diff, this.editor.getData()); + this.versionControlService.saveDiff(this.editService.getMarkdownID() as string, diff, this.editor.getData()); this.prevVersion = this.editor.getData(); let contents = this.editor.getData(); let pass = this.editService.getDocumentPassword(); - if(pass != '' && pass != undefined) { + if (pass != '' && pass != undefined) { this.fileService.saveDocument( this.fileService.encryptSafeLockDocument(contents, pass), this.editService.getMarkdownID(), this.editService.getPath(), this.editService.getSafeLock() - ); + ); } else { this.fileService.saveDocument( @@ -276,7 +276,7 @@ export class EditComponent implements AfterViewInit, OnInit { this.editService.getMarkdownID(), this.editService.getPath(), this.editService.getSafeLock() - ); + ); } } @@ -415,7 +415,7 @@ export class EditComponent implements AfterViewInit, OnInit { }), ]) .then( - () => {}, + () => { }, (error) => { console.error( 'Could not copy HTML data (image) to clipboard: ', @@ -497,30 +497,33 @@ export class EditComponent implements AfterViewInit, OnInit { async refreshSidebarHistory() { this.history = []; - const data=await this.versionControlService.retrieveAllHistory(this.editService.getMarkdownID() as string); - const snapshot=data.SnapshotHistory; - const diff=data.DiffHistory; - - for(let i = 0; i < snapshot.length; i++) { - snapshot[i].LastModified = this.formatDate(snapshot[i].LastModified); - snapshot[i].Name = "Snapshot " + i; - for(let j = 0; j < diff.length; j++) { - if(snapshot[i].SnapshotID === diff[j].SnapshotID) { - snapshot[i].ChildDiff = diff[j]; - diff[j].LastModified = this.formatDate(diff[j].LastModified); - diff[j].Name = "Diff " + j; - diff[j].hasSnapshot = true; + this.versionControlService.retrieveAllHistory(this.editService.getMarkdownID() as string).then((data) => { + console.log("Response body: ", data); + const snapshot = JSON.parse(JSON.stringify(data.SnapshotHistory)); + const diff = JSON.parse(JSON.stringify(data.DiffHistory)); + + for (let i = 0; i < snapshot.length; i++) { + snapshot[i].LastModified = this.formatDate(snapshot[i].LastModified); + snapshot[i].Name = "Snapshot " + i; + for (let j = 0; j < diff.length; j++) { + if (snapshot[i].SnapshotID === diff[j].SnapshotID) { + snapshot[i].ChildDiff = diff[j]; + diff[j].LastModified = this.formatDate(diff[j].LastModified); + diff[j].Name = "Diff " + j; + diff[j].hasSnapshot = true; + } } } - } - this.history=snapshot; - for(let i=0;i((resolve, reject) => { this.sendRetrieveAllHistory(markdownID).subscribe({ next: (response: HttpResponse) => { - console.log(response); + console.log("Backend data response: ",response); if (response.status === 200) { resolve(response.body); } else { From e3832798530cea979c47740598986bfd8b4af334 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:59:21 +0200 Subject: [PATCH 099/186] Added dropdown arrow --- frontend/src/app/edit/edit.component.html | 1 + frontend/src/app/edit/edit.component.scss | 23 ++++++++++++++++++++++- frontend/src/app/edit/edit.component.ts | 14 ++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/edit/edit.component.html b/frontend/src/app/edit/edit.component.html index 14131593..067bcc45 100644 --- a/frontend/src/app/edit/edit.component.html +++ b/frontend/src/app/edit/edit.component.html @@ -248,6 +248,7 @@

History

+

{{obj.Name}}

{{obj.LastModified}}

diff --git a/frontend/src/app/edit/edit.component.scss b/frontend/src/app/edit/edit.component.scss index d2c32e52..e1c48cad 100644 --- a/frontend/src/app/edit/edit.component.scss +++ b/frontend/src/app/edit/edit.component.scss @@ -739,7 +739,7 @@ Preserve the relative scale, though. */ .historyObject { transition: 0.2s; display: grid; - grid-template-columns: 2fr 2fr 1fr; + grid-template-columns: 0.5fr 2fr 2fr 0.5fr; justify-content: space-around; width: $sidebar-content-width; border-radius: 8px; @@ -783,4 +783,25 @@ Preserve the relative scale, though. */ cursor: pointer; background-color: #ddf; transition: 0.5s; +} + +.dropdownArrow { + transition: transform 0.3s ease; + margin: 0; + margin: auto 0; + width: 20px; + height: 20px; + padding: 4px; + + border-radius: 5px; +} + +.dropdownArrow:hover { + cursor: pointer; + background-color: #ddf; +} + +.dropdownArrow.expanded { + transform: rotate(90deg); + /* Rotate 180 degrees when expanded */ } \ No newline at end of file diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index fcc50353..ac4f1919 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -645,4 +645,18 @@ export class EditComponent implements AfterViewInit, OnInit { this.history[i].isCurrent = false; } } + + expandSnapshot(snapshot: any, event: any) { + if (snapshot.expanded) { + snapshot.expanded = false; + } else { + snapshot.expanded = true; + } + + const arrowElement = event.target; + + arrowElement.classList.toggle('expanded'); + + event.stopPropagation(); + } } From e4e249f5e37e0281bd2aa7122cc3d2f2097ba390 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Tue, 19 Sep 2023 18:11:57 +0200 Subject: [PATCH 100/186] Dropdown of snapshots to diffs now works --- frontend/src/app/edit/edit.component.html | 19 ++++++++++++++----- frontend/src/app/edit/edit.component.scss | 6 ++++++ frontend/src/app/edit/edit.component.ts | 5 ++++- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/edit/edit.component.html b/frontend/src/app/edit/edit.component.html index 067bcc45..0a9ce6d3 100644 --- a/frontend/src/app/edit/edit.component.html +++ b/frontend/src/app/edit/edit.component.html @@ -247,12 +247,21 @@

History

-
- -

{{obj.Name}}

-

{{obj.LastModified}}

- +
+
+ +

{{obj.Name}}

+

{{obj.LastModified}}

+ +
+
+
+

{{diffObj.Name}}

+

{{diffObj.LastModified}}

+ +
+
diff --git a/frontend/src/app/edit/edit.component.scss b/frontend/src/app/edit/edit.component.scss index e1c48cad..ac3497b8 100644 --- a/frontend/src/app/edit/edit.component.scss +++ b/frontend/src/app/edit/edit.component.scss @@ -736,6 +736,7 @@ Preserve the relative scale, though. */ color: #000 } +.diffObject, .historyObject { transition: 0.2s; display: grid; @@ -755,12 +756,17 @@ Preserve the relative scale, though. */ user-select: none; } +.diffObject:hover, .historyObject:hover { cursor: pointer; // scale: 1.1; background-color: darken($light-grey, 10%); } +.diffObject{ + grid-template-columns: 2fr 2fr 1fr; +} + .selectedHistory { background-color: #dfd; } diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index ac4f1919..a7aa3fbd 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -505,9 +505,10 @@ export class EditComponent implements AfterViewInit, OnInit { for (let i = 0; i < snapshot.length; i++) { snapshot[i].LastModified = this.formatDate(snapshot[i].LastModified); snapshot[i].Name = "Snapshot " + i; + snapshot[i].ChildDiffs = []; for (let j = 0; j < diff.length; j++) { if (snapshot[i].SnapshotID === diff[j].SnapshotID) { - snapshot[i].ChildDiff = diff[j]; + snapshot[i].ChildDiffs.push(diff[j]); diff[j].LastModified = this.formatDate(diff[j].LastModified); diff[j].Name = "Diff " + j; diff[j].hasSnapshot = true; @@ -522,8 +523,10 @@ export class EditComponent implements AfterViewInit, OnInit { this.history.push(diff[i]); } } + console.log(this.history); }); + } pageBreak() { From c9f30744be7335a2bb72954a179fba4fb7a840fd Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Tue, 19 Sep 2023 18:14:24 +0200 Subject: [PATCH 101/186] Better representation of snapshot --- frontend/src/app/edit/edit.component.scss | 3 ++- frontend/src/app/edit/edit.component.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/edit/edit.component.scss b/frontend/src/app/edit/edit.component.scss index ac3497b8..a985a5b2 100644 --- a/frontend/src/app/edit/edit.component.scss +++ b/frontend/src/app/edit/edit.component.scss @@ -764,7 +764,8 @@ Preserve the relative scale, though. */ } .diffObject{ - grid-template-columns: 2fr 2fr 1fr; + margin-left: 20px; + grid-template-columns: 2fr 2fr 0.5fr; } .selectedHistory { diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index a7aa3fbd..97c86ce1 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -510,7 +510,7 @@ export class EditComponent implements AfterViewInit, OnInit { if (snapshot[i].SnapshotID === diff[j].SnapshotID) { snapshot[i].ChildDiffs.push(diff[j]); diff[j].LastModified = this.formatDate(diff[j].LastModified); - diff[j].Name = "Diff " + j; + diff[j].Name = "Version " + j; diff[j].hasSnapshot = true; } } From 56c3700ef1f0a79a046aa707aa7d02f4d2a18e84 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Tue, 19 Sep 2023 18:46:01 +0200 Subject: [PATCH 102/186] Save confirmation --- frontend/src/app/edit/edit.component.html | 5 +++-- frontend/src/app/edit/edit.component.ts | 26 +++++++++++++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/edit/edit.component.html b/frontend/src/app/edit/edit.component.html index 0a9ce6d3..01ac7980 100644 --- a/frontend/src/app/edit/edit.component.html +++ b/frontend/src/app/edit/edit.component.html @@ -1,9 +1,10 @@
+
-
+
+ (click)="exitToHome()">
diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 97c86ce1..7dde3dd5 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -17,7 +17,7 @@ import { EditService } from '../services/edit.service'; import { AssetService } from '../services/asset.service'; import { VersionControlService } from '../services/version.control.service'; import { Inject } from '@angular/core'; -import { MessageService } from 'primeng/api'; +import { MessageService, ConfirmationService } from 'primeng/api'; import { set } from 'cypress/types/lodash'; import { PageBreak } from '@ckeditor/ckeditor5-page-break'; @@ -58,7 +58,8 @@ export class EditComponent implements AfterViewInit, OnInit { private assetService: AssetService, private clipboard: Clipboard, private messageService: MessageService, - private versionControlService: VersionControlService + private versionControlService: VersionControlService, + private confirmationService: ConfirmationService, ) { } @HostListener('window:beforeunload', ['$event']) @@ -250,6 +251,27 @@ export class EditComponent implements AfterViewInit, OnInit { this.router.navigate(['/camera'], { state: data }); } + exitToHome(){ + console.log("Exit To Home."); + this.confirmationService.confirm({ + message: 'Do you want to save before you leave?', + header: 'Save Confirmation', + icon: 'pi pi-exclamation-triangle', + acceptLabel: 'Exit and Save', + rejectLabel: 'Exit without Saving', + accept: () => { + this.editService.setContent(this.editor.getData()); + this.saveDocumentContents(); + this.router.navigate(['/home']); + }, + reject: (type: any) => { + if(type === 1) + this.router.navigate(['/home']); + } + + }); + } + saveDocumentContents() { // Save the document quill content to localStorage when changes occur // const editableArea: HTMLElement = this.elementRef.nativeElement.querySelector('.document-editor__editable'); From 2cc0a9f96e91ca882444e4850ccd31723172387b Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Tue, 19 Sep 2023 18:55:57 +0200 Subject: [PATCH 103/186] Implemented Contrast adjustment --- frontend/src/app/camera/camera.component.html | 4 +- frontend/src/app/camera/camera.component.ts | 45 ++++++++++++++++--- 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/camera/camera.component.html b/frontend/src/app/camera/camera.component.html index 30c3b933..c9063124 100644 --- a/frontend/src/app/camera/camera.component.html +++ b/frontend/src/app/camera/camera.component.html @@ -31,9 +31,11 @@
- +
+ +
diff --git a/frontend/src/app/camera/camera.component.ts b/frontend/src/app/camera/camera.component.ts index 762153c5..bcdf90ab 100644 --- a/frontend/src/app/camera/camera.component.ts +++ b/frontend/src/app/camera/camera.component.ts @@ -24,7 +24,7 @@ export class CameraComponent { flipCamera: boolean = false; cameraAvailable: boolean = false; settingCamera: boolean = false; - + contrastValue: number = 0; constructor( private elementRef: ElementRef, private assetService: AssetService, @@ -59,7 +59,7 @@ export class CameraComponent { } setupCamera() { - this.settingCamera=true; + this.settingCamera = true; if (!navigator.mediaDevices || !navigator.mediaDevices.getUserMedia) { console.error("getUserMedia is not supported in this browser."); this.cameraAvailable = false; @@ -76,7 +76,7 @@ export class CameraComponent { // Access granted, display the camera stream this.cameraAvailable = true; this.videoRef.srcObject = stream; - this.settingCamera=false; + this.settingCamera = false; }) .catch((error) => { // Handle errors and permission denial @@ -89,8 +89,8 @@ export class CameraComponent { disableCamera() { - if(this.settingCamera){ - let interval=setInterval(() => { + if (this.settingCamera) { + let interval = setInterval(() => { try { this.videoRef.srcObject .getTracks() @@ -164,4 +164,39 @@ export class CameraComponent { } } + adjustContrast() { + const imageElement = document.getElementById('image') as HTMLImageElement; + if (imageElement) { + const canvas = document.createElement('canvas'); + const ctx = canvas.getContext('2d'); + if (ctx) { // Check if ctx is not null + const img = new Image(); + img.src = this.sysImage; + img.onload = () => { + canvas.width = img.width; + canvas.height = img.height; + ctx.drawImage(img, 0, 0, img.width, img.height); + const imageData = ctx.getImageData(0, 0, canvas.width, canvas.height); + const data = imageData.data; + + // Adjust contrast + const factor = (259 * (this.contrastValue + 255)) / (255 * (259 - this.contrastValue)); + for (let i = 0; i < data.length; i += 4) { + data[i] = this.clamp(factor * (data[i] - 128) + 128); + data[i + 1] = this.clamp(factor * (data[i + 1] - 128) + 128); + data[i + 2] = this.clamp(factor * (data[i + 2] - 128) + 128); + } + + ctx.putImageData(imageData, 0, 0); + this.sysImage = canvas.toDataURL(); + }; + } + } + } + + clamp(value: number, min = 0, max = 255): number { + return Math.min(max, Math.max(min, value)); + } + + } From 49094131005b54d176ead81a3ef865900600619c Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Tue, 19 Sep 2023 19:30:06 +0200 Subject: [PATCH 104/186] Fix to contrast adjustment --- frontend/src/app/camera/camera.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/camera/camera.component.ts b/frontend/src/app/camera/camera.component.ts index bcdf90ab..d4bc1ea6 100644 --- a/frontend/src/app/camera/camera.component.ts +++ b/frontend/src/app/camera/camera.component.ts @@ -14,6 +14,7 @@ export class CameraComponent { @ViewChild('videoElement', { static: false }) videoElement!: ElementRef; sysImage = ''; + originalImage = ''; public sidebarVisible = false; assetName: string = ''; videoRef: any; @@ -126,6 +127,7 @@ export class CameraComponent { const dataUrl = canvas.toDataURL('image/jpeg', 1); // Adjust the quality (0.0 to 1.0) this.sysImage = dataUrl; + this.originalImage = dataUrl; this.captured = true; } @@ -171,7 +173,7 @@ export class CameraComponent { const ctx = canvas.getContext('2d'); if (ctx) { // Check if ctx is not null const img = new Image(); - img.src = this.sysImage; + img.src = this.originalImage; img.onload = () => { canvas.width = img.width; canvas.height = img.height; From fa7003ecaf7d41737b16ab4f24d7260670394f8c Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Tue, 19 Sep 2023 20:25:56 +0200 Subject: [PATCH 105/186] Photo editing is complete --- frontend/src/app/camera/camera.component.html | 13 +++- frontend/src/app/camera/camera.component.scss | 10 +++- frontend/src/app/camera/camera.component.ts | 60 ++++++++++++++++--- 3 files changed, 73 insertions(+), 10 deletions(-) diff --git a/frontend/src/app/camera/camera.component.html b/frontend/src/app/camera/camera.component.html index c9063124..8bd9c151 100644 --- a/frontend/src/app/camera/camera.component.html +++ b/frontend/src/app/camera/camera.component.html @@ -6,7 +6,7 @@ + (click)="captured=false;resetFilters()">



Camera Not @@ -34,7 +34,16 @@

- +
+

Adjust Contrast

+ +

Adjust Brightness

+ +
+ + +
+
{ + return new Promise((resolve) => { const canvas = document.createElement('canvas'); const ctx = canvas.getContext('2d'); - if (ctx) { // Check if ctx is not null + if (ctx) { const img = new Image(); - img.src = this.originalImage; + img.src = dataImage; img.onload = () => { canvas.width = img.width; canvas.height = img.height; @@ -190,15 +190,61 @@ export class CameraComponent { } ctx.putImageData(imageData, 0, 0); - this.sysImage = canvas.toDataURL(); + resolve(canvas.toDataURL()); }; + } else { + resolve(dataImage); // Return the original dataURL if the canvas context cannot be obtained } - } + }); + } + + + async adjustBrightness(dataImage: string): Promise { + return new Promise((resolve) => { + const canvas = document.createElement('canvas'); + const ctx = canvas.getContext('2d'); + if (ctx) { + const img = new Image(); + img.src = dataImage; + img.onload = () => { + canvas.width = img.width; + canvas.height = img.height; + ctx.drawImage(img, 0, 0, img.width, img.height); + const imageData = ctx.getImageData(0, 0, canvas.width, canvas.height); + const data = imageData.data; + + // Adjust brightness + const factor = (this.brightnessValue - 100) / 100; // Calculate the brightness factor + for (let i = 0; i < data.length; i += 4) { + data[i] = this.clamp(data[i] + 255 * factor); + data[i + 1] = this.clamp(data[i + 1] + 255 * factor); + data[i + 2] = this.clamp(data[i + 2] + 255 * factor); + } + + ctx.putImageData(imageData, 0, 0); + resolve(canvas.toDataURL()); + }; + } else { + resolve(dataImage); // Return the original dataURL if the canvas context cannot be obtained + } + }); + } + + + async applyFilters() { + const contrastImage = await this.adjustBrightness(this.originalImage); + const brightnessImage = await this.adjustContrast(contrastImage); + this.sysImage = brightnessImage; } clamp(value: number, min = 0, max = 255): number { return Math.min(max, Math.max(min, value)); } + resetFilters() { + this.contrastValue = 0; + this.brightnessValue = 100; + this.sysImage = this.originalImage; + } } From 48141338997c45f6ad2ed62228ae5f0c0fbc96cf Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Tue, 19 Sep 2023 20:53:18 +0200 Subject: [PATCH 106/186] numbering starts from 1 now --- frontend/src/app/edit/edit.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 7dde3dd5..6dec4fee 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -526,13 +526,13 @@ export class EditComponent implements AfterViewInit, OnInit { for (let i = 0; i < snapshot.length; i++) { snapshot[i].LastModified = this.formatDate(snapshot[i].LastModified); - snapshot[i].Name = "Snapshot " + i; + snapshot[i].Name = "Snapshot " + (i+1); snapshot[i].ChildDiffs = []; for (let j = 0; j < diff.length; j++) { if (snapshot[i].SnapshotID === diff[j].SnapshotID) { snapshot[i].ChildDiffs.push(diff[j]); diff[j].LastModified = this.formatDate(diff[j].LastModified); - diff[j].Name = "Version " + j; + diff[j].Name = "Version " + (j+1); diff[j].hasSnapshot = true; } } @@ -541,7 +541,7 @@ export class EditComponent implements AfterViewInit, OnInit { for (let i = 0; i < diff.length; i++) { if (!diff[i].hasSnapshot) { diff[i].LastModified = this.formatDate(diff[i].LastModified); - diff[i].Name = "Diff " + i; + diff[i].Name = "Diff " + (i+1); this.history.push(diff[i]); } } From 9e4e1a2ab047a75daafbe031970967024b04e3e2 Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 00:00:20 +0200 Subject: [PATCH 107/186] Fixed snapshot creation issue --- .../version_control.service.ts | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index 8f1762ec..85ae16b1 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -27,17 +27,26 @@ export class VersionControlService { diffDTO.MarkdownID, ); + const nextDiff = + await this.diffService.getDiff( + diffDTO, + nextDiffID, + ); + this.s3Service.saveDiff(diffDTO, nextDiffID); if ( - nextDiffID % - parseInt( - process.env.DIFFS_PER_SNAPSHOT, - ) === - 0 && - nextDiffID !== 0 + !(nextDiffID === 0 && !nextDiff.HasBeenUsed) ) { - this.saveSnapshot(diffDTO); + if ( + nextDiffID % + parseInt( + process.env.DIFFS_PER_SNAPSHOT, + ) === + 0 + ) { + this.saveSnapshot(diffDTO); + } } await this.diffService.updateDiff( @@ -52,13 +61,13 @@ export class VersionControlService { ///===----------------------------------------------------- - getDiff(diffDTO: DiffDTO) {} + // getDiff(diffDTO: DiffDTO) {} ///===----------------------------------------------------- - getAllDiffsForSnapshot( - snapshotDTO: SnapshotDTO, - ) {} + // getAllDiffsForSnapshot( + // snapshotDTO: SnapshotDTO, + // ) {} ///===----------------------------------------------------- @@ -68,7 +77,7 @@ export class VersionControlService { diffDTO.MarkdownID, ); - this.s3Service.saveSnapshot( + await this.s3Service.saveSnapshot( diffDTO, nextSnapshotID, ); @@ -85,7 +94,7 @@ export class VersionControlService { ///===----------------------------------------------------- - getDiffSetForSnapshot(snapshot: SnapshotDTO) {} + // getDiffSetForSnapshot(snapshot: SnapshotDTO) {} ///===----------------------------------------------------- From e65fc4ee82af7988589b1738a71900a7e45b199a Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 00:00:36 +0200 Subject: [PATCH 108/186] Commented out deprecated function --- .../version_control/version_control.controller.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/backend/src/version_control/version_control.controller.ts b/backend/src/version_control/version_control.controller.ts index 75d429c1..2d1ff9f4 100644 --- a/backend/src/version_control/version_control.controller.ts +++ b/backend/src/version_control/version_control.controller.ts @@ -49,12 +49,12 @@ export class VersionControlController { ///===---------------------------------------------------- - @Post('get_diff_set') - getDiffSet(@Body() snapshotDTO: SnapshotDTO) { - return this.versionControlService.getDiffSetForSnapshot( - snapshotDTO, - ); - } + // @Post('get_diff_set') + // getDiffSet(@Body() snapshotDTO: SnapshotDTO) { + // return this.versionControlService.getDiffSetForSnapshot( + // snapshotDTO, + // ); + // } ///===---------------------------------------------------- @@ -111,7 +111,6 @@ export class VersionControlController { ); versionHistoryDTO.DiffHistory = diffDTOs; - console.log(versionHistoryDTO); return versionHistoryDTO; } } From 8441971dc0f9f054304e196381ac61e097ab6357 Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 00:00:59 +0200 Subject: [PATCH 109/186] Await asynchronous call to update markdown file --- backend/src/markdown_files/markdown_files.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/markdown_files/markdown_files.service.ts b/backend/src/markdown_files/markdown_files.service.ts index a69f0b3a..57f298eb 100644 --- a/backend/src/markdown_files/markdown_files.service.ts +++ b/backend/src/markdown_files/markdown_files.service.ts @@ -158,7 +158,7 @@ export class MarkdownFilesService { markdownFile.NextDiffID = (markdownFile.NextDiffID + 1) % parseInt(process.env.MAX_DIFFS); - return this.markdownFileRepository.save( + return await this.markdownFileRepository.save( markdownFile, ); } From dd3bd9db7628c4a30e55f7d1308725b70a70bc45 Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 00:01:29 +0200 Subject: [PATCH 110/186] Added function: getDiff --- backend/src/diffs/diffs.service.ts | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/backend/src/diffs/diffs.service.ts b/backend/src/diffs/diffs.service.ts index bfa83b2b..ddc039b5 100644 --- a/backend/src/diffs/diffs.service.ts +++ b/backend/src/diffs/diffs.service.ts @@ -14,7 +14,7 @@ export class DiffsService { private diffRepository: Repository, ) {} - async updateDiff( + async getDiff( diffDTO: DiffDTO, nextDiffID: number, ) { @@ -26,6 +26,26 @@ export class DiffsService { }, }); + return diff; + } + + async updateDiff( + diffDTO: DiffDTO, + nextDiffID: number, + ) { + // const diff = + // await this.diffRepository.findOne({ + // where: { + // MarkdownID: diffDTO.MarkdownID, + // S3DiffID: nextDiffID, + // }, + // }); + + const diff = await this.getDiff( + diffDTO, + nextDiffID, + ); + diff.LastModified = new Date(); diff.HasBeenUsed = true; await this.diffRepository.save(diff); From 7778bbe129c7cc98a696dae8483ae8dd4839fe5f Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Wed, 20 Sep 2023 10:41:54 +0200 Subject: [PATCH 111/186] Simplified logic using De Morgan's equivalent --- backend/src/version_control/version_control.service.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index 85ae16b1..a35133bb 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -36,7 +36,8 @@ export class VersionControlService { this.s3Service.saveDiff(diffDTO, nextDiffID); if ( - !(nextDiffID === 0 && !nextDiff.HasBeenUsed) + nextDiffID !== 0 || + nextDiff.HasBeenUsed ) { if ( nextDiffID % From fa3e08e2be318503b37c4054dd3ccc0a6689e5b1 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Wed, 20 Sep 2023 13:37:29 +0200 Subject: [PATCH 112/186] Added DTO for version content transfer --- frontend/src/app/services/dto/version_set.dto.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 frontend/src/app/services/dto/version_set.dto.ts diff --git a/frontend/src/app/services/dto/version_set.dto.ts b/frontend/src/app/services/dto/version_set.dto.ts new file mode 100644 index 00000000..77003c68 --- /dev/null +++ b/frontend/src/app/services/dto/version_set.dto.ts @@ -0,0 +1,13 @@ +export class VersionSetDTO { + UserID: number; + MarkdownID: string; + DiffHistory: string[]; + SnapshotID: string; + + constructor() { + this.UserID = 0; + this.MarkdownID = ''; + this.DiffHistory = []; + this.SnapshotID = ''; + } +} \ No newline at end of file From c7b7f9512c3f55e73d76bc94397d906e88bb9b07 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Wed, 20 Sep 2023 13:39:57 +0200 Subject: [PATCH 113/186] Created backend version_set dto --- .../src/app/services/dto/version_set.dto.ts | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/src/app/services/dto/version_set.dto.ts b/frontend/src/app/services/dto/version_set.dto.ts index 77003c68..3fa7e03c 100644 --- a/frontend/src/app/services/dto/version_set.dto.ts +++ b/frontend/src/app/services/dto/version_set.dto.ts @@ -1,13 +1,13 @@ -export class VersionSetDTO { - UserID: number; - MarkdownID: string; - DiffHistory: string[]; - SnapshotID: string; +export class VersionSetDTO { + UserID: number; + MarkdownID: string; + DiffHistory: string[]; + SnapshotID: string; - constructor() { - this.UserID = 0; - this.MarkdownID = ''; - this.DiffHistory = []; - this.SnapshotID = ''; - } -} \ No newline at end of file + constructor() { + this.UserID = 0; + this.MarkdownID = ''; + this.DiffHistory = []; + this.SnapshotID = ''; + } +} From 1022e7b7199291d9bdcda1a75d46b2b9128b23bc Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Wed, 20 Sep 2023 13:41:42 +0200 Subject: [PATCH 114/186] Corrected name of dto --- .../src/version_control/dto/version_set.dto.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 backend/src/version_control/dto/version_set.dto.ts diff --git a/backend/src/version_control/dto/version_set.dto.ts b/backend/src/version_control/dto/version_set.dto.ts new file mode 100644 index 00000000..ff47222e --- /dev/null +++ b/backend/src/version_control/dto/version_set.dto.ts @@ -0,0 +1,16 @@ +import { DiffDTO } from '../../diffs/dto/diffs.dto'; +import { SnapshotDTO } from '../../snapshots/dto/snapshot.dto'; + +export class VersionSetDTO { + UserID: number; + MarkdownID: string; + DiffHistory: string[]; + SnapshotID: string; + + constructor() { + this.UserID = undefined; + this.MarkdownID = undefined; + this.DiffHistory = undefined; + this.SnapshotID = undefined; + } +} From 22c90c1697a526e7a80659c18ec56e97a938079c Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Wed, 20 Sep 2023 13:41:48 +0200 Subject: [PATCH 115/186] Created function to retrieve history content set --- .../app/services/version.control.service.ts | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index 9880b962..c7b65282 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -11,6 +11,7 @@ import { MarkdownFileDTO } from './dto/markdown_file.dto'; import { FileService } from './file.service'; import { VersionDTO } from './dto/version.dto'; import { environment } from 'src/environments/environment'; +import { VersionSetDTO } from './dto/version_set.dto'; @Injectable({ providedIn: 'root', @@ -319,4 +320,34 @@ export class VersionControlService { ); return this.http.post(url, body, { headers, observe: 'response' }); } + loadHistoryContent(markdownID:string, diffHistory: string[], snapshotID: string) { + return new Promise((resolve, reject) => { + this.sendLoadHistoryContent(markdownID, diffHistory, snapshotID).subscribe({ + next: (response: HttpResponse) => { + console.log(response); + if (response.status === 200) { + resolve(response.body); + } else { + resolve(null); + } + }, + }); + }); + } + + sendLoadHistoryContent(markdownID:string, diffHistory: string[], snapshotID: string): Observable> { + const environmentURL = environment.apiURL; + const url = `${environmentURL}version_control/get_history_set`; + const body = new VersionSetDTO(); + + body.UserID = this.userService.getUserID() as number; + body.MarkdownID = markdownID; + body.DiffHistory = diffHistory; + body.SnapshotID = snapshotID; + const headers = new HttpHeaders().set( + 'Authorization', + 'Bearer ' + this.userService.getAuthToken() + ); + return this.http.post(url, body, { headers, observe: 'response' }); + } } From 8117aab93cdb546bce7c13dcfe66e046192dcb38 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Wed, 20 Sep 2023 14:06:42 +0200 Subject: [PATCH 116/186] Renamed function for consistency --- frontend/src/app/services/version.control.service.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index c7b65282..3d9e9509 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -320,9 +320,9 @@ export class VersionControlService { ); return this.http.post(url, body, { headers, observe: 'response' }); } - loadHistoryContent(markdownID:string, diffHistory: string[], snapshotID: string) { + loadHistorySet(markdownID:string, diffHistory: string[], snapshotID: string) { return new Promise((resolve, reject) => { - this.sendLoadHistoryContent(markdownID, diffHistory, snapshotID).subscribe({ + this.sendLoadHistorySet(markdownID, diffHistory, snapshotID).subscribe({ next: (response: HttpResponse) => { console.log(response); if (response.status === 200) { @@ -335,7 +335,7 @@ export class VersionControlService { }); } - sendLoadHistoryContent(markdownID:string, diffHistory: string[], snapshotID: string): Observable> { + sendLoadHistorySet(markdownID:string, diffHistory: string[], snapshotID: string): Observable> { const environmentURL = environment.apiURL; const url = `${environmentURL}version_control/get_history_set`; const body = new VersionSetDTO(); From ffea86064d635b66261c3e1d5e80c45722240d3e Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Wed, 20 Sep 2023 15:58:27 +0200 Subject: [PATCH 117/186] Added shift mouse wheel to zoom --- frontend/src/app/edit/edit.component.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 6dec4fee..79834ffb 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -67,6 +67,22 @@ export class EditComponent implements AfterViewInit, OnInit { this.saveDocumentContents(); } + @HostListener('window:mousewheel', ['$event']) + onMouseWheel(event: WheelEvent) { + console.log(event) + if(event.shiftKey) + { + if(event.deltaY > 0) + { + this.zoomOut(); + } + else + { + this.zoomIn(); + } + } + } + showImageUploadPopup(): void { const ref = this.dialogService.open(ImageUploadPopupComponent, { header: 'Upload Images', From 2310b29589856404479f5500e5a3b06c3e4a5826 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Wed, 20 Sep 2023 16:00:37 +0200 Subject: [PATCH 118/186] Can now save with ctrl s --- frontend/src/app/edit/edit.component.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 79834ffb..60a30d4f 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -83,6 +83,17 @@ export class EditComponent implements AfterViewInit, OnInit { } } + @HostListener('window:keydown', ['$event']) + onKeyDown(event: KeyboardEvent) { + // Check if the Ctrl key is pressed and the 's' key (or 'S') is pressed simultaneously + if (event.ctrlKey && (event.key === 's' || event.key === 'S')) { + event.preventDefault(); + this.saveDocumentContents(); + + } + } + + showImageUploadPopup(): void { const ref = this.dialogService.open(ImageUploadPopupComponent, { header: 'Upload Images', From 0d12f5b50ec116bd8c25da0fdd31be3752ff48c1 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Wed, 20 Sep 2023 16:07:41 +0200 Subject: [PATCH 119/186] Removed console logs --- frontend/src/app/camera/camera.component.ts | 2 -- frontend/src/app/edit/edit.component.ts | 7 ------- frontend/src/app/home/home.component.ts | 5 ----- frontend/src/app/login/login.component.ts | 1 - frontend/src/app/services/folder.service.ts | 2 -- frontend/src/app/services/user.service.ts | 3 --- frontend/src/app/services/version.control.service.ts | 2 -- 7 files changed, 22 deletions(-) diff --git a/frontend/src/app/camera/camera.component.ts b/frontend/src/app/camera/camera.component.ts index cf8b4ce2..9f2e2bf9 100644 --- a/frontend/src/app/camera/camera.component.ts +++ b/frontend/src/app/camera/camera.component.ts @@ -99,7 +99,6 @@ export class CameraComponent { .forEach((track: { stop: () => any }) => track.stop()); clearInterval(interval); } catch (e) { - // console.log(e); } }, 1000); } @@ -108,7 +107,6 @@ export class CameraComponent { .getTracks() .forEach((track: { stop: () => any }) => track.stop()); } catch (e) { - // console.log(e); } } diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 60a30d4f..d9c2eefd 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -69,7 +69,6 @@ export class EditComponent implements AfterViewInit, OnInit { @HostListener('window:mousewheel', ['$event']) onMouseWheel(event: WheelEvent) { - console.log(event) if(event.shiftKey) { if(event.deltaY > 0) @@ -279,7 +278,6 @@ export class EditComponent implements AfterViewInit, OnInit { } exitToHome(){ - console.log("Exit To Home."); this.confirmationService.confirm({ message: 'Do you want to save before you leave?', header: 'Save Confirmation', @@ -303,10 +301,7 @@ export class EditComponent implements AfterViewInit, OnInit { // Save the document quill content to localStorage when changes occur // const editableArea: HTMLElement = this.elementRef.nativeElement.querySelector('.document-editor__editable'); - console.log(this.prevVersion) - console.log(this.editor.getData()); const diff = this.versionControlService.getReadablePatch(this.prevVersion as string, this.editor.getData()); - console.log(diff); this.versionControlService.saveDiff(this.editService.getMarkdownID() as string, diff, this.editor.getData()); this.prevVersion = this.editor.getData(); let contents = this.editor.getData(); @@ -547,7 +542,6 @@ export class EditComponent implements AfterViewInit, OnInit { async refreshSidebarHistory() { this.history = []; this.versionControlService.retrieveAllHistory(this.editService.getMarkdownID() as string).then((data) => { - console.log("Response body: ", data); const snapshot = JSON.parse(JSON.stringify(data.SnapshotHistory)); const diff = JSON.parse(JSON.stringify(data.DiffHistory)); @@ -572,7 +566,6 @@ export class EditComponent implements AfterViewInit, OnInit { this.history.push(diff[i]); } } - console.log(this.history); }); diff --git a/frontend/src/app/home/home.component.ts b/frontend/src/app/home/home.component.ts index 20e88efd..1668c649 100644 --- a/frontend/src/app/home/home.component.ts +++ b/frontend/src/app/home/home.component.ts @@ -1133,7 +1133,6 @@ export class HomeComponent implements OnInit, AfterViewInit { // @HostListener('document:keydown.enter', ['$event']) // handleEnterKeyPress(event: KeyboardEvent) { // const selected = this.getSelected(); - // console.log(selected); // if (selected.length === 1) { // if (selected[0].Type === 'file') { // this.onOpenFileSelect(selected[0].MarkdownID); @@ -1147,7 +1146,6 @@ export class HomeComponent implements OnInit, AfterViewInit { // @HostListener('document:keydown.delete', ['$event']) // handleDeleteKeyPress(event: KeyboardEvent) { // const selected = this.getSelected(); - // console.log(selected); // if (selected.length === 1) { // this.deleteSelectedEntity(selected[0]); // } @@ -1594,9 +1592,7 @@ export class HomeComponent implements OnInit, AfterViewInit { } let count = 0; for (let i = j; i < x.length; i++) { - console.log(i); setTimeout(() => { - console.log(startSelecting); const element = x[i]; if (element === this.shiftClickStart || element === node) { startSelecting = !startSelecting; @@ -1752,7 +1748,6 @@ export class HomeComponent implements OnInit, AfterViewInit { } out(x: number) { - console.log(x); } async lockDocument() { diff --git a/frontend/src/app/login/login.component.ts b/frontend/src/app/login/login.component.ts index f970d7b8..d7e719c1 100644 --- a/frontend/src/app/login/login.component.ts +++ b/frontend/src/app/login/login.component.ts @@ -176,7 +176,6 @@ export class LoginComponent { // // (document.getElementsByClassName('backgroundImage')[0] as HTMLElement).style.backgroundImage= 'radial-gradient(at ' + mouseXpercentage + '% ' + mouseYpercentage + '%, #3498db, #9b59b6)'; // (document.getElementsByClassName('backgroundImage')[0] as HTMLElement).style.backgroundImage = // 'radial-gradient(at ' + mouseXpercentage + '% ' + mouseYpercentage + '%, rgb(100 100 100 / 70%), rgb(100 100 100 / 70%)), url(/assets/MockData/BGIW.jpg)'; - // console.log('radial-gradient(at ' + mouseXpercentage + '% ' + mouseYpercentage + '%, rgb(100 100 100 / 70%), rgb(100 100 100 / 70%)), url(/assets/MockData/BGIW.jpg)'); } isValidPassword(password: string): boolean { diff --git a/frontend/src/app/services/folder.service.ts b/frontend/src/app/services/folder.service.ts index 5127c91f..f756c6d9 100644 --- a/frontend/src/app/services/folder.service.ts +++ b/frontend/src/app/services/folder.service.ts @@ -210,11 +210,9 @@ export class FolderService { path: string | undefined, folderName: string ): Promise { - // console.log(folderID+" "+path+" "+folderName); return new Promise((resolve, reject) => { this.sendRenameData(folderID, path, folderName).subscribe({ next: (response: HttpResponse) => { - // console.log(response); if (response.status === 200) { this.messageService.add({ severity: 'success', diff --git a/frontend/src/app/services/user.service.ts b/frontend/src/app/services/user.service.ts index 78303053..e680c196 100644 --- a/frontend/src/app/services/user.service.ts +++ b/frontend/src/app/services/user.service.ts @@ -200,7 +200,6 @@ export class UserService { this.hashPassword(newPassword, salt) ).subscribe({ next: (response: HttpResponse) => { - // console.log('forgotPass response: ', response); if (response.status === 200) { this.messageService.add({ severity: 'success', @@ -386,7 +385,6 @@ export class UserService { return new Promise(async (resolve, reject) => { this.sendPasswordResetData(token, password, salt).subscribe({ next: (response: HttpResponse) => { - console.log(response); if (response.status === 200) { this.messageService.add({ severity: 'success', @@ -482,7 +480,6 @@ export class UserService { this.sendRefreshTokenRequest().subscribe({ next: (response: HttpResponse) => { if (response.status === 200) { - // console.log(response); this.authToken = response.body.Token; this.expiresAt = this.jwtHelper.decodeToken( response.body.Token diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index 3d9e9509..18924ac4 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -36,8 +36,6 @@ export class VersionControlService { // const diff = this.DiffPatchService.diff_main(text1, text2); // const patches = this.DiffPatchService.patch_make(diff); - // console.log(this.DiffPatchService.patch_toText(patches)); - // console.log(this.DiffPatchService.patch_apply(patches, text1)); // }); // }); // } From c78b108a735f80d7d5473c676990463cff49a395 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 16:15:43 +0200 Subject: [PATCH 120/186] Fixed conflicts? --- frontend/src/app/edit/edit.component.ts | 189 +++++++++++++----- .../app/services/version.control.service.ts | 87 ++++---- 2 files changed, 186 insertions(+), 90 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 6dec4fee..1501a019 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -59,8 +59,8 @@ export class EditComponent implements AfterViewInit, OnInit { private clipboard: Clipboard, private messageService: MessageService, private versionControlService: VersionControlService, - private confirmationService: ConfirmationService, - ) { } + private confirmationService: ConfirmationService + ) {} @HostListener('window:beforeunload', ['$event']) beforeUnloadHandler(event: BeforeUnloadEvent) { @@ -122,8 +122,7 @@ export class EditComponent implements AfterViewInit, OnInit { //get window width this.isTouchScreen = window.matchMedia('(pointer: coarse)').matches; const width = window.innerWidth; - if (width < 800) - this.hideSideBar(); + if (width < 800) this.hideSideBar(); const c = localStorage.getItem('content'); const m = localStorage.getItem('markdownID'); const n = localStorage.getItem('name'); @@ -132,20 +131,81 @@ export class EditComponent implements AfterViewInit, OnInit { const sl = localStorage.getItem('safeLock'); const dp = localStorage.getItem('encryptedDocumentPassword'); - if (c != null && m != null && n != null && p != null && pf != null && sl != null && dp != null) - this.editService.setAll(c, m, n, p, pf, sl === 'true', this.editService.decryptPassword(dp)); + if ( + c != null && + m != null && + n != null && + p != null && + pf != null && + sl != null && + dp != null + ) + this.editService.setAll( + c, + m, + n, + p, + pf, + sl === 'true', + this.editService.decryptPassword(dp) + ); this.fileName = this.editService.getName(); - this.history.push({ name: 'Latest', date: 'now', html: this.editService.getContent(), id: 'LATEST', isCurrent: true }); - this.history.push({ name: 'Version 7', date: '01-01-1977', html: '', id: '8' }); - this.history.push({ name: 'Version 6', date: '01-01-1976', html: '

Text added from V0 to V1.

More Text added from V1 to V2.

Addition from V3 to V4

', id: '7' }); - this.history.push({ name: 'Version 5', date: '01-01-1975', html: '

Text to be removed soon.

Text added from V0 to V1.

More Text added from V1 to V2.

Addition from V3 to V4

', id: '6' }); - this.history.push({ name: 'Version 4', date: '01-01-1974', html: '

Text to be removed soon.

Text added from V0 to V1.

More Text added from V1 to V2.

Addition from V3 to V4

', id: '5' }); - this.history.push({ name: 'Version 3', date: '01-01-1973', html: '

Text to be removed soon.

Text added from V0 to V1.

More Text added from V1 to V2.

', id: '4' }); - this.history.push({ name: 'Version 2', date: '01-01-1972', html: '

Text added from V0 to V1.

More Text added from V1 to V2.

', id: '3' }); - this.history.push({ name: 'Version 1', date: '01-01-1971', html: '

Text added from V0 to V1.

', id: '2' }); - this.history.push({ name: 'Version 0', date: '01-01-1970', html: '', id: '1' }); - + this.history.push({ + name: 'Latest', + date: 'now', + html: this.editService.getContent(), + id: 'LATEST', + isCurrent: true, + }); + this.history.push({ + name: 'Version 7', + date: '01-01-1977', + html: '', + id: '8', + }); + this.history.push({ + name: 'Version 6', + date: '01-01-1976', + html: '

Text added from V0 to V1.

More Text added from V1 to V2.

Addition from V3 to V4

', + id: '7', + }); + this.history.push({ + name: 'Version 5', + date: '01-01-1975', + html: '

Text to be removed soon.

Text added from V0 to V1.

More Text added from V1 to V2.

Addition from V3 to V4

', + id: '6', + }); + this.history.push({ + name: 'Version 4', + date: '01-01-1974', + html: '

Text to be removed soon.

Text added from V0 to V1.

More Text added from V1 to V2.

Addition from V3 to V4

', + id: '5', + }); + this.history.push({ + name: 'Version 3', + date: '01-01-1973', + html: '

Text to be removed soon.

Text added from V0 to V1.

More Text added from V1 to V2.

', + id: '4', + }); + this.history.push({ + name: 'Version 2', + date: '01-01-1972', + html: '

Text added from V0 to V1.

More Text added from V1 to V2.

', + id: '3', + }); + this.history.push({ + name: 'Version 1', + date: '01-01-1971', + html: '

Text added from V0 to V1.

', + id: '2', + }); + this.history.push({ + name: 'Version 0', + date: '01-01-1970', + html: '', + id: '1', + }); } ngAfterViewInit() { @@ -251,8 +311,8 @@ export class EditComponent implements AfterViewInit, OnInit { this.router.navigate(['/camera'], { state: data }); } - exitToHome(){ - console.log("Exit To Home."); + exitToHome() { + console.log('Exit To Home.'); this.confirmationService.confirm({ message: 'Do you want to save before you leave?', header: 'Save Confirmation', @@ -265,10 +325,8 @@ export class EditComponent implements AfterViewInit, OnInit { this.router.navigate(['/home']); }, reject: (type: any) => { - if(type === 1) - this.router.navigate(['/home']); - } - + if (type === 1) this.router.navigate(['/home']); + }, }); } @@ -276,11 +334,18 @@ export class EditComponent implements AfterViewInit, OnInit { // Save the document quill content to localStorage when changes occur // const editableArea: HTMLElement = this.elementRef.nativeElement.querySelector('.document-editor__editable'); - console.log(this.prevVersion) + console.log(this.prevVersion); console.log(this.editor.getData()); - const diff = this.versionControlService.getReadablePatch(this.prevVersion as string, this.editor.getData()); + const diff = this.versionControlService.getReadablePatch( + this.prevVersion as string, + this.editor.getData() + ); console.log(diff); - this.versionControlService.saveDiff(this.editService.getMarkdownID() as string, diff, this.editor.getData()); + this.versionControlService.saveDiff( + this.editService.getMarkdownID() as string, + diff, + this.editor.getData() + ); this.prevVersion = this.editor.getData(); let contents = this.editor.getData(); let pass = this.editService.getDocumentPassword(); @@ -291,14 +356,28 @@ export class EditComponent implements AfterViewInit, OnInit { this.editService.getPath(), this.editService.getSafeLock() ); - } - else { + } else { this.fileService.saveDocument( contents, this.editService.getMarkdownID(), this.editService.getPath(), this.editService.getSafeLock() ); + // const latestVersionContent = + // this.versionControlService.getLatestVersionContent(); + + // const readablePatch = this.versionControlService.getReadablePatch( + // latestVersionContent, + // contents + // ); + // const markdownID = this.editService.getMarkdownID(); + + // this.versionControlService.saveDiff( + // readablePatch, + // markdownID ? (markdownID as string) : '' + // ); + + // this.versionControlService.setLatestVersionContent(contents); } } @@ -437,7 +516,7 @@ export class EditComponent implements AfterViewInit, OnInit { }), ]) .then( - () => { }, + () => {}, (error) => { console.error( 'Could not copy HTML data (image) to clipboard: ', @@ -519,36 +598,36 @@ export class EditComponent implements AfterViewInit, OnInit { async refreshSidebarHistory() { this.history = []; - this.versionControlService.retrieveAllHistory(this.editService.getMarkdownID() as string).then((data) => { - console.log("Response body: ", data); - const snapshot = JSON.parse(JSON.stringify(data.SnapshotHistory)); - const diff = JSON.parse(JSON.stringify(data.DiffHistory)); - - for (let i = 0; i < snapshot.length; i++) { - snapshot[i].LastModified = this.formatDate(snapshot[i].LastModified); - snapshot[i].Name = "Snapshot " + (i+1); - snapshot[i].ChildDiffs = []; - for (let j = 0; j < diff.length; j++) { - if (snapshot[i].SnapshotID === diff[j].SnapshotID) { - snapshot[i].ChildDiffs.push(diff[j]); - diff[j].LastModified = this.formatDate(diff[j].LastModified); - diff[j].Name = "Version " + (j+1); - diff[j].hasSnapshot = true; + this.versionControlService + .retrieveAllHistory(this.editService.getMarkdownID() as string) + .then((data) => { + console.log('Response body: ', data); + const snapshot = JSON.parse(JSON.stringify(data.SnapshotHistory)); + const diff = JSON.parse(JSON.stringify(data.DiffHistory)); + + for (let i = 0; i < snapshot.length; i++) { + snapshot[i].LastModified = this.formatDate(snapshot[i].LastModified); + snapshot[i].Name = 'Snapshot ' + (i + 1); + snapshot[i].ChildDiffs = []; + for (let j = 0; j < diff.length; j++) { + if (snapshot[i].SnapshotID === diff[j].SnapshotID) { + snapshot[i].ChildDiffs.push(diff[j]); + diff[j].LastModified = this.formatDate(diff[j].LastModified); + diff[j].Name = 'Version ' + (j + 1); + diff[j].hasSnapshot = true; + } } } - } - this.history = snapshot; - for (let i = 0; i < diff.length; i++) { - if (!diff[i].hasSnapshot) { - diff[i].LastModified = this.formatDate(diff[i].LastModified); - diff[i].Name = "Diff " + (i+1); - this.history.push(diff[i]); + this.history = snapshot; + for (let i = 0; i < diff.length; i++) { + if (!diff[i].hasSnapshot) { + diff[i].LastModified = this.formatDate(diff[i].LastModified); + diff[i].Name = 'Diff ' + (i + 1); + this.history.push(diff[i]); + } } - } - console.log(this.history); - }); - - + console.log(this.history); + }); } pageBreak() { diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index 3d9e9509..c406f856 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -1,49 +1,40 @@ import { Injectable } from '@angular/core'; import { UserService } from './user.service'; -// import DiffMatchPatch from 'diff-match-patch'; import { diff_match_patch as DiffMatchPatch } from 'diff-match-patch'; -import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http'; + +import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Observable } from 'rxjs'; +import { HttpResponse } from '@angular/common/http'; +import { MessageService } from 'primeng/api'; +import { environment } from '../../environments/environment'; + import { DiffDTO } from './dto/diff.dto'; import { SnapshotDTO } from './dto/snapshot.dto'; import { MarkdownFileDTO } from './dto/markdown_file.dto'; import { FileService } from './file.service'; import { VersionDTO } from './dto/version.dto'; -import { environment } from 'src/environments/environment'; import { VersionSetDTO } from './dto/version_set.dto'; @Injectable({ providedIn: 'root', }) export class VersionControlService { - constructor(private http: HttpClient, private fileService: FileService, private userService: UserService) { } + constructor( + private http: HttpClient, + private fileService: FileService, + private messageService: MessageService, + private userService: UserService + ) {} public snapshotArr: SnapshotDTO[] = []; public diffArr: DiffDTO[] = []; public versionArr: VersionDTO[] = []; - private DiffPatchService = new DiffMatchPatch(); - // async test(): Promise { - // let text1: string = ''; - // let text2: string = ''; - // const filePath1 = '../assets/VersionControl/test1.txt'; - // const filePath2 = '../assets/VersionControl/test2.txt'; - // this.http.get(filePath1, { responseType: 'text' }).subscribe((data) => { - // text1 = data; - // this.http.get(filePath2, { responseType: 'text' }).subscribe((data) => { - // text2 = data; - - // const diff = this.DiffPatchService.diff_main(text1, text2); - // const patches = this.DiffPatchService.patch_make(diff); - // console.log(this.DiffPatchService.patch_toText(patches)); - // console.log(this.DiffPatchService.patch_apply(patches, text1)); - // }); - // }); - // } + private latestVersion: VersionDTO = new VersionDTO(); + private DiffPatchService = new DiffMatchPatch(); async init(): Promise { - // TODO: Un-hijack login this.snapshotArr = []; this.diffArr = []; this.versionArr = []; @@ -73,8 +64,7 @@ export class VersionControlService { this.http.get(element, { responseType: 'text' }).subscribe((data) => { var tempDTO = new DiffDTO(); tempDTO.MarkdownID = 'abc123'; - tempDTO.DiffNumber = +element.charAt(element.length - 1); - tempDTO.SnapshotNumber = this.snapshotArr[0].SnapshotNumber; + // tempDTO.snapshotNumber = this.snapshotArr[0].snapshotNumber; tempDTO.Content = data; this.pushToDiffArr(tempDTO); }); @@ -98,6 +88,14 @@ export class VersionControlService { return this.snapshotArr; } + getLatestVersionContent(): string { + return this.latestVersion.Content; + } + + setLatestVersionContent(content: string) { + this.latestVersion.Content = content; + } + pushToSnapshotArr(element: SnapshotDTO): SnapshotDTO[] { this.snapshotArr.push(element); return this.snapshotArr; @@ -109,15 +107,16 @@ export class VersionControlService { a.SnapshotNumber > b.SnapshotNumber ? 1 : a.SnapshotNumber < b.SnapshotNumber - ? -1 - : 0 + ? -1 + : 0 ); } sortDiffArr(inArr: DiffDTO[]): void { // Ascending sort on diffNumber - inArr.sort((a, b) => - a.DiffNumber > b.DiffNumber ? 1 : a.DiffNumber < b.DiffNumber ? -1 : 0 + inArr.sort( + (a, b) => + a.DiffNumber > b.DiffNumber ? 1 : a.DiffNumber < b.DiffNumber ? -1 : 0 // TODO: Rework ); } @@ -184,7 +183,7 @@ export class VersionControlService { let retString = snapshot.Content; const tempArr = this.diffArr.filter((ele) => { - return ele.DiffNumber < diff.DiffNumber; + return ele.DiffNumber < diff.DiffNumber; // TODO: Rework }); this.sortDiffArr(tempArr); @@ -204,6 +203,7 @@ export class VersionControlService { } snapshotRestore(snapshot: SnapshotDTO): void { + //TODO: Rework this.snapshotArr = this.snapshotArr.filter((ele) => { return ele.SnapshotNumber <= snapshot.SnapshotNumber; }); @@ -217,6 +217,7 @@ export class VersionControlService { } diffRestore(diff: DiffDTO): void { + //TODO: Rework this.snapshotArr = this.snapshotArr.filter((ele) => { return ele.SnapshotNumber <= diff.SnapshotNumber; }); @@ -229,7 +230,11 @@ export class VersionControlService { this.sortDiffArr(this.diffArr); } - saveDiff(fileID: string, content: string, snapshotPayload:string): Promise { + saveDiff( + fileID: string, + content: string, + snapshotPayload: string + ): Promise { return new Promise((resolve, reject) => { this.sendSaveDiff(fileID, content, snapshotPayload).subscribe({ next: (response: HttpResponse) => { @@ -243,7 +248,11 @@ export class VersionControlService { }); } - sendSaveDiff(markdownID: string, content: string, snapshotPayload:string): Observable> { + sendSaveDiff( + markdownID: string, + content: string, + snapshotPayload: string + ): Observable> { const environmentURL = environment.apiURL; const url = `${environmentURL}version_control/save_diff`; console.log(url); @@ -295,7 +304,7 @@ export class VersionControlService { return new Promise((resolve, reject) => { this.sendRetrieveAllHistory(markdownID).subscribe({ next: (response: HttpResponse) => { - console.log("Backend data response: ",response); + console.log('Backend data response: ', response); if (response.status === 200) { resolve(response.body); } else { @@ -320,7 +329,11 @@ export class VersionControlService { ); return this.http.post(url, body, { headers, observe: 'response' }); } - loadHistorySet(markdownID:string, diffHistory: string[], snapshotID: string) { + loadHistorySet( + markdownID: string, + diffHistory: string[], + snapshotID: string + ) { return new Promise((resolve, reject) => { this.sendLoadHistorySet(markdownID, diffHistory, snapshotID).subscribe({ next: (response: HttpResponse) => { @@ -335,7 +348,11 @@ export class VersionControlService { }); } - sendLoadHistorySet(markdownID:string, diffHistory: string[], snapshotID: string): Observable> { + sendLoadHistorySet( + markdownID: string, + diffHistory: string[], + snapshotID: string + ): Observable> { const environmentURL = environment.apiURL; const url = `${environmentURL}version_control/get_history_set`; const body = new VersionSetDTO(); From e64859d29cbc7f9bd5f65e74d79d7c3756d87023 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Wed, 20 Sep 2023 16:27:29 +0200 Subject: [PATCH 121/186] Now we don't send the snapshot twice on save --- frontend/src/app/edit/edit.component.ts | 20 +++++++++++-------- .../app/services/version.control.service.ts | 9 +++------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index c833a6c9..790836e6 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -349,7 +349,7 @@ export class EditComponent implements AfterViewInit, OnInit { }); } - saveDocumentContents() { + async saveDocumentContents() { // Save the document quill content to localStorage when changes occur // const editableArea: HTMLElement = this.elementRef.nativeElement.querySelector('.document-editor__editable'); @@ -357,28 +357,32 @@ export class EditComponent implements AfterViewInit, OnInit { this.prevVersion as string, this.editor.getData() ); - this.versionControlService.saveDiff( - this.editService.getMarkdownID() as string, - diff, - this.editor.getData() - ); + this.prevVersion = this.editor.getData(); let contents = this.editor.getData(); let pass = this.editService.getDocumentPassword(); if (pass != '' && pass != undefined) { - this.fileService.saveDocument( + await this.fileService.saveDocument( this.fileService.encryptSafeLockDocument(contents, pass), this.editService.getMarkdownID(), this.editService.getPath(), this.editService.getSafeLock() ); + await this.versionControlService.saveDiff( + this.editService.getMarkdownID() as string, + diff + ); } else { - this.fileService.saveDocument( + await this.fileService.saveDocument( contents, this.editService.getMarkdownID(), this.editService.getPath(), this.editService.getSafeLock() ); + await this.versionControlService.saveDiff( + this.editService.getMarkdownID() as string, + diff + ); // const latestVersionContent = // this.versionControlService.getLatestVersionContent(); diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index e7db1a23..a88c5102 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -248,11 +248,10 @@ export class VersionControlService { saveDiff( fileID: string, - content: string, - snapshotPayload: string + content: string ): Promise { return new Promise((resolve, reject) => { - this.sendSaveDiff(fileID, content, snapshotPayload).subscribe({ + this.sendSaveDiff(fileID, content).subscribe({ next: (response: HttpResponse) => { if (response.status === 200) { resolve(true); @@ -266,8 +265,7 @@ export class VersionControlService { sendSaveDiff( markdownID: string, - content: string, - snapshotPayload: string + content: string ): Observable> { const environmentURL = environment.apiURL; const url = `${environmentURL}version_control/save_diff`; @@ -277,7 +275,6 @@ export class VersionControlService { body.UserID = this.userService.getUserID() as number; body.Content = content; body.MarkdownID = markdownID; - body.SnapshotPayload = snapshotPayload; const headers = new HttpHeaders().set( 'Authorization', 'Bearer ' + this.userService.getAuthToken() From 707e794128d7c5269320cca2d1a24d5b7bb2bccc Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 17:17:55 +0200 Subject: [PATCH 122/186] Removed space --- backend/src/diffs/entities/diffs.entity.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/diffs/entities/diffs.entity.ts b/backend/src/diffs/entities/diffs.entity.ts index a128dca7..1524d838 100644 --- a/backend/src/diffs/entities/diffs.entity.ts +++ b/backend/src/diffs/entities/diffs.entity.ts @@ -23,7 +23,7 @@ export class Diff { default: () => 'CURRENT_TIMESTAMP(3)', onUpdate: 'CURRENT_TIMESTAMP(3)', }) - LastModified: Date; + LastModified: Date; @Column() HasBeenUsed: boolean; From e2d9636f36ffee973091ed95b3bf02fbc9df0d2e Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 17:47:55 +0200 Subject: [PATCH 123/186] uncommented some logic --- frontend/src/app/edit/edit.component.ts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 790836e6..92679c8b 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -383,21 +383,21 @@ export class EditComponent implements AfterViewInit, OnInit { this.editService.getMarkdownID() as string, diff ); - // const latestVersionContent = - // this.versionControlService.getLatestVersionContent(); + const latestVersionContent = + this.versionControlService.getLatestVersionContent(); - // const readablePatch = this.versionControlService.getReadablePatch( - // latestVersionContent, - // contents - // ); - // const markdownID = this.editService.getMarkdownID(); + const readablePatch = this.versionControlService.getReadablePatch( + latestVersionContent, + contents + ); + const markdownID = this.editService.getMarkdownID(); - // this.versionControlService.saveDiff( - // readablePatch, - // markdownID ? (markdownID as string) : '' - // ); + this.versionControlService.saveDiff( + readablePatch, + markdownID ? (markdownID as string) : '' + ); - // this.versionControlService.setLatestVersionContent(contents); + this.versionControlService.setLatestVersionContent(contents); } } From 4698c6a597e2e12b322a62d34b6c13288dc68d5a Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Wed, 20 Sep 2023 17:50:29 +0200 Subject: [PATCH 124/186] Added functions for ordering circular array logically --- backend/src/diffs/diffs.service.ts | 49 ++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/backend/src/diffs/diffs.service.ts b/backend/src/diffs/diffs.service.ts index ddc039b5..2b63466b 100644 --- a/backend/src/diffs/diffs.service.ts +++ b/backend/src/diffs/diffs.service.ts @@ -14,6 +14,8 @@ export class DiffsService { private diffRepository: Repository, ) {} + ///===----------------------------------------------------- + async getDiff( diffDTO: DiffDTO, nextDiffID: number, @@ -29,6 +31,8 @@ export class DiffsService { return diff; } + ///===----------------------------------------------------- + async updateDiff( diffDTO: DiffDTO, nextDiffID: number, @@ -51,6 +55,8 @@ export class DiffsService { await this.diffRepository.save(diff); } + ///===----------------------------------------------------- + async createDiffs( markdownFileDTO: MarkdownFileDTO, snapshotIDs: string[], @@ -91,6 +97,8 @@ export class DiffsService { await this.diffRepository.insert(diffRecords); } + ///===----------------------------------------------------- + async deleteDiffs( markdownFileDTO: MarkdownFileDTO, ) { @@ -99,14 +107,51 @@ export class DiffsService { }); } + ///===----------------------------------------------------- + async getAllDiffs( - markdownFileDTO: MarkdownFileDTO, + markdownID: string, ) { return await this.diffRepository.find({ where: { - MarkdownID: markdownFileDTO.MarkdownID, + MarkdownID: markdownID, HasBeenUsed: true, }, }); } + + ///===----------------------------------------------------- + + getLogicalIndex( + s3Index: number, + nextDiffID: number, + arr_len: number, + ): number { + return ( + (s3Index - nextDiffID + arr_len) % arr_len + ); + } + + ///===----------------------------------------------------- + + async getLogicalDiffOrder( + diffDTOs: DiffDTO[], + nextDiffID: number, + ) { + const arrLength = parseInt( + process.env.MAX_DIFFS, + ); + const logicalOrder: DiffDTO[] = new Array( + arrLength, + ).fill(0); + for (let idx = 0; idx < arrLength; idx++) { + const logicalIndex = this.getLogicalIndex( + diffDTOs[idx].S3DiffID, + nextDiffID, + arrLength, + ); + logicalOrder[logicalIndex] = diffDTOs[idx]; + } + return logicalOrder; + } } From c2b7817769606c9c538f7da93e8b6795dd147d6d Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Wed, 20 Sep 2023 17:50:56 +0200 Subject: [PATCH 125/186] Added various functions for retrieving diffs and snapshots --- backend/src/s3/s3.service.ts | 122 ++++++++++++++++++++++++++++++++++- 1 file changed, 121 insertions(+), 1 deletion(-) diff --git a/backend/src/s3/s3.service.ts b/backend/src/s3/s3.service.ts index 5d490b8e..8d2b9c99 100644 --- a/backend/src/s3/s3.service.ts +++ b/backend/src/s3/s3.service.ts @@ -270,6 +270,124 @@ export class S3Service { ///===---------------------------------------------------- + async getDiffSet( + S3DiffIDs: number[], + userID: number, + markdownID: string, + ) { + const filePath = `${userID}/${markdownID}`; + + let diffDTOs: DiffDTO[] = []; + + for (let i = 0; i < S3DiffIDs.length; i++) { + try { + const response = await this.s3Client.send( + new GetObjectCommand({ + Bucket: this.awsS3BucketName, + Key: `${filePath}/diff/${S3DiffIDs[i]}`, + }), + ); + + const diffDTO = new DiffDTO(); + diffDTO.Content = + await response.Body.transformToString(); + diffDTOs.push(diffDTO); + } catch (err) { + console.log( + `S3 diff ${i} read error: ` + err, + ); + return undefined; + } + } + return diffDTOs; + } + + ///===---------------------------------------------------- + + async getSnapshot( + S3SnapshotID: number, + userID: number, + markdownID: string, + ) { + const filePath = `${userID}/${markdownID}`; + + try { + const response = await this.s3Client.send( + new GetObjectCommand({ + Bucket: this.awsS3BucketName, + Key: `${filePath}/snapshot/${S3SnapshotID}`, + }), + ); + + const snapshotDTO = new SnapshotDTO(); + snapshotDTO.Content = + await response.Body.transformToString(); + return snapshotDTO; + } catch (err) { + console.log( + `S3 snapshot ${S3SnapshotID} read error: ` + + err, + ); + return undefined; + } + } + + ///===---------------------------------------------------- + + async saveOldestSnapshot(diffDTO: DiffDTO) { + const filePath = `${diffDTO.UserID}/${diffDTO.MarkdownID}`; + + const markdownFileDTO = new MarkdownFileDTO(); + markdownFileDTO.UserID = diffDTO.UserID; + markdownFileDTO.MarkdownID = + diffDTO.MarkdownID; + + const file = await this.retrieveFile( + markdownFileDTO, + ); + + try { + await this.s3Client.send( + new PutObjectCommand({ + Bucket: this.awsS3BucketName, + Key: `${filePath}/snapshot/${process.env.MAX_SNAPSHOTS}`, + Body: file.Content, + }), + ); + } catch (err) { + console.log('Write File Error: ' + err); + return undefined; + } + return diffDTO; + } + + ///===---------------------------------------------------- + + async retrieveOldestSnapshot( + markdownFileDTO: MarkdownFileDTO, + ) { + const filePath = `${markdownFileDTO.UserID}/${markdownFileDTO.MarkdownID}`; + + try { + const response = await this.s3Client.send( + new GetObjectCommand({ + Bucket: this.awsS3BucketName, + Key: `${filePath}/snapshot/${process.env.MAX_SNAPSHOTS}`, + }), + ); + + markdownFileDTO.Content = + await response.Body.transformToString(); + markdownFileDTO.Size = + response.ContentLength; + } catch (err) { + console.log('Read File Error: ' + err); + return undefined; + } + } + + ///===---------------------------------------------------- + /** * @notes every snapshot is associated with n previous diffs. * The IDs of the associated diffs do not change unless @@ -278,6 +396,7 @@ export class S3Service { async getAllDiffsForSnapshot( snapshotDTO: SnapshotDTO, + isOldestSnapshot: boolean, ) { const filePath = `${snapshotDTO.UserID}/${snapshotDTO.MarkdownID}`; @@ -353,7 +472,7 @@ export class S3Service { // Create snapshot objects for ( let j = 0; - j < parseInt(process.env.MAX_SNAPSHOTS); + j < parseInt(process.env.MAX_SNAPSHOTS) + 1; // one extra for the oldest snapshot j++ ) { try { @@ -420,6 +539,7 @@ export class S3Service { console.log('Write File Error: ' + err); return undefined; } + return diffDTO; } From 10d9c4d13e7cf1aa98414c5e984fc98b6090cd6a Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 17:51:15 +0200 Subject: [PATCH 126/186] variable name refactor --- frontend/src/app/edit/edit.component.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 92679c8b..7c7c39f8 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -45,7 +45,7 @@ export class EditComponent implements AfterViewInit, OnInit { noAssetsAvailable: boolean = false; isTouchScreen: boolean = false; sideBarTab: boolean = false; - prevVersion: string = ''; + previousVersion: string = ''; public editor: DecoupledEditor = {} as DecoupledEditor; public globalAreaReference!: HTMLElement; @@ -108,7 +108,7 @@ export class EditComponent implements AfterViewInit, OnInit { } async ngOnInit(): Promise { - this.prevVersion = this.editService.getContent() as string; + this.previousVersion = this.editService.getContent() as string; this.speedDialItems = [ { icon: 'pi pi-pencil', @@ -354,11 +354,11 @@ export class EditComponent implements AfterViewInit, OnInit { // const editableArea: HTMLElement = this.elementRef.nativeElement.querySelector('.document-editor__editable'); const diff = this.versionControlService.getReadablePatch( - this.prevVersion as string, + this.previousVersion as string, this.editor.getData() ); - this.prevVersion = this.editor.getData(); + this.previousVersion = this.editor.getData(); let contents = this.editor.getData(); let pass = this.editService.getDocumentPassword(); if (pass != '' && pass != undefined) { From 67eda7a8ed8b3f419f58d227fcae7636c832c1ff Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Wed, 20 Sep 2023 17:51:16 +0200 Subject: [PATCH 127/186] Added creation of addtional base snapshot --- backend/src/snapshots/snapshots.service.ts | 50 +++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/backend/src/snapshots/snapshots.service.ts b/backend/src/snapshots/snapshots.service.ts index 69a5d783..9662e4c8 100644 --- a/backend/src/snapshots/snapshots.service.ts +++ b/backend/src/snapshots/snapshots.service.ts @@ -4,6 +4,7 @@ import { Repository } from 'typeorm'; import { Snapshot } from './entities/snapshots.entity'; import { MarkdownFileDTO } from '../markdown_files/dto/markdown_file.dto'; import * as CryptoJS from 'crypto-js'; +import { SnapshotDTO } from './dto/snapshot.dto'; @Injectable() export class SnapshotService { @@ -21,7 +22,7 @@ export class SnapshotService { const snapshotRecords = []; for ( let i = 0; - i < parseInt(process.env.MAX_SNAPSHOTS); + i < parseInt(process.env.MAX_SNAPSHOTS) + 1; i++ ) { const snapshotID = CryptoJS.SHA256( @@ -89,4 +90,51 @@ export class SnapshotService { HasBeenUsed: true, }); } + + ///===----------------------------------------------------- + + getLogicalIndex( + s3Index: number, + nextSnapshotID: number, + arr_len: number, + ): number { + return ( + (s3Index - nextSnapshotID + arr_len) % + arr_len + ); + } + + ///===----------------------------------------------------- + + async getLogicalSnapshotOrder( + snapshotDTOs: SnapshotDTO[], + nextDiffID: number, + ) { + const arrLength = parseInt( + process.env.MAX_DIFFS, + ); + const logicalOrder: SnapshotDTO[] = new Array( + arrLength, + ).fill(0); + for (let idx = 0; idx < arrLength; idx++) { + const logicalIndex = this.getLogicalIndex( + snapshotDTOs[idx].S3SnapshotID, + nextDiffID, + arrLength, + ); + logicalOrder[logicalIndex] = + snapshotDTOs[idx]; + } + return logicalOrder; + } + + ///===----------------------------------------------------- + + async getSnapshotByID(snapshotID: string) { + return await this.snapshotRepository.findOne({ + where: { + SnapshotID: snapshotID, + }, + }); + } } From cf65ff52fe6e6d57778eb6807ebf360276746230 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Wed, 20 Sep 2023 17:51:56 +0200 Subject: [PATCH 128/186] Added OldestSnapshot boolean --- backend/src/snapshots/dto/snapshot.dto.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/src/snapshots/dto/snapshot.dto.ts b/backend/src/snapshots/dto/snapshot.dto.ts index 1cb34e81..f1d88964 100644 --- a/backend/src/snapshots/dto/snapshot.dto.ts +++ b/backend/src/snapshots/dto/snapshot.dto.ts @@ -6,6 +6,7 @@ export class SnapshotDTO { S3SnapshotID: number; LastModified: Date; Content: string; + OldestSnapshot: boolean constructor() { this.SnapshotID = undefined; @@ -15,5 +16,6 @@ export class SnapshotDTO { this.S3SnapshotID = undefined; this.LastModified = undefined; this.Content = undefined; + this.OldestSnapshot = false; } } \ No newline at end of file From 7144608a7ce1e7af19c450c895705930e67e0db2 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Wed, 20 Sep 2023 17:52:24 +0200 Subject: [PATCH 129/186] Added various versioning functions --- .../version_control.controller.ts | 113 ++++++++++++------ 1 file changed, 74 insertions(+), 39 deletions(-) diff --git a/backend/src/version_control/version_control.controller.ts b/backend/src/version_control/version_control.controller.ts index 2d1ff9f4..bd0198ad 100644 --- a/backend/src/version_control/version_control.controller.ts +++ b/backend/src/version_control/version_control.controller.ts @@ -13,6 +13,8 @@ import { VersionHistoryDTO } from './dto/version_history.dto'; import { version } from 'os'; import { SnapshotService } from '../snapshots/snapshots.service'; import { DiffsService } from '../diffs/diffs.service'; +import { MarkdownFilesService } from '../markdown_files/markdown_files.service'; +import { VersionSetDTO } from './dto/version_set.dto'; @Controller('version_control') export class VersionControlController { @@ -20,6 +22,7 @@ export class VersionControlController { private readonly versionControlService: VersionControlService, private readonly snapshotService: SnapshotService, private readonly diffService: DiffsService, + private readonly markdownFileService: MarkdownFilesService, ) {} ///===---------------------------------------------------- @@ -31,42 +34,6 @@ export class VersionControlController { ///===---------------------------------------------------- - // @Post('get_diff') - // getDiff(@Body() diffDTO: DiffDTO) { - // return this.versionControlService.getDiff( - // diffDTO, - // ); - // } - - // ///===---------------------------------------------------- - - // @Post('get_all_diffs') - // getAllDiffs(@Body() snapshotDTO: SnapshotDTO) { - // return this.versionControlService.getAllDiffsForSnapshot( - // snapshotDTO, - // ); - // } - - ///===---------------------------------------------------- - - // @Post('get_diff_set') - // getDiffSet(@Body() snapshotDTO: SnapshotDTO) { - // return this.versionControlService.getDiffSetForSnapshot( - // snapshotDTO, - // ); - // } - - ///===---------------------------------------------------- - - // @Post('save_snapshot') - // saveSnapshot(@Body() snapshotDTO: SnapshotDTO) { - // this.versionControlService.saveSnapshot( - // snapshotDTO, - // ); - // } - - ///===---------------------------------------------------- - @Post('get_all_snapshots') @HttpCode(HttpStatus.OK) getAllSnapshots( @@ -79,6 +46,18 @@ export class VersionControlController { ///===---------------------------------------------------- + @Post('get_history_set') + @HttpCode(HttpStatus.OK) + getHistorySet( + @Body() versionSetDTO: VersionSetDTO, + ) { + return this.versionControlService.getHistorySet( + versionSetDTO, + ); + } + + ///===---------------------------------------------------- + @Post('load_history') @HttpCode(HttpStatus.OK) async loadHistory( @@ -87,30 +66,86 @@ export class VersionControlController { const versionHistoryDTO = new VersionHistoryDTO(); + // Populate snapshot history + + const nextSnapshotID = + await this.markdownFileService.getNextSnapshotID( + markdownFileDTO.MarkdownID, + ); + const snapshots = await this.snapshotService.getAllSnapshots( markdownFileDTO, ); - const snapshotDTOs = + let snapshotDTOs = await this.versionControlService.convertSnapshotsToSnapshotDTOs( snapshots, ); + if ( + snapshotDTOs.length < + parseInt(process.env.MAX_SNAPSHOTS) + ) { + const baseSnapshotDTO = + new SnapshotDTO(); + baseSnapshotDTO.MarkdownID = + markdownFileDTO.MarkdownID; + baseSnapshotDTO.OldestSnapshot = true; + snapshotDTOs.unshift(baseSnapshotDTO); + } + + if ( + snapshotDTOs.length === + parseInt(process.env.MAX_SNAPSHOTS) + ) { + snapshotDTOs = + await this.snapshotService.getLogicalSnapshotOrder( + snapshotDTOs, + nextSnapshotID, + ); + } + versionHistoryDTO.SnapshotHistory = snapshotDTOs; + // Populate diff history + + const nextDiffID = + await this.markdownFileService.getNextDiffID( + markdownFileDTO.MarkdownID, + ); + const diffs = await this.diffService.getAllDiffs( - markdownFileDTO, + markdownFileDTO.MarkdownID, ); - const diffDTOs = + let diffDTOs = await this.versionControlService.convertDiffsToDiffDTOs( diffs, ); + if ( + diffDTOs.length === + parseInt(process.env.MAX_DIFFS) + ) { + diffDTOs = + await this.diffService.getLogicalDiffOrder( + diffDTOs, + nextDiffID, + ); + } + versionHistoryDTO.DiffHistory = diffDTOs; + //==------------------------------- + console.log( + 'nextSnapshotID: ', + nextSnapshotID, + ); + console.log('nextDiffID: ', nextDiffID); + console.log(versionHistoryDTO); + //==------------------------------- return versionHistoryDTO; } } From 6747dd8dd82fb376e5dd646b8f3123e85232226a Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Wed, 20 Sep 2023 17:52:48 +0200 Subject: [PATCH 130/186] Added boolean logic changes --- .../version_control.service.ts | 59 ++++++++++++++++++- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index a35133bb..a97723f2 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -8,6 +8,9 @@ import { SnapshotDTO } from '../snapshots/dto/snapshot.dto'; import { SnapshotService } from '../snapshots/snapshots.service'; import { Snapshot } from '../snapshots/entities/snapshots.entity'; import { Diff } from '../diffs/entities/diffs.entity'; +import { VersionHistoryDTO } from './dto/version_history.dto'; +import { VersionSetDTO } from './dto/version_set.dto'; +import { version } from 'os'; @Injectable() export class VersionControlService { @@ -33,6 +36,15 @@ export class VersionControlService { nextDiffID, ); + // Special case: first diff, first pass + if ( + nextDiffID === 0 && + !nextDiff.HasBeenUsed + ) { + this.s3Service.saveOldestSnapshot(diffDTO); + // return ? + } + this.s3Service.saveDiff(diffDTO, nextDiffID); if ( @@ -40,7 +52,7 @@ export class VersionControlService { nextDiff.HasBeenUsed ) { if ( - nextDiffID % + (nextDiffID + 1) % parseInt( process.env.DIFFS_PER_SNAPSHOT, ) === @@ -236,7 +248,7 @@ export class VersionControlService { ///===---------------------------------------------------- async convertDiffsToDiffDTOs(diffs: Diff[]) { - const diffDTOs = []; + const diffDTOs: DiffDTO[] = []; for (let i = 0; i < diffs.length; i++) { const diff = diffs[i]; const diffDTO = new DiffDTO(); @@ -250,4 +262,47 @@ export class VersionControlService { } return diffDTOs; } + + ///===---------------------------------------------------- + + async getHistorySet( + versionSetDTO: VersionSetDTO, + ) { + const diffs = + await this.diffService.getAllDiffs( + versionSetDTO.MarkdownID, + ); + + const S3DiffIDs: number[] = diffs.map( + (diff) => diff.S3DiffID, + ); + + const diffDTOs = + await this.s3Service.getDiffSet( + S3DiffIDs, + versionSetDTO.UserID, + versionSetDTO.MarkdownID, + ); + + const snapshot = + await this.snapshotService.getSnapshotByID( + versionSetDTO.SnapshotID, + ); + + const snapshotDTO = + await this.s3Service.getSnapshot( + snapshot.S3SnapshotID, + versionSetDTO.UserID, + versionSetDTO.MarkdownID, + ); + + const versionHistoryDTO = + new VersionHistoryDTO(); + + versionHistoryDTO.DiffHistory = diffDTOs; + versionHistoryDTO.SnapshotHistory = [ + snapshotDTO, + ]; + return versionHistoryDTO; + } } From 3ae0d8bc295eed776c664f5069a741546647f624 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Wed, 20 Sep 2023 17:53:11 +0200 Subject: [PATCH 131/186] Added an OldestSnapshot field --- frontend/src/app/services/dto/snapshot.dto.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/app/services/dto/snapshot.dto.ts b/frontend/src/app/services/dto/snapshot.dto.ts index 49eca70b..305818f6 100644 --- a/frontend/src/app/services/dto/snapshot.dto.ts +++ b/frontend/src/app/services/dto/snapshot.dto.ts @@ -3,11 +3,13 @@ export class SnapshotDTO { MarkdownID: string; SnapshotNumber: number; Content: string; + OldestSnapshot: boolean; constructor() { this.UserID = 0; this.MarkdownID = ''; this.SnapshotNumber = 0; this.Content = ''; + this.OldestSnapshot = false; } } From 2c9e86dea23d4671074c7a2a266068f39f873306 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Wed, 20 Sep 2023 18:01:52 +0200 Subject: [PATCH 132/186] Created service to handle http requests to backend --- .../app/services/versioning-api.service.spec.ts | 16 ++++++++++++++++ .../src/app/services/versioning-api.service.ts | 9 +++++++++ 2 files changed, 25 insertions(+) create mode 100644 frontend/src/app/services/versioning-api.service.spec.ts create mode 100644 frontend/src/app/services/versioning-api.service.ts diff --git a/frontend/src/app/services/versioning-api.service.spec.ts b/frontend/src/app/services/versioning-api.service.spec.ts new file mode 100644 index 00000000..e811992d --- /dev/null +++ b/frontend/src/app/services/versioning-api.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { VersioningApiService } from './versioning-api.service'; + +describe('VersioningApiService', () => { + let service: VersioningApiService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(VersioningApiService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/services/versioning-api.service.ts b/frontend/src/app/services/versioning-api.service.ts new file mode 100644 index 00000000..45b6c669 --- /dev/null +++ b/frontend/src/app/services/versioning-api.service.ts @@ -0,0 +1,9 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class VersioningApiService { + + constructor() { } +} From a3a31559b849672d6162689c15db02685d4d564f Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Wed, 20 Sep 2023 18:04:37 +0200 Subject: [PATCH 133/186] Moved over functionality to versioning-api service --- .../app/services/versioning-api.service.ts | 149 +++++++++++++++++- 1 file changed, 148 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/services/versioning-api.service.ts b/frontend/src/app/services/versioning-api.service.ts index 45b6c669..b987430b 100644 --- a/frontend/src/app/services/versioning-api.service.ts +++ b/frontend/src/app/services/versioning-api.service.ts @@ -1,9 +1,156 @@ +import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs'; +import { environment } from 'src/environments/environment'; +import { VersionSetDTO } from './dto/version_set.dto'; +import { UserService } from './user.service'; +import { DiffDTO } from './dto/diff.dto'; +import { SnapshotDTO } from './dto/snapshot.dto'; +import { MarkdownFileDTO } from './dto/markdown_file.dto'; @Injectable({ providedIn: 'root' }) export class VersioningApiService { - constructor() { } + constructor( + private http: HttpClient, + private userService: UserService + ) { } + + saveDiff( + fileID: string, + content: string + ): Promise { + return new Promise((resolve, reject) => { + this.sendSaveDiff(fileID, content).subscribe({ + next: (response: HttpResponse) => { + if (response.status === 200) { + resolve(true); + } else { + resolve(false); + } + }, + }); + }); + } + + sendSaveDiff( + markdownID: string, + content: string + ): Observable> { + const environmentURL = environment.apiURL; + const url = `${environmentURL}version_control/save_diff`; + console.log(url); + const body = new DiffDTO(); + + body.UserID = this.userService.getUserID() as number; + body.Content = content; + body.MarkdownID = markdownID; + const headers = new HttpHeaders().set( + 'Authorization', + 'Bearer ' + this.userService.getAuthToken() + ); + console.log(body); + return this.http.post(url, body, { headers, observe: 'response' }); + } + + retrieveAllSnapshots(markdownID: string): Promise { + return new Promise((resolve, reject) => { + this.sendRetrieveAllSnapshots(markdownID).subscribe({ + next: (response: HttpResponse) => { + console.log(response); + if (response.status === 200) { + resolve(response.body); + } else { + resolve(null); + } + }, + }); + }); + } + + sendRetrieveAllSnapshots(markdownID: string): Observable> { + const environmentURL = environment.apiURL; + const url = `${environmentURL}version_control/get_all_snapshots`; + console.log(url); + const body = new SnapshotDTO(); + + body.UserID = this.userService.getUserID() as number; + body.MarkdownID = markdownID; + const headers = new HttpHeaders().set( + 'Authorization', + 'Bearer ' + this.userService.getAuthToken() + ); + return this.http.post(url, body, { headers, observe: 'response' }); + } + + retrieveAllHistory(markdownID: string): Promise { + return new Promise((resolve, reject) => { + this.sendRetrieveAllHistory(markdownID).subscribe({ + next: (response: HttpResponse) => { + console.log('Backend data response: ', response); + if (response.status === 200) { + resolve(response.body); + } else { + resolve(null); + } + }, + }); + }); + } + + sendRetrieveAllHistory(markdownID: string): Observable> { + const environmentURL = environment.apiURL; + const url = `${environmentURL}version_control/load_history`; + console.log(url); + const body = new MarkdownFileDTO(); + + body.UserID = this.userService.getUserID() as number; + body.MarkdownID = markdownID; + const headers = new HttpHeaders().set( + 'Authorization', + 'Bearer ' + this.userService.getAuthToken() + ); + return this.http.post(url, body, { headers, observe: 'response' }); + } + loadHistorySet( + markdownID: string, + diffHistory: string[], + snapshotID: string + ) { + return new Promise((resolve, reject) => { + this.sendLoadHistorySet(markdownID, diffHistory, snapshotID).subscribe({ + next: (response: HttpResponse) => { + console.log(response); + if (response.status === 200) { + resolve(response.body); + } else { + resolve(null); + } + }, + }); + }); + } + + sendLoadHistorySet( + markdownID: string, + diffHistory: string[], + snapshotID: string + ): Observable> { + const environmentURL = environment.apiURL; + const url = `${environmentURL}version_control/get_history_set`; + const body = new VersionSetDTO(); + + body.UserID = this.userService.getUserID() as number; + body.MarkdownID = markdownID; + body.DiffHistory = diffHistory; + body.SnapshotID = snapshotID; + const headers = new HttpHeaders().set( + 'Authorization', + 'Bearer ' + this.userService.getAuthToken() + ); + return this.http.post(url, body, { headers, observe: 'response' }); + } + } From 9a494ea66fa484ecab44638993e85252e6fbf67b Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 18:05:01 +0200 Subject: [PATCH 134/186] Refactored previousVersion --- frontend/src/app/edit/edit.component.ts | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 7c7c39f8..c84239c9 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -45,7 +45,6 @@ export class EditComponent implements AfterViewInit, OnInit { noAssetsAvailable: boolean = false; isTouchScreen: boolean = false; sideBarTab: boolean = false; - previousVersion: string = ''; public editor: DecoupledEditor = {} as DecoupledEditor; public globalAreaReference!: HTMLElement; @@ -108,7 +107,6 @@ export class EditComponent implements AfterViewInit, OnInit { } async ngOnInit(): Promise { - this.previousVersion = this.editService.getContent() as string; this.speedDialItems = [ { icon: 'pi pi-pencil', @@ -353,12 +351,6 @@ export class EditComponent implements AfterViewInit, OnInit { // Save the document quill content to localStorage when changes occur // const editableArea: HTMLElement = this.elementRef.nativeElement.querySelector('.document-editor__editable'); - const diff = this.versionControlService.getReadablePatch( - this.previousVersion as string, - this.editor.getData() - ); - - this.previousVersion = this.editor.getData(); let contents = this.editor.getData(); let pass = this.editService.getDocumentPassword(); if (pass != '' && pass != undefined) { @@ -368,10 +360,6 @@ export class EditComponent implements AfterViewInit, OnInit { this.editService.getPath(), this.editService.getSafeLock() ); - await this.versionControlService.saveDiff( - this.editService.getMarkdownID() as string, - diff - ); } else { await this.fileService.saveDocument( contents, @@ -379,10 +367,6 @@ export class EditComponent implements AfterViewInit, OnInit { this.editService.getPath(), this.editService.getSafeLock() ); - await this.versionControlService.saveDiff( - this.editService.getMarkdownID() as string, - diff - ); const latestVersionContent = this.versionControlService.getLatestVersionContent(); From 3e006677bdc74081e1560d45fabd4e18230a7885 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 18:06:36 +0200 Subject: [PATCH 135/186] linter fixes --- backend/src/version_control/version_control.controller.ts | 4 +--- backend/src/version_control/version_control.service.ts | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/backend/src/version_control/version_control.controller.ts b/backend/src/version_control/version_control.controller.ts index bd0198ad..bf80d6c8 100644 --- a/backend/src/version_control/version_control.controller.ts +++ b/backend/src/version_control/version_control.controller.ts @@ -10,7 +10,6 @@ import { DiffDTO } from '../diffs/dto/diffs.dto'; import { SnapshotDTO } from '../snapshots/dto/snapshot.dto'; import { MarkdownFileDTO } from 'src/markdown_files/dto/markdown_file.dto'; import { VersionHistoryDTO } from './dto/version_history.dto'; -import { version } from 'os'; import { SnapshotService } from '../snapshots/snapshots.service'; import { DiffsService } from '../diffs/diffs.service'; import { MarkdownFilesService } from '../markdown_files/markdown_files.service'; @@ -87,8 +86,7 @@ export class VersionControlController { snapshotDTOs.length < parseInt(process.env.MAX_SNAPSHOTS) ) { - const baseSnapshotDTO = - new SnapshotDTO(); + const baseSnapshotDTO = new SnapshotDTO(); baseSnapshotDTO.MarkdownID = markdownFileDTO.MarkdownID; baseSnapshotDTO.OldestSnapshot = true; diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index a97723f2..8aa7350a 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -10,7 +10,6 @@ import { Snapshot } from '../snapshots/entities/snapshots.entity'; import { Diff } from '../diffs/entities/diffs.entity'; import { VersionHistoryDTO } from './dto/version_history.dto'; import { VersionSetDTO } from './dto/version_set.dto'; -import { version } from 'os'; @Injectable() export class VersionControlService { From 48c602f06e9a0e23cf12f3b820c4cfc32f98c984 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 18:11:55 +0200 Subject: [PATCH 136/186] linter fixes --- backend/src/diffs/diffs.service.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/src/diffs/diffs.service.ts b/backend/src/diffs/diffs.service.ts index 2b63466b..7d456a1f 100644 --- a/backend/src/diffs/diffs.service.ts +++ b/backend/src/diffs/diffs.service.ts @@ -109,9 +109,7 @@ export class DiffsService { ///===----------------------------------------------------- - async getAllDiffs( - markdownID: string, - ) { + async getAllDiffs(markdownID: string) { return await this.diffRepository.find({ where: { MarkdownID: markdownID, From 8d3c4875260a6d4a185ce06bcd3c9188c157f2f0 Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 18:11:07 +0200 Subject: [PATCH 137/186] Removed special case --- backend/src/version_control/version_control.service.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index 8aa7350a..9efad2b8 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -35,15 +35,6 @@ export class VersionControlService { nextDiffID, ); - // Special case: first diff, first pass - if ( - nextDiffID === 0 && - !nextDiff.HasBeenUsed - ) { - this.s3Service.saveOldestSnapshot(diffDTO); - // return ? - } - this.s3Service.saveDiff(diffDTO, nextDiffID); if ( From 929f9119dab9b2034a3c7526c03822ea01f8bf6d Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 18:14:00 +0200 Subject: [PATCH 138/186] More linter fixes --- backend/src/s3/s3.service.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/src/s3/s3.service.ts b/backend/src/s3/s3.service.ts index 8d2b9c99..d5078d7a 100644 --- a/backend/src/s3/s3.service.ts +++ b/backend/src/s3/s3.service.ts @@ -7,7 +7,7 @@ import { PutObjectCommand, S3Client, } from '@aws-sdk/client-s3'; -import * as fs from 'fs/promises'; // for local storage +// import * as fs from 'fs/promises'; // for local storage import * as CryptoJS from 'crypto-js'; import { AssetDTO } from '../assets/dto/asset.dto'; import { DiffDTO } from '../diffs/dto/diffs.dto'; @@ -277,7 +277,7 @@ export class S3Service { ) { const filePath = `${userID}/${markdownID}`; - let diffDTOs: DiffDTO[] = []; + const diffDTOs: DiffDTO[] = []; for (let i = 0; i < S3DiffIDs.length; i++) { try { @@ -396,11 +396,10 @@ export class S3Service { async getAllDiffsForSnapshot( snapshotDTO: SnapshotDTO, - isOldestSnapshot: boolean, ) { const filePath = `${snapshotDTO.UserID}/${snapshotDTO.MarkdownID}`; - let diffDTOs: DiffDTO[] = []; + const diffDTOs: DiffDTO[] = []; const firstDiffID = snapshotDTO.S3SnapshotID * @@ -551,7 +550,7 @@ export class S3Service { ) { const filePath = `${snapshotDTO.UserID}/${snapshotDTO.MarkdownID}`; - let snapshotDTOs: SnapshotDTO[] = []; + const snapshotDTOs: SnapshotDTO[] = []; for ( let i = 0; From e1e6eb860c6003e0f47f3f97f5f04796c350bbdd Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 18:22:18 +0200 Subject: [PATCH 139/186] Added support for safeLock --- frontend/src/app/edit/edit.component.ts | 27 ++++++++++++++++--------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index c84239c9..ee0c0aa0 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -353,6 +353,16 @@ export class EditComponent implements AfterViewInit, OnInit { let contents = this.editor.getData(); let pass = this.editService.getDocumentPassword(); + + const latestVersionContent = + this.versionControlService.getLatestVersionContent(); + + const readablePatch = this.versionControlService.getReadablePatch( + latestVersionContent, + contents + ); + const markdownID = this.editService.getMarkdownID(); + if (pass != '' && pass != undefined) { await this.fileService.saveDocument( this.fileService.encryptSafeLockDocument(contents, pass), @@ -360,6 +370,11 @@ export class EditComponent implements AfterViewInit, OnInit { this.editService.getPath(), this.editService.getSafeLock() ); + + this.versionControlService.saveDiff( + this.fileService.encryptSafeLockDocument(readablePatch, pass), + markdownID ? (markdownID as string) : '' + ); } else { await this.fileService.saveDocument( contents, @@ -367,22 +382,14 @@ export class EditComponent implements AfterViewInit, OnInit { this.editService.getPath(), this.editService.getSafeLock() ); - const latestVersionContent = - this.versionControlService.getLatestVersionContent(); - - const readablePatch = this.versionControlService.getReadablePatch( - latestVersionContent, - contents - ); - const markdownID = this.editService.getMarkdownID(); this.versionControlService.saveDiff( readablePatch, markdownID ? (markdownID as string) : '' ); - - this.versionControlService.setLatestVersionContent(contents); } + + this.versionControlService.setLatestVersionContent(contents); } hideSideBar() { From 620c010220b6544ee06b1c8987d9b59769bd8b49 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 18:36:01 +0200 Subject: [PATCH 140/186] Variable mismatch --- frontend/src/app/edit/edit.component.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index ee0c0aa0..7bd2f1c0 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -372,8 +372,8 @@ export class EditComponent implements AfterViewInit, OnInit { ); this.versionControlService.saveDiff( - this.fileService.encryptSafeLockDocument(readablePatch, pass), - markdownID ? (markdownID as string) : '' + markdownID ? (markdownID as string) : '', + this.fileService.encryptSafeLockDocument(readablePatch, pass) ); } else { await this.fileService.saveDocument( @@ -384,8 +384,8 @@ export class EditComponent implements AfterViewInit, OnInit { ); this.versionControlService.saveDiff( - readablePatch, - markdownID ? (markdownID as string) : '' + markdownID ? (markdownID as string) : '', + readablePatch ); } From 8dc1ef89ad28280fa253ac7f007dbb52ec8de2e9 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 19:36:46 +0200 Subject: [PATCH 141/186] Added prev content --- frontend/src/app/edit/edit.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 7bd2f1c0..ff0012f4 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -148,6 +148,7 @@ export class EditComponent implements AfterViewInit, OnInit { const pf = localStorage.getItem('parentFolderID'); const sl = localStorage.getItem('safeLock'); const dp = localStorage.getItem('encryptedDocumentPassword'); + this.versionControlService.setLatestVersionContent(c ? (c as string) : ''); if ( c != null && From 96c6bab3943f84ad4b251a30aae3fb31b8183dae Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 20:14:23 +0200 Subject: [PATCH 142/186] Added await --- backend/src/version_control/version_control.service.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index 9efad2b8..344b6356 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -35,7 +35,10 @@ export class VersionControlService { nextDiffID, ); - this.s3Service.saveDiff(diffDTO, nextDiffID); + await this.s3Service.saveDiff( + diffDTO, + nextDiffID, + ); if ( nextDiffID !== 0 || @@ -48,7 +51,7 @@ export class VersionControlService { ) === 0 ) { - this.saveSnapshot(diffDTO); + await this.saveSnapshot(diffDTO); } } From 029a1e0538f96d7070381e0924798e9b216ea7aa Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 20:14:49 +0200 Subject: [PATCH 143/186] Ran formatter --- backend/src/file_manager/file_manager.service.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/src/file_manager/file_manager.service.ts b/backend/src/file_manager/file_manager.service.ts index bc1aa003..2e9a5976 100644 --- a/backend/src/file_manager/file_manager.service.ts +++ b/backend/src/file_manager/file_manager.service.ts @@ -85,9 +85,10 @@ export class FileManagerService { markdownFileDTO, ); - const snapshotIDs: string[] = await this.snapshotService.createSnapshots( - markdownFileDTO, - ); + const snapshotIDs: string[] = + await this.snapshotService.createSnapshots( + markdownFileDTO, + ); await this.diffsService.createDiffs( markdownFileDTO, From f7c6c52f959660e53c4df0cd494c25c6a8d1164a Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 20:15:28 +0200 Subject: [PATCH 144/186] Removed erroneous incrementation of nextDiffID --- backend/src/markdown_files/markdown_files.service.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/src/markdown_files/markdown_files.service.ts b/backend/src/markdown_files/markdown_files.service.ts index 57f298eb..d54edc74 100644 --- a/backend/src/markdown_files/markdown_files.service.ts +++ b/backend/src/markdown_files/markdown_files.service.ts @@ -91,8 +91,6 @@ export class MarkdownFilesService { ); markdownToUpdate.LastModified = new Date(); markdownToUpdate.Size = markdownDTO.Size; - markdownToUpdate.NextDiffID = - (markdownToUpdate.NextDiffID + 1) % 10; return this.markdownFileRepository.save( markdownToUpdate, ); From b45cc4081da7959a6fb50dfda37530e9a1d0bf12 Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 20:15:54 +0200 Subject: [PATCH 145/186] Removed old s3 call --- backend/src/s3/s3.service.ts | 50 ++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/backend/src/s3/s3.service.ts b/backend/src/s3/s3.service.ts index d5078d7a..26195152 100644 --- a/backend/src/s3/s3.service.ts +++ b/backend/src/s3/s3.service.ts @@ -154,20 +154,20 @@ export class S3Service { return undefined; } - try { - // await fs.writeFile( - // `./storage/${filePath}/diff/${markdownFileDTO.NextDiffID}`, - // fileData, - // 'utf-8', - // ); - /*const response = */ await this.s3Client.send( - new PutObjectCommand({ - Bucket: this.awsS3BucketName, - Key: `${filePath}/diff/${markdownFileDTO.NextDiffID}`, - Body: markdownFileDTO.NewDiff, - }), - ); - } catch (err) {} + // try { + // // await fs.writeFile( + // // `./storage/${filePath}/diff/${markdownFileDTO.NextDiffID}`, + // // fileData, + // // 'utf-8', + // // ); + // /*const response = */ await this.s3Client.send( + // new PutObjectCommand({ + // Bucket: this.awsS3BucketName, + // Key: `${filePath}/diff/${markdownFileDTO.NextDiffID}`, + // Body: markdownFileDTO.NewDiff, + // }), + // ); + // } catch (err) {} return markdownFileDTO; } @@ -253,6 +253,10 @@ export class S3Service { ) { const filePath = `${diffDTO.UserID}/${diffDTO.MarkdownID}`; + console.log( + 'diffDTO.Content: ', + diffDTO.Content, + ); try { await this.s3Client.send( new PutObjectCommand({ @@ -471,7 +475,7 @@ export class S3Service { // Create snapshot objects for ( let j = 0; - j < parseInt(process.env.MAX_SNAPSHOTS) + 1; // one extra for the oldest snapshot + j < parseInt(process.env.MAX_SNAPSHOTS); j++ ) { try { @@ -524,14 +528,28 @@ export class S3Service { diffDTO: DiffDTO, nextSnapshotID: number, ) { + const markdownFileDTO: MarkdownFileDTO = + new MarkdownFileDTO(); + markdownFileDTO.UserID = diffDTO.UserID; + markdownFileDTO.MarkdownID = + diffDTO.MarkdownID; + const fileDTO = await this.retrieveFile( + markdownFileDTO, + ); + const filePath = `${diffDTO.UserID}/${diffDTO.MarkdownID}`; + console.log( + 'fileDTO.Content: ', + fileDTO.Content, + ); + try { await this.s3Client.send( new PutObjectCommand({ Bucket: this.awsS3BucketName, Key: `${filePath}/snapshot/${nextSnapshotID}`, - Body: diffDTO.SnapshotPayload, + Body: fileDTO.Content, }), ); } catch (err) { From a4b57ab43e457c051ce6120f24e6749d84e90bc5 Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 20:16:17 +0200 Subject: [PATCH 146/186] Removed creation of extra snapshot --- backend/src/snapshots/snapshots.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/snapshots/snapshots.service.ts b/backend/src/snapshots/snapshots.service.ts index 9662e4c8..b378e9e8 100644 --- a/backend/src/snapshots/snapshots.service.ts +++ b/backend/src/snapshots/snapshots.service.ts @@ -22,7 +22,7 @@ export class SnapshotService { const snapshotRecords = []; for ( let i = 0; - i < parseInt(process.env.MAX_SNAPSHOTS) + 1; + i < parseInt(process.env.MAX_SNAPSHOTS); i++ ) { const snapshotID = CryptoJS.SHA256( From ceb15e58b958c67f2a649160402b2113e23559ee Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 20:23:16 +0200 Subject: [PATCH 147/186] Refactor to DTO --- backend/src/snapshots/dto/snapshot.dto.ts | 4 +- frontend/src/app/edit/edit.component.ts | 41 +++++++++++++++---- frontend/src/app/services/dto/diff.dto.ts | 12 ++++++ frontend/src/app/services/dto/snapshot.dto.ts | 12 ++++++ 4 files changed, 58 insertions(+), 11 deletions(-) diff --git a/backend/src/snapshots/dto/snapshot.dto.ts b/backend/src/snapshots/dto/snapshot.dto.ts index f1d88964..cd66fd73 100644 --- a/backend/src/snapshots/dto/snapshot.dto.ts +++ b/backend/src/snapshots/dto/snapshot.dto.ts @@ -6,7 +6,7 @@ export class SnapshotDTO { S3SnapshotID: number; LastModified: Date; Content: string; - OldestSnapshot: boolean + OldestSnapshot: boolean; constructor() { this.SnapshotID = undefined; @@ -18,4 +18,4 @@ export class SnapshotDTO { this.Content = undefined; this.OldestSnapshot = false; } -} \ No newline at end of file +} diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index ff0012f4..b403c93d 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -25,6 +25,8 @@ import html2pdf from 'html2pdf.js/dist/html2pdf'; import DecoupledEditor from '@ckeditor/ckeditor5-build-decoupled-document'; import { parse } from 'path'; +import { SnapshotDTO } from '../services/dto/snapshot.dto'; +import { DiffDTO } from '../services/dto/diff.dto'; @Component({ selector: 'app-edit', @@ -613,30 +615,51 @@ export class EditComponent implements AfterViewInit, OnInit { this.versionControlService .retrieveAllHistory(this.editService.getMarkdownID() as string) .then((data) => { - const snapshot = JSON.parse(JSON.stringify(data.SnapshotHistory)); - const diff = JSON.parse(JSON.stringify(data.DiffHistory)); + const snapshot = JSON.parse( + JSON.stringify(data.SnapshotHistory) + ) as SnapshotDTO[]; + const diff = JSON.parse(JSON.stringify(data.DiffHistory)) as DiffDTO[]; for (let i = 0; i < snapshot.length; i++) { - snapshot[i].LastModified = this.formatDate(snapshot[i].LastModified); + snapshot[i].LastModifiedString = this.formatDate( + snapshot[i].LastModified.toDateString() + ); snapshot[i].Name = 'Snapshot ' + (i + 1); snapshot[i].ChildDiffs = []; + let versionNumber = 0; for (let j = 0; j < diff.length; j++) { if (snapshot[i].SnapshotID === diff[j].SnapshotID) { snapshot[i].ChildDiffs.push(diff[j]); - diff[j].LastModified = this.formatDate(diff[j].LastModified); - diff[j].Name = 'Version ' + (j + 1); - diff[j].hasSnapshot = true; + diff[j].LastModifiedString = this.formatDate( + diff[j].LastModified.toDateString() + ); + diff[j].VersionNumber = versionNumber++; + diff[j].Name = 'Version ' + diff[j].VersionNumber; + diff[j].HasSnapshot = true; } } + snapshot[0].ChildDiffs.sort((a, b) => { + return a.VersionNumber > b.VersionNumber + ? 1 + : a.VersionNumber < b.VersionNumber + ? -1 + : 0; + }); } this.history = snapshot; + + let diffNumber = 0; for (let i = 0; i < diff.length; i++) { - if (!diff[i].hasSnapshot) { - diff[i].LastModified = this.formatDate(diff[i].LastModified); - diff[i].Name = 'Diff ' + (i + 1); + if (!diff[i].HasSnapshot) { + diff[i].LastModifiedString = this.formatDate( + diff[i].LastModified.toDateString() + ); + diff[i].VersionNumber = diffNumber++; + diff[i].Name = 'Diff ' + diff[i].VersionNumber; this.history.push(diff[i]); } } + console.log(this.history); }); } diff --git a/frontend/src/app/services/dto/diff.dto.ts b/frontend/src/app/services/dto/diff.dto.ts index b4cd40c3..fa44912d 100644 --- a/frontend/src/app/services/dto/diff.dto.ts +++ b/frontend/src/app/services/dto/diff.dto.ts @@ -5,6 +5,12 @@ export class DiffDTO { SnapshotNumber: number; Content: string; SnapshotPayload: string; + LastModified: Date; + LastModifiedString: string; + Name: string; + SnapshotID: string; + VersionNumber: number; + HasSnapshot: boolean; constructor() { this.UserID = 0; @@ -13,5 +19,11 @@ export class DiffDTO { this.SnapshotNumber = 0; this.Content = ''; this.SnapshotPayload = ''; + this.LastModified = new Date(); + this.LastModifiedString = ''; + this.Name = ''; + this.SnapshotID = ''; + this.VersionNumber = 0; + this.HasSnapshot = false; } } diff --git a/frontend/src/app/services/dto/snapshot.dto.ts b/frontend/src/app/services/dto/snapshot.dto.ts index 305818f6..fd5d89e5 100644 --- a/frontend/src/app/services/dto/snapshot.dto.ts +++ b/frontend/src/app/services/dto/snapshot.dto.ts @@ -1,15 +1,27 @@ +import { DiffDTO } from './diff.dto'; + export class SnapshotDTO { + SnapshotID: string; UserID: number; MarkdownID: string; SnapshotNumber: number; Content: string; OldestSnapshot: boolean; + LastModified: Date; + LastModifiedString: string; + Name: string; + ChildDiffs: DiffDTO[]; constructor() { + this.SnapshotID = ''; this.UserID = 0; this.MarkdownID = ''; this.SnapshotNumber = 0; this.Content = ''; this.OldestSnapshot = false; + this.LastModified = new Date(); + this.LastModifiedString = ''; + this.Name = ''; + this.ChildDiffs = []; } } From b316b7b01da10d0aef620c91d636630d85747944 Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 20:40:24 +0200 Subject: [PATCH 148/186] Deleted insertion of extra snapshot --- .../src/version_control/version_control.controller.ts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/backend/src/version_control/version_control.controller.ts b/backend/src/version_control/version_control.controller.ts index bf80d6c8..d04d6fec 100644 --- a/backend/src/version_control/version_control.controller.ts +++ b/backend/src/version_control/version_control.controller.ts @@ -82,17 +82,6 @@ export class VersionControlController { snapshots, ); - if ( - snapshotDTOs.length < - parseInt(process.env.MAX_SNAPSHOTS) - ) { - const baseSnapshotDTO = new SnapshotDTO(); - baseSnapshotDTO.MarkdownID = - markdownFileDTO.MarkdownID; - baseSnapshotDTO.OldestSnapshot = true; - snapshotDTOs.unshift(baseSnapshotDTO); - } - if ( snapshotDTOs.length === parseInt(process.env.MAX_SNAPSHOTS) From 6e5e9e6500a6a293db762312905e1cf5e88510b8 Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 20:40:37 +0200 Subject: [PATCH 149/186] Removed debugging statements --- backend/src/snapshots/snapshots.service.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backend/src/snapshots/snapshots.service.ts b/backend/src/snapshots/snapshots.service.ts index b378e9e8..3cde5451 100644 --- a/backend/src/snapshots/snapshots.service.ts +++ b/backend/src/snapshots/snapshots.service.ts @@ -110,6 +110,10 @@ export class SnapshotService { snapshotDTOs: SnapshotDTO[], nextDiffID: number, ) { + console.log( + 'snapshots.service snapshotDTOS: ', + snapshotDTOs, + ); const arrLength = parseInt( process.env.MAX_DIFFS, ); From d535b972c5fe4f4d775c1d0f3604563954a283e2 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 20:56:43 +0200 Subject: [PATCH 150/186] Date format fixes --- frontend/src/app/edit/edit.component.html | 4 ++-- frontend/src/app/edit/edit.component.ts | 16 +++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/frontend/src/app/edit/edit.component.html b/frontend/src/app/edit/edit.component.html index 01ac7980..7649e475 100644 --- a/frontend/src/app/edit/edit.component.html +++ b/frontend/src/app/edit/edit.component.html @@ -252,14 +252,14 @@

History

{{obj.Name}}

-

{{obj.LastModified}}

+

{{obj.LastModifiedString}}

{{diffObj.Name}}

-

{{diffObj.LastModified}}

+

{{diffObj.LastModifiedString}}

diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index b403c93d..d1f99dd4 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -622,7 +622,7 @@ export class EditComponent implements AfterViewInit, OnInit { for (let i = 0; i < snapshot.length; i++) { snapshot[i].LastModifiedString = this.formatDate( - snapshot[i].LastModified.toDateString() + snapshot[i].LastModified ); snapshot[i].Name = 'Snapshot ' + (i + 1); snapshot[i].ChildDiffs = []; @@ -631,9 +631,9 @@ export class EditComponent implements AfterViewInit, OnInit { if (snapshot[i].SnapshotID === diff[j].SnapshotID) { snapshot[i].ChildDiffs.push(diff[j]); diff[j].LastModifiedString = this.formatDate( - diff[j].LastModified.toDateString() + diff[j].LastModified ); - diff[j].VersionNumber = versionNumber++; + diff[j].VersionNumber = ++versionNumber; diff[j].Name = 'Version ' + diff[j].VersionNumber; diff[j].HasSnapshot = true; } @@ -651,10 +651,8 @@ export class EditComponent implements AfterViewInit, OnInit { let diffNumber = 0; for (let i = 0; i < diff.length; i++) { if (!diff[i].HasSnapshot) { - diff[i].LastModifiedString = this.formatDate( - diff[i].LastModified.toDateString() - ); - diff[i].VersionNumber = diffNumber++; + diff[i].LastModifiedString = this.formatDate(diff[i].LastModified); + diff[i].VersionNumber = ++diffNumber; diff[i].Name = 'Diff ' + diff[i].VersionNumber; this.history.push(diff[i]); } @@ -745,8 +743,8 @@ export class EditComponent implements AfterViewInit, OnInit { return inputString.charAt(0).toUpperCase() + inputString.slice(1); } - formatDate(dateString: string): string { - if (!dateString || dateString.length === 0) { + formatDate(dateString: Date): string { + if (!dateString) { return dateString; // Return the input string as-is if it's empty or null. } From 11cdf1f215757ce2b0dcdfea5a51cff0b174dac7 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 20:57:19 +0200 Subject: [PATCH 151/186] Sort direction change --- frontend/src/app/edit/edit.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index d1f99dd4..da7d3431 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -639,9 +639,9 @@ export class EditComponent implements AfterViewInit, OnInit { } } snapshot[0].ChildDiffs.sort((a, b) => { - return a.VersionNumber > b.VersionNumber + return a.VersionNumber < b.VersionNumber ? 1 - : a.VersionNumber < b.VersionNumber + : a.VersionNumber > b.VersionNumber ? -1 : 0; }); From 6b423bd891b63708d83be911e42753b273272a0c Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 20:59:32 +0200 Subject: [PATCH 152/186] Order update --- frontend/src/app/edit/edit.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index da7d3431..52048a52 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -646,7 +646,6 @@ export class EditComponent implements AfterViewInit, OnInit { : 0; }); } - this.history = snapshot; let diffNumber = 0; for (let i = 0; i < diff.length; i++) { @@ -657,6 +656,7 @@ export class EditComponent implements AfterViewInit, OnInit { this.history.push(diff[i]); } } + snapshot.map((a) => this.history.push(a)); console.log(this.history); }); From c123df9be201c62d1be4c540729a2b41e707efa3 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 21:19:34 +0200 Subject: [PATCH 153/186] BUG FIX: Saving empty local storage --- frontend/src/app/edit/edit.component.ts | 31 +++++++++++++++++-------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 52048a52..6fb55a0d 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -65,7 +65,8 @@ export class EditComponent implements AfterViewInit, OnInit { @HostListener('window:beforeunload', ['$event']) beforeUnloadHandler(event: BeforeUnloadEvent) { - this.saveDocumentContents(); + if (this.editService.getContent() !== '') this.saveDocumentContents(); + console.log('END'); } @HostListener('window:mousewheel', ['$event']) @@ -374,10 +375,11 @@ export class EditComponent implements AfterViewInit, OnInit { this.editService.getSafeLock() ); - this.versionControlService.saveDiff( - markdownID ? (markdownID as string) : '', - this.fileService.encryptSafeLockDocument(readablePatch, pass) - ); + if (readablePatch !== '') + this.versionControlService.saveDiff( + markdownID ? (markdownID as string) : '', + this.fileService.encryptSafeLockDocument(readablePatch, pass) + ); } else { await this.fileService.saveDocument( contents, @@ -386,10 +388,11 @@ export class EditComponent implements AfterViewInit, OnInit { this.editService.getSafeLock() ); - this.versionControlService.saveDiff( - markdownID ? (markdownID as string) : '', - readablePatch - ); + if (readablePatch !== '') + this.versionControlService.saveDiff( + markdownID ? (markdownID as string) : '', + readablePatch + ); } this.versionControlService.setLatestVersionContent(contents); @@ -656,7 +659,15 @@ export class EditComponent implements AfterViewInit, OnInit { this.history.push(diff[i]); } } - snapshot.map((a) => this.history.push(a)); + snapshot + .sort((a, b) => { + return a.SnapshotNumber < b.SnapshotNumber + ? 1 + : a.SnapshotNumber > b.SnapshotNumber + ? -1 + : 0; + }) + .map((a) => this.history.push(a)); console.log(this.history); }); From 729c9ca862aac2cd08a1b44f3b0f1e30b85385ec Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 21:20:17 +0200 Subject: [PATCH 154/186] Removed console log --- frontend/src/app/edit/edit.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 6fb55a0d..14a90bda 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -66,7 +66,6 @@ export class EditComponent implements AfterViewInit, OnInit { @HostListener('window:beforeunload', ['$event']) beforeUnloadHandler(event: BeforeUnloadEvent) { if (this.editService.getContent() !== '') this.saveDocumentContents(); - console.log('END'); } @HostListener('window:mousewheel', ['$event']) From 06fa156502b680f33dadd5f8a10528e34a442d47 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 21:24:30 +0200 Subject: [PATCH 155/186] Final order change --- frontend/src/app/edit/edit.component.ts | 15 ++++++++++++--- frontend/src/app/services/dto/snapshot.dto.ts | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 14a90bda..0aa7ed1c 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -640,13 +640,22 @@ export class EditComponent implements AfterViewInit, OnInit { diff[j].HasSnapshot = true; } } - snapshot[0].ChildDiffs.sort((a, b) => { - return a.VersionNumber < b.VersionNumber + snapshot.sort((a, b) => { + return a.OrderNumber < b.OrderNumber ? 1 - : a.VersionNumber > b.VersionNumber + : a.OrderNumber > b.OrderNumber ? -1 : 0; }); + snapshot.map((a) => + a.ChildDiffs.sort((a, b) => { + return a.VersionNumber < b.VersionNumber + ? 1 + : a.VersionNumber > b.VersionNumber + ? -1 + : 0; + }) + ); } let diffNumber = 0; diff --git a/frontend/src/app/services/dto/snapshot.dto.ts b/frontend/src/app/services/dto/snapshot.dto.ts index fd5d89e5..e7346b97 100644 --- a/frontend/src/app/services/dto/snapshot.dto.ts +++ b/frontend/src/app/services/dto/snapshot.dto.ts @@ -11,6 +11,7 @@ export class SnapshotDTO { LastModifiedString: string; Name: string; ChildDiffs: DiffDTO[]; + OrderNumber: number; constructor() { this.SnapshotID = ''; @@ -23,5 +24,6 @@ export class SnapshotDTO { this.LastModifiedString = ''; this.Name = ''; this.ChildDiffs = []; + this.OrderNumber = 0; } } From 8b915636625745fed416cf45332149a8c37678a0 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 21:42:09 +0200 Subject: [PATCH 156/186] refactor for to map --- frontend/src/app/edit/edit.component.ts | 42 ++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 0aa7ed1c..8d44e322 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -622,16 +622,14 @@ export class EditComponent implements AfterViewInit, OnInit { ) as SnapshotDTO[]; const diff = JSON.parse(JSON.stringify(data.DiffHistory)) as DiffDTO[]; - for (let i = 0; i < snapshot.length; i++) { - snapshot[i].LastModifiedString = this.formatDate( - snapshot[i].LastModified - ); - snapshot[i].Name = 'Snapshot ' + (i + 1); - snapshot[i].ChildDiffs = []; + snapshot.map((a, i) => { + a.LastModifiedString = this.formatDate(a.LastModified); + a.Name = 'Snapshot ' + (i + 1); + a.ChildDiffs = []; let versionNumber = 0; for (let j = 0; j < diff.length; j++) { - if (snapshot[i].SnapshotID === diff[j].SnapshotID) { - snapshot[i].ChildDiffs.push(diff[j]); + if (a.SnapshotID === diff[j].SnapshotID) { + a.ChildDiffs.push(diff[j]); diff[j].LastModifiedString = this.formatDate( diff[j].LastModified ); @@ -640,23 +638,25 @@ export class EditComponent implements AfterViewInit, OnInit { diff[j].HasSnapshot = true; } } - snapshot.sort((a, b) => { - return a.OrderNumber < b.OrderNumber - ? 1 - : a.OrderNumber > b.OrderNumber - ? -1 - : 0; - }); - snapshot.map((a) => - a.ChildDiffs.sort((a, b) => { - return a.VersionNumber < b.VersionNumber + snapshot + .sort((a, b) => { + return a.OrderNumber < b.OrderNumber ? 1 - : a.VersionNumber > b.VersionNumber + : a.OrderNumber > b.OrderNumber ? -1 : 0; }) - ); - } + .map((a) => + a.ChildDiffs.sort((a, b) => { + return a.VersionNumber < b.VersionNumber + ? 1 + : a.VersionNumber > b.VersionNumber + ? -1 + : 0; + }) + ); + }); + // for (let i = 0; i < snapshot.length; i++) let diffNumber = 0; for (let i = 0; i < diff.length; i++) { From 52dfeaaca015222cd0cdcbb757e328e5bcc1bdb0 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 21:55:11 +0200 Subject: [PATCH 157/186] Hopefully --- frontend/src/app/edit/edit.component.ts | 28 ++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 8d44e322..6704e58c 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -638,24 +638,24 @@ export class EditComponent implements AfterViewInit, OnInit { diff[j].HasSnapshot = true; } } - snapshot - .sort((a, b) => { - return a.OrderNumber < b.OrderNumber + }); + snapshot + .sort((a, b) => { + return a.OrderNumber < b.OrderNumber + ? 1 + : a.OrderNumber > b.OrderNumber + ? -1 + : 0; + }) + .map((a) => + a.ChildDiffs.sort((a, b) => { + return a.VersionNumber < b.VersionNumber ? 1 - : a.OrderNumber > b.OrderNumber + : a.VersionNumber > b.VersionNumber ? -1 : 0; }) - .map((a) => - a.ChildDiffs.sort((a, b) => { - return a.VersionNumber < b.VersionNumber - ? 1 - : a.VersionNumber > b.VersionNumber - ? -1 - : 0; - }) - ); - }); + ); // for (let i = 0; i < snapshot.length; i++) let diffNumber = 0; From 90da1ea54da69ab842d3996f0d168957772cf2d7 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 22:00:16 +0200 Subject: [PATCH 158/186] Hopefully fixed --- frontend/src/app/edit/edit.component.ts | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 6704e58c..fdfac5ce 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -624,7 +624,8 @@ export class EditComponent implements AfterViewInit, OnInit { snapshot.map((a, i) => { a.LastModifiedString = this.formatDate(a.LastModified); - a.Name = 'Snapshot ' + (i + 1); + a.OrderNumber = i + 1; + a.Name = 'Snapshot ' + a.OrderNumber; a.ChildDiffs = []; let versionNumber = 0; for (let j = 0; j < diff.length; j++) { @@ -667,15 +668,7 @@ export class EditComponent implements AfterViewInit, OnInit { this.history.push(diff[i]); } } - snapshot - .sort((a, b) => { - return a.SnapshotNumber < b.SnapshotNumber - ? 1 - : a.SnapshotNumber > b.SnapshotNumber - ? -1 - : 0; - }) - .map((a) => this.history.push(a)); + snapshot.map((a) => this.history.push(a)); console.log(this.history); }); From 50a81be46585b17100045256254fcde1900ca85f Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Wed, 20 Sep 2023 22:06:10 +0200 Subject: [PATCH 159/186] BUG FIX: no longer logically sorting snapshots and diffs --- .../version_control.controller.ts | 48 ++++++++----------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/backend/src/version_control/version_control.controller.ts b/backend/src/version_control/version_control.controller.ts index d04d6fec..8ee3197c 100644 --- a/backend/src/version_control/version_control.controller.ts +++ b/backend/src/version_control/version_control.controller.ts @@ -82,16 +82,16 @@ export class VersionControlController { snapshots, ); - if ( - snapshotDTOs.length === - parseInt(process.env.MAX_SNAPSHOTS) - ) { - snapshotDTOs = - await this.snapshotService.getLogicalSnapshotOrder( - snapshotDTOs, - nextSnapshotID, - ); - } + // if ( + // snapshotDTOs.length === + // parseInt(process.env.MAX_SNAPSHOTS) + // ) { + // snapshotDTOs = + // await this.snapshotService.getLogicalSnapshotOrder( + // snapshotDTOs, + // nextSnapshotID, + // ); + // } versionHistoryDTO.SnapshotHistory = snapshotDTOs; @@ -113,26 +113,18 @@ export class VersionControlController { diffs, ); - if ( - diffDTOs.length === - parseInt(process.env.MAX_DIFFS) - ) { - diffDTOs = - await this.diffService.getLogicalDiffOrder( - diffDTOs, - nextDiffID, - ); - } + // if ( + // diffDTOs.length === + // parseInt(process.env.MAX_DIFFS) + // ) { + // diffDTOs = + // await this.diffService.getLogicalDiffOrder( + // diffDTOs, + // nextDiffID, + // ); + // } versionHistoryDTO.DiffHistory = diffDTOs; - //==------------------------------- - console.log( - 'nextSnapshotID: ', - nextSnapshotID, - ); - console.log('nextDiffID: ', nextDiffID); - console.log(versionHistoryDTO); - //==------------------------------- return versionHistoryDTO; } } From 00f2364ccc3fd81fda66b0dae89a9c09518d452d Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 22:18:21 +0200 Subject: [PATCH 160/186] UI Change xD --- frontend/src/app/edit/edit.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/edit/edit.component.html b/frontend/src/app/edit/edit.component.html index 7649e475..3498f4b8 100644 --- a/frontend/src/app/edit/edit.component.html +++ b/frontend/src/app/edit/edit.component.html @@ -251,7 +251,7 @@

History

-

{{obj.Name}}

+

{{obj.LastModified}}

{{obj.LastModifiedString}}

From 03b66ec67cae5cffdffa54474d418a51cf3444e0 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Wed, 20 Sep 2023 22:26:01 +0200 Subject: [PATCH 161/186] spacing changes --- frontend/src/app/edit/edit.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/edit/edit.component.scss b/frontend/src/app/edit/edit.component.scss index a985a5b2..b2a7a5cf 100644 --- a/frontend/src/app/edit/edit.component.scss +++ b/frontend/src/app/edit/edit.component.scss @@ -740,7 +740,7 @@ Preserve the relative scale, though. */ .historyObject { transition: 0.2s; display: grid; - grid-template-columns: 0.5fr 2fr 2fr 0.5fr; + grid-template-columns: 0.5fr 4fr 0.5fr; justify-content: space-around; width: $sidebar-content-width; border-radius: 8px; From 1d13a3fed92dee82980017da6b6f00f061d08e17 Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 22:28:36 +0200 Subject: [PATCH 162/186] Reworked sorting --- frontend/src/app/edit/edit.component.ts | 33 ++++++++++++------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index fdfac5ce..8c5c2f96 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -622,42 +622,41 @@ export class EditComponent implements AfterViewInit, OnInit { ) as SnapshotDTO[]; const diff = JSON.parse(JSON.stringify(data.DiffHistory)) as DiffDTO[]; + snapshot.sort((a, b) => { + return a.LastModified < b.LastModified + ? 1 + : a.LastModified > b.LastModified + ? -1 + : 0; + }); + snapshot.map((a, i) => { a.LastModifiedString = this.formatDate(a.LastModified); a.OrderNumber = i + 1; a.Name = 'Snapshot ' + a.OrderNumber; a.ChildDiffs = []; - let versionNumber = 0; for (let j = 0; j < diff.length; j++) { if (a.SnapshotID === diff[j].SnapshotID) { a.ChildDiffs.push(diff[j]); diff[j].LastModifiedString = this.formatDate( diff[j].LastModified ); - diff[j].VersionNumber = ++versionNumber; - diff[j].Name = 'Version ' + diff[j].VersionNumber; diff[j].HasSnapshot = true; } } }); - snapshot - .sort((a, b) => { - return a.OrderNumber < b.OrderNumber + snapshot.map((a) => + a.ChildDiffs.sort((a, b) => { + return a.LastModified < b.LastModified ? 1 - : a.OrderNumber > b.OrderNumber + : a.LastModified > b.LastModified ? -1 : 0; + }).map((a, i) => { + a.VersionNumber = i + 1; + a.Name = 'Version ' + a.VersionNumber; }) - .map((a) => - a.ChildDiffs.sort((a, b) => { - return a.VersionNumber < b.VersionNumber - ? 1 - : a.VersionNumber > b.VersionNumber - ? -1 - : 0; - }) - ); - // for (let i = 0; i < snapshot.length; i++) + ); let diffNumber = 0; for (let i = 0; i < diff.length; i++) { From f3e2bcd5a0d480721e4e37fc346bcf1bafcff137 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Wed, 20 Sep 2023 22:31:04 +0200 Subject: [PATCH 163/186] Fixed spacing of diff object --- frontend/src/app/edit/edit.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/edit/edit.component.scss b/frontend/src/app/edit/edit.component.scss index b2a7a5cf..291b5812 100644 --- a/frontend/src/app/edit/edit.component.scss +++ b/frontend/src/app/edit/edit.component.scss @@ -765,7 +765,7 @@ Preserve the relative scale, though. */ .diffObject{ margin-left: 20px; - grid-template-columns: 2fr 2fr 0.5fr; + grid-template-columns: 2fr 0.5fr; } .selectedHistory { From bf636ba95df5b1e0929ce9e891fc2fdf9784284f Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Wed, 20 Sep 2023 22:49:48 +0200 Subject: [PATCH 164/186] Removed repeated datetime --- frontend/src/app/edit/edit.component.html | 255 +++++++++++++++++----- 1 file changed, 198 insertions(+), 57 deletions(-) diff --git a/frontend/src/app/edit/edit.component.html b/frontend/src/app/edit/edit.component.html index 3498f4b8..a683d21b 100644 --- a/frontend/src/app/edit/edit.component.html +++ b/frontend/src/app/edit/edit.component.html @@ -1,6 +1,10 @@
- - + +
@@ -26,12 +30,22 @@ />
- +
-
+
@@ -40,7 +54,7 @@ [(visible)]="exportDialogVisible" [focusOnShow]="true" [modal]="true" - [style]="{ width: '50vw', minWidth: 'min(500px,100vw)' }" + [style]="{ width: '50vw', minWidth: 'min(500px,100vw)' }" >
@@ -78,7 +92,11 @@
-
+
@@ -107,21 +125,48 @@
-->
- +
-
+

Assets

-
+

History

-
- +
+
@@ -129,7 +174,11 @@

Assets

History

-
+
History
- -

- Camera -

+ +

Camera

- -

- Upload -

+ +

Upload

@@ -164,13 +217,29 @@

History

- - -
- +
+
-
- +
+
@@ -179,13 +248,39 @@

History

+

+ No Assets Available +

+
+ +
-

No Assets Available

-
- -
-
-
+
+
+ +
+
@@ -202,7 +297,12 @@

History

/>
-
+
History />
-
+
History />
-
+
- -
+ +
History
- -

{{ capitalizeFirstLetter(obj.Format) }}

+

+ {{ capitalizeFirstLetter(obj.Format) }} +

{{ formatDate(obj.DateCreated) }}

@@ -249,33 +364,59 @@

History

-
- -

{{obj.LastModified}}

-

{{obj.LastModifiedString}}

- - +
+ +

{{ obj.LastModified }}

+ +
-
-

{{diffObj.Name}}

-

{{diffObj.LastModifiedString}}

- +
+ + +

{{ diffObj.LastModified }}

+
-
- -
-
-
+
+

@@ -290,7 +431,7 @@

History

header="Extracted Text:" [(visible)]="textCopyDialog" [modal]="true" - [style]="{ width: '50vw', minWidth: 'min(500px,100vw)' }" + [style]="{ width: '50vw', minWidth: 'min(500px,100vw)' }" [focusOnShow]="true" >
@@ -304,5 +445,5 @@

History

/>
-

No text detected :(

+

No text detected :(

From 192d9b2a0f0b991d6b1a084baf407651d5f12e8e Mon Sep 17 00:00:00 2001 From: Dylan Kapnias Date: Wed, 20 Sep 2023 23:11:29 +0200 Subject: [PATCH 165/186] Updating version numbers --- frontend/src/app/edit/edit.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 8c5c2f96..942888bb 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -652,8 +652,8 @@ export class EditComponent implements AfterViewInit, OnInit { : a.LastModified > b.LastModified ? -1 : 0; - }).map((a, i) => { - a.VersionNumber = i + 1; + }).map((a, i, arr) => { + a.VersionNumber = arr.length - i + 1; a.Name = 'Version ' + a.VersionNumber; }) ); From 54847dcc8196edabb08c5200b9c837345fe47214 Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 23:28:52 +0200 Subject: [PATCH 166/186] Co-authored-by: Dylan Shane Kapnias --- backend/src/diffs/diffs.service.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/backend/src/diffs/diffs.service.ts b/backend/src/diffs/diffs.service.ts index 7d456a1f..dadc1264 100644 --- a/backend/src/diffs/diffs.service.ts +++ b/backend/src/diffs/diffs.service.ts @@ -109,6 +109,23 @@ export class DiffsService { ///===----------------------------------------------------- + async resetDiffs( + markdownID: string, + snapshotID: string, + ) { + await this.diffRepository.update( + { + MarkdownID: markdownID, + SnapshotID: snapshotID, + }, + { + HasBeenUsed: false, + }, + ); + } + + ///===----------------------------------------------------- + async getAllDiffs(markdownID: string) { return await this.diffRepository.find({ where: { From 2f56a1f653f1a27f6992eb62f337a3e7c538486a Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 23:30:43 +0200 Subject: [PATCH 167/186] Added functions for versioning --- backend/src/snapshots/snapshots.service.ts | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/backend/src/snapshots/snapshots.service.ts b/backend/src/snapshots/snapshots.service.ts index 3cde5451..c0579271 100644 --- a/backend/src/snapshots/snapshots.service.ts +++ b/backend/src/snapshots/snapshots.service.ts @@ -82,6 +82,52 @@ export class SnapshotService { ///===----------------------------------------------------- + async resetSnapshot( + markdownID: string, + nextSnapshotID: number, + ) { + const snapshot = + await this.snapshotRepository.findOne({ + where: { + MarkdownID: markdownID, + S3SnapshotID: nextSnapshotID, + }, + }); + + snapshot.HasBeenUsed = false; + await this.snapshotRepository.save(snapshot); + return snapshot; + } + + ///===----------------------------------------------------- + + async getSnapshotByS3SnapshotID( + markdownID: string, + s3SnapshotID: number, + ) { + return await this.snapshotRepository.findOne({ + where: { + MarkdownID: markdownID, + S3SnapshotID: s3SnapshotID, + }, + }); + } + + ///===----------------------------------------------------- + + async getNextSnapshotID(markdownID: string) { + const markdownFile = + await this.snapshotRepository.findOne({ + where: { + MarkdownID: markdownID, + HasBeenUsed: false, + }, + }); + return markdownFile.S3SnapshotID; + } + + ///===----------------------------------------------------- + async deleteSnapshots( markdownFileDTO: MarkdownFileDTO, ) { From 03ba82bf4c6f253b82784e7e37b8b82598e6030f Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 23:30:53 +0200 Subject: [PATCH 168/186] Various updates --- .../version_control.controller.ts | 42 +++++-------------- .../version_control.service.ts | 16 +++++++ 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/backend/src/version_control/version_control.controller.ts b/backend/src/version_control/version_control.controller.ts index 8ee3197c..80fccbdc 100644 --- a/backend/src/version_control/version_control.controller.ts +++ b/backend/src/version_control/version_control.controller.ts @@ -67,63 +67,41 @@ export class VersionControlController { // Populate snapshot history - const nextSnapshotID = - await this.markdownFileService.getNextSnapshotID( - markdownFileDTO.MarkdownID, - ); + // const nextSnapshotID = + // await this.markdownFileService.getNextSnapshotID( + // markdownFileDTO.MarkdownID, + // ); const snapshots = await this.snapshotService.getAllSnapshots( markdownFileDTO, ); - let snapshotDTOs = + const snapshotDTOs = await this.versionControlService.convertSnapshotsToSnapshotDTOs( snapshots, ); - // if ( - // snapshotDTOs.length === - // parseInt(process.env.MAX_SNAPSHOTS) - // ) { - // snapshotDTOs = - // await this.snapshotService.getLogicalSnapshotOrder( - // snapshotDTOs, - // nextSnapshotID, - // ); - // } - versionHistoryDTO.SnapshotHistory = snapshotDTOs; // Populate diff history - const nextDiffID = - await this.markdownFileService.getNextDiffID( - markdownFileDTO.MarkdownID, - ); + // const nextDiffID = + // await this.markdownFileService.getNextDiffID( + // markdownFileDTO.MarkdownID, + // ); const diffs = await this.diffService.getAllDiffs( markdownFileDTO.MarkdownID, ); - let diffDTOs = + const diffDTOs = await this.versionControlService.convertDiffsToDiffDTOs( diffs, ); - // if ( - // diffDTOs.length === - // parseInt(process.env.MAX_DIFFS) - // ) { - // diffDTOs = - // await this.diffService.getLogicalDiffOrder( - // diffDTOs, - // nextDiffID, - // ); - // } - versionHistoryDTO.DiffHistory = diffDTOs; return versionHistoryDTO; } diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index 344b6356..29f5e09b 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -52,6 +52,22 @@ export class VersionControlService { 0 ) { await this.saveSnapshot(diffDTO); + + const nextSnapshotID = + await this.snapshotService.getNextSnapshotID( + diffDTO.MarkdownID, + ); + + const nextSnapshot = + await this.snapshotService.resetSnapshot( + diffDTO.MarkdownID, + nextSnapshotID, + ); + + await this.diffService.resetDiffs( + diffDTO.MarkdownID, + nextSnapshot.SnapshotID, + ); } } From 08764177cf1180593417afb2c210bf38cc81f9e8 Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 23:41:29 +0200 Subject: [PATCH 169/186] Bug fix --- backend/src/snapshots/snapshots.service.ts | 23 +++++++++---------- .../version_control.service.ts | 2 +- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/backend/src/snapshots/snapshots.service.ts b/backend/src/snapshots/snapshots.service.ts index c0579271..ff23d5dc 100644 --- a/backend/src/snapshots/snapshots.service.ts +++ b/backend/src/snapshots/snapshots.service.ts @@ -113,18 +113,17 @@ export class SnapshotService { }); } - ///===----------------------------------------------------- - - async getNextSnapshotID(markdownID: string) { - const markdownFile = - await this.snapshotRepository.findOne({ - where: { - MarkdownID: markdownID, - HasBeenUsed: false, - }, - }); - return markdownFile.S3SnapshotID; - } + // ///===----------------------------------------------------- + + // async getNextSnapshotID(markdownID: string) { + // const markdownFile = + // await this.snapshotRepository.findOne({ + // where: { + // MarkdownID: markdownID, + // }, + // }); + // return markdownFile.S3SnapshotID; + // } ///===----------------------------------------------------- diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index 29f5e09b..7bba571a 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -54,7 +54,7 @@ export class VersionControlService { await this.saveSnapshot(diffDTO); const nextSnapshotID = - await this.snapshotService.getNextSnapshotID( + await this.markdownFileService.getNextSnapshotID( diffDTO.MarkdownID, ); From c0afa215ee40dfd400dedc1ff0795fab5ee10104 Mon Sep 17 00:00:00 2001 From: Jake Weatherhead Date: Wed, 20 Sep 2023 23:48:16 +0200 Subject: [PATCH 170/186] Added debugging statements --- backend/src/snapshots/snapshots.service.ts | 1 + backend/src/version_control/version_control.service.ts | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/backend/src/snapshots/snapshots.service.ts b/backend/src/snapshots/snapshots.service.ts index ff23d5dc..f52d5772 100644 --- a/backend/src/snapshots/snapshots.service.ts +++ b/backend/src/snapshots/snapshots.service.ts @@ -86,6 +86,7 @@ export class SnapshotService { markdownID: string, nextSnapshotID: number, ) { + console.log('resetSnapshot', nextSnapshotID); const snapshot = await this.snapshotRepository.findOne({ where: { diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index 7bba571a..fd35a6a1 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -58,12 +58,22 @@ export class VersionControlService { diffDTO.MarkdownID, ); + console.log( + 'version_control: nextsnapshotID ', + nextSnapshotID, + ); + const nextSnapshot = await this.snapshotService.resetSnapshot( diffDTO.MarkdownID, nextSnapshotID, ); + console.log( + 'nextSnapshot: ', + nextSnapshot, + ); + await this.diffService.resetDiffs( diffDTO.MarkdownID, nextSnapshot.SnapshotID, From 7cea7f3188d93b9a746e9def3f4b85bc50192e0b Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Thu, 21 Sep 2023 11:14:14 +0200 Subject: [PATCH 171/186] Removed debugging statements --- backend/src/snapshots/snapshots.service.ts | 1 - backend/src/version_control/version_control.service.ts | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/backend/src/snapshots/snapshots.service.ts b/backend/src/snapshots/snapshots.service.ts index f52d5772..ff23d5dc 100644 --- a/backend/src/snapshots/snapshots.service.ts +++ b/backend/src/snapshots/snapshots.service.ts @@ -86,7 +86,6 @@ export class SnapshotService { markdownID: string, nextSnapshotID: number, ) { - console.log('resetSnapshot', nextSnapshotID); const snapshot = await this.snapshotRepository.findOne({ where: { diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index fd35a6a1..7bba571a 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -58,22 +58,12 @@ export class VersionControlService { diffDTO.MarkdownID, ); - console.log( - 'version_control: nextsnapshotID ', - nextSnapshotID, - ); - const nextSnapshot = await this.snapshotService.resetSnapshot( diffDTO.MarkdownID, nextSnapshotID, ); - console.log( - 'nextSnapshot: ', - nextSnapshot, - ); - await this.diffService.resetDiffs( diffDTO.MarkdownID, nextSnapshot.SnapshotID, From aad5b982e9fe06aafa36ec28fed9d6ba4a56c302 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Thu, 21 Sep 2023 11:19:31 +0200 Subject: [PATCH 172/186] General maintenance --- .../src/version_control/version_control.service.ts | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/backend/src/version_control/version_control.service.ts b/backend/src/version_control/version_control.service.ts index 7bba571a..6d6f4c2d 100644 --- a/backend/src/version_control/version_control.service.ts +++ b/backend/src/version_control/version_control.service.ts @@ -53,6 +53,7 @@ export class VersionControlService { ) { await this.saveSnapshot(diffDTO); + // Reset next snapshot and associated diffs const nextSnapshotID = await this.markdownFileService.getNextSnapshotID( diffDTO.MarkdownID, @@ -83,16 +84,6 @@ export class VersionControlService { ///===----------------------------------------------------- - // getDiff(diffDTO: DiffDTO) {} - - ///===----------------------------------------------------- - - // getAllDiffsForSnapshot( - // snapshotDTO: SnapshotDTO, - // ) {} - - ///===----------------------------------------------------- - async saveSnapshot(diffDTO: DiffDTO) { const nextSnapshotID = await this.markdownFileService.getNextSnapshotID( From 07e005461418003fc595f89686338426d98b808c Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Thu, 21 Sep 2023 14:23:32 +0200 Subject: [PATCH 173/186] Fixed timeout issues --- .../file_manager/file_manager.controller.spec.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/backend/src/file_manager/file_manager.controller.spec.ts b/backend/src/file_manager/file_manager.controller.spec.ts index 65aa1f72..7c6fa455 100644 --- a/backend/src/file_manager/file_manager.controller.spec.ts +++ b/backend/src/file_manager/file_manager.controller.spec.ts @@ -33,6 +33,10 @@ import { JwtService } from '@nestjs/jwt'; import { ResetPasswordService } from '../reset_password/reset_password.service'; import { ResetPasswordRequest } from '../reset_password/entities/reset_password_request.entity'; import { MailService } from '../mail/mail.service'; +import { DiffsService } from '../diffs/diffs.service'; +import { SnapshotService } from '../snapshots/snapshots.service'; +import { Diff } from '../diffs/entities/diffs.entity'; +import { Snapshot } from '../snapshots/entities/snapshots.entity'; describe('FileManagerController', () => { let controller: FileManagerController; @@ -54,6 +58,8 @@ describe('FileManagerController', () => { JwtService, ResetPasswordService, MailService, + DiffsService, + SnapshotService, { provide: 'FileManagerService', useValue: { @@ -74,6 +80,14 @@ describe('FileManagerController', () => { provide: getRepositoryToken(User), useClass: Repository, }, + { + provide: getRepositoryToken(Diff), + useClass: Repository, + }, + { + provide: getRepositoryToken(Snapshot), + useClass: Repository, + }, { provide: getRepositoryToken( ResetPasswordRequest, From b7eeda66f7165d87895c3d8e3141dc7a643cac17 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Thu, 21 Sep 2023 14:23:44 +0200 Subject: [PATCH 174/186] Fixed timeout issues --- .../file_manager/file_manager.service.spec.ts | 153 +++++++++++++++++- .../src/file_manager/file_manager.service.ts | 4 + .../version_control.service.spec.ts | 7 + 3 files changed, 163 insertions(+), 1 deletion(-) diff --git a/backend/src/file_manager/file_manager.service.spec.ts b/backend/src/file_manager/file_manager.service.spec.ts index 39194d7c..963c1dbb 100644 --- a/backend/src/file_manager/file_manager.service.spec.ts +++ b/backend/src/file_manager/file_manager.service.spec.ts @@ -36,6 +36,10 @@ import * as CryptoJS from 'crypto-js'; import { ResetPasswordService } from '../reset_password/reset_password.service'; import { ResetPasswordRequest } from '../reset_password/entities/reset_password_request.entity'; import { MailService } from '../mail/mail.service'; +import { DiffsService } from '../diffs/diffs.service'; +import { SnapshotService } from '../snapshots/snapshots.service'; +import { Diff } from '../diffs/entities/diffs.entity'; +import { Snapshot } from '../snapshots/entities/snapshots.entity'; jest.mock('crypto-js', () => { const mockedHash = jest.fn( @@ -67,6 +71,8 @@ describe('FileManagerService', () => { let s3ServiceMock: S3ServiceMock; let conversionService: ConversionService; let usersService: UsersService; + let snapshotService: SnapshotService; + let diffService: DiffsService; beforeEach(async () => { const module: TestingModule = @@ -82,6 +88,8 @@ describe('FileManagerService', () => { AuthService, JwtService, ResetPasswordService, + DiffsService, + SnapshotService, MailService, { provide: 'FileManagerService', @@ -92,6 +100,7 @@ describe('FileManagerService', () => { createFolder: jest.fn(), retrieveAllFolders: jest.fn(), convertFoldersToDTOs: jest.fn(), + deleteFile: jest.fn(), }, }, { @@ -137,6 +146,24 @@ describe('FileManagerService', () => { deleteFile: jest.fn(), createFile: jest.fn(), retrieveFile: jest.fn(), + createDiffObjectsForFile: jest.fn(), + createSnapshotObjectsForFile: + jest.fn(), + }, + }, + { + provide: 'DiffsService', + useValue: { + deleteFile: jest.fn(), + createDiffs: jest.fn(), + deleteDiffs: jest.fn(), + }, + }, + { + provide: 'SnapshotService', + useValue: { + deleteFile: jest.fn(), + createSnapshots: jest.fn(), }, }, { @@ -152,6 +179,14 @@ describe('FileManagerService', () => { provide: getRepositoryToken(User), useClass: Repository, }, + { + provide: getRepositoryToken(Diff), + useClass: Repository, + }, + { + provide: getRepositoryToken(Snapshot), + useClass: Repository, + }, { provide: getRepositoryToken( ResetPasswordRequest, @@ -182,6 +217,15 @@ describe('FileManagerService', () => { usersService = module.get(UsersService); module.close(); + + snapshotService = module.get( + SnapshotService, + ); + module.close(); + + diffService = + module.get(DiffsService); + module.close(); }); describe('create_folder', () => { @@ -629,7 +673,6 @@ describe('FileManagerService', () => { it('should throw an error if UserID is undefined', async () => { const markdownFileDTO = new MarkdownFileDTO(); - try { await service.createFile(markdownFileDTO); expect(true).toBe(false); @@ -656,6 +699,23 @@ describe('FileManagerService', () => { returnFile.Name = 'New Document'; returnFile.Size = 0; + jest.spyOn( + s3Service, + 'createSnapshotObjectsForFile', + ); + + jest.spyOn( + s3Service, + 'createDiffObjectsForFile', + ); + jest + .spyOn(snapshotService, 'createSnapshots') + .mockResolvedValue([] as number[]); + + jest + .spyOn(diffService, 'createDiffs') + .mockResolvedValue([] as any); + const createFileSpy = jest.spyOn( s3Service, 'createFile', @@ -712,6 +772,36 @@ describe('FileManagerService', () => { ) .mockResolvedValueOnce(markdownFileDTO); + jest.spyOn( + s3Service, + 'createSnapshotObjectsForFile', + ); + + jest.spyOn( + s3Service, + 'createDiffObjectsForFile', + ); + jest + .spyOn(snapshotService, 'createSnapshots') + .mockResolvedValue([] as number[]); + + jest + .spyOn(diffService, 'createDiffs') + .mockResolvedValue([] as any); + + jest + .spyOn(markdownFilesService, 'create') + .mockResolvedValueOnce(markdownFileDTO); + + jest + .spyOn(Repository.prototype, 'save') + .mockResolvedValueOnce(markdownFileDTO); + + const createFileSpy = jest.spyOn( + s3Service, + 'createFile', + ); + const response = await service.createFile( markdownFileDTO, true, @@ -745,6 +835,22 @@ describe('FileManagerService', () => { createSpy.mockResolvedValue( markdownFileDTO, ); + jest.spyOn( + s3Service, + 'createSnapshotObjectsForFile', + ).mockResolvedValue([] as any); + + jest.spyOn( + s3Service, + 'createDiffObjectsForFile', + ).mockResolvedValue([] as any); + jest + .spyOn(snapshotService, 'createSnapshots') + .mockResolvedValue([] as number[]); + + jest + .spyOn(diffService, 'createDiffs') + .mockResolvedValue([] as any); const response = await service.createFile( markdownFileDTO, @@ -1381,10 +1487,37 @@ describe('FileManagerService', () => { .spyOn(s3Service, 'deleteFile') .mockResolvedValue(new MarkdownFileDTO()); + jest + .spyOn( + s3Service, + 'deleteDiffObjectsForFile', + ) + .mockResolvedValue([] as any); + jest + .spyOn( + s3Service, + 'deleteSnapshotObjectsForFile', + ) + .mockResolvedValue([] as any); + + jest + .spyOn(diffService, 'deleteDiffs') + .mockResolvedValue([] as any); + + jest + .spyOn(snapshotService, 'deleteSnapshots') + .mockResolvedValue([] as any); + jest .spyOn(markdownFilesService, 'remove') .mockResolvedValue(new MarkdownFile()); + jest + .spyOn(Repository.prototype, 'delete') + .mockResolvedValueOnce( + markdownFileDTO as any, + ); + const response = await service.deleteFile( markdownFileDTO, ); @@ -1435,6 +1568,24 @@ describe('FileManagerService', () => { .spyOn(markdownFilesService, 'remove') .mockResolvedValue(new MarkdownFile()); + jest.spyOn(Repository.prototype, 'delete'); + + jest.spyOn( + s3Service, + 'deleteSnapshotObjectsForFile', + ); + jest.spyOn( + s3Service, + 'deleteDiffObjectsForFile', + ); + jest.spyOn( + snapshotService, + 'deleteSnapshots', + ); + jest + .spyOn(diffService, 'deleteDiffs') + .mockResolvedValue([] as any); + const response = await service.deleteFile( markdownFileDTO, ); diff --git a/backend/src/file_manager/file_manager.service.ts b/backend/src/file_manager/file_manager.service.ts index 2e9a5976..bacae352 100644 --- a/backend/src/file_manager/file_manager.service.ts +++ b/backend/src/file_manager/file_manager.service.ts @@ -67,6 +67,10 @@ export class FileManagerService { ) markdownFileDTO.NextSnapshotID = 0; + + + + if (isTest) { await this.s3ServiceMock.createFile( markdownFileDTO, diff --git a/backend/src/version_control/version_control.service.spec.ts b/backend/src/version_control/version_control.service.spec.ts index 119f6f42..3c66216d 100644 --- a/backend/src/version_control/version_control.service.spec.ts +++ b/backend/src/version_control/version_control.service.spec.ts @@ -11,6 +11,8 @@ import { getRepositoryToken } from '@nestjs/typeorm'; import { Diff } from '../diffs/entities/diffs.entity'; import { Repository } from 'typeorm'; import { MarkdownFile } from '../markdown_files/entities/markdown_file.entity'; +import { SnapshotService } from '../snapshots/snapshots.service'; +import { Snapshot } from '../snapshots/entities/snapshots.entity'; describe('VersionControlService', () => { let service: VersionControlService; @@ -28,6 +30,7 @@ describe('VersionControlService', () => { MarkdownFilesService, S3Service, S3ServiceMock, + SnapshotService, { provide: getRepositoryToken(Diff), useClass: Repository, @@ -37,6 +40,10 @@ describe('VersionControlService', () => { getRepositoryToken(MarkdownFile), useClass: Repository, }, + { + provide: getRepositoryToken(Snapshot), + useClass: Repository, + }, ], }).compile(); From 07a97ab37ea56425ce7aa216dbd3c12742cd84e7 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Thu, 21 Sep 2023 14:28:01 +0200 Subject: [PATCH 175/186] Fixed last failing unit test file --- backend/src/version_control/version_control.controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/version_control/version_control.controller.ts b/backend/src/version_control/version_control.controller.ts index 80fccbdc..33220e9c 100644 --- a/backend/src/version_control/version_control.controller.ts +++ b/backend/src/version_control/version_control.controller.ts @@ -8,7 +8,7 @@ import { import { VersionControlService } from './version_control.service'; import { DiffDTO } from '../diffs/dto/diffs.dto'; import { SnapshotDTO } from '../snapshots/dto/snapshot.dto'; -import { MarkdownFileDTO } from 'src/markdown_files/dto/markdown_file.dto'; +import { MarkdownFileDTO } from '../markdown_files/dto/markdown_file.dto'; import { VersionHistoryDTO } from './dto/version_history.dto'; import { SnapshotService } from '../snapshots/snapshots.service'; import { DiffsService } from '../diffs/diffs.service'; From 6a72da5483eea7a894511de3555840d78da69153 Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Thu, 21 Sep 2023 14:41:54 +0200 Subject: [PATCH 176/186] Minor reformatting --- backend/src/file_manager/file_manager.service.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/backend/src/file_manager/file_manager.service.ts b/backend/src/file_manager/file_manager.service.ts index bacae352..fad30c22 100644 --- a/backend/src/file_manager/file_manager.service.ts +++ b/backend/src/file_manager/file_manager.service.ts @@ -66,10 +66,6 @@ export class FileManagerService { markdownFileDTO.NextSnapshotID === undefined ) markdownFileDTO.NextSnapshotID = 0; - - - - if (isTest) { await this.s3ServiceMock.createFile( From c0277a63d44344fd76c11610dad3d814c6cf5f8a Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Thu, 21 Sep 2023 14:46:42 +0200 Subject: [PATCH 177/186] Added metadata reference for snapshots --- backend/test/file_manager.e2e-spec.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/backend/test/file_manager.e2e-spec.ts b/backend/test/file_manager.e2e-spec.ts index 6baa1b2a..bd09b353 100644 --- a/backend/test/file_manager.e2e-spec.ts +++ b/backend/test/file_manager.e2e-spec.ts @@ -18,6 +18,7 @@ import { getRepositoryToken } from '@nestjs/typeorm'; import { MarkdownFile } from '../src/markdown_files/entities/markdown_file.entity'; // import { S3Service } from '../src/s3/s3.service'; import { S3ServiceMock } from '../src/s3/__mocks__/s3.service'; +import { Snapshot } from '../src/snapshots/entities/snapshots.entity'; // import { FileDTO } from '../src/s3/dto/file.dto'; // let startTime: string; @@ -47,6 +48,10 @@ describe('FileManagerController (integration)', () => { getRepositoryToken(MarkdownFile), useClass: Repository, }, + { + provide: getRepositoryToken(Snapshot), + useClass: Repository, + }, ], }).compile(); From 38aa2fbc81f629478304b728e2f73b191e7dc63d Mon Sep 17 00:00:00 2001 From: jakeweatherhead Date: Thu, 21 Sep 2023 15:12:25 +0200 Subject: [PATCH 178/186] Patched failing integration test --- .../src/file_manager/file_manager.service.ts | 40 ++++++++++++------- backend/test/file_manager.e2e-spec.ts | 4 ++ 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/backend/src/file_manager/file_manager.service.ts b/backend/src/file_manager/file_manager.service.ts index fad30c22..629867e5 100644 --- a/backend/src/file_manager/file_manager.service.ts +++ b/backend/src/file_manager/file_manager.service.ts @@ -66,35 +66,45 @@ export class FileManagerService { markdownFileDTO.NextSnapshotID === undefined ) markdownFileDTO.NextSnapshotID = 0; - + if (isTest) { await this.s3ServiceMock.createFile( markdownFileDTO, ); + const returnMD_DTO = new MarkdownFileDTO(); + returnMD_DTO.MarkdownID = 'testID'; + returnMD_DTO.Name = 'New Document'; + returnMD_DTO.Content = 'testContent'; + returnMD_DTO.Path = ''; + returnMD_DTO.DateCreated = new Date(); + returnMD_DTO.LastModified = new Date(); + returnMD_DTO.Size = 0; + returnMD_DTO.ParentFolderID = ''; + returnMD_DTO.UserID = 0; + return returnMD_DTO; } else { await this.s3service.createFile( markdownFileDTO, ); - } - - await this.s3service.createDiffObjectsForFile( - markdownFileDTO, - ); - await this.s3service.createSnapshotObjectsForFile( - markdownFileDTO, - ); + await this.s3service.createDiffObjectsForFile( + markdownFileDTO, + ); - const snapshotIDs: string[] = - await this.snapshotService.createSnapshots( + await this.s3service.createSnapshotObjectsForFile( markdownFileDTO, ); - await this.diffsService.createDiffs( - markdownFileDTO, - snapshotIDs, - ); + const snapshotIDs: string[] = + await this.snapshotService.createSnapshots( + markdownFileDTO, + ); + await this.diffsService.createDiffs( + markdownFileDTO, + snapshotIDs, + ); + } return await this.markdownFilesService.create( markdownFileDTO, ); diff --git a/backend/test/file_manager.e2e-spec.ts b/backend/test/file_manager.e2e-spec.ts index bd09b353..106dd64a 100644 --- a/backend/test/file_manager.e2e-spec.ts +++ b/backend/test/file_manager.e2e-spec.ts @@ -35,6 +35,7 @@ enum ResetScope { describe('FileManagerController (integration)', () => { let app: INestApplication; let markdownFileRepository: Repository; + let snapshotRepository: Repository; let s3Service: S3ServiceMock; beforeAll(async () => { @@ -63,6 +64,9 @@ describe('FileManagerController (integration)', () => { >(getRepositoryToken(MarkdownFile)); s3Service = new S3ServiceMock(); + snapshotRepository = moduleFixture.get< + Repository + >(getRepositoryToken(Snapshot)); await resetUser(ResetScope.ALL); }); From 854c675aacad10c349e3f65796ee40f93fb97afb Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Thu, 21 Sep 2023 15:22:56 +0200 Subject: [PATCH 179/186] WHen last asset gets deleted the spinner doesn't spin forever --- frontend/src/app/edit/edit.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 942888bb..2bd9f78c 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -583,6 +583,7 @@ export class EditComponent implements AfterViewInit, OnInit { detail: 'Asset deleted', }); this.assets.splice(currAssetIndex, 1); + if(this.assets.length === 0) this.noAssetsAvailable = true; } else { this.assets[currAssetIndex].Deleted = false; } From b0aa2ca832fe8c9af411f14fbfddea608fa37053 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Thu, 21 Sep 2023 15:39:29 +0200 Subject: [PATCH 180/186] Added spinner on actions in home page --- frontend/src/app/home/home.component.html | 5 +++++ frontend/src/app/home/home.component.scss | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/frontend/src/app/home/home.component.html b/frontend/src/app/home/home.component.html index 2ef41aa7..53fe1363 100644 --- a/frontend/src/app/home/home.component.html +++ b/frontend/src/app/home/home.component.html @@ -1,3 +1,8 @@ + +
+ Loading... +
+
diff --git a/frontend/src/app/home/home.component.scss b/frontend/src/app/home/home.component.scss index 282a7820..f2bd5935 100644 --- a/frontend/src/app/home/home.component.scss +++ b/frontend/src/app/home/home.component.scss @@ -573,4 +573,24 @@ $icon-size: 1.5rem; flex-direction: column; justify-content: center; align-items: center; +} + +/* CSS */ +.loading-overlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: rgba(0, 0, 0, 0.5); + /* Adjust the alpha value for transparency */ + display: flex; + justify-content: center; + align-items: center; + z-index: 9999; + /* Adjust the z-index to be on top of everything */ +} + +.loadingIcon { + width:10%; } \ No newline at end of file From 5a87d330b5bb56307f60176100a2aa457541fb5c Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Thu, 21 Sep 2023 15:51:20 +0200 Subject: [PATCH 181/186] Updated local storage on save --- frontend/src/app/edit/edit.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 2bd9f78c..67734f83 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -365,7 +365,7 @@ export class EditComponent implements AfterViewInit, OnInit { contents ); const markdownID = this.editService.getMarkdownID(); - + localStorage.setItem('content', contents); if (pass != '' && pass != undefined) { await this.fileService.saveDocument( this.fileService.encryptSafeLockDocument(contents, pass), @@ -433,6 +433,7 @@ export class EditComponent implements AfterViewInit, OnInit { .then((Boolean) => { if (Boolean) { this.editService.setName(this.fileName); + localStorage.setItem('name', this.fileName as string); } }); } From c299e5d67cea25078e8f15226b461bba63c81af4 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Thu, 21 Sep 2023 16:09:31 +0200 Subject: [PATCH 182/186] Fixed some sonar issues --- frontend/src/app/edit/edit.component.html | 2 ++ frontend/src/app/edit/edit.component.ts | 8 ++++---- frontend/src/app/home/home.component.html | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/edit/edit.component.html b/frontend/src/app/edit/edit.component.html index a683d21b..59280322 100644 --- a/frontend/src/app/edit/edit.component.html +++ b/frontend/src/app/edit/edit.component.html @@ -259,6 +259,7 @@

History

class="spinner" src="assets/Spinner/loading2.gif" title="Loading..." + alt="Loading..." />
@@ -275,6 +276,7 @@

History

class="spinner" src="assets/Spinner/loading2.gif" title="Loading..." + alt="Loading..." />
{ + snapshot.forEach((a, i) => { a.LastModifiedString = this.formatDate(a.LastModified); a.OrderNumber = i + 1; a.Name = 'Snapshot ' + a.OrderNumber; @@ -647,14 +647,14 @@ export class EditComponent implements AfterViewInit, OnInit { } } }); - snapshot.map((a) => + snapshot.forEach((a) => a.ChildDiffs.sort((a, b) => { return a.LastModified < b.LastModified ? 1 : a.LastModified > b.LastModified ? -1 : 0; - }).map((a, i, arr) => { + }).forEach((a, i, arr) => { a.VersionNumber = arr.length - i + 1; a.Name = 'Version ' + a.VersionNumber; }) @@ -669,7 +669,7 @@ export class EditComponent implements AfterViewInit, OnInit { this.history.push(diff[i]); } } - snapshot.map((a) => this.history.push(a)); + snapshot.forEach((a) => this.history.push(a)); console.log(this.history); }); diff --git a/frontend/src/app/home/home.component.html b/frontend/src/app/home/home.component.html index 53fe1363..b68af925 100644 --- a/frontend/src/app/home/home.component.html +++ b/frontend/src/app/home/home.component.html @@ -1,6 +1,6 @@
- Loading... + Loading...
From 46f6b008b4bb9041ca2560816cc50379ac961efb Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Thu, 21 Sep 2023 16:19:27 +0200 Subject: [PATCH 183/186] More sonar fixes --- frontend/src/app/edit/edit.component.ts | 19 ++- .../app/services/version.control.service.ts | 135 ------------------ 2 files changed, 8 insertions(+), 146 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index fc7fa759..241dca60 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -4,10 +4,10 @@ import { ElementRef, HostListener, OnInit, - ViewChild, + Inject, } from '@angular/core'; import { Router } from '@angular/router'; -import { MenuItem } from 'primeng/api'; +import { MenuItem, MessageService, ConfirmationService } from 'primeng/api'; import { FileUploadPopupComponent } from '../file-upload-popup/file-upload-popup.component'; import { ImageUploadPopupComponent } from '../image-upload-popup/image-upload-popup.component'; import { Clipboard } from '@angular/cdk/clipboard'; @@ -16,15 +16,11 @@ import { FileService } from '../services/file.service'; import { EditService } from '../services/edit.service'; import { AssetService } from '../services/asset.service'; import { VersionControlService } from '../services/version.control.service'; -import { Inject } from '@angular/core'; -import { MessageService, ConfirmationService } from 'primeng/api'; -import { set } from 'cypress/types/lodash'; -import { PageBreak } from '@ckeditor/ckeditor5-page-break'; +import { VersioningApiService } from '../services/versioning-api.service'; import html2pdf from 'html2pdf.js/dist/html2pdf'; import DecoupledEditor from '@ckeditor/ckeditor5-build-decoupled-document'; -import { parse } from 'path'; import { SnapshotDTO } from '../services/dto/snapshot.dto'; import { DiffDTO } from '../services/dto/diff.dto'; @@ -60,7 +56,8 @@ export class EditComponent implements AfterViewInit, OnInit { private clipboard: Clipboard, private messageService: MessageService, private versionControlService: VersionControlService, - private confirmationService: ConfirmationService + private confirmationService: ConfirmationService, + private versioningApiService: VersioningApiService ) {} @HostListener('window:beforeunload', ['$event']) @@ -375,7 +372,7 @@ export class EditComponent implements AfterViewInit, OnInit { ); if (readablePatch !== '') - this.versionControlService.saveDiff( + this.versioningApiService.saveDiff( markdownID ? (markdownID as string) : '', this.fileService.encryptSafeLockDocument(readablePatch, pass) ); @@ -388,7 +385,7 @@ export class EditComponent implements AfterViewInit, OnInit { ); if (readablePatch !== '') - this.versionControlService.saveDiff( + this.versioningApiService.saveDiff( markdownID ? (markdownID as string) : '', readablePatch ); @@ -616,7 +613,7 @@ export class EditComponent implements AfterViewInit, OnInit { async refreshSidebarHistory() { this.history = []; - this.versionControlService + this.versioningApiService .retrieveAllHistory(this.editService.getMarkdownID() as string) .then((data) => { const snapshot = JSON.parse( diff --git a/frontend/src/app/services/version.control.service.ts b/frontend/src/app/services/version.control.service.ts index a88c5102..ce56e2d4 100644 --- a/frontend/src/app/services/version.control.service.ts +++ b/frontend/src/app/services/version.control.service.ts @@ -245,139 +245,4 @@ export class VersionControlService { this.sortSnapshotArr(this.snapshotArr); this.sortDiffArr(this.diffArr); } - - saveDiff( - fileID: string, - content: string - ): Promise { - return new Promise((resolve, reject) => { - this.sendSaveDiff(fileID, content).subscribe({ - next: (response: HttpResponse) => { - if (response.status === 200) { - resolve(true); - } else { - resolve(false); - } - }, - }); - }); - } - - sendSaveDiff( - markdownID: string, - content: string - ): Observable> { - const environmentURL = environment.apiURL; - const url = `${environmentURL}version_control/save_diff`; - console.log(url); - const body = new DiffDTO(); - - body.UserID = this.userService.getUserID() as number; - body.Content = content; - body.MarkdownID = markdownID; - const headers = new HttpHeaders().set( - 'Authorization', - 'Bearer ' + this.userService.getAuthToken() - ); - console.log(body); - return this.http.post(url, body, { headers, observe: 'response' }); - } - - retrieveAllSnapshots(markdownID: string): Promise { - return new Promise((resolve, reject) => { - this.sendRetrieveAllSnapshots(markdownID).subscribe({ - next: (response: HttpResponse) => { - console.log(response); - if (response.status === 200) { - resolve(response.body); - } else { - resolve(null); - } - }, - }); - }); - } - - sendRetrieveAllSnapshots(markdownID: string): Observable> { - const environmentURL = environment.apiURL; - const url = `${environmentURL}version_control/get_all_snapshots`; - console.log(url); - const body = new SnapshotDTO(); - - body.UserID = this.userService.getUserID() as number; - body.MarkdownID = markdownID; - const headers = new HttpHeaders().set( - 'Authorization', - 'Bearer ' + this.userService.getAuthToken() - ); - return this.http.post(url, body, { headers, observe: 'response' }); - } - - retrieveAllHistory(markdownID: string): Promise { - return new Promise((resolve, reject) => { - this.sendRetrieveAllHistory(markdownID).subscribe({ - next: (response: HttpResponse) => { - console.log('Backend data response: ', response); - if (response.status === 200) { - resolve(response.body); - } else { - resolve(null); - } - }, - }); - }); - } - - sendRetrieveAllHistory(markdownID: string): Observable> { - const environmentURL = environment.apiURL; - const url = `${environmentURL}version_control/load_history`; - console.log(url); - const body = new MarkdownFileDTO(); - - body.UserID = this.userService.getUserID() as number; - body.MarkdownID = markdownID; - const headers = new HttpHeaders().set( - 'Authorization', - 'Bearer ' + this.userService.getAuthToken() - ); - return this.http.post(url, body, { headers, observe: 'response' }); - } - loadHistorySet( - markdownID: string, - diffHistory: string[], - snapshotID: string - ) { - return new Promise((resolve, reject) => { - this.sendLoadHistorySet(markdownID, diffHistory, snapshotID).subscribe({ - next: (response: HttpResponse) => { - console.log(response); - if (response.status === 200) { - resolve(response.body); - } else { - resolve(null); - } - }, - }); - }); - } - - sendLoadHistorySet( - markdownID: string, - diffHistory: string[], - snapshotID: string - ): Observable> { - const environmentURL = environment.apiURL; - const url = `${environmentURL}version_control/get_history_set`; - const body = new VersionSetDTO(); - - body.UserID = this.userService.getUserID() as number; - body.MarkdownID = markdownID; - body.DiffHistory = diffHistory; - body.SnapshotID = snapshotID; - const headers = new HttpHeaders().set( - 'Authorization', - 'Bearer ' + this.userService.getAuthToken() - ); - return this.http.post(url, body, { headers, observe: 'response' }); - } } From d6dd95b6f2f412f5e255e318f939082d52a1ad48 Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:38:06 +0200 Subject: [PATCH 184/186] New icons for diff and snapshots --- .../src/assets/Icons/editIcons/diffArrow.png | Bin 0 -> 15137 bytes .../src/assets/Icons/editIcons/snapshot.png | Bin 0 -> 1976 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 frontend/src/assets/Icons/editIcons/diffArrow.png create mode 100644 frontend/src/assets/Icons/editIcons/snapshot.png diff --git a/frontend/src/assets/Icons/editIcons/diffArrow.png b/frontend/src/assets/Icons/editIcons/diffArrow.png new file mode 100644 index 0000000000000000000000000000000000000000..374a31921ae65ab120f77c2c70f87ee84bfa38fa GIT binary patch literal 15137 zcmYj&2Rv18{P4M#i>}bk9v59JdzL-QwL%FElwBg*C1hNrWQIakvPxOmvXhm0DILj`_p`hNZg zeo%Uy*E6L7{{m?2Bf#Is+;z>oAc+1W{2%d5l%5kTvJo3 zde_U&#{HIro2NtCiV6n=@j`m|bEdxO%isJ`ZeDr5MPBu~cts$D@`G4dZm8{e_VEG{ z!OJhPMi`;v*)b=0y+t&1@NFxHibhUN%S7C#r*Dq)BB+hV5s!Q#|KZO6HbohIX3@$L z$m)4uaK(FTV~;O{RZ5S}!ME@G-r)^aR?FNzOL-czZL|B!m2~l3YZjB0s;wrI^gdke zA9Xcwpkn7kjtKD(97E_2nF(7M?zej@l_QiEHtHs>U zdn0mBBXk)rBc2%iNn=^jSZvpK|9<75ZJ%k;yuP059Uh+=izeDXWcbT*Ln+$8<@ z^YfBa`NZ61&vfkoWyypcTA~GqR8oX)>pTlFH zTQewl4W|oYf>=sPZep#^ZZ37^G3a!hz!WgUhpc%ngqQx~u)au05>K@)N5HQfcR@aN zR~zs`8|9k`1rtAh&EboP_?&PR;*U<&uM3q#1e*|&q@QmgB6O<&*fc!9{RAEdW1Ls# z#ip~%Aw0jGDU|ziKQ`RN*SS?kZ(n7QKzrd8B2u><>~7te+7F(27c)Y{p3Jy)@@ozS zINR92F+}gpu13GGuMMO-J;NXZ;S!{ks5O3ndUSC-=E9l8&;KrWA=du9Kx3{^aHc|ij@Qke_rthSPa37UxB#eo85!9IyP`W2x!Q|S10Hi|i zK7kSwZw_E~{xWp-UxTue{*e3KxLDpJtjo02J`d@YZE;MYNM@;#eaI8>(F5X;-@{jD z{|OxG%k8>7hSv-R?1<}3R(``?!m$z^ep-Yi!LtS(mP0-MiSxWT+!t^49rC{3sqy~QQ5{lO$U_RQ6U%b1;iX}s! zfxz}8BKL(WVkRP4-%Bs@t=#T4y+?@0x>R>iywv;o;mQN=|C~&}r{&N^iKXJlv1c(8 zqc>W19}Sgx=q3gmE-#Msi624v@G2zp>Dp$MRN&u7?rM~G%H9-R-5Pgvo63Z-OUy$) zIoIfPPWjpW5~}--grpvk>&mbg+P+6Uk%qP5+00qPL+`63H3*|8Uj*4dNY+IQ%c8m@q_x4r_-JSI}^%ErI8rCF_=TdC0Lpx?#QSS zzPg&4C))-E5Lnpt&%t`^Q~=3gVAXqU_4wU2u*~2Vcaaw-W2Qu%b!;cn&*VAjE3FUr zd+|iUV?*4}Z&Tlp=K`u=pIw1G(E~um|FlBVNA}?uuUa2m>_;6k9X;H1k&RHE4O103 z$pawpul?pNoS*wF(X*v%nMJ1WM)n-P2xIQm7`0=bN`ZbalSMbu1I6n1j z@WvF&al^whmxr+Fe{%}j zv)rE8R&#gROnhttSn%{R0t)yN>Lc9{n63js4awwLW4)^{yR6=nzXg^h zdj13e@7XvrB$@0(S;w^h0#HWVz%dQAF9^&`r|*m>s`-(BEc8%rSKp9XWSNA)YF;p9XnATl0Q@8Et035yWgFL^N0pVLX0-1UAWZz9 zvU#X-_Ls3}AGNfa!9`aOU6bdI83%D%z)-U5=L_meCR@@>M0=>Q@7+&)diwg2;r`Rv z!@oeG`U<)=^#lN8$NY^72&nD>H^iglB46))Y{f0Q4|l%hFF&xI=iks083;|09~)_w zm@~8}iIf>Az@sOhkW-?whPSluN{;&3&!2s0Pjo~9gL=vvrVP+IApANGnBDus+*}%X z`y0j^%VXG$mduln8M3;pQj@O&y<#@@peIhgx4x$xAiTqwT^_&@=+F9;QEzdUXObmY**M z9r@cWfvM(sF&yJ8ETO4ZCf|_mM~a8y#3wf8ULEAl01$~8mLsQN)jMZFwe=5dzvA(q znk40)hAbr-*smX7;>gg-b;<{ZHFr0h1#0>;;aE|0z`wTA$%Q+U4?^H1D|T~4JN`@`W?!z^Fn^vFf3hPDxsZED-u&2 z)@1)!zQF+4XUSE+XM(oBBg3{ODEH(BuEt5@Q_~hMYhWCm&PW1$mi7JqdiGdaF5ZpG z)vZ&${ZNM*gBeRmbwzH1fYY7!pU58)!2;_IiCXv8{_42ok56noGxfE9;BXu`YjSy>|+h)xp zA=uxHI{YR_F`IL54G=@0Cd3jg<8HKW-}2)3w`5BY$i^(n3pM@NWUu*)Xj7WQbR`rN zzMoShodWV>A24|_zbcbr>B{739J{IG5OAfA7p8AyZu)r}o=Uh9e&I+P#M#RMIu(*@ z^;GtluFU`9Pv@>tQD}u)j`xx7S=iV+8r!i#-d#uMz zz7G-h#vV0rDBW2ev&u!h+{DIK;KmdmeIfElZu@G`L~PX#g97Upp(ap~GI zprSHAkZb(Fa-x(`2_vE2NM+UKWSx*R%~GW-qfiz1b|n*Ay9?dU={2^Cp}TxWy2K75 zCR)gSlBTdVK=l~sX_n!i&up|^=)#jOCw#E0C@LB~bxloax9Q;PpO>=yoCLy$viWq; zcVH2T=C*hnIvF%f7>+xXlmcOdTmxFlW#e%w4)>!1X%zGK*$~izX_Jpp{jiT;=VvDB zd3H4S$M&5PHa38>jns$eW_!B7^@ttd=o4_v%M>T#XI~rCFYH zb3&anOTU0+hhad1HQ-#iO69?}&oZ|!!p?P&$rKWtwVNMrGR?^rLf~^1UqjJDv&o0` zYT&|jGgzrGMhLd1+%+C}Q#b5J-(+je)3FY=P9o6wlxQ8pa6z!K9n}&i z_BUYRb6CHyso%0E@#vX$l?2dg};1;kvGz9Ye&Oynvc=+|S?Lo2nO7dNiZa z0;jgRjo|H@@1%H6Yj-^1a&KVNz}tdLXTMuCD~N+#4@j_{uN$JK^xm#0qccbnG1IR#2+&r5M)wI&$`~8c`OM{P2k6MIOlH%W#Mom_@KLWH(uo8iw z+vbOtDCV+-$gg@A>X^$-AO-`|jN!kq2jg$@w1Ot?(>AANdv&r!zp!v1_xA7TV*@9f zck!mVZv>8_{&mr96!B#f7kY^WtJ(hZ#n?})m5Iexg-J*El&?}pZgw{hIpuSMK*>Ht zmU38Kby;BT@n<|6dnoIEKTP(@r8wXTKqv~5hs<%*?S`)5pfONjd3eE7WzC4feiAtqo|D7Zc~)VvtnX0WaBJFUC!xt%O~TiX z&g4rbEUvtY5|H_!n^XJTo5qjnjaEOdzR^m54=dnF{$!N(#sN78uwZyJ%X@3mC{fh= z?@d&Yhj{T7R^XoC9mJ3oRz#f+0K;9)Vra2wY_Gvuy=dXg-L^_Y0te5S7>s7cwU3{+hu*I zwxaq@S^U&r21TI}FUrLwvfyaPqGJ040WH{;J?y@Tu)gq;HiJAFeNt@qyr%Z=`9)Om z-OlUNHb*6gt{3|tBqwO;JQ4p_CzET3)b$(Zor)U>@uKd9HP_S=NVis;^ds*yglin#}6zw(=r$?S8$12AuwFO$MyA zEr0EVhDpJg(Ptr;s<|pu9V%85r}(r4`DFAQ2{U7s-o5Ct*8gC6vn+6O>p`IOduSull`ww-sv@@m@B01tzJMUH@=>%XuJ&08atc&%LRDHvmevGD4jOwd$#*4|sgmg_878)Kz^ zWQw`B-q_ZF+c!%jaqDusr=i<>AmD_C%WNtd6YpfC{HQ2Wr>H3k3X{rn9bv)vB?T}+ zI;bpmg^_%ljmhEBbKN7xuj?_sSrQcdLBThRMR8>)aLUd`4kL|`ZgE7ck$779rt8$Q z#Q>DuJ*KJeBS@o|7Jyh@>K)U#r>r#9Y`?nKtV&4m+}!((J2bj~BBsNmYW$sgf-g*mIre?JM}%EZScp<)Z@WwhIzjo z=P7mUzDX9%gl3*^_pAjK2zUS(#~Z8#`uKXB_s$U_XwroK-8gKB(p9qm$3mR+U6HdM zndjQQWmSG4`JF8TIQT=$d|Jrmt^>%Qs6MT%1Y_bWx_uDDz#NL1(ZGq_PRVSLbaf_y znsml!rO!|AXY))rT-hy9gXKXrVt_}*S6xJD{Qhx@dwioE4kF6D*#Uw&klhWpj?GxO zWEWr5?Te5qg78xPo1`Wj&g{t;a_YMUwDq_zUX#X>;HXu%Xc)BneROWDu$-j`GF#7N9K-E^# z5%wNt5)inZ+O;|?sRZ^KM|-4BVtMzLW{;3n1Up(u2$}wqE)Ww&uRx3yDuO;+pg=t; z{^=)hJX#~L=#_Q#5%67I>lb%p!0z7bx3CB1w=nPvCD0wuH$rp6NA&Om^vJh>yl>sv zwZika0YcxXhJJtAb%CSP=k;Q&M4@axdvlu^c{qczUk4ke-pxboTUkdXf0$$N5h(7M z*e5r)>R=F!GnQD04?1%A>_=Z@19s_pgO>=jS+V+-5|-PelhAx1y?%1}ZSNXPv7^iW z79)*VgWL#645q;HHZ2ib=}cEDp`^1l`upg{h8`ATFQMf9tSMl68Sf%WqZ;AVdn4}x zo}Z%ZCS-uhnoZZq<^vb}1%FPMLQcI)KVb40H#oCGHIhmiTm1gr*%7)__8#7&i;<}$HL4ka;gIv4@-!}i4%nF4 zds;f3PcDFB7N#I(i51$9BOR0Zctl?p`zFYAN0ad2_+|LGh$U8HD9F1&`z=CO+rAM3 zW;ZZvXweA|VmN+2U{N9Wm5A6UnBARiEj&N<`XA2sjyxJM75=rKIp8GWO>!J8mgZk2 zl!!1aJSd19NC@q@BWwWoE^uGEbr9}BSnMg;iAoT1Cm?_;xVwGGV{J!>Hel1M`kzf& zh*CR$oe(lG3&*aev%?zmCOHaO`gq~2hB%W*9bEE=|NZMVbcaX7kRPrSfs=%xuQb;= zZ`W!4_wW^DDpCy)e+XK1I2`+vG^F(-$z9qtBSP$FuWv|zZRi9Ov6m``!oIl?^f>Xk z{<|X3MPS)~vzNmSGTp!HS0HpgGx7KGPx*8;z9Z@iS)rP5ib9oAm3eTM8euAQ4K56< zA`V$H`2J3Ka{@a3^1K2;pyyPW%ACn_1bbo=GAoAo#VZ&@BY+7P>1l~%5pWSR%tXD~ zeP&`(ycI%^5N+y3@4nhQ*`y30PNJRKc3i*V=1B*j zURT#Ggj8!wFb14`d#xVJ5CNNv#Kdl7=~(1Ev~Uzg1GC_PD1D(Vq^r8k2h*f;W~K@j ziq()WBt_$uD=^*cJv}X;vwvRb268G(4mQsMwHs;;CHS!CBCtUP|m>K09p1C`bCvMG)T@CNu+|Xdh^8JuB$gJ#98}a{k%*2%Hz&Sl0evHUhi+x=>v14$!Y`4f z&)H)a&uTo|wB-fX)d=DH{`~qEaNX_t_G>+99H3K(Z_h`r5xkNnpb5r+KY8I0#E}5c z0$};t@?{(TrW{%Iv&_U-(yh{s+!=gddSZ{%!_EZZdse3!@n%E&Uc+s3eC`+k(n5!P zVd@e|+Su9c>R$r>5#X>3*vBHvwPQ<&HGRAD_{a#4n?hCga<$0U09Ns7eo&RhIJ$zY z{YW+X`m?=qN42=3%D&NC5Ly-HUMQg|m2tEIkt!7l8GZQqp!(^a|8+ z(erj7G+bo1F=oVA>imXqSEBgGUqL5xx@E;Ugv zDU%cjyC!Er6oKu>NCYq&i@zd3ze%goLZ! zGh}dtZuls!f_E0{TuX-2c>xrD1Y zT^27MIo7n-kOAJNhGFysmak!7rOC%t8pZ&uMgZ4_h+c&07}S%wI}7tL8!6?{rv>mT zvL+u%8Yu4cDD6FR4`R;Xt4x>Rx$aH?RE)1TL8L^7TAje2`XaWg3%7skhuD`Br(&hA zzsK%$%!?H~+aZC#{RLdg?h*wJq)>MH8*D%@(5ND0LL5uL0$qGR z0venG*7?WDKVz(|B7kJ;t&?Dd^vgpUF<;shl*Kpwj(C2T3jEYF5#!5O$k zocS91{2-9K2x&UK%jN(_6J3nVM2-PVB8R&gD0UUYTv$Jk%DOrnXGyaUg1pG(2OdE{ z#pCOZ5U(-HPGcPDm$c_}&&(O{TwnVMv%)V6X{0av>IT&W7U)N0N-!J|>T-jd2J(jx zmC-k`>ciCcH?LZzF(r+wezlvE&36IcuAl!YS+2=C$p%`O{86B4D2Y;LWdm|yi$V{-Vg$nWTN9Oa z(fQ(}TSyyh1KSkl;Lx@U$4vC+C=Q_URZ!A?!#=my{CrOfzLkTSs8q(6taf}W7#u(0 zV^k{#gFXyEAFp^Mi3noF@_mUO`Rxp%u&;ppvdUBMZO~QF8esTrP;H6IVl7OsGC(f` zxK)xUsWYcrn{nEdrEZaQ1rzV!)dA9+k?uTf#~!GWw)?5CT_;2kHtd9x`(iJi!VMY( z%vXG46ZzJYe~+XBntprj8;XHxPP~%I-{}I>lyp87btKR)Ue69>#wFZ`yK7)abmgzb(mhV^okG5Y*yt;VGl*WId4u*#iN~DXn{oiY} z2F2Lpkt?OSoEays3#>M84ucB1Jm@P^x8JW?)8}L>e%kS`9<32(){$_oGzyR-b7K|s zlg5g!;rUrXBkI_!g|f?5sNvjza~fLX!H;D%6HeQh|4vK{>e{q0nPO0 zjXo+P#t0f)tbP!>QA|mPD*boZw{Nh&;>fQ5$Jgv(v43Xn8eubTuLqD)w=I5~BKUD^ zyuYgzsP|%FHvI0Qet)TXXYFc`;>#yua-8H(WoQjv<(W@99_n=8(65J0>(}Ux$~GVb zWB@(l$75HV1HW5VIVSD`XF^$C+@?;o8r2t%*s~270|OJVyEE2@TbKMns-@qq2HDf; zbq`;qs=5G@XoI_|3^lS!+P@V`Y@43*M8|?r5z(M&c4ZT>0ESV!MfH!nKJ&M>FKvDm zfef4JYnG1HyQ7UB_ay}RG=h$z1h7iFm0)BbuhLh1?SsqyXpzdhk+#IzMzls^X|Yxl zB|*dJFFHkh8x;MuK)33-*uCQp?Cqk}f9!I6f54T0<5%5pAh|^BtAG;?qFF3HEm0%8 zU>+a`Fv8%I^+FDtklThsG;PscQtsSwW}=|&o>e{OZ90t#CPUzFy2NdR-R!#WzQVYL zpTAbht>4D&sV+#E4+j^fdVs=XG$=6f-JbSOE{|@zlzU@PKMc=*CZKfAzVzMdLfy0W z`#&d#=f^K6u6y=hYq=B+h!(q7FkI>D2Y2pWz+hBwv$sZfRq$YOMPK948|)=fsMpDN z(|~ZnTAb~6RG|A|H!LyEF$_LDv;ohgg@O;Y^L`yvvYDW=^v2@#dD>}(5Q$&E3HM8( zB=?g`evhfcjgE4^S^|^nB=oiY&_;QjzHalSdGuT4z{kS7BuNiKsiDi#`L^IG%~#7T zz(&mIseSf3vF1`0^l5S^ko5jv^XyJ}}lywZl} zf&l-ao%Jh^{he>kij`besI0E%KaR&`q9+(L1Q^q=l?Kh)s&b#k#RpiooN7i}t4K=g zuYFJfjhDhCb})R>9D7tE#IgZ4)A^t^^ZK=4f!gVM2gy|JCB%no1&_c zj?a$YaP5vPNf^(+7XWCu_TgR#`}BUNwwU5)aNN~66?24cTFf|^R*DJBr@S--hH12c z_vkvyGatlkxr3N~v5!!@Ued(_W`!=O5!%HPY@h#e;f{ZIMJo7}w^-v@KxO;5Wc?0= z6@}nhs7zgEY@>YYkH4Stn2Ahfiu$YV2UraOC4Frs4~rEF)si@%BV#|qzHJc6w&xSo z@5!q8JE;l<8zFSX7tQzW(l@fb>~%S3tu{hXI-uzq?+m(|iZ$XC=0a=lFeigwVQV*k z`2X@xa7E;%C+kOr?2;5^?CDVV!+IC?w16z>34yk*=3Di+4M|3_)M{n%VgHv?!;>Vm z#=nfV{8s+lv$vn@Y&YESH-tCyG}--N`t-I*uAqyjF0=12%ISquHz0K%=nuZG=tCW{ zWe8|iQ8bqCen|(B?9aEey)%De$T5Gm^aA!XwI{ZNmB3t4X{$tF#K+0wDqu87^DD9B zpGN;U5LVrd4WNsc9rsXuqJn?^&@nAN_@6hTOMzFSuV-hA?Mpc2k`mn3od>I-?#4Rk z`RGQan4}< zoatK+65F0I>9@Q{WE(LfbN4@<$lp#qid@MP{F|odfp>`ua zxad~#V=!07J`*cF8YnO-Ofr+1rzI?T7n`}A1o~jRv+Q8#a4_$A_M1;ep}L9Vav8w% z_0?Lz3!)Ia{X^MhlIy0gwQ7A@%a`s0Fj5F3J-zz|wOq*45dT|{-0^Ovrn8I36q4zt zuW?PG%W?bQxYM4%fugVOj@$mQN*yEltG4U=3E z_7k&uzvr5xvdirURtxw`s#}xx6#*`vhx@I4aO*X?+g)TH5SlEAP+mV%5?TGxx!vfKUTPVO10K#*d=WC_Ke5Bp+h4-#;0`s(ge#Q@b?~*^y`=0@Gawcj68)ti(KIG@P=4}ll1wh-t7>N4V zS;=JckT?WSme2j^vrtJ@-yx?HxWoj}Da|vlNU_m2KN+U99@X;QA>)9Lq=%nb-JN3Z zfAlli{k@a#7-nMf_RXlKo2_?;(=(Bs?+higO3O9UhJSak*zWgS%ltbr&yQO-0M>)b zlIzW%nHSJTYT!C`;09weaIziF(jpK3ZnE9xDUEGB1U+THxnF~sY4ZOX-VG;HDT4|( z%a@(^-Y=27V5Fm8S*i(r2UtYM_7M*jkf4TP~>Zx4*TZTvMl=f zC#4vBcLr0Tz1P1Wpc?#l18!|2n9#{#O@*;JV%c_o%p6q^rYMc7PU`nokH+MQ1thce zmf}};XqQ3Ir6q*XQ$8AqDL%Ls9h{R%ovC<0SnHRkKm4{&-n2du}!wq<9SB4&*^%Se+9u-&8FJ_w*6b{NV>&LJ< zQUxv6RXNz#F%X-0MvD=AmUl9uCa;k_eqTa?Dc5U%moBvhLrbg~0uI_9NhXB>pJ&Cu z5NotECavk@lvQCld7Ua|L<*o~0|&b7+c&AcW5H%_0+?S6D=JFH2?N%P!$Rp=F@el~bn;ne>D=D?O@BD1N9*1e! zfgff!4{!jpGjNY$T2*0{>NX|bmqr125jT3aIvX%??W8skh`fC*$Als+%!6-7D5ZR- z&N29+*?QZfi<7i&e(Dz=*Ocq5st*$$7E$r;}4Yh)YYm z0!K3((VfFPz|NW`c!jvyUgB;DC(Zc6b^|FZ2Qd2_&5%*W`Q0DeCz@T}DLa7*!n6+U zEqC@8#nJPv^Yf%nBEr4gFXHy;a<{Cegg{&R{U}#V4wCoGuX|$YAEr4aTS4#;wV$!q zB7wBBKbnvOVafPh)jOLxM!kKm=)QTCw7{g;2DK-{$^Q(Jz?I?2`m0oG`gS~H@qhe~ zb5Z<^S?i9ZY=Wbof6;q#;X91;sQ62>^^}=<- zDFKq1eOeIpjh^|ZcbC?pcmReAzu?KLpjDE!m-H-BSX`#A3(zCD7qn+K zWG4Tw?O}bs$(u_0IZmeK3-n`NTHjY5f10V;W;s2%cPUNipc+}H?eO)XTba!!6G&rI z=XpthC#NQ)sqU-Me5Yl~+32j9U^p}cNkZnRS2(x8Q-|^T5AqBt)GG34ds9x9ZY<32 zslWeL`4~-}24BZ*qVVN?Wx-%#pr-Dv* z&N!Hip&v9DTnkROk3JGb?c!zyHKiznhjd7*+`)ALcpM>nNcR8^;Kyt}Ew)TP_TpMl z`nxg0v`nd-yBa&s+pCSzIPd&kVBo;D^b*1(d!sY=c-X;-xwMM0drMhb!BO=5mD3=D zuW6z$pANAL!Dh=ErVRCWZmp6K*DXLH_GSHzREhu;DCtF+3Lq@P_x`e3kwhbh9EVg7 zNYm2yTW1+n!!CjI&eZ(9er+;2CrnP389Fux3anwm;>kAYTp3zUv+`5wlzYOQ+QBce zBfVXqUiN8ISh6)?y5&366WeF1%K1_IQdw+XaP-B&B|u+CFu)UhOAL#7wqr{X-w=r!}d zM<~^WlRw!uOATWMnvF1N*9=&y zf?pu`wcb)pC5zkRWIQ;DwAW?#U-t$((O?&H-e|`qF{!)nBeT^_6scs>WJK~ zuqkp&Mx3Rskma?<^od|%Bta3>B0gIG(Dk5KJ4io=Mh296V6As+cbwUcL;yvlvuwY&4iy#M2(GF;zi`QM0lCY`x zJLI3Ko{1*TJWST#D_cNmzRFHM{#ec!>BB6(bqWqsNjCP30KSY~t*Jl_`Lv678RPvu zf{@`GAk2L;e|p^jKxYAl18V)^G#E+)3Ec6~wb*I~pq|^=VMh($m0d9HmvyVv(RvlN z1xCyhJnz|Uz1Uy)k>{UVQd89>QT1!p*Ov6Oc7 z-7?y6e<2siD|1mzp(!la=z{`#5n4Cs08>uu8_<8t$6)mif$ce%eTYA{&e=cueE4Sp zo4`~!$q&!bdMLRQPFVWuQvRJ^DaI58CiV#v(w}H8L#|w~c0=TAJDe%+nD7h%5eV^RM#UA75PQmH=09Y=p>?5hAP23aAuphK~Kd z^NAdu?YBkc!8ZvU1(INg(%8QF&ug~zjQirvv83ntswwI8w=YXOK|(I56fFlDYq}IW zSlU->^J{nC%`98H;dL1F3n_OLU9SyRtt|QstXGmka{qvCBS%kn-m;W3_uTSSiIyaP zLVGR6k_bAd+of-?E~iyj3|yvh6odKxzAHSM<{nGo6WhoC+)KT0HD={O{O_NSS?Z$0v7Cv$QnM72x+3^Wm$~u zACfeGWAO7z%PxKR4CnsByBCXw0W!da#xsouyq%)yiKYHd*%R5vZ}_8nY7znR_d~1H zAEXd|RdAniC-oeekLmE(c20{WVu>X~kK^a5saGlF2n@Lq+c+Z$_BFu!`mlDTo3>La zy}|WdE`mLgHfx;Hdl+Ui=H`8d-&{cj%;3J`>mjn+VKb+Dl$$NlK{Q4YeFApo)Q#vG z#9T+T0XYx5Tl<&vl0OZc=h=L%H%(9GmwP&2vocY!Ig?cTKz+LKqqD${Bp9T~@>$Z) zc@0I(JWbZWUsgb)au64&sd;PMY0bi&6SC0r@NJ&G@kfJjx(o0T;};1&1~M*Xjo(2` zk!iwvgRe@b5WN+e+V-zbjiiuMNy61%ZIacPum&>=;BI?^BaeKuNquyqIg>$!!I!&l zgV@kDxhl}wtU49kycF!dl4TuiU9m&`UScnbyCYGqb3C{LXKeRhz*1?~Wy#+bczQ>z zW;tfhOL~h6OjV;RP&(KWx@L-Ir&4O-{ZT?^pQ^8?y!f*^1^dapN=~amFmQqA_yBT2 z;jb$Sbw8IbBrIvS__Vkv@eg^V#lB-~C#17m4>i-J)b5@vYTooX{#U^WF-(lHJ*1Qh z-7_!MY2j`=xQtdoAD(uNv+dI4FA8oI*#=(A&ikJZ@1W^n@IN|=r4-{5DeyTfq^ETe KUwqy=^#1?^{^UFW literal 0 HcmV?d00001 diff --git a/frontend/src/assets/Icons/editIcons/snapshot.png b/frontend/src/assets/Icons/editIcons/snapshot.png new file mode 100644 index 0000000000000000000000000000000000000000..fb635eab820d51ae69e7a865a1a534abb2eafe9c GIT binary patch literal 1976 zcmaKt3s90-8^>QTgfP)9FRg}JHZ>aMws$T#irxKy8C^K>$|4 zMgV~O5u6;n;tHk*iDdy~bc;MXnE34ZR*Xtb<&9q3)FR@=8 zEaGOEd9kk>MU*s)k^Ft8ob?Wx-)C}8AEKrDtV8C+v$xa{Tv@fv{JKZ^k+UM3abdyA z0=dyJPUlPkB^gUezDkzaP*5&8TM3`0Pb5(^Z3*px1da=V2omwc@M# zArzLZz}n`?BTMKa18ZzBCz5tdB~o)%>Yay0;3ziXZTpD>aWR}>@$Uva;rKTT6^mz@ z`~3``|Iw|!al9s?gx3cd6Ps15xL#ivxZ2#hjF;Rtk&^v%7{@}>uHX$}22e{f{K%N9 z5OE8wyj^ACvT^t!KAO@B3AHGXrg+1k($3Vjaw|hq7U6Q!`cRYn z^;t>l=6BEZoc-}Wv=*BCbc@GkHBf_ov(LfL3nMTF{Wn}#`9X5el?rF)LM}im@%ZH|f6D+A@R;*!{AJx30Z%V5(ZBrrbCC`z&Ct^Jsj^3pAwh8v2H};=i8~ z81AT;f(oENAu2(4(Ck&WyO|pyjWOJ}+0WZda8hziWfS?HA?5-`U3*yT0P?MgpbaP3 ziBywgsx#69c1tx`8rr44ok5@H@9&gl51x;Vf{QVA2^MOg*_Ds=%{M(NjfPaB zM5v-b8BErO>bUVrYiha=^4!0!ha2ob4TXC|j|M)>@VpZZTzF+`Rlb0`YmakcXTTuy zAynXLT81Yk{F^VgoOcsp2pVt^?MPf+yGgKG8Y(cp;03sAMN;*3u#mzxP&fNc9dKSyq-QI1vrY@4yYz>$bER20?a2; z)0OJNC4-+ymxQePRrbesE%Y?Tsb}l95<5yj(WJ2JYHY3nt8Qv?7nDkEC~dLpuIOzM z-Y$8@54Kvt*?&k*`4b|v6}=d!XWG3ns_>N$<;P3$dcT#6yzQC)eLIv2nMx=R26!x3 zeOE(T6|<(yHycj(ufmt*a=?~qd`+1(zkV-{9{+H)M6f#jd3P$p0*6SnQ0n4&#}+h> zJ!V;+6#`DK;;}}e6|)t0dROxQ;e%0`crea*<~SAcOIv=G3K)m13JrI;nPb73b_?qpkMMwpE^iHItb+* zCv?9TB`!5uq%Yat*YCtDJ)^g9mdq&iw|bor@~(X{*~|Wx$bh^PDiZTbBCI3nR?z%v qX2WUE*ima1+Ub* Date: Thu, 21 Sep 2023 17:38:26 +0200 Subject: [PATCH 185/186] Date and icon reformat --- frontend/src/app/edit/edit.component.html | 18 +++++-- frontend/src/app/edit/edit.component.scss | 7 +-- frontend/src/app/edit/edit.component.ts | 64 ++++++++++++++++------- 3 files changed, 64 insertions(+), 25 deletions(-) diff --git a/frontend/src/app/edit/edit.component.html b/frontend/src/app/edit/edit.component.html index 59280322..8b094f69 100644 --- a/frontend/src/app/edit/edit.component.html +++ b/frontend/src/app/edit/edit.component.html @@ -377,8 +377,13 @@

History

alt="" (click)="expandSnapshot(obj, $event)" /> -

{{ obj.LastModified }}

- + + +

{{obj.LastModifiedString}}

History [ngClass]="{ selectedHistory: diffObj.isCurrent }" (click)="insertContent(diffObj)" > + - -

{{ diffObj.LastModified }}

+

{{ diffObj.LastModifiedString }}

+ this.history.push(a)); console.log(this.history); @@ -754,16 +759,22 @@ export class EditComponent implements AfterViewInit, OnInit { } formatDate(dateString: Date): string { - if (!dateString) { - return dateString; // Return the input string as-is if it's empty or null. - } - + const months = [ + 'January', 'February', 'March', 'April', 'May', 'June', + 'July', 'August', 'September', 'October', 'November', 'December' + ]; + if(!dateString) return ''; const date = new Date(dateString); - const year = date.getFullYear().toString(); - const month = (date.getMonth() + 1).toString().padStart(2, '0'); - const day = date.getDate().toString().padStart(2, '0'); - return `${year}-${month}-${day}`; + const dd = String(date.getDate()).padStart(2, '0'); + const mm = date.getMonth() ; // January is 0! + const yyyy = date.getFullYear(); + + const hh = String(date.getHours()).padStart(2, '0'); + const min = String(date.getMinutes()).padStart(2, '0'); + const ss = String(date.getSeconds()).padStart(2, '0'); + + return `${dd} ${months[mm]}, ${hh}:${min}:${ss}`; } enableReadOnly() { @@ -775,15 +786,17 @@ export class EditComponent implements AfterViewInit, OnInit { } insertContent(obj: any) { - this.deselectAllHistory(); - obj.isCurrent = true; - if (obj.SnapshotID === 'LATEST') { - this.disableReadOnly(); - this.editor.setData(obj.Content); - return; - } - this.enableReadOnly(); - this.editor.setData(obj.Content); + + console.log("Just clicked on: " , obj); + // this.deselectAllHistory(); + // obj.isCurrent = true; + // if (obj.SnapshotID === 'LATEST') { + // this.disableReadOnly(); + // this.editor.setData(obj.Content); + // return; + // } + // this.enableReadOnly(); + // this.editor.setData(obj.Content); } deselectAllHistory() { @@ -804,5 +817,20 @@ export class EditComponent implements AfterViewInit, OnInit { arrowElement.classList.toggle('expanded'); event.stopPropagation(); + + //retrieve all diff content and previous snapshot content + this.versioningApiService.loadHistorySet(this.editService.getMarkdownID() as string, snapshot.ChildDiffs, snapshot.snapshotID).then((data) => { + if(data !== null){ + console.log("Process diff data."); + } + else { + this.messageService.add({ + severity: 'error', + summary: 'Error', + detail: 'Error retrieving history set', + }); + return; + } + }); } } From 0185d84a1c8d4181b0d808a7a9d79cb4fa6f348f Mon Sep 17 00:00:00 2001 From: JulianPienaar <104741835+JulianPienaar@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:45:43 +0200 Subject: [PATCH 186/186] Implemented functionality to test versioning --- frontend/src/app/edit/edit.component.ts | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/frontend/src/app/edit/edit.component.ts b/frontend/src/app/edit/edit.component.ts index 142f4f4f..c5ec5d15 100644 --- a/frontend/src/app/edit/edit.component.ts +++ b/frontend/src/app/edit/edit.component.ts @@ -788,15 +788,16 @@ export class EditComponent implements AfterViewInit, OnInit { insertContent(obj: any) { console.log("Just clicked on: " , obj); - // this.deselectAllHistory(); - // obj.isCurrent = true; - // if (obj.SnapshotID === 'LATEST') { - // this.disableReadOnly(); - // this.editor.setData(obj.Content); - // return; - // } - // this.enableReadOnly(); - // this.editor.setData(obj.Content); + if(!obj.Content) return; + this.deselectAllHistory(); + obj.isCurrent = true; + if (obj.Name === 'Latest') { + this.disableReadOnly(); + this.editor.setData(obj.Content); + return; + } + this.enableReadOnly(); + this.editor.setData(obj.Content); } deselectAllHistory() { @@ -821,7 +822,9 @@ export class EditComponent implements AfterViewInit, OnInit { //retrieve all diff content and previous snapshot content this.versioningApiService.loadHistorySet(this.editService.getMarkdownID() as string, snapshot.ChildDiffs, snapshot.snapshotID).then((data) => { if(data !== null){ - console.log("Process diff data."); + console.log("Process diff data.", data); + snapshot.Content =data.SnapshotHistory[0].Content; + } else { this.messageService.add({