Migrate build info, integrate provider, remove commonUtils.getAPiUrl() calls and remove consts

f66d0bc0 · Bekerle, Patrizio · 89979fa2 · f66d0bc0 · f66d0bc0 · f66d0bc0
Unverified Commit f66d0bc0 authored 4 years ago by Bekerle, Patrizio
--- a/toolkit-showcase/assets/check-in-place-select.metadata.json
+++ b/toolkit-showcase/assets/check-in-place-select.metadata.json
@@ -13,5 +13,6 @@
  "description": {
    "de": "Ort Web Component",
    "en": "Check-in place select web component"
-  }
+  },
+  "subscribe": "lang:lang,entry-point-url:entry-point-url"
 }
--- a/toolkit-showcase/assets/common.metadata.json
+++ b/toolkit-showcase/assets/common.metadata.json
@@ -13,5 +13,6 @@
  "description": {
    "de": "Gemeinsame Web Components",
    "en": "Common web components"
-  }
+  },
+  "subscribe": "lang:lang,entry-point-url:entry-point-url"
 }
--- a/toolkit-showcase/assets/data-table-view.metadata.json
+++ b/toolkit-showcase/assets/data-table-view.metadata.json
@@ -13,5 +13,6 @@
  "description": {
    "de": "DataTable: mit Daten, Paginierung, Such- und Exportfunktion",
    "en": "DataTable: with data, paging and searching AND exportable"
-  }
+  },
+  "subscribe": "lang:lang,entry-point-url:entry-point-url"
 }
--- a/toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs
+++ b/toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs
@@ -53,14 +53,23 @@
 </head>
 <body>
-<<%= name %>
+<dbp-provider id="root"
-    lang="de"
+              lang="de" entry-point-url="<%= entryPointURL %>"
-    src="<%= getUrl(name + '.topic.metadata.json') %>"
+              nextcloud-web-app-password-url="<%= nextcloudWebAppPasswordURL %>"
-    entry-point-url="<%= entryPointURL %>"
+              nextcloud-webdav-url="<%= nextcloudWebDavURL %>"
-    base-path="<%= getUrl('') %>"
+              nextcloud-name="<%= nextcloudName %>"
-    keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= getUrl('silent-check-sso.html') %>"}'
+              nextcloud-file-url="<%= nextcloudFileURL %>">
-    matomo-url="<%= matomoUrl %>" matomo-site-id="<%= matomoSiteId %>"
+    <<%= name %>
-><dbp-loading-spinner></dbp-loading-spinner></<%= name %>>
+        src="<%= getUrl(name + '.topic.metadata.json') %>"
+        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>
 <!-- Error handling for too old browsers -->
 <script src="<%= getPrivateUrl('browser-check.js') %>" defer></script>

--- a/toolkit-showcase/assets/file-handling.metadata.json
+++ b/toolkit-showcase/assets/file-handling.metadata.json
@@ -13,5 +13,6 @@
  "description": {
    "de": "Web Componente für file sink und file source. Für mehrere verschiedenen Quellen.",
    "en": "Web components for file sink and file source. For several different sources."
-  }
+  },
+  "subscribe": "lang:lang,entry-point-url:entry-point-url,nextcloud-web-app-password-url:nextcloud-web-app-password-url,nextcloud-webdav-url:nextcloud-webdav-url,nextcloud-name:nextcloud-name,nextcloud-file-url:nextcloud-file-url,show-nextcloud-file-picker:show-nextcloud-file-picker"
 }
--- a/toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json
+++ b/toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json
@@ -13,5 +13,6 @@
  "description": {
    "de": "Erlaubt das Einfügen von Webinhalten",
    "en": "Allows the inserting of web content"
-  }
+  },
+  "subscribe": "lang:lang,entry-point-url:entry-point-url"
 }
--- a/toolkit-showcase/assets/language-select.metadata.json
+++ b/toolkit-showcase/assets/language-select.metadata.json
@@ -13,5 +13,6 @@
  "description": {
    "de": "Sprachauswahl Web Component",
    "en": "Language select web component"
-  }
+  },
+  "subscribe": "lang:lang,entry-point-url:entry-point-url"
 }
--- a/toolkit-showcase/assets/matomo.metadata.json
+++ b/toolkit-showcase/assets/matomo.metadata.json
@@ -13,5 +13,6 @@
  "description": {
    "de": "Matomo Web Component",
    "en": "Matomo web component"
-  }
+  },
+  "subscribe": "lang:lang,entry-point-url:entry-point-url"
 }
--- a/toolkit-showcase/assets/notification.metadata.json
+++ b/toolkit-showcase/assets/notification.metadata.json
@@ -13,5 +13,6 @@
  "description": {
    "de": "Zeigt eine Benachrichtigung an",
    "en": "Shows a message"
-  }
+  },
+  "subscribe": "lang:lang,entry-point-url:entry-point-url"
 }
