Fixed editor bugs

code/client/src/App.tsx

@@ -8,12 +8,12 @@ import { ErrorProvider } from '@ui/contexts/error/ErrorContext';
 import Sidebar from '@ui/components/sidebar/Sidebar';
 import { WorkspaceProvider } from '@ui/contexts/workspace/WorkspaceContext';
 import Home from '@ui/pages/home/Home';
-import {ReactLogCaller} from '@/utils/logging';
+import { ReactLogCaller } from '@/utils/logging';
 
 import { CommunicationProvider } from '@ui/contexts/communication/CommunicationContext';
 import { useEffect } from 'react';
 
-const logger = ReactLogCaller
+const logger = ReactLogCaller;
 
 function App() {
   useEffect(() => {

code/client/src/domain/editor/operations/markdown/operations.ts

@@ -73,9 +73,7 @@ export default (fugue: Fugue, { socket }: Communication): MarkdownDomainOperatio
 
     // Remove block styles if the selection is single position at beginning of a line or multi-line selection
     if ((start === end && start.column === 0) || start.line !== end.line) {
-      const newSelection = start.column !== 0
-          ? { start: { line: start.line + 1, column: 0 }, end }
-          : selection;
+      const newSelection = start.column !== 0 ? { start: { line: start.line + 1, column: 0 }, end } : selection;
       const operations = fugue.updateBlockStylesLocalBySelection('paragraph', newSelection);
       socket.emit('operations', operations);
     }

code/client/src/domain/editor/slate/handlers/history/toHistoryOperations.ts

@@ -111,10 +111,11 @@ function toHistoryOperations(editor: Editor, operations: Batch | undefined, reve
 
     const cursor = pointToCursor(editor, { ...selectionBefore?.anchor });
 
-    const start = {
-      line: operation.path[0],
-      column: cursor.column + offset(cursor.line),
-    };
+    const start = { ...cursor, column: cursor.column + offset(cursor.line) };
+    //     {
+    //   line: operation.path[0],
+    //   column: cursor.column + offset(cursor.line),
+    // };
     const end = {
       line: start.line,
       column: start.column + operation.text.length,
@@ -140,7 +141,7 @@ function toHistoryOperations(editor: Editor, operations: Batch | undefined, reve
     // Remove whole line
     if (operation.path.length === 1) {
       const start = { line: operation.path[0], column: 0 };
-      const end = { line: operation.path[0], column: Infinity };
+      const end = { ...start, column: Infinity };
 
       const selection = { start, end };
       return {
@@ -158,15 +159,9 @@ function toHistoryOperations(editor: Editor, operations: Batch | undefined, reve
 
     const cursor = pointToCursor(editor, selectionBefore.anchor);
 
-    const start = {
-      ...cursor,
-      column: cursor.column + lineOffset(cursor.line),
-    };
+    const start = { ...cursor, column: cursor.column + lineOffset(cursor.line) };
 
-    const end = {
-      ...start,
-      column: start.column + operation.node.text.length,
-    };
+    const end = { ...start, column: start.column + operation.node.text.length };
 
     const selection = { start, end };
 
@@ -219,10 +214,7 @@ function toHistoryOperations(editor: Editor, operations: Batch | undefined, reve
 
     const start = pointToCursor(editor, { path: operation.path, offset: 0 });
 
-    const end = {
-      ...start,
-      column: start.column + (offset || 0),
-    };
+    const end = { ...start, column: start.column + (offset || 0) };
 
     return {
       type: set_mode ? 'set_node' : 'unset_node',

code/client/src/domain/editor/slate/plugins/markdown/operations/editorOperations.ts

@@ -152,7 +152,7 @@ export default (editor: Editor, handlers: MarkdownDomainOperations) => {
     const match = editor.above({
       match: (n: Node) => Element.isElement(n) && editor.isBlock(n),
     });
-    if(!match) return;
+    if (!match) return;
     const [block, path] = match;
     const start = Editor.start(editor, path);
 
@@ -169,24 +169,21 @@ export default (editor: Editor, handlers: MarkdownDomainOperations) => {
   const deleteSelection = (deleteHandler: DeleteFunction, options?: TextDeleteOptions) => {
     const selection = getSelection(editor);
 
-    console.log("Selection: ", selection);
-    console.log("Editor: ", editor.selection);
+    console.log('Selection: ', selection);
+    console.log('Editor: ', editor.selection);
 
     // Iterate over the selected lines and delete the block styles
     for (let i = selection.start.line + 1; i <= selection.end.line; i++) {
       const block = editor.children[i];
-      if (Element.isElement(block)) {
-        // If the block is not a paragraph and the selection is at the start of the block, delete the block style
-        // Else remove both the block
-        if(block.type !== 'paragraph'){
-          const location : Location = {path: [i, 0], offset: 0};
-          Transforms.setNodes(editor, { type: 'paragraph' }, { at: location });
-          handlers.deleteBlockStyles(selection);
-        }
-      }
+      if (!Element.isElement(block) || block.type === 'paragraph') continue;
+      // If the block is not a paragraph and the selection is at the start of the block, delete the block style
+      // Else remove both the block and the block style
+      const location: Location = { path: [i, 0], offset: 0 };
+      Transforms.setNodes(editor, { type: 'paragraph' }, { at: location });
+      handlers.deleteBlockStyles(selection);
     }
     deleteHandler(options);
-  }
+  };
 
   /**
    * Checks if the given node is an inline.

code/client/src/utils/logging.ts

@@ -11,4 +11,4 @@ export const ClientLogCaller = {
 export const DomainLogCaller = getLogger(ClientLogCaller.Domain);
 export const ServicesLogCaller = getLogger(ClientLogCaller.Services);
 export const ReactLogCaller = getLogger(ClientLogCaller.React);
-export const PWALogCaller = getLogger(ClientLogCaller.PWA);
+export const PWALogCaller = getLogger(ClientLogCaller.PWA);

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

@@ -18,9 +18,12 @@ function resourcesHandlers(service: ResourcesService, io: Server) {
    * @param res
    */
   const createResource = async (req: Request, res: Response) => {
+    // Validate workspace id
     const { wid } = req.params;
     if (!wid) throw new InvalidParameterError('Workspace id is required');
     if (!isValidUUID(wid)) throw new InvalidParameterError('Invalid workspace id');
+
+    // Get resource input model
     const resource = req.body as ResourceInputModel;
     if (!resource) throw new InvalidParameterError('Body is required');
     const { type, name, parent } = resource;
@@ -38,12 +41,17 @@ function resourcesHandlers(service: ResourcesService, io: Server) {
    * @param res
    */
   const getResource = async (req: Request, res: Response) => {
-    const { wid, id, metaOnly } = req.params;
+    // Validate workspace id and resource id
+    const { wid, id } = req.params;
     if (!wid) throw new InvalidParameterError('Workspace id is required');
     if (!id) throw new InvalidParameterError('Resource id is required');
     if (!isValidUUID(wid)) throw new InvalidParameterError('Invalid workspace id');
     if (!isValidUUID(id)) throw new InvalidParameterError('Invalid resource id');
+
+    // Get resource metadata query parameter
+    const { metaOnly } = req.query;
     if (!isValidMetaOnlyValue(metaOnly as string)) throw new InvalidParameterError('Invalid metaOnly value');
+
     const resource = await service.getResource(wid, id, metaOnly === 'true');
     httpResponse.ok(res).json(resource);
   };
@@ -54,14 +62,17 @@ function resourcesHandlers(service: ResourcesService, io: Server) {
    * @param res
    */
   const updateResource = async (req: Request, res: Response) => {
+    // Validate workspace id and resource id
     const { wid, id } = req.params;
     if (!wid) throw new InvalidParameterError('Workspace id is required');
     if (!id) throw new InvalidParameterError('Resource id is required');
     if (!isValidUUID(wid)) throw new InvalidParameterError('Invalid workspace id');
     if (!isValidUUID(id)) throw new InvalidParameterError('Invalid resource id');
 
+    // Get resource input model
     const resource = req.body as Partial<WorkspaceResource>;
     if (!resource) throw new InvalidParameterError('Body is required');
+
     await service.updateResource(id, resource);
     io.in(wid).emit('updatedResource', { id, ...resource });
     httpResponse.noContent(res).send();
@@ -73,6 +84,7 @@ function resourcesHandlers(service: ResourcesService, io: Server) {
    * @param res
    */
   const deleteResource = async (req: Request, res: Response) => {
+    // Validate workspace id and resource id
     const { wid, id } = req.params;
     if (!wid) throw new InvalidParameterError('Workspace id is required');
     if (!id) throw new InvalidParameterError('Resource id is required');

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

@@ -1,9 +1,9 @@
 import { SocketHandler } from '@controllers/ws/types';
 import { Socket } from 'socket.io';
 
-import {ControllersLogCaller} from '@src/utils/logging';
+import { ControllersLogCaller } from '@src/utils/logging';
 
-const logger = ControllersLogCaller("ws")
+const logger = ControllersLogCaller('ws');
 
 export default function initSocketEvents(events: Record<string, SocketHandler>) {
   // const onCursorChange = events['cursorChange'];

code/server/src/ts/server.ts

@@ -8,8 +8,7 @@ import router from '@src/controllers/http/router';
 import config from '@src/config';
 import initSocketEvents from '@controllers/ws/initSocketEvents';
 import { TestDatabases } from '@databases/TestDatabases';
-import {ServerLogCaller} from '@src/utils/logging';
-import getLogger from '@notespace/shared/src/utils/logging';
+import { ServerLogCaller } from '@src/utils/logging';
 
 const logger = ServerLogCaller;
 logger.logWarning('Starting server...');

code/server/src/ts/utils/logging.ts

@@ -9,10 +9,9 @@ export const ServiceLogCaller = {
 };
 
 export const ServerLogCaller = getLogger(ServiceLogCaller.Server);
-export const DatabaseLogCaller = (module : string) =>
-    getLogger(ServiceLogCaller.Database + '-' + ColorWrap(LogColor.Green, module));
-export const ServicesLogCaller = (module : string) =>
-    getLogger(ServiceLogCaller.Services + '-' + ColorWrap(LogColor.Yellow, module));
-export const ControllersLogCaller = (module : string) =>
-    getLogger(ServiceLogCaller.Controllers + '-' + ColorWrap(LogColor.Red, module));
-
+export const DatabaseLogCaller = (module: string) =>
+  getLogger(ServiceLogCaller.Database + '-' + ColorWrap(LogColor.Green, module));
+export const ServicesLogCaller = (module: string) =>
+  getLogger(ServiceLogCaller.Services + '-' + ColorWrap(LogColor.Yellow, module));
+export const ControllersLogCaller = (module: string) =>
+  getLogger(ServiceLogCaller.Controllers + '-' + ColorWrap(LogColor.Red, module));

code/server/src/ts/utils/validators.ts

@@ -1,8 +1,4 @@
-export function isValidUUID(uuid: string): boolean {
-  const regex = new RegExp('^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-([89ab])[0-9a-fA-F]{3}-[0-9a-fA-F]{12}$');
-  return regex.test(uuid);
-}
+import { validate } from 'uuid';
+export const isValidUUID = (uuid: string): boolean => validate(uuid);
 
-export function isValidMetaOnlyValue(metaOnly?: string): boolean {
-  return !metaOnly || ['true', 'false'].includes(metaOnly);
-}
+export const isValidMetaOnlyValue = (metaOnly?: string): boolean => !metaOnly || ['true', 'false'].includes(metaOnly);