fix: better error message

Author: bobbyg603

src/common/data/table-data/index.ts

@@ -1,4 +1,4 @@
-export { TableDataClient, isErrorResponse, ErrorResponse } from './table-data-client/table-data-client';
+export { TableDataClient, isSuccessResponse, isErrorResponse, ErrorResponse } from './table-data-client/table-data-client';
 export { TableDataRequest } from './table-data-client/table-data-request';
 export { TableDataResponse } from './table-data-client/table-data-response';
 export { ColumnSortOrder } from './table-data-form-data-builder/column-sort-order';

src/common/data/table-data/table-data-client/table-data-client.spec.ts

@@ -76,7 +76,7 @@ describe('TableDataClient', () => {
                 sortOrder,
             });
             if (isErrorResponse(response)) {
-                throw new Error(response.message);
+                throw new Error((await response.json()).message);
             }
             result = await response.json();
         });

src/common/data/table-data/table-data-client/table-data-client.ts

@@ -8,7 +8,7 @@ export class TableDataClient {
     async postGetData<T, U = Record<string, unknown> | undefined>(
         request: TableDataRequest,
         formParts: Record<string, string> = {}
-    ): Promise<BugSplatResponse<TableDataResponse<T, U>> | ErrorResponse> {
+    ): Promise<BugSplatResponse<TableDataResponse<T, U>> | BugSplatResponse<ErrorResponse>> {
         const factory = () => this._apiClient.createFormData();
         const formData = new TableDataFormDataBuilder(factory, formParts)
             .withDatabase(request.database)
@@ -32,7 +32,7 @@ export class TableDataClient {
 
     async getData<T, U = Record<string, unknown> | undefined>(
         request: TableDataRequest
-    ): Promise<BugSplatResponse<TableDataResponse<T, U>> | ErrorResponse> {
+    ): Promise<BugSplatResponse<TableDataResponse<T, U>> | BugSplatResponse<ErrorResponse>> {
         const factory = () => this._apiClient.createFormData();
         const formData = new TableDataFormDataBuilder(factory)
             .withDatabase(request.database)
@@ -56,14 +56,14 @@ export class TableDataClient {
     private async makeRequest<T, U = unknown>(
         url: string,
         init: RequestInit
-    ): Promise<BugSplatResponse<TableDataResponse<T, U>> | ErrorResponse> {
-        const response = await this._apiClient.fetch<TableDataResponse<T, U>>(url, init);
+    ): Promise<BugSplatResponse<TableDataResponse<T, U>> | BugSplatResponse<ErrorResponse>> {
+        const response = await this._apiClient.fetch<TableDataResponse<T, U> | ErrorResponse>(url, init);
 
-        if (isErrorResponse(response)) {
-            return response;
+        if (response.status !== 200) {
+            return response as unknown as BugSplatResponse<ErrorResponse>;
         }
 
-        const responseData = await response.json();
+        const responseData = await response.json() as TableDataResponse<T, U>;
         const rows = responseData.rows || [];
         const pageData = responseData.pageData || {};
         const status = response.status;
@@ -82,8 +82,14 @@ export class TableDataClient {
 
 export type ErrorResponse = { status: number; message: string };
 
-export const isErrorResponse = (
-    response: BugSplatResponse<unknown> | ErrorResponse
-): response is ErrorResponse => {
+export function isSuccessResponse<T, U = Record<string, unknown> | undefined>(
+    response: BugSplatResponse<TableDataResponse<T, U> | ErrorResponse>
+): response is BugSplatResponse<TableDataResponse<T, U>> {
+    return 'status' in response && response.status === 200;
+}
+
+export function isErrorResponse<T, U = Record<string, unknown> | undefined>(
+    response: BugSplatResponse<TableDataResponse<T, U> | ErrorResponse>
+): response is BugSplatResponse<ErrorResponse> {
     return 'status' in response && response.status !== 200;
-};
+}

src/crashes/crashes-api-client/crashes-api-client.ts

@@ -37,7 +37,7 @@ export class CrashesApiClient {
         >(request);
 
         if (isErrorResponse(response)) {
-            throw new Error(response.message);
+            throw new Error((await response.json()).message);
         }
 
         const responseData = await response.json();

src/crashes/key-crash-api-client/key-crash-api-client.ts

@@ -16,7 +16,7 @@ export class KeyCrashApiClient {
         const formParts = { stackKeyId: `${request.stackKeyId}` };
         const response = await this._tableDataClient.postGetData<CrashesApiResponseRow, KeyCrashPageDataRawResponse>(request, formParts);
         if (isErrorResponse(response)) {
-            throw new Error(response.message);
+            throw new Error((await response.json()).message);
         }
         const json = await response.json() as Required<TableDataResponse<CrashesApiResponseRow, KeyCrashPageDataRawResponse>>;
         const pageData = createKeyCrashPageData(json.pageData);

src/summary/summary-api-client/summary-api-client.ts

@@ -24,7 +24,7 @@ export class SummaryApiClient {
         );
 
         if (isErrorResponse(response)) {
-            throw new Error(response.message);
+            throw new Error((await response.json()).message);
         }
 
         const responseData = await response.json();

src/versions/versions-api-client/versions-api-client.ts

@@ -26,7 +26,7 @@ export class VersionsApiClient {
     async getVersions(request: TableDataRequest): Promise<TableDataResponse<VersionsApiRow>> {
         const response = await this._tableDataClient.getData<VersionsApiResponseRow>(request);
         if (isErrorResponse(response)) {
-            throw new Error(response.message);
+            throw new Error((await response.json()).message);
         }
         const json = await response.json();
         const pageData = json.pageData;