Replace undocumented error response with proper HTTPException

Author: tw4l

backend/btrixcloud/profiles.py

@@ -395,7 +395,7 @@ async def delete_profile(
         profile = await self.get_profile(profileid, org)
 
         if profile.inUse:
-            return {"error": "in_use"}
+            raise HTTPException(status_code=400, detail="profile_in_use")
 
         query: dict[str, object] = {"_id": profileid}
         if org:

frontend/src/pages/org/browser-profiles-detail.ts

@@ -554,35 +554,31 @@ export class BrowserProfilesDetail extends BtrixElement {
     const profileName = this.profile!.name;
 
     try {
-      const data = await this.api.fetch<Profile & { error: boolean }>(
+      await this.api.fetch<Profile>(
         `/orgs/${this.orgId}/profiles/${this.profile!.id}`,
         {
           method: "DELETE",
         },
       );
 
-      if (data.error && data.inUse) {
-        this.notify.toast({
-          message: msg(
-            html`Could not delete <strong>${profileName}</strong>, currently in
-              use. Please remove browser profile from all Crawl Workflows to
-              continue.`,
-          ),
-          variant: "warning",
-          duration: 15000,
-        });
-      } else {
-        this.navigate.to(`${this.navigate.orgBasePath}/browser-profiles`);
+      this.navigate.to(`${this.navigate.orgBasePath}/browser-profiles`);
 
-        this.notify.toast({
-          message: msg(html`Deleted <strong>${profileName}</strong>.`),
-          variant: "success",
-          icon: "check2-circle",
-        });
-      }
+      this.notify.toast({
+        message: msg(html`Deleted <strong>${profileName}</strong>.`),
+        variant: "success",
+        icon: "check2-circle",
+      });
     } catch (e) {
+      let message = msg("Sorry, couldn't delete browser profile at this time.");
+      if (isApiError(e) && e.details == "profile_in_use") {
+        message = msg(
+          html`Could not delete <strong>${profileName}</strong>, currently in
+            use. Please remove browser profile from all crawl workflows to
+            continue.`,
+        );
+      }
       this.notify.toast({
-        message: msg("Sorry, couldn't delete browser profile at this time."),
+        message: message,
         variant: "danger",
         icon: "exclamation-octagon",
         id: "browser-profile-error",

frontend/src/pages/org/browser-profiles-list.ts

@@ -382,39 +382,35 @@ export class BrowserProfilesList extends BtrixElement {
 
   private async deleteProfile(profile: Profile) {
     try {
-      const data = await this.api.fetch<Profile & { error?: boolean }>(
+      await this.api.fetch<{ error?: boolean }>(
         `/orgs/${this.orgId}/profiles/${profile.id}`,
         {
           method: "DELETE",
         },
       );
 
-      if (data.error && data.inUse) {
-        this.notify.toast({
-          message: msg(
-            html`Could not delete <strong>${profile.name}</strong>, currently in
-              use. Please remove browser profile from all Crawl Workflows to
-              continue.`,
-          ),
-          variant: "warning",
-          duration: 15000,
-        });
-      } else {
-        this.notify.toast({
-          message: msg(html`Deleted <strong>${profile.name}</strong>.`),
-          variant: "success",
-          icon: "check2-circle",
-          id: "browser-profile-deleted-status",
-        });
-
-        void this.fetchBrowserProfiles();
-      }
+      this.notify.toast({
+        message: msg(html`Deleted <strong>${profile.name}</strong>.`),
+        variant: "success",
+        icon: "check2-circle",
+        id: "browser-profile-deleted-status",
+      });
+
+      void this.fetchBrowserProfiles();
     } catch (e) {
+      let message = msg("Sorry, couldn't delete browser profile at this time.");
+      if (isApiError(e) && e.details == "profile_in_use") {
+        message = msg(
+          html`Could not delete <strong>${profile.name}</strong>, currently in
+            use. Please remove browser profile from all crawl workflows to
+            continue.`,
+        );
+      }
       this.notify.toast({
-        message: msg("Sorry, couldn't delete browser profile at this time."),
+        message: message,
         variant: "danger",
         icon: "exclamation-octagon",
-        id: "browser-profile-deleted-status",
+        id: "browser-profile-error",
       });
     }
   }