Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#493 conflict 해결 pr #504

Merged
merged 18 commits into from
Oct 3, 2023
Merged

#493 conflict 해결 pr #504

merged 18 commits into from
Oct 3, 2023

Conversation

2taesung
Copy link
Contributor

@2taesung 2taesung commented Oct 3, 2023

Related issue

subGraph

Result

  • subGraph 화면
    image

  • e2e test report(transform test, subGraph(x))
    image

Work list

  • 이전 리팩토링 피드백 반영
  • drawSubGraph function
  • circle styling
  • getStartYEndY util function
  • e2e test to click on cluster(transform test, subGraph(x))

Discussion

  • subGraph에 각 commits 의 관계성을 갖는 선은 추가할 계획이긴 합니다.
  • 기타 외 다른 개발 아이디어나 현재 UI상에서도 개선점이 있다면 의견 부탁드립니다!

root added 16 commits September 23, 2023 02:37
fix: payload-type error 임시로 방어 로직을 넣었는데 근본적으로 payload가 하나의 타입으로 들어와야함
7d9885e
refactor: remove clusterSizes param
a3a27f1
refactor: korean hard description removed
7beda0d
feat: add playwright/test types in tsconfig
958cc70
feat: cluster click movement e2e test
42c89ab
refactor: remove event cuz interupt click for test
7cdf84e
fix: command type err by kyutae
d614d43
feat: drawSubGraph Fn in ClusterGraph
5384e4f
feat: circle styling
8e4b5da
feat: get start Y, end Y for center of circle range
3d3b7cf
feat: drawSubGraph without relationship
82ae203
feat: add drawSubGraph in index
f6f8bff
refactor: changing todo Korean to English
2dcf3ff
fix: conflict for merge
2d23313
feat: ClusterGraph scss module
405b87b
Merge branch '2taesung-feat/sub-graph' into main
87ca8ed
@2taesung 2taesung requested review from a team as code owners October 3, 2023 06:25
@2taesung 2taesung self-assigned this Oct 3, 2023
@2taesung
Copy link
Contributor Author

2taesung commented Oct 3, 2023 •
edited
Loading

Too complex conflict 로 인해 #493 pr을 close하고 해당 conflict를 해결한 후 새롭게 pr 올렸습니다.
conflict 내용

  • FakeIDEAdapter.ts-> 버그 해결하는 부분에서 conflict 발생
  • Cluster -> subGraph작업과 Cluster SCSS module 작업 충돌

review 부탁드립니다!
@ytaek @KyuTae98 내용은 기존 pr과 동일합니다.

yunjin-kim
yunjin-kim approved these changes Oct 3, 2023
View reviewed changes
Copy link
Contributor

@yunjin-kim yunjin-kim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM~

ytaek
ytaek approved these changes Oct 3, 2023
View reviewed changes
Copy link
Contributor

@ytaek ytaek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@2taesung 2taesung merged commit 301cfeb into githru:main Oct 3, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ytaek ytaek ytaek approved these changes

@yunjin-kim yunjin-kim yunjin-kim approved these changes

Assignees

@2taesung 2taesung

Labels
test ✨ view
Projects
Githru.v Board
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@2taesung @ytaek @yunjin-kim