Skip to content

Commit 21cf5d2

Browse files
committed
replace default integration name placeholder
1 parent af1f151 commit 21cf5d2

22 files changed

+88
-88
lines changed

src/messageTypes.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@ export type LocalizedMessages = {
444444
integrationsRequiredField: string;
445445
integrationsOptionalField: string;
446446
integrationsUnnamedIntegration: string;
447+
integrationsDefaultName: string;
447448
integrationsUnsupportedIntegrationType: string;
448449
// Select input settings strings
449450
selectInputSettingsTitle: string;

src/notebooks/deepnote/integrations/integrationWebview.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ export class IntegrationWebviewProvider implements IIntegrationWebviewProvider {
375375
integrationsCaCertificateText: localize.Integrations.caCertificateText,
376376
integrationsCaCertificateTextPlaceholder: localize.Integrations.caCertificateTextPlaceholder,
377377
integrationsUnnamedIntegration: localize.Integrations.unnamedIntegration('{0}'),
378+
integrationsDefaultName: localize.Integrations.defaultName('{0}'),
378379
integrationsUnsupportedIntegrationType: localize.Integrations.unsupportedIntegrationType('{0}')
379380
};
380381

src/platform/common/utils/localize.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,7 @@ export namespace Integrations {
833833
export const requiredField = l10n.t('*');
834834
export const optionalField = l10n.t('(optional)');
835835
export const unnamedIntegration = (id: string) => l10n.t('Unnamed Integration ({0})', id);
836+
export const defaultName = (type: string) => l10n.t('My {0} integration', type);
836837
export const unsupportedIntegrationType = (type: string) => l10n.t('Unsupported integration type: {0}', type);
837838

838839
// Integration type labels

src/webviews/webview-side/integrations/AlloyDBForm.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import * as React from 'react';
2-
import { format, getLocString } from '../react-common/locReactSide';
2+
import { getLocString } from '../react-common/locReactSide';
33
import { DatabaseIntegrationConfig } from '@deepnote/database-integrations';
44
import { SshOptionsFields } from './SshOptionsFields';
55
import { CaCertificateFields } from './CaCertificateFields';
6+
import { getDefaultIntegrationName } from './integrationUtils';
67

78
export interface IAlloyDBFormProps {
89
integrationId: string;
@@ -16,11 +17,9 @@ function createEmptyAlloyDBConfig(params: {
1617
id: string;
1718
name?: string;
1819
}): Extract<DatabaseIntegrationConfig, { type: 'alloydb' }> {
19-
const unnamedIntegration = getLocString('integrationsUnnamedIntegration', 'Unnamed Integration ({0})');
20-
2120
return {
2221
id: params.id,
23-
name: (params.name || format(unnamedIntegration, params.id)).trim(),
22+
name: (params.name || getDefaultIntegrationName('alloydb')).trim(),
2423
type: 'alloydb',
2524
metadata: {
2625
host: '',

src/webviews/webview-side/integrations/AthenaForm.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
import * as React from 'react';
2-
import { format, getLocString } from '../react-common/locReactSide';
2+
import { getLocString } from '../react-common/locReactSide';
33
import { DatabaseIntegrationConfig } from '@deepnote/database-integrations';
4+
import { getDefaultIntegrationName } from './integrationUtils';
45

56
function createEmptyAthenaConfig(params: {
67
id: string;
78
name?: string;
89
}): Extract<DatabaseIntegrationConfig, { type: 'athena' }> {
9-
const unnamedIntegration = getLocString('integrationsUnnamedIntegration', 'Unnamed Integration ({0})');
10-
1110
return {
1211
id: params.id,
13-
name: (params.name || format(unnamedIntegration, params.id)).trim(),
12+
name: (params.name || getDefaultIntegrationName('athena')).trim(),
1413
type: 'athena',
1514
metadata: {
1615
access_key_id: '',

src/webviews/webview-side/integrations/BigQueryForm.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import * as React from 'react';
22
import { format, getLocString } from '../react-common/locReactSide';
33
import { BigQueryAuthMethods, DatabaseIntegrationConfig } from '@deepnote/database-integrations';
4+
import { getDefaultIntegrationName } from './integrationUtils';
45

56
type BigQueryConfig = Extract<DatabaseIntegrationConfig, { type: 'big-query' }>;
67

78
function createEmptyBigQueryConfig(params: { id: string; name?: string }): BigQueryConfig {
8-
const unnamedIntegration = getLocString('integrationsUnnamedIntegration', 'Unnamed Integration ({0})');
9-
109
return {
1110
id: params.id,
12-
name: (params.name || format(unnamedIntegration, params.id)).trim(),
11+
name: (params.name || getDefaultIntegrationName('big-query')).trim(),
1312
type: 'big-query',
1413
metadata: {
1514
authMethod: BigQueryAuthMethods.ServiceAccount,

src/webviews/webview-side/integrations/ClickHouseForm.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import * as React from 'react';
2-
import { format, getLocString } from '../react-common/locReactSide';
2+
import { getLocString } from '../react-common/locReactSide';
33
import { DatabaseIntegrationConfig } from '@deepnote/database-integrations';
44
import { SshOptionsFields } from './SshOptionsFields';
55
import { CaCertificateFields } from './CaCertificateFields';
6+
import { getDefaultIntegrationName } from './integrationUtils';
67

78
export interface IClickHouseFormProps {
89
integrationId: string;
@@ -16,11 +17,9 @@ function createEmptyClickHouseConfig(params: {
1617
id: string;
1718
name?: string;
1819
}): Extract<DatabaseIntegrationConfig, { type: 'clickhouse' }> {
19-
const unnamedIntegration = getLocString('integrationsUnnamedIntegration', 'Unnamed Integration ({0})');
20-
2120
return {
2221
id: params.id,
23-
name: (params.name || format(unnamedIntegration, params.id)).trim(),
22+
name: (params.name || getDefaultIntegrationName('clickhouse')).trim(),
2423
type: 'clickhouse',
2524
metadata: {
2625
host: '',

src/webviews/webview-side/integrations/ConfigurationForm.tsx

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,7 @@ import { SpannerForm } from './SpannerForm';
1818
import { SQLServerForm } from './SQLServerForm';
1919
import { TrinoForm } from './TrinoForm';
2020
import { ConfigurableDatabaseIntegrationConfig, ConfigurableDatabaseIntegrationType } from './types';
21-
22-
// Localized labels for integration types (duplicated from sqlCellStatusBarProvider.ts due to import restrictions)
23-
const integrationTypeLabels: Record<ConfigurableDatabaseIntegrationType, string> = {
24-
alloydb: 'AlloyDB',
25-
athena: 'Amazon Athena',
26-
'big-query': 'BigQuery',
27-
clickhouse: 'ClickHouse',
28-
databricks: 'Databricks',
29-
dremio: 'Dremio',
30-
mariadb: 'MariaDB',
31-
materialize: 'Materialize',
32-
mindsdb: 'MindsDB',
33-
mongodb: 'MongoDB',
34-
mysql: 'MySQL',
35-
pgsql: 'PostgreSQL',
36-
redshift: 'Amazon Redshift',
37-
snowflake: 'Snowflake',
38-
spanner: 'Google Cloud Spanner',
39-
'sql-server': 'SQL Server',
40-
trino: 'Trino'
41-
};
21+
import { integrationTypeLabels } from './integrationUtils';
4222

4323
export interface IConfigurationFormProps {
4424
integrationId: string;

src/webviews/webview-side/integrations/DatabricksForm.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import * as React from 'react';
2-
import { format, getLocString } from '../react-common/locReactSide';
2+
import { getLocString } from '../react-common/locReactSide';
33
import { DatabaseIntegrationConfig } from '@deepnote/database-integrations';
44
import { SshOptionsFields } from './SshOptionsFields';
5+
import { getDefaultIntegrationName } from './integrationUtils';
56

67
function createEmptyDatabricksConfig(params: {
78
id: string;
89
name?: string;
910
}): Extract<DatabaseIntegrationConfig, { type: 'databricks' }> {
10-
const unnamedIntegration = getLocString('integrationsUnnamedIntegration', 'Unnamed Integration ({0})');
11-
1211
return {
1312
id: params.id,
14-
name: (params.name || format(unnamedIntegration, params.id)).trim(),
13+
name: (params.name || getDefaultIntegrationName('databricks')).trim(),
1514
type: 'databricks',
1615
metadata: {
1716
host: '',

src/webviews/webview-side/integrations/DremioForm.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import * as React from 'react';
2-
import { format, getLocString } from '../react-common/locReactSide';
2+
import { getLocString } from '../react-common/locReactSide';
33
import { DatabaseIntegrationConfig } from '@deepnote/database-integrations';
44
import { SshOptionsFields } from './SshOptionsFields';
5+
import { getDefaultIntegrationName } from './integrationUtils';
56

67
function createEmptyDremioConfig(params: {
78
id: string;
89
name?: string;
910
}): Extract<DatabaseIntegrationConfig, { type: 'dremio' }> {
10-
const unnamedIntegration = getLocString('integrationsUnnamedIntegration', 'Unnamed Integration ({0})');
11-
1211
return {
1312
id: params.id,
14-
name: (params.name || format(unnamedIntegration, params.id)).trim(),
13+
name: (params.name || getDefaultIntegrationName('dremio')).trim(),
1514
type: 'dremio',
1615
metadata: {
1716
host: '',

0 commit comments

Comments
 (0)