Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • advertisement
  • automagic
  • dbp-translation-component
  • demo
  • demo-file-handling
  • favorites-and-recent-files
  • icon-set-mapping
  • lit2
  • main
  • person-select-custom
  • port-i18next-parser
  • publish
  • remove-sentry
  • renovate/lock-file-maintenance
  • revert-6c632dc6
  • wc-part
  • wip-cleanup
17 results

Target

Select target project
  • 987FCF504483CBC8/toolkit
1 result
Select Git revision
  • advertisement
  • automagic
  • dbp-translation-component
  • demo
  • demo-file-handling
  • favorites-and-recent-files
  • icon-set-mapping
  • lit2
  • main
  • person-select-custom
  • port-i18next-parser
  • publish
  • remove-sentry
  • renovate/lock-file-maintenance
  • revert-6c632dc6
  • wc-part
  • wip-cleanup
17 results
Show changes
Commits on Source (4)
......@@ -7,7 +7,6 @@ import {AuthKeycloak} from '@dbp-toolkit/auth';
import {AuthMenuButton} from './auth-menu-button.js';
import {Notification} from '@dbp-toolkit/notification';
import * as commonStyles from '@dbp-toolkit/common/styles';
import * as commonUtils from '@dbp-toolkit/common/utils';
import {classMap} from 'lit-html/directives/class-map.js';
import {Router} from './router.js';
import {BuildInfo} from './build-info.js';
......@@ -47,7 +46,7 @@ export class AppShell extends ScopedElementsMixin(AdapterLitElement) {
super();
this.lang = i18n.language;
this.activeView = '';
this.entryPointUrl = commonUtils.getAPiUrl();
this.entryPointUrl = '';
this.subtitle = '';
this.description = '';
this.routes = [];
......@@ -815,7 +814,7 @@ export class AppShell extends ScopedElementsMixin(AdapterLitElement) {
return html`
<slot class="${slotClassMap}"></slot>
<dbp-auth-keycloak lang="${this.lang}" url="${kc.url}" realm="${kc.realm}" client-id="${kc.clientId}" silent-check-sso-redirect-uri="${kc.silentCheckSsoRedirectUri || ''}" scope="${kc.scope || ''}" idp-hint="${kc.idpHint || ''}" load-person ?force-login="${kc.forceLogin}" ?try-login="${!kc.forceLogin}"></dbp-auth-keycloak>
<dbp-auth-keycloak lang="${this.lang}" entry-point-url="${this.entryPointUrl}" url="${kc.url}" realm="${kc.realm}" client-id="${kc.clientId}" silent-check-sso-redirect-uri="${kc.silentCheckSsoRedirectUri || ''}" scope="${kc.scope || ''}" idp-hint="${kc.idpHint || ''}" load-person ?force-login="${kc.forceLogin}" ?try-login="${!kc.forceLogin}"></dbp-auth-keycloak>
<dbp-matomo endpoint="${this.matomoUrl}" site-id="${this.matomoSiteId}" git-info="${this.gitInfo}"></dbp-matomo>
<div class="${mainClassMap}">
<div id="main">
......
import {i18n} from './i18n.js';
import JSONLD from '@dbp-toolkit/common/jsonld';
import * as commonUtils from '@dbp-toolkit/common/utils';
import {EventBus} from '@dbp-toolkit/common';
import {KeycloakWrapper} from './keycloak.js';
import {LoginStatus} from './util.js';
......@@ -33,7 +32,7 @@ export class AuthKeycloak extends AdapterLitElement {
this.personId = "";
this.tryLogin = false;
this.person = null;
this.entryPointUrl = commonUtils.getAPiUrl();
this.entryPointUrl = '';
this._loginStatus = LoginStatus.UNKNOWN;
// Keycloak config
......
......@@ -375,7 +375,10 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
// on Error: try to reload with home directory
if ((path !== "/" || path !== "") && this.webDavClient !== null && error.message.search("401") === -1) {
console.log("error in load directory");
this.directoryPath = "";
this.loadDirectory("");
}
else {
this.loading = false;
......
......@@ -132,6 +132,12 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
this.openDialog();
}
break;
case "nextcloudDefaultDir":
//check if default destination is set
if (this.firstOpen) {
this.nextcloudDir = this.nextcloudDefaultDir;
}
break;
}
});
......
......@@ -111,6 +111,12 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
// this.closeDialog();
}
break;
case "nextcloudDefaultDir":
//check if default destination is set
if (this.firstOpen) {
this.nextcloudDir = this.nextcloudDefaultDir;
}
break;
}
});
......@@ -192,7 +198,8 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
}
// check if we want to decompress the zip and queue the contained files
if (this.decompressZip && file.type === "application/zip") {
if (this.decompressZip
&& (file.type === "application/zip" || file.type === "application/x-zip-compressed")) {
// add decompressed files to tempFilesToHandle
await commonUtils.asyncArrayForEach(
await this.decompressZIP(file), (file) => this.sendFileEvent(file));
......@@ -432,7 +439,7 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
let allowedMimeTypes = this.allowedMimeTypes;
if (this.decompressZip) {
allowedMimeTypes += ",application/zip";
allowedMimeTypes += ",application/zip,application/x-zip-compressed";
}
return html`
......