fix: paste multiple line to table issue #3906

luka-nextcloud · 2023-03-07T07:05:55Z

📝 Summary

Resolves: Pasting into table destroys it #3529

🖼️ Screenshots

🏚️ Before

🏡 After

🚧 TODO

...

🏁 Checklist

Code is properly formatted (npm run lint / npm run stylelint / composer run cs:check)
Sign-off message is added to all commits
Tests (unit, integration and/or end-to-end) passing and the changes are covered with tests
Documentation (README or documentation) has been updated or is not required

cypress · 2023-03-07T07:15:20Z

Passing run #10056 ↗︎

0	143	1	0	0

Details:

fix: paste multiple line to table issue
Project: Text	Commit: `35320faec9`
Status: Passed	Duration: 03:20 💡
Started: Jun 7, 2023 9:18 PM	Ended: Jun 7, 2023 9:22 PM

_{This comment has been generated by cypress-bot as a result of this
project's GitHub integration settings.}

mejo-

Thanks for looking into this @luka-nextcloud! I have some comments 😊

src/nodes/Table/Table.js

mejo- · 2023-03-07T11:41:58Z

@luka-nextcloud also, how about adding a Cypress test for this?

mejo-

Thanks, works well now @luka-nextcloud. I have some minor remarks, mainly to make the code more readable and to fix the failing linting tests. Please also squash all commits into one. Afterwards the PR is good to be merged from my side.

I'm not sure whether deconstructing the slice children and reassembling them into a new fragment is really necesary, but I didn't find a simpler solution myself.

src/nodes/Table/Table.js

src/nodes/Table/TableCell.js

datenangebot

Code looks good,

green CI and usage of the tasks (initial issue description) would be appreciated

cypress/e2e/workspace.spec.js

juliushaertl · 2023-05-09T07:04:27Z

Please check the cypress test again as it seems ot be failing after moving it

juliushaertl · 2023-05-17T06:42:51Z

/compile

cypress/e2e/nodes/Table.spec.js

juliushaertl

Please squash the commits as discussed

luka-nextcloud · 2023-05-25T09:48:49Z

@mejo- Your comments were already resolved. Could you please approve?

Signed-off-by: Luka Trovic <luka@nextcloud.com>

juliushaertl · 2023-06-07T21:14:13Z

/compile

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>

mejo- · 2023-06-08T06:22:03Z

/backport 4fea236 to stable27

mejo- · 2023-06-08T06:22:12Z

/backport 4fea236 to stable26

mejo- · 2023-06-08T06:22:22Z

/backport 4fea236 to stable25

backportbot-nextcloud · 2023-06-08T06:24:44Z

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

This replaces the broken approach from #3906. * Only regard paste handler if pasting to a table cell (Fixes: #4443) * Add all (marked) text nodes with newlines in between * Only add a newline for non-text nodes to prevent newlines in between text with changing marks. Signed-off-by: Jonas <jonas@freesources.org>

luka-nextcloud requested a review from max-nextcloud March 7, 2023 07:05

luka-nextcloud self-assigned this Mar 7, 2023

luka-nextcloud force-pushed the bug/copy-paste-multiple-lines-to-table branch from 2a54b60 to ec14f8b Compare March 7, 2023 07:08

mejo- requested changes Mar 7, 2023

View reviewed changes

src/nodes/Table/Table.js Outdated Show resolved Hide resolved

src/nodes/Table/Table.js Outdated Show resolved Hide resolved

luka-nextcloud force-pushed the bug/copy-paste-multiple-lines-to-table branch from ec14f8b to 39df7ed Compare March 14, 2023 19:45

juliushaertl added this to the Nextcloud 27 milestone Mar 21, 2023

juliushaertl added bug Something isn't working 2. developing labels Mar 24, 2023

luka-nextcloud force-pushed the bug/copy-paste-multiple-lines-to-table branch from 023ccec to 343d060 Compare March 28, 2023 13:25

mejo- requested changes Mar 28, 2023

View reviewed changes

src/nodes/Table/Table.js Outdated Show resolved Hide resolved

src/nodes/Table/TableCell.js Outdated Show resolved Hide resolved

src/nodes/Table/TableCell.js Show resolved Hide resolved

src/nodes/Table/TableCell.js Show resolved Hide resolved

luka-nextcloud force-pushed the bug/copy-paste-multiple-lines-to-table branch 2 times, most recently from 13b3fa2 to 97bf10c Compare March 29, 2023 15:01

luka-nextcloud requested a review from mejo- March 29, 2023 15:03

luka-nextcloud force-pushed the bug/copy-paste-multiple-lines-to-table branch from ce23640 to 140a1aa Compare March 31, 2023 09:55

juliushaertl self-requested a review April 6, 2023 13:23

juliushaertl added 3. to review and removed 2. developing labels Apr 6, 2023

luka-nextcloud force-pushed the bug/copy-paste-multiple-lines-to-table branch from 140a1aa to 4621b08 Compare April 18, 2023 15:38

datenangebot approved these changes Apr 19, 2023

View reviewed changes

juliushaertl reviewed Apr 26, 2023

View reviewed changes

cypress/e2e/workspace.spec.js Outdated Show resolved Hide resolved

skjnldsv mentioned this pull request May 3, 2023

27.0.0 beta 1 nextcloud/server#38038

Merged

luka-nextcloud force-pushed the bug/copy-paste-multiple-lines-to-table branch from 4621b08 to a9c25ef Compare May 8, 2023 08:32

luka-nextcloud requested a review from juliushaertl May 8, 2023 08:33

luka-nextcloud force-pushed the bug/copy-paste-multiple-lines-to-table branch from a9c25ef to b917a02 Compare May 8, 2023 18:33

luka-nextcloud force-pushed the bug/copy-paste-multiple-lines-to-table branch from b917a02 to 52e9ed8 Compare May 17, 2023 05:37

blizzz mentioned this pull request May 17, 2023

27.0.0 RC1 nextcloud/server#38341

Merged

juliushaertl reviewed May 22, 2023

View reviewed changes

cypress/e2e/nodes/Table.spec.js Outdated Show resolved Hide resolved

blizzz modified the milestones: Nextcloud 27, Nextcloud 28 May 23, 2023

luka-nextcloud requested a review from juliushaertl May 24, 2023 12:06

juliushaertl approved these changes May 24, 2023

View reviewed changes

luka-nextcloud force-pushed the bug/copy-paste-multiple-lines-to-table branch 2 times, most recently from 55020ea to d6b4585 Compare May 24, 2023 17:36

mejo- approved these changes May 25, 2023

View reviewed changes

juliushaertl force-pushed the bug/copy-paste-multiple-lines-to-table branch from d6b4585 to 99185f6 Compare June 6, 2023 07:02

fix: paste multiple line to table issue

4fea236

Signed-off-by: Luka Trovic <luka@nextcloud.com>

juliushaertl force-pushed the bug/copy-paste-multiple-lines-to-table branch from 99185f6 to 4fea236 Compare June 7, 2023 21:00

chore(assets): Recompile assets

35320fa

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>

juliushaertl merged commit 71697ce into main Jun 7, 2023
32 checks passed

delete-merged-branch bot deleted the bug/copy-paste-multiple-lines-to-table branch June 7, 2023 21:39

backportbot-nextcloud bot added the backport-request label Jun 8, 2023

This was referenced Jun 8, 2023

[stable27] fix: paste multiple line to table issue #4264

Merged

[stable26] fix: paste multiple line to table issue #4265

Merged

backportbot-nextcloud bot removed the backport-request label Jun 8, 2023

mejo- mentioned this pull request Jul 7, 2023

Copy and paste removes newline #4443

Closed

mejo- mentioned this pull request Jul 7, 2023

fix(frontend): Improve paste handler for table cells #4452

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: paste multiple line to table issue #3906

fix: paste multiple line to table issue #3906

luka-nextcloud commented Mar 7, 2023 •

edited

cypress bot commented Mar 7, 2023 •

edited

mejo- left a comment

mejo- commented Mar 7, 2023

mejo- left a comment

datenangebot left a comment

juliushaertl commented May 9, 2023

juliushaertl commented May 17, 2023

juliushaertl left a comment

luka-nextcloud commented May 25, 2023

juliushaertl commented Jun 7, 2023

mejo- commented Jun 8, 2023

mejo- commented Jun 8, 2023

mejo- commented Jun 8, 2023

backportbot-nextcloud bot commented Jun 8, 2023

fix: paste multiple line to table issue #3906

fix: paste multiple line to table issue #3906

Conversation

luka-nextcloud commented Mar 7, 2023 • edited

📝 Summary

🖼️ Screenshots

🚧 TODO

🏁 Checklist

cypress bot commented Mar 7, 2023 • edited

Passing run #10056 ↗︎

mejo- left a comment

Choose a reason for hiding this comment

mejo- commented Mar 7, 2023

mejo- left a comment

Choose a reason for hiding this comment

datenangebot left a comment

Choose a reason for hiding this comment

juliushaertl commented May 9, 2023

juliushaertl commented May 17, 2023

juliushaertl left a comment

Choose a reason for hiding this comment

luka-nextcloud commented May 25, 2023

juliushaertl commented Jun 7, 2023

mejo- commented Jun 8, 2023

mejo- commented Jun 8, 2023

mejo- commented Jun 8, 2023

backportbot-nextcloud bot commented Jun 8, 2023

luka-nextcloud commented Mar 7, 2023 •

edited

cypress bot commented Mar 7, 2023 •

edited