From 3c0707579b199cf1524732d40d4f4192342f3201 Mon Sep 17 00:00:00 2001
From: dterefe <daveterefe@gmail.com>
Date: Thu, 6 Jun 2024 13:13:31 +0100
Subject: [PATCH 01/15] first

---
 .../svelte/components/Input/Dropdown.svelte   |  1 +
 .../components/Input/FolderStructure.svelte   | 61 +++++++++++++++
 DUUIWeb/src/lib/svelte/components/Node.svelte | 75 +++++++++++++++++++
 .../src/lib/svelte/components/TreeView.svelte | 54 +++++++++++++
 .../src/routes/processes/+layout.server.ts    |  2 +-
 DUUIWeb/src/routes/processes/+page.svelte     | 68 ++++++++++++++++-
 .../src/routes/processes/ProcessInput.svelte  |  3 +
 7 files changed, 262 insertions(+), 2 deletions(-)
 create mode 100644 DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
 create mode 100644 DUUIWeb/src/lib/svelte/components/Node.svelte
 create mode 100644 DUUIWeb/src/lib/svelte/components/TreeView.svelte

diff --git a/DUUIWeb/src/lib/svelte/components/Input/Dropdown.svelte b/DUUIWeb/src/lib/svelte/components/Input/Dropdown.svelte
index 329d42a..496649c 100644
--- a/DUUIWeb/src/lib/svelte/components/Input/Dropdown.svelte
+++ b/DUUIWeb/src/lib/svelte/components/Input/Dropdown.svelte
@@ -2,6 +2,7 @@
 	@component
 	A Dropdown component where one option can be selected.
 -->
+
 <script lang="ts">
 	import { equals, toTitleCase } from '$lib/duui/utils/text'
 	import type { Placement } from '@floating-ui/dom'