--- a/toolkit-showcase/assets/person-profile.metadata.json
+++ b/toolkit-showcase/assets/person-profile.metadata.json
@@ -13,5 +13,6 @@
  "description": {
    "de": "Gemeinsame Web Components",
    "en": "Person profile web components"
-  }
+  },
+  "subscribe": "lang:lang,entry-point-url:entry-point-url"
 }
--- a/toolkit-showcase/assets/person-select.metadata.json
+++ b/toolkit-showcase/assets/person-select.metadata.json
@@ -13,5 +13,6 @@
  "description": {
    "de": "Erlaubt das Suchen von Personen",
    "en": "Allows searching for persons"
-  }
+  },
+  "subscribe": "lang:lang,entry-point-url:entry-point-url"
 }
--- a/toolkit-showcase/assets/qr-code-scanner.metadata.json
+++ b/toolkit-showcase/assets/qr-code-scanner.metadata.json
@@ -13,5 +13,6 @@
  "description": {
    "de": "Scannt Qr Codes",
    "en": "Scans Qr Codes"
-  }
+  },
+  "subscribe": "lang:lang,entry-point-url:entry-point-url"
 }
--- a/toolkit-showcase/rollup.config.js
+++ b/toolkit-showcase/rollup.config.js
@@ -9,6 +9,7 @@ import json from '@rollup/plugin-json';
 import replace from "@rollup/plugin-replace";
 import serve from 'rollup-plugin-serve';
 import urlPlugin from "@rollup/plugin-url";
+// TODO: remove consts if "environment" isn't needed because "getAPiUrl" is removed
 import consts from 'rollup-plugin-consts';
 import license from 'rollup-plugin-license';
 import del from 'rollup-plugin-delete';
