Code Refactoring

code/client/src/domain/editor/fugue/Fugue.ts

@@ -28,7 +28,7 @@ export class Fugue {
   }
 
   applyOperations(operations: Operation[], override: boolean = false) {
-    if (override) this.tree.clear(); // clear the tree if operations will override the current state
+    if (override) this.tree.clear();
     for (const operation of operations) {
       switch (operation.type) {
         case 'insert':

code/client/src/pwa/manifest-config.ts

@@ -33,4 +33,4 @@ export const manifestConfig: Partial<ManifestOptions> = {
       purpose: 'maskable',
     },
   ],
-};
+};

code/client/src/pwa/pwa-assets.config.ts

@@ -1,9 +1,9 @@
 import { defineConfig, minimal2023Preset as preset } from '@vite-pwa/assets-generator/config';
 
 export default defineConfig({
-    headLinkOptions: {
-        preset: '2023',
-    },
-    preset,
-    images: ['public/notespace.png'],
-});
+  headLinkOptions: {
+    preset: '2023',
+  },
+  preset,
+  images: ['public/notespace.png'],
+});

code/client/src/pwa/pwa-config.ts

@@ -1,11 +1,11 @@
 import { VitePWAOptions } from 'vite-plugin-pwa';
-import {manifestConfig} from "./manifest-config";
+import { manifestConfig } from './manifest-config';
 
 const pwaConfig: Partial<VitePWAOptions> = {
   registerType: 'autoUpdate',
   manifest: manifestConfig,
   devOptions: {
     enabled: true,
-  }
+  },
 };
 export default pwaConfig;

code/client/src/ui/pages/document/components/editor/hooks/useEditorSync.ts

@@ -1,27 +1,16 @@
 import { Dispatch, SetStateAction, useCallback, useEffect } from 'react';