diff --git a/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte b/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
new file mode 100644
index 0000000..6439e38
--- /dev/null
+++ b/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
@@ -0,0 +1,61 @@
+<!--
+	@component
+	A Dropdown component where one option can be selected.
+-->
+
+<script lang="ts">
+    import { equals, toTitleCase } from '$lib/duui/utils/text'
+    import type { Placement } from '@floating-ui/dom'
+    import { faCheck, faChevronDown, type IconDefinition } from '@fortawesome/free-solid-svg-icons'
+    import { TreeView, TreeViewItem, popup, type PopupSettings } from '@skeletonlabs/skeleton'
+    import Fa from 'svelte-fa'
+
+    export let label: string = ''
+    export let name: string = label
+
+    // export let options: string[] | number[]
+    export let selectedItem: string = ""
+
+    function toggleSelectable(e, item) {
+        selectedItem = item;
+    }
+</script>
+
+<TreeView>
+    <TreeViewItem
+        selectable
+        selected={selectedItem === 'images'}
+        label="images"
+        iconF7="folder_fill"
+        onClick={(e) => toggleSelectable(e, 'images')}
+    >
+        <TreeViewItem
+            selectable
+            selected={selectedItem === 'avatar.png'}
+            label="avatar.png"
+            iconF7="photo_fill"
+            onClick={(e) => toggleSelectable(e, 'avatar.png')}
+        />
+        <TreeViewItem
+            selectable
+            selected={selectedItem === 'background.jpg'}
+            label="background.jpg"
+            iconF7="photo_fill"
+            onClick={(e) => toggleSelectable(e, 'background.jpg')}
+        />
+    </TreeViewItem>
+    <TreeViewItem
+        selectable
+        selected={selectedItem === '.gitignore'}
+        label=".gitignore"
+        iconF7="logo_github"
+        onClick={(e) => toggleSelectable(e, '.gitignore')}
+    />
+    <TreeViewItem
+        selectable
+        selected={selectedItem === 'index.html'}
+        label="index.html"
+        iconF7="doc_text_fill"
+        onClick={(e) => toggleSelectable(e, 'index.html')}
+    />
+</TreeView>
diff --git a/DUUIWeb/src/lib/svelte/components/Node.svelte b/DUUIWeb/src/lib/svelte/components/Node.svelte
new file mode 100644
index 0000000..1f91517
--- /dev/null
+++ b/DUUIWeb/src/lib/svelte/components/Node.svelte
@@ -0,0 +1,75 @@
+<script>
+    import { createEventDispatcher } from 'svelte';
+
+    export let tree;
+    const dispatch = createEventDispatcher();
+    const toggleExpansion = () => {
+        tree.expanded = !tree.expanded;
+    };
+
+    const toggleCheck = () => {
+        // update the current node's state here, the UI only need to represent it,
+        // don't need to bind the check state to the UI
+        tree.checked = !tree.checked;
+
+        // emit node 'toggle' event, notify parent compnent to rebuild the entire tree's state
+        dispatch('toggle', {
+            node: tree
+        });
+    };
+</script>
+
+<ul>
+    <li>
+        {#if tree.children}
+            <input
+                    type="checkbox"
+                    data-label={tree.label}
+                    checked={tree.checked}
+                    indeterminate={tree.indeterminate}
+                    on:click={toggleCheck}
+            />
+            <span on:click={toggleExpansion} class="arrow" class:arrowDown={tree.expanded} />
+            <span on:click={toggleCheck}>
+				{tree.label}
+			</span>
+            {#if tree.expanded}
+                {#each tree.children as child}
+                    <svelte:self tree={child} on:toggle />
+                {/each}
+            {/if}
+        {:else}
+            <input
+                    type="checkbox"
+                    data-label={tree.label}
+                    checked={tree.checked}
+                    indeterminate={tree.indeterminate}
+                    on:click={toggleCheck}
+            />
+            <span on:click={toggleCheck}>
+				{tree.label}
+			</span>
+        {/if}
+    </li>
+</ul>
+
+<style>
+    ul {
+        margin: 0;
+        list-style: none;
+        padding-left: 1.2rem;
+        user-select: none;
+    }
+    .arrow::before {
+        --tw-content: '+';
+        content: var(--tw-content);		display: inline-block;
+        cursor: pointer;
+        font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+        font-size: 1rem;
+        line-height: 1.5rem;
+    }
+    .arrowDown::before {
+        --tw-content: '-';
+        content: var(--tw-content);
+    }
+</style>
\ No newline at end of file
diff --git a/DUUIWeb/src/lib/svelte/components/TreeView.svelte b/DUUIWeb/src/lib/svelte/components/TreeView.svelte
new file mode 100644
index 0000000..1918853
--- /dev/null
+++ b/DUUIWeb/src/lib/svelte/components/TreeView.svelte
@@ -0,0 +1,54 @@
+<script context="module">
+    // retain module scoped expansion state for each tree node
+    const _expansionState = {
+        /* treeNodeId: expanded <boolean> */
+    }
+</script>
+<script>
+    //	import { slide } from 'svelte/transition'
+    export let tree
+    const {label, children} = tree
+
+    let expanded = _expansionState[label] || false
+    const toggleExpansion = () => {
+        expanded = _expansionState[label] = !expanded
+    }
+    $: arrowDown = expanded
+</script>
+
+<ul><!-- transition:slide -->
+    <li>
+        {#if children}
+			<span on:click={toggleExpansion}>
+				<span class="arrow" class:arrowDown>&#x25b6</span>
+                {label}
+			</span>
+            {#if expanded}
+                {#each children as child}
+                    <svelte:self tree={child} />
+                {/each}
+            {/if}
+        {:else}
+			<span>
+				<span class="no-arrow"/>
+                {label}
+			</span>
+        {/if}
+    </li>
+</ul>
+
+<style>
+    ul {
+        margin: 0;
+        list-style: none;
+        padding-left: 1.2rem;
+        user-select: none;
+    }
+    .no-arrow { padding-left: 1.0rem; }
+    .arrow {
+        cursor: pointer;
+        display: inline-block;
+        /* transition: transform 200ms; */
+    }
+    .arrowDown { transform: rotate(90deg); }
+</style>
diff --git a/DUUIWeb/src/routes/processes/+layout.server.ts b/DUUIWeb/src/routes/processes/+layout.server.ts
index 4ffbd62..a7f224b 100644
--- a/DUUIWeb/src/routes/processes/+layout.server.ts
+++ b/DUUIWeb/src/routes/processes/+layout.server.ts
@@ -3,7 +3,7 @@ import { redirect } from '@sveltejs/kit'
 import type { LayoutServerLoad } from '../$types'
 
 export const load: LayoutServerLoad = async ({ locals, url, cookies }) => {
-	if (!locals.user) {
+	if (locals.user) {
 		redirect(302, handleLoginRedirect(url))
 	}
 }
diff --git a/DUUIWeb/src/routes/processes/+page.svelte b/DUUIWeb/src/routes/processes/+page.svelte
index 234cb5b..a938de4 100644
--- a/DUUIWeb/src/routes/processes/+page.svelte
+++ b/DUUIWeb/src/routes/processes/+page.svelte
@@ -33,9 +33,11 @@
 		faCloudUpload,
 		faFileArrowUp
 	} from '@fortawesome/free-solid-svg-icons'
-	import { FileDropzone, ProgressBar, getToastStore } from '@skeletonlabs/skeleton'
+	import {FileDropzone, ProgressBar, getToastStore, TreeViewItem, TreeView} from '@skeletonlabs/skeleton'
 	import { onMount } from 'svelte'
+	import Node from '$lib/svelte/components/Node.svelte'
 	import Fa from 'svelte-fa'
+	import FolderStructure from "$lib/svelte/components/Input/FolderStructure.svelte";
 
 	export let data
 	const { user } = data
@@ -229,6 +231,28 @@
 		isValidFileUpload(fileStorage)
 	$: uploadBucketIsValid = isValidS3BucketName(fileStorage.path)
 	$: $userSession
+
+	let folder = {
+		label: 'root',
+		checked: true,
+		expanded: true,
+		children: [
+			{
+				label: 'node A',
+				expanded: true,
+				children: [{ label: 'node Aa' }, { label: 'node Ab' }]
+			},
+			{ label: 'node B' },
+			{ label: 'node C' },
+			{ label: 'node D' }
+		]
+	};
+
+	let selectedItem: string = ""
+
+	function toggleSelectable(e, item) {
+		selectedItem = item;
+	}
 </script>
 
 <svelte:head>
@@ -365,6 +389,48 @@
 								bind:value={$processSettingsStore.settings.language}
 							/>
 
+							<div>
+								<TreeView>
+<!--									<TreeViewItem-->
+<!--											selectable-->
+<!--											selected={selectedItem === 'images'}-->
+<!--											label="images"-->
+<!--											iconF7="folder_fill"-->
+<!--											onClick={(e) => toggleSelectable(e, 'images')}-->
+<!--									>-->
+<!--										<TreeViewItem-->
+<!--												selectable-->
+<!--												selected={selectedItem === 'avatar.png'}-->
+<!--												label="avatar.png"-->
+<!--												iconF7="photo_fill"-->
+<!--												onClick={(e) => toggleSelectable(e, 'avatar.png')}-->
+<!--										/>-->
+<!--										<TreeViewItem-->
+<!--												selectable-->
+<!--												selected={selectedItem === 'background.jpg'}-->
+<!--												label="background.jpg"-->
+<!--												iconF7="photo_fill"-->
+<!--												onClick={(e) => toggleSelectable(e, 'background.jpg')}-->
+<!--										/>-->
+<!--									</TreeViewItem>-->
+									<TreeViewItem
+											selectable
+											selected={selectedItem === '.gitignore'}
+											label=".gitignore"
+											iconF7="logo_github"
+											onClick={(e) => toggleSelectable(e, '.gitignore')}
+									/>
+									<TreeViewItem
+											selectable
+											selected={selectedItem === 'index.html'}
+											label="index.html"
+											iconF7="doc_text_fill"
+											onClick={(e) => toggleSelectable(e, 'index.html')}
+									/>
+								</TreeView>
+							</div>
+
+
 							{#if equals($processSettingsStore.input.provider, IO.Text)}
 								<TextArea
 									label="Document Text"
diff --git a/DUUIWeb/src/routes/processes/ProcessInput.svelte b/DUUIWeb/src/routes/processes/ProcessInput.svelte
index 1125773..829d60c 100644
--- a/DUUIWeb/src/routes/processes/ProcessInput.svelte
+++ b/DUUIWeb/src/routes/processes/ProcessInput.svelte
@@ -12,12 +12,15 @@
 	import TextArea from '$lib/svelte/components/Input/TextArea.svelte'
 	import TextInput from '$lib/svelte/components/Input/TextInput.svelte'
 	import { FileDropzone } from '@skeletonlabs/skeleton'
+	import Node from '$lib/svelte/components/Node.svelte'
 
 	export let input: DUUIDocumentProvider
 	export let language: string = 'Unspecified'
 	export let files: FileList
 
 	$: inputBucketIsValid = isValidS3BucketName(input.path)
+
+
 </script>
 
 <div class="grid gap-4">

From a575ff0fc1dde0c5f3788a90f1404633db66683b Mon Sep 17 00:00:00 2001
From: dterefe <daveterefe@gmail.com>
Date: Fri, 14 Jun 2024 13:51:58 +0100
Subject: [PATCH 02/15] Added Folderpicker

---
 DUUIWeb/package-lock.json                     |   8 +-
 DUUIWeb/package.json                          |   2 +-
 .../lib/svelte/components/FolderIcon.svelte   |  13 ++
 .../components/Input/FolderStructure.svelte   | 160 +++++++++++++-----
 DUUIWeb/src/routes/processes/+page.svelte     |  64 +++----
 5 files changed, 161 insertions(+), 86 deletions(-)
 create mode 100644 DUUIWeb/src/lib/svelte/components/FolderIcon.svelte

diff --git a/DUUIWeb/package-lock.json b/DUUIWeb/package-lock.json
index 3960052..b23ee4e 100644
--- a/DUUIWeb/package-lock.json
+++ b/DUUIWeb/package-lock.json
@@ -23,7 +23,7 @@
         "uuid": "^9.0.0"
       },
       "devDependencies": {
-        "@skeletonlabs/skeleton": "2.0.0",
+        "@skeletonlabs/skeleton": "2.10.0",
         "@skeletonlabs/tw-plugin": "0.1.0",
         "@sveltejs/adapter-auto": "^3.0.0",
         "@sveltejs/kit": "^2.0.0",
@@ -1052,9 +1052,9 @@
       ]
     },
     "node_modules/@skeletonlabs/skeleton": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@skeletonlabs/skeleton/-/skeleton-2.0.0.tgz",
-      "integrity": "sha512-8SaDK3kEUU57cSb/5a984EbINgnOPzShlkwPkduAhqc71SEqhRvx+RlLEpe1174NAYi00oi//LguIAYuVrSfBA==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@skeletonlabs/skeleton/-/skeleton-2.10.0.tgz",
+      "integrity": "sha512-jPdDT9PCkGmlUgsgNvR99bK6N2pWG2GfdapwWqDVZkKIhTsLz4TeJNF3H26Pfkicoj4hNz486+WYa7iSpbn80g==",
       "dev": true,
       "dependencies": {
         "esm-env": "1.0.0"
diff --git a/DUUIWeb/package.json b/DUUIWeb/package.json
index 827cf61..8cd946e 100644
--- a/DUUIWeb/package.json
+++ b/DUUIWeb/package.json
@@ -12,7 +12,7 @@
     "format": "prettier --plugin-search-dir . --write ."
   },
   "devDependencies": {
-    "@skeletonlabs/skeleton": "2.0.0",
+    "@skeletonlabs/skeleton": "2.10.0",
     "@skeletonlabs/tw-plugin": "0.1.0",
     "@sveltejs/adapter-auto": "^3.0.0",
     "@sveltejs/kit": "^2.0.0",
diff --git a/DUUIWeb/src/lib/svelte/components/FolderIcon.svelte b/DUUIWeb/src/lib/svelte/components/FolderIcon.svelte
new file mode 100644
index 0000000..f2fc2c6
--- /dev/null
+++ b/DUUIWeb/src/lib/svelte/components/FolderIcon.svelte
@@ -0,0 +1,13 @@
+<script>
+    import Fa from 'svelte-fa'
+    import { faFolder} from '@fortawesome/free-solid-svg-icons'
+
+    export let icon = faFolder; // Prop to receive the icon name (e.g., "folder")
+    export let size = '1em'; // Optional prop for icon size (default: 1em)
+
+    // Import specific icons as needed (optional, for better performance)
+    // import faStar from '@fortawesome/free-solid-svg-icons/faStar';
+    // import faCog from '@fortawesome/free-solid-svg-icons/faCog';
+</script>
+
+<Fa icon="{icon}" size="{size}" />
\ No newline at end of file
diff --git a/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte b/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
index 6439e38..283a43f 100644
--- a/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
+++ b/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
@@ -1,61 +1,135 @@
 <!--
 	@component
-	A Dropdown component where one option can be selected.
+	A FolderStructure component where one option can be selected.
 -->
 
 <script lang="ts">
     import { equals, toTitleCase } from '$lib/duui/utils/text'
     import type { Placement } from '@floating-ui/dom'
-    import { faCheck, faChevronDown, type IconDefinition } from '@fortawesome/free-solid-svg-icons'
-    import { TreeView, TreeViewItem, popup, type PopupSettings } from '@skeletonlabs/skeleton'
+    import {faCheck, faFolder, faChevronDown, type IconDefinition} from '@fortawesome/free-solid-svg-icons'
+    import { ListBox, ListBoxItem, popup, type PopupSettings } from '@skeletonlabs/skeleton'
+    import { TreeView, TreeViewItem, RecursiveTreeView, type TreeViewNode } from '@skeletonlabs/skeleton'
+    import FolderIcon from "$lib/svelte/components/FolderIcon.svelte";
+
     import Fa from 'svelte-fa'
+    import type {ComponentType} from "svelte";
 
     export let label: string = ''
     export let name: string = label
 
-    // export let options: string[] | number[]
-    export let selectedItem: string = ""
+    export let options: string[] | number[] = []
+    export let value: string | number = ""
+
+    export let placement: Placement = 'bottom-start'
+
+    export let offset: number = 4
+
+    export let style: string = 'input-wrapper'
+    export let rounded: string = 'rounded-md'
+    export let border: string = 'border'
+    export let textAlign: string = 'text-start'
+
+    let icon: IconDefinition = faFolder
+
+    const dropdown: PopupSettings = {
+        event: 'click',
+        target: name,
+        placement: placement,
+        closeQuery: '.listbox-item',
+        middleware: {
+            offset: offset
+        }
+    }
+
+    let checkedNodes : string[] = []
+    let indeterminateNodes: string[] = []
+
+    let myTreeViewNodes: TreeViewNode[] = [
+        {
+            id: '1',
+            content: 'Folder 1',
+            children: [
+                {
+                    id: '2',
+                    content: 'Folder 2'
+                },
+                {
+                    id: '3',
+                    content: 'Folder 3'
+                }
+            ]
+        },
+        {
+            id: '4',
+            content: 'Folder 5'
+        }
+    ]
+    // myTreeViewNodes[0]["unique-id"].children[0].lead = FolderIcon
+
+    let addFolderIcon = (node: TreeViewNode) => {
+        node.lead = FolderIcon
+        if (node.children) {
+            for (let child of node.children) {
+                addFolderIcon(child)
+            }
+        }
+    }
+
+    for (let node of myTreeViewNodes) {
+        addFolderIcon(node)
+    }
+
+    let getNode = (nodes: TreeViewNode[], id: string) => {
+        let getNode1 = (node: TreeViewNode) => {
+            if (node.id === id) return node;
+
+            if (node.children) {
+                for (let child of node.children) {
+                    let result = getNode1(child)
+                    if (result) return result
+                }
+            }
+            return null;
+        }
+
+        for (let node of nodes) {
+            let result = getNode1(node)
+            if (result) return result
+        }
+        return null;
+    }
 
-    function toggleSelectable(e, item) {
-        selectedItem = item;
+    let displayCheckedNodes = (nodes: string[]) => {
+        let filtered = checkedNodes.filter(x => !getNode(myTreeViewNodes, x)?.children)
+        return filtered.map((x) => " " + getNode(myTreeViewNodes, x).content)
     }
+
 </script>
 
-<TreeView>
-    <TreeViewItem
-        selectable
-        selected={selectedItem === 'images'}
-        label="images"
-        iconF7="folder_fill"
-        onClick={(e) => toggleSelectable(e, 'images')}
+<div class="label flex flex-col md:min-w-[220px]">
+    {#if label}
+        <span class="form-label text-start">{label} </span>
+    {/if}
+    <button
+            class="flex items-center !justify-between gap-2 px-3 py-2 leading-6 border rounded-md input-wrapper"
+            use:popup={dropdown}
     >
-        <TreeViewItem
-            selectable
-            selected={selectedItem === 'avatar.png'}
-            label="avatar.png"
-            iconF7="photo_fill"
-            onClick={(e) => toggleSelectable(e, 'avatar.png')}
-        />
-        <TreeViewItem
-            selectable
-            selected={selectedItem === 'background.jpg'}
-            label="background.jpg"
-            iconF7="photo_fill"
-            onClick={(e) => toggleSelectable(e, 'background.jpg')}
+        <span>{displayCheckedNodes(checkedNodes)}</span>
+
+        <Fa {icon} />
+    </button>
+</div>
+<div data-popup={name}>
+    <div class="popup-solid p-1 md:min-w-[768px]">
+        <RecursiveTreeView
+            selection
+            multiple
+            relational
+            bind:checkedNodes={checkedNodes}
+            bind:indeterminateNodes={indeterminateNodes}
+            nodes={myTreeViewNodes}
+
         />
-    </TreeViewItem>
-    <TreeViewItem
-        selectable
-        selected={selectedItem === '.gitignore'}
-        label=".gitignore"
-        iconF7="logo_github"
-        onClick={(e) => toggleSelectable(e, '.gitignore')}
-    />
-    <TreeViewItem
-        selectable
-        selected={selectedItem === 'index.html'}
-        label="index.html"
-        iconF7="doc_text_fill"
-        onClick={(e) => toggleSelectable(e, 'index.html')}
-    />
-</TreeView>
+    </div>
+
+</div>
diff --git a/DUUIWeb/src/routes/processes/+page.svelte b/DUUIWeb/src/routes/processes/+page.svelte
index a938de4..9665dfa 100644
--- a/DUUIWeb/src/routes/processes/+page.svelte
+++ b/DUUIWeb/src/routes/processes/+page.svelte
@@ -31,7 +31,8 @@
 		faCheck,
 		faCloud,
 		faCloudUpload,
-		faFileArrowUp
+		faFileArrowUp,
+		faFolder
 	} from '@fortawesome/free-solid-svg-icons'
 	import {FileDropzone, ProgressBar, getToastStore, TreeViewItem, TreeView} from '@skeletonlabs/skeleton'
 	import { onMount } from 'svelte'
@@ -390,44 +391,31 @@
 							/>
 
 							<div>
-								<TreeView>
-<!--									<TreeViewItem-->
-<!--											selectable-->
-<!--											selected={selectedItem === 'images'}-->
-<!--											label="images"-->
-<!--											iconF7="folder_fill"-->
-<!--											onClick={(e) => toggleSelectable(e, 'images')}-->
-<!--									>-->
-<!--										<TreeViewItem-->
-<!--												selectable-->
-<!--												selected={selectedItem === 'avatar.png'}-->
-<!--												label="avatar.png"-->
-<!--												iconF7="photo_fill"-->
-<!--												onClick={(e) => toggleSelectable(e, 'avatar.png')}-->
-<!--										/>-->
-<!--										<TreeViewItem-->
-<!--												selectable-->
-<!--												selected={selectedItem === 'background.jpg'}-->
-<!--												label="background.jpg"-->
-<!--												iconF7="photo_fill"-->
-<!--												onClick={(e) => toggleSelectable(e, 'background.jpg')}-->
-<!--										/>-->
+
+								<FolderStructure />
+
+<!--								<TreeView selection >-->
+<!--									<TreeViewItem>-->
+<!--										<svelte:fragment slot="lead"><Fa icon={faFolder}  /></svelte:fragment>-->
+<!--										(item 1)-->
+<!--										<svelte:fragment slot="children">-->
+<!--											<TreeViewItem>-->
+<!--												(Child 1)-->
+<!--												<svelte:fragment slot="children">-->
+<!--													<TreeViewItem>-->
+<!--														(Child of Child 1)-->
+<!--													</TreeViewItem>-->
+<!--													<TreeViewItem>-->
+<!--														(Child of Child 2)-->
+<!--													</TreeViewItem>-->
+<!--												</svelte:fragment>-->
+<!--											</TreeViewItem>-->
+<!--											<TreeViewItem>-->
+<!--												(Child 2)-->
+<!--											</TreeViewItem>-->
+<!--										</svelte:fragment>-->
 <!--									</TreeViewItem>-->
-									<TreeViewItem
-											selectable
-											selected={selectedItem === '.gitignore'}
-											label=".gitignore"
-											iconF7="logo_github"
-											onClick={(e) => toggleSelectable(e, '.gitignore')}
-									/>
-									<TreeViewItem
-											selectable
-											selected={selectedItem === 'index.html'}
-											label="index.html"
-											iconF7="doc_text_fill"
-											onClick={(e) => toggleSelectable(e, 'index.html')}
-									/>
-								</TreeView>
+<!--								</TreeView>-->
 							</div>
 
 

From ae54b1d221fc0e1563c67e45ae8023f14897cba0 Mon Sep 17 00:00:00 2001
From: dterefe <daveterefe@gmail.com>
Date: Fri, 21 Jun 2024 12:35:10 +0100
Subject: [PATCH 03/15] Started adding interface to receive a FolderStructure
 from the server.

---
 DUUIWeb/src/lib/duui/io.ts                    |  7 ++-
 .../components/Input/FolderStructure.svelte   |  8 +--
 DUUIWeb/src/routes/processes/+page.svelte     | 57 ++-----------------
 3 files changed, 13 insertions(+), 59 deletions(-)

diff --git a/DUUIWeb/src/lib/duui/io.ts b/DUUIWeb/src/lib/duui/io.ts
index 111307e..a5adadf 100644
--- a/DUUIWeb/src/lib/duui/io.ts
+++ b/DUUIWeb/src/lib/duui/io.ts
@@ -34,7 +34,7 @@ export type DUUIDocumentProvider = {
 	file_extension: FileExtension
 }
 
-export type IOProvider = 'Dropbox' | 'Minio' | 'File' | 'Text' | 'None'
+export type IOProvider = 'Dropbox' | 'Minio' | 'File' | 'Text' | 'NextCloud' | 'None'
 export type FileExtension = '.txt' | '.xmi' | '.gz'
 
 export enum IO {
@@ -42,13 +42,14 @@ export enum IO {
 	File = 'File',
 	Minio = 'Minio',
 	Text = 'Text',
+	NextCloud = 'NextCloud',
 	None = 'None'
 }
 
-export const IO_INPUT: string[] = ['Dropbox', 'File', 'Minio', 'Text']
+export const IO_INPUT: string[] = ['Dropbox', 'File', 'Minio', 'Text', 'NextCloud']
 export const INPUT_EXTENSIONS: string[] = ['.txt', '.xmi', '.gz']
 
-export const IO_OUTPUT: string[] = ['Dropbox', 'Minio', 'None']
+export const IO_OUTPUT: string[] = ['Dropbox', 'Minio', 'NextCloud', 'None']
 export const OUTPUT_EXTENSIONS: string[] = ['.txt', '.xmi']
 
 export const isCloudProvider = (provider: string) => {
diff --git a/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte b/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
index 283a43f..f754e08 100644
--- a/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
+++ b/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
@@ -16,6 +16,7 @@
 
     export let label: string = ''
     export let name: string = label
+    export let isMultiple = false
 
     export let options: string[] | number[] = []
     export let value: string | number = ""
@@ -100,7 +101,7 @@
     }
 
     let displayCheckedNodes = (nodes: string[]) => {
-        let filtered = checkedNodes.filter(x => !getNode(myTreeViewNodes, x)?.children)
+        let filtered = checkedNodes.filter(x => !getNode(myTreeViewNodes, x)?.children || !isMultiple)
         return filtered.map((x) => " " + getNode(myTreeViewNodes, x).content)
     }
 
@@ -122,9 +123,8 @@
 <div data-popup={name}>
     <div class="popup-solid p-1 md:min-w-[768px]">
         <RecursiveTreeView
-            selection
-            multiple
-            relational
+            multiple={isMultiple}
+            relational={true}
             bind:checkedNodes={checkedNodes}
             bind:indeterminateNodes={indeterminateNodes}
             nodes={myTreeViewNodes}
diff --git a/DUUIWeb/src/routes/processes/+page.svelte b/DUUIWeb/src/routes/processes/+page.svelte
index 9665dfa..77400c4 100644
--- a/DUUIWeb/src/routes/processes/+page.svelte
+++ b/DUUIWeb/src/routes/processes/+page.svelte
@@ -22,6 +22,7 @@
 	import { processSettingsStore, userSession } from '$lib/store.js'
 	import Checkbox from '$lib/svelte/components/Input/Checkbox.svelte'
 	import Dropdown from '$lib/svelte/components/Input/Dropdown.svelte'
+	import FolderStructure from "$lib/svelte/components/Input/FolderStructure.svelte";
 	import Number from '$lib/svelte/components/Input/Number.svelte'
 	import TextArea from '$lib/svelte/components/Input/TextArea.svelte'
 	import TextInput from '$lib/svelte/components/Input/TextInput.svelte'
@@ -31,14 +32,12 @@
 		faCheck,
 		faCloud,
 		faCloudUpload,
-		faFileArrowUp,
-		faFolder
+		faFileArrowUp
 	} from '@fortawesome/free-solid-svg-icons'
-	import {FileDropzone, ProgressBar, getToastStore, TreeViewItem, TreeView} from '@skeletonlabs/skeleton'
-	import { onMount } from 'svelte'
-	import Node from '$lib/svelte/components/Node.svelte'
 	import Fa from 'svelte-fa'
-	import FolderStructure from "$lib/svelte/components/Input/FolderStructure.svelte";
+	import {FileDropzone, ProgressBar, getToastStore} from '@skeletonlabs/skeleton'
+	import { onMount } from 'svelte'
+
 
 	export let data
 	const { user } = data
@@ -232,28 +231,6 @@
 		isValidFileUpload(fileStorage)
 	$: uploadBucketIsValid = isValidS3BucketName(fileStorage.path)
 	$: $userSession
-
-	let folder = {
-		label: 'root',
-		checked: true,
-		expanded: true,
-		children: [
-			{
-				label: 'node A',
-				expanded: true,
-				children: [{ label: 'node Aa' }, { label: 'node Ab' }]
-			},
-			{ label: 'node B' },
-			{ label: 'node C' },
-			{ label: 'node D' }
-		]
-	};
-
-	let selectedItem: string = ""
-
-	function toggleSelectable(e, item) {
-		selectedItem = item;
-	}
 </script>
 
 <svelte:head>
@@ -391,31 +368,7 @@
 							/>
 
 							<div>
-
 								<FolderStructure />
-
-<!--								<TreeView selection >-->
-<!--									<TreeViewItem>-->
-<!--										<svelte:fragment slot="lead"><Fa icon={faFolder}  /></svelte:fragment>-->
-<!--										(item 1)-->
-<!--										<svelte:fragment slot="children">-->
-<!--											<TreeViewItem>-->
-<!--												(Child 1)-->
-<!--												<svelte:fragment slot="children">-->
-<!--													<TreeViewItem>-->
-<!--														(Child of Child 1)-->
-<!--													</TreeViewItem>-->
-<!--													<TreeViewItem>-->
-<!--														(Child of Child 2)-->
-<!--													</TreeViewItem>-->
-<!--												</svelte:fragment>-->
-<!--											</TreeViewItem>-->
-<!--											<TreeViewItem>-->
-<!--												(Child 2)-->
-<!--											</TreeViewItem>-->
-<!--										</svelte:fragment>-->
-<!--									</TreeViewItem>-->
-<!--								</TreeView>-->
 							</div>
 
 

From deef8c5df5d2c95a0449bd7ff307a7a094b6f63e Mon Sep 17 00:00:00 2001
From: dterefe <daveterefe@gmail.com>
Date: Fri, 5 Jul 2024 09:15:24 +0200
Subject: [PATCH 04/15] Partially embedded Nextcloud and GoogleDrive into the
 frontend.

---
 .gitignore                                    |   2 +-
 DUUIRestService/config.ini                    |   8 +-
 DUUIRestService/pom.xml                       |  69 +++---
 .../document/DUUIDocumentProvider.java        |   4 +-
 .../duui/analysis/document/Provider.java      |   1 +
 .../processes/DUUIProcessController.java      |   6 +
 .../controllers/users/DUUIUserController.java |  21 +-
 .../duui/api/storage/DUUIMongoDBStorage.java  |  28 +--
 .../duui/apps/LanguageDetectionFastText.java  |  44 ++--
 DUUIWeb/.gitignore                            |   2 +-
 DUUIWeb/package-lock.json                     | 177 +++++++++++++++
 DUUIWeb/package.json                          |   3 +-
 DUUIWeb/src/app.d.ts                          |  13 ++
 DUUIWeb/src/routes/+page.svelte               |   4 +-
 .../account/(auth)/googledrive/+error.svelte  |  16 ++
 .../(auth)/googledrive/+page.server.ts        |  34 +++
 .../account/(auth)/googledrive/+page.svelte   |  25 +++
 .../routes/account/(auth)/login/+page.svelte  |   7 +-
 .../account/(auth)/register/+page.svelte      |   6 +-
 DUUIWeb/src/routes/account/+page.server.ts    |  25 ++-
 DUUIWeb/src/routes/account/+page.svelte       | 208 +++++++++++++++++-
 DUUIWeb/src/routes/api/users/+server.ts       |   3 +-
 DUUIWeb/src/routes/api/users/admin/+server.ts |   1 -
 .../src/routes/processes/+layout.server.ts    |   2 +-
 24 files changed, 618 insertions(+), 91 deletions(-)
 create mode 100644 DUUIWeb/src/routes/account/(auth)/googledrive/+error.svelte
 create mode 100644 DUUIWeb/src/routes/account/(auth)/googledrive/+page.server.ts
 create mode 100644 DUUIWeb/src/routes/account/(auth)/googledrive/+page.svelte

diff --git a/.gitignore b/.gitignore
index 957f937..20107bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,7 @@ node_modules
 tmp/duui
 
 Monitoring/*
-.env
+DUUIWeb/.env
 
 temp/*
 DUUIRestService/config.properties
diff --git a/DUUIRestService/config.ini b/DUUIRestService/config.ini
index 87b6c88..8616026 100644
--- a/DUUIRestService/config.ini
+++ b/DUUIRestService/config.ini
@@ -6,7 +6,7 @@ HOST=0.0.0.0
 FILE_UPLOAD_DIRECTORY=
 MONGO_HOST=
 MONGO_PORT=
-MONGO_DB=
-MONGO_USER=
-MONGO_PASSWORD=
-MONGO_DB_CONNECTION_STRING=
+MONGO_DB=DUUI
+MONGO_USER=testuser
+MONGO_PASSWORD=test
+MONGO_DB_CONNECTION_STRING=mongodb+srv://testuser:test@duui.7pbduda.mongodb.net/?retryWrites=true&w=majority&appName=DUUI
diff --git a/DUUIRestService/pom.xml b/DUUIRestService/pom.xml
index 33c3ba6..f9f8867 100644
--- a/DUUIRestService/pom.xml
+++ b/DUUIRestService/pom.xml
@@ -101,23 +101,23 @@
                 <!--generate types dynamically -->
                 <groupId>org.apache.uima</groupId>
                 <artifactId>jcasgen-maven-plugin</artifactId>
-                <version>2.9.0</version>
+                <version>3.5.0</version>
                 <configuration>
                     <limitToProject>true</limitToProject>
                     <typeSystemIncludes>
-                        <include>src/main/resources/org/texttechnologylab/types/reproducibleAnnotations.xml
-                        </include>
+                        <include>src/main/resources/org/texttechnologylab/types/*</include>
+                        <!--                        <include>src/main/resources/org/texttechnologylab/types/reproducibleAnnotations.xml</include>-->
                     </typeSystemIncludes>
                 </configuration>
-                <executions>
-                    <execution>
-                        <!--call it in the generate-source phase -->
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <!--                <executions>-->
+                <!--                    <execution>-->
+                <!--                        &lt;!&ndash;call it in the generate-source phase &ndash;&gt;-->
+                <!--                        <phase>generate-sources</phase>-->
+                <!--                        <goals>-->
+                <!--                            <goal>generate</goal>-->
+                <!--                        </goals>-->
+                <!--                    </execution>-->
+                <!--                </executions>-->
             </plugin>
             <!--            <plugin>-->
             <!--                <groupId>org.codehaus.mojo</groupId>-->
@@ -184,9 +184,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.github.texttechnologylab</groupId>
+            <groupId>com.github.dterefe</groupId>
             <artifactId>DockerUnifiedUIMAInterface</artifactId>
-            <version>${duui.version}</version>
+            <version>cba7de43001c0ce35f6effd1b0464aad8f9717be</version>
         </dependency>
 
         <dependency>
@@ -214,13 +214,6 @@
             <version>1.10.0</version>
         </dependency>
 
-
-        <!--        <dependency>-->
-        <!--            <groupId>org.texttechnologylab</groupId>-->
-        <!--            <artifactId>DockerUnifiedUIMAInterface</artifactId>-->
-        <!--            <version>1.0</version>-->
-        <!--        </dependency>-->
-
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
@@ -256,19 +249,37 @@
             <classifier>models-french</classifier>
         </dependency>
 
-        <dependency>
-            <groupId>com.sparkjava</groupId>
-            <artifactId>spark-core</artifactId>
-            <version>2.9.4</version>
-        </dependency>
-
-
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
             <version>4.0.1</version> <!-- Use the appropriate version -->
         </dependency>
-    </dependencies>
+        <!-- https://mvnrepository.com/artifact/org.mortbay.jetty/servlet-api -->
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>3.0.20100224</version>
+        </dependency>
 
+        <dependency>
+            <groupId>com.sparkjava</groupId>
+            <artifactId>spark-core</artifactId>
+            <version>2.9.4</version>
+            <exclusions>
+<!--                <exclusion>-->
+<!--                    <groupId>org.mortbay.jetty</groupId>-->
+<!--                    <artifactId>servlet-api</artifactId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.mortbay.jetty</groupId>-->
+<!--                    <artifactId>jetty</artifactId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.mortbay.jetty</groupId>-->
+<!--                    <artifactId>jetty-util</artifactId>-->
+<!--                </exclusion>-->
+            </exclusions>
+        </dependency>
+    </dependencies>
 
 </project>
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/DUUIDocumentProvider.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/DUUIDocumentProvider.java
index aeec0f9..de74330 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/DUUIDocumentProvider.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/DUUIDocumentProvider.java
@@ -96,7 +96,9 @@ public boolean isText() {
     public boolean isCloudProvider() {
         return provider.equalsIgnoreCase(Provider.DROPBOX)
             || provider.equalsIgnoreCase(Provider.MINIO)
-            || provider.equalsIgnoreCase(Provider.ONEDRIVE);
+            || provider.equalsIgnoreCase(Provider.ONEDRIVE)
+            || provider.equalsIgnoreCase(Provider.NEXTCLOUD)
+            || provider.equalsIgnoreCase(Provider.GOOGLEDRIVE);
     }
 
     public boolean isDatabaseProvider() {
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/Provider.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/Provider.java
index 497f753..c4ed89a 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/Provider.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/Provider.java
@@ -14,4 +14,5 @@ public class Provider {
     public static final String MONGODB = "MongoDB";
     public static final String ONEDRIVE = "OneDrive";
     public static final String NEXTCLOUD = "NextCloud";
+    public static final String GOOGLEDRIVE = "GoogleDrive";
 }
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/processes/DUUIProcessController.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/processes/DUUIProcessController.java
index b554c75..c583b83 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/processes/DUUIProcessController.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/processes/DUUIProcessController.java
@@ -534,6 +534,12 @@ public static IDUUIDocumentHandler getHandler(String provider, String userId) th
 
         } else if (provider.equalsIgnoreCase(Provider.FILE)) {
             return new DUUILocalDocumentHandler();
+        } else if (provider.equalsIgnoreCase(Provider.NEXTCLOUD)) {
+            Document credentials = DUUIUserController.getNextCloudCredentials(user);
+            return  new DUUINextcloudDocumentHandler(
+                        credentials.getString("uri"),
+                        credentials.getString("username"),
+                        credentials.getString("password"));
         }
 
         return null;
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/users/DUUIUserController.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/users/DUUIUserController.java
index 0996b76..710b647 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/users/DUUIUserController.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/users/DUUIUserController.java
@@ -86,6 +86,20 @@ public static Document getMinioCredentials(Document user) {
         return projection.get("connections", Document.class).get("minio", Document.class);
     }
 
+    public static Document getNextCloudCredentials(Document user) {
+        Document projection = DUUIMongoDBStorage
+                .Users()
+                .find(Filters.eq(user.getObjectId("_id")))
+                .projection(Projections.include("connections.nextcloud"))
+                .first();
+
+        if (isNullOrEmpty(projection)) {
+            return new Document();
+        }
+
+        return projection.get("connections", Document.class).get("nextcloud", Document.class);
+    }
+
     /**
      * Get a user by id.
      *
@@ -196,7 +210,7 @@ public static String insertOne(Request request, Response response) {
         }
 
         Document body = Document.parse(request.body());
-
+        System.out.println(body.toJson());
         String email = body.getString("email");
         if (email.isEmpty())
             return missingField(response, "email");
@@ -222,6 +236,7 @@ public static String insertOne(Request request, Response response) {
                 .append("worker_count", role.equalsIgnoreCase(Role.ADMIN) ? 10000 : 500)
                 .append("dropbox", new Document("access_token", null).append("refresh_token", null))
                 .append("minio", new Document("endpoint", null).append("access_key", null).append("secret_key", null))
+                .append("nextcloud", new Document("uri", null).append("username", null).append("password", null))
             );
 
         DUUIMongoDBStorage
@@ -391,6 +406,8 @@ public static String updateOne(Request request, Response response) {
         }
 
         Document body = Document.parse(request.body());
+        System.out.println(body.toJson());
+
         String id = request.params(":id");
 
         List<Bson> __updates = new ArrayList<>();
@@ -398,7 +415,7 @@ public static String updateOne(Request request, Response response) {
 
 
         for (Map.Entry<String, Object> entry : body.entrySet()) {
-            if (!ALLOWED_UPDATES.contains(entry.getKey())) {
+            if (!ALLOWED_UPDATES.contains(entry.getKey()) && !entry.getKey().contains("nextcloud")) {
                 response.status(400);
                 return new Document("error", "Bad Request")
                     .append("message",
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/storage/DUUIMongoDBStorage.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/storage/DUUIMongoDBStorage.java
index ca10c78..c45830e 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/storage/DUUIMongoDBStorage.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/storage/DUUIMongoDBStorage.java
@@ -95,19 +95,21 @@ private DUUIMongoDBStorage() {
     public static MongoClient getClient() {
         if (mongoClient == null) {
             //mongodb://[username:password@]host1[:port1][,...hostN[:portN]][/[defaultauthdb][?options]]
-
-            StringBuilder sb = new StringBuilder();
-            sb.append("mongodb://");
-            sb.append(config.getMongoUser());
-            sb.append(":");
-            sb.append(config.getMongoPassword());
-            sb.append("@");
-            sb.append(config.getMongoHost());
-            sb.append(":").append(config.getMongoPort());
-            sb.append("/?authSource=").append(config.getMongoDatabase());
-
-            mongoClient = MongoClients.create(sb.toString());
-//            mongoClient = MongoClients.create(getConnectionURI());
+            if (getConnectionURI() == null) {
+                StringBuilder sb = new StringBuilder();
+                sb.append("mongodb://");
+                sb.append(config.getMongoUser());
+                sb.append(":");
+                sb.append(config.getMongoPassword());
+                sb.append("@");
+                sb.append(config.getMongoHost());
+                sb.append(":").append(config.getMongoPort());
+                sb.append("/?authSource=").append(config.getMongoDatabase());
+
+                mongoClient = MongoClients.create(sb.toString());
+            } else {
+                mongoClient = MongoClients.create(getConnectionURI());
+            }
         }
         return mongoClient;
     }
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/apps/LanguageDetectionFastText.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/apps/LanguageDetectionFastText.java
index afa29fa..cacb0b3 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/apps/LanguageDetectionFastText.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/apps/LanguageDetectionFastText.java
@@ -24,32 +24,32 @@
 import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.metadata.TypeSystemDescription;
 import org.apache.uima.util.CasIOUtils;
-import org.hucompute.textimager.uima.type.Language_Type;
+import org.hucompute.textimager.uima.type.Language;
 import org.xml.sax.SAXException;
 
 
 public class LanguageDetectionFastText {
 
-    public static class Language extends Annotation {
-        public final static int typeIndexID = JCasRegistry.register(Language.class);
-        public final static int type = typeIndexID;
-
-        public Language(int addr, TOP_Type type) {
-            super(addr, type);
-        }
-
-        public Language(JCas jcas) {
-            super(jcas);
-        }
-
-        public Language(JCas jcas, int begin, int end) {
-            super(jcas, begin, end);
-        }
-
-        public void setValue(String value) {
-            this.jcasType.ll_cas.ll_setStringValue(this.addr, typeIndexID, value);
-        }
-    }
+//    public static class Language extends Annotation {
+//        public final static int typeIndexID = JCasRegistry.register(Language.class);
+//        public final static int type = typeIndexID;
+//
+//        public Language(int addr, TOP_Type type) {
+//            super(addr, type);
+//        }
+//
+//        public Language(JCas jcas) {
+//            super(jcas);
+//        }
+//
+//        public Language(JCas jcas, int begin, int end) {
+//            super(jcas, begin, end);
+//        }
+//
+//        public void setValue(String value) {
+//            this.jcasType.ll_cas.ll_setStringValue(this.addr, typeIndexID, value);
+//        }
+//    }
 
     private static String modelPath;
 
@@ -99,7 +99,7 @@ public void handle(HttpExchange t) throws IOException {
                     Language language = new Language(jc);
                     language.setBegin(sentence.getBegin());
                     language.setEnd(sentence.getEnd());
-                    language.setValue(probLabel.label.replace("__label__", ""));
+                    language.setLanguage(probLabel.label.replace("__label__", ""));
                     language.addToIndexes(jc);
                 }
 
diff --git a/DUUIWeb/.gitignore b/DUUIWeb/.gitignore
index 6635cf5..6cc7287 100644
--- a/DUUIWeb/.gitignore
+++ b/DUUIWeb/.gitignore
@@ -3,7 +3,7 @@ node_modules
 /build
 /.svelte-kit
 /package
-.env
+../.env
 .env.*
 !.env.example
 vite.config.js.timestamp-*
diff --git a/DUUIWeb/package-lock.json b/DUUIWeb/package-lock.json
index b23ee4e..9f9b03b 100644
--- a/DUUIWeb/package-lock.json
+++ b/DUUIWeb/package-lock.json
@@ -15,6 +15,7 @@
         "apexcharts": "^3.45.1",
         "bcrypt": "^5.1.1",
         "dropbox": "^10.34.0",
+        "google-auth-library": "^8.8.0",
         "highlight.js": "^11.9.0",
         "js-yaml": "^4.1.0",
         "lodash": "^4.17.21",
@@ -1602,6 +1603,14 @@
         "node": ">=8"
       }
     },
+    "node_modules/arrify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -1658,6 +1667,25 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/bcrypt": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.1.tgz",
@@ -1671,6 +1699,14 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/bignumber.js": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz",
+      "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -1742,6 +1778,11 @@
         "node": "*"
       }
     },
+    "node_modules/buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
+    },
     "node_modules/builtin-modules": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
@@ -2104,6 +2145,14 @@
       "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
       "dev": true
     },
+    "node_modules/ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "node_modules/electron-to-chromium": {
       "version": "1.4.630",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.630.tgz",
@@ -2433,6 +2482,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -2479,6 +2533,11 @@
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "dev": true
     },
+    "node_modules/fast-text-encoding": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz",
+      "integrity": "sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w=="
+    },
     "node_modules/fastq": {
       "version": "1.16.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
@@ -2670,6 +2729,32 @@
         "node": ">=10"
       }
     },
+    "node_modules/gaxios": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-5.1.3.tgz",
+      "integrity": "sha512-95hVgBRgEIRQQQHIbnxBXeHbW4TqFk4ZDJW7wmVtvYar72FdhRIo1UGOLS2eRAKCPEdPBWu+M7+A33D9CdX9rA==",
+      "dependencies": {
+        "extend": "^3.0.2",
+        "https-proxy-agent": "^5.0.0",
+        "is-stream": "^2.0.0",
+        "node-fetch": "^2.6.9"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/gcp-metadata": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz",
+      "integrity": "sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==",
+      "dependencies": {
+        "gaxios": "^5.0.0",
+        "json-bigint": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -2746,6 +2831,39 @@
       "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
       "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="
     },
+    "node_modules/google-auth-library": {
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-8.9.0.tgz",
+      "integrity": "sha512-f7aQCJODJFmYWN6PeNKzgvy9LI2tYmXnzpNDHEjG5sDNPgGb2FXQyTBnXeSH+PAtpKESFD+LmHw3Ox3mN7e1Fg==",
+      "dependencies": {
+        "arrify": "^2.0.0",
+        "base64-js": "^1.3.0",
+        "ecdsa-sig-formatter": "^1.0.11",
+        "fast-text-encoding": "^1.0.0",
+        "gaxios": "^5.0.0",
+        "gcp-metadata": "^5.3.0",
+        "gtoken": "^6.1.0",
+        "jws": "^4.0.0",
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/google-p12-pem": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-4.0.1.tgz",
+      "integrity": "sha512-WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ==",
+      "dependencies": {
+        "node-forge": "^1.3.1"
+      },
+      "bin": {
+        "gp12-pem": "build/src/bin/gp12-pem.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
@@ -2758,6 +2876,19 @@
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
       "dev": true
     },
+    "node_modules/gtoken": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-6.1.2.tgz",
+      "integrity": "sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ==",
+      "dependencies": {
+        "gaxios": "^5.0.1",
+        "google-p12-pem": "^4.0.0",
+        "jws": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -2957,6 +3088,17 @@
         "@types/estree": "*"
       }
     },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -3001,6 +3143,14 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/json-bigint": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
+      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+      "dependencies": {
+        "bignumber.js": "^9.0.0"
+      }
+    },
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
@@ -3019,6 +3169,25 @@
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
+    "node_modules/jwa": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
+      "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
+      "dependencies": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jws": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
+      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
+      "dependencies": {
+        "jwa": "^2.0.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "node_modules/keyv": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -3359,6 +3528,14 @@
         }
       }
     },
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "engines": {
+        "node": ">= 6.13.0"
+      }
+    },
     "node_modules/node-releases": {
       "version": "2.0.14",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
diff --git a/DUUIWeb/package.json b/DUUIWeb/package.json
index 8cd946e..d8e73d3 100644
--- a/DUUIWeb/package.json
+++ b/DUUIWeb/package.json
@@ -53,6 +53,7 @@
     "lodash": "^4.17.21",
     "svelte-apexcharts": "^1.0.2",
     "svelte-fa": "^3.0.4",
-    "uuid": "^9.0.0"
+    "uuid": "^9.0.0",
+    "google-auth-library": "^8.8.0"
   }
 }
\ No newline at end of file
diff --git a/DUUIWeb/src/app.d.ts b/DUUIWeb/src/app.d.ts
index db46c17..53f59d8 100644
--- a/DUUIWeb/src/app.d.ts
+++ b/DUUIWeb/src/app.d.ts
@@ -40,6 +40,19 @@ interface UserProperties {
 			username: string | null
 			password: string | null
 		}
+		nextcloud?: {
+			uri: string | null
+			username: string | null
+			password: string | null
+		}
+		googleDrive?: {
+			access_token: string | null
+			refresh_token: string | null
+			scope: string | null
+			token_type: string | null
+			id_token: string | null
+			expires_date: number | null
+		}
 	}
 }
 
diff --git a/DUUIWeb/src/routes/+page.svelte b/DUUIWeb/src/routes/+page.svelte
index f4633ee..84b7c49 100644
--- a/DUUIWeb/src/routes/+page.svelte
+++ b/DUUIWeb/src/routes/+page.svelte
@@ -28,7 +28,7 @@
 	 * Logout the user and redirect to the login page.
 	 */
 	const logout = async () => {
-		const response = await fetch('/account/logout', { method: 'PUT' })
+		const response = await fetch('account/logout', { method: 'PUT' })
 		if (response.ok) {
 			userSession.set(undefined)
 
@@ -60,7 +60,7 @@
 						</div>
 
 						<div class="grid md:grid-cols-2 gap-4">
-							{#if $userSession === undefined}
+							{#if $userSession }
 								<a
 									href="/account/register"
 									class="cta button-primary box-shadow !text-xl !justify-center button-modal shadow-md"
diff --git a/DUUIWeb/src/routes/account/(auth)/googledrive/+error.svelte b/DUUIWeb/src/routes/account/(auth)/googledrive/+error.svelte
new file mode 100644
index 0000000..a2f2de6
--- /dev/null
+++ b/DUUIWeb/src/routes/account/(auth)/googledrive/+error.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+	import { page } from '$app/stores'
+</script>
+
+<div class="h-full flex items-center justify-center">
+	<div
+		class="rounded-md hidden sm:block container max-w-screen-sm
+	 mx-auto border border-surface-200 dark:border-surface-500 shadow-md isolate p-4 pr-12"
+	>
+		<div class="flex gap-4 items-center">
+			<p class="text-4xl font-bold">{$page.status}</p>
+			<p>{$page.error?.message}</p>
+		</div>
+		<p class="font-bold">It seems there has been an error on the Server.</p>
+	</div>
+</div>
diff --git a/DUUIWeb/src/routes/account/(auth)/googledrive/+page.server.ts b/DUUIWeb/src/routes/account/(auth)/googledrive/+page.server.ts
new file mode 100644
index 0000000..f0b3e6b
--- /dev/null
+++ b/DUUIWeb/src/routes/account/(auth)/googledrive/+page.server.ts
@@ -0,0 +1,34 @@
+import { redirect } from '@sveltejs/kit'
+import { API_URL, SECRET_CLIENT_ID, SECRET_CLIENT_SECRET } from '$env/static/private'
+import type { PageServerLoad } from './$types'
+import { OAuth2Client } from 'google-auth-library'
+
+
+async function getUserData(access_token) {
+
+	const response = await fetch(`https://www.googleapis.com/oauth2/v3/userinfo?access_token=${access_token}`);
+	console.log('response',response);
+	const data = await response.json();
+	console.log('data',data);
+}
+
+
+export const GET = async ({ url }) => {
+	const redirectURL = 'http://localhost:5173/auth/googledrive/';
+	console.log("asdfsdfasdf")
+	const code = await url.searchParams.get('code')
+
+	try {
+		const oAuth2Client = new  OAuth2Client(
+			SECRET_CLIENT_ID,
+			SECRET_CLIENT_SECRET,
+			redirectURL);
+
+		const r = await oAuth2Client.getToken(code ? code : "");
+		oAuth2Client.setCredentials(r.tokens);
+	} catch (err) {
+		console.error("Error logging: ", err);
+	}
+
+	throw redirect(303, "/account?tab=1");
+}
diff --git a/DUUIWeb/src/routes/account/(auth)/googledrive/+page.svelte b/DUUIWeb/src/routes/account/(auth)/googledrive/+page.svelte
new file mode 100644
index 0000000..057d438
--- /dev/null
+++ b/DUUIWeb/src/routes/account/(auth)/googledrive/+page.svelte
@@ -0,0 +1,25 @@
+<script lang="ts">
+	import { goto } from '$app/navigation'
+	import { faRefresh } from '@fortawesome/free-solid-svg-icons'
+	import { onMount } from 'svelte'
+	import Fa from 'svelte-fa'
+	// export let data
+	// const { success } = data
+
+	onMount(() => {
+		goto('/account?tab=1')
+	})
+</script>
+
+<svelte:head>
+	<title>Google Drive</title>
+</svelte:head>
+
+<div class="h-full w-full flex items-center justify-center p-4">
+	<div class="space-y-8 section-wrapper p-8 flex flex-col items-center">
+		<h1 class="h2">Finishing connection to Google Drive</h1>
+		<hr class="hr" />
+		<Fa icon={faRefresh} spin size="4x" />
+		<p class="text-lg">Do not refresh this page</p>
+	</div>
+</div>
diff --git a/DUUIWeb/src/routes/account/(auth)/login/+page.svelte b/DUUIWeb/src/routes/account/(auth)/login/+page.svelte
index dd0984c..421dd9c 100644
--- a/DUUIWeb/src/routes/account/(auth)/login/+page.svelte
+++ b/DUUIWeb/src/routes/account/(auth)/login/+page.svelte
@@ -22,7 +22,8 @@
 			message = 'Please enter a valid E-Mail address'
 			return
 		}
-		const response = await fetch('/auth/login', {
+
+		const request = {
 			method: 'POST',
 			body: JSON.stringify({
 				email: email,
@@ -31,7 +32,9 @@
 			headers: {
 				'Content-Type': 'application/json'
 			}
-		})
+		}
+
+		const response = await fetch('/auth/login', request)
 
 		const result = await response.json()
 
diff --git a/DUUIWeb/src/routes/account/(auth)/register/+page.svelte b/DUUIWeb/src/routes/account/(auth)/register/+page.svelte
index 26c00e7..1716468 100644
--- a/DUUIWeb/src/routes/account/(auth)/register/+page.svelte
+++ b/DUUIWeb/src/routes/account/(auth)/register/+page.svelte
@@ -29,7 +29,7 @@
 			return
 		}
 
-		const response = await fetch('/auth/register', {
+		const request = {
 			method: 'POST',
 			body: JSON.stringify({
 				email: email,
@@ -39,7 +39,9 @@
 			headers: {
 				'Content-Type': 'application/json'
 			}
-		})
+		}
+
+		const response = await fetch('/auth/register', request)
 
 		const result = await response.json()
 
diff --git a/DUUIWeb/src/routes/account/+page.server.ts b/DUUIWeb/src/routes/account/+page.server.ts
index f7caeed..5131e74 100644
--- a/DUUIWeb/src/routes/account/+page.server.ts
+++ b/DUUIWeb/src/routes/account/+page.server.ts
@@ -1,10 +1,33 @@
-import { API_URL } from '$env/static/private'
+
+import { API_URL, SECRET_CLIENT_ID, SECRET_CLIENT_SECRET } from '$env/static/private'
 import { handleLoginRedirect } from '$lib/utils'
 import { fail, redirect } from '@sveltejs/kit'
 import { DropboxAuth } from 'dropbox'
 import type { PageServerLoad } from './$types'
+import { OAuth2Client } from 'google-auth-library'
+
+// export const actions = {
+// 	OAuth2: async ({}) => {
+// 		alert("sadfasdfasdf")
+// 		console.log("asdfsdfasdf")
+// 		const redirectURL = 'http://localhost:5173/account/auth/googledrive/';
+// 		const oAuth2Client = new  OAuth2Client(
+// 			SECRET_CLIENT_ID,
+// 			SECRET_CLIENT_SECRET,
+// 			redirectURL);
+//
+// 		const authorizeUrl = oAuth2Client.generateAuthUrl({
+// 			access_type: 'offline',
+// 			scope: 'https://www.googleapis.com/auth/userinfo.profile openid',
+// 			prompt: 'consent'
+// 		});
+//
+// 		throw redirect(302, authorizeUrl);
+// 	}
+// }
 
 export const load: PageServerLoad = async ({ locals, cookies, url }) => {
+	console.log('load', locals, cookies, url)
 	if (!locals.user) {
 		redirect(302, handleLoginRedirect(url))
 	}
diff --git a/DUUIWeb/src/routes/account/+page.svelte b/DUUIWeb/src/routes/account/+page.svelte
index 0dd1b69..99683f4 100644
--- a/DUUIWeb/src/routes/account/+page.svelte
+++ b/DUUIWeb/src/routes/account/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+
 	import { page } from '$app/stores'
 	import { COLORS } from '$lib/config.js'
 	import { successToast } from '$lib/duui/utils/ui.js'
@@ -7,7 +8,6 @@
 	import Secret from '$lib/svelte/components/Input/Secret.svelte'
 	import Text from '$lib/svelte/components/Input/TextInput.svelte'
 	import { showConfirmationModal } from '$lib/svelte/utils/modal.js'
-
 	import { goto } from '$app/navigation'
 	import {
 		faAdd,
@@ -46,10 +46,6 @@
 		$userSession.connections = user.connections
 	}
 
-	let minioAccessKey: string = $userSession?.connections.minio.access_key || ''
-	let minioEndpoint: string = $userSession?.connections.minio.endpoint || ''
-	let minioSecretKey: string = $userSession?.connections.minio.secret_key || ''
-
 	$: isDropboxConnected =
 		!!$userSession?.connections.dropbox.access_token &&
 		!!$userSession.connections.dropbox.refresh_token
@@ -59,6 +55,27 @@
 		!!$userSession?.connections.minio.access_key &&
 		!!$userSession?.connections.minio.secret_key
 
+	let minioAccessKey: string = $userSession?.connections.minio.access_key || ''
+	let minioEndpoint: string = $userSession?.connections.minio.endpoint || ''
+	let minioSecretKey: string = $userSession?.connections.minio.secret_key || ''
+
+	$: isNextCloudConnected =
+		!!$userSession?.connections.nextcloud &&
+		!!$userSession?.connections.nextcloud.uri &&
+		!!$userSession?.connections.nextcloud.username &&
+		!!$userSession?.connections.nextcloud.password
+
+	let nextcloudEndpoint: string = $userSession?.connections.nextcloud?.uri || ''
+	let nextcloudUsername: string = $userSession?.connections.nextcloud?.username || ''
+	let nextcloudPassword: string = $userSession?.connections.nextcloud?.password || ''
+
+	$: isGoogleDriveConnected =
+		!!$userSession?.connections.googleDrive &&
+		!!$userSession?.connections.googleDrive.access_token &&
+		!!$userSession?.connections.googleDrive.refresh_token &&
+		!!$userSession?.connections.googleDrive.id_token
+
+
 	$: hasApiKey = !!$userSession?.connections.key
 
 	$: {
@@ -91,7 +108,10 @@
 	}
 
 	const updateUser = async (data: object) => {
-		const response = await fetch('/api/users', { method: 'PUT', body: JSON.stringify(data) })
+		let req = { method: 'PUT', body: JSON.stringify(data) }
+		console.log(req)
+		const response = await fetch('/api/users', req)
+
 		if (response.ok) {
 			toastStore.trigger(successToast('Update successful'))
 		}
@@ -187,6 +207,40 @@
 		}
 	}
 
+	const startGoogleDriveAccess = async () => {
+		window.location.href = "http://localhost:5173/auth/googledrive/"
+	}
+
+	const deleteGoogleDriveAccess = async () => {
+		const confirm = await showConfirmationModal(
+			{
+				title: 'Delete Access for Google Drive',
+				message: `Are you sure you want to revoke access?
+					 You will have to go through the OAuth process again to reconnect.`,
+				textYes: 'Delete'
+			},
+			modalStore
+		)
+
+		if (!confirm) return
+
+		const response = await updateUser({
+			'connections.googleDrive.access_token': null,
+			'connections.googleDrive.refresh_token': null,
+			'connections.googleDrive.id_token': null,
+			'connections.googleDrive.scope': null,
+			'connections.googleDrive.expires_date': null
+		})
+
+		if (response.ok && $userSession && $userSession.connections.googleDrive) {
+			$userSession.connections.googleDrive.access_token = null
+			$userSession.connections.googleDrive.refresh_token = null
+			$userSession.connections.googleDrive.id_token = null
+			$userSession.connections.googleDrive.scope = null
+			$userSession.connections.googleDrive.expires_date = null
+		}
+	}
+
 	const revokeMinioAccess = async () => {
 		const confirm = await showConfirmationModal(
 			{
@@ -217,6 +271,36 @@
 			}
 		}
 	}
+	const revokeNextcloudAccess = async () => {
+		const confirm = await showConfirmationModal(
+			{
+				title: 'Delete Access for NextCloud',
+				message: `Are you sure you want to delete access?`,
+				textYes: 'Delete'
+			},
+			modalStore
+		)
+
+		if (!confirm) return
+
+		const response = await updateUser({
+			'connections.nextcloud.uri': null,
+			'connections.nextcloud.username': null,
+			'connections.nextcloud.password': null
+		})
+
+		if (response.ok) {
+			nextcloudEndpoint = ''
+			nextcloudUsername = ''
+			nextcloudPassword = ''
+
+			if ($userSession && $userSession.connections.nextcloud) {
+				$userSession.connections.nextcloud.uri = null
+				$userSession.connections.nextcloud.username = null
+				$userSession.connections.nextcloud.password = null
+			}
+		}
+	}
 
 	const deleteUser = async (user: { oid: string; email: string; role: string }) => {
 		const confirm = await showConfirmationModal(
@@ -546,6 +630,118 @@
 						for further reading.
 					</p>
 				</div>
+				<div class="section-wrapper p-8 grid grid-rows-[auto_1fr_auto] gap-8">
+					<h2 class="h3 scroll-mt-16" id="minio">NextCloud</h2>
+					<div class="space-y-4">
+						{#if isNextCloudConnected}
+							<p>Your account has been connected to NextCloud successfully.</p>
+						{:else}
+							<p>Enter your NextCloud credentials below to establish a connection.</p>
+						{/if}
+<!--							help="The correct endpoint is the s3 API endpoint. Do not use the Minio Console endpoint!"-->
+						<Text
+							label="Endpoint"
+							style="grow"
+							name="endpoint"
+							bind:value={nextcloudEndpoint}
+						/>
+						<Secret label="Username (Access Key)" name="accessKey" bind:value={nextcloudUsername} />
+						<Secret label="Password (Secret Key)" name="secretKey" bind:value={nextcloudPassword} />
+					</div>
+					<div class="grid md:flex justify-between gap-4">
+						<button
+							class="button-neutral"
+							disabled={!nextcloudEndpoint || !nextcloudUsername || !nextcloudPassword}
+							on:click={() => {
+								updateUser({
+									'connections.nextcloud.uri': nextcloudEndpoint,
+									'connections.nextcloud.username': nextcloudUsername,
+									'connections.nextcloud.password': nextcloudPassword
+								})
+
+								if ($userSession && $userSession.connections.nextcloud) {
+									$userSession.connections.nextcloud.uri = nextcloudEndpoint
+									$userSession.connections.nextcloud.username = nextcloudUsername
+									$userSession.connections.nextcloud.password = nextcloudPassword
+								}
+							}}
+						>
+							<Fa icon={isNextCloudConnected ? faRefresh : faLink} />
+							<span>{isNextCloudConnected ? 'Update' : 'Connect'}</span>
+						</button>
+						{#if isNextCloudConnected}
+							<button class="button-error" on:click={revokeNextcloudAccess}>
+								<Fa icon={faXmarkCircle} />
+								<span>Delete</span>
+							</button>
+						{/if}
+					</div>
+<!--					<p class="text-surface-500 dark:text-surface-200">-->
+<!--						Visit-->
+<!--						<a href="https://min.io/" target="_blank" class="anchor">NextCloud</a>-->
+<!--						for further reading.-->
+<!--					</p>-->
+				</div>
+				<div class="section-wrapper p-8 grid grid-rows-[auto_1fr_auto] gap-8">
+					<h2 class="h3 scroll-mt-16" id="dropbox">Google Drive</h2>
+					<div class="space-y-8">
+						{#if isGoogleDriveConnected}
+							<div>
+								<p>Your Google Drive account has been connected successfully.</p>
+								<p>
+									The folder <span class="badge px-2 mx-2 variant-soft-primary"
+								>Apps/Docker Unified UIMA Interface</span
+								> has been created.
+								</p>
+							</div>
+							<div>
+								<p class="flex-center-4">
+									<Fa icon={faCheck} size="lg" class="text-primary-500" />
+									<span
+									>Read files and folders contained in your <strong>Google Drive Account</strong>
+									</span>
+								</p>
+								<p class="flex-center-4 mb-4">
+									<Fa icon={faCheck} size="lg" class="text-primary-500" />
+									<span>Create files and folders in your <strong>Google Drive Account</strong> </span>
+								</p>
+							</div>
+							<div class="grid md:flex justify-between gap-4">
+								<form method="POST" action="/auth/googleDrive">
+									<button class="button-neutral" type="submit" >
+										<Fa icon={faLink} />
+										<span>Reconnect</span>
+									</button>
+								<form/>
+								<button class="button-error" on:click={deleteGoogleDriveAccess}>
+									<Fa icon={faXmarkCircle} />
+									<span>Delete</span>
+								</button>
+							</div>
+						{:else}
+							<p class="mb-8">
+								By connecting Google Drive and DUUI you can directly read and write data from and to your
+								Google Drive storage.
+							</p>
+							<div class="space-y-2">
+								<p class="flex items-center gap-[22px]">
+									<Fa icon={faFileText} size="lg" class="text-primary-500" />
+									<span
+									>Read files and folders contained in your <strong>Google Drive Storage</strong>
+									</span>
+								</p>
+								<p class="flex-center-4 mb-4">
+									<Fa icon={faFilePen} size="lg" class="text-primary-500" />
+									<span>Create files and folders in your <strong>Google Drive Storage</strong> </span>
+								</p>
+							</div>
+								<button class="button-neutral" on:click={startGoogleDriveAccess}>
+									<Fa icon={faLink} />
+									<span>Connect</span>
+								</button>
+						{/if}
+					</div>
+				</div>
 			</div>
 		{:else if tab === 2}
 			{#if users && $userSession?.role === 'Admin'}
diff --git a/DUUIWeb/src/routes/api/users/+server.ts b/DUUIWeb/src/routes/api/users/+server.ts
index 78c2ffa..44d86b9 100644
--- a/DUUIWeb/src/routes/api/users/+server.ts
+++ b/DUUIWeb/src/routes/api/users/+server.ts
@@ -6,7 +6,6 @@ import { error } from '@sveltejs/kit'
  */
 export const PUT = async ({ request, locals, fetch }) => {
 	const user = locals.user
-
 	if (!user) {
 		return error(401, { message: 'Unauthorized' })
 	}
@@ -15,7 +14,7 @@ export const PUT = async ({ request, locals, fetch }) => {
 		method: 'PUT',
 		body: JSON.stringify(await request.json())
 	})
-
+	console.log(response)
 	return response
 }
 
diff --git a/DUUIWeb/src/routes/api/users/admin/+server.ts b/DUUIWeb/src/routes/api/users/admin/+server.ts
index a47c1b0..5377d47 100644
--- a/DUUIWeb/src/routes/api/users/admin/+server.ts
+++ b/DUUIWeb/src/routes/api/users/admin/+server.ts
@@ -12,7 +12,6 @@ export const PUT = async ({ request, locals, fetch }) => {
 	if (!user || user.role !== 'Admin') {
 		return error(401, { message: 'Unauthorized' })
 	}
-
 	const response = await fetch(`${API_URL}/users/${data.oid}`, {
 		method: 'PUT',
 		body: JSON.stringify({ role: data.role })
diff --git a/DUUIWeb/src/routes/processes/+layout.server.ts b/DUUIWeb/src/routes/processes/+layout.server.ts
index a7f224b..4ffbd62 100644
--- a/DUUIWeb/src/routes/processes/+layout.server.ts
+++ b/DUUIWeb/src/routes/processes/+layout.server.ts
@@ -3,7 +3,7 @@ import { redirect } from '@sveltejs/kit'
 import type { LayoutServerLoad } from '../$types'
 
 export const load: LayoutServerLoad = async ({ locals, url, cookies }) => {
-	if (locals.user) {
+	if (!locals.user) {
 		redirect(302, handleLoginRedirect(url))
 	}
 }

From 18f85aacce7d63bd62539750c37b2ad3b5dca88c Mon Sep 17 00:00:00 2001
From: dterefe <daveterefe@gmail.com>
Date: Fri, 5 Jul 2024 09:06:42 +0100
Subject: [PATCH 05/15] Small fix

---
 DUUIRestService/config.ini                  | 2 +-
 DUUIWeb/src/routes/account/+page.svelte     | 4 ++--
 DUUIWeb/src/routes/api/processes/+server.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/DUUIRestService/config.ini b/DUUIRestService/config.ini
index 8616026..144b4b3 100644
--- a/DUUIRestService/config.ini
+++ b/DUUIRestService/config.ini
@@ -3,7 +3,7 @@ DBX_APP_SECRET=
 DBX_REDIRECT_URL=
 PORT=2605
 HOST=0.0.0.0
-FILE_UPLOAD_DIRECTORY=
+FILE_UPLOAD_DIRECTORY=/temp
 MONGO_HOST=
 MONGO_PORT=
 MONGO_DB=DUUI
diff --git a/DUUIWeb/src/routes/account/+page.svelte b/DUUIWeb/src/routes/account/+page.svelte
index 99683f4..f503fd1 100644
--- a/DUUIWeb/src/routes/account/+page.svelte
+++ b/DUUIWeb/src/routes/account/+page.svelte
@@ -523,8 +523,8 @@
 							<div>
 								<p class="flex-center-4">
 									<Fa icon={faCheck} size="lg" class="text-primary-500" />
-									<span
-										>Read files and folders contained in your <strong>Dropbox Account</strong>
+									<span>
+										Read files and folders contained in your <strong>Dropbox Account</strong>
 									</span>
 								</p>
 								<p class="flex-center-4 mb-4">
diff --git a/DUUIWeb/src/routes/api/processes/+server.ts b/DUUIWeb/src/routes/api/processes/+server.ts
index e1c1d25..d022944 100644
--- a/DUUIWeb/src/routes/api/processes/+server.ts
+++ b/DUUIWeb/src/routes/api/processes/+server.ts
@@ -2,7 +2,7 @@ import { API_URL } from '$env/static/private'
 import { json } from '@sveltejs/kit'
 
 /**
- * Sends a get request to the backend to retrioeve a process.
+ * Sends a get request to the backend to retrieve a process.
  */
 export async function GET({ cookies, url, fetch }) {
 	const processId = url.searchParams.get('process_id') || ''

From 0187401e2374b3881b74872f00c0a008647df0f8 Mon Sep 17 00:00:00 2001
From: dterefe <daveterefe@gmail.com>
Date: Fri, 5 Jul 2024 09:06:49 +0100
Subject: [PATCH 06/15] Small fix

---
 DUUIWeb/src/routes/+error.svelte | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/DUUIWeb/src/routes/+error.svelte b/DUUIWeb/src/routes/+error.svelte
index 8fde21c..2a537e7 100644
--- a/DUUIWeb/src/routes/+error.svelte
+++ b/DUUIWeb/src/routes/+error.svelte
@@ -12,9 +12,8 @@
 			<p>{$page.error?.message}</p>
 		</div>
 		<p class="font-bold">
-			It seems there has been an error on the Server when trying to reach <span
-				>{$page.url.pathname}</span
-			>.
+			It seems there has been an error on the Server when trying to reach
+			<span>{$page.url.pathname}</span>.
 		</p>
 	</div>
 </div>

From f2bdc63e25747200557768c2b468c53d3e71c90e Mon Sep 17 00:00:00 2001
From: dterefe <daveterefe@gmail.com>
Date: Fri, 5 Jul 2024 13:32:56 +0100
Subject: [PATCH 07/15] Started adding FolderPickerApi to the frontend

---
 .../texttechnologylab/duui/api/Methods.java   |   1 +
 .../processes/DUUIProcessRequestHandler.java  |  20 +++
 .../components/Input/FolderStructure.svelte   |  74 +++++------
 DUUIWeb/src/routes/account/+page.svelte       |   4 +-
 .../api/processes/folderstructure/+server.ts  |  25 ++++
 DUUIWeb/src/routes/processes/+page.svelte     | 115 ++++++++++++++----
 6 files changed, 176 insertions(+), 63 deletions(-)
 create mode 100644 DUUIWeb/src/routes/api/processes/folderstructure/+server.ts

diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Methods.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Methods.java
index 26072cc..213d7ff 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Methods.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Methods.java
@@ -130,6 +130,7 @@ public static void init() {
                     halt(401, "Unauthorized");
                 }
             });
+            get("/folderstructure/:id/:provider", DUUIProcessRequestHandler::getFolderStructure);
             get("/:id", DUUIProcessRequestHandler::findOne);
             get("", DUUIProcessRequestHandler::findMany);
             post("", DUUIProcessRequestHandler::start);
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/routes/processes/DUUIProcessRequestHandler.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/routes/processes/DUUIProcessRequestHandler.java
index a059944..e06f400 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/routes/processes/DUUIProcessRequestHandler.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/routes/processes/DUUIProcessRequestHandler.java
@@ -1,7 +1,10 @@
 package org.texttechnologylab.duui.api.routes.processes;
 
+import com.dropbox.core.DbxException;
 import com.mongodb.client.model.Filters;
 import org.bson.Document;
+import org.texttechnologylab.DockerUnifiedUIMAInterface.document_handler.IDUUIDocumentHandler;
+import org.texttechnologylab.DockerUnifiedUIMAInterface.document_handler.IDUUIFolderPickerApi;
 import org.texttechnologylab.DockerUnifiedUIMAInterface.monitoring.DUUIStatus;
 import org.texttechnologylab.duui.api.controllers.documents.DUUIDocumentController;
 import org.texttechnologylab.duui.api.controllers.events.DUUIEventController;
@@ -23,6 +26,7 @@
 import java.util.stream.Stream;
 
 import static org.texttechnologylab.duui.api.controllers.processes.DUUIProcessController.findOneById;
+import static org.texttechnologylab.duui.api.controllers.processes.DUUIProcessController.getHandler;
 
 /**
  * A class that is responsible for handling incoming requests to the /processes path group.
@@ -31,6 +35,22 @@
  */
 public class DUUIProcessRequestHandler {
 
+    public static String getFolderStructure(Request request, Response response) throws DbxException {
+        String id = request.params(":id");
+        String provider = request.params(":provider");
+
+        IDUUIDocumentHandler handler = getHandler(provider, id);
+
+        if (handler instanceof IDUUIFolderPickerApi) {
+            Document document = new Document(((IDUUIFolderPickerApi) handler).getFolderStructure().toJson());
+
+            response.status(200);
+            return document.toJson();
+        }
+
+        return DUUIRequestHelper.notFound(response);
+    }
+
     /**
      * Retrieve a process given its id.
      * See {@link DUUIProcessController#findOneById(String)}
diff --git a/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte b/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
index f754e08..2023f3c 100644
--- a/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
+++ b/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
@@ -4,11 +4,11 @@
 -->
 
 <script lang="ts">
-    import { equals, toTitleCase } from '$lib/duui/utils/text'
+    import { equals } from '$lib/duui/utils/text'
     import type { Placement } from '@floating-ui/dom'
     import {faCheck, faFolder, faChevronDown, type IconDefinition} from '@fortawesome/free-solid-svg-icons'
-    import { ListBox, ListBoxItem, popup, type PopupSettings } from '@skeletonlabs/skeleton'
-    import { TreeView, TreeViewItem, RecursiveTreeView, type TreeViewNode } from '@skeletonlabs/skeleton'
+    import { popup, type PopupSettings } from '@skeletonlabs/skeleton'
+    import { RecursiveTreeView, type TreeViewNode } from '@skeletonlabs/skeleton'
     import FolderIcon from "$lib/svelte/components/FolderIcon.svelte";
 
     import Fa from 'svelte-fa'
@@ -18,17 +18,18 @@
     export let name: string = label
     export let isMultiple = false
 
-    export let options: string[] | number[] = []
     export let value: string | number = ""
 
     export let placement: Placement = 'bottom-start'
 
     export let offset: number = 4
 
-    export let style: string = 'input-wrapper'
-    export let rounded: string = 'rounded-md'
-    export let border: string = 'border'
-    export let textAlign: string = 'text-start'
+    export let tree: TreeViewNode
+
+    // export let style: string = 'input-wrapper'
+    // export let rounded: string = 'rounded-md'
+    // export let border: string = 'border'
+    // export let textAlign: string = 'text-start'
 
     let icon: IconDefinition = faFolder
 
@@ -43,41 +44,22 @@
     }
 
     let checkedNodes : string[] = []
+    let prevNode: string = ""
     let indeterminateNodes: string[] = []
 
-    let myTreeViewNodes: TreeViewNode[] = [
-        {
-            id: '1',
-            content: 'Folder 1',
-            children: [
-                {
-                    id: '2',
-                    content: 'Folder 2'
-                },
-                {
-                    id: '3',
-                    content: 'Folder 3'
-                }
-            ]
-        },
-        {
-            id: '4',
-            content: 'Folder 5'
-        }
-    ]
-    // myTreeViewNodes[0]["unique-id"].children[0].lead = FolderIcon
-
-    let addFolderIcon = (node: TreeViewNode) => {
+    let myTreeViewNodes: TreeViewNode[] = [tree]
+    let addFolderIcon = (node: TreeViewNode, height: number) => {
         node.lead = FolderIcon
         if (node.children) {
             for (let child of node.children) {
-                addFolderIcon(child)
+                addFolderIcon(child, height + 1)
             }
         }
     }
 
     for (let node of myTreeViewNodes) {
-        addFolderIcon(node)
+        addFolderIcon(node, 1)
+
     }
 
     let getNode = (nodes: TreeViewNode[], id: string) => {
@@ -101,8 +83,26 @@
     }
 
     let displayCheckedNodes = (nodes: string[]) => {
-        let filtered = checkedNodes.filter(x => !getNode(myTreeViewNodes, x)?.children || !isMultiple)
-        return filtered.map((x) => " " + getNode(myTreeViewNodes, x).content)
+        if (isMultiple) {
+            for (let i = 0; i < indeterminateNodes.length; i++) {
+                let n = indeterminateNodes[i]
+                let k = checkedNodes.indexOf(n)
+                if (k > -1) {
+                    checkedNodes.splice(k, 1)
+                }
+            }
+
+            value = checkedNodes.map((x) => getNode(myTreeViewNodes, x).content).join(", ")
+        } else {
+            if (checkedNodes.length > 0) {
+                if (checkedNodes.length > 1 && equals(prevNode, checkedNodes[0])) checkedNodes.shift()
+                if (checkedNodes.length > 1 && equals(prevNode, checkedNodes[1])) checkedNodes.pop()
+                value = getNode(myTreeViewNodes, checkedNodes[0]).content
+                prevNode = checkedNodes[0]
+            }
+        }
+
+        return value;
     }
 
 </script>
@@ -123,10 +123,12 @@
 <div data-popup={name}>
     <div class="popup-solid p-1 md:min-w-[768px]">
         <RecursiveTreeView
+            selection
             multiple={isMultiple}
-            relational={true}
+            relational={false}
             bind:checkedNodes={checkedNodes}
             bind:indeterminateNodes={indeterminateNodes}
+
             nodes={myTreeViewNodes}
 
         />
diff --git a/DUUIWeb/src/routes/account/+page.svelte b/DUUIWeb/src/routes/account/+page.svelte
index f503fd1..ed0b5f3 100644
--- a/DUUIWeb/src/routes/account/+page.svelte
+++ b/DUUIWeb/src/routes/account/+page.svelte
@@ -631,7 +631,7 @@
 					</p>
 				</div>
 				<div class="section-wrapper p-8 grid grid-rows-[auto_1fr_auto] gap-8">
-					<h2 class="h3 scroll-mt-16" id="minio">NextCloud</h2>
+					<h2 class="h3 scroll-mt-16" id="nextcloud">NextCloud</h2>
 					<div class="space-y-4">
 						{#if isNextCloudConnected}
 							<p>Your account has been connected to NextCloud successfully.</p>
@@ -683,7 +683,7 @@
 <!--					</p>-->
 				</div>
 				<div class="section-wrapper p-8 grid grid-rows-[auto_1fr_auto] gap-8">
-					<h2 class="h3 scroll-mt-16" id="dropbox">Google Drive</h2>
+					<h2 class="h3 scroll-mt-16" id="googledrive">Google Drive</h2>
 					<div class="space-y-8">
 						{#if isGoogleDriveConnected}
 							<div>
diff --git a/DUUIWeb/src/routes/api/processes/folderstructure/+server.ts b/DUUIWeb/src/routes/api/processes/folderstructure/+server.ts
new file mode 100644
index 0000000..af65afc
--- /dev/null
+++ b/DUUIWeb/src/routes/api/processes/folderstructure/+server.ts
@@ -0,0 +1,25 @@
+import { API_URL } from '$env/static/private'
+import type { DUUIDocument } from '$lib/duui/io'
+import { error, json, type RequestHandler } from '@sveltejs/kit'
+
+/**
+ * Sends a get request to the backend to retrieve the folder structure of a database.
+ */
+export const POST: RequestHandler = async ({ request, cookies, fetch }) => {
+	const data = await request.json()
+
+	const response = await fetch(`${API_URL}/processes/folderstructure/${data.provider}/${data.user}`, {
+		method: 'GET',
+		headers: {
+			Authorization: cookies.get('session') || ''
+		}
+	})
+
+	if (response.ok) {
+		const json = await response.json()
+		return json
+	}
+
+	return {}
+}
+
diff --git a/DUUIWeb/src/routes/processes/+page.svelte b/DUUIWeb/src/routes/processes/+page.svelte
index 77400c4..1254e5c 100644
--- a/DUUIWeb/src/routes/processes/+page.svelte
+++ b/DUUIWeb/src/routes/processes/+page.svelte
@@ -35,7 +35,7 @@
 		faFileArrowUp
 	} from '@fortawesome/free-solid-svg-icons'
 	import Fa from 'svelte-fa'
-	import {FileDropzone, ProgressBar, getToastStore} from '@skeletonlabs/skeleton'
+	import { FileDropzone, ProgressBar, getToastStore, type TreeViewNode } from '@skeletonlabs/skeleton'
 	import { onMount } from 'svelte'
 
 
@@ -118,8 +118,8 @@
 	let onCancelURL =
 		$page.url.searchParams.get('from') || `/pipelines/${$processSettingsStore.pipeline_id}`
 
-	let starting: boolean = false
-	let uploading: boolean = false
+	let starting = false
+	let uploading = false
 
 	let fileStorage = {
 		storeFiles: false,
@@ -231,6 +231,54 @@
 		isValidFileUpload(fileStorage)
 	$: uploadBucketIsValid = isValidS3BucketName(fileStorage.path)
 	$: $userSession
+
+
+	let tree: TreeViewNode | null = {
+		id: '1',
+		content: 'Folder 1',
+		children: [
+			{
+				id: '2',
+				content: 'Folder 2'
+			},
+			{
+				id: '3',
+				content: 'Folder 3'
+			},
+			{
+				id: '4',
+				content: 'Folder 4',
+				children: [
+					{
+						id: '6',
+						content: 'Folder 6'
+					},
+					{
+						id: '7',
+						content: 'Folder 7'
+					}
+				]
+			}
+		]
+	}
+
+
+	async function getFolderStructure(provider: IOProvider) {
+		const response = await fetch('/api/processes/folderstructure',
+			{
+				method: 'POST',
+				body: JSON.stringify({provider: provider, user: $userSession?.oid})
+			})
+
+		if (response.ok) {
+			tree = await response.json()
+			console.log(tree)
+		} else {
+			tree = null
+		}
+	}
+
+
 </script>
 
 <svelte:head>
@@ -349,6 +397,7 @@
 										label="Source"
 										options={IO_INPUT}
 										bind:value={$processSettingsStore.input.provider}
+										on:change={(e) => getFolderStructure($processSettingsStore.input.provider)}
 									/>
 								</div>
 								{#if !equals($processSettingsStore.input.provider, IO.Text)}
@@ -367,11 +416,6 @@
 								bind:value={$processSettingsStore.settings.language}
 							/>
 
-							<div>
-								<FolderStructure />
-							</div>
-
-
 							{#if equals($processSettingsStore.input.provider, IO.Text)}
 								<TextArea
 									label="Document Text"
@@ -435,14 +479,24 @@
 								/>
 							{:else}
 								<div>
-									<TextInput
-										label="Relative path"
-										name="inputPath"
-										bind:value={$processSettingsStore.input.path}
-										error={$processSettingsStore.input.path === '/'
-											? 'Provide an empty path to select the root folder.'
-											: ''}
-									/>
+									{#if tree}
+										<TextInput
+											label="Relative path"
+											name="inputPath"
+											bind:value={$processSettingsStore.input.path}
+											error={$processSettingsStore.input.path === '/'
+												? 'Provide an empty path to select the root folder.'
+												: ''}
+										/>
+									{:else }
+										<FolderStructure
+											tree={tree}
+											label="Folder Picker"
+											name="inputPaths"
+											isMultiple={true}
+											bind:value={$processSettingsStore.input.path}
+										/>
+									{/if}
 									<Tip>Do not include Apps/Docker Unified UIMA Interface in your path!</Tip>
 								</div>
 							{/if}
@@ -558,16 +612,27 @@
 									name="output-folder"
 									bind:value={$processSettingsStore.output.path}
 								/>
-							{:else if equals($processSettingsStore.output.provider, IO.Dropbox)}
+							{:else if equals($processSettingsStore.output.provider, IO.Dropbox)
+									   || equals($processSettingsStore.output.provider, IO.NextCloud)}
 								<div>
-									<TextInput
-										label="Path"
-										name="output-folder"
-										error={['/', ''].includes($processSettingsStore.output.path)
-											? 'Writing to the root folder is not possible.'
-											: ''}
-										bind:value={$processSettingsStore.output.path}
-									/>
+									{#if !tree }
+										<TextInput
+											label="Relative path"
+											name="inputPath"
+											bind:value={$processSettingsStore.input.path}
+											error={$processSettingsStore.input.path === '/'
+												? 'Provide an empty path to select the root folder.'
+												: ''}
+										/>
+									{:else}
+										<FolderStructure
+											tree={tree}
+											label="Folder Picker"
+											name="inputPaths"
+											isMultiple={false}
+											bind:value={$processSettingsStore.output.path}
+										/>
+									{/if}
 									<Tip>Do not include Apps/Docker Unified UIMA Interface in your path!</Tip>
 								</div>
 							{/if}

From 1388c9ab69e6d3936bb1b8884b14cd23747cb8d0 Mon Sep 17 00:00:00 2001
From: dterefe <daveterefe@gmail.com>
Date: Fri, 12 Jul 2024 09:05:37 +0200
Subject: [PATCH 08/15] Embedded Nextcloud retrieval of FolderStructure into
 frontend.

---
 DUUIRestService/.idea/misc.xml                |  3 +-
 .../controllers/users/DUUIUserController.java |  5 +++
 .../processes/DUUIProcessRequestHandler.java  |  3 +-
 .../components/Input/FolderStructure.svelte   | 40 +++++++++++--------
 .../api/processes/folderstructure/+server.ts  | 17 +++++---
 DUUIWeb/src/routes/processes/+page.svelte     | 22 +++++++---
 6 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/DUUIRestService/.idea/misc.xml b/DUUIRestService/.idea/misc.xml
index a107768..967bb8c 100644
--- a/DUUIRestService/.idea/misc.xml
+++ b/DUUIRestService/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
@@ -7,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_20" default="true" project-jdk-name="openjdk-20" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="openjdk-20" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/users/DUUIUserController.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/users/DUUIUserController.java
index 710b647..a170143 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/users/DUUIUserController.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/users/DUUIUserController.java
@@ -132,6 +132,11 @@ public static Document getUserById(ObjectId id, List<String> includeFields) {
             .find(Filters.eq(id))
             .projection(Projections.include(mergedFields))
             .first();
+
+    }
+
+    public static void main(String[] args) {
+        System.out.println(new ObjectId("66879a2e5c9a36692cab46c0"));
     }
 
     /**
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/routes/processes/DUUIProcessRequestHandler.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/routes/processes/DUUIProcessRequestHandler.java
index e06f400..1e1cea0 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/routes/processes/DUUIProcessRequestHandler.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/routes/processes/DUUIProcessRequestHandler.java
@@ -38,13 +38,14 @@ public class DUUIProcessRequestHandler {
     public static String getFolderStructure(Request request, Response response) throws DbxException {
         String id = request.params(":id");
         String provider = request.params(":provider");
-
+        System.out.println("IDDDDDDDDD: " + id);
         IDUUIDocumentHandler handler = getHandler(provider, id);
 
         if (handler instanceof IDUUIFolderPickerApi) {
             Document document = new Document(((IDUUIFolderPickerApi) handler).getFolderStructure().toJson());
 
             response.status(200);
+            System.out.println(document.toJson());
             return document.toJson();
         }
 
diff --git a/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte b/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
index 2023f3c..8fafe14 100644
--- a/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
+++ b/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
@@ -24,7 +24,7 @@
 
     export let offset: number = 4
 
-    export let tree: TreeViewNode
+    export let tree: TreeViewNode | null = null
 
     // export let style: string = 'input-wrapper'
     // export let rounded: string = 'rounded-md'
@@ -46,18 +46,21 @@
     let checkedNodes : string[] = []
     let prevNode: string = ""
     let indeterminateNodes: string[] = []
+    let parentNodes = {}
 
     let myTreeViewNodes: TreeViewNode[] = [tree]
     let addFolderIcon = (node: TreeViewNode, height: number) => {
         node.lead = FolderIcon
         if (node.children) {
             for (let child of node.children) {
+                parentNodes[child.id] = node.id
                 addFolderIcon(child, height + 1)
             }
         }
     }
 
     for (let node of myTreeViewNodes) {
+        parentNodes[node.id] = node.id
         addFolderIcon(node, 1)
 
     }
@@ -82,27 +85,29 @@
         return null;
     }
 
-    let displayCheckedNodes = (nodes: string[]) => {
+    let displayCheckedNodes = (nodes: string[], inde: string[]) => {
+        let v
+
         if (isMultiple) {
-            for (let i = 0; i < indeterminateNodes.length; i++) {
-                let n = indeterminateNodes[i]
-                let k = checkedNodes.indexOf(n)
-                if (k > -1) {
-                    checkedNodes.splice(k, 1)
-                }
+            let isInIndeterminates = (id) => {
+                return inde.includes(id)
             }
+            let filtered = nodes
+              .filter((x) => parentNodes[x] === x || isInIndeterminates(parentNodes[x]))
+            value = filtered.join(",")
+            v = filtered.map((x) => getNode(myTreeViewNodes, x).content).join(", ")
 
-            value = checkedNodes.map((x) => getNode(myTreeViewNodes, x).content).join(", ")
         } else {
-            if (checkedNodes.length > 0) {
-                if (checkedNodes.length > 1 && equals(prevNode, checkedNodes[0])) checkedNodes.shift()
-                if (checkedNodes.length > 1 && equals(prevNode, checkedNodes[1])) checkedNodes.pop()
-                value = getNode(myTreeViewNodes, checkedNodes[0]).content
-                prevNode = checkedNodes[0]
+            if (nodes.length > 0) {
+                if (nodes.length > 1 && equals(prevNode, nodes[0])) nodes.shift()
+                if (nodes.length > 1 && equals(prevNode, nodes[1])) nodes.pop()
+                prevNode = nodes[0]
             }
+            value = nodes.join(",")
+            v = nodes.map((x) => getNode(myTreeViewNodes, x).content).join(", ")
         }
 
-        return value;
+        return v;
     }
 
 </script>
@@ -115,7 +120,7 @@
             class="flex items-center !justify-between gap-2 px-3 py-2 leading-6 border rounded-md input-wrapper"
             use:popup={dropdown}
     >
-        <span>{displayCheckedNodes(checkedNodes)}</span>
+        <span>{displayCheckedNodes(checkedNodes, indeterminateNodes)}</span>
 
         <Fa {icon} />
     </button>
@@ -125,13 +130,14 @@
         <RecursiveTreeView
             selection
             multiple={isMultiple}
-            relational={false}
+            relational={isMultiple}
             bind:checkedNodes={checkedNodes}
             bind:indeterminateNodes={indeterminateNodes}
 
             nodes={myTreeViewNodes}
 
         />
+
     </div>
 
 </div>
diff --git a/DUUIWeb/src/routes/api/processes/folderstructure/+server.ts b/DUUIWeb/src/routes/api/processes/folderstructure/+server.ts
index af65afc..72fb5e0 100644
--- a/DUUIWeb/src/routes/api/processes/folderstructure/+server.ts
+++ b/DUUIWeb/src/routes/api/processes/folderstructure/+server.ts
@@ -5,10 +5,11 @@ import { error, json, type RequestHandler } from '@sveltejs/kit'
 /**
  * Sends a get request to the backend to retrieve the folder structure of a database.
  */
-export const POST: RequestHandler = async ({ request, cookies, fetch }) => {
+export const POST: RequestHandler = async ({ request, cookies, locals, fetch }) => {
 	const data = await request.json()
-
-	const response = await fetch(`${API_URL}/processes/folderstructure/${data.provider}/${data.user}`, {
+	const user = locals.user
+	console.log(user?.oid)
+	const response = await fetch(`${API_URL}/processes/folderstructure/${user?.oid}/${data.provider}`, {
 		method: 'GET',
 		headers: {
 			Authorization: cookies.get('session') || ''
@@ -16,10 +17,14 @@ export const POST: RequestHandler = async ({ request, cookies, fetch }) => {
 	})
 
 	if (response.ok) {
-		const json = await response.json()
-		return json
+		return json(await response.json(), {
+			headers: {
+				'Content-Type': 'application/json'
+			},
+			status: 200
+		})
 	}
 
-	return {}
+	return response
 }
 
diff --git a/DUUIWeb/src/routes/processes/+page.svelte b/DUUIWeb/src/routes/processes/+page.svelte
index 1254e5c..5950da5 100644
--- a/DUUIWeb/src/routes/processes/+page.svelte
+++ b/DUUIWeb/src/routes/processes/+page.svelte
@@ -233,7 +233,7 @@
 	$: $userSession
 
 
-	let tree: TreeViewNode | null = {
+	let tree: TreeViewNode = {
 		id: '1',
 		content: 'Folder 1',
 		children: [
@@ -264,6 +264,7 @@
 
 
 	async function getFolderStructure(provider: IOProvider) {
+		// console.log(provider)
 		const response = await fetch('/api/processes/folderstructure',
 			{
 				method: 'POST',
@@ -273,8 +274,6 @@
 		if (response.ok) {
 			tree = await response.json()
 			console.log(tree)
-		} else {
-			tree = null
 		}
 	}
 
@@ -390,6 +389,19 @@
 								</p>
 							</div>
 						{/if}
+
+						{#if $processSettingsStore.input.provider === IO.NextCloud && !$userSession?.connections.nextcloud}
+							<div class="text-center w-full variant-soft-error p-4 rounded-md">
+								<p class="mx-auto">
+									To use NextCloud you must first connect your <a
+									class="anchor"
+									href="/account#nextcloud"
+									target="_blank">Account</a
+								>
+								</p>
+							</div>
+						{/if}
+
 						<div class="grid gap-4">
 							<div class="flex-center-4">
 								<div class="flex-1">
@@ -397,7 +409,7 @@
 										label="Source"
 										options={IO_INPUT}
 										bind:value={$processSettingsStore.input.provider}
-										on:change={(e) => getFolderStructure($processSettingsStore.input.provider)}
+										on:change={() => getFolderStructure($processSettingsStore.input.provider)}
 									/>
 								</div>
 								{#if !equals($processSettingsStore.input.provider, IO.Text)}
@@ -479,7 +491,7 @@
 								/>
 							{:else}
 								<div>
-									{#if tree}
+									{#if !tree}
 										<TextInput
 											label="Relative path"
 											name="inputPath"

From a1f201db61db300d5e1d63625eb07ad1415680f9 Mon Sep 17 00:00:00 2001
From: dterefe <daveterefe@gmail.com>
Date: Fri, 12 Jul 2024 13:03:57 +0100
Subject: [PATCH 09/15] Added GoogleDrive access to fronted.

---
 DUUIRestService/.idea/misc.xml                |  2 +-
 DUUIRestService/pom.xml                       |  2 +-
 .../processes/DUUIProcessController.java      | 11 ++++-
 .../processes/DUUIProcessRequestHandler.java  |  1 -
 .../{googledrive => google}/+error.svelte     |  0
 .../account/(auth)/google/+page.server.ts     | 19 ++++++++
 .../{googledrive => google}/+page.svelte      |  6 +--
 .../(auth)/googledrive/+page.server.ts        | 34 --------------
 DUUIWeb/src/routes/account/+page.server.ts    | 45 ++++++++-----------
 DUUIWeb/src/routes/account/+page.svelte       |  4 +-
 10 files changed, 55 insertions(+), 69 deletions(-)
 rename DUUIWeb/src/routes/account/(auth)/{googledrive => google}/+error.svelte (100%)
 create mode 100644 DUUIWeb/src/routes/account/(auth)/google/+page.server.ts
 rename DUUIWeb/src/routes/account/(auth)/{googledrive => google}/+page.svelte (87%)
 delete mode 100644 DUUIWeb/src/routes/account/(auth)/googledrive/+page.server.ts

diff --git a/DUUIRestService/.idea/misc.xml b/DUUIRestService/.idea/misc.xml
index 967bb8c..0a13117 100644
--- a/DUUIRestService/.idea/misc.xml
+++ b/DUUIRestService/.idea/misc.xml
@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="openjdk-20" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_20" default="true" project-jdk-name="openjdk-20" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/DUUIRestService/pom.xml b/DUUIRestService/pom.xml
index f9f8867..c621e3f 100644
--- a/DUUIRestService/pom.xml
+++ b/DUUIRestService/pom.xml
@@ -186,7 +186,7 @@
         <dependency>
             <groupId>com.github.dterefe</groupId>
             <artifactId>DockerUnifiedUIMAInterface</artifactId>
-            <version>cba7de43001c0ce35f6effd1b0464aad8f9717be</version>
+            <version>f35591b7374f7afbeb6d1b3a73a0f67953c5d134</version>
         </dependency>
 
         <dependency>
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/processes/DUUIProcessController.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/processes/DUUIProcessController.java
index c583b83..e8aebb3 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/processes/DUUIProcessController.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/processes/DUUIProcessController.java
@@ -536,10 +536,19 @@ public static IDUUIDocumentHandler getHandler(String provider, String userId) th
             return new DUUILocalDocumentHandler();
         } else if (provider.equalsIgnoreCase(Provider.NEXTCLOUD)) {
             Document credentials = DUUIUserController.getNextCloudCredentials(user);
-            return  new DUUINextcloudDocumentHandler(
+            System.out.println("URI: " + credentials.getString("uri"));
+            System.out.println("USERNAME: " + credentials.getString("username"));
+            System.out.println("PASSWORD: " + credentials.getString("password"));
+            DUUINextcloudDocumentHandler handler = new DUUINextcloudDocumentHandler(
                         credentials.getString("uri"),
                         credentials.getString("username"),
                         credentials.getString("password"));
+            try {
+                System.out.println(handler.getFolderStructure().toJson());
+            } catch (Exception e) {
+                System.out.println(e);
+            }
+            return handler;
         }
 
         return null;
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/routes/processes/DUUIProcessRequestHandler.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/routes/processes/DUUIProcessRequestHandler.java
index 1e1cea0..4d718c5 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/routes/processes/DUUIProcessRequestHandler.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/routes/processes/DUUIProcessRequestHandler.java
@@ -38,7 +38,6 @@ public class DUUIProcessRequestHandler {
     public static String getFolderStructure(Request request, Response response) throws DbxException {
         String id = request.params(":id");
         String provider = request.params(":provider");
-        System.out.println("IDDDDDDDDD: " + id);
         IDUUIDocumentHandler handler = getHandler(provider, id);
 
         if (handler instanceof IDUUIFolderPickerApi) {
diff --git a/DUUIWeb/src/routes/account/(auth)/googledrive/+error.svelte b/DUUIWeb/src/routes/account/(auth)/google/+error.svelte
similarity index 100%
rename from DUUIWeb/src/routes/account/(auth)/googledrive/+error.svelte
rename to DUUIWeb/src/routes/account/(auth)/google/+error.svelte
diff --git a/DUUIWeb/src/routes/account/(auth)/google/+page.server.ts b/DUUIWeb/src/routes/account/(auth)/google/+page.server.ts
new file mode 100644
index 0000000..a27837a
--- /dev/null
+++ b/DUUIWeb/src/routes/account/(auth)/google/+page.server.ts
@@ -0,0 +1,19 @@
+import { API_URL } from '$env/static/private'
+import type { PageServerLoad } from './$types'
+
+export const load: PageServerLoad = async ({ url, cookies, fetch }) => {
+	const code = url.searchParams.get('code')
+	// const access_token = url.searchParams.get('access_token')
+	// const expires_in = url.searchParams.get('expires_in')
+	console.log(url)
+	// const response = await fetch(`${API_URL}/users/auth/?code=${code}`, {
+	// 	method: 'PUT',
+	// 	headers: {
+	// 		Authorization: cookies.get('session') || ''
+	// 	}
+	// })
+
+	return {
+		success: true
+	}
+}
diff --git a/DUUIWeb/src/routes/account/(auth)/googledrive/+page.svelte b/DUUIWeb/src/routes/account/(auth)/google/+page.svelte
similarity index 87%
rename from DUUIWeb/src/routes/account/(auth)/googledrive/+page.svelte
rename to DUUIWeb/src/routes/account/(auth)/google/+page.svelte
index 057d438..f22aa05 100644
--- a/DUUIWeb/src/routes/account/(auth)/googledrive/+page.svelte
+++ b/DUUIWeb/src/routes/account/(auth)/google/+page.svelte
@@ -3,11 +3,11 @@
 	import { faRefresh } from '@fortawesome/free-solid-svg-icons'
 	import { onMount } from 'svelte'
 	import Fa from 'svelte-fa'
-	// export let data
-	// const { success } = data
+	export let data
+	const { success } = data
 
 	onMount(() => {
-		goto('/account?tab=1')
+		goto('/account?tab=1&success=' + success)
 	})
 </script>
 
diff --git a/DUUIWeb/src/routes/account/(auth)/googledrive/+page.server.ts b/DUUIWeb/src/routes/account/(auth)/googledrive/+page.server.ts
deleted file mode 100644
index f0b3e6b..0000000
--- a/DUUIWeb/src/routes/account/(auth)/googledrive/+page.server.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { redirect } from '@sveltejs/kit'
-import { API_URL, SECRET_CLIENT_ID, SECRET_CLIENT_SECRET } from '$env/static/private'
-import type { PageServerLoad } from './$types'
-import { OAuth2Client } from 'google-auth-library'
-
-
-async function getUserData(access_token) {
-
-	const response = await fetch(`https://www.googleapis.com/oauth2/v3/userinfo?access_token=${access_token}`);
-	console.log('response',response);
-	const data = await response.json();
-	console.log('data',data);
-}
-
-
-export const GET = async ({ url }) => {
-	const redirectURL = 'http://localhost:5173/auth/googledrive/';
-	console.log("asdfsdfasdf")
-	const code = await url.searchParams.get('code')
-
-	try {
-		const oAuth2Client = new  OAuth2Client(
-			SECRET_CLIENT_ID,
-			SECRET_CLIENT_SECRET,
-			redirectURL);
-
-		const r = await oAuth2Client.getToken(code ? code : "");
-		oAuth2Client.setCredentials(r.tokens);
-	} catch (err) {
-		console.error("Error logging: ", err);
-	}
-
-	throw redirect(303, "/account?tab=1");
-}
diff --git a/DUUIWeb/src/routes/account/+page.server.ts b/DUUIWeb/src/routes/account/+page.server.ts
index 5131e74..2280036 100644
--- a/DUUIWeb/src/routes/account/+page.server.ts
+++ b/DUUIWeb/src/routes/account/+page.server.ts
@@ -1,33 +1,11 @@
-
-import { API_URL, SECRET_CLIENT_ID, SECRET_CLIENT_SECRET } from '$env/static/private'
+import { API_URL, SECRET_CLIENT_ID, SECRET_CLIENT_SECRET, REDIRECT_URL } from '$env/static/private'
 import { handleLoginRedirect } from '$lib/utils'
 import { fail, redirect } from '@sveltejs/kit'
 import { DropboxAuth } from 'dropbox'
 import type { PageServerLoad } from './$types'
 import { OAuth2Client } from 'google-auth-library'
 
-// export const actions = {
-// 	OAuth2: async ({}) => {
-// 		alert("sadfasdfasdf")
-// 		console.log("asdfsdfasdf")
-// 		const redirectURL = 'http://localhost:5173/account/auth/googledrive/';
-// 		const oAuth2Client = new  OAuth2Client(
-// 			SECRET_CLIENT_ID,
-// 			SECRET_CLIENT_SECRET,
-// 			redirectURL);
-//
-// 		const authorizeUrl = oAuth2Client.generateAuthUrl({
-// 			access_type: 'offline',
-// 			scope: 'https://www.googleapis.com/auth/userinfo.profile openid',
-// 			prompt: 'consent'
-// 		});
-//
-// 		throw redirect(302, authorizeUrl);
-// 	}
-// }
-
 export const load: PageServerLoad = async ({ locals, cookies, url }) => {
-	console.log('load', locals, cookies, url)
 	if (!locals.user) {
 		redirect(302, handleLoginRedirect(url))
 	}
@@ -38,7 +16,8 @@ export const load: PageServerLoad = async ({ locals, cookies, url }) => {
 		method: 'GET'
 	})
 
-	let dropbBoxURL: String = new String('')
+	let dropbBoxURL = new String('')
+	let googleDriveURL = ""
 
 	try {
 		const credentials: {
@@ -47,6 +26,7 @@ export const load: PageServerLoad = async ({ locals, cookies, url }) => {
 			url: string
 		} = await response.json()
 
+		console.log(credentials)
 		const dbxAuth = new DropboxAuth({
 			clientId: credentials.key,
 			clientSecret: credentials.secret
@@ -61,8 +41,20 @@ export const load: PageServerLoad = async ({ locals, cookies, url }) => {
 			undefined,
 			false
 		)
-	} catch (error) {}
+	} catch (error) { /* empty */ }
 
+	const googleAuth = new OAuth2Client(
+			SECRET_CLIENT_ID,
+			SECRET_CLIENT_SECRET,
+			REDIRECT_URL)
+
+	googleDriveURL = googleAuth.generateAuthUrl(
+		{
+						scope: "https://www.googleapis.com/auth/drive openid ",
+						access_type: "offline",
+						redirect_uri: "http://localhost:5173/account/google"
+		})
+	console.log('googleDriveURL', googleDriveURL)
 	/**
 	 * Fetch a user from the backend.
 	 *
@@ -100,8 +92,9 @@ export const load: PageServerLoad = async ({ locals, cookies, url }) => {
 
 	return {
 		dropbBoxURL: dropbBoxURL,
+		googleDriveURL: googleDriveURL,
 		user: (await fetchProfile()).user,
 		theme: +(cookies.get('theme') || '0'),
 		users: (await fetchUsers()).users
 	}
-}
+}
\ No newline at end of file
diff --git a/DUUIWeb/src/routes/account/+page.svelte b/DUUIWeb/src/routes/account/+page.svelte
index ed0b5f3..51ae1e3 100644
--- a/DUUIWeb/src/routes/account/+page.svelte
+++ b/DUUIWeb/src/routes/account/+page.svelte
@@ -35,7 +35,7 @@
 	const modalStore = getModalStore()
 
 	export let data
-	let { user, dropbBoxURL, theme, users } = data
+	let { user, dropbBoxURL, googleDriveURL, theme, users } = data
 
 	let email: string = $userSession?.email || ''
 
@@ -208,7 +208,7 @@
 	}
 
 	const startGoogleDriveAccess = async () => {
-		window.location.href = "http://localhost:5173/auth/googledrive/"
+		window.location.href = googleDriveURL
 	}
 
 	const deleteGoogleDriveAccess = async () => {

From af3be5b5f699c15eba83ef2356fca48d761e2797 Mon Sep 17 00:00:00 2001
From: dterefe <daveterefe@gmail.com>
Date: Thu, 18 Jul 2024 16:58:45 +0200
Subject: [PATCH 10/15] Re-Added GoogleDrive to backend

---
 DUUIRestService/config.ini                    |   3 +
 DUUIRestService/pom.xml                       |   2 +-
 .../document/DUUIDocumentProvider.java        |   2 +-
 .../duui/analysis/document/Provider.java      |   2 +-
 .../process/DUUISimpleProcessHandler.java     |  20 ++-
 .../texttechnologylab/duui/api/Config.java    |   6 +
 .../org/texttechnologylab/duui/api/Main.java  |   8 +-
 .../texttechnologylab/duui/api/Methods.java   |   2 +
 .../processes/DUUIProcessController.java      |  18 +--
 .../controllers/users/DUUIUserController.java | 123 +++++++++++++++++-
 .../processes/DUUIProcessRequestHandler.java  |  13 +-
 11 files changed, 171 insertions(+), 28 deletions(-)

diff --git a/DUUIRestService/config.ini b/DUUIRestService/config.ini
index 144b4b3..918078f 100644
--- a/DUUIRestService/config.ini
+++ b/DUUIRestService/config.ini
@@ -1,6 +1,9 @@
 DBX_APP_KEY=
 DBX_APP_SECRET=
 DBX_REDIRECT_URL=
+GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=
+GOOGLE_REDIRECT_URI=
 PORT=2605
 HOST=0.0.0.0
 FILE_UPLOAD_DIRECTORY=/temp
diff --git a/DUUIRestService/pom.xml b/DUUIRestService/pom.xml
index c621e3f..98294c4 100644
--- a/DUUIRestService/pom.xml
+++ b/DUUIRestService/pom.xml
@@ -186,7 +186,7 @@
         <dependency>
             <groupId>com.github.dterefe</groupId>
             <artifactId>DockerUnifiedUIMAInterface</artifactId>
-            <version>f35591b7374f7afbeb6d1b3a73a0f67953c5d134</version>
+            <version>a4b7b5eb31604116b2428ddb7ad53a39296d7ba0</version>
         </dependency>
 
         <dependency>
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/DUUIDocumentProvider.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/DUUIDocumentProvider.java
index de74330..2baa724 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/DUUIDocumentProvider.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/DUUIDocumentProvider.java
@@ -98,7 +98,7 @@ public boolean isCloudProvider() {
             || provider.equalsIgnoreCase(Provider.MINIO)
             || provider.equalsIgnoreCase(Provider.ONEDRIVE)
             || provider.equalsIgnoreCase(Provider.NEXTCLOUD)
-            || provider.equalsIgnoreCase(Provider.GOOGLEDRIVE);
+            || provider.equalsIgnoreCase(Provider.GOOGLE);
     }
 
     public boolean isDatabaseProvider() {
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/Provider.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/Provider.java
index c4ed89a..5fd33e4 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/Provider.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/Provider.java
@@ -14,5 +14,5 @@ public class Provider {
     public static final String MONGODB = "MongoDB";
     public static final String ONEDRIVE = "OneDrive";
     public static final String NEXTCLOUD = "NextCloud";
-    public static final String GOOGLEDRIVE = "GoogleDrive";
+    public static final String GOOGLE = "GoogleDrive";
 }
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/process/DUUISimpleProcessHandler.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/process/DUUISimpleProcessHandler.java
index 84b805d..6dc9032 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/process/DUUISimpleProcessHandler.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/process/DUUISimpleProcessHandler.java
@@ -1,5 +1,6 @@
 package org.texttechnologylab.duui.analysis.process;
 
+import org.texttechnologylab.DockerUnifiedUIMAInterface.document_handler.*;
 import org.texttechnologylab.duui.api.controllers.documents.DUUIDocumentController;
 import org.texttechnologylab.duui.api.controllers.events.DUUIEventController;
 import org.texttechnologylab.duui.api.controllers.pipelines.DUUIPipelineController;
@@ -16,9 +17,6 @@
 import org.apache.uima.jcas.JCas;
 import org.bson.Document;
 import org.texttechnologylab.DockerUnifiedUIMAInterface.DUUIComposer;
-import org.texttechnologylab.DockerUnifiedUIMAInterface.document_handler.DUUIDocument;
-import org.texttechnologylab.DockerUnifiedUIMAInterface.document_handler.DUUIDropboxDocumentHandler;
-import org.texttechnologylab.DockerUnifiedUIMAInterface.document_handler.IDUUIDocumentHandler;
 import org.texttechnologylab.DockerUnifiedUIMAInterface.io.reader.DUUIDocumentReader;
 import org.texttechnologylab.DockerUnifiedUIMAInterface.lua.DUUILuaContext;
 import org.texttechnologylab.DockerUnifiedUIMAInterface.monitoring.DUUIEvent;
@@ -30,6 +28,7 @@
 import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
+import java.security.GeneralSecurityException;
 import java.util.List;
 import java.util.Set;
 import java.util.Vector;
@@ -145,7 +144,7 @@ public void startInput() {
 
         try {
             inputHandler = DUUIProcessController.getHandler(input.getProvider(), getUserID());
-        } catch (IllegalArgumentException | DbxException exception) {
+        } catch (IllegalArgumentException | DbxException | GeneralSecurityException | IOException  exception) {
             onException(exception);
         }
 
@@ -182,9 +181,16 @@ public void startInput() {
         }
 
         try {
-            collectionReader = new DUUIDocumentReader
-                .Builder(composer)
-                .withInputPath(input.getPath())
+            DUUIDocumentReader.Builder builder = new DUUIDocumentReader
+                    .Builder(composer);
+
+            if (inputHandler instanceof  IDUUIFolderPickerApi) {
+                builder.withInputPaths(List.of(input.getPath().split(",")));
+            } else {
+                builder.withInputPath(input.getPath());
+            }
+
+            collectionReader = builder
                 .withInputFileExtension(input.getFileExtension())
                 .withInputHandler(inputHandler)
                 .withOutputPath(output.getPath())
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Config.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Config.java
index 840a58f..ef951cf 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Config.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Config.java
@@ -59,6 +59,12 @@ public String getDropboxRedirectUrl() {
         return properties.getProperty("DBX_REDIRECT_URL", null);
     }
 
+    public String getGoogleClientId() { return properties.getProperty("GOOGLE_CLIENT_ID", null); }
+
+    public String getGoogleClientSecret() { return properties.getProperty("GOOGLE_CLIENT_SECRET", null); }
+
+    public String getGoogleRedirectUri() { return properties.getProperty("GOOGLE_REDIRECT_URI", null); }
+
     public List<String> getAllowedOrigins() {
         return List.of(properties.getProperty("ALLOWED_ORIGINS", "").split(";"));
     }
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Main.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Main.java
index 678f23d..5f721d1 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Main.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Main.java
@@ -26,6 +26,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.security.GeneralSecurityException;
 import java.util.Collection;
 import java.util.List;
 import java.util.UUID;
@@ -58,6 +59,9 @@ public static void main(String[] args) {
             System.err.println("\t> DBX_APP_KEY");
             System.err.println("\t> DBX_APP_SECRET");
             System.err.println("\t> DBX_REDIRECT_URL");
+            System.err.println("\t> GOOGLE_CLIENT_ID");
+            System.err.println("\t> GOOGLE_CLIENT_SECRET");
+            System.err.println("\t> GOOGLE_REDIRECT_URI");
             System.err.println("\t> PORT");
             System.err.println("\t> HOST");
             System.err.println("\t> FILE_UPLOAD_DIRECTORY");
@@ -116,7 +120,7 @@ public static void main(String[] args) {
      *
      * @return a JSON Document containing the path to parent folder (uuid).
      */
-    public static String uploadFile(Request request, Response response) throws ServletException, IOException, DbxException {
+    public static String uploadFile(Request request, Response response) throws ServletException, IOException, DbxException, GeneralSecurityException {
         String authorization = request.headers("Authorization");
         DUUIRequestHelper.authenticate(authorization);
 
@@ -188,7 +192,7 @@ public static String downloadFile(Request request, Response response) {
             response.raw().getOutputStream().write(file.readAllBytes());
             response.raw().getOutputStream().close();
             return "Download.";
-        } catch (DbxException | IOException e) {
+        } catch (DbxException | IOException | GeneralSecurityException e) {
             response.status(500);
             return "The file could not be downloaded.";
         }
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Methods.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Methods.java
index 213d7ff..e263f7f 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Methods.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/Methods.java
@@ -80,6 +80,8 @@ public static void init() {
                 get("/", DUUIUserController::authorizeUser);
                 get("/dropbox", DUUIUserController::getDropboxAppSettings);
                 put("/dropbox", DUUIUserController::finishDropboxOAuthFromCode);
+                get("/google", DUUIUserController::getGoogleSettings);
+                put("/google", DUUIUserController::finishGoogleOAuthFromCode);
             });
         });
 
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/processes/DUUIProcessController.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/processes/DUUIProcessController.java
index e8aebb3..1c45aaf 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/processes/DUUIProcessController.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/processes/DUUIProcessController.java
@@ -1,5 +1,6 @@
 package org.texttechnologylab.duui.api.controllers.processes;
 
+import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
 import org.texttechnologylab.duui.api.Main;
 import org.texttechnologylab.duui.api.controllers.documents.DUUIDocumentController;
 import org.texttechnologylab.duui.api.controllers.events.DUUIEventController;
@@ -29,6 +30,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URISyntaxException;
+import java.security.GeneralSecurityException;
 import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -509,7 +511,7 @@ public static List<IDUUIProcessHandler> getActiveProcesses(String pipelineId) {
      * @return the created DocumentHandler.
      * @throws DbxException if incorrect credentials for Dropbox are provided.
      */
-    public static IDUUIDocumentHandler getHandler(String provider, String userId) throws DbxException {
+    public static IDUUIDocumentHandler getHandler(String provider, String userId) throws DbxException, GeneralSecurityException, IOException {
         Document user = DUUIUserController.getUserById(userId);
 
         if (provider.equalsIgnoreCase(Provider.DROPBOX)) {
@@ -539,16 +541,16 @@ public static IDUUIDocumentHandler getHandler(String provider, String userId) th
             System.out.println("URI: " + credentials.getString("uri"));
             System.out.println("USERNAME: " + credentials.getString("username"));
             System.out.println("PASSWORD: " + credentials.getString("password"));
-            DUUINextcloudDocumentHandler handler = new DUUINextcloudDocumentHandler(
+            return new DUUINextcloudDocumentHandler(
                         credentials.getString("uri"),
                         credentials.getString("username"),
                         credentials.getString("password"));
-            try {
-                System.out.println(handler.getFolderStructure().toJson());
-            } catch (Exception e) {
-                System.out.println(e);
-            }
-            return handler;
+        } else if (provider.equalsIgnoreCase(Provider.GOOGLE)) {
+            Document credentials = DUUIUserController.getGoogleCredentials(user);
+            GoogleCredential credential = new GoogleCredential()
+                    .setAccessToken(credentials.getString("access_token"));
+
+            return new DUUIGoogleDriveDocumentHandler(credential);
         }
 
         return null;
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/users/DUUIUserController.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/users/DUUIUserController.java
index a170143..f890934 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/users/DUUIUserController.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/users/DUUIUserController.java
@@ -1,6 +1,14 @@
 package org.texttechnologylab.duui.api.controllers.users;
 
+import com.google.api.client.auth.oauth2.TokenResponse;
+import com.google.api.client.googleapis.auth.oauth2.*;
+import com.google.api.client.http.javanet.NetHttpTransport;
+import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.services.drive.DriveScopes;
 import com.mongodb.client.result.DeleteResult;
+import org.texttechnologylab.DockerUnifiedUIMAInterface.document_handler.DUUIGoogleDriveDocumentHandler;
+import org.texttechnologylab.DockerUnifiedUIMAInterface.document_handler.DUUINextcloudDocumentHandler;
+import org.texttechnologylab.DockerUnifiedUIMAInterface.document_handler.IDUUIFolderPickerApi;
 import org.texttechnologylab.duui.api.Main;
 import org.texttechnologylab.duui.api.controllers.pipelines.DUUIPipelineController;
 import org.texttechnologylab.duui.api.storage.DUUIMongoDBStorage;
@@ -15,12 +23,15 @@
 import spark.Request;
 import spark.Response;
 
+import java.io.IOException;
+import java.security.GeneralSecurityException;
 import java.time.Instant;
 import java.util.*;
 
 import static org.texttechnologylab.duui.api.routes.DUUIRequestHelper.*;
 
 
+
 /**
  * A Controller for database operations related to the users collection.
  *
@@ -100,6 +111,39 @@ public static Document getNextCloudCredentials(Document user) {
         return projection.get("connections", Document.class).get("nextcloud", Document.class);
     }
 
+    public static Document getGoogleCredentials(Document user) {
+        Document projection = DUUIMongoDBStorage
+                .Users()
+                .find(Filters.eq(user.getObjectId("_id")))
+                .projection(Projections.include("connections.google"))
+                .first();
+
+
+        if (isNullOrEmpty(projection)) {
+            return new Document();
+        }
+
+        Document credentials = projection.get("connections", Document.class).get("google", Document.class);
+
+        try {
+            String accessToken = refreshAccessToken(
+                    credentials.getString("refresh_token"),
+                    Main.config.getGoogleClientId(),
+                    Main.config.getGoogleClientSecret());
+            credentials.put("access_token", accessToken);
+            DUUIMongoDBStorage
+                .Users()
+                .updateOne(
+                    Filters.eq(user.getObjectId("_id")),
+                        Updates.set("connections.google.access_token", accessToken)
+                );
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        return projection.get("connections", Document.class).get("google", Document.class);
+    }
+
     /**
      * Get a user by id.
      *
@@ -135,10 +179,6 @@ public static Document getUserById(ObjectId id, List<String> includeFields) {
 
     }
 
-    public static void main(String[] args) {
-        System.out.println(new ObjectId("66879a2e5c9a36692cab46c0"));
-    }
-
     /**
      * Get a user by id.
      *
@@ -242,6 +282,7 @@ public static String insertOne(Request request, Response response) {
                 .append("dropbox", new Document("access_token", null).append("refresh_token", null))
                 .append("minio", new Document("endpoint", null).append("access_key", null).append("secret_key", null))
                 .append("nextcloud", new Document("uri", null).append("username", null).append("password", null))
+                .append("google", new Document("access_token", null).append("refresh_token", null))
             );
 
         DUUIMongoDBStorage
@@ -420,7 +461,7 @@ public static String updateOne(Request request, Response response) {
 
 
         for (Map.Entry<String, Object> entry : body.entrySet()) {
-            if (!ALLOWED_UPDATES.contains(entry.getKey()) && !entry.getKey().contains("nextcloud")) {
+            if (!ALLOWED_UPDATES.contains(entry.getKey()) && !entry.getKey().contains("nextcloud") && !entry.getKey().contains("google")) {
                 response.status(400);
                 return new Document("error", "Bad Request")
                     .append("message",
@@ -595,6 +636,78 @@ public static String finishDropboxOAuthFromCode(Request request, Response respon
         }
     }
 
+    public static String finishGoogleOAuthFromCode(Request request, Response response) {
+        String code = request.queryParamOrDefault("code", null);
+        if (isNullOrEmpty(code)) return badRequest(response, "Missing code query parameter");
+
+        try {
+
+            GoogleTokenResponse googleTokenResponse = new GoogleAuthorizationCodeTokenRequest(
+                new NetHttpTransport(),
+                new JacksonFactory(),
+                "https://www.googleapis.com/oauth2/v4/token",
+                    Main.config.getGoogleClientId(),
+                    Main.config.getGoogleClientSecret(),
+                    code,
+                    Main.config.getGoogleRedirectUri())
+                .execute();
+
+            String accessToken = googleTokenResponse.getAccessToken();
+            String refreshToken = googleTokenResponse.getRefreshToken();
+
+            UpdateResult result = DUUIMongoDBStorage
+                .Users()
+                .updateOne(
+                        Filters.eq(new ObjectId(getUserId(request))),
+                        Updates.combine(
+                            Updates.set("connections.google.access_token", accessToken),
+                            Updates.set("connections.google.refresh_token", refreshToken)
+                        )
+                );
+
+            if (result.getModifiedCount() == 1) {
+                return new Document()
+                        .append("access_token", accessToken)
+                        .append("refresh_token", refreshToken).toJson();
+            }
+
+            return notFound(response);
+        } catch (IOException e) {
+            response.status(500);
+            return "Failed";
+        }
+    }
+
+    public static void main(String[] args) throws IOException {
+        DUUINextcloudDocumentHandler nc = new DUUINextcloudDocumentHandler(
+                "https://nextcloud.texttechnologylab.org/",
+                "terefe",
+                "AqV-rtto5z"
+        );
+
+        nc.listDocuments("/", ".txt", true)
+                .forEach(d -> System.out.println(d.getPath()));
+    }
+
+    public static String refreshAccessToken(String refreshToken, String clientId, String clientSecret) throws IOException {
+        ArrayList<String> scopes = new ArrayList<>();
+
+        scopes.add(DriveScopes.DRIVE);
+
+        TokenResponse tokenResponse = new GoogleRefreshTokenRequest(new NetHttpTransport(), new JacksonFactory(),
+                refreshToken, clientId, clientSecret).setScopes(scopes).setGrantType("refresh_token").execute();
+
+        return tokenResponse.getAccessToken();
+    }
+
+    public static String getGoogleSettings(Request request, Response response) {
+        return new Document()
+                .append("key", Main.config.getGoogleClientId())
+                .append("secret", Main.config.getGoogleClientSecret())
+                .append("url", Main.config.getGoogleRedirectUri())
+                .toJson();
+    }
+
     public static String getDropboxAppSettings(Request request, Response response) {
         return new Document()
             .append("key", Main.config.getDropboxKey())
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/routes/processes/DUUIProcessRequestHandler.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/routes/processes/DUUIProcessRequestHandler.java
index 4d718c5..a04f0e8 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/routes/processes/DUUIProcessRequestHandler.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/routes/processes/DUUIProcessRequestHandler.java
@@ -21,7 +21,11 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.security.GeneralSecurityException;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
@@ -35,16 +39,19 @@
  */
 public class DUUIProcessRequestHandler {
 
-    public static String getFolderStructure(Request request, Response response) throws DbxException {
+    public static String getFolderStructure(Request request, Response response) throws DbxException, ExecutionException, InterruptedException, GeneralSecurityException, IOException {
         String id = request.params(":id");
         String provider = request.params(":provider");
         IDUUIDocumentHandler handler = getHandler(provider, id);
 
         if (handler instanceof IDUUIFolderPickerApi) {
-            Document document = new Document(((IDUUIFolderPickerApi) handler).getFolderStructure().toJson());
+            CompletableFuture<IDUUIFolderPickerApi.DUUIFolder> folderStructure =
+                    CompletableFuture.supplyAsync(() -> ((IDUUIFolderPickerApi) handler).getFolderStructure());
+            Map<String, Object> tree = folderStructure.get().toJson();
+            Document document = new Document(tree);
 
             response.status(200);
-            System.out.println(document.toJson());
+//            System.out.println(document.toJson());
             return document.toJson();
         }
 

From d35baf447d76ff125f3821da87735aef3ef8bd93 Mon Sep 17 00:00:00 2001
From: dterefe <daveterefe@gmail.com>
Date: Thu, 18 Jul 2024 17:11:21 +0200
Subject: [PATCH 11/15] Re-Added GoogleDrive to frontend

---
 DUUIWeb/src/app.d.ts                          |   6 +-
 DUUIWeb/src/lib/duui/io.ts                    |   7 +-
 .../components/Input/FolderStructure.svelte   |   2 +-
 .../account/(auth)/google/+page.server.ts     |  18 ++-
 DUUIWeb/src/routes/account/+page.server.ts    |  27 +++-
 DUUIWeb/src/routes/account/+page.svelte       |  37 ++----
 DUUIWeb/src/routes/processes/+page.svelte     | 120 +++++++++++-------
 7 files changed, 125 insertions(+), 92 deletions(-)

diff --git a/DUUIWeb/src/app.d.ts b/DUUIWeb/src/app.d.ts
index 53f59d8..306334f 100644
--- a/DUUIWeb/src/app.d.ts
+++ b/DUUIWeb/src/app.d.ts
@@ -45,13 +45,9 @@ interface UserProperties {
 			username: string | null
 			password: string | null
 		}
-		googleDrive?: {
+		google?: {
 			access_token: string | null
 			refresh_token: string | null
-			scope: string | null
-			token_type: string | null
-			id_token: string | null
-			expires_date: number | null
 		}
 	}
 }
diff --git a/DUUIWeb/src/lib/duui/io.ts b/DUUIWeb/src/lib/duui/io.ts
index a5adadf..306c4d1 100644
--- a/DUUIWeb/src/lib/duui/io.ts
+++ b/DUUIWeb/src/lib/duui/io.ts
@@ -34,7 +34,7 @@ export type DUUIDocumentProvider = {
 	file_extension: FileExtension
 }
 
-export type IOProvider = 'Dropbox' | 'Minio' | 'File' | 'Text' | 'NextCloud' | 'None'
+export type IOProvider = 'Dropbox' | 'Minio' | 'File' | 'Text' | 'NextCloud' | 'Google'| 'None'
 export type FileExtension = '.txt' | '.xmi' | '.gz'
 
 export enum IO {
@@ -43,13 +43,14 @@ export enum IO {
 	Minio = 'Minio',
 	Text = 'Text',
 	NextCloud = 'NextCloud',
+	Google = 'Google',
 	None = 'None'
 }
 
-export const IO_INPUT: string[] = ['Dropbox', 'File', 'Minio', 'Text', 'NextCloud']
+export const IO_INPUT: string[] = ['Dropbox', 'File', 'Minio', 'Text', 'NextCloud', 'Google']
 export const INPUT_EXTENSIONS: string[] = ['.txt', '.xmi', '.gz']
 
-export const IO_OUTPUT: string[] = ['Dropbox', 'Minio', 'NextCloud', 'None']
+export const IO_OUTPUT: string[] = ['Dropbox', 'Minio', 'NextCloud', 'Google', 'None']
 export const OUTPUT_EXTENSIONS: string[] = ['.txt', '.xmi']
 
 export const isCloudProvider = (provider: string) => {
diff --git a/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte b/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
index 8fafe14..623a594 100644
--- a/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
+++ b/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
@@ -125,7 +125,7 @@
         <Fa {icon} />
     </button>
 </div>
-<div data-popup={name}>
+<div data-popup={name} class="fixed">
     <div class="popup-solid p-1 md:min-w-[768px]">
         <RecursiveTreeView
             selection
diff --git a/DUUIWeb/src/routes/account/(auth)/google/+page.server.ts b/DUUIWeb/src/routes/account/(auth)/google/+page.server.ts
index a27837a..1412f9c 100644
--- a/DUUIWeb/src/routes/account/(auth)/google/+page.server.ts
+++ b/DUUIWeb/src/routes/account/(auth)/google/+page.server.ts
@@ -3,17 +3,15 @@ import type { PageServerLoad } from './$types'
 
 export const load: PageServerLoad = async ({ url, cookies, fetch }) => {
 	const code = url.searchParams.get('code')
-	// const access_token = url.searchParams.get('access_token')
-	// const expires_in = url.searchParams.get('expires_in')
-	console.log(url)
-	// const response = await fetch(`${API_URL}/users/auth/?code=${code}`, {
-	// 	method: 'PUT',
-	// 	headers: {
-	// 		Authorization: cookies.get('session') || ''
-	// 	}
-	// })
+
+	const response = await fetch(`${API_URL}/users/auth/google?code=${code}`, {
+		method: 'PUT',
+		headers: {
+			Authorization: cookies.get('session') || ''
+		}
+	})
 
 	return {
-		success: true
+		success: response.ok
 	}
 }
diff --git a/DUUIWeb/src/routes/account/+page.server.ts b/DUUIWeb/src/routes/account/+page.server.ts
index 2280036..1c5f277 100644
--- a/DUUIWeb/src/routes/account/+page.server.ts
+++ b/DUUIWeb/src/routes/account/+page.server.ts
@@ -1,4 +1,4 @@
-import { API_URL, SECRET_CLIENT_ID, SECRET_CLIENT_SECRET, REDIRECT_URL } from '$env/static/private'
+import { API_URL} from '$env/static/private'
 import { handleLoginRedirect } from '$lib/utils'
 import { fail, redirect } from '@sveltejs/kit'
 import { DropboxAuth } from 'dropbox'
@@ -17,7 +17,6 @@ export const load: PageServerLoad = async ({ locals, cookies, url }) => {
 	})
 
 	let dropbBoxURL = new String('')
-	let googleDriveURL = ""
 
 	try {
 		const credentials: {
@@ -43,18 +42,32 @@ export const load: PageServerLoad = async ({ locals, cookies, url }) => {
 		)
 	} catch (error) { /* empty */ }
 
+
+	let googleDriveURL = ""
+	const googleResponse = await fetch(`${API_URL}/users/auth/google`, {
+		method: 'GET'
+	})
+
+	const googleCredentials: {
+		key: string
+		secret: string
+		url: string
+	} = await googleResponse.json();
+
+
 	const googleAuth = new OAuth2Client(
-			SECRET_CLIENT_ID,
-			SECRET_CLIENT_SECRET,
-			REDIRECT_URL)
+			googleCredentials.key,
+			googleCredentials.secret,
+			googleCredentials.url)
 
 	googleDriveURL = googleAuth.generateAuthUrl(
 		{
 						scope: "https://www.googleapis.com/auth/drive openid ",
 						access_type: "offline",
-						redirect_uri: "http://localhost:5173/account/google"
+						redirect_uri: googleCredentials.url
 		})
-	console.log('googleDriveURL', googleDriveURL)
+
+
 	/**
 	 * Fetch a user from the backend.
 	 *
diff --git a/DUUIWeb/src/routes/account/+page.svelte b/DUUIWeb/src/routes/account/+page.svelte
index 51ae1e3..391f709 100644
--- a/DUUIWeb/src/routes/account/+page.svelte
+++ b/DUUIWeb/src/routes/account/+page.svelte
@@ -70,10 +70,9 @@
 	let nextcloudPassword: string = $userSession?.connections.nextcloud?.password || ''
 
 	$: isGoogleDriveConnected =
-		!!$userSession?.connections.googleDrive &&
-		!!$userSession?.connections.googleDrive.access_token &&
-		!!$userSession?.connections.googleDrive.refresh_token &&
-		!!$userSession?.connections.googleDrive.id_token
+		!!$userSession?.connections.google &&
+		!!$userSession?.connections.google.access_token &&
+		!!$userSession?.connections.google.refresh_token
 
 
 	$: hasApiKey = !!$userSession?.connections.key
@@ -82,7 +81,7 @@
 		try {
 			const body = document.body
 			body.dataset.theme = 'theme-' + themes[theme]
-		} catch (err) {}
+		} catch (err) { /* empty */ }
 	}
 
 	let tab: number = +($page.url.searchParams.get('tab') || '0')
@@ -225,19 +224,13 @@
 		if (!confirm) return
 
 		const response = await updateUser({
-			'connections.googleDrive.access_token': null,
-			'connections.googleDrive.refresh_token': null,
-			'connections.googleDrive.id_token': null,
-			'connections.googleDrive.scope': null,
-			'connections.googleDrive.expires_date': null
+			'connections.google.access_token': null,
+			'connections.google.refresh_token': null
 		})
 
-		if (response.ok && $userSession && $userSession.connections.googleDrive) {
-			$userSession.connections.googleDrive.access_token = null
-			$userSession.connections.googleDrive.refresh_token = null
-			$userSession.connections.googleDrive.id_token = null
-			$userSession.connections.googleDrive.scope = null
-			$userSession.connections.googleDrive.expires_date = null
+		if (response.ok && $userSession && $userSession.connections.google) {
+			$userSession.connections.google.access_token = null
+			$userSession.connections.google.refresh_token = null
 		}
 	}
 
@@ -683,7 +676,7 @@
 <!--					</p>-->
 				</div>
 				<div class="section-wrapper p-8 grid grid-rows-[auto_1fr_auto] gap-8">
-					<h2 class="h3 scroll-mt-16" id="googledrive">Google Drive</h2>
+					<h2 class="h3 scroll-mt-16" id="google">Google Drive</h2>
 					<div class="space-y-8">
 						{#if isGoogleDriveConnected}
 							<div>
@@ -707,12 +700,10 @@
 								</p>
 							</div>
 							<div class="grid md:flex justify-between gap-4">
-								<form method="POST" action="/auth/googleDrive">
-									<button class="button-neutral" type="submit" >
-										<Fa icon={faLink} />
-										<span>Reconnect</span>
-									</button>
-								<form/>
+								<button class="button-neutral" on:click={startGoogleDriveAccess}>
+									<Fa icon={faLink} />
+									<span>Reconnect</span>
+								</button>
 								<button class="button-error" on:click={deleteGoogleDriveAccess}>
 									<Fa icon={faXmarkCircle} />
 									<span>Delete</span>
diff --git a/DUUIWeb/src/routes/processes/+page.svelte b/DUUIWeb/src/routes/processes/+page.svelte
index 5950da5..4e60831 100644
--- a/DUUIWeb/src/routes/processes/+page.svelte
+++ b/DUUIWeb/src/routes/processes/+page.svelte
@@ -32,7 +32,7 @@
 		faCheck,
 		faCloud,
 		faCloudUpload,
-		faFileArrowUp
+		faFileArrowUp, faRefresh
 	} from '@fortawesome/free-solid-svg-icons'
 	import Fa from 'svelte-fa'
 	import { FileDropzone, ProgressBar, getToastStore, type TreeViewNode } from '@skeletonlabs/skeleton'
@@ -233,48 +233,28 @@
 	$: $userSession
 
 
-	let tree: TreeViewNode = {
-		id: '1',
-		content: 'Folder 1',
-		children: [
-			{
-				id: '2',
-				content: 'Folder 2'
-			},
-			{
-				id: '3',
-				content: 'Folder 3'
-			},
-			{
-				id: '4',
-				content: 'Folder 4',
-				children: [
-					{
-						id: '6',
-						content: 'Folder 6'
-					},
-					{
-						id: '7',
-						content: 'Folder 7'
-					}
-				]
-			}
-		]
-	}
-
+	let inputTree: TreeViewNode = null
+	let outputTree: TreeViewNode = null
+	let fetchingTree = false
 
-	async function getFolderStructure(provider: IOProvider) {
-		// console.log(provider)
+	async function getFolderStructure(provider: IOProvider, isInput = true) {
+		fetchingTree = true
 		const response = await fetch('/api/processes/folderstructure',
 			{
 				method: 'POST',
 				body: JSON.stringify({provider: provider, user: $userSession?.oid})
 			})
-
+		let tree = null
 		if (response.ok) {
 			tree = await response.json()
-			console.log(tree)
 		}
+
+		if (isInput) {
+			inputTree = tree
+		} else {
+			outputTree = tree
+		}
+		fetchingTree = false
 	}
 
 
@@ -350,6 +330,17 @@
 					</a>
 				</div>
 			</div>
+		{:else if fetchingTree}
+
+			<div class="h-full w-full flex items-center justify-center p-4">
+				<div class="space-y-8 section-wrapper p-8 flex flex-col items-center">
+					<h1 class="h2">Fetching Directory Structure...</h1>
+					<hr class="hr" />
+					<Fa icon={faRefresh} spin size="4x" />
+					<p class="text-lg">Do not refresh this page</p>
+				</div>
+			</div>
+
 		{:else}
 			<div class="container mx-auto max-w-4xl grid gap-4">
 				<div class="grid gap-4">
@@ -402,6 +393,18 @@
 							</div>
 						{/if}
 
+						{#if $processSettingsStore.input.provider === IO.Google && !$userSession?.connections.google?.refresh_token}
+							<div class="text-center w-full variant-soft-error p-4 rounded-md">
+								<p class="mx-auto">
+									To use Google you must first connect your <a
+									class="anchor"
+									href="/account#google"
+									target="_blank">Account</a
+								>
+								</p>
+							</div>
+						{/if}
+
 						<div class="grid gap-4">
 							<div class="flex-center-4">
 								<div class="flex-1">
@@ -409,7 +412,7 @@
 										label="Source"
 										options={IO_INPUT}
 										bind:value={$processSettingsStore.input.provider}
-										on:change={() => getFolderStructure($processSettingsStore.input.provider)}
+										on:change={() => getFolderStructure($processSettingsStore.input.provider, true)}
 									/>
 								</div>
 								{#if !equals($processSettingsStore.input.provider, IO.Text)}
@@ -451,7 +454,7 @@
 										{files?.length || 0} files selected
 									</p>
 								</div>
-
+								<!-- TODO: Add Other Providers-->
 								<Checkbox
 									label="Upload input files to cloud storage."
 									bind:checked={fileStorage.storeFiles}
@@ -491,7 +494,7 @@
 								/>
 							{:else}
 								<div>
-									{#if !tree}
+									{#if !inputTree}
 										<TextInput
 											label="Relative path"
 											name="inputPath"
@@ -502,7 +505,7 @@
 										/>
 									{:else }
 										<FolderStructure
-											tree={tree}
+											tree={inputTree}
 											label="Folder Picker"
 											name="inputPaths"
 											isMultiple={true}
@@ -593,6 +596,30 @@
 								</p>
 							</div>
 						{/if}
+
+						{#if $processSettingsStore.output.provider === IO.NextCloud && !$userSession?.connections.nextcloud}
+							<div class="text-center w-full variant-soft-error p-4 rounded-md">
+								<p class="mx-auto">
+									To use NextCloud you must first connect your <a
+										class="anchor"
+										href="/account#nextcloud"
+										target="_blank">Account</a
+									>
+								</p>
+							</div>
+						{/if}
+
+						{#if $processSettingsStore.output.provider === IO.Google && !$userSession?.connections.google?.refresh_token}
+							<div class="text-center w-full variant-soft-error p-4 rounded-md">
+								<p class="mx-auto">
+									To use Google you must first connect your <a
+										class="anchor"
+										href="/account#google"
+										target="_blank">Account</a
+									>
+								</p>
+							</div>
+						{/if}
 						<div class="flex-center-4 justify-between">
 							<h2 class="h2">Output</h2>
 							{#if isValidOutput($processSettingsStore.output, $userSession)}
@@ -606,9 +633,14 @@
 										label="Target"
 										options={IO_OUTPUT}
 										bind:value={$processSettingsStore.output.provider}
+										on:change={() => getFolderStructure($processSettingsStore.output.provider, false)}
 									/>
 								</div>
-								{#if equals($processSettingsStore.output.provider, IO.Dropbox) || equals($processSettingsStore.output.provider, IO.Minio)}
+								{#if equals($processSettingsStore.output.provider, IO.Dropbox)
+									|| equals($processSettingsStore.output.provider, IO.Minio)
+									|| equals($processSettingsStore.output.provider, IO.NextCloud)
+									|| equals($processSettingsStore.output.provider, IO.Google)
+								}
 									<Dropdown
 										label="File extension"
 										name="output-extension"
@@ -625,9 +657,11 @@
 									bind:value={$processSettingsStore.output.path}
 								/>
 							{:else if equals($processSettingsStore.output.provider, IO.Dropbox)
-									   || equals($processSettingsStore.output.provider, IO.NextCloud)}
+									   || equals($processSettingsStore.output.provider, IO.NextCloud)
+									   || equals($processSettingsStore.output.provider, IO.Google)
+							}
 								<div>
-									{#if !tree }
+									{#if !outputTree }
 										<TextInput
 											label="Relative path"
 											name="inputPath"
@@ -638,9 +672,9 @@
 										/>
 									{:else}
 										<FolderStructure
-											tree={tree}
+											tree={outputTree}
 											label="Folder Picker"
-											name="inputPaths"
+											name="outputPaths"
 											isMultiple={false}
 											bind:value={$processSettingsStore.output.path}
 										/>

From de22e2ad53c5dcc1588615ea140340a23d78df25 Mon Sep 17 00:00:00 2001
From: dterefe <daveterefe@gmail.com>
Date: Fri, 19 Jul 2024 14:27:18 +0100
Subject: [PATCH 12/15] Fixes

---
 .../duui/analysis/document/Provider.java           |  2 +-
 .../pipelines/DUUIPipelineController.java          |  6 +++++-
 .../api/controllers/users/DUUIUserController.java  | 14 +-------------
 .../duui/apps/LanguageDetectionFastText.java       | 14 ++++----------
 4 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/Provider.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/Provider.java
index 5fd33e4..fd0d9db 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/Provider.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/analysis/document/Provider.java
@@ -14,5 +14,5 @@ public class Provider {
     public static final String MONGODB = "MongoDB";
     public static final String ONEDRIVE = "OneDrive";
     public static final String NEXTCLOUD = "NextCloud";
-    public static final String GOOGLE = "GoogleDrive";
+    public static final String GOOGLE = "Google";
 }
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/pipelines/DUUIPipelineController.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/pipelines/DUUIPipelineController.java
index 20fa76b..17b3774 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/pipelines/DUUIPipelineController.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/pipelines/DUUIPipelineController.java
@@ -1,5 +1,9 @@
 package org.texttechnologylab.duui.api.controllers.pipelines;
 
+import org.apache.uima.cas.CASException;
+import org.apache.uima.fit.factory.JCasFactory;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.resource.ResourceInitializationException;
 import org.texttechnologylab.duui.api.controllers.components.DUUIComponentController;
 import org.texttechnologylab.duui.api.controllers.processes.DUUIProcessController;
 import org.texttechnologylab.duui.api.storage.DUUIMongoDBStorage;
@@ -461,7 +465,7 @@ public static void setupDrivers(DUUIComposer composer, Document pipeline) {
                 }
                 composer.addDriver(driver);
                 addedDrivers.add(name);
-            } catch (Exception e) {
+            } catch (Exception | LinkageError e) {
                 composer.addEvent(DUUIEvent.Sender.COMPOSER, e.getMessage(), DUUIComposer.DebugLevel.ERROR);
             }
         }
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/users/DUUIUserController.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/users/DUUIUserController.java
index f890934..dc26da6 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/users/DUUIUserController.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/api/controllers/users/DUUIUserController.java
@@ -679,23 +679,11 @@ public static String finishGoogleOAuthFromCode(Request request, Response respons
     }
 
     public static void main(String[] args) throws IOException {
-        DUUINextcloudDocumentHandler nc = new DUUINextcloudDocumentHandler(
-                "https://nextcloud.texttechnologylab.org/",
-                "terefe",
-                "AqV-rtto5z"
-        );
-
-        nc.listDocuments("/", ".txt", true)
-                .forEach(d -> System.out.println(d.getPath()));
     }
 
     public static String refreshAccessToken(String refreshToken, String clientId, String clientSecret) throws IOException {
-        ArrayList<String> scopes = new ArrayList<>();
-
-        scopes.add(DriveScopes.DRIVE);
-
         TokenResponse tokenResponse = new GoogleRefreshTokenRequest(new NetHttpTransport(), new JacksonFactory(),
-                refreshToken, clientId, clientSecret).setScopes(scopes).setGrantType("refresh_token").execute();
+                refreshToken, clientId, clientSecret).setGrantType("refresh_token").execute();
 
         return tokenResponse.getAccessToken();
     }
diff --git a/DUUIRestService/src/main/java/org/texttechnologylab/duui/apps/LanguageDetectionFastText.java b/DUUIRestService/src/main/java/org/texttechnologylab/duui/apps/LanguageDetectionFastText.java
index cacb0b3..ffb13b6 100644
--- a/DUUIRestService/src/main/java/org/texttechnologylab/duui/apps/LanguageDetectionFastText.java
+++ b/DUUIRestService/src/main/java/org/texttechnologylab/duui/apps/LanguageDetectionFastText.java
@@ -4,29 +4,23 @@
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
-
-import java.io.*;
-import java.net.InetSocketAddress;
-
 import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence;
-import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence_Type;
-import org.apache.commons.codec.language.bm.Lang;
 import org.apache.uima.UIMAException;
-import org.apache.uima.cas.Type;
 import org.apache.uima.cas.impl.XmiCasSerializer;
 import org.apache.uima.fit.factory.JCasFactory;
 import org.apache.uima.fit.factory.TypeSystemDescriptionFactory;
 import org.apache.uima.fit.util.JCasUtil;
 import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-import org.apache.uima.jcas.tcas.Annotation;
 import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.metadata.TypeSystemDescription;
 import org.apache.uima.util.CasIOUtils;
 import org.hucompute.textimager.uima.type.Language;
 import org.xml.sax.SAXException;
 
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+
 
 public class LanguageDetectionFastText {
 

From 392b84fab03cb35e67a34a0509ecee546acb7759 Mon Sep 17 00:00:00 2001
From: dterefe <daveterefe@gmail.com>
Date: Fri, 9 Aug 2024 14:25:34 +0100
Subject: [PATCH 13/15] Small adjustments in the interface and bugfixes.

---
 DUUIRestService/pom.xml                       | 54 ++++++++++++-------
 .../svelte/components/Input/Dropdown.svelte   |  2 +-
 .../components/Input/FolderStructure.svelte   |  2 +-
 DUUIWeb/src/routes/account/+page.server.ts    |  4 +-
 DUUIWeb/src/routes/account/+page.svelte       |  4 +-
 .../api/processes/folderstructure/+server.ts  |  2 +-
 6 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/DUUIRestService/pom.xml b/DUUIRestService/pom.xml
index 98294c4..3ac7509 100644
--- a/DUUIRestService/pom.xml
+++ b/DUUIRestService/pom.xml
@@ -186,32 +186,46 @@
         <dependency>
             <groupId>com.github.dterefe</groupId>
             <artifactId>DockerUnifiedUIMAInterface</artifactId>
-            <version>a4b7b5eb31604116b2428ddb7ad53a39296d7ba0</version>
+            <version>b687c633e6066a34570369610331d5f17f66ea39</version>
         </dependency>
 
-        <dependency>
-            <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-            <artifactId>de.tudarmstadt.ukp.dkpro.core.opennlp-asl</artifactId>
-            <version>1.10.0</version>
-        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.uima/uimaj-document-annotation -->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.uima</groupId>-->
+<!--            <artifactId>uimaj-document-annotation</artifactId>-->
+<!--            <version>3.5.0</version>-->
+<!--        </dependency>-->
 
-        <dependency>
-            <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-            <artifactId>de.tudarmstadt.ukp.dkpro.core.api.metadata-asl</artifactId>
-            <version>1.10.0</version>
-        </dependency>
 
-        <!-- https://mvnrepository.com/artifact/de.tudarmstadt.ukp.dkpro.core/de.tudarmstadt.ukp.dkpro.core.io.text-asl -->
-        <dependency>
-            <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-            <artifactId>de.tudarmstadt.ukp.dkpro.core.io.text-asl</artifactId>
-            <version>1.10.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>-->
+<!--            <artifactId>de.tudarmstadt.ukp.dkpro.core.opennlp-asl</artifactId>-->
+<!--            <version>1.10.0</version>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>-->
+<!--            <artifactId>de.tudarmstadt.ukp.dkpro.core.api.metadata-asl</artifactId>-->
+<!--            <version>1.10.0</version>-->
+<!--        </dependency>-->
+
+<!--         https://mvnrepository.com/artifact/de.tudarmstadt.ukp.dkpro.core/de.tudarmstadt.ukp.dkpro.core.io.text-asl -->
+<!--        <dependency>-->
+<!--            <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>-->
+<!--            <artifactId>de.tudarmstadt.ukp.dkpro.core.io.text-asl</artifactId>-->
+<!--            <version>1.10.0</version>-->
+<!--        </dependency>-->
         <!-- https://mvnrepository.com/artifact/de.tudarmstadt.ukp.dkpro.core/de.tudarmstadt.ukp.dkpro.core.tokit-asl -->
+<!--        <dependency>-->
+<!--            <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>-->
+<!--            <artifactId>de.tudarmstadt.ukp.dkpro.core.tokit-asl</artifactId>-->
+<!--            <version>1.10.0</version>-->
+<!--        </dependency>-->
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
         <dependency>
-            <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-            <artifactId>de.tudarmstadt.ukp.dkpro.core.tokit-asl</artifactId>
-            <version>1.10.0</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.8</version>
         </dependency>
 
         <dependency>
diff --git a/DUUIWeb/src/lib/svelte/components/Input/Dropdown.svelte b/DUUIWeb/src/lib/svelte/components/Input/Dropdown.svelte
index 496649c..8708812 100644
--- a/DUUIWeb/src/lib/svelte/components/Input/Dropdown.svelte
+++ b/DUUIWeb/src/lib/svelte/components/Input/Dropdown.svelte
@@ -50,7 +50,7 @@
 	</button>
 </div>
 
-<div data-popup={name}>
+<div data-popup={name} class="fixed">
 	<div class="popup-solid p-2 md:min-w-[220px]">
 		<ListBox class="overflow-hidden" rounded="rounded-md" spacing="space-y-2">
 			{#each options as option}
diff --git a/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte b/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
index 623a594..39e759d 100644
--- a/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
+++ b/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
@@ -126,7 +126,7 @@
     </button>
 </div>
 <div data-popup={name} class="fixed">
-    <div class="popup-solid p-1 md:min-w-[768px]">
+    <div class="overflow-scroll max-h-96 popup-solid p-1 md:min-w-[768px]">
         <RecursiveTreeView
             selection
             multiple={isMultiple}
diff --git a/DUUIWeb/src/routes/account/+page.server.ts b/DUUIWeb/src/routes/account/+page.server.ts
index 1c5f277..684dd36 100644
--- a/DUUIWeb/src/routes/account/+page.server.ts
+++ b/DUUIWeb/src/routes/account/+page.server.ts
@@ -54,7 +54,6 @@ export const load: PageServerLoad = async ({ locals, cookies, url }) => {
 		url: string
 	} = await googleResponse.json();
 
-
 	const googleAuth = new OAuth2Client(
 			googleCredentials.key,
 			googleCredentials.secret,
@@ -64,7 +63,8 @@ export const load: PageServerLoad = async ({ locals, cookies, url }) => {
 		{
 						scope: "https://www.googleapis.com/auth/drive openid ",
 						access_type: "offline",
-						redirect_uri: googleCredentials.url
+						redirect_uri: googleCredentials.url,
+						prompt: "select_account"
 		})
 
 
diff --git a/DUUIWeb/src/routes/account/+page.svelte b/DUUIWeb/src/routes/account/+page.svelte
index 391f709..2c92998 100644
--- a/DUUIWeb/src/routes/account/+page.svelte
+++ b/DUUIWeb/src/routes/account/+page.svelte
@@ -71,9 +71,7 @@
 
 	$: isGoogleDriveConnected =
 		!!$userSession?.connections.google &&
-		!!$userSession?.connections.google.access_token &&
-		!!$userSession?.connections.google.refresh_token
-
+		!!$userSession?.connections.google.access_token
 
 	$: hasApiKey = !!$userSession?.connections.key
 
diff --git a/DUUIWeb/src/routes/api/processes/folderstructure/+server.ts b/DUUIWeb/src/routes/api/processes/folderstructure/+server.ts
index 72fb5e0..84b3d6e 100644
--- a/DUUIWeb/src/routes/api/processes/folderstructure/+server.ts
+++ b/DUUIWeb/src/routes/api/processes/folderstructure/+server.ts
@@ -8,7 +8,7 @@ import { error, json, type RequestHandler } from '@sveltejs/kit'
 export const POST: RequestHandler = async ({ request, cookies, locals, fetch }) => {
 	const data = await request.json()
 	const user = locals.user
-	console.log(user?.oid)
+
 	const response = await fetch(`${API_URL}/processes/folderstructure/${user?.oid}/${data.provider}`, {
 		method: 'GET',
 		headers: {

From fdf734fba4d4b3e152bface99b55f7f19c4551c7 Mon Sep 17 00:00:00 2001
From: dterefe <daveterefe@gmail.com>
Date: Fri, 16 Aug 2024 09:27:04 +0100
Subject: [PATCH 14/15] Clean up.

---
 DUUIRestService/pom.xml                    | 17 +++--------------
 DUUIWeb/src/routes/account/+page.server.ts |  2 --
 DUUIWeb/src/routes/account/+page.svelte    |  1 +
 DUUIWeb/src/routes/processes/+page.svelte  |  1 +
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/DUUIRestService/pom.xml b/DUUIRestService/pom.xml
index 3ac7509..1e6b948 100644
--- a/DUUIRestService/pom.xml
+++ b/DUUIRestService/pom.xml
@@ -228,6 +228,9 @@
             <version>3.8</version>
         </dependency>
 
+
+
+
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
@@ -279,20 +282,6 @@
             <groupId>com.sparkjava</groupId>
             <artifactId>spark-core</artifactId>
             <version>2.9.4</version>
-            <exclusions>
-<!--                <exclusion>-->
-<!--                    <groupId>org.mortbay.jetty</groupId>-->
-<!--                    <artifactId>servlet-api</artifactId>-->
-<!--                </exclusion>-->
-<!--                <exclusion>-->
-<!--                    <groupId>org.mortbay.jetty</groupId>-->
-<!--                    <artifactId>jetty</artifactId>-->
-<!--                </exclusion>-->
-<!--                <exclusion>-->
-<!--                    <groupId>org.mortbay.jetty</groupId>-->
-<!--                    <artifactId>jetty-util</artifactId>-->
-<!--                </exclusion>-->
-            </exclusions>
         </dependency>
     </dependencies>
 
diff --git a/DUUIWeb/src/routes/account/+page.server.ts b/DUUIWeb/src/routes/account/+page.server.ts
index 684dd36..b6cd595 100644
--- a/DUUIWeb/src/routes/account/+page.server.ts
+++ b/DUUIWeb/src/routes/account/+page.server.ts
@@ -25,7 +25,6 @@ export const load: PageServerLoad = async ({ locals, cookies, url }) => {
 			url: string
 		} = await response.json()
 
-		console.log(credentials)
 		const dbxAuth = new DropboxAuth({
 			clientId: credentials.key,
 			clientSecret: credentials.secret
@@ -67,7 +66,6 @@ export const load: PageServerLoad = async ({ locals, cookies, url }) => {
 						prompt: "select_account"
 		})
 
-
 	/**
 	 * Fetch a user from the backend.
 	 *
diff --git a/DUUIWeb/src/routes/account/+page.svelte b/DUUIWeb/src/routes/account/+page.svelte
index 2c92998..89c7da2 100644
--- a/DUUIWeb/src/routes/account/+page.svelte
+++ b/DUUIWeb/src/routes/account/+page.svelte
@@ -44,6 +44,7 @@
 	if (user && $userSession) {
 		$userSession.preferences = user.preferences
 		$userSession.connections = user.connections
+
 	}
 
 	$: isDropboxConnected =
diff --git a/DUUIWeb/src/routes/processes/+page.svelte b/DUUIWeb/src/routes/processes/+page.svelte
index 4e60831..38441a9 100644
--- a/DUUIWeb/src/routes/processes/+page.svelte
+++ b/DUUIWeb/src/routes/processes/+page.svelte
@@ -217,6 +217,7 @@
 			toastStore.trigger(errorToast(JSON.stringify(response.body)))
 			starting = false
 		}
+
 	}
 
 	$: inputBucketIsValid = isValidS3BucketName($processSettingsStore.input.path)

From 7bd2ed3766f1b331a23a1c6d486bf480a93526fb Mon Sep 17 00:00:00 2001
From: dterefe <daveterefe@gmail.com>
Date: Tue, 27 Aug 2024 22:00:49 +0200
Subject: [PATCH 15/15] Fixed Bug where Folder selection with the Picker is not
 remembered.

---
 DUUIRestService/pom.xml                       | 56 +++++++++----------
 .../components/Input/FolderStructure.svelte   | 54 ++++++++++++------
 2 files changed, 65 insertions(+), 45 deletions(-)

diff --git a/DUUIRestService/pom.xml b/DUUIRestService/pom.xml
index 1e6b948..c882813 100644
--- a/DUUIRestService/pom.xml
+++ b/DUUIRestService/pom.xml
@@ -186,41 +186,41 @@
         <dependency>
             <groupId>com.github.dterefe</groupId>
             <artifactId>DockerUnifiedUIMAInterface</artifactId>
-            <version>b687c633e6066a34570369610331d5f17f66ea39</version>
+            <version>5c71f6e7af57fb0273a214f69e58a00ed3e9211d</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.apache.uima/uimaj-document-annotation -->
-<!--        <dependency>-->
-<!--            <groupId>org.apache.uima</groupId>-->
-<!--            <artifactId>uimaj-document-annotation</artifactId>-->
-<!--            <version>3.5.0</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.apache.uima</groupId>-->
+        <!--            <artifactId>uimaj-document-annotation</artifactId>-->
+        <!--            <version>3.5.0</version>-->
+        <!--        </dependency>-->
 
 
-<!--        <dependency>-->
-<!--            <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>-->
-<!--            <artifactId>de.tudarmstadt.ukp.dkpro.core.opennlp-asl</artifactId>-->
-<!--            <version>1.10.0</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>-->
+        <!--            <artifactId>de.tudarmstadt.ukp.dkpro.core.opennlp-asl</artifactId>-->
+        <!--            <version>1.10.0</version>-->
+        <!--        </dependency>-->
 
-<!--        <dependency>-->
-<!--            <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>-->
-<!--            <artifactId>de.tudarmstadt.ukp.dkpro.core.api.metadata-asl</artifactId>-->
-<!--            <version>1.10.0</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>-->
+        <!--            <artifactId>de.tudarmstadt.ukp.dkpro.core.api.metadata-asl</artifactId>-->
+        <!--            <version>1.10.0</version>-->
+        <!--        </dependency>-->
 
-<!--         https://mvnrepository.com/artifact/de.tudarmstadt.ukp.dkpro.core/de.tudarmstadt.ukp.dkpro.core.io.text-asl -->
-<!--        <dependency>-->
-<!--            <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>-->
-<!--            <artifactId>de.tudarmstadt.ukp.dkpro.core.io.text-asl</artifactId>-->
-<!--            <version>1.10.0</version>-->
-<!--        </dependency>-->
+        <!--         https://mvnrepository.com/artifact/de.tudarmstadt.ukp.dkpro.core/de.tudarmstadt.ukp.dkpro.core.io.text-asl -->
+        <!--        <dependency>-->
+        <!--            <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>-->
+        <!--            <artifactId>de.tudarmstadt.ukp.dkpro.core.io.text-asl</artifactId>-->
+        <!--            <version>1.10.0</version>-->
+        <!--        </dependency>-->
         <!-- https://mvnrepository.com/artifact/de.tudarmstadt.ukp.dkpro.core/de.tudarmstadt.ukp.dkpro.core.tokit-asl -->
-<!--        <dependency>-->
-<!--            <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>-->
-<!--            <artifactId>de.tudarmstadt.ukp.dkpro.core.tokit-asl</artifactId>-->
-<!--            <version>1.10.0</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>-->
+        <!--            <artifactId>de.tudarmstadt.ukp.dkpro.core.tokit-asl</artifactId>-->
+        <!--            <version>1.10.0</version>-->
+        <!--        </dependency>-->
         <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -285,4 +285,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte b/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
index 39e759d..339a4b7 100644
--- a/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
+++ b/DUUIWeb/src/lib/svelte/components/Input/FolderStructure.svelte
@@ -18,7 +18,7 @@
     export let name: string = label
     export let isMultiple = false
 
-    export let value: string | number = ""
+    export let value: string = ""
 
     export let placement: Placement = 'bottom-start'
 
@@ -48,6 +48,8 @@
     let indeterminateNodes: string[] = []
     let parentNodes = {}
 
+
+
     let myTreeViewNodes: TreeViewNode[] = [tree]
     let addFolderIcon = (node: TreeViewNode, height: number) => {
         node.lead = FolderIcon
@@ -86,25 +88,43 @@
     }
 
     let displayCheckedNodes = (nodes: string[], inde: string[]) => {
-        let v
+        let v:string
+
 
         if (isMultiple) {
-            let isInIndeterminates = (id) => {
-                return inde.includes(id)
+
+            if (nodes.length === 0 && value !== "") {
+                nodes = value.toString().split(",")
+                v = nodes.map((x) => getNode(myTreeViewNodes, x)).filter(x => x !== null).map(x => x.content).join(", ")
+            } else {
+                let isInIndeterminates = (id) => {
+                    return inde.includes(id)
+                }
+                let filtered = nodes
+                  .filter((x) => parentNodes[x] === x || isInIndeterminates(parentNodes[x]))
+                value = filtered.join(",")
+                v = filtered.map((x) => getNode(myTreeViewNodes, x).content).join(", ")
             }
-            let filtered = nodes
-              .filter((x) => parentNodes[x] === x || isInIndeterminates(parentNodes[x]))
-            value = filtered.join(",")
-            v = filtered.map((x) => getNode(myTreeViewNodes, x).content).join(", ")
-
-        } else {
-            if (nodes.length > 0) {
-                if (nodes.length > 1 && equals(prevNode, nodes[0])) nodes.shift()
-                if (nodes.length > 1 && equals(prevNode, nodes[1])) nodes.pop()
-                prevNode = nodes[0]
+
+        }
+
+        else {
+
+            if (nodes.length === 0 && value !== "") {
+                nodes = value.toString().split(",")
+                const tmp = getNode(myTreeViewNodes, value)
+                v =  tmp ? tmp.content : ""
+            } else {
+
+                if (nodes.length > 0) {
+                    if (nodes.length > 1 && equals(prevNode, nodes[0])) nodes.shift()
+                    if (nodes.length > 1 && equals(prevNode, nodes[1])) nodes.pop()
+                    prevNode = nodes[0]
+                }
+                value = nodes.join(",")
+                v = nodes.map((x) => getNode(myTreeViewNodes, x).content).join(", ")
+
             }
-            value = nodes.join(",")
-            v = nodes.map((x) => getNode(myTreeViewNodes, x).content).join(", ")
         }
 
         return v;
@@ -120,7 +140,7 @@
             class="flex items-center !justify-between gap-2 px-3 py-2 leading-6 border rounded-md input-wrapper"
             use:popup={dropdown}
     >
-        <span>{displayCheckedNodes(checkedNodes, indeterminateNodes)}</span>
+        <span>{ displayCheckedNodes(checkedNodes, indeterminateNodes) }</span>
 
         <Fa {icon} />
     </button>