Merge pull request #1560 from Shelf-nu/improve-sentry-tracking

improvement: turn off capturing or certain errors that are handled already

app/modules/auth/service.server.ts

@@ -160,6 +160,7 @@ export async function signInWithSSO(domain: string) {
     // @ts-expect-error
     if (cause?.code === "sso_provider_not_found") {
       message = "No SSO provider assigned for your organization's domain";
+      shouldBeCaptured = false;
     }
 
     throw new ShelfError({

app/modules/custom-field/service.server.ts

@@ -324,6 +324,7 @@ export async function upsertCustomField(
               },
             },
             label,
+            shouldBeCaptured: false,
           });
         }
         if (existingCustomField.type === "OPTION") {

app/modules/invite/service.server.ts

@@ -46,6 +46,7 @@ async function validateInvite(
         "This email domain uses SCIM SSO for this workspace. Users are managed automatically through your identity provider.",
       label: "Invite",
       status: 400,
+      shouldBeCaptured: false,
     });
   }
 
@@ -59,6 +60,7 @@ async function validateInvite(
           "This email domain uses SSO authentication. The user needs to sign up via SSO before they can be invited.",
         label: "Invite",
         status: 400,
+        shouldBeCaptured: false,
       });
     }
   }

app/modules/location/service.server.ts

@@ -129,15 +129,16 @@ export async function getLocation(
   } catch (cause) {
     throw new ShelfError({
       cause,
-      message: "Something went wrong while fetching location",
+      title: "Location not found",
+      message:
+        "The location you are trying to access does not exist or you do not have permission to access it.",
       additionalData: {
-        ...params,
+        id,
+        organizationId,
         ...(isLikeShelfError(cause) ? cause.additionalData : {}),
       },
       label,
-      shouldBeCaptured: isLikeShelfError(cause)
-        ? cause.shouldBeCaptured
-        : !isNotFoundError(cause),
+      shouldBeCaptured: !isNotFoundError(cause),
     });
   }
 }

app/routes/_auth+/resend-otp.tsx

@@ -32,7 +32,10 @@ export async function action({ request }: ActionFunctionArgs) {
 
     throw notAllowedMethod(method);
   } catch (cause) {
-    const reason = makeShelfError(cause);
+    //@ts-expect-error
+    const isRateLimitError = cause.code === "over_email_send_rate_limit";
+
+    const reason = makeShelfError(cause, {}, !isRateLimitError);
     return json(error(reason), { status: reason.status });
   }
 }

app/routes/_layout+/_layout.tsx

@@ -1,5 +1,9 @@
 import { Roles } from "@prisma/client";
-import type { LinksFunction, LoaderFunctionArgs } from "@remix-run/node";
+import type {
+  LinksFunction,
+  LoaderFunctionArgs,
+  MetaFunction,
+} from "@remix-run/node";
 import { json, redirect } from "@remix-run/node";
 import { Link, NavLink, Outlet, useLoaderData } from "@remix-run/react";
 import { useAtomValue } from "jotai";
@@ -24,6 +28,7 @@ import { config } from "~/config/shelf.config";
 import { getSelectedOrganisation } from "~/modules/organization/context.server";
 import { getUserByID } from "~/modules/user/service.server";
 import styles from "~/styles/layout/index.css?url";
+import { appendToMetaTitle } from "~/utils/append-to-meta-title";
 import {
   installPwaPromptCookie,
   initializePerPageCookieOnLayout,
@@ -137,6 +142,12 @@ export async function loader({ context, request }: LoaderFunctionArgs) {
   }
 }
 
