From 6be6ab809251a716068c63475f650ec234dce44c Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Tue, 20 Sep 2022 23:07:02 +0200 Subject: [PATCH 01/18] Add mutation and unit test for duplication --- server/books/managers.py | 27 +++++++ server/books/models/contentblock.py | 3 + server/books/schema/mutations/__init__.py | 4 +- server/books/schema/mutations/contentblock.py | 19 +++++ .../tests/test_duplicate_content_blocks.py | 76 +++++++++++++++++++ 5 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 server/books/managers.py create mode 100644 server/books/tests/test_duplicate_content_blocks.py diff --git a/server/books/managers.py b/server/books/managers.py new file mode 100644 index 00000000..603ff304 --- /dev/null +++ b/server/books/managers.py @@ -0,0 +1,27 @@ +from wagtail.core.models import PageManager +from typing import TYPE_CHECKING + +from core.logger import get_logger + +if TYPE_CHECKING: + from books.models import ContentBlock + +logger = get_logger(__name__) + +class ContentBlockManager(PageManager): + def duplicate(self, content_block: "ContentBlock", user): + try: + new_content_block = self.model( + user_created=True, + owner=user, + contents=content_block.contents, + title=content_block.title, + type=content_block.type, + ) + content_block.add_sibling(instance=new_content_block, pos='right') + revision = new_content_block.save_revision() + revision.publish() + new_content_block.save() + return new_content_block + except Exception as e: + logger.warn(e) diff --git a/server/books/models/contentblock.py b/server/books/models/contentblock.py index bc744823..e6505022 100644 --- a/server/books/models/contentblock.py +++ b/server/books/models/contentblock.py @@ -6,6 +6,7 @@ from wagtail.core.blocks import StreamBlock from wagtail.core.fields import StreamField from wagtail.images.blocks import ImageChooserBlock +from books.managers import ContentBlockManager from core.wagtail_utils import get_default_settings from books.blocks import CMSDocumentBlock, SolutionBlock, TextBlock, BasicKnowledgeBlock, LinkBlock, VideoBlock, \ DocumentBlock, \ @@ -90,6 +91,8 @@ class ContentBlock(StrictHierarchyPage): parent_page_types = ['books.Chapter'] subpage_types = [] + objects = ContentBlockManager() + @property def module(self): return self.get_parent().get_parent().specific diff --git a/server/books/schema/mutations/__init__.py b/server/books/schema/mutations/__init__.py index 3b0c01e9..b0587618 100644 --- a/server/books/schema/mutations/__init__.py +++ b/server/books/schema/mutations/__init__.py @@ -1,5 +1,6 @@ from books.schema.mutations.chapter import UpdateChapterVisibility -from books.schema.mutations.contentblock import MutateContentBlock, AddContentBlock, DeleteContentBlock +from books.schema.mutations.contentblock import DuplicateContentBlock, MutateContentBlock, AddContentBlock, \ + DeleteContentBlock from books.schema.mutations.module import UpdateSolutionVisibility, UpdateLastModule, SyncModuleVisibility from books.schema.mutations.snapshot import CreateSnapshot, ApplySnapshot, ShareSnapshot, UpdateSnapshot, DeleteSnapshot from books.schema.mutations.topic import UpdateLastTopic @@ -9,6 +10,7 @@ class BookMutations(object): mutate_content_block = MutateContentBlock.Field() add_content_block = AddContentBlock.Field() delete_content_block = DeleteContentBlock.Field() + duplicate_content_block = DuplicateContentBlock.Field() update_solution_visibility = UpdateSolutionVisibility.Field() update_last_module = UpdateLastModule.Field() update_last_topic = UpdateLastTopic.Field() diff --git a/server/books/schema/mutations/contentblock.py b/server/books/schema/mutations/contentblock.py index fda65367..43e2d39b 100644 --- a/server/books/schema/mutations/contentblock.py +++ b/server/books/schema/mutations/contentblock.py @@ -143,3 +143,22 @@ class DeleteContentBlock(relay.ClientIDMutation): return cls(success=True) except ContentBlock.DoesNotExist: return cls(success=False, errors='Content block not found') + + +class DuplicateContentBlock(relay.ClientIDMutation): + class Input: + id = graphene.ID(required=True) + + content_block = graphene.Field(ContentBlockNode) + + @classmethod + def mutate_and_get_payload(cls, root, info, **kwargs): + id = from_global_id(kwargs.get('id'))[1] + user = info.context.user + + try: + content_block = ContentBlock.objects.get(pk=id) + new_content_block = ContentBlock.objects.duplicate(content_block=content_block, user=user) + return cls(content_block=new_content_block) + except ContentBlock.DoesNotExist: + return cls(content_block=None) diff --git a/server/books/tests/test_duplicate_content_blocks.py b/server/books/tests/test_duplicate_content_blocks.py new file mode 100644 index 00000000..12f891fb --- /dev/null +++ b/server/books/tests/test_duplicate_content_blocks.py @@ -0,0 +1,76 @@ +from graphql_relay import to_global_id + +from books.factories import ContentBlockFactory, ModuleFactory, ChapterFactory +from books.models import ContentBlock +from core.tests.base_test import SkillboxTestCase + +DUPLICATE_CONTENT_BLOCK_MUTATION = """ +mutation DuplicateContentBlockMutation($input: DuplicateContentBlockInput!) { + duplicateContentBlock(input: $input) { + contentBlock { + id + } + } +} +""" + +CONTENT_BLOCK_QUERY = """ +query ContentBlockQuery($slug: String!) { + module(slug: $slug) { + chapters { + id + contentBlocks { + id + title + type + } + } + } +} +""" + + +class DuplicateContentBlockTestCase(SkillboxTestCase): + def setUp(self) -> None: + self.createDefault() + # + self.slug = 'module' + self.module = ModuleFactory(slug=self.slug) + self.chapter = ChapterFactory(parent=self.module) + self.content_block = ContentBlock( + type=ContentBlock.NORMAL, + title='Title', + ) + self.chapter.add_child(instance=self.content_block) + + def test_duplicate_content_block(self): + result = self.get_client().execute(CONTENT_BLOCK_QUERY, variables={ + 'slug': self.slug + }) + self.assertIsNone(result.errors) + module = result.data.get('module') + chapter = module.get('chapters')[0] + content_blocks = chapter.get('contentBlocks') + self.assertEqual(len(content_blocks), 1) + self.assertEqual(ContentBlock.objects.count(), 1) + + result = self.get_client().execute(DUPLICATE_CONTENT_BLOCK_MUTATION, variables={ + 'input': { + "id": to_global_id('ContentBlockNode', self.content_block.id) + } + }) + self.assertIsNone(result.errors) + duplicate_content_block = result.data.get('duplicateContentBlock') + content_block = duplicate_content_block.get('contentBlock') + # self.assertEqual(content_block['title'], 'Title') + self.assertIsNotNone(content_block['id']) + + result = self.get_client().execute(CONTENT_BLOCK_QUERY, variables={ + 'slug': self.slug + }) + self.assertIsNone(result.errors) + module = result.data.get('module') + chapter = module.get('chapters')[0] + content_blocks = chapter.get('contentBlocks') + self.assertEqual(ContentBlock.objects.count(), 2) + self.assertEqual(len(content_blocks), 2) From 4693d2c01ae570a49c1ed7a1512fdb4892fe4c8b Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Wed, 21 Sep 2022 16:43:51 +0200 Subject: [PATCH 02/18] Add duplicate action to frontend --- .../modules/custom-content-block.spec.js | 8 +++ client/src/components/ContentBlock.vue | 60 +++++++++++++++++-- .../gql/mutations/duplicateContentBlock.gql | 11 ++++ server/books/managers.py | 2 +- server/schema.graphql | 11 ++++ 5 files changed, 86 insertions(+), 6 deletions(-) create mode 100644 client/src/graphql/gql/mutations/duplicateContentBlock.gql diff --git a/client/cypress/integration/frontend/modules/custom-content-block.spec.js b/client/cypress/integration/frontend/modules/custom-content-block.spec.js index 21bf98c8..d569de30 100644 --- a/client/cypress/integration/frontend/modules/custom-content-block.spec.js +++ b/client/cypress/integration/frontend/modules/custom-content-block.spec.js @@ -61,6 +61,14 @@ describe('Custom Content Block', () => { cy.log('Opening More Menu'); cy.getByDataCy('more-options-link').click(); + cy.log('Duplicating Content Block'); + cy.getByDataCy('duplicate-content-block-link').click(); + + cy.get('.content-block').should('have.length', 2); + + cy.log('Opening More Menu'); + cy.getByDataCy('more-options-link').click(); + // check if content block is still there cy.log('Deleting Content Block'); cy.getByDataCy('delete-content-block-link').click(); diff --git a/client/src/components/ContentBlock.vue b/client/src/components/ContentBlock.vue index 77cd254f..2fabf50b 100644 --- a/client/src/components/ContentBlock.vue +++ b/client/src/components/ContentBlock.vue @@ -11,14 +11,27 @@ >
-
  • +
  • + +
    • +
    • -
  • +
  • contentBlock.id === id); + const contentBlocks = insertAtIndex(chapter.contentBlocks, index, contentBlock); + const data = { + chapter: { + ...chapter, + contentBlocks, + }, + }; + store.writeQuery({query, variables, data}); + } + }, + }); + + }, editContentBlock(contentBlock) { const route = { name: EDIT_CONTENT_BLOCK_PAGE, diff --git a/client/src/graphql/gql/mutations/duplicateContentBlock.gql b/client/src/graphql/gql/mutations/duplicateContentBlock.gql new file mode 100644 index 00000000..dbefec53 --- /dev/null +++ b/client/src/graphql/gql/mutations/duplicateContentBlock.gql @@ -0,0 +1,11 @@ +#import "../fragments/contentBlockInterfaceParts.gql" +#import "../fragments/contentBlockParts.gql" + +mutation DuplicateContentBlock($input: DuplicateContentBlockInput!) { + duplicateContentBlock(input: $input) { + contentBlock { + ...ContentBlockInterfaceParts + ...ContentBlockParts + } + } +} diff --git a/server/books/managers.py b/server/books/managers.py index 603ff304..305c8ddd 100644 --- a/server/books/managers.py +++ b/server/books/managers.py @@ -15,7 +15,7 @@ class ContentBlockManager(PageManager): user_created=True, owner=user, contents=content_block.contents, - title=content_block.title, + title=f'{content_block.title} (Kopie)', type=content_block.type, ) content_block.add_sibling(instance=new_content_block, pos='right') diff --git a/server/schema.graphql b/server/schema.graphql index 7a19e840..0cb896a5 100644 --- a/server/schema.graphql +++ b/server/schema.graphql @@ -478,6 +478,16 @@ type DjangoDebugSQL { encoding: String } +input DuplicateContentBlockInput { + id: ID! + clientMutationId: String +} + +type DuplicateContentBlockPayload { + contentBlock: ContentBlockNode + clientMutationId: String +} + type DuplicateName { reason: String } @@ -694,6 +704,7 @@ type Mutation { mutateContentBlock(input: MutateContentBlockInput!): MutateContentBlockPayload addContentBlock(input: AddContentBlockInput!): AddContentBlockPayload deleteContentBlock(input: DeleteContentBlockInput!): DeleteContentBlockPayload + duplicateContentBlock(input: DuplicateContentBlockInput!): DuplicateContentBlockPayload updateSolutionVisibility(input: UpdateSolutionVisibilityInput!): UpdateSolutionVisibilityPayload updateLastModule(input: UpdateLastModuleInput!): UpdateLastModulePayload updateLastTopic(input: UpdateLastTopicInput!): UpdateLastTopicPayload From d84453009538569f99448289a427169e2bb865b3 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Thu, 29 Sep 2022 15:32:41 +0200 Subject: [PATCH 03/18] Add copy of content block before the orignal --- server/books/managers.py | 2 +- server/books/tests/test_duplicate_content_blocks.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/books/managers.py b/server/books/managers.py index 305c8ddd..761d58b7 100644 --- a/server/books/managers.py +++ b/server/books/managers.py @@ -18,7 +18,7 @@ class ContentBlockManager(PageManager): title=f'{content_block.title} (Kopie)', type=content_block.type, ) - content_block.add_sibling(instance=new_content_block, pos='right') + content_block.add_sibling(instance=new_content_block, pos='left') revision = new_content_block.save_revision() revision.publish() new_content_block.save() diff --git a/server/books/tests/test_duplicate_content_blocks.py b/server/books/tests/test_duplicate_content_blocks.py index 12f891fb..c68e3cbb 100644 --- a/server/books/tests/test_duplicate_content_blocks.py +++ b/server/books/tests/test_duplicate_content_blocks.py @@ -74,3 +74,5 @@ class DuplicateContentBlockTestCase(SkillboxTestCase): content_blocks = chapter.get('contentBlocks') self.assertEqual(ContentBlock.objects.count(), 2) self.assertEqual(len(content_blocks), 2) + self.assertTrue('Kopie' in content_blocks[0].get('title')) + self.assertTrue('Kopie' not in content_blocks[1].get('title')) From e30b392b9660c171d904b230b683eddb58e96079 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Thu, 29 Sep 2022 16:40:22 +0200 Subject: [PATCH 04/18] Add cypress test file --- .../e2e/frontend/modules/duplicate-content-block.cy.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts diff --git a/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts b/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts new file mode 100644 index 00000000..ea86f82d --- /dev/null +++ b/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts @@ -0,0 +1,10 @@ +describe('Duplicate Content Block', () => { + beforeEach(() => { + cy.setup(); + }); + it('works', () => { + cy.visit('/'); + + cy.getByDataCy('whatever'); + }); +}); From 2e080d9e333605fb90ffc2b1b665e46fba2f780b Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Thu, 29 Sep 2022 17:23:50 +0200 Subject: [PATCH 05/18] Prevent copying of instrument content blocks Resolves MS-586 --- client/src/components/ContentBlock.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/components/ContentBlock.vue b/client/src/components/ContentBlock.vue index 2fabf50b..4f5cb45f 100644 --- a/client/src/components/ContentBlock.vue +++ b/client/src/components/ContentBlock.vue @@ -11,7 +11,7 @@ >
  • Date: Tue, 4 Oct 2022 17:09:19 +0200 Subject: [PATCH 06/18] Add readonly blocks for contents not editable by users Relates to MS-589 --- .../content-block-form/ContentBlockForm.vue | 36 +++++++-------- .../content-block-form/ContentElement.vue | 44 +++++++++++++++++++ .../components/content-block-form/helpers.js | 17 +++++++ client/src/pages/editContentBlock.vue | 7 +-- 4 files changed, 81 insertions(+), 23 deletions(-) diff --git a/client/src/components/content-block-form/ContentBlockForm.vue b/client/src/components/content-block-form/ContentBlockForm.vue index dd933f50..8f73956b 100644 --- a/client/src/components/content-block-form/ContentBlockForm.vue +++ b/client/src/components/content-block-form/ContentBlockForm.vue @@ -138,7 +138,13 @@ import AddContentLink from '@/components/content-block-form/AddContentLink.vue'; import ContentElement from '@/components/content-block-form/ContentElement.vue'; - import {moveToIndex, removeAtIndex, replaceAtIndex, swapElements} from '@/graphql/immutable-operations'; + import { + insertAtIndex, + moveToIndex, + removeAtIndex, + replaceAtIndex, + swapElements + } from '@/graphql/immutable-operations'; import {CHOOSER, transformInnerContents} from '@/components/content-block-form/helpers.js'; import ContentElementActions from '@/components/content-block-form/ContentElementActions.vue'; @@ -147,7 +153,7 @@ // TODO: refactor this file, it's huuuuuge! interface ContentBlockFormData { - localContentBlock: any; + localContentBlock: any; } export default Vue.extend({ @@ -201,26 +207,16 @@ update(index: number, element: any, parent?: number) { if (parent === undefined) { // element is top level - this.localContentBlock.contents = [ - ...this.localContentBlock.contents.slice(0, index), - element, - ...this.localContentBlock.contents.slice(index + 1), - ]; + this.localContentBlock.contents = insertAtIndex(this.localContentBlock.contents, index, element); } else { const parentBlock = this.localContentBlock.contents[parent]; - this.localContentBlock.contents = [ - ...this.localContentBlock.contents.slice(0, parent), - { - ...parentBlock, - contents: [ - ...parentBlock.contents.slice(0, index), - element, - ...parentBlock.contents.slice(index + 1), - ], - }, - ...this.localContentBlock.contents.slice(parent + 1), - ]; + const newElementContents = insertAtIndex(parentBlock.contents, index, element); + const newBlock = { + ...parentBlock, + contents: newElementContents, + }; + this.localContentBlock.contents = insertAtIndex(this.localContentBlock.contents, index, newBlock); } }, addBlock(afterOuterIndex: number, innerIndex?: number) { @@ -254,7 +250,7 @@ } }, remove(outer: number, inner?: number, askForConfirmation = true) { - if(askForConfirmation) { + if (askForConfirmation) { this.$modal.open('confirm') .then(() => { this.executeRemoval(outer, inner); diff --git a/client/src/components/content-block-form/ContentElement.vue b/client/src/components/content-block-form/ContentElement.vue index 26c24c3e..438a6a07 100644 --- a/client/src/components/content-block-form/ContentElement.vue +++ b/client/src/components/content-block-form/ContentElement.vue @@ -9,6 +9,7 @@ @remove="$emit('remove', false)" /> + import(/* webpackChunkName: "content-forms" */'@/components/content-forms/AssignmentForm'); const TextForm = () => import(/* webpackChunkName: "content-forms" */'@/components/content-forms/TipTap.vue'); const SubtitleForm = () => import(/* webpackChunkName: "content-forms" */'@/components/content-forms/SubtitleForm'); + // readonly blocks + const SurveyBlock = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/SurveyBlock'); + const Solution = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/Solution'); + const ImageBlock = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/ImageBlock'); + const Instruction = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/Instruction'); + const ModuleRoomSlug = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/ModuleRoomSlug'); + const CmsDocumentBlock = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/CmsDocumentBlock'); const CHOOSER = 'content-block-element-chooser-widget'; @@ -91,6 +99,12 @@ AssignmentForm, TextForm, SubtitleForm, + SurveyBlock, + Solution, + ImageBlock, + Instruction, + ModuleRoomSlug, + CmsDocumentBlock, }, computed: { @@ -163,6 +177,36 @@ title: 'Dokument', icon: 'document-icon', }; + case 'survey': + return { + component: 'survey-block', + title: 'Umfrage' + }; + case 'solution': + return { + component: 'solution', + title: 'Lösung' + }; + case 'image_block': + return { + component: 'image-block', + title: 'Bild' + }; + case 'instruction': + return { + component: 'instruction', + title: 'Instruktion' + }; + case 'module_room_slug': + return { + component: 'module-room-slug', + title: 'Raum' + }; + case 'cms_document_block': + return { + component: 'cms-document-block', + title: 'Dokument' + }; } return { component: CHOOSER, diff --git a/client/src/components/content-block-form/helpers.js b/client/src/components/content-block-form/helpers.js index 583be25c..bd5841c3 100644 --- a/client/src/components/content-block-form/helpers.js +++ b/client/src/components/content-block-form/helpers.js @@ -1,5 +1,22 @@ export const CHOOSER = 'content-block-element-chooser-widget'; export const chooserFilter = value => value.type !== CHOOSER; +export const USER_CONTENT_TYPES = ['subtitle', 'link_block', 'video_block', 'image_url_block', 'text_block', 'assignment', 'document_block']; + +/* + Users can only edit certain types of contents, the rest can only be re-ordered. We only care about their id, we won't + send anything else to the server about them + */ +export const simplifyContents = (contents) => { + return contents.map(c => { + if (USER_CONTENT_TYPES.includes(c.type)) { + return c; + } + return { + id: c.id, + type: 'readonly' + }; + }); +}; export const cleanUpContents = (contents) => { let filteredContents = contents diff --git a/client/src/pages/editContentBlock.vue b/client/src/pages/editContentBlock.vue index 2d379f9c..ef98c1c7 100644 --- a/client/src/pages/editContentBlock.vue +++ b/client/src/pages/editContentBlock.vue @@ -14,7 +14,7 @@ import EDIT_CONTENT_BLOCK_MUTATION from '@/graphql/gql/mutations/editContentBlock.gql'; import MODULE_DETAILS_QUERY from '@/graphql/gql/queries/modules/moduleDetailsQuery.gql'; import {setUserBlockType} from '@/helpers/content-block'; - import {cleanUpContents} from '@/components/content-block-form/helpers'; + import {cleanUpContents, simplifyContents} from '@/components/content-block-form/helpers'; // import ContentBlockForm from '@/components/content-block-form/ContentBlockForm'; @@ -62,10 +62,11 @@ methods: { save({title, contents, isAssignment, id}) { - let cleanedContents = cleanUpContents(contents); + const cleanedContents = cleanUpContents(contents); + const simplifiedContents = simplifyContents(cleanedContents); const contentBlock = { title: title, - contents: cleanedContents, + contents: simplifiedContents, type: setUserBlockType(isAssignment), }; const { slug } = this.$route.params; From 4489a8dcf8fb47f0063552b6329b44bba877eceb Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Tue, 4 Oct 2022 17:11:03 +0200 Subject: [PATCH 07/18] Handle contents not editable by users on the server Relates to MS-589 --- server/books/schema/inputs.py | 1 + server/books/schema/mutations/contentblock.py | 2 +- server/books/schema/mutations/utils.py | 17 ++++++++++++----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/server/books/schema/inputs.py b/server/books/schema/inputs.py index 31bd3a3e..99820e11 100644 --- a/server/books/schema/inputs.py +++ b/server/books/schema/inputs.py @@ -13,6 +13,7 @@ class InputTypes(graphene.Enum): document_block = 'document_block' content_list_item = 'content_list_item' subtitle = 'subtitle' + readonly = 'readonly' class ContentElementValueInput(InputObjectType): diff --git a/server/books/schema/mutations/contentblock.py b/server/books/schema/mutations/contentblock.py index 43e2d39b..0cb3a220 100644 --- a/server/books/schema/mutations/contentblock.py +++ b/server/books/schema/mutations/contentblock.py @@ -48,7 +48,7 @@ class MutateContentBlock(relay.ClientIDMutation): content_block.title = title if contents is not None: - content_block.contents = json.dumps([handle_content_block(c, info.context, module) for c in contents]) + content_block.contents = json.dumps([handle_content_block(c, info.context, module, previous_contents=content_block.contents) for c in contents if c is not None]) content_block.save() diff --git a/server/books/schema/mutations/utils.py b/server/books/schema/mutations/utils.py index 821e012f..2579e802 100644 --- a/server/books/schema/mutations/utils.py +++ b/server/books/schema/mutations/utils.py @@ -41,10 +41,11 @@ ALLOWED_BLOCKS = ( 'document_block', 'content_list_item', 'subtitle', + 'readonly' ) -def handle_content_block(content, context=None, module=None, allowed_blocks=ALLOWED_BLOCKS): +def handle_content_block(content, context=None, module=None, allowed_blocks=ALLOWED_BLOCKS, previous_contents=None): # todo: add all the content blocks # todo: sanitize user inputs! if content['type'] not in allowed_blocks: @@ -64,9 +65,10 @@ def handle_content_block(content, context=None, module=None, allowed_blocks=ALLO value = content['value'] if value.get('id') is not None: assignment = get_object(Assignment, value.get('id')) - assignment.title = value.get('title') - assignment.assignment = value.get('assignment') - assignment.save() + if assignment.user_created and assignment.owner == context.user: + assignment.title = value.get('title') + assignment.assignment = value.get('assignment') + assignment.save() else: assignment = Assignment.objects.create( title=value.get('title'), @@ -119,7 +121,12 @@ def handle_content_block(content, context=None, module=None, allowed_blocks=ALLO 'type': 'content_list_item', 'value': [handle_content_block(c, context, module) for c in content['contents']] } - + elif content['type'] == 'readonly' and previous_contents is not None: + # get first item that matches the id + # users can re-order readonly items, but we won't let them change them otherwise, so we just take the + # item from before and ignore anything else + previous_content = next((c for c in previous_contents.raw_data if c['id'] == content['id']), None) + return previous_content return None From 6c2f414dc06a0d26dddc66b77aaf3aed1b76ee45 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Tue, 4 Oct 2022 17:14:13 +0200 Subject: [PATCH 08/18] Add failing test --- server/books/tests/test_duplicate_content_blocks.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/books/tests/test_duplicate_content_blocks.py b/server/books/tests/test_duplicate_content_blocks.py index c68e3cbb..3e83b066 100644 --- a/server/books/tests/test_duplicate_content_blocks.py +++ b/server/books/tests/test_duplicate_content_blocks.py @@ -76,3 +76,7 @@ class DuplicateContentBlockTestCase(SkillboxTestCase): self.assertEqual(len(content_blocks), 2) self.assertTrue('Kopie' in content_blocks[0].get('title')) self.assertTrue('Kopie' not in content_blocks[1].get('title')) + + + def test_duplicate_non_editable_contents(self): + self.assertTrue(False) From 262c9f14251c71850b249230bcc15e836120173d Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Wed, 5 Oct 2022 09:29:56 +0200 Subject: [PATCH 09/18] Add thinglink and infogram blocks --- .../content-block-form/ContentElement.vue | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/client/src/components/content-block-form/ContentElement.vue b/client/src/components/content-block-form/ContentElement.vue index 438a6a07..86868bff 100644 --- a/client/src/components/content-block-form/ContentElement.vue +++ b/client/src/components/content-block-form/ContentElement.vue @@ -62,7 +62,9 @@ const ImageBlock = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/ImageBlock'); const Instruction = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/Instruction'); const ModuleRoomSlug = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/ModuleRoomSlug'); - const CmsDocumentBlock = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/CmsDocumentBlock'); + const CmsDocumentBlock = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/CmsDocumentBlock'); + const ThinglinkBlock = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/ThinglinkBlock'); + const InfogramBlock = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/InfogramBlock'); const CHOOSER = 'content-block-element-chooser-widget'; @@ -105,6 +107,8 @@ Instruction, ModuleRoomSlug, CmsDocumentBlock, + InfogramBlock, + ThinglinkBlock }, computed: { @@ -180,32 +184,42 @@ case 'survey': return { component: 'survey-block', - title: 'Umfrage' + title: 'Umfrage', }; case 'solution': return { component: 'solution', - title: 'Lösung' + title: 'Lösung', }; case 'image_block': return { component: 'image-block', - title: 'Bild' + title: 'Bild', }; case 'instruction': return { component: 'instruction', - title: 'Instruktion' + title: 'Instruktion', }; case 'module_room_slug': return { component: 'module-room-slug', - title: 'Raum' + title: 'Raum', }; case 'cms_document_block': return { component: 'cms-document-block', - title: 'Dokument' + title: 'Dokument', + }; + case 'thinglink_block': + return { + component: 'thinglink-block', + title: 'Illustration' + }; + case 'infogram_block': + return { + component: 'infogram-block', + title: 'Illustration' }; } return { From 35c7da24b20d782b361dced666fc1f6cefbd353a Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Wed, 5 Oct 2022 15:33:12 +0200 Subject: [PATCH 10/18] Disable failing tests temporarily --- client/cypress.e2e.ts | 2 +- .../modules/duplicate-content-block.cy.ts | 16 ++- .../content-block-form/ContentBlockForm.vue | 44 +++---- server/books/factories.py | 2 +- .../tests/test_duplicate_content_blocks.py | 109 +++++++++++++++++- 5 files changed, 138 insertions(+), 35 deletions(-) diff --git a/client/cypress.e2e.ts b/client/cypress.e2e.ts index 32dd7f2c..0025205b 100644 --- a/client/cypress.e2e.ts +++ b/client/cypress.e2e.ts @@ -3,7 +3,7 @@ export default defineConfig( { e2e: { "baseUrl": "http://localhost:8000", specPattern: 'cypress/e2e/e2e/**/*.{spec,cy}.{js,ts}', - supportFile: 'cypress/support/e2e.js', + supportFile: 'cypress/support/e2e.ts', }, "videoUploadOnPasses": false, "reporter": "junit", diff --git a/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts b/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts index ea86f82d..c2bc692c 100644 --- a/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts +++ b/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts @@ -1,10 +1,18 @@ +import {getMinimalMe} from '../../../support/helpers'; + describe('Duplicate Content Block', () => { beforeEach(() => { cy.setup(); }); - it('works', () => { - cy.visit('/'); + it.skip('works', () => { + cy.visit('/fron'); - cy.getByDataCy('whatever'); - }); + const operations = { + MeQuery: getMinimalMe({isTeacher: true}), + }; + cy.mockGraphqlOps({ + operations + }); + cy.getByDataCy('whatever'); + }); }); diff --git a/client/src/components/content-block-form/ContentBlockForm.vue b/client/src/components/content-block-form/ContentBlockForm.vue index 8f73956b..19269ff9 100644 --- a/client/src/components/content-block-form/ContentBlockForm.vue +++ b/client/src/components/content-block-form/ContentBlockForm.vue @@ -207,46 +207,38 @@ update(index: number, element: any, parent?: number) { if (parent === undefined) { // element is top level - this.localContentBlock.contents = insertAtIndex(this.localContentBlock.contents, index, element); + this.localContentBlock.contents = replaceAtIndex(this.localContentBlock.contents, index, element); } else { const parentBlock = this.localContentBlock.contents[parent]; - const newElementContents = insertAtIndex(parentBlock.contents, index, element); + const newElementContents = replaceAtIndex(parentBlock.contents, index, element); const newBlock = { ...parentBlock, contents: newElementContents, }; - this.localContentBlock.contents = insertAtIndex(this.localContentBlock.contents, index, newBlock); + this.localContentBlock.contents = replaceAtIndex(this.localContentBlock.contents, parent, newBlock); } }, addBlock(afterOuterIndex: number, innerIndex?: number) { if (innerIndex !== undefined) { const block = this.localContentBlock.contents[afterOuterIndex]; - this.localContentBlock.contents = [ - ...this.localContentBlock.contents.slice(0, afterOuterIndex), - { - ...block, - contents: [ - ...block.contents.slice(0, innerIndex + 1), - { - id: -1, - type: CHOOSER, - }, - ...block.contents.slice(innerIndex + 1), - ], - }, - ...this.localContentBlock.contents.slice(afterOuterIndex + 1), - ]; - } else { - this.localContentBlock.contents = [ - ...this.localContentBlock.contents.slice(0, afterOuterIndex + 1), - { + const element = { + ...block, + contents: insertAtIndex(block.contents, innerIndex + 1, { id: -1, type: CHOOSER, - includeListOption: true, - }, - ...this.localContentBlock.contents.slice(afterOuterIndex + 1), - ]; + }), + }; + + this.localContentBlock.contents = replaceAtIndex(this.localContentBlock.contents, afterOuterIndex, element); + } else { + const element = { + id: -1, + type: CHOOSER, + includeListOption: true, + }; + + this.localContentBlock.contents = insertAtIndex(this.localContentBlock.contents, afterOuterIndex + 1, element); } }, remove(outer: number, inner?: number, askForConfirmation = true) { diff --git a/server/books/factories.py b/server/books/factories.py index ea40f8d7..531974c0 100644 --- a/server/books/factories.py +++ b/server/books/factories.py @@ -175,7 +175,7 @@ class ContentBlockFactory(BasePageFactory): if stream_field_name in kwargs: """ stream_field_name is most likely 'contents' - this means: if there is a property named contents, us the defined ones in this block. + this means: if there is a property named contents, use the defined ones in this block. otherwise, go into the other block and randomize the contents """ for idx, resource in enumerate(kwargs[stream_field_name]): diff --git a/server/books/tests/test_duplicate_content_blocks.py b/server/books/tests/test_duplicate_content_blocks.py index 3e83b066..3b7b96ce 100644 --- a/server/books/tests/test_duplicate_content_blocks.py +++ b/server/books/tests/test_duplicate_content_blocks.py @@ -1,4 +1,6 @@ from graphql_relay import to_global_id +from wagtail.core.fields import StreamField +from wagtail.tests.utils.form_data import streamfield, nested_form_data, rich_text from books.factories import ContentBlockFactory, ModuleFactory, ChapterFactory from books.models import ContentBlock @@ -77,6 +79,107 @@ class DuplicateContentBlockTestCase(SkillboxTestCase): self.assertTrue('Kopie' in content_blocks[0].get('title')) self.assertTrue('Kopie' not in content_blocks[1].get('title')) - - def test_duplicate_non_editable_contents(self): - self.assertTrue(False) + # def test_duplicate_non_editable_contents(self): + # # contents__0__text_block__text + # nested_form_data({ + # 'content': streamfield([ + # nested_form_data({ + # 'text_block': [ + # ('text', rich_text('Asdf')) + # ] + # }) + # ]) + # }) + # + # contents = [ + # nested_form_data({ + # 'text_block': streamfield([ + # ('text', 'Asdf') + # ]) + # }), + # # { + # # "type": "text_block", + # # "value": { + # # "text": "Asdf" + # # }, + # # }, + # # { + # # "type": "assignment", + # # "value": { + # # "title": "Ein Auftragstitel", + # # "assignment": "Ein Auftrag", + # # }, + # # }, + # # { + # # "type": "image_block", + # # "value": { + # # "path": "/media/original_images/dummy_pZUH02q.jpg" + # # }, + # # }, + # # { + # # "type": "image_url_block", + # # "value": { + # # "title": "Asdf", + # # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg" + # # }, + # # }, + # # { + # # "type": "link_block", + # # "value": { + # # "text": "Asdf", + # # "url": "https://iterativ.ch" + # # }, + # # }, + # # { + # # "type": "solution", + # # "value": { + # # "text": "Asdf", + # # }, + # # }, + # # { + # # "type": "video_block", + # # "value": { + # # "url": "https://www.youtube.com/watch?v=QxQBWR7sntI" + # # }, + # # }, + # # { + # # "type": "document_block", + # # "value": { + # # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg" + # # }, + # # }, + # # { + # # "type": "infogram_block", + # # "value": { + # # "id": "4405271e-dbfb-407e-ac19-0a238cde393f", + # # "title": "Gerät Internetnutzung Jungen" + # # }, + # # }, + # # { + # # "type": "thinglink_block", + # # "value": { + # # "id": "1314204266449076227" + # # }, + # # }, + # # { + # # "type": "subtitle", + # # "value": { + # # "text": "Subtitle" + # # }, + # # }, + # # { + # # "type": "instruction", + # # "value": { + # # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg", + # # "text": "Instruction", + # # }, + # # }, + # # { + # # "type": "module_room_slug", + # # "value": { + # # "title": "Raum", + # # }, + # # }, + # ] + # self.content_block.contents = contents + # self.assertTrue(False) From cb924a8d520da39dc79f5e0a06f85cf374297a53 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Wed, 5 Oct 2022 16:35:35 +0200 Subject: [PATCH 11/18] Prevent editing of existing assignment blocks --- client/src/components/content-block-form/ContentElement.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/src/components/content-block-form/ContentElement.vue b/client/src/components/content-block-form/ContentElement.vue index 86868bff..4d5f049d 100644 --- a/client/src/components/content-block-form/ContentElement.vue +++ b/client/src/components/content-block-form/ContentElement.vue @@ -57,6 +57,7 @@ const TextForm = () => import(/* webpackChunkName: "content-forms" */'@/components/content-forms/TipTap.vue'); const SubtitleForm = () => import(/* webpackChunkName: "content-forms" */'@/components/content-forms/SubtitleForm'); // readonly blocks + const Assignment = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/assignment/Assignment'); const SurveyBlock = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/SurveyBlock'); const Solution = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/Solution'); const ImageBlock = () => import(/* webpackChunkName: "content-forms" */'@/components/content-blocks/ImageBlock'); @@ -108,7 +109,8 @@ ModuleRoomSlug, CmsDocumentBlock, InfogramBlock, - ThinglinkBlock + ThinglinkBlock, + Assignment }, computed: { @@ -171,7 +173,7 @@ }; case 'assignment': return { - component: 'assignment-form', + component: element.id ? 'assignment' : 'assignment-form', // prevent editing of existing assignments title: 'Aufgabe & Ergebnis', icon: 'speech-bubble-icon', }; From 1772e7ec4a4a1daef93c00e0ab4a3a0fd4ff8101 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Wed, 5 Oct 2022 20:11:51 +0200 Subject: [PATCH 12/18] Replace some titles --- client/src/components/content-block-form/ContentElement.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/components/content-block-form/ContentElement.vue b/client/src/components/content-block-form/ContentElement.vue index 4d5f049d..d59555a9 100644 --- a/client/src/components/content-block-form/ContentElement.vue +++ b/client/src/components/content-block-form/ContentElement.vue @@ -186,7 +186,7 @@ case 'survey': return { component: 'survey-block', - title: 'Umfrage', + title: 'Übung', }; case 'solution': return { @@ -216,12 +216,12 @@ case 'thinglink_block': return { component: 'thinglink-block', - title: 'Illustration' + title: 'Interaktive Grafik' }; case 'infogram_block': return { component: 'infogram-block', - title: 'Illustration' + title: 'Interaktive Grafik' }; } return { From 51cfef5e401b8c34470962a0979a74ee027a8c3b Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Wed, 5 Oct 2022 20:12:19 +0200 Subject: [PATCH 13/18] Re-add failing tests --- .../modules/duplicate-content-block.cy.ts | 2 +- .../tests/test_duplicate_content_blocks.py | 208 +++++++++--------- 2 files changed, 105 insertions(+), 105 deletions(-) diff --git a/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts b/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts index c2bc692c..c8f23eaa 100644 --- a/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts +++ b/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts @@ -4,7 +4,7 @@ describe('Duplicate Content Block', () => { beforeEach(() => { cy.setup(); }); - it.skip('works', () => { + it('works', () => { cy.visit('/fron'); const operations = { diff --git a/server/books/tests/test_duplicate_content_blocks.py b/server/books/tests/test_duplicate_content_blocks.py index 3b7b96ce..4d372507 100644 --- a/server/books/tests/test_duplicate_content_blocks.py +++ b/server/books/tests/test_duplicate_content_blocks.py @@ -79,107 +79,107 @@ class DuplicateContentBlockTestCase(SkillboxTestCase): self.assertTrue('Kopie' in content_blocks[0].get('title')) self.assertTrue('Kopie' not in content_blocks[1].get('title')) - # def test_duplicate_non_editable_contents(self): - # # contents__0__text_block__text - # nested_form_data({ - # 'content': streamfield([ - # nested_form_data({ - # 'text_block': [ - # ('text', rich_text('Asdf')) - # ] - # }) - # ]) - # }) - # - # contents = [ - # nested_form_data({ - # 'text_block': streamfield([ - # ('text', 'Asdf') - # ]) - # }), - # # { - # # "type": "text_block", - # # "value": { - # # "text": "Asdf" - # # }, - # # }, - # # { - # # "type": "assignment", - # # "value": { - # # "title": "Ein Auftragstitel", - # # "assignment": "Ein Auftrag", - # # }, - # # }, - # # { - # # "type": "image_block", - # # "value": { - # # "path": "/media/original_images/dummy_pZUH02q.jpg" - # # }, - # # }, - # # { - # # "type": "image_url_block", - # # "value": { - # # "title": "Asdf", - # # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg" - # # }, - # # }, - # # { - # # "type": "link_block", - # # "value": { - # # "text": "Asdf", - # # "url": "https://iterativ.ch" - # # }, - # # }, - # # { - # # "type": "solution", - # # "value": { - # # "text": "Asdf", - # # }, - # # }, - # # { - # # "type": "video_block", - # # "value": { - # # "url": "https://www.youtube.com/watch?v=QxQBWR7sntI" - # # }, - # # }, - # # { - # # "type": "document_block", - # # "value": { - # # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg" - # # }, - # # }, - # # { - # # "type": "infogram_block", - # # "value": { - # # "id": "4405271e-dbfb-407e-ac19-0a238cde393f", - # # "title": "Gerät Internetnutzung Jungen" - # # }, - # # }, - # # { - # # "type": "thinglink_block", - # # "value": { - # # "id": "1314204266449076227" - # # }, - # # }, - # # { - # # "type": "subtitle", - # # "value": { - # # "text": "Subtitle" - # # }, - # # }, - # # { - # # "type": "instruction", - # # "value": { - # # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg", - # # "text": "Instruction", - # # }, - # # }, - # # { - # # "type": "module_room_slug", - # # "value": { - # # "title": "Raum", - # # }, - # # }, - # ] - # self.content_block.contents = contents - # self.assertTrue(False) + def test_duplicate_non_editable_contents(self): + # contents__0__text_block__text + nested_form_data({ + 'content': streamfield([ + nested_form_data({ + 'text_block': [ + ('text', rich_text('Asdf')) + ] + }) + ]) + }) + + contents = [ + nested_form_data({ + 'text_block': streamfield([ + ('text', 'Asdf') + ]) + }), + # { + # "type": "text_block", + # "value": { + # "text": "Asdf" + # }, + # }, + # { + # "type": "assignment", + # "value": { + # "title": "Ein Auftragstitel", + # "assignment": "Ein Auftrag", + # }, + # }, + # { + # "type": "image_block", + # "value": { + # "path": "/media/original_images/dummy_pZUH02q.jpg" + # }, + # }, + # { + # "type": "image_url_block", + # "value": { + # "title": "Asdf", + # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg" + # }, + # }, + # { + # "type": "link_block", + # "value": { + # "text": "Asdf", + # "url": "https://iterativ.ch" + # }, + # }, + # { + # "type": "solution", + # "value": { + # "text": "Asdf", + # }, + # }, + # { + # "type": "video_block", + # "value": { + # "url": "https://www.youtube.com/watch?v=QxQBWR7sntI" + # }, + # }, + # { + # "type": "document_block", + # "value": { + # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg" + # }, + # }, + # { + # "type": "infogram_block", + # "value": { + # "id": "4405271e-dbfb-407e-ac19-0a238cde393f", + # "title": "Gerät Internetnutzung Jungen" + # }, + # }, + # { + # "type": "thinglink_block", + # "value": { + # "id": "1314204266449076227" + # }, + # }, + # { + # "type": "subtitle", + # "value": { + # "text": "Subtitle" + # }, + # }, + # { + # "type": "instruction", + # "value": { + # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg", + # "text": "Instruction", + # }, + # }, + # { + # "type": "module_room_slug", + # "value": { + # "title": "Raum", + # }, + # }, + ] + self.content_block.contents = contents + self.assertTrue(False) From e98831577f3e411a07c3635dc6d90d3f2473f072 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Wed, 5 Oct 2022 20:32:37 +0200 Subject: [PATCH 14/18] Update frontend test --- .../modules/duplicate-content-block.cy.ts | 48 +++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts b/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts index c8f23eaa..da497018 100644 --- a/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts +++ b/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts @@ -5,14 +5,56 @@ describe('Duplicate Content Block', () => { cy.setup(); }); it('works', () => { - cy.visit('/fron'); - const operations = { MeQuery: getMinimalMe({isTeacher: true}), + UpdateLastModule: {}, + ModuleEditModeQuery: { + module: { + } + }, + AssignmentQuery: { + assignment: { + title: 'Ein Assignment', + assignment: 'Eine Beschreibung' + } + }, + ModuleDetailsQuery: { + module: { + chapters: [ + { + contentBlocks: [ + { + type: 'normal', + title: 'Hello there', + contents: [ + { + type: 'text_block', + value: { + text: '

    Asdf

    ' + } + }, + { + type: 'assignment', + value: { + title: 'Ein Auftrag', + assignment: 'Eine Beschreibung', + id: 'abcd' + } + } + + ] + } + ] + } + ] + } + } }; cy.mockGraphqlOps({ operations }); - cy.getByDataCy('whatever'); + cy.visit('/module/some-module'); + + cy.getByDataCy('toggle-editing').click(); }); }); From 2fbd0dccf9cb9bbfe34fc8b9a210135880f87b7d Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Thu, 6 Oct 2022 17:19:25 +0200 Subject: [PATCH 15/18] Fix editing of content list items --- client/src/components/content-block-form/helpers.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/client/src/components/content-block-form/helpers.js b/client/src/components/content-block-form/helpers.js index bd5841c3..51e8c99a 100644 --- a/client/src/components/content-block-form/helpers.js +++ b/client/src/components/content-block-form/helpers.js @@ -11,6 +11,13 @@ export const simplifyContents = (contents) => { if (USER_CONTENT_TYPES.includes(c.type)) { return c; } + console.log(c); + if (c.type === 'content_list_item') { + return { + ...c, + contents: simplifyContents(c.contents) + }; + } return { id: c.id, type: 'readonly' From f7153fc5cbf60714298de8210e93db9ec74e885c Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Thu, 6 Oct 2022 17:58:18 +0200 Subject: [PATCH 16/18] Disable failing test --- .../e2e/frontend/modules/duplicate-content-block.cy.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts b/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts index da497018..f68e6644 100644 --- a/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts +++ b/client/cypress/e2e/frontend/modules/duplicate-content-block.cy.ts @@ -4,7 +4,9 @@ describe('Duplicate Content Block', () => { beforeEach(() => { cy.setup(); }); - it('works', () => { + it.skip('works', () => { + // todo: does not work right now, as the cache does not seem to update for the 'inEditMode' local query. Need to + // make this work for the test to work right. const operations = { MeQuery: getMinimalMe({isTeacher: true}), UpdateLastModule: {}, From ad21cb4588cfc39969acb6f76acce2d3850d3bd3 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Thu, 6 Oct 2022 18:25:14 +0200 Subject: [PATCH 17/18] Disable failing unit test that's difficult to write --- .../tests/test_duplicate_content_blocks.py | 209 +++++++++--------- 1 file changed, 105 insertions(+), 104 deletions(-) diff --git a/server/books/tests/test_duplicate_content_blocks.py b/server/books/tests/test_duplicate_content_blocks.py index 4d372507..7c049102 100644 --- a/server/books/tests/test_duplicate_content_blocks.py +++ b/server/books/tests/test_duplicate_content_blocks.py @@ -79,107 +79,108 @@ class DuplicateContentBlockTestCase(SkillboxTestCase): self.assertTrue('Kopie' in content_blocks[0].get('title')) self.assertTrue('Kopie' not in content_blocks[1].get('title')) - def test_duplicate_non_editable_contents(self): - # contents__0__text_block__text - nested_form_data({ - 'content': streamfield([ - nested_form_data({ - 'text_block': [ - ('text', rich_text('Asdf')) - ] - }) - ]) - }) - - contents = [ - nested_form_data({ - 'text_block': streamfield([ - ('text', 'Asdf') - ]) - }), - # { - # "type": "text_block", - # "value": { - # "text": "Asdf" - # }, - # }, - # { - # "type": "assignment", - # "value": { - # "title": "Ein Auftragstitel", - # "assignment": "Ein Auftrag", - # }, - # }, - # { - # "type": "image_block", - # "value": { - # "path": "/media/original_images/dummy_pZUH02q.jpg" - # }, - # }, - # { - # "type": "image_url_block", - # "value": { - # "title": "Asdf", - # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg" - # }, - # }, - # { - # "type": "link_block", - # "value": { - # "text": "Asdf", - # "url": "https://iterativ.ch" - # }, - # }, - # { - # "type": "solution", - # "value": { - # "text": "Asdf", - # }, - # }, - # { - # "type": "video_block", - # "value": { - # "url": "https://www.youtube.com/watch?v=QxQBWR7sntI" - # }, - # }, - # { - # "type": "document_block", - # "value": { - # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg" - # }, - # }, - # { - # "type": "infogram_block", - # "value": { - # "id": "4405271e-dbfb-407e-ac19-0a238cde393f", - # "title": "Gerät Internetnutzung Jungen" - # }, - # }, - # { - # "type": "thinglink_block", - # "value": { - # "id": "1314204266449076227" - # }, - # }, - # { - # "type": "subtitle", - # "value": { - # "text": "Subtitle" - # }, - # }, - # { - # "type": "instruction", - # "value": { - # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg", - # "text": "Instruction", - # }, - # }, - # { - # "type": "module_room_slug", - # "value": { - # "title": "Raum", - # }, - # }, - ] - self.content_block.contents = contents - self.assertTrue(False) + # def test_duplicate_non_editable_contents(self): + # # todo: find out how to create contents for tests, then re-enable + # # contents__0__text_block__text + # nested_form_data({ + # 'content': streamfield([ + # nested_form_data({ + # 'text_block': [ + # ('text', rich_text('Asdf')) + # ] + # }) + # ]) + # }) + # + # contents = [ + # nested_form_data({ + # 'text_block': streamfield([ + # ('text', 'Asdf') + # ]) + # }), + # # { + # # "type": "text_block", + # # "value": { + # # "text": "Asdf" + # # }, + # # }, + # # { + # # "type": "assignment", + # # "value": { + # # "title": "Ein Auftragstitel", + # # "assignment": "Ein Auftrag", + # # }, + # # }, + # # { + # # "type": "image_block", + # # "value": { + # # "path": "/media/original_images/dummy_pZUH02q.jpg" + # # }, + # # }, + # # { + # # "type": "image_url_block", + # # "value": { + # # "title": "Asdf", + # # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg" + # # }, + # # }, + # # { + # # "type": "link_block", + # # "value": { + # # "text": "Asdf", + # # "url": "https://iterativ.ch" + # # }, + # # }, + # # { + # # "type": "solution", + # # "value": { + # # "text": "Asdf", + # # }, + # # }, + # # { + # # "type": "video_block", + # # "value": { + # # "url": "https://www.youtube.com/watch?v=QxQBWR7sntI" + # # }, + # # }, + # # { + # # "type": "document_block", + # # "value": { + # # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg" + # # }, + # # }, + # # { + # # "type": "infogram_block", + # # "value": { + # # "id": "4405271e-dbfb-407e-ac19-0a238cde393f", + # # "title": "Gerät Internetnutzung Jungen" + # # }, + # # }, + # # { + # # "type": "thinglink_block", + # # "value": { + # # "id": "1314204266449076227" + # # }, + # # }, + # # { + # # "type": "subtitle", + # # "value": { + # # "text": "Subtitle" + # # }, + # # }, + # # { + # # "type": "instruction", + # # "value": { + # # "url": "http://localhost:8000/media/images/dummy_pZUH02q.max-165x165.jpg", + # # "text": "Instruction", + # # }, + # # }, + # # { + # # "type": "module_room_slug", + # # "value": { + # # "title": "Raum", + # # }, + # # }, + # ] + # self.content_block.contents = contents + # self.assertTrue(False) From e7830bb803aadfc2ec9973ad78b0fd6e44f1d0e6 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Mon, 10 Oct 2022 10:22:40 +0200 Subject: [PATCH 18/18] Remove stray console.log --- client/src/components/content-block-form/helpers.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/components/content-block-form/helpers.js b/client/src/components/content-block-form/helpers.js index 51e8c99a..097ec7f9 100644 --- a/client/src/components/content-block-form/helpers.js +++ b/client/src/components/content-block-form/helpers.js @@ -11,7 +11,6 @@ export const simplifyContents = (contents) => { if (USER_CONTENT_TYPES.includes(c.type)) { return c; } - console.log(c); if (c.type === 'content_list_item') { return { ...c,