From d1cbf63b863e614e70255831c8c32a10c06b8770 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Tue, 23 Mar 2021 13:01:33 +0100
Subject: [PATCH] Remove doInitializationOnce()
No longer needed
---
packages/auth/src/auth-keycloak.js | 4 +++-
.../src/check-in-place-select.js | 3 ---
packages/common/jsonld.js | 16 ++++------------
.../src/organization-select.js | 1 -
packages/person-profile/src/person-profile.js | 3 ---
packages/person-select/src/person-select.js | 1 -
6 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/packages/auth/src/auth-keycloak.js b/packages/auth/src/auth-keycloak.js
index eac61afc..9c0d66d5 100644
--- a/packages/auth/src/auth-keycloak.js
+++ b/packages/auth/src/auth-keycloak.js
@@ -51,6 +51,9 @@ export class AuthKeycloak extends AdapterLitElement {
case 'lang':
i18n.changeLanguage(this.lang);
break;
+ case 'entryPointUrl':
+ // for preloading the instance
+ JSONLD.getInstance(this.entryPointUrl, this.lang);
case 'requestedLoginStatus':
console.log("requested-login-status changed", this.requestedLoginStatus);
switch(this.requestedLoginStatus) {
@@ -152,7 +155,6 @@ export class AuthKeycloak extends AdapterLitElement {
}
this.sendSetPropertyEvent('auth', auth);
- JSONLD.doInitializationOnce(this.entryPointUrl);
}
_setLoginStatus(status, force) {
diff --git a/packages/check-in-place-select/src/check-in-place-select.js b/packages/check-in-place-select/src/check-in-place-select.js
index 617ce6be..f9c721d4 100644
--- a/packages/check-in-place-select/src/check-in-place-select.js
+++ b/packages/check-in-place-select/src/check-in-place-select.js
@@ -309,9 +309,6 @@ export class CheckInPlaceSelect extends ScopedElementsMixin(AdapterLitElement) {
// we don't need to preset the selector if the entry point url changes
this.initJSONLD(true);
break;
- case "auth":
- JSONLD.doInitializationOnce(this.entryPointUrl);
- break;
}
});
diff --git a/packages/common/jsonld.js b/packages/common/jsonld.js
index 956cbae2..2b0cb4dd 100644
--- a/packages/common/jsonld.js
+++ b/packages/common/jsonld.js
@@ -19,7 +19,6 @@ export default class JSONLD {
static async getInstance(apiUrl, lang = 'de') {
let promise = JSONLD.promises[apiUrl];
if (promise === undefined) {
- JSONLD.doInitializationOnce(apiUrl);
promise = new Promise((resolve, reject) => {
JSONLD.initialize(
apiUrl,
@@ -52,24 +51,17 @@ export default class JSONLD {
// add success and failure functions
if (typeof successFnc == 'function') JSONLD.successFunctions[apiUrl].push(successFnc);
if (typeof failureFnc == 'function') JSONLD.failureFunctions[apiUrl].push(failureFnc);
- }
-
- /**
- * This should be run as soon as possible (can be run multiple times)
- *
- * @param apiUrl
- */
- static doInitializationOnce(apiUrl) {
- // console.log("doInitializationOnce", apiUrl);
- // check if api call was already started
if (!apiUrl || JSONLD.initStarted[apiUrl] !== undefined) {
return;
}
JSONLD.initStarted[apiUrl] = true;
JSONLD._doInitialization(apiUrl);
- // console.log("doInitializationOnce Done", apiUrl);
+ }
+
+ static doInitializationOnce(apiUrl) {
+ // No longer needed, remove any calls
}
static _doInitialization(apiUrl) {
diff --git a/packages/organization-select/src/organization-select.js b/packages/organization-select/src/organization-select.js
index 954c6ae7..2c9967c2 100644
--- a/packages/organization-select/src/organization-select.js
+++ b/packages/organization-select/src/organization-select.js
@@ -199,7 +199,6 @@ export class OrganizationSelect extends AdapterLitElement {
}, {}, this.lang);
break;
case "auth":
- JSONLD.doInitializationOnce(this.entryPointUrl);
this.initAuthPersonOnce().then();
break;
default:
diff --git a/packages/person-profile/src/person-profile.js b/packages/person-profile/src/person-profile.js
index 919a9cdf..8a3fe9c3 100644
--- a/packages/person-profile/src/person-profile.js
+++ b/packages/person-profile/src/person-profile.js
@@ -67,9 +67,6 @@ export class PersonProfile extends DBPLitElement {
});
}
break;
- case "auth":
- JSONLD.doInitializationOnce(this.entryPointUrl);
- break;
default:
}
});
diff --git a/packages/person-select/src/person-select.js b/packages/person-select/src/person-select.js
index 1575c5af..9c309be8 100644
--- a/packages/person-select/src/person-select.js
+++ b/packages/person-select/src/person-select.js
@@ -291,7 +291,6 @@ export class PersonSelect extends ScopedElementsMixin(AdapterLitElement) {
this.initJSONLD(true);
break;
case "auth":
- JSONLD.doInitializationOnce(this.entryPointUrl);
this.active = this.authenticated();
break;
}
--
GitLab