Merge pull request #431 from lblod/internal/update-ember-data

update ember-data to 3.28.13
lblod · May 31, 2023 · 50c3f1c · 50c3f1c
2 parents cecd37a + 1a91380
commit 50c3f1c
Show file tree

Hide file tree

Showing 5 changed files with 172 additions and 32,525 deletions.
diff --git a/app/components/agendapoint-menu.hbs b/app/components/agendapoint-menu.hbs
@@ -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>
diff --git a/app/components/agendapoint-menu.js b/app/components/agendapoint-menu.js
@@ -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', {

diff --git a/app/components/participation-list.js b/app/components/participation-list.js
@@ -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;
   }
@@ -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;
   }