Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🪟 🧹 Removes old statuses enum #19599

Merged
merged 1 commit into from
Nov 18, 2022
Merged

🪟 🧹 Removes old statuses enum #19599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions airbyte-webapp/src/components/JobItem/components/AttemptDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
}

Expand Down Expand Up @@ -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)}>
Expand Down
6 changes: 2 additions & 4 deletions airbyte-webapp/src/core/domain/connection/OperationService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
}
Expand Down
11 changes: 0 additions & 11 deletions airbyte-webapp/src/core/statuses.ts
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions airbyte-webapp/src/pages/ConnectionPage/pages/ConnectionItemPage/ConnectionStatusTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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;
});
};

Expand Down