Fix error when Nextcloud file picker is not present and do element fetching refactoring

packages/file-handling/package.json

 {
   "name": "@dbp-toolkit/file-handling",
   "homepage": "https://gitlab.tugraz.at/dbp/web-components/toolkit/-/tree/master/packages/file-handling",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "main": "src/index.js",
   "license": "LGPL-2.1-or-later",
   "repository": {

packages/file-handling/src/file-sink.js

@@ -198,9 +198,10 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
     }
 
     loadWebdavDirectory() {
+        const filePicker = this._('#nextcloud-file-picker');
 
-        if (this._('#nextcloud-file-picker') && this._('#nextcloud-file-picker').webDavClient !== null) {
-            this._('#nextcloud-file-picker').loadDirectory(this._('#nextcloud-file-picker').directoryPath);
+        if (filePicker && filePicker.webDavClient !== null) {
+            filePicker.loadDirectory(filePicker.directoryPath);
         }
     }
 
@@ -217,8 +218,10 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
         if (this.initialFileHandlingState.target !== '' && typeof this.initialFileHandlingState.target !== 'undefined'  && this.firstOpen) {
             this.activeTarget = this.initialFileHandlingState.target;
             this.nextcloudPath = this.initialFileHandlingState.path;
-            if (this._('#nextcloud-file-picker').webDavClient !== null) {
-                this._('#nextcloud-file-picker').loadDirectory(this.initialFileHandlingState.path);
+            const filePicker = this._('#nextcloud-file-picker');
+
+            if (filePicker && filePicker.webDavClient !== null) {
+                filePicker.loadDirectory(this.initialFileHandlingState.path);
                 console.log("load default nextcloud sink", this.initialFileHandlingState.path);
             }
             this.firstOpen = false;

packages/file-handling/src/file-source.js

@@ -389,8 +389,13 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
         if (filePicker) {
             MicroModal.show(filePicker, {
                 disableScroll: true,
-                onClose: modal => { this.isDialogOpen = false;
-                    this._('#nextcloud-file-picker').selectAllButton = true;}
+                onClose: modal => {
+                    this.isDialogOpen = false;
+                    const filePicker = this._('#nextcloud-file-picker');
+
+                    if (filePicker) {
+                        filePicker.selectAllButton = true;}
+                    }
             });
         }
 
@@ -399,8 +404,10 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
         if (this.initialFileHandlingState.target !== '' && typeof this.initialFileHandlingState.target !== 'undefined' && this.firstOpen) {
             this.activeDestination = this.initialFileHandlingState.target;
             this.nextcloudPath = this.initialFileHandlingState.path;
-            if (this._('#nextcloud-file-picker') && this._('#nextcloud-file-picker').webDavClient !== null) {
-                this._('#nextcloud-file-picker').loadDirectory(this.initialFileHandlingState.path);
+            const filePicker = this._('#nextcloud-file-picker');
+
+            if (filePicker && filePicker.webDavClient !== null) {
+                filePicker.loadDirectory(this.initialFileHandlingState.path);
                 //console.log("load default nextcloud source", this.initialFileHandlingState.target);
             }
             this.firstOpen = false;
@@ -409,7 +416,12 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
 
     closeDialog() {
         this.sendSource();
-        this._('#nextcloud-file-picker').selectAllButton = true;
+        const filePicker = this._('#nextcloud-file-picker');
+
+        if (filePicker) {
+            filePicker.selectAllButton = true;
+        }
+
         MicroModal.close(this._('#modal-picker'));
     }
 

[Bekerle, Patrizio]

@BDF32E9143B2CD5B, fyi