autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: getRoute within envoy

Browse Source
This commit is contained in:
Jean-Baptiste Pasquier 2021-07-05 18:29:02 +02:00
parent cf1add07cb
commit 287666e560
4 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/libs/getRoute.js
View File

@ -1,23 +0,0 @@
window.orbit.getRoute = (type, returnFirst = false) => {
let availables = window.orbit.components.filter(c => c.type == type || c.uniq == type);
window.orbit.components.forEach(c => {
if (c.extensions) {
c.extensions.forEach(e => {
if (e.type == type || e.uniq == type) {
availables.push(e);
}
});
}
});
if (availables.length > 1) {
if (returnFirst) {
return availables[0].route;
} else {
return availables[availables.length - 1].route;
}
} else if (availables.length < 1) {
console.error(`No component found for route ${type}`);
} else {
return availables[0].route;
}
}

2
src/libs/sw-toolbox.js
View File

@ -1,4 +1,4 @@
import(`https://storage.googleapis.com/workbox-cdn/releases/6.1.1/workbox-window.prod.mjs`).then(workboxWindow => {
import(`https://storage.googleapis.com/workbox-cdn/releases/6.1.5/workbox-window.prod.mjs`).then(workboxWindow => {
if ('serviceWorker' in navigator) {
window.addEventListener('load', function () {

26
src/orbit-envoy.pug
View File

@ -196,5 +196,29 @@ for component of components
defaultRoute = defaultComponent[0].uniq;
}
- const orbitComponents = `window.orbit={};window.orbit.components = ${JSON.stringify(components)};window.orbit.federations = ${JSON.stringify(federations)};window.orbit.defaultRoute = "${defaultRoute}";window.orbit.client = ${JSON.stringify(client)};window.hubl = window.orbit;`;
- const orbitComponents = `window.orbit={};window.orbit.components = ${JSON.stringify(components)};window.orbit.federations = ${JSON.stringify(federations)};window.orbit.defaultRoute = "${defaultRoute}";window.orbit.client = ${JSON.stringify(client)};`;
script!=orbitComponents
| window.orbit.getRoute = (type, returnFirst = false) => {
| let availables = window.orbit.components.filter(c => c.type == type || c.uniq == type);
| window.orbit.components.forEach(c => {
| if (c.extensions) {
| c.extensions.forEach(e => {
| if (e.type == type || e.uniq == type) {
| availables.push(e);
| }
| });
| }
| });
| if (availables.length > 1) {
| if (returnFirst) {
| return availables[0].route;
| } else {
| return availables[availables.length - 1].route;
| }
| } else if (availables.length < 1) {
| console.error(`No component found for route ${type}`);
| } else {
| return availables[0].route;
| }
| }
| window.hubl = window.orbit;

2
src/scripts/login-element-visibility.js
View File

@ -36,7 +36,7 @@ document.addEventListener("DOMContentLoaded", function () {
}
});
window.addEventListener("navigate", e => {
if (e.detail.route == "login" && !window.requestLogin) {
if (e.detail.route == "login" && !window.requestLogin && window.orbit.getRoute) {
window.dispatchEvent(
new CustomEvent('requestNavigation', {
detail: {