diff --git a/app/components/breadcrumb/index.js b/app/components/breadcrumb/index.js index c1b8d9f..24d7b9f 100644 --- a/app/components/breadcrumb/index.js +++ b/app/components/breadcrumb/index.js @@ -4,17 +4,7 @@ import Component from '@glimmer/component'; export default class BreadcrumbComponent extends Component { get nodes() { - let current, - _nodes = []; - - current = this.args.node; - - while (current && current.get('id')) { - _nodes.push(current); - current = current.get('parent'); - } - - return _nodes.reverse(); + return this.args.node.breadcrumb; } get query() { diff --git a/app/components/breadcrumb/item.hbs b/app/components/breadcrumb/item.hbs index aec1e10..f509c77 100644 --- a/app/components/breadcrumb/item.hbs +++ b/app/components/breadcrumb/item.hbs @@ -1,12 +1,12 @@ diff --git a/app/models/document.js b/app/models/document.js index 2fa2344..8b437b3 100644 --- a/app/models/document.js +++ b/app/models/document.js @@ -6,6 +6,7 @@ export default class DocumentModel extends NodeModel { @attr image; @attr lang; @attr ocr; + @attr breadcrumb; @attr ocr_status; // `versions` is an Array of DocumentVersion(s) @attr versions; // of type DocumentVersion diff --git a/app/models/folder.js b/app/models/folder.js index 6e5d9b0..4e1159f 100644 --- a/app/models/folder.js +++ b/app/models/folder.js @@ -1,8 +1,12 @@ +import { attr } from '@ember-data/model'; + import NodeModel from './node'; export default class FolderModel extends NodeModel { + @attr breadcrumb; + get nodeType() { return 'folder'; } diff --git a/app/models/node.js b/app/models/node.js index 8f8e6a9..2b6b8cf 100644 --- a/app/models/node.js +++ b/app/models/node.js @@ -4,6 +4,8 @@ export default class NodeModel extends Model { @attr title; @attr tags; @attr model; + @attr breadcrumb; + @belongsTo('node', { async: true, diff --git a/changelog.d/509.fixed.md b/changelog.d/509.fixed.md new file mode 100644 index 0000000..ec5cdd8 --- /dev/null +++ b/changelog.d/509.fixed.md @@ -0,0 +1 @@ +Wrong breadcrumb path when openening document/folder \ No newline at end of file