Removes old statuses enum (#19599)

airbytehq · Nov 18, 2022 · a017133 · a017133
1 parent c472340
commit a017133
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 23 deletions.
diff --git a/airbyte-webapp/src/components/JobItem/components/AttemptDetails.tsx b/airbyte-webapp/src/components/JobItem/components/AttemptDetails.tsx
@@ -3,9 +3,7 @@ import dayjs from "dayjs";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 
-import Status from "core/statuses";
-
-import { AttemptRead } from "../../../core/request/AirbyteClient";
+import { AttemptRead, AttemptStatus } from "../../../core/request/AirbyteClient";
 import styles from "./AttemptDetails.module.scss";
 
 interface AttemptDetailsProps {
@@ -21,7 +19,7 @@ const getFailureFromAttempt = (attempt: AttemptRead) => {
 const AttemptDetails: React.FC<AttemptDetailsProps> = ({ attempt, className, hasMultipleAttempts }) => {
   const { formatMessage } = useIntl();
 
-  if (attempt.status !== Status.SUCCEEDED && attempt.status !== Status.FAILED) {
+  if (attempt.status !== AttemptStatus.succeeded && attempt.status !== AttemptStatus.failed) {
     return null;
   }
 
@@ -62,7 +60,7 @@ const AttemptDetails: React.FC<AttemptDetailsProps> = ({ attempt, className, has
   const hours = Math.abs(date2.diff(date1, "hour"));
   const minutes = Math.abs(date2.diff(date1, "minute")) - hours * 60;
   const seconds = Math.abs(date2.diff(date1, "second")) - minutes * 60 - hours * 3600;
-  const isFailed = attempt.status === Status.FAILED;
+  const isFailed = attempt.status === AttemptStatus.failed;
 
   return (
     <div className={classNames(styles.container, className)}>

diff --git a/airbyte-webapp/src/core/domain/connection/OperationService.ts b/airbyte-webapp/src/core/domain/connection/OperationService.ts
@@ -1,13 +1,11 @@
-import Status from "core/statuses";
-
-import { checkOperation, OperationCreate } from "../../request/AirbyteClient";
+import { checkOperation, CheckOperationReadStatus, OperationCreate } from "../../request/AirbyteClient";
 import { AirbyteRequestService } from "../../request/AirbyteRequestService";
 
 export class OperationService extends AirbyteRequestService {
   public async check({ operatorConfiguration }: OperationCreate) {
     const rs = await checkOperation(operatorConfiguration, this.requestOptions);
 
-    if (rs.status === Status.FAILED) {
+    if (rs.status === CheckOperationReadStatus.failed) {
       // TODO: place proper error
       throw new Error("failed");
     }

diff --git a/airbyte-webapp/src/core/statuses.ts b/airbyte-webapp/src/core/statuses.ts
diff --git a/airbyte-webapp/src/pages/ConnectionPage/pages/ConnectionItemPage/ConnectionStatusTab.tsx b/airbyte-webapp/src/pages/ConnectionPage/pages/ConnectionItemPage/ConnectionStatusTab.tsx
@@ -13,8 +13,7 @@ import { Tooltip } from "components/ui/Tooltip";
 
 import { Action, Namespace } from "core/analytics";
 import { getFrequencyFromScheduleData } from "core/analytics/utils";
-import { ConnectionStatus, JobWithAttemptsRead } from "core/request/AirbyteClient";
-import Status from "core/statuses";
+import { ConnectionStatus, JobStatus, JobWithAttemptsRead } from "core/request/AirbyteClient";
 import { useTrackPage, PageTrackingCodes, useAnalyticsService } from "hooks/services/Analytics";
 import { useConfirmationModalService } from "hooks/services/ConfirmationModal";
 import { useConnectionEditService } from "hooks/services/ConnectionEdit/ConnectionEditService";
@@ -41,7 +40,7 @@ interface ActiveJob {
 const getJobRunningOrPending = (jobs: JobWithAttemptsRead[]) => {
   return jobs.find((jobWithAttempts) => {
     const jobStatus = jobWithAttempts?.job?.status;
-    return jobStatus === Status.PENDING || jobStatus === Status.RUNNING || jobStatus === Status.INCOMPLETE;
+    return jobStatus === JobStatus.pending || jobStatus === JobStatus.running || jobStatus === JobStatus.incomplete;
   });
 };