fix(Designer): Added connection name check to avoid known connection …

…name strings (#4104) Will avoid checking for known connection name strings
Azure · Feb 2, 2024 · 3fc73e5 · 3fc73e5
1 parent 213b5f0
commit 3fc73e5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/libs/services/designer-client-services/src/lib/base/connection.ts b/libs/services/designer-client-services/src/lib/base/connection.ts
@@ -336,25 +336,24 @@ export abstract class BaseConnectionService implements IConnectionService {
   async getUniqueConnectionName(connectorId: string, connectionNames: string[], connectorName: string): Promise<string> {
     const { name: connectionName, index } = getUniqueName(connectionNames, connectorName);
     return isArmResourceId(connectorId)
-      ? this._getUniqueConnectionNameInApiHub(connectorName, connectorId, connectionName, index)
+      ? this._getUniqueConnectionNameInApiHub(connectorName, connectorId, connectionName, index, connectionNames)
       : connectionName;
   }
 
   protected async _getUniqueConnectionNameInApiHub(
     connectorName: string,
     connectorId: string,
     connectionName: string,
-    i: number
+    i: number,
+    connectionNames: string[] = []
   ): Promise<string> {
-    const connectionId = this.getAzureConnectionRequestPath(connectionName);
-    const isUnique = await this._testConnectionIdUniquenessInApiHub(connectionId);
-
-    if (isUnique) {
-      return connectionName;
-    } else {
-      connectionName = `${connectorName}-${i++}`;
-      return this._getUniqueConnectionNameInApiHub(connectorName, connectorId, connectionName, i);
+    if (!connectionNames.includes(connectionName)) {
+      const connectionId = this.getAzureConnectionRequestPath(connectionName);
+      const isUnique = await this._testConnectionIdUniquenessInApiHub(connectionId);
+      if (isUnique) return connectionName;
     }
+    connectionName = `${connectorName}-${++i}`;
+    return this._getUniqueConnectionNameInApiHub(connectorName, connectorId, connectionName, i, connectionNames);
   }
 
   protected _testConnectionIdUniquenessInApiHub(id: string): Promise<boolean> {

diff --git a/libs/utils/src/lib/helpers/connections.ts b/libs/utils/src/lib/helpers/connections.ts
@@ -204,7 +204,7 @@ function _isConnectionParameterHidden(connectionParameter: ConnectionParameter):
 export const getUniqueName = (keys: string[], prefix: string): { name: string; index: number } => {
   const set = new Set(keys.map((name) => name.split('::')[0]));
 
-  let index = 1;
+  let index = 0;
   let name = prefix;
   while (set.has(name)) {
     name = `${prefix}-${++index}`;