Feat/editable-label #126

dontry · 2024-03-12T10:47:04Z

This MR enables user to edit message labels.

Create new component <MessageLabel /> and use it in Message and SelftInvocation component
Create a reusable hook useEditLabel containing event handlers for editing labels.
Refactor <ConditionLabel /> to use useEditLabel hook
Add a new regex removeSpacesBeforeAndInsideBrackets for getFormattedText function
Add test cases to cypress e2e test
Update github actions e2e.yml to fix Python dependencies missing issue

TODO: fix overflow issue of the first method label upon first time edit

MrCoder · 2024-03-17T08:23:41Z

Layout is not updated:

MrCoder

Layout is not updated. See images in comments.

src/components/DiagramFrame/SeqDiagram/MessageLayer/MessageLabel.vue

...s/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/Interaction/Occurrence/Occurrence.vue

MrCoder · 2024-03-31T10:29:52Z

It does not wrap the method with double quotes if there are spaces or special characters.

MrCoder · 2024-04-04T05:50:33Z

修改message之后，没有刷新Layout

dontry · 2024-04-05T10:46:00Z

修改message之后，没有刷新Layout

没有办法复现问题。稍微做了一些优化改动。

MrCoder · 2024-04-17T12:11:08Z

只有在特定的DSL下才可以重现。下面的示例，修改methodLong2

A.method1 {
  B.methodLong2
}

Screen.Recording.2024-04-17.at.10.19.16.PM.mov

dontry · 2024-04-18T12:03:36Z

修改message之后，没有刷新Layout

这个问题是因为我掉到一个坑。之前定义的regex有一个g代表全局搜索，是有状态的。造成第一次碰到特殊字符能识别，之后搜索是从上一次得到的index算起，导致后面的检测不成功。现在这个bug已经修复了。其他你碰到的问题，我没发复现。你试试再拉一下最新的commit测试一下？有问题的情况，可以附上DSL, 我可以做regression test

dontry · 2024-04-18T12:05:41Z

我决定添加一些e2e测试到smoke test

MrCoder · 2024-04-20T07:55:28Z

Spaces in selfMessage is not handled properly.

Screen.Recording.2024-04-20.at.5.52.27.PM.mov

dontry · 2024-04-28T02:34:24Z

Similar issues on Self message. See the last comment.

Fixed

This reverts commit 6b6788a.

MrCoder · 2024-04-29T02:09:55Z

src/core.ts

