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.

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

Revert "Choose optimal sync modes by default on UI (#12411)" #12583

Merged
merged 1 commit into from
May 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion airbyte-webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"test:coverage": "npm test -- --coverage --watchAll=false",
"format": "prettier --write 'src/**/*.{ts,tsx}'",
"storybook": "start-storybook -p 9009 -s public --quiet",
"lint": "eslint --ext js,ts,tsx src",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import { flatten, getPathType } from "./utils";
const Section = styled.div<{ error?: boolean; isSelected: boolean }>`
border: 1px solid ${(props) => (props.error ? props.theme.dangerColor : "none")};
background: ${({ theme, isSelected }) => (isSelected ? "rgba(97, 94, 255, 0.1);" : theme.greyColor0)};
padding: 2px;

&:first-child {
border-radius: 8px 8px 0 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const StreamFieldTable: React.FC<StreamFieldTableProps> = (props) => {
</TreeRowWrapper>
<RowsContainer>
{props.syncSchemaFields.map((field) => (
<TreeRowWrapper depth={1} key={pathDisplayName(field.path)}>
<TreeRowWrapper depth={1} key={field.key}>
<FieldRow
path={field.path}
name={pathDisplayName(field.path)}
Expand Down
58 changes: 50 additions & 8 deletions airbyte-webapp/src/views/Connection/ConnectionForm/formConfig.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
import { setIn } from "formik";
import { useMemo } from "react";
import { useIntl } from "react-intl";
import * as yup from "yup";

import { DropDownRow } from "components";

import FrequencyConfig from "config/FrequencyConfig.json";
import { DestinationSyncMode, SyncMode, SyncSchema, SyncSchemaStream } from "core/domain/catalog";
import {
AirbyteStreamConfiguration,
DestinationSyncMode,
SyncMode,
SyncSchema,
SyncSchemaStream,
} from "core/domain/catalog";
import { Connection, ScheduleProperties } from "core/domain/connection";
import { ConnectionNamespaceDefinition, ConnectionSchedule } from "core/domain/connection";
import {
Expand All @@ -21,8 +28,6 @@ import { SOURCE_NAMESPACE_TAG } from "core/domain/connector/source";
import { ValuesProps } from "hooks/services/useConnectionHook";
import { useCurrentWorkspace } from "services/workspaces/WorkspacesService";

import { getOptimalSyncMode, verifyConfigCursorField, verifySupportedSyncModes } from "./formConfigHelpers";

type FormikConnectionFormValues = {
schedule?: ScheduleProperties | null;
prefix: string;
Expand Down Expand Up @@ -192,17 +197,54 @@ function mapFormPropsToOperation(
return newOperations;
}

const useInitialSchema = (schema: SyncSchema, supportedDestinationSyncModes: DestinationSyncMode[]): SyncSchema =>
function getDefaultCursorField(streamNode: SyncSchemaStream): string[] {
if (streamNode.stream.defaultCursorField.length) {
return streamNode.stream.defaultCursorField;
}
return streamNode.config.cursorField;
}

const useInitialSchema = (schema: SyncSchema): SyncSchema =>
useMemo<SyncSchema>(
() => ({
streams: schema.streams.map<SyncSchemaStream>((apiNode, id) => {
const nodeWithId: SyncSchemaStream = { ...apiNode, id: id.toString() };
const nodeStream = verifyConfigCursorField(verifySupportedSyncModes(nodeWithId));

return getOptimalSyncMode(nodeStream, supportedDestinationSyncModes);
// If the value in supportedSyncModes is empty assume the only supported sync mode is FULL_REFRESH.
// Otherwise, it supports whatever sync modes are present.
const streamNode = nodeWithId.stream.supportedSyncModes?.length
? nodeWithId
: setIn(nodeWithId, "stream.supportedSyncModes", [SyncMode.FullRefresh]);

// If syncMode isn't null - don't change item
if (streamNode.config.syncMode) {
return streamNode;
}

const updateStreamConfig = (config: Partial<AirbyteStreamConfiguration>): SyncSchemaStream => ({
...streamNode,
config: { ...streamNode.config, ...config },
});

const supportedSyncModes = streamNode.stream.supportedSyncModes;

// Prefer INCREMENTAL sync mode over other sync modes
if (supportedSyncModes.includes(SyncMode.Incremental)) {
return updateStreamConfig({
cursorField: streamNode.config.cursorField.length
? streamNode.config.cursorField
: getDefaultCursorField(streamNode),
syncMode: SyncMode.Incremental,
});
}

// If source don't support INCREMENTAL and FULL_REFRESH - set first value from supportedSyncModes list
return updateStreamConfig({
syncMode: streamNode.stream.supportedSyncModes[0],
});
}),
}),
[schema.streams, supportedDestinationSyncModes]
[schema.streams]
);

const getInitialTransformations = (operations: Operation[]): Transformation[] => operations.filter(isDbtTransformation);
Expand All @@ -224,7 +266,7 @@ const useInitialValues = (
destDefinition: DestinationDefinitionSpecification,
isEditMode?: boolean
): FormikConnectionFormValues => {
const initialSchema = useInitialSchema(connection.syncCatalog, destDefinition.supportedDestinationSyncModes);
const initialSchema = useInitialSchema(connection.syncCatalog);

return useMemo(() => {
const initialValues: FormikConnectionFormValues = {
Expand Down

This file was deleted.

This file was deleted.