Skip to content

refactor(tutor-setup): enforce minimum loading duration for tutor setup & optimize code #2903

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

Merged
shewa12 merged 3 commits into from
Jul 15, 2026
+6 −5
Merged

refactor(tutor-setup): enforce minimum loading duration for tutor setup & optimize code #2903

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26cf761
refactor(tutor-setup): clean up loading animation and optimize code
nur-alam Jul 14, 2026
8caa9e4
fix(tutor-setup): enforce minimum loading duration for tutor setup
nur-alam Jul 14, 2026
8850b35
refactor(tutor-setup): remove loadSampleCourse variable and inline check
nur-alam Jul 14, 2026
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
11 changes: 6 additions & 5 deletions assets/src/js/admin-dashboard/tutor-setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ document.addEventListener('DOMContentLoaded', () => {
const loadingTextElement = onboardWrapper.querySelector('.tutor-onboard-loading-text');
const loadingText = loadingTextElement?.dataset.text || loadingTextElement?.textContent?.trim() || '';
let loadingTextTimer = null;
let isLoadingTextLooping = false;
let isSubmitting = false;

const handleReloadHotkeys = (event) => {
Expand Down Expand Up @@ -87,8 +86,6 @@ document.addEventListener('DOMContentLoaded', () => {
};

const stopLoadingTextAnimation = () => {
isLoadingTextLooping = false;

if (loadingTextTimer) {
clearTimeout(loadingTextTimer);
loadingTextTimer = null;
Expand All @@ -105,10 +102,9 @@ document.addEventListener('DOMContentLoaded', () => {
}

let dotsCount = 0;
isLoadingTextLooping = true;

const animateDots = () => {
if (!loadingTextElement || !isLoadingTextLooping) {
if (!loadingTextElement) {
return;
}

Expand Down Expand Up @@ -201,6 +197,8 @@ document.addEventListener('DOMContentLoaded', () => {

activateScreen(loadingScreen);
const loadingTextAnimation = startLoadingTextAnimation();
const minimumLoadingDuration = 6000;
const onboardStartTime = performance.now();

try {
if (formData.get('tutor_onboard_load_sample_course')) {
Expand Down Expand Up @@ -228,6 +226,9 @@ document.addEventListener('DOMContentLoaded', () => {
submitButton.disabled = false;
}
await loadingTextAnimation;
const onboardingDuration = performance.now() - onboardStartTime;
const remainingLoadingDuration = Math.max(0, minimumLoadingDuration - onboardingDuration);
await wait(remainingLoadingDuration);
await fadeOutLoadingScreen();
toggleReloadProtection(false);
location.href = _tutorOnboardObject.tutor_welcome_page;
Expand Down
Loading