Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Made loading more resilient #1940

Merged
merged 4 commits into from
Aug 8, 2023
Merged

Made loading more resilient #1940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2435d5
Made loading more resilient
mimse Aug 8, 2023
1cb8b85
Fixed typo
mimse Aug 8, 2023
1ae08d5
Exclude from sonarcloud
mimse Aug 8, 2023
e5cb747
Fixed feature flag test
mimse Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/frontend-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
-Dsonar.projectKey=geh-frontend-app
-Dsonar.organization=energinet-datahub
-Dsonar.sources=apps/dh/app-dh,libs/dh,libs/ui-watt,libs/gf
-Dsonar.exclusions=**/*.spec.ts,libs/dh/shared/domain/src/lib/generated/**/*,libs/dh/shared/data-access-msw/src/assets/mockServiceWorker.js,libs/dh/shared/data-access-msw/src/lib/mocks/**/*
-Dsonar.exclusions=libs/dh/shared/assets/src/assets/b2c-custom-layouts/**/*,**/*.spec.ts,libs/dh/shared/domain/src/lib/generated/**/*,libs/dh/shared/data-access-msw/src/assets/mockServiceWorker.js,libs/dh/shared/data-access-msw/src/lib/mocks/**/*
-Dsonar.cpd.exclusions=libs/dh/globalization/assets-localization/src/assets/i18n/*.json
-Dsonar.coverage.exclusions=libs/ui-watt/**/+storybook/*,libs/ui-watt/**/*.stories.ts,
env:
Expand Down
36 changes: 20 additions & 16 deletions libs/dh/shared/assets/src/assets/b2c-custom-layouts/changepassword-unified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,7 @@
Utils.waitFor("button#next", function (element) {
element.addEventListener("click", Utils.toggleErrorClasses);
});
}

function showContent() {
document.querySelector("main").style.display = "block";
Utils.showContent();
}
</script>

Expand All @@ -86,19 +83,26 @@
? SETTINGS.remoteResource.replace(SETTINGS.remoteResource.split("/").pop(), "")
: "";

var head = document.getElementsByTagName("head")[0];
var link = document.createElement("link");
link.rel = "stylesheet";
link.type = "text/css";
link.href = path + "main.css";
link.onload = showContent;
head.appendChild(link);
const loadStylePromise = new Promise((resolve, reject) => {
var style = document.createElement("link");
style.rel = "stylesheet";
style.type = "text/css";
style.href = path + "main.css";
style.onload = resolve;
style.onerror = reject;
document.head.appendChild(style);
});

const loadScriptPromise = new Promise((resolve, reject) => {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = path + "main.js";
script.onload = resolve;
script.onerror = reject;
document.head.appendChild(script);
});

var script = document.createElement("script");
script.type = "text/javascript";
script.src = path + "main.js";
script.onload = init;
head.appendChild(script);
Promise.all([loadStylePromise, loadScriptPromise]).then(init);
</script>
</head>
<body>
Expand Down
38 changes: 21 additions & 17 deletions libs/dh/shared/assets/src/assets/b2c-custom-layouts/forgotpassword-unified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,30 +199,34 @@
toggleErrorClasses();
});
});
}

function showContent() {
document.querySelector("main").style.display = "block";
Utils.showContent();
}
</script>
<script>
const path = window.SETTINGS
? SETTINGS.remoteResource.replace(SETTINGS.remoteResource.split("/").pop(), "")
: "";

var head = document.getElementsByTagName("head")[0];
var link = document.createElement("link");
link.rel = "stylesheet";
link.type = "text/css";
link.href = path + "main.css";
link.onload = showContent;
head.appendChild(link);

var script = document.createElement("script");
script.type = "text/javascript";
script.src = path + "main.js";
script.onload = init;
head.appendChild(script);
const loadStylePromise = new Promise((resolve, reject) => {
var style = document.createElement("link");
style.rel = "stylesheet";
style.type = "text/css";
style.href = path + "main.css";
style.onload = resolve;
style.onerror = reject;
document.head.appendChild(style);
});

