Skip to content
Snippets Groups Projects
Commit 50c62216 authored by Steinwender, Tamara's avatar Steinwender, Tamara
Browse files

Add missing notifications when pushing to clipboard

parent bcab9533
No related branches found
No related tags found
No related merge requests found
Pipeline #44680 passed
...@@ -74,7 +74,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -74,7 +74,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
} }
update(changedProperties) { update(changedProperties) {
console.log("update");
changedProperties.forEach((oldValue, propName) => { changedProperties.forEach((oldValue, propName) => {
switch (propName) { switch (propName) {
case "lang": case "lang":
...@@ -90,8 +89,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -90,8 +89,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
} }
connectedCallback() { connectedCallback() {
console.log("callback");
super.connectedCallback(); super.connectedCallback();
const that = this; const that = this;
this.updateComplete.then(() => { this.updateComplete.then(() => {
...@@ -204,24 +201,18 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -204,24 +201,18 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
} }
}); });
that.generateClipboardTable(); that.generateClipboardTable();
console.log("table generation end");
}); });
if(!window.clipboardWarning) { if(!window.clipboardWarning) {
window.addEventListener('beforeunload', this._onReceiveBeforeUnload, false); window.addEventListener('beforeunload', this._onReceiveBeforeUnload, false);
window.clipboardWarning = true; window.clipboardWarning = true;
console.log("clipboardwarning inner");
} }
console.log("clipboardwarning");
} }
disconnectedCallback() { disconnectedCallback() {
console.log("disconnected callback");
//We doesn't want to deregister this event, because we want to use this event over activities //We doesn't want to deregister this event, because we want to use this event over activities
//window.removeEventListener('beforeunload', this._onReceiveBeforeUnload); //window.removeEventListener('beforeunload', this._onReceiveBeforeUnload);
...@@ -233,8 +224,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -233,8 +224,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
* *
*/ */
selectAllFiles() { selectAllFiles() {
console.log("select all files");
let maxSelected = this.tabulatorTable.getRows().filter(row => row.getData().type != 'directory' && this.checkFileType(row.getData(), this.allowedMimeTypes)).length; let maxSelected = this.tabulatorTable.getRows().filter(row => row.getData().type != 'directory' && this.checkFileType(row.getData(), this.allowedMimeTypes)).length;
let selected = this.tabulatorTable.getSelectedRows().length; let selected = this.tabulatorTable.getSelectedRows().length;
...@@ -249,7 +238,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -249,7 +238,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
checkFileType(file) { checkFileType(file) {
console.log("check type");
// check if file is allowed // check if file is allowed
const [fileMainType, fileSubType] = file.type.split('/'); const [fileMainType, fileSubType] = file.type.split('/');
...@@ -269,7 +257,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -269,7 +257,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
} }
generateClipboardTable() { generateClipboardTable() {
console.log("generate before");
if (this.clipboardFiles.files) { if (this.clipboardFiles.files) {
let data = []; let data = [];
...@@ -283,7 +270,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -283,7 +270,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
}; };
} }
console.log("generate");
if (this.tabulatorTable !== null){ if (this.tabulatorTable !== null){
this.tabulatorTable.clearData(); this.tabulatorTable.clearData();
this.tabulatorTable.setData(data); this.tabulatorTable.setData(data);
...@@ -292,24 +278,28 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -292,24 +278,28 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
} }
async sendClipboardFiles(files) { async sendClipboardFiles(files) {
console.log("send files");
for(let i = 0; i < files.length; i ++) for(let i = 0; i < files.length; i ++)
{ {
await this.sendFileEvent(files[i].file); await this.sendFileEvent(files[i].file);
} }
this.tabulatorTable.deselectRow(); this.tabulatorTable.deselectRow();
send({
"summary": i18n.t('clipboard.saved-files-title', {count: files.length}),
"body": i18n.t('clipboard.saved-files-body', {count: files.length}),
"type": "success",
"timeout": 5,
});
} }
async sendFileEvent(file) { async sendFileEvent(file) {
console.log("send files event");
const data = {"file": file, "data": file}; const data = {"file": file, "data": file};
const event = new CustomEvent("dbp-clipboard-file-picker-file-downloaded", const event = new CustomEvent("dbp-clipboard-file-picker-file-downloaded",
{ "detail": data, bubbles: true, composed: true }); { "detail": data, bubbles: true, composed: true });
this.dispatchEvent(event); this.dispatchEvent(event);
} }
...@@ -319,7 +309,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -319,7 +309,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
* @param event * @param event
*/ */
onReceiveBeforeUnload(event){ onReceiveBeforeUnload(event){
console.log("onreceive beforeunload");
// we don't need to stop if there are no signed files // we don't need to stop if there are no signed files
if (this.clipboardFiles.files.length === 0) { if (this.clipboardFiles.files.length === 0) {
...@@ -353,8 +342,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -353,8 +342,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
saveFilesToClipboardEvent(ev) saveFilesToClipboardEvent(ev)
{ {
console.log("save files to clipboard event");
//save it //save it
let data = {}; let data = {};
let files = []; let files = [];
...@@ -376,11 +363,7 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -376,11 +363,7 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
saveFilesToClipboard() saveFilesToClipboard()
{ {
console.log("save files to clipboard");
//save it //save it
console.log("clipboard", this.clipboardFiles);
console.log("filesToSave", this.filesToSave);
let data = {}; let data = {};
let files = []; let files = [];
if (this.clipboardFiles && this.clipboardFiles.files.length !== 0) { if (this.clipboardFiles && this.clipboardFiles.files.length !== 0) {
...@@ -389,20 +372,23 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -389,20 +372,23 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
} else { } else {
files = files.concat(this.filesToSave); files = files.concat(this.filesToSave);
} }
console.log("files", files);
if (this.filesToSave && this.filesToSave.length !== 0) { if (this.filesToSave && this.filesToSave.length !== 0) {
data = {"files": files}; data = {"files": files};
this.sendSetPropertyEvent('clipboard-files', data); this.sendSetPropertyEvent('clipboard-files', data);
const event = new CustomEvent("dbp-clipboard-file-picker-file-uploaded", const event = new CustomEvent("dbp-clipboard-file-picker-file-uploaded",
{ bubbles: true, composed: true }); { bubbles: true, composed: true });
this.dispatchEvent(event); this.dispatchEvent(event);
send({
"summary": i18n.t('clipboard.saved-files-title', {count: this.filesToSave.length}),
"body": i18n.t('clipboard.saved-files-body', {count: this.filesToSave.length}),
"type": "success",
"timeout": 5,
});
} }
} }
finishedSaveFilesToClipboard(ev) { finishedSaveFilesToClipboard(ev) {
console.log("finishedSaveFilesToClipboard");
send({ send({
"summary": i18n.t('clipboard.saved-files-title', {count: ev.detail.count}), "summary": i18n.t('clipboard.saved-files-title', {count: ev.detail.count}),
"body": i18n.t('clipboard.saved-files-body', {count: ev.detail.count}), "body": i18n.t('clipboard.saved-files-body', {count: ev.detail.count}),
...@@ -412,8 +398,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -412,8 +398,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
} }
saveFilesFromClipboard() { saveFilesFromClipboard() {
console.log("saveFilesFromClipboard");
const fileSink = this._("#file-sink-clipboard"); const fileSink = this._("#file-sink-clipboard");
if ( fileSink ) { if ( fileSink ) {
this._("#file-sink-clipboard").files = Object.create(this.tabulatorTable.getSelectedData().length > 0 ? this.tabulatorTable.getSelectedData() : this.clipboardFiles.files); this._("#file-sink-clipboard").files = Object.create(this.tabulatorTable.getSelectedData().length > 0 ? this.tabulatorTable.getSelectedData() : this.clipboardFiles.files);
...@@ -422,8 +406,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -422,8 +406,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
} }
getClipboardFileList() { getClipboardFileList() {
console.log("getClipboardFileList");
let files = []; let files = [];
for (let i = 0; i < this.clipboardFiles.files.length; i ++) for (let i = 0; i < this.clipboardFiles.files.length; i ++)
{ {
...@@ -436,8 +418,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -436,8 +418,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
* Open Filesink for multiple files * Open Filesink for multiple files
*/ */
async openClipboardFileSink() { async openClipboardFileSink() {
console.log("openClipboardFileSink");
const fileSink = this._("#file-sink-clipboard"); const fileSink = this._("#file-sink-clipboard");
if (fileSink) { if (fileSink) {
this._("#file-sink-clipboard").files = Object.create(this.clipboardFiles.files); this._("#file-sink-clipboard").files = Object.create(this.clipboardFiles.files);
...@@ -446,8 +426,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -446,8 +426,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
} }
clearClipboard() { clearClipboard() {
console.log("clearClipboard");
if (this.tabulatorTable && this.tabulatorTable.getSelectedData().length > 0) { if (this.tabulatorTable && this.tabulatorTable.getSelectedData().length > 0) {
let count = this.tabulatorTable.getSelectedData().length; let count = this.tabulatorTable.getSelectedData().length;
this.tabulatorTable.deleteRow(this.tabulatorTable.getSelectedRows()); this.tabulatorTable.deleteRow(this.tabulatorTable.getSelectedRows());
...@@ -481,20 +459,21 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -481,20 +459,21 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
} }
} }
openFilesource() { //TODO openFilesource() {
console.log("openFileSource"); const fileSource = this._("#file-source");
if (fileSource) {
const fileSink = this._("#file-source");
if (fileSink) {
this._("#file-source").setAttribute("dialog-open", ""); this._("#file-source").setAttribute("dialog-open", "");
} }
} }
//TODO
// FIX closing modal dialog when deleting or adding files in modal dialogue
// FIX missing nextcloud in second hierarchy
getAdditionalButtons() { getAdditionalButtons() {
console.log("getAdditionalButtons");
return html` return html`
<div class="flex-container"> <div class="flex-container">
<div class="btn-flex-container-mobile"> <div class="btn-flex-container-mobile">
<button @click="${() => { this.openFilesource(); }}" <button @click="${() => { this.openFilesource(); }}"
class="button" title="${i18n.t('clipboard.add-files')}"> class="button" title="${i18n.t('clipboard.add-files')}">
...@@ -550,7 +529,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -550,7 +529,6 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
} }
getClipboardSink() { getClipboardSink() {
console.log("getClipboardSink");
const tabulatorCss = commonUtils.getAssetURL(pkgName, 'tabulator-tables/css/tabulator.min.css'); const tabulatorCss = commonUtils.getAssetURL(pkgName, 'tabulator-tables/css/tabulator.min.css');
let additionalButtons = this.showAdditionalButtons ? this.getAdditionalButtons() : ""; let additionalButtons = this.showAdditionalButtons ? this.getAdditionalButtons() : "";
return html` return html`
...@@ -586,10 +564,7 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -586,10 +564,7 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
getClipboardSource() { getClipboardSource() {
console.log("getClipboardSource");
const tabulatorCss = commonUtils.getAssetURL(pkgName, 'tabulator-tables/css/tabulator.min.css'); const tabulatorCss = commonUtils.getAssetURL(pkgName, 'tabulator-tables/css/tabulator.min.css');
let additionalButtons = this.showAdditionalButtons ? this.getAdditionalButtons() : ""; let additionalButtons = this.showAdditionalButtons ? this.getAdditionalButtons() : "";
return html` return html`
<div class="wrapper"> <div class="wrapper">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment