From 05c683668cca1124242826f7343c0c054a738317 Mon Sep 17 00:00:00 2001 From: Edmundo Ruiz Ghanem Date: Fri, 2 Dec 2022 10:41:59 -0500 Subject: [PATCH] Move CatalogDiff modal from views to components --- .../CatalogDiffModal/CatalogDiffModal.module.scss | 2 +- .../connection}/CatalogDiffModal/CatalogDiffModal.test.tsx | 0 .../connection}/CatalogDiffModal/CatalogDiffModal.tsx | 4 ++-- .../connection/CatalogDiffModal}/DiffAccordion.module.scss | 0 .../connection/CatalogDiffModal}/DiffAccordion.tsx | 2 +- .../CatalogDiffModal}/DiffAccordionHeader.module.scss | 4 ++-- .../connection/CatalogDiffModal}/DiffAccordionHeader.tsx | 0 .../connection/CatalogDiffModal}/DiffFieldTable.module.scss | 0 .../connection/CatalogDiffModal}/DiffFieldTable.tsx | 2 +- .../connection/CatalogDiffModal}/DiffHeader.tsx | 2 +- .../connection/CatalogDiffModal}/DiffIconBlock.module.scss | 0 .../connection/CatalogDiffModal}/DiffIconBlock.tsx | 0 .../connection/CatalogDiffModal}/DiffSection.module.scss | 0 .../connection/CatalogDiffModal}/DiffSection.tsx | 2 +- .../connection/CatalogDiffModal}/FieldRow.module.scss | 0 .../connection/CatalogDiffModal}/FieldRow.tsx | 0 .../connection/CatalogDiffModal}/FieldSection.module.scss | 0 .../connection/CatalogDiffModal}/FieldSection.tsx | 2 +- .../connection/CatalogDiffModal}/StreamRow.module.scss | 0 .../connection/CatalogDiffModal}/StreamRow.tsx | 5 +++-- .../connection}/CatalogDiffModal/index.stories.tsx | 0 .../src/components/connection/CatalogDiffModal/index.ts | 1 + .../connection/CatalogDiffModal/types.ts} | 0 .../connection}/CatalogDiffModal/utils.tsx | 0 .../connection}/useConfirmCatalogDiff.tsx | 4 ++-- .../pages/ConnectionItemPage/ConnectionReplicationTab.tsx | 2 +- 26 files changed, 17 insertions(+), 15 deletions(-) rename airbyte-webapp/src/{views/Connection => components/connection}/CatalogDiffModal/CatalogDiffModal.module.scss (65%) rename airbyte-webapp/src/{views/Connection => components/connection}/CatalogDiffModal/CatalogDiffModal.test.tsx (100%) rename airbyte-webapp/src/{views/Connection => components/connection}/CatalogDiffModal/CatalogDiffModal.tsx (93%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/DiffAccordion.module.scss (100%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/DiffAccordion.tsx (97%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/DiffAccordionHeader.module.scss (56%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/DiffAccordionHeader.tsx (100%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/DiffFieldTable.module.scss (100%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/DiffFieldTable.tsx (96%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/DiffHeader.tsx (93%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/DiffIconBlock.module.scss (100%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/DiffIconBlock.tsx (100%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/DiffSection.module.scss (100%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/DiffSection.tsx (98%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/FieldRow.module.scss (100%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/FieldRow.tsx (100%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/FieldSection.module.scss (100%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/FieldSection.tsx (97%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/StreamRow.module.scss (100%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/components => components/connection/CatalogDiffModal}/StreamRow.tsx (93%) rename airbyte-webapp/src/{views/Connection => components/connection}/CatalogDiffModal/index.stories.tsx (100%) create mode 100644 airbyte-webapp/src/components/connection/CatalogDiffModal/index.ts rename airbyte-webapp/src/{views/Connection/CatalogDiffModal/types.tsx => components/connection/CatalogDiffModal/types.ts} (100%) rename airbyte-webapp/src/{views/Connection => components/connection}/CatalogDiffModal/utils.tsx (100%) rename airbyte-webapp/src/{views/Connection/CatalogDiffModal => hooks/connection}/useConfirmCatalogDiff.tsx (91%) diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/CatalogDiffModal.module.scss b/airbyte-webapp/src/components/connection/CatalogDiffModal/CatalogDiffModal.module.scss similarity index 65% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/CatalogDiffModal.module.scss rename to airbyte-webapp/src/components/connection/CatalogDiffModal/CatalogDiffModal.module.scss index 4a53ac37cae7..095b5c59ee25 100644 --- a/airbyte-webapp/src/views/Connection/CatalogDiffModal/CatalogDiffModal.module.scss +++ b/airbyte-webapp/src/components/connection/CatalogDiffModal/CatalogDiffModal.module.scss @@ -1,4 +1,4 @@ -@use "../../../scss/variables"; +@use "scss/variables"; .modalContent { display: flex; diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/CatalogDiffModal.test.tsx b/airbyte-webapp/src/components/connection/CatalogDiffModal/CatalogDiffModal.test.tsx similarity index 100% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/CatalogDiffModal.test.tsx rename to airbyte-webapp/src/components/connection/CatalogDiffModal/CatalogDiffModal.test.tsx diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/CatalogDiffModal.tsx b/airbyte-webapp/src/components/connection/CatalogDiffModal/CatalogDiffModal.tsx similarity index 93% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/CatalogDiffModal.tsx rename to airbyte-webapp/src/components/connection/CatalogDiffModal/CatalogDiffModal.tsx index fda79811d5a8..8ce4b516d163 100644 --- a/airbyte-webapp/src/views/Connection/CatalogDiffModal/CatalogDiffModal.tsx +++ b/airbyte-webapp/src/components/connection/CatalogDiffModal/CatalogDiffModal.tsx @@ -9,8 +9,8 @@ import { AirbyteCatalog, CatalogDiff } from "core/request/AirbyteClient"; import { useModalService } from "hooks/services/Modal"; import styles from "./CatalogDiffModal.module.scss"; -import { DiffSection } from "./components/DiffSection"; -import { FieldSection } from "./components/FieldSection"; +import { DiffSection } from "./DiffSection"; +import { FieldSection } from "./FieldSection"; import { getSortedDiff } from "./utils"; interface CatalogDiffModalProps { diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffAccordion.module.scss b/airbyte-webapp/src/components/connection/CatalogDiffModal/DiffAccordion.module.scss similarity index 100% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffAccordion.module.scss rename to airbyte-webapp/src/components/connection/CatalogDiffModal/DiffAccordion.module.scss diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffAccordion.tsx b/airbyte-webapp/src/components/connection/CatalogDiffModal/DiffAccordion.tsx similarity index 97% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffAccordion.tsx rename to airbyte-webapp/src/components/connection/CatalogDiffModal/DiffAccordion.tsx index 52cd6efc35ab..1392090fc7ed 100644 --- a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffAccordion.tsx +++ b/airbyte-webapp/src/components/connection/CatalogDiffModal/DiffAccordion.tsx @@ -3,10 +3,10 @@ import { useMemo } from "react"; import { StreamTransform } from "core/request/AirbyteClient"; -import { getSortedDiff } from "../utils"; import styles from "./DiffAccordion.module.scss"; import { DiffAccordionHeader } from "./DiffAccordionHeader"; import { DiffFieldTable } from "./DiffFieldTable"; +import { getSortedDiff } from "./utils"; interface DiffAccordionProps { streamTransform: StreamTransform; diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffAccordionHeader.module.scss b/airbyte-webapp/src/components/connection/CatalogDiffModal/DiffAccordionHeader.module.scss similarity index 56% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffAccordionHeader.module.scss rename to airbyte-webapp/src/components/connection/CatalogDiffModal/DiffAccordionHeader.module.scss index 58427fc104f2..740f7cc61d87 100644 --- a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffAccordionHeader.module.scss +++ b/airbyte-webapp/src/components/connection/CatalogDiffModal/DiffAccordionHeader.module.scss @@ -1,5 +1,5 @@ -@forward "../components/StreamRow.module.scss"; -@forward "../components/DiffSection.module.scss"; +@forward "./StreamRow.module.scss"; +@forward "./DiffSection.module.scss"; @use "scss/variables"; .row { diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffAccordionHeader.tsx b/airbyte-webapp/src/components/connection/CatalogDiffModal/DiffAccordionHeader.tsx similarity index 100% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffAccordionHeader.tsx rename to airbyte-webapp/src/components/connection/CatalogDiffModal/DiffAccordionHeader.tsx diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffFieldTable.module.scss b/airbyte-webapp/src/components/connection/CatalogDiffModal/DiffFieldTable.module.scss similarity index 100% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffFieldTable.module.scss rename to airbyte-webapp/src/components/connection/CatalogDiffModal/DiffFieldTable.module.scss diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffFieldTable.tsx b/airbyte-webapp/src/components/connection/CatalogDiffModal/DiffFieldTable.tsx similarity index 96% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffFieldTable.tsx rename to airbyte-webapp/src/components/connection/CatalogDiffModal/DiffFieldTable.tsx index b4d45e871777..aab8e0f02af5 100644 --- a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffFieldTable.tsx +++ b/airbyte-webapp/src/components/connection/CatalogDiffModal/DiffFieldTable.tsx @@ -2,10 +2,10 @@ import { FormattedMessage } from "react-intl"; import { FieldTransform } from "core/request/AirbyteClient"; -import { DiffVerb } from "../types"; import styles from "./DiffFieldTable.module.scss"; import { DiffHeader } from "./DiffHeader"; import { FieldRow } from "./FieldRow"; +import { DiffVerb } from "./types"; interface DiffFieldTableProps { fieldTransforms: FieldTransform[]; diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffHeader.tsx b/airbyte-webapp/src/components/connection/CatalogDiffModal/DiffHeader.tsx similarity index 93% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffHeader.tsx rename to airbyte-webapp/src/components/connection/CatalogDiffModal/DiffHeader.tsx index 00ef53880d3c..1693c9543fad 100644 --- a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffHeader.tsx +++ b/airbyte-webapp/src/components/connection/CatalogDiffModal/DiffHeader.tsx @@ -1,6 +1,6 @@ import { useIntl } from "react-intl"; -import { DiffVerb } from "../types"; +import { DiffVerb } from "./types"; export type DiffType = "field" | "stream"; diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffIconBlock.module.scss b/airbyte-webapp/src/components/connection/CatalogDiffModal/DiffIconBlock.module.scss similarity index 100% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffIconBlock.module.scss rename to airbyte-webapp/src/components/connection/CatalogDiffModal/DiffIconBlock.module.scss diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffIconBlock.tsx b/airbyte-webapp/src/components/connection/CatalogDiffModal/DiffIconBlock.tsx similarity index 100% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffIconBlock.tsx rename to airbyte-webapp/src/components/connection/CatalogDiffModal/DiffIconBlock.tsx diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffSection.module.scss b/airbyte-webapp/src/components/connection/CatalogDiffModal/DiffSection.module.scss similarity index 100% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffSection.module.scss rename to airbyte-webapp/src/components/connection/CatalogDiffModal/DiffSection.module.scss diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffSection.tsx b/airbyte-webapp/src/components/connection/CatalogDiffModal/DiffSection.tsx similarity index 98% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffSection.tsx rename to airbyte-webapp/src/components/connection/CatalogDiffModal/DiffSection.tsx index 215e40a53cb9..06ebc68e1bb7 100644 --- a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/DiffSection.tsx +++ b/airbyte-webapp/src/components/connection/CatalogDiffModal/DiffSection.tsx @@ -2,10 +2,10 @@ import { FormattedMessage } from "react-intl"; import { AirbyteCatalog, StreamDescriptor, StreamTransform } from "core/request/AirbyteClient"; -import { DiffVerb } from "../types"; import { DiffHeader } from "./DiffHeader"; import styles from "./DiffSection.module.scss"; import { StreamRow } from "./StreamRow"; +import { DiffVerb } from "./types"; interface DiffSectionProps { streams: StreamTransform[]; diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/FieldRow.module.scss b/airbyte-webapp/src/components/connection/CatalogDiffModal/FieldRow.module.scss similarity index 100% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/FieldRow.module.scss rename to airbyte-webapp/src/components/connection/CatalogDiffModal/FieldRow.module.scss diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/FieldRow.tsx b/airbyte-webapp/src/components/connection/CatalogDiffModal/FieldRow.tsx similarity index 100% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/FieldRow.tsx rename to airbyte-webapp/src/components/connection/CatalogDiffModal/FieldRow.tsx diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/FieldSection.module.scss b/airbyte-webapp/src/components/connection/CatalogDiffModal/FieldSection.module.scss similarity index 100% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/FieldSection.module.scss rename to airbyte-webapp/src/components/connection/CatalogDiffModal/FieldSection.module.scss diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/FieldSection.tsx b/airbyte-webapp/src/components/connection/CatalogDiffModal/FieldSection.tsx similarity index 97% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/FieldSection.tsx rename to airbyte-webapp/src/components/connection/CatalogDiffModal/FieldSection.tsx index b6916a74ee8f..41067a879303 100644 --- a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/FieldSection.tsx +++ b/airbyte-webapp/src/components/connection/CatalogDiffModal/FieldSection.tsx @@ -2,10 +2,10 @@ import { FormattedMessage, useIntl } from "react-intl"; import { StreamTransform } from "core/request/AirbyteClient"; -import { DiffVerb } from "../types"; import { DiffAccordion } from "./DiffAccordion"; import { DiffHeader } from "./DiffHeader"; import styles from "./FieldSection.module.scss"; +import { DiffVerb } from "./types"; interface FieldSectionProps { streams: StreamTransform[]; diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/StreamRow.module.scss b/airbyte-webapp/src/components/connection/CatalogDiffModal/StreamRow.module.scss similarity index 100% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/StreamRow.module.scss rename to airbyte-webapp/src/components/connection/CatalogDiffModal/StreamRow.module.scss diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/StreamRow.tsx b/airbyte-webapp/src/components/connection/CatalogDiffModal/StreamRow.tsx similarity index 93% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/components/StreamRow.tsx rename to airbyte-webapp/src/components/connection/CatalogDiffModal/StreamRow.tsx index 083699a47076..5f1f97cac192 100644 --- a/airbyte-webapp/src/views/Connection/CatalogDiffModal/components/StreamRow.tsx +++ b/airbyte-webapp/src/components/connection/CatalogDiffModal/StreamRow.tsx @@ -2,11 +2,12 @@ import { faMinus, faPlus } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import classnames from "classnames"; +import { ModificationIcon } from "components/icons/ModificationIcon"; + import { StreamTransform } from "core/request/AirbyteClient"; -import { ModificationIcon } from "../../../../components/icons/ModificationIcon"; -import { DiffVerb } from "../types"; import styles from "./StreamRow.module.scss"; +import { DiffVerb } from "./types"; interface StreamRowProps { streamTransform: StreamTransform; diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/index.stories.tsx b/airbyte-webapp/src/components/connection/CatalogDiffModal/index.stories.tsx similarity index 100% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/index.stories.tsx rename to airbyte-webapp/src/components/connection/CatalogDiffModal/index.stories.tsx diff --git a/airbyte-webapp/src/components/connection/CatalogDiffModal/index.ts b/airbyte-webapp/src/components/connection/CatalogDiffModal/index.ts new file mode 100644 index 000000000000..ef0d83e8f7e7 --- /dev/null +++ b/airbyte-webapp/src/components/connection/CatalogDiffModal/index.ts @@ -0,0 +1 @@ +export * from "./CatalogDiffModal"; diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/types.tsx b/airbyte-webapp/src/components/connection/CatalogDiffModal/types.ts similarity index 100% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/types.tsx rename to airbyte-webapp/src/components/connection/CatalogDiffModal/types.ts diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/utils.tsx b/airbyte-webapp/src/components/connection/CatalogDiffModal/utils.tsx similarity index 100% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/utils.tsx rename to airbyte-webapp/src/components/connection/CatalogDiffModal/utils.tsx diff --git a/airbyte-webapp/src/views/Connection/CatalogDiffModal/useConfirmCatalogDiff.tsx b/airbyte-webapp/src/hooks/connection/useConfirmCatalogDiff.tsx similarity index 91% rename from airbyte-webapp/src/views/Connection/CatalogDiffModal/useConfirmCatalogDiff.tsx rename to airbyte-webapp/src/hooks/connection/useConfirmCatalogDiff.tsx index 9261d31175d6..3fc149c8383f 100644 --- a/airbyte-webapp/src/views/Connection/CatalogDiffModal/useConfirmCatalogDiff.tsx +++ b/airbyte-webapp/src/hooks/connection/useConfirmCatalogDiff.tsx @@ -1,11 +1,11 @@ import { useEffect } from "react"; import { useIntl } from "react-intl"; +import { CatalogDiffModal } from "components/connection/CatalogDiffModal/CatalogDiffModal"; + import { useConnectionEditService } from "hooks/services/ConnectionEdit/ConnectionEditService"; import { useModalService } from "hooks/services/Modal"; -import { CatalogDiffModal } from "./CatalogDiffModal"; - export const useConfirmCatalogDiff = () => { const { formatMessage } = useIntl(); const { openModal } = useModalService(); diff --git a/airbyte-webapp/src/pages/ConnectionPage/pages/ConnectionItemPage/ConnectionReplicationTab.tsx b/airbyte-webapp/src/pages/ConnectionPage/pages/ConnectionItemPage/ConnectionReplicationTab.tsx index 72b0c8cd7efe..d997389fb7f5 100644 --- a/airbyte-webapp/src/pages/ConnectionPage/pages/ConnectionItemPage/ConnectionReplicationTab.tsx +++ b/airbyte-webapp/src/pages/ConnectionPage/pages/ConnectionItemPage/ConnectionReplicationTab.tsx @@ -9,6 +9,7 @@ import LoadingSchema from "components/LoadingSchema"; import { Action, Namespace } from "core/analytics"; import { getFrequencyFromScheduleData } from "core/analytics/utils"; import { toWebBackendConnectionUpdate } from "core/domain/connection"; +import { useConfirmCatalogDiff } from "hooks/connection/useConfirmCatalogDiff"; import { PageTrackingCodes, useAnalyticsService, useTrackPage } from "hooks/services/Analytics"; import { useConnectionEditService } from "hooks/services/ConnectionEdit/ConnectionEditService"; import { @@ -20,7 +21,6 @@ import { useModalService } from "hooks/services/Modal"; import { useConnectionService, ValuesProps } from "hooks/services/useConnectionHook"; import { useCurrentWorkspaceId } from "services/workspaces/WorkspacesService"; import { equal } from "utils/objects"; -import { useConfirmCatalogDiff } from "views/Connection/CatalogDiffModal/useConfirmCatalogDiff"; import EditControls from "views/Connection/ConnectionForm/components/EditControls"; import { ConnectionFormFields } from "views/Connection/ConnectionForm/ConnectionFormFields"; import {