From 1bb9743860d6b54232b2417cb1e7834156c7ea8f Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio@bekerle.com>
Date: Tue, 20 Apr 2021 08:26:07 +0200
Subject: [PATCH] Remove enclosing provider
---
.../assets/dbp-toolkit-showcase.html.ejs | 43 +++++++++----------
toolkit-showcase/src/dbp-toolkit-showcase.js | 3 --
2 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs b/toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs
index 8108d220..49362469 100644
--- a/toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs
+++ b/toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs
@@ -53,29 +53,26 @@
</head>
<body>
-<dbp-provider id="root"
- lang="de"
- entry-point-url="<%= entryPointURL %>"
- nextcloud-auth-url="<%= nextcloudWebAppPasswordURL %>"
- nextcloud-web-dav-url="<%= nextcloudWebDavURL %>"
- nextcloud-name="<%= nextcloudName %>"
- nextcloud-file-url="<%= nextcloudFileURL %>">
- <<%= name %>
- src="<%= getUrl(name + '.topic.metadata.json') %>"
- subscribe="lang,entry-point-url"
- auth
- requested-login-status
- analytics-event
- lang="en"
- base-path="<%= getUrl('') %>"
- keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= getUrl('silent-check-sso.html') %>"}'
- matomo-url="<%= matomoUrl %>" matomo-site-id="<%= matomoSiteId %>"
- git-info='<%= buildInfo.info %>'
- build-url='<%= buildInfo.url %>'
- build-time='<%= buildInfo.time %>'
- env='<%= buildInfo.env %>'
- ><dbp-loading-spinner></dbp-loading-spinner></<%= name %>>
-</dbp-provider>
+<<%= name %>
+ lang="de"
+ entry-point-url="<%= entryPointURL %>"
+ nextcloud-auth-url="<%= nextcloudWebAppPasswordURL %>"
+ nextcloud-web-dav-url="<%= nextcloudWebDavURL %>"
+ nextcloud-name="<%= nextcloudName %>"
+ nextcloud-file-url="<%= nextcloudFileURL %>"
+ src="<%= getUrl(name + '.topic.metadata.json') %>"
+ auth
+ requested-login-status
+ analytics-event
+ lang="en"
+ base-path="<%= getUrl('') %>"
+ keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= getUrl('silent-check-sso.html') %>"}'
+ matomo-url="<%= matomoUrl %>" matomo-site-id="<%= matomoSiteId %>"
+ git-info='<%= buildInfo.info %>'
+ build-url='<%= buildInfo.url %>'
+ build-time='<%= buildInfo.time %>'
+ env='<%= buildInfo.env %>'
+><dbp-loading-spinner></dbp-loading-spinner></<%= name %>>
<!-- Error handling for too old browsers -->
<script src="<%= getPrivateUrl('browser-check.js') %>" defer></script>
diff --git a/toolkit-showcase/src/dbp-toolkit-showcase.js b/toolkit-showcase/src/dbp-toolkit-showcase.js
index 3d2bde72..89c224bb 100644
--- a/toolkit-showcase/src/dbp-toolkit-showcase.js
+++ b/toolkit-showcase/src/dbp-toolkit-showcase.js
@@ -1,7 +1,4 @@
import {AppShell} from '@dbp-toolkit/app-shell';
import * as commonUtils from '@dbp-toolkit/common/utils';
-import {Provider} from '@dbp-toolkit/provider';
-// It's important that the Provider is created before the AppShell, so the AppShell can subscribe to the Provider
-commonUtils.defineCustomElement('dbp-provider', Provider);
commonUtils.defineCustomElement('dbp-toolkit-showcase', AppShell);
--
GitLab