const loadScriptPromise = new Promise((resolve, reject) => {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = path + "main.js";
script.onload = resolve;
script.onerror = reject;
document.head.appendChild(script);
});

Promise.all([loadStylePromise, loadScriptPromise]).then(init);
</script>
</head>
<body>
Expand Down
39 changes: 22 additions & 17 deletions libs/dh/shared/assets/src/assets/b2c-custom-layouts/login-unified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,30 +158,35 @@
element.addEventListener("click", Utils.toggleErrorClasses);
appendForgotPasswordTemplate();
});
}

function showContent() {
document.querySelector("main").style.display = "block";
Utils.showContent();
}
</script>

<script>
const path = window.SETTINGS
? SETTINGS.remoteResource.replace(SETTINGS.remoteResource.split("/").pop(), "")
: "";
var head = document.getElementsByTagName("head")[0];
var link = document.createElement("link");
link.rel = "stylesheet";
link.type = "text/css";
link.href = path + "main.css";
link.onload = showContent;
head.appendChild(link);

var script = document.createElement("script");
script.type = "text/javascript";
script.src = path + "main.js";
script.onload = init;
head.appendChild(script);

const loadStylePromise = new Promise((resolve, reject) => {
var style = document.createElement("link");
style.rel = "stylesheet";
style.type = "text/css";
style.href = path + "main.css";
style.onload = resolve;
style.onerror = reject;
document.head.appendChild(style);
});

const loadScriptPromise = new Promise((resolve, reject) => {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = path + "main.js";
script.onload = resolve;
script.onerror = reject;
document.head.appendChild(script);
});

Promise.all([loadStylePromise, loadScriptPromise]).then(init);
</script>
</head>
<body>
Expand Down
39 changes: 22 additions & 17 deletions libs/dh/shared/assets/src/assets/b2c-custom-layouts/login-with-mitid-unified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,30 +192,35 @@
appendForgotPasswordTemplate();
setMitIdFlowSignInFlow();
});
}

function showContent() {
document.querySelector("main").style.display = "block";
Utils.showContent();
}
</script>

<script>
const path = window.SETTINGS
? SETTINGS.remoteResource.replace(SETTINGS.remoteResource.split("/").pop(), "")
: "";
var head = document.getElementsByTagName("head")[0];
var link = document.createElement("link");
link.rel = "stylesheet";
link.type = "text/css";
link.href = path + "main.css";
link.onload = showContent;
head.appendChild(link);

var script = document.createElement("script");
script.type = "text/javascript";
script.src = path + "main.js";
script.onload = init;
head.appendChild(script);

const loadStylePromise = new Promise((resolve, reject) => {
var style = document.createElement("link");
style.rel = "stylesheet";
style.type = "text/css";
style.href = path + "main.css";
style.onload = resolve;
style.onerror = reject;
document.head.appendChild(style);
});

const loadScriptPromise = new Promise((resolve, reject) => {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = path + "main.js";
script.onload = resolve;
script.onerror = reject;
document.head.appendChild(script);
});