@@ -164,14 +165,9 @@ export default (async () => {return {
        del({
          targets: 'dist/*'
        }),
+        // TODO: remove consts if "environment" isn't needed because "getAPiUrl" is removed
        consts({
          environment: build,
-          buildinfo: getBuildInfo(),
-          nextcloudWebAppPasswordURL: nextcloudWebAppPasswordURL,
-          nextcloudWebDavURL: nextcloudWebDavURL,
-          nextcloudBaseURL: nextcloudBaseURL,
-          nextcloudFileURL: nextcloudFileURL,
-          nextcloudName: nextcloudName,
        }),
        emitEJS({
          src: 'assets',
@@ -186,6 +182,10 @@ export default (async () => {return {
            name: pkg.name,
            entryPointURL: entryPointURL,
            nextcloudBaseURL: nextcloudBaseURL,
+            nextcloudWebAppPasswordURL: nextcloudWebAppPasswordURL,
+            nextcloudWebDavURL: nextcloudWebDavURL,
+            nextcloudFileURL: nextcloudFileURL,
+            nextcloudName: nextcloudName,
            keyCloakServer: keyCloakServer,
            keyCloakBaseURL: keyCloakBaseURL,
            keyCloakClientId: keyCloakClientId,

--- a/toolkit-showcase/src/dbp-check-in-place-select-demo-activity.js
+++ b/toolkit-showcase/src/dbp-check-in-place-select-demo-activity.js
@@ -7,8 +7,9 @@ import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
 import readme from '@dbp-toolkit/check-in-place-select/README.md';
 import highlightCSSPath from 'highlight.js/styles/default.css';
 import * as demoStyles from "./styles";
+import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
-class DbpActivityNameDemoActivity extends ScopedElementsMixin(LitElement) {
+class DbpActivityNameDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
    static get scopedElements() {
        return {
            'dbp-check-in-place-select-demo': CheckInPlaceSelectDemo,
@@ -16,8 +17,8 @@ class DbpActivityNameDemoActivity extends ScopedElementsMixin(LitElement) {
    }
    static get properties() {
-        return {
+        return this.getProperties({
-        };
+        });
    }
    connectedCallback() {

--- a/toolkit-showcase/src/dbp-common-demo-activity.js
+++ b/toolkit-showcase/src/dbp-common-demo-activity.js
@@ -7,8 +7,9 @@ import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
 import readme from '@dbp-toolkit/common/README.md';
 import highlightCSSPath from 'highlight.js/styles/default.css';
 import * as demoStyles from "./styles";
+import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
-class DbpCommonDemoActivity extends ScopedElementsMixin(LitElement) {
+class DbpCommonDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
    static get scopedElements() {
        return {
            'dbp-common-demo': DbpCommonDemo,
@@ -16,8 +17,8 @@ class DbpCommonDemoActivity extends ScopedElementsMixin(LitElement) {
    }
    static get properties() {
-        return {
+        return this.getProperties({
-        };
+        });
    }
    connectedCallback() {

--- a/toolkit-showcase/src/dbp-data-table-view-demo-activity.js
+++ b/toolkit-showcase/src/dbp-data-table-view-demo-activity.js
@@ -7,8 +7,9 @@ import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
 import readme from '@dbp-toolkit/data-table-view/README.md';
 import highlightCSSPath from 'highlight.js/styles/default.css';
 import * as demoStyles from "./styles";
+import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
-class DbpActivityNameDemoActivity extends ScopedElementsMixin(LitElement) { //TODO
+class DbpActivityNameDemoActivity extends ScopedElementsMixin(AdapterLitElement) { //TODO
    static get scopedElements() {
        return {
            'dbp-data-table-view-demo': DataTableViewDemo,
@@ -16,8 +17,8 @@ class DbpActivityNameDemoActivity extends ScopedElementsMixin(LitElement) { //TO
    }
    static get properties() {
-        return {
+        return this.getProperties({
-        };
+        });
    }
    connectedCallback() {

--- a/toolkit-showcase/src/dbp-demo-template.js
+++ b/toolkit-showcase/src/dbp-demo-template.js
@@ -7,8 +7,9 @@ import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
 // import readme from '@dbp-toolkit/class-name/README.md'; TODO
 import highlightCSSPath from 'highlight.js/styles/default.css';
 import * as demoStyles from "./styles";
+import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
-class DbpActivityNameDemoActivity extends ScopedElementsMixin(LitElement) { //TODO
+class DbpActivityNameDemoActivity extends ScopedElementsMixin(AdapterLitElement) { //TODO
    static get scopedElements() {
        return {
            // TODO
@@ -17,8 +18,8 @@ class DbpActivityNameDemoActivity extends ScopedElementsMixin(LitElement) { //TO
    }
    static get properties() {
-        return {
+        return this.getProperties({
-        };
+        });
    }
    connectedCallback() {

--- a/toolkit-showcase/src/dbp-file-handling-demo-activity.js
+++ b/toolkit-showcase/src/dbp-file-handling-demo-activity.js
@@ -7,8 +7,9 @@ import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
 import readme from '@dbp-toolkit/file-handling/README.md';
 import highlightCSSPath from 'highlight.js/styles/default.css';
 import * as demoStyles from "./styles";
+import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
-class DbpFileHandlingDemoActivity extends ScopedElementsMixin(LitElement) {
+class DbpFileHandlingDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
    static get scopedElements() {
        return {
            'dbp-file-handling-demo': FileSourceDemo,
@@ -16,8 +17,8 @@ class DbpFileHandlingDemoActivity extends ScopedElementsMixin(LitElement) {
    }
    static get properties() {
-        return {
+        return this.getProperties({
-        };
+        });
    }
    connectedCallback() {

--- a/toolkit-showcase/src/dbp-knowledge-base-web-page-element-view-demo-activity.js
+++ b/toolkit-showcase/src/dbp-knowledge-base-web-page-element-view-demo-activity.js
@@ -7,8 +7,9 @@ import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
 import readme from '@dbp-toolkit/knowledge-base-web-page-element-view/README.md';
 import highlightCSSPath from 'highlight.js/styles/default.css';
 import * as demoStyles from "./styles";
+import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
-class KnowledgeBaseWebPageElementViewDemoActivity extends ScopedElementsMixin(LitElement) {
+class KnowledgeBaseWebPageElementViewDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
    static get scopedElements() {
        return {
            'dbp-knowledge-base-web-page-element-view-demo': KnowledgeBaseWebPageElementViewDemo,
@@ -16,8 +17,8 @@ class KnowledgeBaseWebPageElementViewDemoActivity extends ScopedElementsMixin(Li
    }
    static get properties() {
-        return {
+        return this.getProperties({
-        };
+        });
    }
    connectedCallback() {

--- a/toolkit-showcase/src/dbp-language-select-demo-activity.js
+++ b/toolkit-showcase/src/dbp-language-select-demo-activity.js
@@ -7,8 +7,9 @@ import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
 import readme from '@dbp-toolkit/language-select/README.md';
 import highlightCSSPath from 'highlight.js/styles/default.css';
 import * as demoStyles from "./styles";
+import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
-class DbpLanguageSelectDemoActivity extends ScopedElementsMixin(LitElement) {
+class DbpLanguageSelectDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
    static get scopedElements() {
        return {
            'dbp-language-select-demo': LanguageSelectDemo,
@@ -16,8 +17,8 @@ class DbpLanguageSelectDemoActivity extends ScopedElementsMixin(LitElement) {
    }
    static get properties() {
-        return {
+        return this.getProperties({
-        };
+        });
    }
    connectedCallback() {