Wrong breadcrumb path (ciur/papermerge#509)

papermerge · Jan 23, 2023 · 9cee14b · 9cee14b
1 parent 0aaeb75
commit 9cee14b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git 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
@@ -1,12 +1,12 @@
 <li class="breadcrumb-item">
-  {{#if (is_equal @node.title ".inbox")}}
+  {{#if (is_equal @node.[0] ".inbox")}}
     {{#if this.show_spinner}}
       <Spinner @inProgress={{true}} class="text-primary" />
     {{else}}
       <Spinner @inProgress={{false}} class="text-primary" />
     {{/if}}
       <Breadcrumb::Inbox />
-  {{else if (is_equal @node.title ".home")}}
+  {{else if (is_equal @node.[0] ".home")}}
     {{#if this.show_spinner}}
       <Spinner @inProgress={{true}} class="text-primary" />
     {{else}}
@@ -17,14 +17,14 @@
 
   <button
     class="btn btn-link"
-    {{on "click" (perform @onNodeClicked @node.id @hint 'folder')}}
-    {{tooltip title=@node.id placement='bottom' delay=4000}}>
-      {{#if (is_equal @node.title ".inbox")}}
+    {{on "click" (perform @onNodeClicked @node.[1] @hint 'folder')}}
+    {{tooltip title=@node.[1] placement='bottom' delay=4000}}>
+      {{#if (is_equal @node.[0] ".inbox")}}
         Inbox
-      {{else if (is_equal @node.title ".home")}}
+      {{else if (is_equal @node.[0] ".home")}}
         Home
       {{else}}
-        {{@node.title}}
+        {{@node.[0]}}
       {{/if}}
   </button>
 </li>
diff --git 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
@@ -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
@@ -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
@@ -0,0 +1 @@
+Wrong breadcrumb path when openening document/folder
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Wrong breadcrumb path when openening document/folder