Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
aaaef76
generic multi step auth form
lovincyrus Dec 8, 2025
0ab6530
inital s3 and azure
lovincyrus Dec 8, 2025
968f49a
multi step form renderer
lovincyrus Dec 8, 2025
781fb5b
exclude name from connector form
lovincyrus Dec 8, 2025
6ac31f1
reset
lovincyrus Dec 8, 2025
00fc8ee
bump specs
lovincyrus Dec 8, 2025
b964462
gate multi step configs buttno
lovincyrus Dec 8, 2025
e0f66b9
clean up
lovincyrus Dec 8, 2025
d8ed85d
remove unused
lovincyrus Dec 8, 2025
931889b
lint, prettier
lovincyrus Dec 9, 2025
a55e846
separate the long constant
lovincyrus Dec 9, 2025
818ad79
copy changes
lovincyrus Dec 9, 2025
2479c85
clean up s3 connector form
lovincyrus Dec 9, 2025
61bd19b
fix multi step connector preview
lovincyrus Dec 9, 2025
09079fc
fix excluded keys of s3
lovincyrus Dec 9, 2025
9ac8a4b
spacing between preview and help
lovincyrus Dec 9, 2025
ed7ee47
reorg
lovincyrus Dec 9, 2025
d4bdae6
fix azure schema
lovincyrus Dec 9, 2025
0f8cc46
use public instead of skip in gcs
lovincyrus Dec 9, 2025
ca67542
public option for object storage connectors
lovincyrus Dec 9, 2025
c2d1d84
unblock public in s3
lovincyrus Dec 9, 2025
2db9c08
gate save anyway on multi step connector submission
lovincyrus Dec 9, 2025
3a3d3b4
import your data right data panel
lovincyrus Dec 9, 2025
8332724
import data copy for model step 2
lovincyrus Dec 9, 2025
54a3e62
gate save anyway on step 2 when import data
lovincyrus Dec 9, 2025
a17f504
gcs source in yup schema
lovincyrus Dec 9, 2025
b0ad7ea
dynamic validaton for multi step connectors
lovincyrus Dec 9, 2025
ee15857
add comments to the fallback schema
lovincyrus Dec 9, 2025
5e8a21b
azure and s3 e2e
lovincyrus Dec 9, 2025
8123e2b
update default auth method for azure
lovincyrus Dec 9, 2025
1c25ae7
hide save anyway when advacning to the model step for multi step
lovincyrus Dec 9, 2025
1054602
fix e2e
lovincyrus Dec 9, 2025
35b69b7
centralize multi step auth method state to the store
lovincyrus Dec 9, 2025
ee61f06
clean up save anyway logic
lovincyrus Dec 9, 2025
6804228
save anyway e2e
lovincyrus Dec 9, 2025
0411f34
isMultiStepConnectorDisabled
lovincyrus Dec 9, 2025
6694210
reorg public option
lovincyrus Dec 9, 2025
a1626e9
colocate button labels
lovincyrus Dec 9, 2025
fdb5d83
fixes
lovincyrus Dec 9, 2025
66bcba2
use onsubmit to fix validation flicker rerender
lovincyrus Dec 11, 2025
119af77
fix submission for already connected?
lovincyrus Dec 11, 2025
b713e8b
s3 naming
lovincyrus Dec 12, 2025
83bfcdf
json schema config
lovincyrus Dec 15, 2025
b976b96
json schema form renderer
lovincyrus Dec 16, 2025
9396e92
missing placeholder texts
lovincyrus Dec 16, 2025
634d2f0
prettier
lovincyrus Dec 16, 2025
e495160
fix field spacing
lovincyrus Dec 16, 2025
54ee93f
individual schemas
lovincyrus Dec 17, 2025
d7b6c83
templates reorg
lovincyrus Dec 17, 2025
99f076d
schema driven
lovincyrus Dec 17, 2025
48a9f92
Revert "schema driven"
lovincyrus Dec 17, 2025
efdfd5c
re-add aws_role_arn
lovincyrus Dec 18, 2025
9cdcfa7
fix auth method revalidation
lovincyrus Dec 18, 2025
f8b7aaa
fix e2e
lovincyrus Dec 18, 2025
5c19210
fix selected auth method remnant
lovincyrus Dec 18, 2025
5da442e
fix continue submission
lovincyrus Dec 18, 2025
bdfed20
fix lingering save anyway after submission for public option
lovincyrus Dec 18, 2025
2324101
clear input fields on auth method change
lovincyrus Dec 18, 2025
1f3d7e2
explicit group fields
lovincyrus Dec 19, 2025
97dd8fd
reduce markup dup in the renderer
lovincyrus Dec 19, 2025
ad64b77
relocate utils
lovincyrus Dec 19, 2025
9b2e3bf
lint
lovincyrus Dec 19, 2025
d680923
move renderer
lovincyrus Dec 19, 2025
4bc9d51
extract connector flow into a wrapper
lovincyrus Dec 19, 2025
c47ee09
Merge branch 'pr-8467-temp' into feat/connector-schemas
royendo Dec 19, 2025
22bdc58
feat: Add HTTPS connector with JSON Schema-based authentication
royendo Dec 19, 2025
3ad0943
feat: Add PostgreSQL, MySQL, and SQLite connector schemas
royendo Dec 19, 2025
882ae68
feat: add JSON schemas for cloud warehouse connectors (Sprint 3)
royendo Dec 19, 2025
54975a9
feat: add JSON schemas for OLAP engine connectors (Sprint 4)
royendo Dec 19, 2025
7a7477a
fix: simplify BigQuery and SQLite schemas
royendo Dec 19, 2025
c3f3a76
fix: update BigQuery credentials field label to 'GCP Credentials'
royendo Dec 19, 2025
aaac4b2
fix: add table and source name fields to SQLite schema
royendo Dec 19, 2025
806d23b
fix: resolve multi-step connector validation and UI issues
royendo Dec 19, 2025
480c281
fix: revert SQLite to single-form source (not multi-step connector)
royendo Dec 19, 2025
af17437
fix: add defensive check in validation to handle null form values
royendo Dec 19, 2025
574f18b
commit
royendo Dec 19, 2025
126e903
clean up
royendo Dec 20, 2025
77c705c
advanced
royendo Dec 20, 2025
73e5bd7
rmeove clickhouse
royendo Dec 20, 2025
91d6eba
to be cont'd
royendo Dec 20, 2025
ecc12c5
cleanup CH forms
royendo Dec 20, 2025
8bc88f3
to be cont;d
royendo Dec 20, 2025
d030140
Create ClickHouseCloud.svelte
royendo Dec 20, 2025
2faa338
https://jam.dev/c/0fa9e14e-4e81-4f2e-86fe-8db39aff7a18
royendo Dec 22, 2025
f10809a
ch-cloud icon
royendo Dec 22, 2025
9544431
fixing bugs, but not sur eif best way
royendo Dec 22, 2025
4f5aba4
required source
royendo Dec 22, 2025
078487d
reamining keys
royendo Dec 22, 2025
104497e
missing keys
royendo Dec 22, 2025
3f38963
prefix
royendo Dec 22, 2025
3f665f6
prettier
royendo Dec 22, 2025
229d205
ch ui modal
royendo Dec 22, 2025
3f56853
prettier
royendo Dec 22, 2025
d69a6a9
revert snowflake and redshift changes
royendo Dec 22, 2025
6da2a63
Update snowflake.ts
royendo Dec 22, 2025
5b2ab4c
nit
royendo Dec 22, 2025
95d64d8
revert
royendo Dec 22, 2025
9c6c8a9
nit
royendo Dec 22, 2025
3f5d3f8
Update sqlite.go
royendo Dec 22, 2025
654a621
nit
royendo Dec 22, 2025
3da5c17
x-step explorer, create metrics with AI for read only
royendo Dec 23, 2025
0fddf6b
Merge branch 'main' into feat/connector-schemas
royendo Dec 23, 2025
1068d12
pulled new changed from cyrus/shared-multi-step-form
royendo Dec 23, 2025
e0f8ab8
Update submitAddDataForm.ts
royendo Dec 23, 2025
030a430
all ts, missed these three
royendo Dec 24, 2025
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
14 changes: 14 additions & 0 deletions runtime/drivers/athena/athena.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,20 @@ var spec = drivers.Spec{
Placeholder: "s3://bucket-name/path/",
Required: true,
},
{
Key: "region",
Type: drivers.StringPropertyType,
DisplayName: "AWS Region",
Description: "AWS region where Athena is configured",
Placeholder: "us-east-1",
},
{
Key: "workgroup",
Type: drivers.StringPropertyType,
DisplayName: "Workgroup",
Description: "Athena workgroup name (optional)",
Placeholder: "primary",
},
},
ImplementsWarehouse: true,
}
Expand Down
9 changes: 6 additions & 3 deletions runtime/drivers/azure/azure.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,12 @@ var spec = drivers.Spec{
Secret: true,
},
{
Key: "azure_storage_connection_string",
Type: drivers.StringPropertyType,
Secret: true,
Key: "azure_storage_connection_string",
Type: drivers.StringPropertyType,
DisplayName: "Azure Connection String",
Description: "Azure connection string for storage account",
Placeholder: "Paste your Azure connection string here",
Secret: true,
},
},
// Important: Any edits to the below properties must be accompanied by changes to the client-side form validation schemas.
Expand Down
36 changes: 26 additions & 10 deletions runtime/drivers/https/https.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,25 @@ func init() {
}

