diff --git a/backend/src/middleware/permissionsMiddleware.spec.js b/backend/src/middleware/permissionsMiddleware.spec.js index 7e5245ef9..775533867 100644 --- a/backend/src/middleware/permissionsMiddleware.spec.js +++ b/backend/src/middleware/permissionsMiddleware.spec.js @@ -159,97 +159,5 @@ describe('authorization', () => { }) }) }) - - // Wolle describe('access reports protected propertied', () => { - // const reportsQuery = gql ` - // query { - // reports { - // id - // createdAt - // updatedAt - // rule - // disable - // closed - // filed - // reviewed - // resource - // } - // } - // ` - - // describe('unauthenticated', () => { - // beforeEach(() => { - // authenticatedUser = null - // }) - // it("throws an error and does not expose the owner's email address", async () => { - // await expect( - // query({ query: reportsQuery, variables: { name: 'Owner' } }), - // ).resolves.toMatchObject({ - // errors: [{ message: 'Not Authorised!' }], - // data: { User: [null] }, - // }) - // }) - // }) - - // describe('authenticated', () => { - // describe('as the owner', () => { - // beforeEach(async () => { - // authenticatedUser = await owner.toJson() - // }) - - // it("exposes the owner's email address", async () => { - // variables = { name: 'Owner' } - // await expect(query({ query: reportsQuery, variables })).resolves.toMatchObject({ - // data: { User: [{ email: 'owner@example.org' }] }, - // errors: undefined, - // }) - // }) - // }) - - // describe('as another regular user', () => { - // beforeEach(async () => { - // authenticatedUser = await anotherRegularUser.toJson() - // }) - - // it("throws an error and does not expose the owner's email address", async () => { - // await expect( - // query({ query: reportsQuery, variables: { name: 'Owner' } }), - // ).resolves.toMatchObject({ - // errors: [{ message: 'Not Authorised!' }], - // data: { User: [null] }, - // }) - // }) - // }) - - // describe('as a moderator', () => { - // beforeEach(async () => { - // authenticatedUser = await moderator.toJson() - // }) - - // it("throws an error and does not expose the owner's email address", async () => { - // await expect( - // query({ query: reportsQuery, variables: { name: 'Owner' } }), - // ).resolves.toMatchObject({ - // errors: [{ message: 'Not Authorised!' }], - // data: { User: [null] }, - // }) - // }) - // }) - - // describe('as an administrator', () => { - // beforeEach(async () => { - // authenticatedUser = await administrator.toJson() - // }) - - // it("exposes the owner's email address", async () => { - // variables = { name: 'Owner' } - // await expect(query({ query: reportsQuery, variables })).resolves.toMatchObject({ - // data: { User: [{ email: 'owner@example.org' }] }, - // errors: undefined, - // }) - // }) - // }) - // }) - // }) }) }) diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js index 58090c762..07054d3a3 100644 --- a/backend/src/schema/resolvers/moderation.js +++ b/backend/src/schema/resolvers/moderation.js @@ -31,7 +31,6 @@ export default { return reviewTransactionResponse.records.map(record => record.get('review')) }) const [reviewed] = await reviewWriteTxResultPromise - // Wolle console.log('reviewed: ', reviewed) return reviewed || null } finally { session.close() diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js index 7556b9c9e..f7a2addc4 100644 --- a/backend/src/schema/resolvers/reports.js +++ b/backend/src/schema/resolvers/reports.js @@ -29,12 +29,10 @@ export default { }, ) log(fileReportTransactionResponse) - // Wolle return fileReportTransactionResponse.records.map(transformReturnType) return fileReportTransactionResponse.records.map(record => record.get('filedReport')) }) try { const [filedReport] = await fileReportWriteTxResultPromise - // Wolle console.log('filedReport: ', filedReport) return filedReport || null } finally { session.close() diff --git a/webapp/components/features/ReportList/ReportList.vue b/webapp/components/features/ReportList/ReportList.vue index 865599dee..275ae964f 100644 --- a/webapp/components/features/ReportList/ReportList.vue +++ b/webapp/components/features/ReportList/ReportList.vue @@ -43,13 +43,22 @@ export default { computed: { filterOptions() { return [ - { label: this.$t('moderation.reports.filterLabel.all'), value: { reviewed: null, closed: null } }, + { + label: this.$t('moderation.reports.filterLabel.all'), + value: { reviewed: null, closed: null }, + }, { label: this.$t('moderation.reports.filterLabel.unreviewed'), value: { reviewed: false, closed: false }, }, - { label: this.$t('moderation.reports.filterLabel.reviewed'), value: { reviewed: true, closed: false } }, - { label: this.$t('moderation.reports.filterLabel.closed'), value: { reviewed: null, closed: true } }, + { + label: this.$t('moderation.reports.filterLabel.reviewed'), + value: { reviewed: true, closed: false }, + }, + { + label: this.$t('moderation.reports.filterLabel.closed'), + value: { reviewed: null, closed: true }, + }, ] }, modalData() { diff --git a/webapp/components/features/ReportsTable/ReportsTable.vue b/webapp/components/features/ReportsTable/ReportsTable.vue index 5736cc716..3892c0b12 100644 --- a/webapp/components/features/ReportsTable/ReportsTable.vue +++ b/webapp/components/features/ReportsTable/ReportsTable.vue @@ -25,11 +25,7 @@