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

Add snippet placeholder #653

Merged
merged 2 commits into from
May 2, 2024
Merged

Add snippet placeholder #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3dbabfe
Use rdfa aware snippet insert component
piemonkey Apr 29, 2024
06522b4
Add snippet placholder node to regulatory statement edit schema
piemonkey Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/nine-wombats-stare.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"frontend-gelinkt-notuleren": minor
---

Add support for snippet placeholder nodes in regulatory statements
11 changes: 9 additions & 2 deletions app/controllers/regulatory-statements/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ import {
table_of_contents,
} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/table-of-contents-plugin/nodes';
import { document_title } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/document-title-plugin/nodes';
import {
snippetPlaceholder,
snippetPlaceholderView,
} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin/nodes/snippet-placeholder';

import generateExportFromEditorDocument from 'frontend-gelinkt-notuleren/utils/generate-export-from-editor-document';
import ENV from 'frontend-gelinkt-notuleren/config/environment';
Expand All @@ -93,7 +97,8 @@ import {
OCMW,
} from '../../utils/bestuurseenheid-classificatie-codes';

import SnippetInsertComponent from '@lblod/ember-rdfa-editor-lblod-plugins/components/snippet-plugin/snippet-insert';
import SnippetInsertRdfaComponent from '@lblod/ember-rdfa-editor-lblod-plugins/components/snippet-plugin/snippet-insert-rdfa';

export default class RegulatoryStatementsRoute extends Controller {
@service documentService;
@service store;
Expand All @@ -104,7 +109,7 @@ export default class RegulatoryStatementsRoute extends Controller {
@service intl;
editor;
@tracked citationPlugin = citationPlugin(this.config.citation);
SnippetInsert = SnippetInsertComponent;
SnippetInsert = SnippetInsertRdfaComponent;

schema = new Schema({
nodes: {
Expand Down Expand Up @@ -139,6 +144,7 @@ export default class RegulatoryStatementsRoute extends Controller {
invisible_rdfa,
block_rdfa,
link: link(this.config.link),
snippet_placeholder: snippetPlaceholder,
},
marks: {
inline_rdfa,
Expand Down Expand Up @@ -168,6 +174,7 @@ export default class RegulatoryStatementsRoute extends Controller {
codelist: codelistView(controller),
text_variable: textVariableView(controller),
templateComment: templateCommentView(controller),
snippet_placeholder: snippetPlaceholderView(controller),
};
};
}
Expand Down
1 change: 1 addition & 0 deletions app/styles/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
@import "template-comments-plugin";
@import "article-structure-plugin";
@import "worship-plugin";
@import "snippet-plugin";
@import "project/p-annotations"; // @TODO: refactor in ember-rdfa-editor

// give treatment (behandeling) content the same style as other say-documents
Expand Down
21 changes: 11 additions & 10 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"@lblod/ember-acmidm-login": "^2.0.0-beta.1",
"@lblod/ember-environment-banner": "^0.5.0",
"@lblod/ember-mock-login": "0.7.0",
"@lblod/ember-rdfa-editor": "9.7.1",
"@lblod/ember-rdfa-editor-lblod-plugins": "^17.1.1",
"@lblod/ember-rdfa-editor": "9.7.1-dev.67f7224891c720868d2e8ef0e92ce46d76959257",
"@lblod/ember-rdfa-editor-lblod-plugins": "17.1.1-dev.cadbcee954ade2283156a07199d212d7c9be852c",
"@release-it-plugins/lerna-changelog": "^6.0.0",
"broccoli-asset-rev": "^3.0.0",
"broccoli-plugin": "^4.0.7",
Expand Down Expand Up @@ -116,8 +116,8 @@
"ember-concurrency": "^2.3.7",
"ember-modifier": "^3.2.7"
},
"@lblod/ember-rdfa-editor": {
"ember-focus-trap": "^1.1.0"
"@lblod/ember-rdfa-editor-lblod-plugins": {
"@lblod/ember-rdfa-editor": "9.7.1-dev.67f7224891c720868d2e8ef0e92ce46d76959257"
}
},
"engines": {
Expand Down