From cf63b9a4168d7003f3d81e145b68bbd99984b9b2 Mon Sep 17 00:00:00 2001
From: Eugen Ciur <eugen@papermerge.com>
Date: Sun, 14 Nov 2021 09:10:38 +0100
Subject: [PATCH] consider the case of dual panel with one panel as viewer and
another one as commander
---
app/components/commander/index.hbs | 12 +++++++++---
app/components/commander/index.js | 9 +++++++++
app/components/document/index.hbs | 6 +-----
app/components/document/link_to_left.hbs | 2 +-
4 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/app/components/commander/index.hbs b/app/components/commander/index.hbs
index aa195fe..1683188 100644
--- a/app/components/commander/index.hbs
+++ b/app/components/commander/index.hbs
@@ -45,9 +45,15 @@
@selectedNodes={{this.selected_nodes}}
@onCheckboxChange={{this.onCheckboxChange}} >
{{#if (is_equal @hint "left")}}
- <Folder::LinkToLeft
- @node={{node}}
- @extranode={{@extranode}} />
+ {{#if (is_equal node.nodeType "folder")}}
+ <Folder::LinkToLeft
+ @node={{node}}
+ @extranode={{@extranode}} />
+ {{else}}
+ <Document::LinkToLeft
+ @node={{node}}
+ @extranode={{@extranode}} />
+ {{/if}}
{{else}}
<Folder::LinkToRight
@node={{@extranode}}
diff --git a/app/components/commander/index.js b/app/components/commander/index.js
index 4e9218f..06c71e3 100644
--- a/app/components/commander/index.js
+++ b/app/components/commander/index.js
@@ -5,6 +5,15 @@ import { action } from '@ember/object';
export default class CommanderComponent extends Component {
+ /*
+ Arguments:
+
+ @node = current node/folder
+ @extranode = extract node to display (on second panel)
+ @hint = "left" | "right" indicates which of two sides
+ is current panel displayed. @hint is "left" indicates that
+ commander is displayed in left panel.
+ */
// show create new folder modal dialog?
@tracked show_new_folder_modal = false;
diff --git a/app/components/document/index.hbs b/app/components/document/index.hbs
index e45e9ca..0ab46ef 100644
--- a/app/components/document/index.hbs
+++ b/app/components/document/index.hbs
@@ -6,10 +6,6 @@
{{on "change" this.onCheckboxChange}} />
<div class="icon document"></div>
<div class="title">
- <LinkTo
- @route="authenticated.document"
- @model={{@model.id}}>
- {{@model.title}}
- </LinkTo>
+ {{yield}}
</div>
</div>
\ No newline at end of file
diff --git a/app/components/document/link_to_left.hbs b/app/components/document/link_to_left.hbs
index b37c748..b03043f 100644
--- a/app/components/document/link_to_left.hbs
+++ b/app/components/document/link_to_left.hbs
@@ -1,6 +1,6 @@
{{#if @extranode}}
<LinkTo
- @route="authenticated.nodes"
+ @route="authenticated.document"
@model={{@node.id}}
@query={{hash extranode_id=@extranode.id}}>
{{@node.title}}
--
GitLab