Skip to content

Commit 80504d9

Browse files
authored
Switch order of namespaces and make Destination Default is the defaul… (#21047)
* Switch order of namespace options to make Destination Default appear as the first option * Destination Default is the default option * Update expected HTML
1 parent 199b7e9 commit 80504d9

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

airbyte-webapp/src/components/CreateConnection/__snapshots__/CreateConnectionForm.test.tsx.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ exports[`CreateConnectionForm should render 1`] = `
258258
<div
259259
class="<removed-for-snapshot-test>"
260260
>
261-
Mirror source structure
261+
Destination default
262262
</div>
263263
</div>
264264
</div>
@@ -303,7 +303,7 @@ exports[`CreateConnectionForm should render 1`] = `
303303
<input
304304
name="namespaceDefinition"
305305
type="hidden"
306-
value="source"
306+
value="destination"
307307
/>
308308
</div>
309309
</div>
@@ -796,9 +796,9 @@ exports[`CreateConnectionForm should render 1`] = `
796796
/>
797797
<div
798798
class="<removed-for-snapshot-test>"
799-
title="'<source schema>"
799+
title="'<destination schema>"
800800
>
801-
'&lt;source schema&gt;
801+
'&lt;destination schema&gt;
802802
</div>
803803
<div
804804
class="<removed-for-snapshot-test>"

airbyte-webapp/src/components/connection/DestinationNamespaceModal/DestinationNamespaceModal.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { ExampleSettingsTable } from "./ExampleSettingsTable";
1919
const destinationNamespaceValidationSchema = yup.object().shape({
2020
namespaceDefinition: yup
2121
.string()
22-
.oneOf([NamespaceDefinitionType.source, NamespaceDefinitionType.destination, NamespaceDefinitionType.customformat])
22+
.oneOf([NamespaceDefinitionType.destination, NamespaceDefinitionType.source, NamespaceDefinitionType.customformat])
2323
.required("form.empty.error"),
2424
namespaceFormat: yup.string().when("namespaceDefinition", {
2525
is: NamespaceDefinitionType.customformat,
@@ -48,7 +48,7 @@ export const DestinationNamespaceModal: React.FC<DestinationNamespaceModalProps>
4848
return (
4949
<Formik
5050
initialValues={{
51-
namespaceDefinition: initialValues?.namespaceDefinition ?? NamespaceDefinitionType.source,
51+
namespaceDefinition: initialValues?.namespaceDefinition ?? NamespaceDefinitionType.destination,
5252
namespaceFormat: initialValues.namespaceFormat,
5353
}}
5454
enableReinitialize
@@ -69,14 +69,14 @@ export const DestinationNamespaceModal: React.FC<DestinationNamespaceModalProps>
6969
<LabeledRadioButton
7070
{...field}
7171
className={styles.radioButton}
72-
id="destinationNamespace.source"
72+
id="destinationNamespace.destination"
7373
label={
7474
<Text as="span">
75-
<FormattedMessage id="connectionForm.modal.destinationNamespace.option.source" />
75+
<FormattedMessage id="connectionForm.modal.destinationNamespace.option.destination" />
7676
</Text>
7777
}
78-
value={NamespaceDefinitionType.source}
79-
checked={field.value === NamespaceDefinitionType.source}
78+
value={NamespaceDefinitionType.destination}
79+
checked={field.value === NamespaceDefinitionType.destination}
8080
/>
8181
)}
8282
</Field>
@@ -85,14 +85,14 @@ export const DestinationNamespaceModal: React.FC<DestinationNamespaceModalProps>
8585
<LabeledRadioButton
8686
{...field}
8787
className={styles.radioButton}
88-
id="destinationNamespace.destination"
88+
id="destinationNamespace.source"
8989
label={
9090
<Text as="span">
91-
<FormattedMessage id="connectionForm.modal.destinationNamespace.option.destination" />
91+
<FormattedMessage id="connectionForm.modal.destinationNamespace.option.source" />
9292
</Text>
9393
}
94-
value={NamespaceDefinitionType.destination}
95-
checked={field.value === NamespaceDefinitionType.destination}
94+
value={NamespaceDefinitionType.source}
95+
checked={field.value === NamespaceDefinitionType.source}
9696
/>
9797
)}
9898
</Field>

airbyte-webapp/src/views/Connection/ConnectionForm/components/NamespaceDefinitionField.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ import { NamespaceDefinitionType } from "../../../../core/request/AirbyteClient"
1010
import styles from "./NamespaceDefinitionField.module.scss";
1111

1212
export const StreamOptions = [
13-
{
14-
value: NamespaceDefinitionType.source,
15-
label: <FormattedMessage id="connectionForm.sourceFormat" />,
16-
testId: "namespaceDefinition-source",
17-
},
1813
{
1914
value: NamespaceDefinitionType.destination,
2015
label: <FormattedMessage id="connectionForm.destinationFormat" />,
2116
testId: "namespaceDefinition-destination",
2217
},
18+
{
19+
value: NamespaceDefinitionType.source,
20+
label: <FormattedMessage id="connectionForm.sourceFormat" />,
21+
testId: "namespaceDefinition-source",
22+
},
2323
{
2424
value: NamespaceDefinitionType.customformat,
2525
label: <FormattedMessage id="connectionForm.customFormat" />,

airbyte-webapp/src/views/Connection/ConnectionForm/formConfig.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ export const createConnectionValidationSchema = ({
138138
namespaceDefinition: yup
139139
.string()
140140
.oneOf([
141-
NamespaceDefinitionType.source,
142141
NamespaceDefinitionType.destination,
142+
NamespaceDefinitionType.source,
143143
NamespaceDefinitionType.customformat,
144144
])
145145
.required("form.empty.error"),
@@ -365,7 +365,7 @@ export const useInitialValues = (
365365
scheduleData: connection.connectionId ? connection.scheduleData ?? null : DEFAULT_SCHEDULE,
366366
nonBreakingChangesPreference: connection.nonBreakingChangesPreference ?? NonBreakingChangesPreference.ignore,
367367
prefix: connection.prefix || "",
368-
namespaceDefinition: connection.namespaceDefinition || NamespaceDefinitionType.source,
368+
namespaceDefinition: connection.namespaceDefinition || NamespaceDefinitionType.destination,
369369
namespaceFormat: connection.namespaceFormat ?? SOURCE_NAMESPACE_TAG,
370370
geography: connection.geography || workspace.defaultGeography || "auto",
371371
};

tools/bin/load_test/connection_spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
]
3333
},
3434
"prefix": "",
35-
"namespaceDefinition": "source",
35+
"namespaceDefinition": "destination",
3636
"namespaceFormat": "${SOURCE_NAMESPACE}",
3737
"scheduleType": "basic",
3838
"scheduleData": {

0 commit comments

Comments
 (0)