Merged branch bugfix/hail-mary into develop

horia141 · Mar 4, 2024 · f89e36e · f89e36e
1 parent aced73f
commit f89e36e
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/src/webui/app/components/doc-editor.tsx b/src/webui/app/components/doc-editor.tsx
@@ -9,6 +9,7 @@ import { isNoErrorSomeData } from "~/logic/action-result";
 import type { OneOfNoteContentBlock } from "~/logic/domain/notes";
 import type { BlockEditorProps } from "./infra/block-editor";
 import { FieldError, GlobalError } from "./infra/errors";
+import { Buffer } from 'buffer';
 
 const BlockEditor = lazy(() =>
   import("~/components/infra/block-editor.js").then((module) => ({
@@ -45,14 +46,15 @@ export function DocEditor({
 
   const act = useCallback(() => {
     setIsActing(true);
+    const base64Content = Buffer.from(JSON.stringify(noteContent), 'utf-8').toString('base64');
     if (docId && noteId) {
       // We already created this thing, we just need to update!
       cardActionFetcher.submit(
         {
           docId: docId,
           noteId: noteId,
           name: noteName || "Untitled",
-          content: btoa(JSON.stringify(noteContent)),
+          content: base64Content,
         },
         {
           method: "post",
@@ -64,7 +66,7 @@ export function DocEditor({
       cardActionFetcher.submit(
         {
           name: noteName || "Untitled",
-          content: btoa(JSON.stringify(noteContent)),
+          content: base64Content,
         },
         {
           method: "post",

diff --git a/src/webui/app/components/entity-note-editor.tsx b/src/webui/app/components/entity-note-editor.tsx
@@ -8,6 +8,7 @@ import type { SomeErrorNoData } from "~/logic/action-result";
 import type { OneOfNoteContentBlock } from "~/logic/domain/notes";
 import type { BlockEditorProps } from "./infra/block-editor";
 import { FieldError, GlobalError } from "./infra/errors";
+import { Buffer } from 'buffer';
 
 const BlockEditor = lazy(() =>
   import("~/components/infra/block-editor.js").then((module) => ({
@@ -35,11 +36,12 @@ export function EntityNoteEditor({
 
   const act = useCallback(() => {
     setIsActing(true);
+    const base64Content = Buffer.from(JSON.stringify(noteContent), 'utf-8').toString('base64');
     // We already created this thing, we just need to update!
     cardActionFetcher.submit(
       {
         id: initialNote.ref_id,
-        content: btoa(JSON.stringify(noteContent)),
+        content: base64Content,
       },
       {
         method: "post",

diff --git a/src/webui/app/routes/workspace/core/notes/update.tsx b/src/webui/app/routes/workspace/core/notes/update.tsx
@@ -11,11 +11,15 @@ import {
 } from "~/logic/action-result";
 import { NoteContentParser } from "~/logic/domain/notes";
 import { getSession } from "~/sessions";
+import { Buffer } from "buffer";
 
 const UpdateForEntityFormSchema = {
   id: z.string(),
   content: z.preprocess(
-    (value) => JSON.parse(atob(String(value))),
+    (value) => {
+      const utf8Buffer = Buffer.from(String(value), 'base64');
+      return JSON.parse(utf8Buffer.toString("utf-8"));
+    }
     NoteContentParser
   ),
 };

diff --git a/src/webui/app/routes/workspace/docs/create-action.tsx b/src/webui/app/routes/workspace/docs/create-action.tsx
@@ -11,11 +11,15 @@ import {
 } from "~/logic/action-result";
 import { NoteContentParser } from "~/logic/domain/notes";
 import { getSession } from "~/sessions";
+import { Buffer } from "buffer";
 
 const CreateFormSchema = {
   name: z.string(),
   content: z.preprocess(
-    (value) => JSON.parse(atob(String(value))),
+    (value) => {
+      const utf8Buffer = Buffer.from(String(value), 'base64');
+      return JSON.parse(utf8Buffer.toString('utf-8'));
+    },
     NoteContentParser
   ),
 };

diff --git a/src/webui/app/routes/workspace/docs/update-action.tsx b/src/webui/app/routes/workspace/docs/update-action.tsx
@@ -11,13 +11,17 @@ import {
 } from "~/logic/action-result";
 import { NoteContentParser } from "~/logic/domain/notes";
 import { getSession } from "~/sessions";
+import { Buffer } from "buffer";
 
 const UpdateFormSchema = {
   docId: z.string(),
   noteId: z.string(),
   name: z.string(),
   content: z.preprocess(
-    (value) => JSON.parse(atob(String(value))),
+    (value) => {
+      const utf8Buffer = Buffer.from(String(value), 'base64');
+      return JSON.parse(utf8Buffer.toString("utf-8"));
+    },
     NoteContentParser
   ),
 };

diff --git a/src/webui/package.json b/src/webui/package.json
@@ -40,6 +40,7 @@
     "js-cookie": "^3.0.5",
     "jupiter-gen": "^0.0.1",
     "luxon": "^3.2.0",
+    "buffer": "^6.0.3",
     "notistack": "^3.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",