Skip to content
Snippets Groups Projects
Unverified Commit 338fdeba authored by Bekerle, Patrizio's avatar Bekerle, Patrizio :fire:
Browse files

Remove tugUtils.getAPiUrl() and integrate lang and entry-point-url attributes

parent 0d28459a
Branches
No related tags found
No related merge requests found
Pipeline #16208 passed
Stage: test
Stage: deploy
Show whitespace changes
Inline Side-by-side
Showing
with 110 additions and 51 deletions
packages/common/test/unit.js
+ 0
− 5
View file @ 338fdeba
import {expect, assert} from 'chai';
import * as utils from '../utils';
import * as tugUtils from '../tug-utils';
import * as styles from '../styles';
import '../jsonld.js';
......@@ -35,10 +34,6 @@ suite('utils', () => {
assert.isTrue(res);
});
test('getAPiUrl', () => {
assert(tugUtils.getAPiUrl().startsWith("http"));
});
test('getAssetURL', () => {
// Backwards compat
assert.equal(new URL(utils.getAssetURL("foo/bar")).pathname, "/foo/bar");
......
packages/common/tug-utils.js deleted 100644 → 0
+ 0
− 25
View file @ 0d28459a
import environment from 'consts:environment';
export const getAPiUrl = (path = "") => {
let apiBaseUrl = '';
switch(environment) {
case "development":
apiBaseUrl = 'https://mw-dev.tugraz.at';
break;
case "demo":
apiBaseUrl = 'https://api-demo.tugraz.at';
break;
case "production":
apiBaseUrl = 'https://api.tugraz.at';
break;
case "bs":
apiBaseUrl = 'http://bs-local.com:8000';
break;
case "local":
default:
apiBaseUrl = 'http://127.0.0.1:8000';
}
return apiBaseUrl + path;
};
toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs
+ 1
− 1
View file @ 338fdeba
......@@ -54,7 +54,7 @@
<body>
<dbp-provider id="root"
lang="de" entry-point-url="<%= entryPointURL %>"
lang="en" entry-point-url="<%= entryPointURL %>"
nextcloud-web-app-password-url="<%= nextcloudWebAppPasswordURL %>"
nextcloud-webdav-url="<%= nextcloudWebDavURL %>"
nextcloud-name="<%= nextcloudName %>"
......
toolkit-showcase/rollup.config.js
+ 0
− 6
View file @ 338fdeba
......@@ -9,8 +9,6 @@ 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';
import md from 'rollup-plugin-md';
......@@ -165,10 +163,6 @@ export default (async () => {return {
del({
targets: 'dist/*'
}),
// TODO: remove consts if "environment" isn't needed because "getAPiUrl" is removed
consts({
environment: build,
}),
emitEJS({
src: 'assets',
include: ['**/*.ejs', '**/.*.ejs'],
......
toolkit-showcase/src/dbp-check-in-place-select-demo-activity.js
+ 10
− 2
View file @ 338fdeba
......@@ -10,6 +10,12 @@ import * as demoStyles from "./styles";
import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
class DbpActivityNameDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
constructor() {
super();
this.lang = 'en';
this.entryPointUrl = '';
}
static get scopedElements() {
return {
'dbp-check-in-place-select-demo': CheckInPlaceSelectDemo,
......@@ -18,6 +24,8 @@ class DbpActivityNameDemoActivity extends ScopedElementsMixin(AdapterLitElement)
static get properties() {
return this.getProperties({
lang: { type: String },
entryPointUrl: { type: String, attribute: 'entry-point-url' },
});
}
......@@ -50,7 +58,7 @@ class DbpActivityNameDemoActivity extends ScopedElementsMixin(AdapterLitElement)
render() {
return html`
${unsafeHTML(readme)}
<dbp-check-in-place-select-demo id="demo" lang="en" no-auth></dbp-check-in-place-select-demo>
<dbp-check-in-place-select-demo id="demo" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" no-auth></dbp-check-in-place-select-demo>
`;
}
}
......
toolkit-showcase/src/dbp-common-demo-activity.js
+ 9
− 2
View file @ 338fdeba
......@@ -10,6 +10,12 @@ import * as demoStyles from "./styles";
import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
class DbpCommonDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
constructor() {
super();
this.lang = 'en';
this.entryPointUrl = '';
}
static get scopedElements() {
return {
'dbp-common-demo': DbpCommonDemo,
......@@ -18,6 +24,8 @@ class DbpCommonDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
static get properties() {
return this.getProperties({
lang: { type: String },
entryPointUrl: { type: String, attribute: 'entry-point-url' },
});
}
......@@ -49,9 +57,8 @@ class DbpCommonDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
render() {
return html`
${unsafeHTML(readme)}
<dbp-common-demo id="demo" lang="en"></dbp-common-demo>
<dbp-common-demo id="demo" lang="${this.lang}" entry-point-url="${this.entryPointUrl}"></dbp-common-demo>
`;
}
}
......
toolkit-showcase/src/dbp-data-table-view-demo-activity.js
+ 9
− 1
View file @ 338fdeba
......@@ -10,6 +10,12 @@ import * as demoStyles from "./styles";
import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
class DbpActivityNameDemoActivity extends ScopedElementsMixin(AdapterLitElement) { //TODO
constructor() {
super();
this.lang = 'en';
this.entryPointUrl = '';
}
static get scopedElements() {
return {
'dbp-data-table-view-demo': DataTableViewDemo,
......@@ -18,6 +24,8 @@ class DbpActivityNameDemoActivity extends ScopedElementsMixin(AdapterLitElement)
static get properties() {
return this.getProperties({
lang: { type: String },
entryPointUrl: { type: String, attribute: 'entry-point-url' },
});
}
......@@ -51,7 +59,7 @@ class DbpActivityNameDemoActivity extends ScopedElementsMixin(AdapterLitElement)
return html`
${unsafeHTML(readme)}
<dbp-data-table-view-demo id="demo" lang="en" no-auth></dbp-data-table-view-demo>
<dbp-data-table-view-demo id="demo" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" no-auth></dbp-data-table-view-demo>
`;
}
}
......
toolkit-showcase/src/dbp-demo-template.js
+ 9
− 1
View file @ 338fdeba
......@@ -10,6 +10,12 @@ import * as demoStyles from "./styles";
import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
class DbpActivityNameDemoActivity extends ScopedElementsMixin(AdapterLitElement) { //TODO
constructor() {
super();
this.lang = 'en';
this.entryPointUrl = '';
}
static get scopedElements() {
return {
// TODO
......@@ -19,6 +25,8 @@ class DbpActivityNameDemoActivity extends ScopedElementsMixin(AdapterLitElement)
static get properties() {
return this.getProperties({
lang: { type: String },
entryPointUrl: { type: String, attribute: 'entry-point-url' },
});
}
......@@ -53,7 +61,7 @@ class DbpActivityNameDemoActivity extends ScopedElementsMixin(AdapterLitElement)
<!--
TODO
${unsafeHTML(readme)}
<dbp-class-name-demo id="demo" lang="en"></dbp-class-name-demo>
<dbp-class-name-demo id="demo" lang="${this.lang}" entry-point-url="${this.entryPointUrl}"></dbp-class-name-demo>
-->
`;
}
......
toolkit-showcase/src/dbp-file-handling-demo-activity.js
+ 9
− 1
View file @ 338fdeba
......@@ -10,6 +10,12 @@ import * as demoStyles from "./styles";
import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
class DbpFileHandlingDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
constructor() {
super();
this.lang = 'en';
this.entryPointUrl = '';
}
static get scopedElements() {
return {
'dbp-file-handling-demo': FileSourceDemo,
......@@ -18,6 +24,8 @@ class DbpFileHandlingDemoActivity extends ScopedElementsMixin(AdapterLitElement)
static get properties() {
return this.getProperties({
lang: { type: String },
entryPointUrl: { type: String, attribute: 'entry-point-url' },
});
}
......@@ -50,7 +58,7 @@ class DbpFileHandlingDemoActivity extends ScopedElementsMixin(AdapterLitElement)
render() {
return html`
${unsafeHTML(readme)}
<dbp-file-handling-demo id="demo" lang="en"></dbp-file-handling-demo>
<dbp-file-handling-demo id="demo" lang="${this.lang}" entry-point-url="${this.entryPointUrl}"></dbp-file-handling-demo>
`;
}
}
......
toolkit-showcase/src/dbp-knowledge-base-web-page-element-view-demo-activity.js
+ 9
− 1
View file @ 338fdeba
......@@ -10,6 +10,12 @@ import * as demoStyles from "./styles";
import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
class KnowledgeBaseWebPageElementViewDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
constructor() {
super();
this.lang = 'en';
this.entryPointUrl = '';
}
static get scopedElements() {
return {
'dbp-knowledge-base-web-page-element-view-demo': KnowledgeBaseWebPageElementViewDemo,
......@@ -18,6 +24,8 @@ class KnowledgeBaseWebPageElementViewDemoActivity extends ScopedElementsMixin(Ad
static get properties() {
return this.getProperties({
lang: { type: String },
entryPointUrl: { type: String, attribute: 'entry-point-url' },
});
}
......@@ -50,7 +58,7 @@ class KnowledgeBaseWebPageElementViewDemoActivity extends ScopedElementsMixin(Ad
render() {
return html`
${unsafeHTML(readme)}
<dbp-knowledge-base-web-page-element-view-demo id="demo" lang="en" no-auth></dbp-knowledge-base-web-page-element-view-demo>
<dbp-knowledge-base-web-page-element-view-demo id="demo" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" no-auth></dbp-knowledge-base-web-page-element-view-demo>
`;
}
}
......
toolkit-showcase/src/dbp-language-select-demo-activity.js
+ 9
− 1
View file @ 338fdeba
......@@ -10,6 +10,12 @@ import * as demoStyles from "./styles";
import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
class DbpLanguageSelectDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
constructor() {
super();
this.lang = 'en';
this.entryPointUrl = '';
}
static get scopedElements() {
return {
'dbp-language-select-demo': LanguageSelectDemo,
......@@ -18,6 +24,8 @@ class DbpLanguageSelectDemoActivity extends ScopedElementsMixin(AdapterLitElemen
static get properties() {
return this.getProperties({
lang: { type: String },
entryPointUrl: { type: String, attribute: 'entry-point-url' },
});
}
......@@ -51,7 +59,7 @@ class DbpLanguageSelectDemoActivity extends ScopedElementsMixin(AdapterLitElemen
return html`
${unsafeHTML(readme)}
<dbp-language-select-demo id="demo" lang="en"></dbp-language-select-demo>
<dbp-language-select-demo id="demo" lang="${this.lang}" entry-point-url="${this.entryPointUrl}"></dbp-language-select-demo>
`;
}
......
toolkit-showcase/src/dbp-matomo-demo-activity.js
+ 9
− 1
View file @ 338fdeba
......@@ -10,6 +10,12 @@ import * as demoStyles from "./styles";
import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
class DbpMatomoDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
constructor() {
super();
this.lang = 'en';
this.entryPointUrl = '';
}
static get scopedElements() {
return {
'dbp-matomo-demo': MatomoDemo,
......@@ -18,6 +24,8 @@ class DbpMatomoDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
static get properties() {
return this.getProperties({
lang: { type: String },
entryPointUrl: { type: String, attribute: 'entry-point-url' },
});
}
......@@ -50,7 +58,7 @@ class DbpMatomoDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
render() {
return html`
${unsafeHTML(readme)}
<dbp-matomo-demo id="demo" lang="en" no-auth></dbp-matomo-demo>
<dbp-matomo-demo id="demo" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" no-auth></dbp-matomo-demo>
`;
}
}
......
toolkit-showcase/src/dbp-notification-demo-activity.js
+ 9
− 1
View file @ 338fdeba
......@@ -10,6 +10,12 @@ import * as demoStyles from "./styles";
import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
class DbpNotificationDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
constructor() {
super();
this.lang = 'en';
this.entryPointUrl = '';
}
static get scopedElements() {
return {
'dbp-notification-demo': NotificationDemo,
......@@ -18,6 +24,8 @@ class DbpNotificationDemoActivity extends ScopedElementsMixin(AdapterLitElement)
static get properties() {
return this.getProperties({
lang: { type: String },
entryPointUrl: { type: String, attribute: 'entry-point-url' },
});
}
......@@ -50,7 +58,7 @@ class DbpNotificationDemoActivity extends ScopedElementsMixin(AdapterLitElement)
render() {
return html`
${unsafeHTML(readme)}
<dbp-notification-demo id="demo" lang="en"></dbp-notification-demo>
<dbp-notification-demo id="demo" lang="${this.lang}" entry-point-url="${this.entryPointUrl}"></dbp-notification-demo>
`;
}
}
......
toolkit-showcase/src/dbp-person-profile-demo-activity.js
+ 9
− 1
View file @ 338fdeba
......@@ -10,6 +10,12 @@ import * as demoStyles from "./styles";
import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
class DbpPersonProfileDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
constructor() {
super();
this.lang = 'en';
this.entryPointUrl = '';
}
static get scopedElements() {
return {
'dbp-person-profile-demo': PersonProfileDemo,
......@@ -18,6 +24,8 @@ class DbpPersonProfileDemoActivity extends ScopedElementsMixin(AdapterLitElement
static get properties() {
return this.getProperties({
lang: { type: String },
entryPointUrl: { type: String, attribute: 'entry-point-url' },
});
}
......@@ -50,7 +58,7 @@ class DbpPersonProfileDemoActivity extends ScopedElementsMixin(AdapterLitElement
render() {
return html`
${unsafeHTML(readme)}
<dbp-person-profile-demo id="demo" lang="en" no-auth></dbp-person-profile-demo>
<dbp-person-profile-demo id="demo" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" no-auth></dbp-person-profile-demo>
`;
}
......
toolkit-showcase/src/dbp-person-select-demo-activity.js
+ 9
− 1
View file @ 338fdeba
......@@ -10,6 +10,12 @@ import * as demoStyles from "./styles";
import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
class DbpPersonSelectDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
constructor() {
super();
this.lang = 'en';
this.entryPointUrl = '';
}
static get scopedElements() {
return {
'dbp-person-select-demo': PersonSelectDemo,
......@@ -18,6 +24,8 @@ class DbpPersonSelectDemoActivity extends ScopedElementsMixin(AdapterLitElement)
static get properties() {
return this.getProperties({
lang: { type: String },
entryPointUrl: { type: String, attribute: 'entry-point-url' },
});
}
......@@ -50,7 +58,7 @@ class DbpPersonSelectDemoActivity extends ScopedElementsMixin(AdapterLitElement)
render() {
return html`
${unsafeHTML(readme)}
<dbp-person-select-demo id="demo" lang="en" no-auth></dbp-person-select-demo>
<dbp-person-select-demo id="demo" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" no-auth></dbp-person-select-demo>
`;
}
}
......
toolkit-showcase/src/dbp-qr-code-scanner-demo-activity.js
+ 9
− 1
View file @ 338fdeba
......@@ -10,6 +10,12 @@ import * as demoStyles from './styles';
import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
class DbpQrCodeScannerDemoActivity extends ScopedElementsMixin(AdapterLitElement) {
constructor() {
super();
this.lang = 'en';
this.entryPointUrl = '';
}
static get scopedElements() {
return {
'dbp-qr-code-scanner-demo': QrCodeScannerDemo,
......@@ -18,6 +24,8 @@ class DbpQrCodeScannerDemoActivity extends ScopedElementsMixin(AdapterLitElement
static get properties() {
return this.getProperties({
lang: { type: String },
entryPointUrl: { type: String, attribute: 'entry-point-url' },
});
}
......@@ -47,7 +55,7 @@ class DbpQrCodeScannerDemoActivity extends ScopedElementsMixin(AdapterLitElement
render() {
return html`
${unsafeHTML(readme)}
<dbp-qr-code-scanner-demo id="scanner-demo" lang="en"></dbp-qr-code-scanner-demo>
<dbp-qr-code-scanner-demo id="scanner-demo" lang="${this.lang}" entry-point-url="${this.entryPointUrl}"></dbp-qr-code-scanner-demo>
`;
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment