Fix history missing from gallery edit

crates/service/web/storyteller_web/src/api_doc_cli.rs

@@ -27,7 +27,6 @@ use errors::AnyhowResult;
 
 pub mod billing;
 pub mod configs;
-pub mod error;
 pub mod http_server;
 pub mod state;
 pub mod threads;

crates/service/web/storyteller_web/src/api_doc_server.rs

@@ -30,7 +30,6 @@ use crate::configs::static_api_tokens::StaticApiTokenSet;
 
 pub mod billing;
 pub mod configs;
-pub mod error;
 pub mod http_server;
 pub mod state;
 pub mod threads;

crates/service/web/storyteller_web/src/error/internal_error.rs

@@ -1,37 +0,0 @@
-use std::error::Error;
-use std::fmt::{Debug, Display, Formatter};
-
-/// Any generic errors arising internally.
-/// An error class that we do not expose via the API.
-/// This should be massaged before we send it to the user.
-#[derive(Debug)]
-pub enum InternalError {
-  /// Issue with HMAC decoding
-  /// This is typically when using development cookies against production,
-  /// or vice versa.
-  VisitorCookieError(String),
-  
-  /// Decode error with AVT cookie missing a required field.
-  VisitorCookieMissingField(&'static str),
-
-  /// Catch instances of anyhow::Error.
-  AnyhowError(anyhow::Error),
-}
-
-impl Error for InternalError {}
-
-impl Display for InternalError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      InternalError::VisitorCookieError(reason) => write!(f, "Visitor cookie error: {:?}", reason),
-      InternalError::VisitorCookieMissingField(field) => write!(f, "Visitor cookie missing field: {}", field),
-      InternalError::AnyhowError(err) => write!(f, "Anyhow error: {}", err),
-    }
-  }
-}
-
-impl From<anyhow::Error> for InternalError {
-  fn from(err: anyhow::Error) -> Self {
-    InternalError::AnyhowError(err)
-  }
-}

crates/service/web/storyteller_web/src/error/mod.rs

@@ -1 +0,0 @@
-pub mod internal_error;

crates/service/web/storyteller_web/src/http_server/cookies/anonymous_visitor_tracking/avt_cookie_manager.rs

@@ -4,12 +4,12 @@ use actix_web::HttpRequest;
 use anyhow::anyhow;
 use log::warn;
 
-use crate::error::internal_error::InternalError;
-use crate::http_server::cookies::anonymous_visitor_tracking::avt_cookie_payload::AvtCookiePayload;
 use cookies::jwt_signer::JwtSigner;
 use errors::AnyhowResult;
 use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
 
+use crate::http_server::cookies::anonymous_visitor_tracking::avt_cookie_payload::AvtCookiePayload;
+
 const VISITOR_COOKIE_NAME : &str = "visitor";
 
 /// Handle "anonymous visitor tracking" cookies.
@@ -70,7 +70,7 @@ impl AvtCookieManager {
     Ok(payload)
   }
 
