Merge branch 'keyeh-feat/recursive-folder'

lib/Controller/ApiBase.php

@@ -222,7 +222,7 @@ class ApiBase extends Controller
 
     protected function isRecursive()
     {
-        return null === $this->request->getParam('folder');
+        return null === $this->request->getParam('folder') || $this->request->getParam('recursive');
     }
 
     protected function isArchive()

src/components/Timeline.vue

@@ -323,7 +323,10 @@ export default defineComponent({
 
   methods: {
     async routeChange(to: any, from?: any) {
-      if (from?.path !== to.path) {
+      if (
+        from?.path !== to.path ||
+        JSON.stringify(from.query) !== JSON.stringify(to.query)
+      ) {
         await this.refresh();
       }
 
@@ -634,6 +637,9 @@ export default defineComponent({
       // Folder
       if (this.$route.name === "folders") {
         query.set("folder", utils.getFolderRoutePath(this.config_foldersPath));
+        if (this.$route.query.recursive) {
+          query.set("recursive", "1");
+        }
       }
 
       // Archive

src/components/top-matter/FolderTopMatter.vue

@@ -15,7 +15,21 @@
     </NcBreadcrumbs>
 
     <div class="right-actions">
-      <NcActions :inline="1">
+      <NcActions :inline="2">
+        <NcActionRouter
+          :to="{ query: recursive ? {} : { recursive: '1' } }"
+          close-after-click
+        >
+          {{
+            recursive
+              ? t("memories", "Folder View")
+              : t("memories", "Timeline View")
+          }}
+          <template #icon>
+            <FoldersIcon v-if="recursive" :size="20" />
+            <TimelineIcon v-else :size="20" />
+          </template>
+        </NcActionRouter>
         <NcActionButton
           :aria-label="t('memories', 'Share folder')"
           @click="$refs.shareModal.open(false)"
@@ -41,11 +55,14 @@ const NcBreadcrumb = () =>
   import("@nextcloud/vue/dist/Components/NcBreadcrumb");
 import NcActions from "@nextcloud/vue/dist/Components/NcActions";
 import NcActionButton from "@nextcloud/vue/dist/Components/NcActionButton";
+import NcActionRouter from "@nextcloud/vue/dist/Components/NcActionRouter";
 
 import FolderShareModal from "../modal/FolderShareModal.vue";
 
 import HomeIcon from "vue-material-design-icons/Home.vue";
 import ShareIcon from "vue-material-design-icons/ShareVariant.vue";
+import TimelineIcon from "vue-material-design-icons/ImageMultiple.vue";
+import FoldersIcon from "vue-material-design-icons/FolderMultiple.vue";
 
 export default defineComponent({
   name: "FolderTopMatter",
@@ -54,13 +71,17 @@ export default defineComponent({
     NcBreadcrumb,
     NcActions,
     NcActionButton,
+    NcActionRouter,
     FolderShareModal,
     HomeIcon,
     ShareIcon,
+    TimelineIcon,
+    FoldersIcon,
   },
 
   data: () => ({
     topMatter: null as TopMatterFolder | null,
+    recursive: false,
   }),
 
   watch: {
@@ -92,8 +113,10 @@ export default defineComponent({
               };
             }),
         };
+        this.recursive = this.$route.query.recursive === "1";
       } else {
         this.topMatter = null;
+        this.recursive = false;
       }
     },
   },
@@ -105,12 +128,20 @@ export default defineComponent({
   display: flex;
   vertical-align: middle;
 
+  .breadcrumb {
+    min-width: 0;
+  }
+
   .right-actions {
     margin-right: 40px;
     z-index: 50;
     @media (max-width: 768px) {
       margin-right: 10px;
     }
+
+    :deep span {
+      cursor: pointer;
+    }
   }
 }
-</style>
+</style>

src/components/viewer/Viewer.vue

@@ -814,6 +814,7 @@ export default defineComponent({
           if (this.$route.hash?.startsWith("#v")) {
             this.$router.replace({
               hash: "",
+              query: this.$route.query,
             });
           }
         }