IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,291 Commits 5 Branches 2 Tags
Commit Graph

7291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
e4aba5d4df Add test case/Fix message 
- Test that the rule is automatically created for new reviews
- Improve English message
 2019-12-02 13:56:44 +01:00
mattwr18
c05065f684 Refactor backend 
- update script
- use readTxResult for validateReview
- favor more verbose variables
- do not set review.closed as we close the report and the rule at the
moment is set to 'latestReviewUpdatedAtRules' rule, so it's clear the
last review must have been the one that closed the report
 2019-12-02 13:38:35 +01:00
mattwr18
14a689d955 Remove comments 2019-12-02 12:02:15 +01:00
mattwr18
00d5f58b00 Move components to features, style table[WIP] 
- In conversations with @alina-beck, she suggested we move the
ReportsTable and FiledTable to features since it is tightly coupled to
Reports... we can work towards a table that is "dumb" and just takes the
data and displays it in another PR
- Add extra column for Current status
- Fix widths
 2019-12-02 11:26:11 +01:00
roschaefer
3409a34374 Always show the menu to switch filters 2019-11-30 02:22:53 +01:00
roschaefer
74a65a9114 Be more specific "Current status" inst. of "Type" 2019-11-30 02:21:29 +01:00
roschaefer
9fd895fc42 Use <button> instead of <a> 
If you don't want to link somewhere, use a button instead of an anchor,
fellas. 😉
 2019-11-30 01:31:57 +01:00
mattwr18
985d53e52b Fix broken tests 2019-11-29 20:49:46 +01:00
mattwr18
c088c6eac4 Refactor test to avoid unneccessary http request 
- Set up/tear down should not needlessly run http requests. These tests
are not designed to test that the report/review process works as
expected. that is the job of their respective unit tests/e2e tests.
 2019-11-29 20:48:11 +01:00
mattwr18
7441dbf28c Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-29 20:43:09 +01:00
mattwr18
bbd80fbc23 Add test cases for review workflow 2019-11-29 19:45:52 +01:00
mattwr18
f5545e3976 Fix middleware/spec 2019-11-29 19:45:34 +01:00
mattwr18
5d63dda6ee Refactor validateReport/Review 
- Don't throw error if a report already exists since we use MERGE and
that does not create a new resource if it exists. That is tested at the
neo4j(database) level.
- We also have a test to make in reports.spec.js that no duplicate is
created to ensure we didn't make some error on our part.
- Fix some faulty logic in validateReview
 2019-11-29 18:47:41 +01:00
mattwr18
c0d9fe5257 Test validationMiddleware validateReport/Review 2019-11-29 18:43:24 +01:00
mattwr18
107f10edc9 Update table styling 2019-11-29 15:29:11 +01:00
mattwr18
b7f0bc7164
Merge pull request #2375 from Human-Connection/keep_dots_in_emails 
Don't remove sub-addresses in emails
 2019-11-29 14:14:25 +01:00
mattwr18
a8a9abb4e4 Refactor/Add new components 2019-11-29 14:02:53 +01:00
mattwr18
2e54a43417
Merge pull request #2333 from Human-Connection/remove_obsolete_invitation_code 
refactor: Remove obsolete code about invitation codes
 2019-11-29 13:45:46 +01:00
mattwr18
3c0a24825c Move components to _new structure/refactor 
- extract more components
 2019-11-29 13:27:39 +01:00
roschaefer
76414dbec7 Fix lint 2019-11-28 18:07:00 +01:00
mattwr18
9401d4e1e1 [WIP] Extract code into own components 2019-11-28 17:38:44 +01:00
mattwr18
9990fe2cb2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-28 16:14:23 +01:00
mattwr18
3d8435dde1 Get frontend working with data from backend 2019-11-28 16:13:48 +01:00
mattwr18
89daa3356c Return reviews with reports, rename variables 
- Instead of just returning the moderator who reviewed, we return the
review as well
 2019-11-28 16:10:33 +01:00
roschaefer
973d3f899a Remove dots of gmail addresses 
I had a chat with our moderator Daniel. He asks us to remove dots from
gmail accounts. He finds it more consistent and he has no problem to
write a mail to a gmail address without dots. He is OK to save the
email address different from how a user memorizes it.
 2019-11-28 14:02:11 +01:00
roschaefer
7146e0a9b2 Fix lint 2019-11-28 13:48:09 +01:00
mattwr18
21be2c08ba Update to return resource instead of to 
- more verbose makes it easier to understand
 2019-11-28 13:44:00 +01:00
mattwr18
3de377a860
Merge pull request #2373 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/apollo-4.0.0-rc18 
build(deps): bump @nuxtjs/apollo from 4.0.0-rc17 to 4.0.0-rc18 in /webapp
 2019-11-28 11:47:10 +01:00
