39 Commits

Author SHA1 Message Date
Robert Schäfer
ffe6dc7736 Add MutationObserver to fix tests
Our build server failed because of frontend tests. However, all our
fullstack tests are passing... So maybe an issue in our test setup, not
reproducible in a real browser?

This commit:
ee4f132b0f (diff-0806c5f3fdae5e139222967601c7faca)
adds MutationObserver to their test setup. Adding it to our test suites
that touch the `editor` directly fixes our tests, too!

From what I can tell is that prosemirror is calling
`this.observer.takeRecords()`. Probably `tiptap` updated its
dependencies at some point and that's where `this.observer` was
introduced? Hard to tell. It really looks just like an issue only
present in test environments, so I think it's safe not to investigate
any further.
2019-08-02 14:32:06 +02:00
Wolfgang Huß
3b88c47206 Update the contentExcerpt
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2019-07-16 15:48:38 +02:00
Wolfgang Huß
e4fd7f4cf7 Merge branch '552-update_comment' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-07-16 15:11:41 +02:00
Matt Rider
a019c8c311 Revert unintended changes, refactor
- rename some variables in comments.spec.js while dealing with merge conflicts
- rename EditCommentForm/index.vue with new naming convention
- add comment to explain absense of <no-ssr>
- use a comments content for edit comment form content, not excerpt
2019-07-16 07:53:57 -03:00
Wolfgang Huß
9203f7310d Edit Comment content not contentExcerpt
Comment button now only active, if the comment has changed.
Remove `console.log`.
2019-07-16 11:48:33 +02:00
Matt Rider
c7dc2f6a5c Hide CommentForm when an edit is in progress
- Follow @Tirokk PR review
2019-07-15 19:09:33 -03:00
Matt Rider
36c4a22b76 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 552-update_comment 2019-07-15 18:29:26 -03:00
Matt Rider
b6dcafcc2b Fix linting 2019-07-10 18:52:23 -03:00
Robert Schäfer
9a72e7b9e6 Proper null handling
FYI @mattwr18
2019-07-10 18:01:18 +02:00
Wolfgang Huß
a4cf2d3ee8 Store Hashtags of Post content in database and write a lot of tests
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2019-07-01 20:13:28 +02:00
ALau2088
912b94d43c add EditCommentForm spec.js 2019-06-27 10:59:53 -07:00
ALau2088
5e9f46405e Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-06-27 10:18:53 -07:00
Matt Rider
6908cd6316 Fix lint
- remove unused variable
2019-06-24 19:11:59 -03:00
Matt Rider
c6203ad8eb Refactor CreateComments functionality
- update apollo cache on successful mutation
- remove global event listener
- avoid refetch Post to update CommentsList
- return comment with its author from resolver
2019-06-24 18:21:52 -03:00
0c3e53a239
Merge pull request #836 from Human-Connection/835-use-vuex-to-make-editor-placeholder-reactive
Set up editor placeholder to use Vuex
2019-06-19 14:59:17 +02:00
senderfm
0a66ad56d9 Fix Specs, lint, fix test 2019-06-18 09:58:29 +02:00
Matt Rider
01eb25eca6 Update CommentForm with vuex 2019-06-15 16:15:49 -03:00
mattwr18
54ca9a6e0c
Merge pull request #831 from Human-Connection/804-turn-root-listener-off
Turn off $root listeners in beforeDestroy
2019-06-15 08:51:54 -03:00
Matt Rider
7d00b73530 Turn off $root listeners in beforeDestroy 2019-06-14 14:02:22 -03:00
Wolfgang Huß
58b36372b9 Merge remote-tracking branch 'origin/master' into 734-authorization-problem-disabling-post
# Conflicts:
#	webapp/pages/profile/_id/_slug.spec.js

Defined missing `$filter.truncate` which made console errors in the webapp Jest test.
2019-06-14 11:11:22 +02:00
Wolfgang Huß
482ac1572b Refactored and created the tests of DeletePostCallback
Created a folder `utils` for PostHelpers.js.
Fixed a new incoming problem of the master with deleting Posts on the User Profile.

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2019-06-13 19:23:13 +02:00
Robert Schäfer
b8c5db48a6 Implement prefix of image urls with a filter
Fix #820

