Skip to content
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

Jump to bottom

Custom editor3 blocks #4532

Merged
merged 75 commits into from
Jun 3, 2024
Merged

Custom editor3 blocks #4532

merged 75 commits into from
Jun 3, 2024

Conversation

tomaskikutis
Copy link
Member

BOR-1

This PR contains code already reviewed in #4519.

To see only changes that are unique to this PR, merge this branch to #4519 with --squash --no-commit options.

tomaskikutis and others added 30 commits May 2, 2024 14:04
@tomaskikutis
drop intermediate exports
8592cc3
@thecalcc
Add custom blocks tab, fix adding and deleting vocabularies with no r…
00a2275 
…eload bug
@thecalcc
Changes after review
b3f2011
@tomaskikutis
v1
a89a7e7
@tomaskikutis
move code to reload spellchecker warnings after action is performed
1624796
@tomaskikutis
move spellcheck call componentDidUpdate
87157f7
@tomaskikutis
enable accepting spellchecker suggestions inside table cell
c5d755f
@tomaskikutis
improve interface of getDecorators
6e2620e
@tomaskikutis
disable spellchecking for tables
7f224c8
@tomaskikutis
when spellchecking action is performed - update UI without delay
39b0ad4
@tomaskikutis
drop spellchecker initialization in authoring-react
6ad6a66 
it was moved to Editor3InitializeSpellchecker
@tomaskikutis
remove unused import
b8ecc43
@tomaskikutis
fix unit tests
1ba6944
@tomaskikutis
replace removed unit tests with e2e tests
1c3e597
@thecalcc
IVocabulary type improvements
e9f1057
@tomaskikutis
custom blocks - basics
783c4be
@thecalcc
Custom blocks implementation
b8f6554
@tomaskikutis
use content template when adding a new custom content block
5511714
@tomaskikutis
use tablekind
bc46a2a
@tomaskikutis
drop customToolbarStyle
4b9dbb0
@thecalcc
Custom editor block template with custom formatting options
c15768e
@thecalcc
Merge branch 'develop' into custom-blocks-tab
d94849b
@tomaskikutis
improve naming to make it clear it also applies to tables
69cf80b
@tomaskikutis
rename multiLinePopup to tablePopup
3042e68
@tomaskikutis
improve naming
ab4c4c7
@thecalcc
Changes after review
591a18b
@tomaskikutis
unify toolbar for table based atomic blocks
95c69e1
@thecalcc
Add playwright test
e88d4c1
@tomaskikutis
add vocabularyId to store for custom blocks
71f65fb
@tomaskikutis
Merge branch 'custom-blocks-tab' into custom-editor3-blocks
ceb1e20
tomaskikutis added 17 commits May 23, 2024 13:38
@tomaskikutis
fix lint
b18c5fb
@tomaskikutis
fix applying inline and block styles to tables
0366fb1 
previous implementation used to drop additional data I added to IActiveCell
@tomaskikutis
generate HTML from custom block
5084cfa
@tomaskikutis
fix a unit test
dcb79df
@tomaskikutis
only allow configuring supported formatting options
5fa006d
@tomaskikutis
Merge remote-tracking branch 'konstantin/custom-blocks-tab' into cust…
584b250 
…om-editor3-blocks
@tomaskikutis
minor improvements for testing
2b6e328
@tomaskikutis
[email protected]
812ac28
@tomaskikutis
add e2e tests
9925e49
@tomaskikutis
fix config modal breaking in production build
2f5fa03
@tomaskikutis
Merge branch 'develop' into custom-editor3-blocks
ea6f8c6
@tomaskikutis
fix lint
8b40535
@tomaskikutis
fix order in formatting options select
83202ef
@tomaskikutis
add custom blocks to a list of components that require drag and drop …
e4eebfc 
…support
@tomaskikutis
fix lint
59115ba
@tomaskikutis
minor improvements
6c9392b
@tomaskikutis
only render editor3 toolbar button to add custom block when there are…
2bf4115 
… vocabularies configured
@tomaskikutis tomaskikutis requested a review from thecalcc May 29, 2024 10:38
@tomaskikutis tomaskikutis mentioned this pull request May 29, 2024
Merged
thecalcc
thecalcc reviewed May 29, 2024
View reviewed changes
Copy link
Contributor

@thecalcc thecalcc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good, small changes only

e2e/client/playwright/editor3.spec.ts Outdated Show resolved Hide resolved
e2e/client/playwright/editor3.spec.ts Outdated Show resolved Hide resolved
e2e/client/playwright/page-object-models/settings/content-profile.ts Outdated Show resolved Hide resolved
karma.conf.js Show resolved Hide resolved
scripts/apps/workspace/content/views/FormattingOptionsMultiSelect.tsx Outdated Show resolved Hide resolved
scripts/core/editor3/html/to-html/AtomicBlockParser.ts Outdated Show resolved Hide resolved
scripts/core/editor3/reducers/table.tsx Show resolved Hide resolved
scripts/core/editor3/reducers/table.tsx Show resolved Hide resolved
scripts/core/editor3/reducers/table.tsx Show resolved Hide resolved
scripts/core/helpers/utils.tsx Show resolved Hide resolved
@thecalcc thecalcc self-requested a review May 30, 2024 11:36
@thecalcc
Copy link
Contributor

Fix CI

@tomaskikutis tomaskikutis merged commit 2ec11fa into superdesk:develop Jun 3, 2024
3 checks passed
@petrjasek petrjasek added this to the 2.8 milestone Jun 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thecalcc thecalcc thecalcc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.8
Development

Successfully merging this pull request may close these issues.
3 participants
@tomaskikutis @thecalcc @petrjasek