var spec = drivers.Spec{
DisplayName: "https",
Description: "Connect to a remote file.",
DisplayName: "HTTPS",
Description: "Connect to remote files and REST APIs.",
DocsURL: "https://docs.rilldata.com/build/connect/#adding-a-remote-source",
// Important: Any edits to the below properties must be accompanied by changes to the client-side form validation schemas.
ConfigProperties: []*drivers.PropertySpec{
{
Key: "headers",
Type: drivers.StringPropertyType,
DisplayName: "HTTP Headers (JSON)",
Description: `HTTP headers as JSON object. Example: {"Authorization": "Bearer my-token"}`,
Placeholder: `{"Authorization": "Bearer my-token"}`,
},
},
SourceProperties: []*drivers.PropertySpec{
{
Key: "path",
Type: drivers.StringPropertyType,
DisplayName: "Path",
Description: "Path to the remote file.",
Placeholder: "https://example.com/file.csv",
DisplayName: "URL",
Description: "URL to the remote file or API endpoint",
Placeholder: "https://api.example.com/data",
Required: true,
},
{
Expand Down Expand Up @@ -102,8 +110,9 @@ func (d driver) Open(instanceID string, config map[string]any, st *storage.Clien
}

conn := &Connection{
config: config,
logger: logger,
config: config,
configProp: cfg,
logger: logger,
}
return conn, nil
}
Expand All @@ -121,8 +130,9 @@ func (d driver) TertiarySourceConnectors(ctx context.Context, src map[string]any
}

type Connection struct {
config map[string]any
logger *zap.Logger
config map[string]any
configProp *ConfigProperties
logger *zap.Logger
}

var _ drivers.Handle = &Connection{}
Expand Down Expand Up @@ -254,6 +264,12 @@ func (c *Connection) FilePaths(ctx context.Context, src map[string]any) ([]strin
return nil, fmt.Errorf("failed to create request for path %s: %w", path, err)
}

// Apply connector-level headers first (from config)
for k, v := range c.configProp.Headers {
req.Header.Set(k, v)
}

// Model-specific headers override connector headers
for k, v := range modelProp.Headers {
req.Header.Set(k, v)
}
Expand Down
20 changes: 14 additions & 6 deletions runtime/drivers/s3/s3.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,22 @@ var spec = drivers.Spec{
DocsURL: "https://docs.rilldata.com/build/connectors/data-source/s3",
ConfigProperties: []*drivers.PropertySpec{
{
Key: "aws_access_key_id",
Type: drivers.StringPropertyType,
Secret: true,
Key: "aws_access_key_id",
Type: drivers.StringPropertyType,
DisplayName: "AWS access key ID",
Description: "AWS access key ID for explicit credentials",
Placeholder: "Enter your AWS access key ID",
Secret: true,
Required: true,
},
{
Key: "aws_secret_access_key",
Type: drivers.StringPropertyType,
Secret: true,
Key: "aws_secret_access_key",
Type: drivers.StringPropertyType,
DisplayName: "AWS secret access key",
Description: "AWS secret access key for explicit credentials",
Placeholder: "Enter your AWS secret access key",
Secret: true,
Required: true,
},
{
Key: "region",
Expand Down
8 changes: 8 additions & 0 deletions runtime/drivers/snowflake/snowflake.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,14 @@ var spec = drivers.Spec{
Placeholder: "your_role",
Hint: "The Snowflake role to use (defaults to your default role if not specified)",
},
{
Key: "privateKey",
Type: drivers.StringPropertyType,
DisplayName: "Private Key",
Description: "RSA private key in PEM format for key pair authentication",
Placeholder: "-----BEGIN PRIVATE KEY-----\\n...\\n-----END PRIVATE KEY-----",
Secret: true,
},
},
ImplementsWarehouse: true,
}
Expand Down
6 changes: 3 additions & 3 deletions runtime/drivers/sqlite/sqlite.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ func (d driver) Spec() drivers.Spec {
Key: "db",
Type: drivers.StringPropertyType,
Required: true,
DisplayName: "DB",
Description: "Path to SQLite db file",
Placeholder: "/path/to/sqlite.db",
DisplayName: "Database Path",
Description: "Path to SQLite database file",
Placeholder: "/path/to/database.db",
},
{
Key: "table",
Expand Down
46 changes: 46 additions & 0 deletions web-common/src/components/icons/connectors/ClickHouseCloud.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<svg
width="117"
height="29"
viewBox="0 0 117 29"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M46.896 4.8576C45.8688 4.8576 45.0672 5.2128 44.4912 5.9232C43.9152 6.624 43.6272 7.5888 43.6272 8.8176C43.6272 10.0368 43.896 10.9968 44.4336 11.6976C44.9712 12.3984 45.7872 12.7488 46.8816 12.7488C47.3232 12.7488 47.7456 12.7104 48.1488 12.6336C48.5616 12.5472 48.9792 12.4368 49.4016 12.3024V13.6416C48.9984 13.7952 48.5856 13.9056 48.1632 13.9728C47.7504 14.0496 47.2608 14.088 46.6944 14.088C45.6384 14.088 44.7648 13.872 44.0736 13.44C43.3824 12.9984 42.864 12.384 42.5184 11.5968C42.1728 10.8 42 9.8688 42 8.8032C42 7.7664 42.1872 6.8496 42.5616 6.0528C42.9456 5.256 43.5024 4.6368 44.232 4.1952C44.9616 3.744 45.8544 3.5184 46.9104 3.5184C47.4288 3.5184 47.9328 3.576 48.4224 3.6912C48.9216 3.7968 49.3776 3.9504 49.7904 4.152L49.2144 5.448C48.8784 5.2944 48.5136 5.16 48.12 5.0448C47.736 4.92 47.328 4.8576 46.896 4.8576ZM52.9701 13.944H51.4437V3H52.9701V13.944ZM56.1448 3.2304C56.3752 3.2304 56.5768 3.2976 56.7496 3.432C56.9224 3.5664 57.0088 3.792 57.0088 4.1088C57.0088 4.416 56.9224 4.6416 56.7496 4.7856C56.5768 4.92 56.3752 4.9872 56.1448 4.9872C55.8952 4.9872 55.684 4.92 55.5112 4.7856C55.348 4.6416 55.2664 4.416 55.2664 4.1088C55.2664 3.792 55.348 3.5664 55.5112 3.432C55.684 3.2976 55.8952 3.2304 56.1448 3.2304ZM56.8936 6.1824V13.944H55.3672V6.1824H56.8936ZM62.4154 14.088C61.3402 14.088 60.4762 13.7712 59.8234 13.1376C59.1706 12.4944 58.8442 11.4864 58.8442 10.1136C58.8442 9.1536 59.0026 8.376 59.3194 7.7808C59.6362 7.1856 60.073 6.7488 60.6298 6.4704C61.1866 6.1824 61.8202 6.0384 62.5306 6.0384C62.9626 6.0384 63.3658 6.0864 63.7402 6.1824C64.1242 6.2688 64.441 6.3696 64.6906 6.4848L64.2298 7.7232C63.961 7.6176 63.673 7.5264 63.3658 7.4496C63.0682 7.3728 62.785 7.3344 62.5162 7.3344C61.1146 7.3344 60.4138 8.256 60.4138 10.0992C60.4138 10.9824 60.5866 11.6544 60.9322 12.1152C61.2778 12.576 61.7866 12.8064 62.4586 12.8064C62.8906 12.8064 63.2698 12.7584 63.5962 12.6624C63.9322 12.5664 64.2394 12.4416 64.5178 12.288V13.6128C64.2394 13.776 63.937 13.896 63.6106 13.9728C63.2842 14.0496 62.8858 14.088 62.4154 14.088ZM67.862 8.472C67.862 8.664 67.8524 8.8944 67.8332 9.1632C67.814 9.432 67.7996 9.672 67.79 9.8832H67.8332C67.9388 9.7392 68.0828 9.552 68.2652 9.3216C68.4572 9.0816 68.6252 8.8848 68.7692 8.7312L71.1452 6.1824H72.9164L69.7916 9.5088L73.118 13.944H71.318L68.7548 10.4736L67.862 11.2224V13.944H66.35V3H67.862V8.472ZM82.5873 13.944H81.0321V9.2496H76.1217V13.944H74.5665V3.6624H76.1217V7.9248H81.0321V3.6624H82.5873V13.944ZM92.0056 10.056C92.0056 11.3424 91.6744 12.336 91.012 13.0368C90.3496 13.7376 89.4568 14.088 88.3336 14.088C87.6328 14.088 87.0088 13.9296 86.4616 13.6128C85.924 13.296 85.4968 12.84 85.18 12.2448C84.8728 11.64 84.7192 10.9104 84.7192 10.056C84.7192 8.7696 85.0456 7.7808 85.6984 7.0896C86.3512 6.3888 87.244 6.0384 88.3768 6.0384C89.0872 6.0384 89.7112 6.1968 90.2488 6.5136C90.796 6.8208 91.2232 7.272 91.5304 7.8672C91.8472 8.4624 92.0056 9.192 92.0056 10.056ZM86.2888 10.056C86.2888 10.9296 86.452 11.6112 86.7784 12.1008C87.1144 12.5904 87.6424 12.8352 88.3624 12.8352C89.0824 12.8352 89.6056 12.5904 89.932 12.1008C90.268 11.6112 90.436 10.9296 90.436 10.056C90.436 9.1728 90.268 8.496 89.932 8.0256C89.596 7.5456 89.068 7.3056 88.348 7.3056C87.628 7.3056 87.1048 7.5456 86.7784 8.0256C86.452 8.496 86.2888 9.1728 86.2888 10.056ZM100.622 6.1824V13.944H99.3982L99.1822 12.9216H99.1102C98.8606 13.3248 98.515 13.6224 98.0734 13.8144C97.6318 13.9968 97.1662 14.088 96.6766 14.088C95.7646 14.088 95.0686 13.8624 94.5886 13.4112C94.1086 12.96 93.8686 12.2448 93.8686 11.2656V6.1824H95.4094V11.0352C95.4094 12.2352 95.9326 12.8352 96.979 12.8352C97.7758 12.8352 98.3278 12.6 98.635 12.1296C98.9422 11.6592 99.0958 10.9872 99.0958 10.1136V6.1824H100.622ZM108.166 11.7552C108.166 12.5136 107.888 13.0944 107.331 13.4976C106.774 13.8912 106.001 14.088 105.013 14.088C104.465 14.088 103.995 14.0448 103.601 13.9584C103.217 13.8816 102.862 13.7664 102.536 13.6128V12.2736C102.872 12.4368 103.265 12.5856 103.717 12.72C104.177 12.8448 104.624 12.9072 105.056 12.9072C105.632 12.9072 106.045 12.816 106.294 12.6336C106.553 12.4512 106.683 12.2064 106.683 11.8992C106.683 11.7264 106.635 11.5728 106.539 11.4384C106.443 11.2944 106.261 11.1504 105.992 11.0064C105.733 10.8528 105.349 10.68 104.84 10.488C104.341 10.2864 103.918 10.0896 103.572 9.8976C103.236 9.696 102.977 9.4608 102.795 9.192C102.613 8.9136 102.521 8.5584 102.521 8.1264C102.521 7.4544 102.79 6.9408 103.328 6.5856C103.875 6.2208 104.595 6.0384 105.488 6.0384C105.958 6.0384 106.4 6.0864 106.813 6.1824C107.235 6.2784 107.643 6.4128 108.037 6.5856L107.533 7.752C107.197 7.608 106.851 7.488 106.496 7.392C106.141 7.2864 105.78 7.2336 105.416 7.2336C104.955 7.2336 104.604 7.3056 104.364 7.4496C104.124 7.5936 104.004 7.7952 104.004 8.0544C104.004 8.2368 104.062 8.3952 104.177 8.5296C104.293 8.664 104.484 8.7984 104.753 8.9328C105.032 9.0672 105.411 9.2304 105.891 9.4224C106.371 9.6048 106.779 9.792 107.115 9.984C107.461 10.176 107.72 10.4112 107.893 10.6896C108.075 10.968 108.166 11.3232 108.166 11.7552ZM113.039 6.0384C114.056 6.0384 114.858 6.3552 115.444 6.9888C116.029 7.6128 116.322 8.4672 116.322 9.552V10.3872H111.109C111.128 11.184 111.335 11.7936 111.728 12.216C112.132 12.6384 112.693 12.8496 113.413 12.8496C113.912 12.8496 114.354 12.8064 114.738 12.72C115.132 12.624 115.535 12.4848 115.948 12.3024V13.5696C115.554 13.7424 115.16 13.872 114.767 13.9584C114.373 14.0448 113.903 14.088 113.356 14.088C112.597 14.088 111.93 13.9392 111.354 13.6416C110.788 13.344 110.341 12.9024 110.015 12.3168C109.698 11.7216 109.54 10.992 109.54 10.128C109.54 9.2544 109.684 8.5152 109.972 7.9104C110.269 7.3056 110.677 6.8448 111.196 6.528C111.724 6.2016 112.338 6.0384 113.039 6.0384ZM113.039 7.2192C112.492 7.2192 112.05 7.3968 111.714 7.752C111.388 8.1072 111.196 8.6112 111.138 9.264H114.796C114.786 8.6592 114.637 8.1696 114.349 7.7952C114.071 7.4112 113.634 7.2192 113.039 7.2192Z"
fill="#151515"
/>
<path
d="M72.3014 20.9363H71.1934C71.1508 20.6996 71.0715 20.4912 70.9555 20.3113C70.8395 20.1314 70.6975 19.9787 70.5294 19.8532C70.3613 19.7278 70.1731 19.6331 69.9648 19.5691C69.7588 19.5052 69.5398 19.4733 69.3078 19.4733C68.8888 19.4733 68.5135 19.5786 68.1821 19.7893C67.853 20 67.5926 20.309 67.4008 20.7162C67.2114 21.1233 67.1167 21.6205 67.1167 22.2076C67.1167 22.7995 67.2114 23.299 67.4008 23.7062C67.5926 24.1134 67.8542 24.4212 68.1856 24.6295C68.5171 24.8378 68.8899 24.942 69.3042 24.942C69.5339 24.942 69.7517 24.9112 69.9577 24.8497C70.166 24.7858 70.3542 24.6922 70.5223 24.5691C70.6904 24.446 70.8324 24.2957 70.9484 24.1181C71.0668 23.9382 71.1485 23.7323 71.1934 23.5002L72.3014 23.5038C72.2422 23.8613 72.1274 24.1903 71.9569 24.491C71.7889 24.7893 71.5722 25.0474 71.3071 25.2652C71.0443 25.4806 70.7436 25.6475 70.4051 25.7659C70.0666 25.8842 69.6972 25.9434 69.2971 25.9434C68.6674 25.9434 68.1063 25.7943 67.6139 25.496C67.1215 25.1953 66.7332 24.7656 66.4491 24.2069C66.1674 23.6482 66.0265 22.9818 66.0265 22.2076C66.0265 21.4311 66.1686 20.7647 66.4527 20.2083C66.7368 19.6496 67.125 19.2211 67.6175 18.9228C68.1099 18.6222 68.6698 18.4718 69.2971 18.4718C69.683 18.4718 70.0429 18.5275 70.3767 18.6387C70.7129 18.7476 71.0147 18.9086 71.2822 19.1217C71.5497 19.3324 71.7711 19.5904 71.9463 19.8958C72.1215 20.1989 72.2398 20.5457 72.3014 20.9363ZM74.591 18.5713V25.844H73.5292V18.5713H74.591ZM78.317 25.9541C77.8057 25.9541 77.3594 25.8369 76.9782 25.6025C76.5971 25.3681 76.3012 25.0403 76.0905 24.6189C75.8798 24.1975 75.7744 23.705 75.7744 23.1416C75.7744 22.5758 75.8798 22.081 76.0905 21.6572C76.3012 21.2334 76.5971 20.9044 76.9782 20.67C77.3594 20.4356 77.8057 20.3184 78.317 20.3184C78.8284 20.3184 79.2747 20.4356 79.6558 20.67C80.037 20.9044 80.3329 21.2334 80.5436 21.6572C80.7543 22.081 80.8596 22.5758 80.8596 23.1416C80.8596 23.705 80.7543 24.1975 80.5436 24.6189C80.3329 25.0403 80.037 25.3681 79.6558 25.6025C79.2747 25.8369 78.8284 25.9541 78.317 25.9541ZM78.3206 25.0627C78.652 25.0627 78.9266 24.9751 79.1444 24.8C79.3622 24.6248 79.5232 24.3916 79.6274 24.1004C79.7339 23.8092 79.7872 23.4884 79.7872 23.138C79.7872 22.79 79.7339 22.4704 79.6274 22.1792C79.5232 21.8857 79.3622 21.6501 79.1444 21.4725C78.9266 21.295 78.652 21.2062 78.3206 21.2062C77.9868 21.2062 77.7098 21.295 77.4896 21.4725C77.2718 21.6501 77.1096 21.8857 77.0031 22.1792C76.8989 22.4704 76.8469 22.79 76.8469 23.138C76.8469 23.4884 76.8989 23.8092 77.0031 24.1004C77.1096 24.3916 77.2718 24.6248 77.4896 24.8C77.7098 24.9751 77.9868 25.0627 78.3206 25.0627ZM85.5001 23.5819V20.3894H86.5654V25.844H85.5214V24.8994H85.4646C85.3391 25.1906 85.1379 25.4332 84.8609 25.6274C84.5863 25.8191 84.2442 25.915 83.8346 25.915C83.4842 25.915 83.1741 25.8381 82.9042 25.6842C82.6367 25.5279 82.426 25.2971 82.2721 24.9917C82.1206 24.6863 82.0448 24.3087 82.0448 23.8589V20.3894H83.1066V23.7311C83.1066 24.1028 83.2096 24.3987 83.4156 24.6189C83.6215 24.839 83.8891 24.9491 84.2181 24.9491C84.417 24.9491 84.6147 24.8994 84.8112 24.8C85.01 24.7005 85.1746 24.5502 85.3048 24.349C85.4374 24.1477 85.5025 23.8921 85.5001 23.5819ZM90.034 25.9505C89.5937 25.9505 89.2007 25.8381 88.855 25.6132C88.5117 25.3859 88.2419 25.0627 88.0454 24.6437C87.8512 24.2223 87.7542 23.7169 87.7542 23.1274C87.7542 22.5379 87.8524 22.0336 88.0489 21.6146C88.2478 21.1956 88.52 20.8748 88.8657 20.6522C89.2113 20.4297 89.6031 20.3184 90.0411 20.3184C90.3796 20.3184 90.6519 20.3752 90.8579 20.4889C91.0662 20.6001 91.2272 20.7304 91.3408 20.8795C91.4568 21.0287 91.5468 21.16 91.6107 21.2737H91.6746V18.5713H92.7364V25.844H91.6995V24.9953H91.6107C91.5468 25.1113 91.4545 25.2439 91.3337 25.393C91.2153 25.5421 91.052 25.6724 90.8437 25.7836C90.6353 25.8949 90.3654 25.9505 90.034 25.9505ZM90.2684 25.045C90.5738 25.045 90.8318 24.9645 91.0425 24.8035C91.2556 24.6402 91.4166 24.4141 91.5255 24.1252C91.6367 23.8364 91.6924 23.5002 91.6924 23.1167C91.6924 22.7379 91.6379 22.4065 91.529 22.1224C91.4201 21.8383 91.2603 21.617 91.0496 21.4583C90.8389 21.2997 90.5785 21.2204 90.2684 21.2204C89.9488 21.2204 89.6824 21.3033 89.4694 21.469C89.2563 21.6347 89.0953 21.8608 88.9864 22.1473C88.8799 22.4337 88.8266 22.7569 88.8266 23.1167C88.8266 23.4813 88.8811 23.8092 88.99 24.1004C89.0989 24.3916 89.2599 24.6224 89.4729 24.7929C89.6884 24.9609 89.9535 25.045 90.2684 25.045Z"
fill="black"
/>
<path
d="M20.5001 0C14.0001 0 10.5001 4 8.50013 9.5C4.50013 9.5 0.000244141 14 0.500132 20C0.832239 23.9862 4.00025 28.5 9.00013 28.5H33.5001C37.0001 28.5 40.5001 25.5 40.5001 21C40.5001 16 37.0001 13 33.5001 13C33.5001 5 28.0001 0 20.5001 0Z"
fill="#F9FF69"
/>
<path
d="M20.5 0.25C24.1939 0.25 27.3789 1.48007 29.6387 3.67871C31.8973 5.87634 33.25 9.05948 33.25 13V13.25H33.5C36.8511 13.25 40.25 16.127 40.25 21C40.25 25.3619 36.8619 28.25 33.5 28.25H9C4.17148 28.2499 1.07423 23.8816 0.749023 19.9795C0.504837 17.0486 1.482 14.4876 3.00488 12.6602C4.53166 10.828 6.59092 9.75005 8.5 9.75H8.6748L8.73535 9.58496C9.7269 6.85838 11.0823 4.52586 12.9766 2.87598C14.8656 1.23067 17.3065 0.250027 20.5 0.25Z"
stroke="#151515"
stroke-opacity="0.1"
stroke-width="0.5"
/>
<path
d="M14 8.66955C14 8.57707 14.0771 8.5 14.1696 8.5H15.4643C15.5568 8.5 15.6338 8.57707 15.6338 8.66955V23.0505C15.6338 23.143 15.5568 23.22 15.4643 23.22H14.1696C14.0771 23.22 14 23.143 14 23.0505V8.66955Z"
fill="#161616"
/>
<path
d="M17.2676 8.66955C17.2676 8.57707 17.3446 8.5 17.4371 8.5H18.7319C18.8244 8.5 18.9014 8.57707 18.9014 8.66955V23.0505C18.9014 23.143 18.8244 23.22 18.7319 23.22H17.4371C17.3446 23.22 17.2676 23.143 17.2676 23.0505V8.66955Z"
fill="#161616"
/>
<path
d="M20.5352 8.66955C20.5352 8.57707 20.6122 8.5 20.7047 8.5H21.9995C22.0919 8.5 22.169 8.57707 22.169 8.66955V23.0505C22.169 23.143 22.0919 23.22 21.9995 23.22H20.7047C20.6122 23.22 20.5352 23.143 20.5352 23.0505V8.66955Z"
fill="#161616"
/>
<path
d="M23.8184 8.66955C23.8184 8.57707 23.8954 8.5 23.9879 8.5H25.2827C25.3751 8.5 25.4522 8.57707 25.4522 8.66955V23.0505C25.4522 23.143 25.3751 23.22 25.2827 23.22H23.9879C23.8954 23.22 23.8184 23.143 23.8184 23.0505V8.66955Z"
fill="#161616"
/>
<path
d="M27.0859 14.4034C27.0859 14.3109 27.163 14.2339 27.2555 14.2339H28.5502C28.6427 14.2339 28.7198 14.3109 28.7198 14.4034V17.332C28.7198 17.4245 28.6427 17.5016 28.5502 17.5016H27.2555C27.163 17.5016 27.0859 17.4245 27.0859 17.332V14.4034Z"
fill="#161616"
/>
</svg>
28 changes: 19 additions & 9 deletions web-common/src/features/connectors/code-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,18 @@ driver: ${getDriverNameForConnector(connector.name as string)}`;
properties = properties.filter(options.fieldFilter);
}

// Get the secret property keys
// Get the secret property keys from the properties being used (orderedProperties or configProperties)
const propertiesForTypeChecking =
options?.orderedProperties ?? connector.configProperties ?? [];
const secretPropertyKeys =
connector.configProperties
?.filter((property) => property.secret)
propertiesForTypeChecking
.filter((property) => property.secret)
.map((property) => property.key) || [];

// Get the string property keys
// Get the string property keys from the properties being used
const stringPropertyKeys =
connector.configProperties
?.filter(
propertiesForTypeChecking
.filter(
(property) => property.type === ConnectorDriverPropertyType.TYPE_STRING,
)
.map((property) => property.key) || [];
Expand All @@ -81,6 +83,12 @@ driver: ${getDriverNameForConnector(connector.name as string)}`;
.filter((property) => {
if (!property.key) return false;
const value = formValues[property.key];

// Secret fields should be shown with env variable placeholder if they exist in formValues
// Don't include secrets that weren't provided (e.g., password when using DSN)
const isSecretProperty = secretPropertyKeys.includes(property.key);
if (isSecretProperty && value !== undefined) return true;

if (value === undefined) return false;
// Filter out empty strings for optional fields
if (typeof value === "string" && value.trim() === "") return false;
Expand All @@ -96,7 +104,7 @@ driver: ${getDriverNameForConnector(connector.name as string)}`;
})
.map((property) => {
const key = property.key as string;
const value = formValues[key] as string;
const value = formValues[key];

const isSecretProperty = secretPropertyKeys.includes(key);
if (isSecretProperty) {
Expand All @@ -107,12 +115,14 @@ driver: ${getDriverNameForConnector(connector.name as string)}`;
)} }}"`;
}

// At this point, value is guaranteed to be defined due to the filter above
const stringValue = value as string;
const isStringProperty = stringPropertyKeys.includes(key);
if (isStringProperty) {
return `${key}: "${value}"`;
return `${key}: "${stringValue}"`;
}

return `${key}: ${value}`;
return `${key}: ${stringValue}`;
})
.join("\n");

Expand Down
Loading
Loading