conslidate unnamed integration strings

Author: jankuca

src/messageTypes.ts

@@ -231,10 +231,10 @@ export type LocalizedMessages = {
     integrationsSnowflakeRolePlaceholder: string;
     integrationsSnowflakeWarehouseLabel: string;
     integrationsSnowflakeWarehousePlaceholder: string;
-    integrationsSnowflakeUnnamedIntegration: string;
     // Common form strings
     integrationsRequiredField: string;
     integrationsOptionalField: string;
+    integrationsUnnamedIntegration: string;
 };
 // Map all messages to specific payloads
 export class IInteractiveWindowMapping {

src/notebooks/deepnote/integrations/integrationWebview.ts

@@ -181,7 +181,8 @@ export class IntegrationWebviewProvider implements IIntegrationWebviewProvider {
             integrationsSnowflakeRoleLabel: localize.Integrations.snowflakeRoleLabel,
             integrationsSnowflakeRolePlaceholder: localize.Integrations.snowflakeRolePlaceholder,
             integrationsSnowflakeWarehouseLabel: localize.Integrations.snowflakeWarehouseLabel,
-            integrationsSnowflakeWarehousePlaceholder: localize.Integrations.snowflakeWarehousePlaceholder
+            integrationsSnowflakeWarehousePlaceholder: localize.Integrations.snowflakeWarehousePlaceholder,
+            integrationsUnnamedIntegration: localize.Integrations.unnamedIntegration('{0}')
         };
 
         await this.currentPanel.webview.postMessage({

src/platform/common/utils/localize.ts

@@ -830,6 +830,7 @@ export namespace Integrations {
     export const save = l10n.t('Save');
     export const requiredField = l10n.t('*');
     export const optionalField = l10n.t('(optional)');
+    export const unnamedIntegration = (id: string) => l10n.t('Unnamed Integration ({0})', id);
 
     // Integration type labels
     export const postgresTypeLabel = l10n.t('PostgreSQL');
@@ -850,7 +851,6 @@ export namespace Integrations {
     export const postgresPasswordLabel = l10n.t('Password');
     export const postgresPasswordPlaceholder = l10n.t('••••••••');
     export const postgresSslLabel = l10n.t('Use SSL');
-    export const postgresUnnamedIntegration = (id: string) => l10n.t('Unnamed PostgreSQL Integration ({0})', id);
 
     // BigQuery form strings
     export const bigQueryNameLabel = l10n.t('Name (optional)');
@@ -861,7 +861,6 @@ export namespace Integrations {
     export const bigQueryCredentialsPlaceholder = l10n.t('{"type": "service_account", ...}');
     export const bigQueryCredentialsRequired = l10n.t('Credentials are required');
     export const bigQueryInvalidJson = (message: string) => l10n.t('Invalid JSON: {0}', message);
-    export const bigQueryUnnamedIntegration = (id: string) => l10n.t('Unnamed BigQuery Integration ({0})', id);
 
     // Snowflake form strings
     export const snowflakeNameLabel = l10n.t('Name (optional)');
@@ -899,7 +898,6 @@ export namespace Integrations {
     export const snowflakeRolePlaceholder = l10n.t('');
     export const snowflakeWarehouseLabel = l10n.t('Warehouse (optional)');
     export const snowflakeWarehousePlaceholder = l10n.t('');
-    export const snowflakeUnnamedIntegration = (id: string) => l10n.t('Unnamed Snowflake Integration ({0})', id);
 }
 
 export namespace Deprecated {

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

@@ -71,11 +71,11 @@ export const BigQueryForm: React.FC<IBigQueryFormProps> = ({
             return;
         }
 
-        const unnamedIntegration = format('Unnamed BigQuery Integration ({0})', integrationId);
+        const unnamedIntegration = getLocString('integrationsUnnamedIntegration', 'Unnamed Integration ({0})');
 
         const config: BigQueryIntegrationConfig = {
             id: integrationId,
-            name: (name || unnamedIntegration).trim(),
+            name: (name || format(unnamedIntegration, integrationId)).trim(),
             type: 'bigquery',
             projectId: projectId.trim(),
             credentials: trimmedCredentials

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

@@ -49,11 +49,11 @@ export const PostgresForm: React.FC<IPostgresFormProps> = ({
     const handleSubmit = (e: React.FormEvent) => {
         e.preventDefault();
 
-        const unnamedIntegration = format('Unnamed PostgreSQL Integration ({0})', integrationId);
+        const unnamedIntegration = getLocString('integrationsUnnamedIntegration', 'Unnamed Integration ({0})');
 
         const config: PostgresIntegrationConfig = {
             id: integrationId,
-            name: (name || unnamedIntegration).trim(),
+            name: (name || format(unnamedIntegration, integrationId)).trim(),
             type: 'postgres',
             host,
             port: parseInt(port, 10),

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

@@ -107,10 +107,7 @@ export const SnowflakeForm: React.FC<ISnowflakeFormProps> = ({
     const handleSubmit = (e: React.FormEvent) => {
         e.preventDefault();
 
-        const unnamedIntegration = getLocString(
-            'integrationsSnowflakeUnnamedIntegration',
-            'Unnamed Snowflake Integration ({0})'
-        );
+        const unnamedIntegration = getLocString('integrationsUnnamedIntegration', 'Unnamed Integration ({0})');
 
         let config: SnowflakeIntegrationConfig;