Skip to content

[stable25] Migrate to @nextcloud/vue-richtext #950

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

Merged
PVince81 merged 4 commits into from
Oct 10, 2022
Merged

[stable25] Migrate to @nextcloud/vue-richtext #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
817d8c7
Migrate to @nextcloud/vue-richtext
nickvergessen Oct 7, 2022
32408b8
Fix exclude list
nickvergessen Oct 7, 2022
480eef3
Update snapshots
nickvergessen Oct 7, 2022
dbaf3fe
Recompile
nickvergessen Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/activity-dashboard.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/activity-dashboard.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/activity-sidebar.js
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions js/activity-sidebar.js.LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,6 @@ object-assign
* MIT Licensed
*/

/*!
* repeat-string <https://github.com/jonschlinkert/repeat-string>
*
* Copyright (c) 2014-2015, Jon Schlinkert.
* Licensed under the MIT License.
*/

/*!
* focus-trap 7.0.0
* @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion js/activity-sidebar.js.map
View file
Open in desktop

Large diffs are not rendered by default.

1,462 changes: 47 additions & 1,415 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
"transformIgnorePatterns": [
"\\.pnp\\.[^\\/]+$",
"/node_modules/(?!(@juliushaertl/vue-richtext)|(vue-material-design-icons)/)"
"/node_modules/(?!(@nextcloud/vue-richtext)|(vue-material-design-icons)/)"
],
"snapshotSerializers": [
"<rootDir>/node_modules/jest-serializer-vue"
Expand All @@ -71,7 +71,6 @@
]
},
"dependencies": {
"@juliushaertl/vue-richtext": "^1.0.1",
"@nextcloud/auth": "^2.0.0",
"@nextcloud/axios": "^2.0.0",
"@nextcloud/dialogs": "^3.1.4",
Expand All @@ -83,6 +82,7 @@
"@nextcloud/router": "^2.0.0",
"@nextcloud/vue": "^7.0.0-beta.3",
"@nextcloud/vue-dashboard": "^2.0.1",
"@nextcloud/vue-richtext": "^2.0.4",
"vue": "^2.7.10",
"vue-material-design-icons": "^5.1.2",
"vuex": "^3.6.2"
Expand Down
2 changes: 1 addition & 1 deletion src/components/Activity.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<script>
import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
import NcUserBubble from '@nextcloud/vue/dist/Components/NcUserBubble.js'
import RichText from '@juliushaertl/vue-richtext'
import RichText from '@nextcloud/vue-richtext'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'

import ActivityModel from '../models/ActivityModel.js'
Expand Down
110 changes: 37 additions & 73 deletions src/tests/__snapshots__/Activity.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,11 @@ exports[`Display correct information for changes 1`] = `
<!---->
</div>
<div class="activity-entry__content">
<div data-v-30428f72="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-30428f72="">
<p data-v-30428f72="">You changed <span data-v-30428f72="" class="rich-text-file rich-text--component" attrs="[object Object]" key="h-2"><!----> <a href="http://localhost:8080/index.php/f/776">Test file - renamed.md</a> <!----></span></p>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-a8ade67f="">You changed <span data-v-a8ade67f="" class="rich-text-file rich-text--component"><!----> <a href="http://localhost:8080/index.php/f/776">Test file - renamed.md</a> <!----></span></div>
</div>
<div data-v-30428f72="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-30428f72="">
<div data-v-30428f72=""></div>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f=""></div>
</div>
</div> <span class="activity-entry__date v-popper--has-tooltip">11 days ago</span>
</li>
Expand All @@ -35,15 +31,11 @@ exports[`Display correct information for comments 1`] = `
<!---->
</div>
<div class="activity-entry__content">
<div data-v-30428f72="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-30428f72="">
<p data-v-30428f72="">You commented</p>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-a8ade67f="">You commented</div>
</div>
<div data-v-30428f72="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-30428f72="">
<p data-v-30428f72="">A comment</p>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f="">A comment</div>
</div>
</div> <span class="activity-entry__date v-popper--has-tooltip">11 days ago</span>
</li>
Expand All @@ -60,15 +52,11 @@ exports[`Display correct information for creations 1`] = `
<!---->
</div>
<div class="activity-entry__content">
<div data-v-30428f72="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-30428f72="">
<p data-v-30428f72="">You created <span data-v-30428f72="" class="rich-text-file rich-text--component" attrs="[object Object]" key="h-2"><!----> <a href="http://localhost:8080/index.php/f/776">Test file.md</a> <!----></span></p>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-a8ade67f="">You created <span data-v-a8ade67f="" class="rich-text-file rich-text--component"><!----> <a href="http://localhost:8080/index.php/f/776">Test file.md</a> <!----></span></div>
</div>
<div data-v-30428f72="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-30428f72="">
<div data-v-30428f72=""></div>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f=""></div>
</div>
</div> <span class="activity-entry__date v-popper--has-tooltip">11 days ago</span>
</li>
Expand All @@ -85,15 +73,11 @@ exports[`Display correct information for favorites 1`] = `
<!---->
</div>
<div class="activity-entry__content">
<div data-v-30428f72="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-30428f72="">
<p data-v-30428f72="">Added to favorites</p>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-a8ade67f="">Added to favorites</div>
</div>
<div data-v-30428f72="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-30428f72="">
<div data-v-30428f72=""></div>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f=""></div>
</div>
</div> <span class="activity-entry__date v-popper--has-tooltip">11 days ago</span>
</li>
Expand All @@ -110,15 +94,11 @@ exports[`Display correct information for moves 1`] = `
<!---->
</div>
<div class="activity-entry__content">
<div data-v-30428f72="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-30428f72="">
<p data-v-30428f72="">You moved <span data-v-30428f72="" class="rich-text-file rich-text--component" attrs="[object Object]" key="h-2"><!----> <a href="http://localhost:8080/index.php/f/776">Test file.md</a> <!----></span> to <span data-v-30428f72="" class="rich-text-file rich-text--component" attrs="[object Object]" key="h-3"><!----> <a href="http://localhost:8080/index.php/f/753">Documents</a> <!----></span></p>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-a8ade67f="">You moved <span data-v-a8ade67f="" class="rich-text-file rich-text--component"><!----> <a href="http://localhost:8080/index.php/f/776">Test file.md</a> <!----></span> to <span data-v-a8ade67f="" class="rich-text-file rich-text--component"><!----> <a href="http://localhost:8080/index.php/f/753">Documents</a> <!----></span></div>
</div>
<div data-v-30428f72="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-30428f72="">
<div data-v-30428f72=""></div>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f=""></div>
</div>
</div> <span class="activity-entry__date v-popper--has-tooltip">11 days ago</span>
</li>
Expand All @@ -135,15 +115,11 @@ exports[`Display correct information for renames 1`] = `
<!---->
</div>
<div class="activity-entry__content">
<div data-v-30428f72="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-30428f72="">
<p data-v-30428f72="">You renamed <span data-v-30428f72="" class="rich-text-file rich-text--component" attrs="[object Object]" key="h-2"><!----> <a href="http://localhost:8080/index.php/f/776">Test file - renamed.md</a> <!----></span> to <span data-v-30428f72="" class="rich-text-file rich-text--component" attrs="[object Object]" key="h-3"><!----> <a href="http://localhost:8080/index.php/f/776">Test file - renamed - looooooooong.md</a> <!----></span></p>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-a8ade67f="">You renamed <span data-v-a8ade67f="" class="rich-text-file rich-text--component"><!----> <a href="http://localhost:8080/index.php/f/776">Test file - renamed.md</a> <!----></span> to <span data-v-a8ade67f="" class="rich-text-file rich-text--component"><!----> <a href="http://localhost:8080/index.php/f/776">Test file - renamed - looooooooong.md</a> <!----></span></div>
</div>
<div data-v-30428f72="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-30428f72="">
<div data-v-30428f72=""></div>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f=""></div>
</div>
</div> <span class="activity-entry__date v-popper--has-tooltip">11 days ago</span>
</li>
Expand All @@ -160,15 +136,11 @@ exports[`Display correct information for shares 1`] = `
<!---->
</div>
<div class="activity-entry__content">
<div data-v-30428f72="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-30428f72="">
<p data-v-30428f72="">Shared as public link</p>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-a8ade67f="">Shared as public link</div>
</div>
<div data-v-30428f72="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-30428f72="">
<div data-v-30428f72=""></div>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f=""></div>
</div>
</div> <span class="activity-entry__date v-popper--has-tooltip">11 days ago</span>
</li>
Expand All @@ -185,15 +157,11 @@ exports[`Display correct information for tags 1`] = `
<!---->
</div>
<div class="activity-entry__content">
<div data-v-30428f72="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-30428f72="">
<p data-v-30428f72="">Added system tag <strong data-v-30428f72="" attrs="[object Object]" key="h-2" class="rich-text--component">tag1</strong></p>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-a8ade67f="">Added system tag <strong data-v-a8ade67f="" class="rich-text--component">tag1</strong></div>
</div>
<div data-v-30428f72="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-30428f72="">
<div data-v-30428f72=""></div>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f=""></div>
</div>
</div> <span class="activity-entry__date v-popper--has-tooltip">11 days ago</span>
</li>
Expand All @@ -210,15 +178,11 @@ exports[`Display correct information for unfavorites 1`] = `
<!---->
</div>
<div class="activity-entry__content">
<div data-v-30428f72="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-30428f72="">
<p data-v-30428f72="">Removed from favorites</p>
</div>
</div>
<div data-v-30428f72="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-30428f72="">
<div data-v-30428f72=""></div>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__subject rich-text--wrapper">
<div data-v-a8ade67f="">Removed from favorites</div>
</div>
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f=""></div>
</div>
</div> <span class="activity-entry__date v-popper--has-tooltip">11 days ago</span>
</li>
Expand Down