From 68cbf39fa6fcb3303d96a997a50d130c0cc9df52 Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio@bekerle.com>
Date: Wed, 10 Feb 2021 10:17:00 +0100
Subject: [PATCH] Do subscription name refactoring
---
packages/auth/assets/index.html | 2 +-
.../src/dbp-check-in-place-select-demo.js | 4 ++--
.../src/dbp-knowledge-base-web-page-element-view-demo.js | 8 ++++----
packages/provider/assets/index.html.ejs | 2 +-
packages/provider/src/dbp-provider-demo.js | 6 +++---
toolkit-showcase/assets/auth.metadata.json | 2 +-
.../assets/check-in-place-select.metadata.json | 2 +-
toolkit-showcase/assets/common.metadata.json | 2 +-
toolkit-showcase/assets/data-table-view.metadata.json | 2 +-
toolkit-showcase/assets/file-handling.metadata.json | 2 +-
.../knowledge-base-web-page-element-view.metadata.json | 2 +-
toolkit-showcase/assets/language-select.metadata.json | 2 +-
toolkit-showcase/assets/matomo.metadata.json | 2 +-
toolkit-showcase/assets/notification.metadata.json | 2 +-
toolkit-showcase/assets/person-profile.metadata.json | 2 +-
toolkit-showcase/assets/person-select.metadata.json | 2 +-
toolkit-showcase/assets/qr-code-scanner.metadata.json | 2 +-
toolkit-showcase/src/dbp-auth-demo-activity.js | 2 +-
18 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/packages/auth/assets/index.html b/packages/auth/assets/index.html
index a96e0220..7a85c894 100644
--- a/packages/auth/assets/index.html
+++ b/packages/auth/assets/index.html
@@ -19,7 +19,7 @@
try-login></dbp-auth-keycloak>
<dbp-login-button subscribe="auth" lang="de" show-image></dbp-login-button>
- <dbp-auth-demo lang="de" entry-point-url="http://127.0.0.1:8000" subscribe="auth:auth"></dbp-auth-demo>
+ <dbp-auth-demo lang="de" entry-point-url="http://127.0.0.1:8000" subscribe="auth"></dbp-auth-demo>
</dbp-provider>
</body>
diff --git a/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js b/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js
index 1d302c0a..20c0b84e 100644
--- a/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js
+++ b/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js
@@ -75,13 +75,13 @@ export class CheckInPlaceSelectDemo extends ScopedElementsMixin(DBPLitElement) {
<div class="field">
<label class="label">Check-In-Place 1</label>
<div class="control">
- <dbp-check-in-place-select lang="${this.lang}" entry-point-url="${this.entryPointUrl}" subscribe="auth:auth"></dbp-check-in-place-select>
+ <dbp-check-in-place-select lang="${this.lang}" entry-point-url="${this.entryPointUrl}" subscribe="auth"></dbp-check-in-place-select>
</div>
</div>
<div class="field">
<label class="label">Check-In-Place 2</label>
<div class="control">
- <dbp-check-in-place-select lang="${this.lang}" entry-point-url="${this.entryPointUrl}" subscribe="auth:auth" show-reload-button reload-button-title="Click me"></dbp-check-in-place-select>
+ <dbp-check-in-place-select lang="${this.lang}" entry-point-url="${this.entryPointUrl}" subscribe="auth" show-reload-button reload-button-title="Click me"></dbp-check-in-place-select>
</div>
</div>
</form>
diff --git a/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js
index 14a2f4fd..717b3c1c 100644
--- a/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js
+++ b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js
@@ -86,23 +86,23 @@ export class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(DBP
<div class="container">
<h2 class="subtitle">Deutsch</h2>
<p>Ein erster Schritt</p>
- <dbp-knowledge-base-web-page-element-view subscribe="auth:auth" lang="de" entry-point-url="${this.entryPointUrl}" value="bedienstete/bibliothek/buch-ausleihen" text="Ein Buch ausleihen"></dbp-knowledge-base-web-page-element-view>
+ <dbp-knowledge-base-web-page-element-view subscribe="auth" lang="de" entry-point-url="${this.entryPointUrl}" value="bedienstete/bibliothek/buch-ausleihen" text="Ein Buch ausleihen"></dbp-knowledge-base-web-page-element-view>
</div>
<div class="container">
<h2 class="subtitle">Englisch</h2>
<p>A first step</p>
- <dbp-knowledge-base-web-page-element-view subscribe="auth:auth" lang="en" entry-point-url="${this.entryPointUrl}" value="bedienstete/bibliothek/buch-ausleihen" text="Borrow a book"></dbp-knowledge-base-web-page-element-view>
+ <dbp-knowledge-base-web-page-element-view subscribe="auth" lang="en" entry-point-url="${this.entryPointUrl}" value="bedienstete/bibliothek/buch-ausleihen" text="Borrow a book"></dbp-knowledge-base-web-page-element-view>
</div>
<hr>
<div class="container">
<p>mit Text in der WebComponent:</p>
- <dbp-knowledge-base-web-page-element-view subscribe="auth:auth" lang="${this.lang}" value="abc/def/xyz" text="FAQ"></dbp-knowledge-base-web-page-element-view>
+ <dbp-knowledge-base-web-page-element-view subscribe="auth" lang="${this.lang}" value="abc/def/xyz" text="FAQ"></dbp-knowledge-base-web-page-element-view>
</div>
<hr>
<div class="container">
<p>ohne Text in der WebComponent:</p>
Kontaktieren Sie uns unter...
- <dbp-knowledge-base-web-page-element-view subscribe="auth:auth" class="opt" lang="${this.lang}" value="abc/def/klm"></dbp-knowledge-base-web-page-element-view>
+ <dbp-knowledge-base-web-page-element-view subscribe="auth" class="opt" lang="${this.lang}" value="abc/def/klm"></dbp-knowledge-base-web-page-element-view>
</div>
</section>
`;
diff --git a/packages/provider/assets/index.html.ejs b/packages/provider/assets/index.html.ejs
index a69096d5..a201f2d2 100644
--- a/packages/provider/assets/index.html.ejs
+++ b/packages/provider/assets/index.html.ejs
@@ -20,7 +20,7 @@
<body>
<dbp-provider id="root" root="1" availability="global" lang="de" entry-point-url="http://127.0.0.1:8000" auth requested-login-status>
- <dbp-provider-demo id="provider-demo" subscribe="lang:lang:entry-point-url:entry-point-url"></dbp-provider-demo>
+ <dbp-provider-demo id="provider-demo" subscribe="lang:entry-point-url"></dbp-provider-demo>
</dbp-provider>
<p>version: <span style="color: white; background-color: black;"><%= buildInfo.info %></span></p>
</body>
diff --git a/packages/provider/src/dbp-provider-demo.js b/packages/provider/src/dbp-provider-demo.js
index df615488..0fd78e06 100644
--- a/packages/provider/src/dbp-provider-demo.js
+++ b/packages/provider/src/dbp-provider-demo.js
@@ -97,14 +97,14 @@ class ProviderDemo extends ScopedElementsMixin(DBPLitElement) {
<h2>${i18n.t('demo.consumer')}</h2>
<p>${i18n.t('demo.consumer_description', {id: "c1", subscriptions: "border-color"})}</p>
<pre><dbp-consumer id="c1" subscribe="border-color:bc" ></dbp-consumer></pre>
- <dbp-consumer id="c1" subscribe="border-color:bc,lang:lang"></dbp-consumer>
+ <dbp-consumer id="c1" subscribe="border-color:bc,lang"></dbp-consumer>
<p>${i18n.t('demo.consumer_description', {id: "c2", subscriptions: "foo"})}</p>
<pre><dbp-consumer id="c2" subscribe="foo:foo" ></dbp-consumer></pre>
- <dbp-consumer id="c2" subscribe="foo:foo,lang:lang"></dbp-consumer>
+ <dbp-consumer id="c2" subscribe="foo:foo,lang"></dbp-consumer>
<p>${i18n.t('demo.consumer_description', {id: "c3", subscriptions: "availability:status"})}</p>
<p>Local <em>status</em> is provided as <em>availability</em></p>
<pre><dbp-consumer id="c3" subscribe="status:availability" border-color="orange" ></dbp-consumer></pre>
- <dbp-consumer id="c3" subscribe="status:availability,lang:lang" border-color="orange"></dbp-consumer>
+ <dbp-consumer id="c3" subscribe="status:availability,lang" border-color="orange"></dbp-consumer>
<p>${i18n.t('demo.consumer_description', {id: "c4", subscriptions: "unknown-name:status"})}</p>
<p>Remote <em>unknown-name</em> does not exist, the default value is overwritten by <em>undefined</em></i></p>
<pre><dbp-consumer id="c4" subscribe="status:unknown-name" border-color="darkgray" ></dbp-consumer></pre>
diff --git a/toolkit-showcase/assets/auth.metadata.json b/toolkit-showcase/assets/auth.metadata.json
index 826c212b..43eecda4 100644
--- a/toolkit-showcase/assets/auth.metadata.json
+++ b/toolkit-showcase/assets/auth.metadata.json
@@ -14,5 +14,5 @@
"de": "Web Komponente zur Authentifikation",
"en": "Auth web component"
},
- "subscribe": "lang:lang,entry-point-url:entry-point-url"
+ "subscribe": "lang,entry-point-url"
}
diff --git a/toolkit-showcase/assets/check-in-place-select.metadata.json b/toolkit-showcase/assets/check-in-place-select.metadata.json
index cc76f853..8647f481 100644
--- a/toolkit-showcase/assets/check-in-place-select.metadata.json
+++ b/toolkit-showcase/assets/check-in-place-select.metadata.json
@@ -14,5 +14,5 @@
"de": "Ort Web Component",
"en": "Check-in place select web component"
},
- "subscribe": "lang:lang,entry-point-url:entry-point-url"
+ "subscribe": "lang,entry-point-url"
}
diff --git a/toolkit-showcase/assets/common.metadata.json b/toolkit-showcase/assets/common.metadata.json
index 654f1c98..f536e1ec 100644
--- a/toolkit-showcase/assets/common.metadata.json
+++ b/toolkit-showcase/assets/common.metadata.json
@@ -14,5 +14,5 @@
"de": "Gemeinsame Web Components",
"en": "Common web components"
},
- "subscribe": "lang:lang,entry-point-url:entry-point-url"
+ "subscribe": "lang,entry-point-url"
}
diff --git a/toolkit-showcase/assets/data-table-view.metadata.json b/toolkit-showcase/assets/data-table-view.metadata.json
index ad646391..afc1f01f 100644
--- a/toolkit-showcase/assets/data-table-view.metadata.json
+++ b/toolkit-showcase/assets/data-table-view.metadata.json
@@ -14,5 +14,5 @@
"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"
+ "subscribe": "lang,entry-point-url"
}
diff --git a/toolkit-showcase/assets/file-handling.metadata.json b/toolkit-showcase/assets/file-handling.metadata.json
index edd171f0..044c5478 100644
--- a/toolkit-showcase/assets/file-handling.metadata.json
+++ b/toolkit-showcase/assets/file-handling.metadata.json
@@ -14,5 +14,5 @@
"de": "Web Komponenten 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-auth-url:nextcloud-auth-url,nextcloud-web-dav-url:nextcloud-web-dav-url,nextcloud-name:nextcloud-name,nextcloud-file-url:nextcloud-file-url,show-nextcloud-file-picker:show-nextcloud-file-picker"
+ "subscribe": "lang,entry-point-url,nextcloud-auth-url:nextcloud-auth-url,nextcloud-web-dav-url:nextcloud-web-dav-url,nextcloud-name:nextcloud-name,nextcloud-file-url:nextcloud-file-url,show-nextcloud-file-picker:show-nextcloud-file-picker"
}
diff --git a/toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json b/toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json
index d5f59a30..904c8db9 100644
--- a/toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json
+++ b/toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json
@@ -14,5 +14,5 @@
"de": "Erlaubt das Einfügen von Webinhalten",
"en": "Allows the inserting of web content"
},
- "subscribe": "lang:lang,entry-point-url:entry-point-url"
+ "subscribe": "lang,entry-point-url"
}
diff --git a/toolkit-showcase/assets/language-select.metadata.json b/toolkit-showcase/assets/language-select.metadata.json
index 21a66e2d..1334dace 100644
--- a/toolkit-showcase/assets/language-select.metadata.json
+++ b/toolkit-showcase/assets/language-select.metadata.json
@@ -14,5 +14,5 @@
"de": "Sprachauswahl Web Component",
"en": "Language select web component"
},
- "subscribe": "lang:lang,entry-point-url:entry-point-url"
+ "subscribe": "lang,entry-point-url"
}
diff --git a/toolkit-showcase/assets/matomo.metadata.json b/toolkit-showcase/assets/matomo.metadata.json
index 6e472d64..ac6196b2 100644
--- a/toolkit-showcase/assets/matomo.metadata.json
+++ b/toolkit-showcase/assets/matomo.metadata.json
@@ -14,5 +14,5 @@
"de": "Matomo Web Component",
"en": "Matomo web component"
},
- "subscribe": "lang:lang,entry-point-url:entry-point-url"
+ "subscribe": "lang,entry-point-url"
}
diff --git a/toolkit-showcase/assets/notification.metadata.json b/toolkit-showcase/assets/notification.metadata.json
index 06d42c71..c5e96274 100644
--- a/toolkit-showcase/assets/notification.metadata.json
+++ b/toolkit-showcase/assets/notification.metadata.json
@@ -14,5 +14,5 @@
"de": "Zeigt eine Benachrichtigung an",
"en": "Shows a message"
},
- "subscribe": "lang:lang,entry-point-url:entry-point-url"
+ "subscribe": "lang,entry-point-url"
}
diff --git a/toolkit-showcase/assets/person-profile.metadata.json b/toolkit-showcase/assets/person-profile.metadata.json
index 93e53416..1a12b5cb 100644
--- a/toolkit-showcase/assets/person-profile.metadata.json
+++ b/toolkit-showcase/assets/person-profile.metadata.json
@@ -14,5 +14,5 @@
"de": "Gemeinsame Web Components",
"en": "Person profile web components"
},
- "subscribe": "lang:lang,entry-point-url:entry-point-url"
+ "subscribe": "lang,entry-point-url"
}
diff --git a/toolkit-showcase/assets/person-select.metadata.json b/toolkit-showcase/assets/person-select.metadata.json
index 3c67077d..35c1d58d 100644
--- a/toolkit-showcase/assets/person-select.metadata.json
+++ b/toolkit-showcase/assets/person-select.metadata.json
@@ -14,5 +14,5 @@
"de": "Erlaubt das Suchen von Personen",
"en": "Allows searching for persons"
},
- "subscribe": "lang:lang,entry-point-url:entry-point-url"
+ "subscribe": "lang,entry-point-url"
}
diff --git a/toolkit-showcase/assets/qr-code-scanner.metadata.json b/toolkit-showcase/assets/qr-code-scanner.metadata.json
index c58d7eda..ad5a59ff 100644
--- a/toolkit-showcase/assets/qr-code-scanner.metadata.json
+++ b/toolkit-showcase/assets/qr-code-scanner.metadata.json
@@ -14,5 +14,5 @@
"de": "Scannt Qr Codes",
"en": "Scans Qr Codes"
},
- "subscribe": "lang:lang,entry-point-url:entry-point-url"
+ "subscribe": "lang,entry-point-url"
}
diff --git a/toolkit-showcase/src/dbp-auth-demo-activity.js b/toolkit-showcase/src/dbp-auth-demo-activity.js
index 0adeb6f5..240300a4 100644
--- a/toolkit-showcase/src/dbp-auth-demo-activity.js
+++ b/toolkit-showcase/src/dbp-auth-demo-activity.js
@@ -59,7 +59,7 @@ class DbpAuthDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
render() {
return html`
${unsafeHTML(readme)}
- <dbp-auth-demo id="demo" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" subscribe="auth:auth"></dbp-auth-demo>
+ <dbp-auth-demo id="demo" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" subscribe="auth"></dbp-auth-demo>
`;
}
}
--
GitLab