mattwr18
595236ac53
Merge pull request #2372 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-7.0.4 
build(deps): bump graphql-shield from 7.0.2 to 7.0.4 in /backend
 2019-11-28 11:46:49 +01:00
mattwr18
277c425e37
Merge pull request #2371 from Human-Connection/dependabot/npm_and_yarn/cypress-3.7.0 
build(deps-dev): bump cypress from 3.6.1 to 3.7.0
 2019-11-28 11:46:28 +01:00
mattwr18
fc31aae181
Merge pull request #2359 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.7.4 
build(deps-dev): bump @babel/core from 7.7.2 to 7.7.4 in /backend
 2019-11-28 11:38:26 +01:00
mattwr18
5e56098600
Merge pull request #2357 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.12 
build(deps): bump apollo-server from 2.9.11 to 2.9.12 in /backend
 2019-11-28 11:34:25 +01:00
roschaefer
9e2baf25d2 Don't remove dots in emails 2019-11-28 11:22:09 +01:00
dependabot-preview[bot]
0a5a0668c8
build(deps): bump @nuxtjs/apollo in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc17 to 4.0.0-rc18.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.17...v4.0.0-rc.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-28 04:19:49 +00:00
dependabot-preview[bot]
98623133fe
build(deps): bump graphql-shield from 7.0.2 to 7.0.4 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.2 to 7.0.4.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.2...v7.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-28 04:18:22 +00:00
dependabot-preview[bot]
6a52673524
build(deps-dev): bump cypress from 3.6.1 to 3.7.0 
Bumps [cypress](https://github.com/cypress-io/cypress) from 3.6.1 to 3.7.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.6.1...v3.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-28 04:17:57 +00:00
dependabot-preview[bot]
3c4a3a8a32
build(deps): bump apollo-server from 2.9.11 to 2.9.12 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.11 to 2.9.12.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.9.11...apollo-server@2.9.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 17:17:58 +00:00
dependabot-preview[bot]
1f52c73324
build(deps-dev): bump @babel/core from 7.7.2 to 7.7.4 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.2 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.2...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 17:16:21 +00:00
mattwr18
4861ab26dd
Merge pull request #2369 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.0.5 
build(deps-dev): bump eslint-plugin-jest from 23.0.4 to 23.0.5 in /webapp
 2019-11-27 18:15:51 +01:00
mattwr18
ff1ba9ea21
Merge pull request #2368 from Human-Connection/dependabot/npm_and_yarn/backend/hapi/joi-16.1.8 
build(deps): bump @hapi/joi from 16.1.7 to 16.1.8 in /backend
 2019-11-27 18:15:31 +01:00
mattwr18
943693f9ed
Merge pull request #2365 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-23.0.5 
build(deps-dev): bump eslint-plugin-jest from 23.0.4 to 23.0.5 in /backend
 2019-11-27 18:15:11 +01:00
mattwr18
46c16e9060
Merge pull request #2339 from Human-Connection/dependabot/npm_and_yarn/backend/babel/plugin-proposal-throw-expressions-7.7.4 
build(deps-dev): bump @babel/plugin-proposal-throw-expressions from 7.2.0 to 7.7.4 in /backend
 2019-11-27 18:14:15 +01:00
mattwr18
6865709210
Merge pull request #2334 from Human-Connection/refactor_is_author_permission 
refactor: Close session in isAuthor permission
 2019-11-27 18:13:48 +01:00
mattwr18
f42eea15a6
Merge pull request #2323 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.8.1 
build(deps): bump date-fns from 2.7.0 to 2.8.1 in /webapp
 2019-11-27 18:11:08 +01:00
mattwr18
e6fdb70a07 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-27 18:09:24 +01:00
mattwr18
5d80eca711
Merge pull request #2169 from Human-Connection/1967-Component-Tests-ContentView 
1967 component tests content view
 2019-11-27 18:03:36 +01:00
mattwr18
1f7d8a023e Update reports query in frontend 2019-11-27 17:45:32 +01:00
mattwr18
c6f16497fa Update Post slug to be non-nullable 2019-11-27 17:45:05 +01:00
mattwr18
d18d9228b0 Refactor tests/resolvers 
- we were making multiple http requests to report resources in this
test, now we are bypassing these requests by setting the database up to
how we want to test, then testing what we want in isolation.
- also added tests for closing a report
- favor union for returning resource
- simplify review mutation
 2019-11-27 17:35:30 +01:00
mattwr18
3a05844356 Refactor tests/resolvers 
- Favor union as it's cleaner and less code
- refactor tests to new implementation
- add reviewedByModerator resolver
 2019-11-27 17:31:51 +01:00