Merge branch 'master' of gitlab.tugraz.at:dbp/web-components/toolkit

packages/app-shell/src/app-shell.js

@@ -55,6 +55,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
         this.topic = {};
         this.basePath = '/';
         this.keycloakConfig = null;
+        this.noWelcomePage = false;
 
         this._updateAuth = this._updateAuth.bind(this);
         this._loginStatus = 'unknown';
@@ -138,12 +139,14 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
             }
         }
 
-        // Inject the welcome activity
-        routes.unshift("welcome");
-        metadata = Object.assign(metadata, {
-            "welcome": appWelcomeMeta,
-        });
-        customElements.get("dbp-app-shell-welcome").app = this;
+        if (!this.noWelcomePage) {
+            // Inject the welcome activity
+            routes.unshift("welcome");
+            metadata = Object.assign(metadata, {
+                "welcome": appWelcomeMeta,
+            });
+            customElements.get("dbp-app-shell-welcome").app = this;
+        }
 
         // this also triggers a rebuilding of the menu
         this.metadata = metadata;
@@ -230,6 +233,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
             _loginStatus: { type: Boolean, attribute: false },
             matomoUrl: { type: String, attribute: "matomo-url" },
             matomoSiteId: { type: Number, attribute: "matomo-site-id" },
+            noWelcomePage: { type: Boolean, attribute: "no-welcome-page" }
         };
     }
 
@@ -732,7 +736,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
 
         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 try-login></dbp-auth-keycloak>
+            <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-matomo endpoint="${this.matomoUrl}" site-id="${this.matomoSiteId}"></dbp-matomo>
             <div class="${mainClassMap}">
             <div id="main">

packages/matomo/rollup.config.js

@@ -64,7 +64,7 @@ export default (async () => {
             }),
             consts({
                 environment: build,
-                buildInfo: getBuildInfo(),
+                buildinfo: getBuildInfo(),
             }),
             emitEJS({
                 src: 'assets',
@@ -105,4 +105,4 @@ export default (async () => {
             (process.env.ROLLUP_WATCH === 'true') ? serve({contentBase: 'dist', host: '127.0.0.1', port: 8002}) : false
         ]
     };
-})();
+})();
\ No newline at end of file

packages/matomo/src/matomo.js

@@ -2,7 +2,7 @@ import {i18n} from './i18n.js';
 import {LitElement} from "lit-element";
 import DBPLitElement from 'dbp-common/dbp-lit-element';
 import {EventBus} from 'dbp-common';
-import buildInfo from 'consts:buildInfo';
+import buildInfo from 'consts:buildinfo';
 
 
 export class MatomoElement extends DBPLitElement {