+export const meta: MetaFunction<typeof loader> = ({ error }) => [
+  /** This will make sure that if we have an error its visible in the title of the browser tab */
+  // @ts-expect-error
+  { title: error ? appendToMetaTitle(error.data.error.title) : "" },
+];
+
 export default function App() {
   useCrisp();
   const { disabledTeamOrg, minimizedSidebar } = useLoaderData<typeof loader>();

app/routes/_layout+/settings.custom-fields.new.tsx

@@ -62,6 +62,7 @@ export async function loader({ context, request }: LoaderFunctionArgs) {
     );
   } catch (cause) {
     const reason = makeShelfError(cause, { userId });
+
     throw json(error(reason), { status: reason.status });
   }
 }

app/routes/qr+/$qrId_.link.asset.tsx

@@ -77,6 +77,7 @@ export const loader = async ({
         label: "QR",
         status: 403,
         cause: null,
+        shouldBeCaptured: false,
       });
     }
 

app/routes/qr+/$qrId_.link.kit.tsx

@@ -77,6 +77,7 @@ export const loader = async ({
         label: "QR",
         status: 403,
         cause: null,
+        shouldBeCaptured: false,
       });
     }
 

app/utils/custom-fields.ts

@@ -204,6 +204,7 @@ export const buildCustomFieldValue = (
           : "Invalid custom field value",
       message: `Failed to read/process custom field value for '${def.name}' with type '${def.type}'. The value we found is: '${value.raw}'. Make sure to format your dates using the format: YYYY-MM-DD`,
       label: "Custom fields",
+      shouldBeCaptured: false,
     });
   }
 };

app/utils/error.ts

@@ -235,7 +235,8 @@ export function makeShelfError(
         ...cause.additionalData,
         ...additionalData,
       },
-      shouldBeCaptured: cause.shouldBeCaptured || shouldBeCaptured,
+      shouldBeCaptured:
+        "shouldBeCaptured" in cause ? cause.shouldBeCaptured : shouldBeCaptured,
     });
   }
 
@@ -312,7 +313,7 @@ export function maybeUniqueConstraintViolation(
   options?: Options
 ) {
   let message = `We could not create or update this ${modelName}. Please try again or contact support.`;
-  let shouldBeCaptured = true;
+  let shouldBeCaptured = false;
   const validationErrors = {} as ValidationError<any>;
 
   if (

app/utils/storage.server.ts

@@ -226,13 +226,15 @@ export async function uploadImageFromUrl(
         message: "Failed to fetch image from URL",
         additionalData: { imageUrl },
         label,
+        shouldBeCaptured: false,
       });
     });
 
     if (!response.ok) {
       throw new ShelfError({
         cause: null,
         message: "Failed to fetch image from URL",
+        shouldBeCaptured: false,
         additionalData: { imageUrl, status: response.status },
         label,
       });
@@ -245,6 +247,7 @@ export async function uploadImageFromUrl(
         message: "URL does not point to a valid image",
         additionalData: { imageUrl, contentType: actualContentType },
         label,
+        shouldBeCaptured: false,
       });
     }
 
@@ -257,6 +260,7 @@ export async function uploadImageFromUrl(
         }MB`,
         additionalData: { imageUrl, size: imageBlob.size },
         label,
+        shouldBeCaptured: false,
       });
     }
 
@@ -308,6 +312,7 @@ export async function uploadImageFromUrl(
         : "Failed to process and upload image from URL",
       additionalData: { imageUrl, filename, contentType, bucketName },
       label,
+      shouldBeCaptured: isShelfError ? cause.shouldBeCaptured : true,
     });
   }
 }

app/utils/subscription.server.ts

@@ -309,6 +309,7 @@ export async function assertUserCanCreateMoreOrganizations(userId: string) {
       message: "You cannot create more workspaces with your current plan.",
       additionalData: { userId, tierLimit },
       label,
+      shouldBeCaptured: false,
     });
   }
 }
@@ -360,6 +361,7 @@ export async function assertUserCanInviteUsersToWorkspace({
         "You cannot invite other users to a personal workspace. Please create a Team workspace.",
       status: 403,
       label,
+      shouldBeCaptured: false,
     });
   }
 }