@@ -104,7 +104,6 @@ export default class ZenUml implements IZenUml {
  async doRender(config: Config | undefined) {
    console.debug("rendering start");
    const start = getStartTime();
-    clearCache();


@danshuitaihejie 这个地方删掉有没有别的影响？

@danshuitaihejie 这个地方删掉有没有别的影响？

这个地方不能的clearCache不能删除

* Upgrade to node 20 for e2e. * Updated actions to use newer node version. * Upgrade python to 3.12

MrCoder · 2024-05-30T03:57:27Z

...mFrame/SeqDiagram/MessageLayer/Block/Statement/Interaction/SelfInvocation/SelfInvocation.vue

@@ -7,7 +7,7 @@
    ref="messageRef"
  >
    <label
-      class="name group px-px hover:text-skin-message-hover hover:bg-skin-message-hover relative min-h-[1em]"
+      class="name group px-px hover:text-skin-message-hover hover:bg-skin-message-hover relative min-h-[1em] w-full"


This is causing an undesired effect see below video. This does not seem to be the cause if the issue. There is real issue that needs to be fixed. The corresponding interaction should not have width at the first place.

self-message-centred.mp4

MrCoder requested changes Mar 17, 2024

View reviewed changes

dontry marked this pull request as draft March 17, 2024 22:22

dontry marked this pull request as ready for review March 23, 2024 10:51

dontry commented Mar 23, 2024

View reviewed changes

src/components/DiagramFrame/SeqDiagram/MessageLayer/MessageLabel.vue Outdated Show resolved Hide resolved

...s/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/Interaction/Occurrence/Occurrence.vue Show resolved Hide resolved

dontry self-assigned this Mar 27, 2024

dontry requested a review from MrCoder March 27, 2024 10:18

dontry changed the title ~~Feat/ediable-label~~ Feat/editable-label Mar 28, 2024

MrCoder mentioned this pull request Apr 2, 2024

Double click to modify messages #111

Open

3 tasks

dontry force-pushed the feat/ediable-label branch from c1aee45 to 836510c Compare April 5, 2024 01:05

dontry added 11 commits April 15, 2024 21:40

new EditableLabel component

3beddda

Add useEditLabel function and MessageLabel component

974c9a1

Fix condition label formatting and update signature text

275c810

Add message label to selfInvocation and interaction-async vue

34f7984

Fix labelPosition calculation in Message.vue

40d3d9c

Fix funky arrow issue in label edit mode

c17ee0a

Fix style panel covering the text due to its position

7a42e6b

Add edit message test case to cypress tests

ee378c5

Add special character regex to useEditLabel function

bd2f349

Fix labelPosition calculation in Message.vue

0d100f8

Refactor self-invocation-async component in SeqDiagram

5494cb0

Refactor self-invocation-async component in SeqDiagram

021a675

dontry force-pushed the feat/ediable-label branch from c92c7f9 to 021a675 Compare April 18, 2024 02:46

dontry added 3 commits April 26, 2024 23:12

Refactor self-invocation component in SeqDiagram

9d4a7f0

Add e2e tests

2458159

Retain spaces after closing bracket

417b143

dontry and others added 17 commits April 28, 2024 12:54

Update snapshots

cd83950

Merge branch 'main' into feat/ediable-label

71440d7

bump cypress-run actions

6b6788a

Revert "bump cypress-run actions"

f21195a

This reverts commit 6b6788a.

update pnpm-lock.yaml

5baf4ac

Update e2e workflow to include Python setup

e58fcea

Update e2e workflow to include Python setup and fix pip installation

87f6b54

specifies python version

321712f

new editable label snapshots

4f94ac4

Update editable label message in e2e test

eb6c8cd

revert interaction.spec.js

aedfe80

update snapshots

a372379

Update editable label test descriptions in e2e tests

ac1ccfb

Update editable label test descriptions in e2e tests

1c45b47

update smoke test snapshot

6350404

update smoke test snapshots

d593fc6

Fixed an issue the participant's position is not updated.

a28cdb6

MrCoder reviewed Apr 29, 2024

View reviewed changes

MrCoder added 4 commits April 29, 2024 12:13

Replaced expected screenshot.

097d47e

Replaced another expected screenshot.

c728dc8

Reverted change on core.ts. Cache is not only for Coordinates class.

f5cedfc

Cicd/upgrade node version (#140)

8b5aec1

* Upgrade to node 20 for e2e. * Updated actions to use newer node version. * Upgrade python to 3.12

MrCoder approved these changes Apr 29, 2024

View reviewed changes

MrCoder merged commit 445f884 into main Apr 29, 2024
12 checks passed

MrCoder deleted the feat/ediable-label branch April 29, 2024 04:21

MrCoder reviewed May 30, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat/editable-label #126

Feat/editable-label #126

dontry commented Mar 12, 2024 •

edited

MrCoder commented Mar 17, 2024

MrCoder left a comment

MrCoder commented Mar 31, 2024

MrCoder commented Apr 4, 2024

dontry commented Apr 5, 2024

MrCoder commented Apr 17, 2024 •

edited

dontry commented Apr 18, 2024

dontry commented Apr 18, 2024

MrCoder commented Apr 20, 2024

dontry commented Apr 28, 2024

MrCoder Apr 29, 2024

danshuitaihejie Apr 29, 2024

MrCoder May 30, 2024

Feat/editable-label #126

Feat/editable-label #126

Conversation

dontry commented Mar 12, 2024 • edited

MrCoder commented Mar 17, 2024

MrCoder left a comment

Choose a reason for hiding this comment

MrCoder commented Mar 31, 2024

MrCoder commented Apr 4, 2024

dontry commented Apr 5, 2024

MrCoder commented Apr 17, 2024 • edited

dontry commented Apr 18, 2024

dontry commented Apr 18, 2024

MrCoder commented Apr 20, 2024

dontry commented Apr 28, 2024

MrCoder Apr 29, 2024

Choose a reason for hiding this comment

danshuitaihejie Apr 29, 2024

Choose a reason for hiding this comment

MrCoder May 30, 2024

Choose a reason for hiding this comment

dontry commented Mar 12, 2024 •

edited

MrCoder commented Apr 17, 2024 •

edited