From 21e27a14e5fb9ab1e5e27527fe6e8713055f62b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20T=C3=B6gl?= <toegl@tugraz.at> Date: Tue, 9 Nov 2021 16:46:39 +0100 Subject: [PATCH] Add config variable for optional additional nextcloud menu --- app.config.js | 15 ++++++++++----- assets/dbp-signature.html.ejs | 3 +-- rollup.config.js | 2 ++ src/dbp-qualified-signature-pdf-upload.js | 3 ++- ...p-qualified-signature-pdf-upload.metadata.json | 2 +- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app.config.js b/app.config.js index 2313713..3f756dc 100644 --- a/app.config.js +++ b/app.config.js @@ -11,7 +11,8 @@ export default { nextcloudName: 'TU Graz cloud', pdfAsQualifiedlySigningServer: 'https://sig-dev.tugraz.at', hiddenActivities: ['dbp-signature-verification-full'], - enableAnnotations: true + enableAnnotations: true, + enableAdditionalMenu: true }, bs: { basePath: '/dist/', @@ -25,7 +26,8 @@ export default { nextcloudName: 'TU Graz cloud', pdfAsQualifiedlySigningServer: 'https://sig-dev.tugraz.at', hiddenActivities: [], - enableAnnotations: true + enableAnnotations: true, + enableAdditionalMenu: true }, development: { basePath: '/apps/signature/', @@ -39,7 +41,8 @@ export default { nextcloudName: 'TU Graz cloud', pdfAsQualifiedlySigningServer: 'https://sig-dev.tugraz.at', hiddenActivities: ['dbp-signature-verification-full'], - enableAnnotations: true + enableAnnotations: true, + enableAdditionalMenu: true }, demo: { basePath: '/apps/signature/', @@ -53,7 +56,8 @@ export default { nextcloudName: 'TU Graz cloud', pdfAsQualifiedlySigningServer: 'https://sig-demo.tugraz.at', hiddenActivities: ['dbp-signature-verification-full'], - enableAnnotations: true + enableAnnotations: true, + enableAdditionalMenu: true }, production: { basePath: '/', @@ -67,6 +71,7 @@ export default { nextcloudName: 'TU Graz cloud', pdfAsQualifiedlySigningServer: 'https://sig.tugraz.at', hiddenActivities: ['dbp-signature-verification-full'], - enableAnnotations: false + enableAnnotations: false, + enableAdditionalMenu: false }, }; \ No newline at end of file diff --git a/assets/dbp-signature.html.ejs b/assets/dbp-signature.html.ejs index b110f22..6026f16 100644 --- a/assets/dbp-signature.html.ejs +++ b/assets/dbp-signature.html.ejs @@ -68,9 +68,8 @@ id="app" lang="de" entry-point-url="<%= entryPointURL %>" file-handling-enabled-targets="local,nextcloud" - <%= buildInfo.env !== 'production' && buildInfo.env !== 'local' ? 'show-nextcloud-additional-menu' : '' %> <%= enableAnnotations ? 'allow-annotating' : '' %> - <%= buildInfo.env !== 'production' && buildInfo.env !== 'local' ? 'show-nextcloud-additional-menu' : '' %> + <%= enableAdditionalMenu ? 'show-nextcloud-additional-menu' : '' %> nextcloud-web-app-password-url="<%= nextcloudWebAppPasswordURL %>" nextcloud-webdav-url="<%= nextcloudWebDavURL %>" nextcloud-name="<%= nextcloudName %>" diff --git a/rollup.config.js b/rollup.config.js index ceb158f..a37b15e 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -43,6 +43,7 @@ if (appEnv in appConfig) { pdfAsQualifiedlySigningServer: 'https://test', hiddenActivities: [], enableAnnotations: true, + enableAdditionalMenu: true, }; } else { console.error(`Unknown build environment: '${appEnv}', use one of '${Object.keys(appConfig)}'`); @@ -137,6 +138,7 @@ export default (async () => { matomoSiteId: config.matomoSiteId, buildInfo: getBuildInfo(appEnv), enableAnnotations: config.enableAnnotations, + enableAdditionalMenu: config.enableAdditionalMenu, } }), resolve({ diff --git a/src/dbp-qualified-signature-pdf-upload.js b/src/dbp-qualified-signature-pdf-upload.js index 213ea82..3cf17b8 100644 --- a/src/dbp-qualified-signature-pdf-upload.js +++ b/src/dbp-qualified-signature-pdf-upload.js @@ -115,7 +115,8 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle addAnnotationInProgress: { type: Boolean, attribute: false }, queuedFilesAnnotationModes: { type: Array, attribute: false }, queuedFilesAnnotationSaved: { type: Array, attribute: false }, - fileHandlingEnabledTargets: {type: String, attribute: 'file-handling-enabled-targets'} + fileHandlingEnabledTargets: {type: String, attribute: 'file-handling-enabled-targets'}, + showNextcloudAdditionalMenu: { type: Boolean, attribute: 'show-nextcloud-additional-menu' }, }; } diff --git a/src/dbp-qualified-signature-pdf-upload.metadata.json b/src/dbp-qualified-signature-pdf-upload.metadata.json index 8ce6b81..3f9f88c 100644 --- a/src/dbp-qualified-signature-pdf-upload.metadata.json +++ b/src/dbp-qualified-signature-pdf-upload.metadata.json @@ -14,5 +14,5 @@ "de": "Erlaubt das Hochladen von PDF-Dokumenten, um sie mit einer persönlichen elektronischen Signatur zu versehen", "en": "Allows upload of PDF-documents to personally sign them" }, - "subscribe": "lang,entry-point-url,nextcloud-web-app-password-url,nextcloud-webdav-url,nextcloud-name,nextcloud-auth-info,nextcloud-file-url,file-handling-enabled-targets,auth,allow-annotating" + "subscribe": "lang,entry-point-url,nextcloud-web-app-password-url,nextcloud-webdav-url,nextcloud-name,nextcloud-auth-info,nextcloud-file-url,file-handling-enabled-targets,auth,allow-annotating,show-nextcloud-additional-menu" } -- GitLab