-  pub fn decode_cookie_payload_from_request(&self, request: &HttpRequest) -> Result<Option<AvtCookiePayload>, InternalError> {
+  pub fn decode_cookie_payload_from_request(&self, request: &HttpRequest) -> AnyhowResult<Option<AvtCookiePayload>> {
     let cookie = match request.cookie(VISITOR_COOKIE_NAME) {
       None => return Ok(None),
       Some(cookie) => cookie,
@@ -79,7 +79,7 @@ impl AvtCookieManager {
     match self.decode_cookie_payload(&cookie) {
       Err(e) => {
         warn!("Visitor cookie decode error: {:?}", e);
-        Err(InternalError::VisitorCookieError(e.to_string()))
+        Err(anyhow!("Could not decode visitor cookie: {:?}", e))
       },
       Ok(payload) => Ok(Some(payload)),
     }

crates/service/web/storyteller_web/src/http_server/cookies/anonymous_visitor_tracking/avt_cookie_payload.rs

@@ -1,7 +1,9 @@
 use std::collections::BTreeMap;
 use std::str::FromStr;
 
-use crate::error::internal_error::InternalError;
+use anyhow::anyhow;
+
+use errors::AnyhowResult;
 use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
 
 /**
@@ -36,19 +38,18 @@ impl AvtCookiePayload {
     }
   }
 
-  pub fn from_map(map: BTreeMap<String, String>) -> Result<Self, InternalError> {
+  pub fn from_map(map: BTreeMap<String, String>) -> AnyhowResult<Self> {
     let avt_token = map.get("avt_token")
-        .ok_or_else(|| InternalError::VisitorCookieMissingField("avt_token"))?;
+        .ok_or(anyhow!("avt_token not present"))?
+        .to_string();
 
     let cookie_version = map
         .get("cookie_version")
-        .ok_or_else(|| InternalError::VisitorCookieMissingField("cookie_version"))?;
+        .ok_or(anyhow!("avt_token not present"))?;
 
-    let avt_token = AnonymousVisitorTrackingToken::new_from_str(avt_token);
+    let avt_token = AnonymousVisitorTrackingToken::new_from_str(&avt_token);
 
-    let cookie_version = u32::from_str(cookie_version)
-        .map_err(|e| InternalError::VisitorCookieError(
-          format!("invalid integer for cookie_version: {:?}, version: {}", e, cookie_version)))?;
+    let cookie_version = u32::from_str(cookie_version)?;
 
     Ok(AvtCookiePayload {
       avt_token,

crates/service/web/storyteller_web/src/main.rs

@@ -92,7 +92,6 @@ use crate::util::troll_user_bans::troll_user_ban_list::TrollUserBanList;
 
 pub mod billing;
 pub mod configs;
-pub mod error;
 pub mod http_server;
 pub mod state;
 pub mod threads;

frontend/apps/editor3d/app/src/Helpers/CanvasHelpers.ts

@@ -13,17 +13,3 @@ export const normalizeCanvas = (canvas: HTMLCanvasElement, width: number, height
   ctx.drawImage(canvas, 0, 0, width, height);
   return newCanvas;
 }
-
-export const drawAlphaMask = (canvas: OffscreenCanvas, width: number, height: number) => {
-  const ctx = canvas.getContext("2d");
-  if (!ctx) {
-    throw new Error("Failed to get canvas context");
-  }
-
-  // Fill the entire screen with black and composite to keep non-transparent pixels
-  ctx.save();
-  ctx.globalCompositeOperation = "source-in";
-  ctx.fillStyle = "black";
-  ctx.fillRect(0, 0, width, height);
-  ctx.restore();
-}

frontend/apps/editor3d/app/src/pages/PageEdit/PageEdit.tsx

@@ -10,7 +10,7 @@ import { useUndoRedoHotkeys } from "../PageDraw/hooks/useUndoRedoHotkeys";
 import PromptEditor from "./PromptEditor/PromptEditor";
 import { ActiveEditTool, useEditStore } from "./stores/EditState";
 import { EditPaintSurface } from "./EditPaintSurface";
-import { drawAlphaMask, normalizeCanvas } from "../../Helpers/CanvasHelpers";
+import { normalizeCanvas } from "../../Helpers/CanvasHelpers";
 import { BaseImageSelector, BaseSelectorImage } from "./BaseImageSelector";
 import DrawToolControlBar from "./DrawToolControlBar";
 import {
@@ -187,10 +187,6 @@ const PageEdit = () => {
       rect.height(),
     );
 
-    // Convert colored canvas to alpha mask
-    // NOTE: This isn't needed because the tauri backend uses the alpha channel anyway
-    // drawAlphaMask(fittedCanvas, rect.width(), rect.height());
-
     const blob = await fittedCanvas.convertToBlob({ type: "image/png" });
     const arrayBuffer = await blob.arrayBuffer();
 
@@ -374,7 +370,7 @@ const PageEdit = () => {
             }}
             //fillColor={store.fillColor}
             activeTool={store.activeTool}
-            brushColor={"rgba(39, 187, 245, 0.54)"}
+            brushColor={store.brushColor}
             brushSize={store.brushSize}
             onSelectionChange={setIsSelecting}
             stageRef={stageRef}