Ok, so after I would have to use the same method in three different
locations (`<ds-card>` expects an `image` attribute but cannot render
entire components) I decided to implement the prefix of image urls with
a filter rather than a component. The downside of this is that we have
to add the filter on a lot of component tests. The benefit is less
components and hopefully less complexity.
2019-06-13 16:56:41 +02:00
ALau2088
22f166adac merge upstream/552-update_comment 2019-06-08 15:55:51 -07:00
ALau2088
8d4ed065c7 add post.comment.updated 2019-06-05 18:42:17 -07:00
Wolfgang Huß
948a99d9da Merge remote-tracking branch 'origin/master' into 553-delete-comment
# Conflicts:
#	webapp/components/Modal/DeleteModal.vue
#	webapp/components/PostCard/index.vue
#	webapp/components/comments/CommentList/index.vue
#	webapp/pages/index.vue
#	webapp/pages/post/_id/_slug/more-info.vue
2019-06-03 10:39:13 +02:00
Wolfgang Huß
5bec0f1d72 Refined list deletion functions and started writing custom mutation for DeleteComment and their tests 2019-05-31 15:46:34 +02:00
Wolfgang Huß
3e3e447bc5 Refactored three quater of the tests 2019-05-29 17:59:07 +02:00
Matt Rider
f732ff44d0 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/prettier-1.17.1-fix_incompatibility 2019-05-29 10:33:43 -03:00
Matt Rider
ff0b4b6867 Fix lint 2019-05-29 09:47:24 -03:00
Wolfgang Huß
7807831e0e Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-29 12:17:24 +02:00
Matt Rider
745a326fbe Test refetching a Post with its comments 2019-05-27 19:16:27 -03:00
Matt Rider
b378bcb286 Fix edit field render bug(CommentForm)
- remove no-ssr, which was not necessary and causing the edit field not to appear the majority of the times visiting a Post.
- this was really bad user experience since a user would need to refresh the page to comment.
- removed args in refetchPostComments as there are no params passed in when it is called anymore
- needed to add an if statement since if there are no comments on a Post, then this.$apollo.queries.Post is undefined and it errors out trying to call refetch()
- update test to remove no-ssr

Co-authored-by: Mike Aono <aonomike@gmail.com>
2019-05-27 17:02:00 -03:00
Wolfgang Huß
68980f85c6 Merge remote-tracking branch 'origin/master' into 553-delete-comment
# Conflicts:
#	webapp/components/Comment.vue
#	webapp/components/ContentMenu.vue
#	webapp/components/Modal/DeleteModal.spec.js
#	webapp/components/Modal/DeleteModal.vue
#	webapp/components/Modal/DisableModal.spec.js
#	webapp/components/Modal/DisableModal.vue
#	webapp/components/Modal/ReportModal.spec.js
#	webapp/components/Modal/ReportModal.vue
#	webapp/components/PostCard/index.vue
#	webapp/components/comments/CommentList/index.vue
#	webapp/locales/de.json
#	webapp/pages/index.vue
#	webapp/pages/profile/_id/_slug.vue
2019-05-27 12:34:59 +02:00
ALau2088
8c7009097a 552-update_comment 2019-05-24 08:22:56 -07:00
ALau2088
8a8ed5131e refactor backend and add UI 2019-05-24 08:03:39 -07:00
5202763dd8
frontend lint fixes 2019-05-23 19:40:39 +02:00
Wolfgang Huß
7f83f775a7 Clean up the delete-menu stuff for Comments and Posts 2019-05-19 08:23:51 +02:00
Wolfgang Huß
8033556145 Investigation how to update the Comments List intelligent 2019-05-18 07:35:45 +02:00
Matt Rider
09a8ad78b8 Merge in changes in master from comments PR #536 2019-05-07 20:13:41 -03:00