-import { Descendant, Editor } from 'slate';
+import { Editor } from 'slate';
 import { toSlate } from '@domain/editor/slate/utils/slate';
 import { Fugue } from '@domain/editor/fugue/Fugue';
 
 function useEditorSync(fugue: Fugue, setEditor: Dispatch<SetStateAction<Editor>>) {
-  // editor syncing
-  const updateEditor = useCallback(
-    (newValue: Descendant[]) => {
-      setEditor(prevState => {
-        prevState.children = newValue;
-        return prevState;
-      });
-    },
-    [setEditor]
-  );
-
-  const syncEditor = useCallback(
-    (slate?: Descendant[]) => {
-      const newSlate = slate || toSlate(fugue);
-      updateEditor(newSlate);
-    },
-    [fugue, updateEditor]
-  );
+  const syncEditor = useCallback(() => {
+    const newSlate = toSlate(fugue);
+    setEditor(prevState => {
+      prevState.children = newSlate;
+      return prevState;
+    });
+  }, [fugue, setEditor]);
 
   // syncs the editor with fugue on mount
   useEffect(() => {

code/server/sql/create_tables.sql

@@ -43,7 +43,7 @@ CREATE TABLE IF NOT EXISTS workspace_member (
 
 -- Triggers
 
--- Resource is deleted -> Remove self from parent's children array
+    -- Resource is deleted -> Remove self from parent's children array
     create or replace function on_child_removed() returns trigger as $$
         begin
             --- Check if parent resource exists
@@ -57,7 +57,7 @@ CREATE TABLE IF NOT EXISTS workspace_member (
         end;
     $$ language plpgsql;
 
--- Resource is updated -> Update new and old parent's children array
+    -- Resource is updated -> Update new and old parent's children array
     create or replace function on_child_updated() returns trigger as $$
         begin
             if new.parent = old.parent then
@@ -79,7 +79,7 @@ CREATE TABLE IF NOT EXISTS workspace_member (
         end;
     $$ language plpgsql;
 
--- NEW RESOURCE IS CREATED -> UPDATE SELF'S PARENT ID AND APPEND SELF TO PARENT'S CHILDREN ARRAY
+    -- New resource is created -> Update self's parent id and append self to parent's children array
     create or replace function on_new_resource_created() returns trigger as $$
         begin
             --- parent_id is null
@@ -110,7 +110,7 @@ CREATE TABLE IF NOT EXISTS workspace_member (
         end;
     $$ language plpgsql;
 
--- Add root resource to resource table when a workspace is created
+    -- Add root resource to resource table when a workspace is created
     create or replace function add_root_resource() returns trigger as $$
         begin
             insert into resource (id, workspace, name, type)

code/server/src/controllers/http/handlers/resourcesHandlers.ts

@@ -3,7 +3,7 @@ import { ResourceInputModel, Resource } from '@notespace/shared/src/workspace/ty
 import { httpResponse } from '@controllers/http/utils/httpResponse';
 import { NextFunction, Request, Response } from 'express';
 import { ResourcesService } from '@services/ResourcesService';
-import { InvalidParameterError } from '@domain/errors/errors';
+import { InvalidParameterError } from '@src/errors';
 import { Server } from 'socket.io';
 import { enforceAuth } from '@controllers/http/middlewares/authMiddlewares';
 

code/server/src/controllers/http/handlers/usersHandlers.ts

@@ -4,7 +4,7 @@ import { UsersService } from '@services/UsersService';
 import { httpResponse } from '@controllers/http/utils/httpResponse';
 import { enforceAuth } from '@controllers/http/middlewares/authMiddlewares';
 import admin from 'firebase-admin';
-import { UnauthorizedError } from '@domain/errors/errors';
+import { UnauthorizedError } from '@src/errors';
 
 function usersHandlers(service: UsersService) {
   const sessionLogin = async (req: Request, res: Response) => {

code/server/src/controllers/http/handlers/workspacesHandlers.ts

@@ -5,7 +5,7 @@ import { NextFunction, Request, Response } from 'express';
 import { WorkspaceInputModel, WorkspaceMeta } from '@notespace/shared/src/workspace/types/workspace';
 import { Services } from '@services/Services';
 import { Server } from 'socket.io';
-import { ForbiddenError, InvalidParameterError } from '@domain/errors/errors';
+import { ForbiddenError, InvalidParameterError } from '@src/errors';
 import { enforceAuth } from '@controllers/http/middlewares/authMiddlewares';
 import { getSearchParams, SearchParams } from '@src/utils/searchParams';
 import commitsHandlers from '@controllers/http/handlers/commitsHandlers';

code/server/src/controllers/ws/events/document/onJoinDocument.ts

@@ -1,6 +1,6 @@
 import { Socket } from 'socket.io';
 import rooms from '@controllers/ws/rooms/rooms';
-import { InvalidParameterError } from '@domain/errors/errors';
+import { InvalidParameterError } from '@src/errors';
 import { getUserFromSocket } from '@controllers/ws/utils';
 import { getCursorColor } from '@controllers/ws/events/document/onCursorChange';
 import { Collaborator } from '@notespace/shared/src/users/types';

code/server/src/controllers/ws/events/document/onOperation.ts

@@ -1,7 +1,7 @@
 import { Socket } from 'socket.io';
 import { Operation } from '@notespace/shared/src/document/types/operations';
 
-import { ForbiddenError, InvalidParameterError } from '@domain/errors/errors';
+import { ForbiddenError, InvalidParameterError } from '@src/errors';
 import { DocumentsService } from '@services/DocumentsService';
 import rooms from '@controllers/ws/rooms/rooms';
 

code/server/src/controllers/ws/events/workspace/onJoinWorkspace.ts

@@ -1,5 +1,5 @@
 import rooms from '@controllers/ws/rooms/rooms';
-import { InvalidParameterError } from '@domain/errors/errors';
+import { InvalidParameterError } from '@src/errors';
 import { WorkspacesService } from '@services/WorkspacesService';
 import { Socket } from 'socket.io';
 import { getUserFromSocket } from '@controllers/ws/utils';

code/server/src/controllers/ws/rooms/rooms.ts

@@ -1,7 +1,7 @@
 import { Socket } from 'socket.io';
 import Room from '@controllers/ws/rooms/Room';
 import { getRoom, joinRoom, leaveRoom } from '@controllers/ws/rooms/operations';
-import { ForbiddenError } from '@domain/errors/errors';
+import { ForbiddenError } from '@src/errors';
 import { UserData } from '@notespace/shared/src/users/types';
 
 /**

code/server/src/databases/firestore/FirestoreCommitsDB.ts

@@ -1,7 +1,7 @@
 import db from '@src/firebaseConfig';
 import { CommitsRepository } from '@databases/types';
 import { Commit, CommitMeta } from '@notespace/shared/src/document/types/commits';
-import { NotFoundError } from '@domain/errors/errors';
+import { NotFoundError } from '@src/errors';
 
 export class FirestoreCommitsDB implements CommitsRepository {
   async saveCommit(id: string, commit: Commit): Promise<void> {

code/server/src/databases/firestore/FirestoreDocumentsDB.ts

@@ -1,5 +1,5 @@
 import { DocumentContent } from '@notespace/shared/src/workspace/types/document';
-import { NotFoundError } from '@domain/errors/errors';
+import { NotFoundError } from '@src/errors';
 import { Operation } from '@notespace/shared/src/document/types/operations';
 import { firestore } from 'firebase-admin';
 import FieldValue = firestore.FieldValue;

code/server/src/databases/memory/MemoryCommitsDB.ts

@@ -1,4 +1,4 @@
-import { NotFoundError } from '@domain/errors/errors';
+import { NotFoundError } from '@src/errors';
 import { CommitsRepository } from '@databases/types';
 import { Commit, CommitMeta } from '@notespace/shared/src/document/types/commits';
 

code/server/src/databases/memory/MemoryDocumentsDB.ts

@@ -1,4 +1,4 @@
-import { NotFoundError } from '@domain/errors/errors';
+import { NotFoundError } from '@src/errors';
 import { Operation } from '@notespace/shared/src/document/types/operations';
 import { DocumentsRepository } from '@databases/types';
 import { DocumentContent } from '@notespace/shared/src/workspace/types/document';

code/server/src/databases/memory/MemoryResourcesDB.ts

@@ -1,7 +1,7 @@
 import { ResourcesRepository } from '@databases/types';
 import { ResourceType, Resource, DocumentResource } from '@notespace/shared/src/workspace/types/resource';
 import { Memory } from '@databases/memory/Memory';
-import { NotFoundError } from '@domain/errors/errors';
+import { NotFoundError } from '@src/errors';
 import { v4 as uuid } from 'uuid';
 
 export class MemoryResourcesDB implements ResourcesRepository {

code/server/src/databases/memory/MemoryUsersDB.ts

@@ -1,7 +1,7 @@
 import { UsersRepository } from '@databases/types';
 import { User } from '@notespace/shared/src/users/types';
 import { Memory } from '@databases/memory/Memory';
-import { NotFoundError } from '@domain/errors/errors';
+import { NotFoundError } from '@src/errors';
 
 export class MemoryUsersDB implements UsersRepository {
   async createUser(id: string, name: string, email: string): Promise<void> {

code/server/src/databases/memory/MemoryWorkspacesDB.ts

@@ -4,7 +4,7 @@ import { Memory } from '@databases/memory/Memory';
 import { v4 as uuid } from 'uuid';
 import { Resource, ResourceType } from '@notespace/shared/src/workspace/types/resource';
 import { omit } from 'lodash';
-import { NotFoundError } from '@domain/errors/errors';
+import { NotFoundError } from '@src/errors';
 import { SearchParams } from '@src/utils/searchParams';
 
 export class MemoryWorkspacesDB implements WorkspacesRepository {

code/server/src/databases/postgres/PostgresResourcesDB.ts

@@ -1,6 +1,6 @@
 import { ResourceType, Resource, DocumentResource } from '@notespace/shared/src/workspace/types/resource';
 import { ResourcesRepository } from '@databases/types';
-import { NotFoundError } from '@domain/errors/errors';
+import { NotFoundError } from '@src/errors';
 import { isEmpty } from 'lodash';
 import sql from '@databases/postgres/config';
 

code/server/src/databases/postgres/PostgresUsersDB.ts

@@ -2,7 +2,7 @@ import { UsersRepository } from '@databases/types';
 import { User } from '@notespace/shared/src/users/types';
 import sql from '@databases/postgres/config';
 import { isEmpty } from 'lodash';
-import { NotFoundError } from '@domain/errors/errors';
+import { NotFoundError } from '@src/errors';
 
 export class PostgresUsersDB implements UsersRepository {
   async createUser(id: string, name: string, email: string): Promise<void> {

code/server/src/databases/postgres/PostgresWorkspacesDB.ts

@@ -1,5 +1,5 @@
 import { Workspace, WorkspaceMeta } from '@notespace/shared/src/workspace/types/workspace';
-import { NotFoundError } from '@domain/errors/errors';
+import { NotFoundError } from '@src/errors';
 import { WorkspacesRepository } from '@databases/types';
 import { isEmpty } from 'lodash';
 import sql from '@databases/postgres/config';

code/server/src/services/utils.ts

@@ -1,4 +1,4 @@
-import { InvalidParameterError } from '@domain/errors/errors';
+import { InvalidParameterError } from '@src/errors';
 import { randomBytes } from 'crypto';
 
 const MIN_NAME_LENGTH = 2;

code/server/src/utils/searchParams.ts

@@ -1,4 +1,4 @@
-import { InvalidParameterError } from '@domain/errors/errors';
+import { InvalidParameterError } from '@src/errors';
 
 const DEFAULT_QUERY = '';
 const DEFAULT_SKIP = 0;