Skip to content

Commit e0445f6

Browse files
committed
fix(mermaid): show duplicated chaincodes by including channel name in node ID
Signed-off-by: OsamaRab3 <osrab3@gmail.com>
1 parent d91902b commit e0445f6

10 files changed

+14
-14
lines changed

e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-k8s.json.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ classDef subgraph_padding fill:none,stroke:none
587587
588588
subgraph channel_my_channel1 [Channel: my-channel1]
589589
subgraph channel_my_channel1_padding [ ]
590-
chaincode_chaincode1[[Chaincode: chaincode1]]
590+
chaincode_chaincode1_my_channel1[[Chaincode: chaincode1]]
591591
end
592592
class channel_my_channel1_padding subgraph_padding
593593
end

e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3567,7 +3567,7 @@ classDef subgraph_padding fill:none,stroke:none
35673567
35683568
subgraph channel_my_channel1 [Channel: my-channel1]
35693569
subgraph channel_my_channel1_padding [ ]
3570-
chaincode_chaincode1[[Chaincode: chaincode1]]
3570+
chaincode_chaincode1_my_channel1[[Chaincode: chaincode1]]
35713571
end
35723572
class channel_my_channel1_padding subgraph_padding
35733573
end

e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3629,7 +3629,7 @@ classDef subgraph_padding fill:none,stroke:none
36293629
36303630
subgraph channel_my_channel1 [Channel: my-channel1]
36313631
subgraph channel_my_channel1_padding [ ]
3632-
chaincode_chaincode1[[Chaincode: chaincode1]]
3632+
chaincode_chaincode1_my_channel1[[Chaincode: chaincode1]]
36333633
end
36343634
class channel_my_channel1_padding subgraph_padding
36353635
end

e2e/__snapshots__/fablo-config-hlf2-1org-2chaincode-raft-ccaas.json.test.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3813,14 +3813,14 @@ classDef subgraph_padding fill:none,stroke:none
38133813
38143814
subgraph channel_my_channel1 [Channel: my-channel1]
38153815
subgraph channel_my_channel1_padding [ ]
3816-
chaincode_chaincode1[[Chaincode: chaincode1]]
3816+
chaincode_chaincode1_my_channel1[[Chaincode: chaincode1]]
38173817
end
38183818
class channel_my_channel1_padding subgraph_padding
38193819
end
38203820
38213821
subgraph channel_my_channel2 [Channel: my-channel2]
38223822
subgraph channel_my_channel2_padding [ ]
3823-
chaincode_chaincode1[[Chaincode: chaincode1]]
3823+
chaincode_chaincode1_my_channel2[[Chaincode: chaincode1]]
38243824
end
38253825
class channel_my_channel2_padding subgraph_padding
38263826
end

e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4595,8 +4595,8 @@ classDef subgraph_padding fill:none,stroke:none
45954595
45964596
subgraph channel_my_channel1 [Channel: my-channel1]
45974597
subgraph channel_my_channel1_padding [ ]
4598-
chaincode_or_policy_chaincode[[Chaincode: or-policy-chaincode]]
4599-
chaincode_and_policy_chaincode[[Chaincode: and-policy-chaincode]]
4598+
chaincode_or_policy_chaincode_my_channel1[[Chaincode: or-policy-chaincode]]
4599+
chaincode_and_policy_chaincode_my_channel1[[Chaincode: and-policy-chaincode]]
46004600
end
46014601
class channel_my_channel1_padding subgraph_padding
46024602
end

e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6579,7 +6579,7 @@ classDef subgraph_padding fill:none,stroke:none
65796579
65806580
subgraph channel_my_channel1 [Channel: my-channel1]
65816581
subgraph channel_my_channel1_padding [ ]
6582-
chaincode_chaincode1[[Chaincode: chaincode1]]
6582+
chaincode_chaincode1_my_channel1[[Chaincode: chaincode1]]
65836583
end
65846584
class channel_my_channel1_padding subgraph_padding
65856585
end
@@ -6594,7 +6594,7 @@ classDef subgraph_padding fill:none,stroke:none
65946594
65956595
subgraph channel_my_channel3 [Channel: my-channel3]
65966596
subgraph channel_my_channel3_padding [ ]
6597-
chaincode_chaincode2[[Chaincode: chaincode2]]
6597+
chaincode_chaincode2_my_channel3[[Chaincode: chaincode2]]
65986598
end
65996599
class channel_my_channel3_padding subgraph_padding
66006600
end

e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7193,7 +7193,7 @@ classDef subgraph_padding fill:none,stroke:none
71937193
71947194
subgraph channel_my_channel1 [Channel: my-channel1]
71957195
subgraph channel_my_channel1_padding [ ]
7196-
chaincode_chaincode1[[Chaincode: chaincode1]]
7196+
chaincode_chaincode1_my_channel1[[Chaincode: chaincode1]]
71977197
end
71987198
class channel_my_channel1_padding subgraph_padding
71997199
end

e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4029,7 +4029,7 @@ classDef subgraph_padding fill:none,stroke:none
40294029
40304030
subgraph channel_my_channel1 [Channel: my-channel1]
40314031
subgraph channel_my_channel1_padding [ ]
4032-
chaincode_chaincode1[[Chaincode: chaincode1]]
4032+
chaincode_chaincode1_my_channel1[[Chaincode: chaincode1]]
40334033
end
40344034
class channel_my_channel1_padding subgraph_padding
40354035
end

e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4054,7 +4054,7 @@ classDef subgraph_padding fill:none,stroke:none
40544054
40554055
subgraph channel_my_channel1 [Channel: my-channel1]
40564056
subgraph channel_my_channel1_padding [ ]
4057-
chaincode_chaincode1[[Chaincode: chaincode1]]
4057+
chaincode_chaincode1_my_channel1[[Chaincode: chaincode1]]
40584058
end
40594059
class channel_my_channel1_padding subgraph_padding
40604060
end

src/export-network-topology/generateMermaidDiagram.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { FabloConfigExtended, OrdererGroup } from "../types/FabloConfigExtended"
33
const safeId = (id: string): string => id.replace(/[^a-zA-Z0-9_]/g, "_");
44
const ordererGroupId = (g: OrdererGroup): string => safeId(`ord_group_${g.name}_${g.orderers?.[0].address}`);
55
const channelId = (channelName: string): string => safeId(`channel_${channelName}`);
6-
const chaincodeId = (ccName: string): string => safeId(`chaincode_${ccName}`);
6+
const chaincodeId = (ccName: string, channelName: string): string => safeId(`chaincode_${ccName}_${channelName}`);
77

88
export function generateMermaidDiagram(config: FabloConfigExtended): string {
99
const lines: string[] = ["graph LR"];
@@ -64,7 +64,7 @@ export function generateMermaidDiagram(config: FabloConfigExtended): string {
6464
// Add chaincodes for this channel (using cylinder shape)
6565
const channelChaincodes = config.chaincodes?.filter((cc) => cc.channel?.name === channel.name) ?? [];
6666
channelChaincodes.forEach((cc) => {
67-
lines.push(` ${chaincodeId(cc.name)}[[Chaincode: ${cc.name}]]`);
67+
lines.push(` ${chaincodeId(cc.name, channel.name)}[[Chaincode: ${cc.name}]]`);
6868
});
6969

7070
// Add dummy invisible node for empty channels to ensure visibility

0 commit comments

Comments
 (0)