From 0875406bf8c8b3dd8a63576b849e2e9427f30f30 Mon Sep 17 00:00:00 2001
From: jdg <jd@infdj.com>
Date: Sat, 25 Jun 2022 09:23:59 +0000
Subject: [PATCH] x

---
 appinfo/info.xml                |  2 +-
 css/style.css                   |  6 +++---
 js/WikiPages.js                 |  5 ++++-
 lib/Db/WikiMapper.php           |  4 ++--
 lib/Helper/WikiHelper.php       | 19 +++++++------------
 lib/Service/WikiPageService.php |  4 +++-
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index b5a8497..0235f27 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -13,7 +13,7 @@
     <category>organization</category>
     <bugs>https://git.jd.guillen.io/wiki4nextcloud/issues</bugs>
     <dependencies>
-        <nextcloud min-version="12" max-version="24"/>
+        <nextcloud min-version="12" max-version="25"/>
     </dependencies>
     <navigations>
         <navigation>
diff --git a/css/style.css b/css/style.css
index fc02da3..bd2ee96 100644
--- a/css/style.css
+++ b/css/style.css
@@ -5,15 +5,15 @@ li[data-id="wikis"] select {
 li[class^="wikiPage-lvl-"] a::before {
 	display: inline-block; 
 }
-.wikiPage-lvl-1 a::before {
+.wikiPage-lvl-1>a::before {
 	content: "•"; 
 	width: 1em;
 }
-.wikiPage-lvl-2 a::before {
+.wikiPage-lvl-2>a::before {
 	content: "• •";
 	width: 1.5em;
 }
-.wikiPage-lvl-3 a::before {
+.wikiPage-lvl-3>a::before {
 	content: "• • •";
 	width: 2em;
 }
diff --git a/js/WikiPages.js b/js/WikiPages.js
index a642d32..1eda561 100644
--- a/js/WikiPages.js
+++ b/js/WikiPages.js
@@ -12,6 +12,8 @@ class WikiPages {
     clear() {
         this.wikiId = null;
         this.ul.querySelectorAll('[data-page-id]').forEach( x=>x.remove() );
+
+        document.querySelectorAll('#app-navigation .active').forEach(e=>e.class.remove('.active'))
     }
 
     getWikiId() {
@@ -167,6 +169,7 @@ class WikiPages {
             } while(nextNode && nextNode.dataset.pid!=parent.dataset.pid);
         }
 
+        let link2folder = OC.generateUrl('/apps/files?fileid='+pageId);
         let li = document.createElement("li");
         li.classList.add(`wikiPage-lvl-${lvl}`);
         li.dataset.pageId = pageId;
@@ -190,7 +193,7 @@ class WikiPages {
 		<div class="app-navigation-entry-menu">
 		<ul>
             <li>
-                <button data-id="openFolder" class="icon-folder">Open Folder</button>
+                <a data-id="openFolder" class="icon-folder" href="${link2folder}">Open Folder</a>
             </li>
 			<li>
 				<button data-id="add" class="icon-add">Add Page</button>
diff --git a/lib/Db/WikiMapper.php b/lib/Db/WikiMapper.php
index d0aaf7a..f35c055 100644
--- a/lib/Db/WikiMapper.php
+++ b/lib/Db/WikiMapper.php
@@ -45,12 +45,12 @@ class WikiMapper extends QBMapper {
 
         if ($filter) {
             if (array_key_exists('title',$filter) ) {
-                $qb->where(
+                $qb->andwhere(
                     $qb->expr()->eq('title', $qb->createNamedParameter($filter['title']))
                 );
             }                    
             if (array_key_exists('fileId',$filter) ) {
-                $qb->where(
+                $qb->andwhere(
                     $qb->expr()->eq('file_id', $qb->createNamedParameter($filter['fileId']))
                 );
             }      
diff --git a/lib/Helper/WikiHelper.php b/lib/Helper/WikiHelper.php
index 1286463..d761661 100644
--- a/lib/Helper/WikiHelper.php
+++ b/lib/Helper/WikiHelper.php
@@ -81,8 +81,7 @@ class WikiHelper {
             if ( $this->wikiFolder->nodeExists($path) ) {
                 $this->getFileByName(self::WIKI_FILE)->putContent($data);
             } else {
-                $this->wikiFolder
-                    ->newFile(self::WIKI_FILE, $data);
+                $this->wikiFolder->newFile(self::WIKI_FILE, $data);
             }
         } catch(\Exception $ex) {
             return false;
@@ -154,26 +153,22 @@ class WikiHelper {
     public function getWikiPageContent($id): string {
         try {
             $pageFolder = $this->getFolderById($id);
-            $path = $pageFolder->getInternalPath().'/'.self::WIKI_FILE_CONTENT;
-            if ( $this->wikiFolder->nodeExists($path) ) {
-                return $this->getFileByName(self::WIKI_FILE_CONTENT)->getContent();
+            if ( $pageFolder->nodeExists(self::WIKI_FILE_CONTENT) ) {
+                return $pageFolder->get(self::WIKI_FILE_CONTENT)->getContent();
             }
-            $this->wikiFolder->newFile(self::WIKI_FILE_CONTENT, '');
         } catch(\Exception $ex) {
             return null;
         }
         return '';
-    }    
+    }
 
     public function update(int $id, string $content) {
         try {
             $pageFolder = $this->getFolderById($id);
-            $path = $pageFolder->getInternalPath().'/'.self::WIKI_FILE_CONTENT;
-            if ( $this->wikiFolder->nodeExists($path) ) {
-                $this->getFileByName(self::WIKI_FILE_CONTENT)->putContent($content);
+            if ( $pageFolder->nodeExists(self::WIKI_FILE_CONTENT) ) {
+                $pageFolder->get(self::WIKI_FILE_CONTENT)->putContent($content);
             } else {
-                $this->wikiFolder
-                    ->newFile(self::WIKI_FILE_CONTENT, $content);
+                $pageFolder->newFile(self::WIKI_FILE_CONTENT, $content);
             }
         } catch(\Exception $ex) {
             return false;
diff --git a/lib/Service/WikiPageService.php b/lib/Service/WikiPageService.php
index adfbf67..c428096 100644
--- a/lib/Service/WikiPageService.php
+++ b/lib/Service/WikiPageService.php
@@ -45,7 +45,9 @@ class WikiPageService {
     public function find(int $wikiId, int $id, string $userId) {
         try {
             $wiki = $this->mapper->find($wikiId, $userId);
-            $wikiPageContent = $this->wikiHelper->setFolderId($wiki->getFileId())->getWikiPageContent($id);
+            $wikiPageContent = $this->wikiHelper
+                                    ->setFolderId($wiki->getFileId())
+                                    ->getWikiPageContent($id);
         } catch(Exception $e) {
             $this->handleException($e);
         }