Show dataset sources with the same hash and different title (#1959)

datalens-tech · Dec 19, 2024 · c6a6faf · c6a6faf
1 parent dc0c3a5
commit c6a6faf
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/src/ui/units/datasets/store/selectors/dataset.ts b/src/ui/units/datasets/store/selectors/dataset.ts
@@ -97,6 +97,13 @@ export const connectionsSelector = (state: DatalensGlobalState) => {
     });
 };
 
+const getSourceHashTitleId = <T extends {parameter_hash: string; title: string}>({
+    parameter_hash,
+    title,
+}: T) => {
+    return `${parameter_hash}-${title}`;
+};
+
 export const sourcePrototypesSelector = (state: DatalensGlobalState) => {
     const {
         sourcePrototypes = [],
@@ -105,31 +112,30 @@ export const sourcePrototypesSelector = (state: DatalensGlobalState) => {
 
     const availableSourcesMap = new Map(
         sourcePrototypes.map((source) => {
-            const {parameter_hash: parameterHash} = source;
-
             return [
-                parameterHash,
+                getSourceHashTitleId(source),
                 source as
                     | BaseSource
                     | {id?: string; isSource?: boolean; isConnectedWithAvatar?: boolean},
             ];
         }),
     );
+
     const availableSourceAvatars = sourceAvatars.map(({source_id: sourceId}) => sourceId);
 
     sources.filter(DatasetUtils.filterVirtual).forEach((source) => {
-        const {parameter_hash: parameterHash, id: sourceId} = source;
-
-        const sourcePrototype = availableSourcesMap.get(parameterHash);
+        const {id: sourceId} = source;
+        const sourceHashTitleId = getSourceHashTitleId(source);
+        const sourcePrototype = availableSourcesMap.get(sourceHashTitleId);
 
         if (sourcePrototype) {
-            availableSourcesMap.set(parameterHash, {
+            availableSourcesMap.set(sourceHashTitleId, {
                 ...sourcePrototype,
                 id: sourceId,
                 isSource: true,
             });
         } else {
-            availableSourcesMap.set(parameterHash, {
+            availableSourcesMap.set(sourceHashTitleId, {
                 ...source,
                 isSource: true,
                 isConnectedWithAvatar: availableSourceAvatars.includes(sourceId),