Promise.all([loadStylePromise, loadScriptPromise]).then(init);
</script>
</head>
<body>
Expand Down
5 changes: 5 additions & 0 deletions libs/dh/shared/assets/src/assets/b2c-custom-layouts/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
* limitations under the License.
*/
const Utils = {
showContent: function () {
Utils.waitFor('main', (main) => {
main.style.display = 'block';
});
},
waitFor: function (selector, callback) {
const elm = document.querySelector(selector);

Expand Down
36 changes: 20 additions & 16 deletions libs/dh/shared/assets/src/assets/b2c-custom-layouts/multifactorauth-unified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,30 +91,34 @@
Utils.waitFor("button#next", function (element) {
element.addEventListener("click", toggleErrorClasses);
});
}

function showContent() {
document.querySelector("main").style.display = "block";
Utils.showContent();
}
</script>
<script>
const path = window.SETTINGS
? SETTINGS.remoteResource.replace(SETTINGS.remoteResource.split("/").pop(), "")
: "";

var head = document.getElementsByTagName("head")[0];
var link = document.createElement("link");
link.rel = "stylesheet";
link.type = "text/css";
link.href = path + "main.css";
link.onload = showContent;
head.appendChild(link);
const loadStylePromise = new Promise((resolve, reject) => {
var style = document.createElement("link");
style.rel = "stylesheet";
style.type = "text/css";
style.href = path + "main.css";
style.onload = resolve;
style.onerror = reject;
document.head.appendChild(style);
});

const loadScriptPromise = new Promise((resolve, reject) => {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = path + "main.js";
script.onload = resolve;
script.onerror = reject;
document.head.appendChild(script);
});

var script = document.createElement("script");
script.type = "text/javascript";
script.src = path + "main.js";
script.onload = init;
head.appendChild(script);
Promise.all([loadStylePromise, loadScriptPromise]).then(init);
</script>
</head>
<body>
Expand Down
31 changes: 22 additions & 9 deletions libs/dh/shared/assets/src/assets/b2c-custom-layouts/reset-password.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,22 +99,35 @@
}
</style>
<script>
function showContent() {
document.querySelector("main").style.display = "block";
function init() {
Utils.showContent();
}
</script>
<script>
const path = window.SETTINGS
? SETTINGS.remoteResource.replace(SETTINGS.remoteResource.split("/").pop(), "")
: "";

var head = document.getElementsByTagName("head")[0];
var link = document.createElement("link");
link.rel = "stylesheet";
link.type = "text/css";
link.href = path + "main.css";
link.onload = showContent;
head.appendChild(link);
const loadStylePromise = new Promise((resolve, reject) => {
var style = document.createElement("link");
style.rel = "stylesheet";
style.type = "text/css";
style.href = path + "main.css";
style.onload = resolve;
style.onerror = reject;
document.head.appendChild(style);
});

const loadScriptPromise = new Promise((resolve, reject) => {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = path + "main.js";
script.onload = resolve;
script.onerror = reject;
document.head.appendChild(script);
});

Promise.all([loadStylePromise, loadScriptPromise]).then(init);
</script>
</head>
<body>
Expand Down
38 changes: 21 additions & 17 deletions libs/dh/shared/assets/src/assets/b2c-custom-layouts/self-asserted.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,30 +125,34 @@
element.addEventListener("click", toggleErrorClasses);
});
});
}

function showContent() {
document.querySelector("main").style.display = "block";
Utils.showContent();
}
</script>
<script>
const path = window.SETTINGS
? SETTINGS.remoteResource.replace(SETTINGS.remoteResource.split("/").pop(), "")
: "";

var head = document.getElementsByTagName("head")[0];
var link = document.createElement("link");
link.rel = "stylesheet";
link.type = "text/css";
link.href = path + "main.css";
link.onload = showContent;
head.appendChild(link);

var script = document.createElement("script");
script.type = "text/javascript";
script.src = path + "main.js";
script.onload = init;
head.appendChild(script);
const loadStylePromise = new Promise((resolve, reject) => {
var style = document.createElement("link");
style.rel = "stylesheet";
style.type = "text/css";
style.href = path + "main.css";
style.onload = resolve;
style.onerror = reject;
document.head.appendChild(style);
});

const loadScriptPromise = new Promise((resolve, reject) => {
var script = document.createElement("script");
script.type = "text/javascript";
script.src = path + "main.js";
script.onload = resolve;
script.onerror = reject;
document.head.appendChild(script);
});

Promise.all([loadStylePromise, loadScriptPromise]).then(init);
</script>
</head>
<body>
Expand Down
Loading
Loading