Fix status check on JobItem and ensure that SourceService returns…

… `LogsRequestError` when there are logs.
airbytehq · Aug 16, 2022 · 756b7c1 · 756b7c1
1 parent 7b83718
commit 756b7c1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/airbyte-webapp/src/components/JobItem/JobItem.tsx b/airbyte-webapp/src/components/JobItem/JobItem.tsx
@@ -34,21 +34,23 @@ interface JobItemProps {
   job: SynchronousJobReadWithStatus | JobsWithJobs;
 }
 
-const didJobSucceed = (job: SynchronousJobReadWithStatus | JobsWithJobs) => {
-  return getJobStatus(job) !== "failed";
-};
+const didJobSucceed = (job: SynchronousJobReadWithStatus | JobsWithJobs): boolean =>
+  "succeeded" in job ? job.succeeded : getJobStatus(job) !== "failed";
 
 export const getJobStatus: (
   job: SynchronousJobReadWithStatus | JobsWithJobs
-) => JobStatus | CheckConnectionReadStatus = (job) => {
-  return "status" in job ? job.status : job.job.status;
-};
-
-export const getJobAttemps: (job: SynchronousJobReadWithStatus | JobsWithJobs) => AttemptRead[] | undefined = (job) => {
-  return "attempts" in job ? job.attempts : undefined;
-};
-
-export const getJobId = (job: SynchronousJobReadWithStatus | JobsWithJobs) => ("id" in job ? job.id : job.job.id);
+) => JobStatus | CheckConnectionReadStatus = (job) =>
+  "succeeded" in job
+    ? job.succeeded
+      ? CheckConnectionReadStatus.succeeded
+      : CheckConnectionReadStatus.failed
+    : job.job.status;
+
+export const getJobAttemps: (job: SynchronousJobReadWithStatus | JobsWithJobs) => AttemptRead[] | undefined = (job) =>
+  "attempts" in job ? job.attempts : undefined;
+
+export const getJobId = (job: SynchronousJobReadWithStatus | JobsWithJobs): string | number =>
+  "id" in job ? job.id : job.job.id;
 
 export const JobItem: React.FC<JobItemProps> = ({ job }) => {
   const { jobId: linkedJobId } = useAttemptLink();

diff --git a/airbyte-webapp/src/core/domain/connector/SourceService.ts b/airbyte-webapp/src/core/domain/connector/SourceService.ts
@@ -83,7 +83,7 @@ export class SourceService extends AirbyteRequestService {
 
     if (!result.jobInfo?.succeeded || !result.catalog) {
       // @ts-expect-error TODO: address this case
-      const e = new CommonRequestError(result);
+      const e = result.jobInfo?.logs ? new LogsRequestError(result.jobInfo) : new CommonRequestError(result);
       // Generate error with failed status and received logs
       e._status = 400;
       // @ts-expect-error address this case