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.

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

update ember-data to 3.28.13 #431

Merged
merged 23 commits into from
May 31, 2023
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
17a60df
updated ember-data to 3.28.12
lagartoverde Feb 22, 2023
842f8d9
added await helper to solve ember data issues
lagartoverde Feb 22, 2023
9403347
Merge branch 'master' into internal/update-ember-data
elpoelma Feb 27, 2023
e6c71fd
unfinished work trying to make ember data work
lagartoverde Mar 1, 2023
6393c66
Merge branch 'internal/update-ember-data' of github.com:lblod/fronten…
lagartoverde Mar 1, 2023
b63a9c3
Merge branch 'master' into internal/update-ember-data
elpoelma May 3, 2023
73b8f6b
Merge branch 'master' into internal/update-ember-data
abeforgit May 5, 2023
6c52d83
fix linting
abeforgit May 5, 2023
a37d70b
use trim on fullName getter
elpoelma May 8, 2023
689925d
fix empty strong tag issue
elpoelma May 8, 2023
c67b365
bump ember-data to 3.28.13
elpoelma May 8, 2023
55f4e52
Merge branch 'internal/clean-up-ember-data-models' into internal/upda…
elpoelma May 18, 2023
ff46ccc
add null check to secretary property
elpoelma May 22, 2023
2aab46d
fix functionaris model
elpoelma May 22, 2023
cbf21b6
Merge branch 'internal/clean-up-ember-data-models' into internal/upda…
elpoelma May 22, 2023
21c6202
remove unncessary template awaits
elpoelma May 22, 2023
aa88a9e
move secreary loading back to getter
elpoelma May 22, 2023
c3e3fdd
Merge branch 'internal/clean-up-ember-data-models' into internal/upda…
elpoelma May 22, 2023
301886c
Merge branch 'internal/clean-up-ember-data-models' into internal/upda…
elpoelma May 25, 2023
2a988b8
Merge branch 'internal/clean-up-ember-data-models' into internal/upda…
elpoelma May 31, 2023
de5ea45
Merge branch 'master' into internal/update-ember-data
elpoelma May 31, 2023
fab3a20
Merge branch 'master' into internal/update-ember-data
abeforgit May 31, 2023
1a91380
fix(lint): fix formatting
abeforgit May 31, 2023
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
24 changes: 13 additions & 11 deletions app/components/agendapoint-menu.hbs
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<AuButtonGroup @inline={{true}} role="tablist" aria-label={{t "editor-tabs"}}>
<AuLink @route="agendapoints.edit" class="au-u-margin-bottom-none" @skin="button-secondary" @icon="document" @iconAlignment="left" @model={{@documentContainer.id}}>
{{t "attachments.return"}}
</AuLink>
<AuLink @route="agendapoints.attachments" class="au-u-margin-bottom-none" @skin="button-secondary" @icon="attachment" @iconAlignment="left" @model={{@documentContainer.id}}>
{{t "attachments.attachments"}}
{{#if this.attachmentCount}}( {{this.attachmentCount}} ){{/if}}
</AuLink>
<AuLink @route="agendapoints.revisions" class="au-u-margin-bottom-none" @skin="button-secondary" @icon="draft" @iconAlignment="left" @model={{@documentContainer.id}}>
{{t "agendapoint.revisions"}}
{{#if this.revisionCount}}( {{this.revisionCount}} ){{/if}}
</AuLink>
{{#if @documentContainer}}
<AuLink @route="agendapoints.edit" class="au-u-margin-bottom-none" @skin="button-secondary" @icon="document" @iconAlignment="left" @model={{@documentContainer.id}}>
{{t "attachments.return"}}
</AuLink>
<AuLink @route="agendapoints.attachments" class="au-u-margin-bottom-none" @skin="button-secondary" @icon="attachment" @iconAlignment="left" @model={{@documentContainer.id}}>
{{t "attachments.attachments"}}
{{#if this.attachmentCount}}( {{this.attachmentCount}} ){{/if}}
</AuLink>
<AuLink @route="agendapoints.revisions" class="au-u-margin-bottom-none" @skin="button-secondary" @icon="draft" @iconAlignment="left" @model={{@documentContainer.id}}>
{{t "agendapoint.revisions"}}
{{#if this.revisionCount}}( {{this.revisionCount}} ){{/if}}
</AuLink>
{{/if}}
</AuButtonGroup>
6 changes: 4 additions & 2 deletions app/components/agendapoint-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ export default class AgendapointMenuComponent extends Component {
revisionCountData = trackedFunction(this, async () => {
const containerId = this.args.documentContainer.id;
// We use this little hack to ensure the function is running
// eslint-disable-next-line no-unused-vars
const editorDocument = this.args.editorDocument.id;
if (this.args.editorDocument) {
// eslint-disable-next-line no-unused-vars
const editorDocument = this.args.editorDocument.id;
}
//this has to be here https://github.com/ember-learn/guides-source/issues/1769
await Promise.resolve();
const revisionCountData = await this.store.query('editor-document', {
Expand Down
8 changes: 4 additions & 4 deletions app/components/participation-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ import { action } from '@ember/object';
export default class ParticipationListComponent extends Component {
@tracked popup = false;

get secretary() {
return this.args.secretary;
}

get chairman() {
return this.args.chairman;
}
Expand All @@ -43,10 +47,6 @@ export default class ParticipationListComponent extends Component {
return this.chairman ?? this.args.defaultChairman;
}

get secretary() {
return this.args.secretary;
}

get defaultedSecretary() {
return this.secretary ?? this.args.defaultSecretary;
}
Expand Down
42 changes: 20 additions & 22 deletions app/components/zitting-text-document-container.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,26 @@ import { task } from 'ember-concurrency';
import { action } from '@ember/object';
import { Schema } from '@lblod/ember-rdfa-editor';

import {
doc,
block_rdfa,
blockquote,
bullet_list,
code_block,
hard_break,
heading,
horizontal_rule,
image,
inline_rdfa,
list_item,
ordered_list,
paragraph,
placeholder,
repaired_block,
text,
} from '@lblod/ember-rdfa-editor/nodes';
import { invisible_rdfa } from '@lblod/ember-rdfa-editor/marks/inline-rdfa';

import {
em,
strikethrough,
Expand All @@ -13,37 +33,15 @@ import {
} from '@lblod/ember-rdfa-editor/plugins/text-style';
import { highlight } from '@lblod/ember-rdfa-editor/plugins/highlight/marks/highlight';
import { color } from '@lblod/ember-rdfa-editor/plugins/color/marks/color';
import {
block_rdfa,
hard_break,
horizontal_rule,
invisible_rdfa,
paragraph,
repaired_block,
text,
} from '@lblod/ember-rdfa-editor/nodes';
import {
tableNodes,
tablePlugin,
} from '@lblod/ember-rdfa-editor/plugins/table';
import { link, linkView } from '@lblod/ember-rdfa-editor/nodes/link';
import {
bullet_list,
list_item,
ordered_list,
} from '@lblod/ember-rdfa-editor/plugins/list';
import { placeholder } from '@lblod/ember-rdfa-editor/plugins/placeholder';
import { heading } from '@lblod/ember-rdfa-editor/plugins/heading';
import { blockquote } from '@lblod/ember-rdfa-editor/plugins/blockquote';
import { code_block } from '@lblod/ember-rdfa-editor/plugins/code';
import { image } from '@lblod/ember-rdfa-editor/plugins/image';
import { inline_rdfa } from '@lblod/ember-rdfa-editor/marks';
import date from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/nodes/date';

import { tableKeymap } from '@lblod/ember-rdfa-editor/plugins/table';

import { doc } from '@lblod/ember-rdfa-editor/nodes';

import { tableMenu } from '@lblod/ember-rdfa-editor/plugins/table';

import {
Expand Down
Loading