Merge pull request #763 from rakseong/main

[View] cluster 요약에서 cluster의 releaseTag를 보여주는 방식 변경

Author: ytaek

packages/view/src/components/VerticalClusterList/Summary/Summary.tsx

@@ -15,7 +15,7 @@ import { getClusterSizes } from "../ClusterGraph/ClusterGraph.util";
 import { CLUSTER_HEIGHT, DETAIL_HEIGHT, NODE_GAP } from "../ClusterGraph/ClusterGraph.const";
 
 import { usePreLoadAuthorImg } from "./Summary.hook";
-import { getInitData, getClusterIds, getClusterById } from "./Summary.util";
+import { getInitData, getClusterIds, getClusterById, getCommitLatestTag } from "./Summary.util";
 import { Content } from "./Content";
 
 const COLLAPSED_ROW_HEIGHT = CLUSTER_HEIGHT + NODE_GAP * 2;
@@ -88,7 +88,7 @@ const Summary = () => {
                   ));
                 })}
             </div>
-            <div>{cluster.latestReleaseTag}</div>
+            <div>{getCommitLatestTag(cluster.clusterTags)}</div>
             <Content
               content={cluster.summary.content}
               clusterId={cluster.clusterId}

packages/view/src/components/VerticalClusterList/Summary/Summary.type.ts

@@ -19,7 +19,7 @@ export type Summary = {
 export type Cluster = {
   clusterId: number;
   summary: Summary;
-  latestReleaseTag: string;
+  clusterTags: string[];
 };
 
 export type AuthSrcMap = Record<string, string>;

packages/view/src/components/VerticalClusterList/Summary/Summary.util.ts

@@ -36,7 +36,7 @@ function tagToNumber(tag: string, maxLength: number): number {
  * @param tags
  * @returns
  */
-function getCommitLatestTag(tags: string[]): string {
+export function getCommitLatestTag(tags: string[]): string {
   if (!Array.isArray(tags) || tags.length === 0) return "";
 
   const validTags = tags.filter((tag) => isValidReleaseTag(tag));
@@ -66,37 +66,52 @@ export function getInitData(data: GlobalProps["data"]): Cluster[] {
   const clusters: Cluster[] = [];
 
   data.map((clusterNode) => {
-    const { commit: clusterFirstCommit, clusterId } = clusterNode.commitNodeList[0];
-    const { message } = clusterFirstCommit;
+    const { message } = clusterNode.commitNodeList[0].commit;
+    const resultMsg = message.split("/n/n")[0];
+    const cluster: Cluster = {
+      clusterId: clusterNode.commitNodeList[0].clusterId,
+      summary: {
+        authorNames: [],
+        content: {
+          message: resultMsg,
+          count: clusterNode.commitNodeList.length - 1,
+        },
+      },
+      clusterTags: [],
+    };
+
     const clusterTags: string[] = [];
-    const authorSet: Set<string> = new Set();
+    const authorNameSet: Set<string> = new Set();
 
     clusterNode.commitNodeList.forEach((commitNode: CommitNode) => {
       // set names
       commitNode.commit.author.names.forEach((name) => {
-        authorSet.add(name.trim());
+        authorNameSet.add(name.trim());
       });
 
       // get releaseTags in cluster commitNodeList
-      commitNode.commit.releaseTags?.forEach((tag) => {
-        clusterTags.push(tag);
+      commitNode.commit.releaseTags?.map((tag) => {
+        if (clusterTags.indexOf(tag) === -1) {
+          clusterTags.push(tag);
+        }
+        return clusterTags;
       });
     });
+    cluster.summary.authorNames.push(Array.from(authorNameSet) as string[]);
 
-    // set latset release tag
-    const latestReleaseTag = getCommitLatestTag(clusterTags);
+    // set release tag in cluster
+    cluster.clusterTags = clusterTags;
 
-    const cluster: Cluster = {
-      clusterId: clusterId,
-      summary: {
-        authorNames: [Array.from(authorSet)],
-        content: {
-          message: message.split("/n/n")[0],
-          count: clusterNode.commitNodeList.length - 1,
-        },
-      },
-      latestReleaseTag: latestReleaseTag,
-    };
+    // remove name overlap
+    const authorsSet = cluster.summary.authorNames.reduce((set, authorArray) => {
+      authorArray.forEach((author) => {
+        set.add(author);
+      });
+      return set;
+    }, new Set());
+
+    cluster.summary.authorNames = [];
+    cluster.summary.authorNames.push(Array.from(authorsSet) as string[]);
 
     clusters.push(cluster);
     return cluster;