From 29bbdd29d7f4b361887def3b969493a378f415a0 Mon Sep 17 00:00:00 2001 From: yu-i-i Date: Tue, 27 Jan 2026 00:22:16 +0100 Subject: [PATCH] Admin Tools: Fix for 6.1.0 migraton --- .../user-list-ds-nav.scss | 0 .../user-list.scss | 0 .../web/frontend/stylesheets/modules/all.scss | 4 ++-- .../app/src/ProjectListController.mjs | 16 +++++++-------- .../app/src/UserListController.mjs | 20 +++++++++---------- 5 files changed, 20 insertions(+), 20 deletions(-) rename services/web/frontend/stylesheets/modules/{admin-panel => admin-tools}/user-list-ds-nav.scss (100%) rename services/web/frontend/stylesheets/modules/{admin-panel => admin-tools}/user-list.scss (100%) diff --git a/services/web/frontend/stylesheets/modules/admin-panel/user-list-ds-nav.scss b/services/web/frontend/stylesheets/modules/admin-tools/user-list-ds-nav.scss similarity index 100% rename from services/web/frontend/stylesheets/modules/admin-panel/user-list-ds-nav.scss rename to services/web/frontend/stylesheets/modules/admin-tools/user-list-ds-nav.scss diff --git a/services/web/frontend/stylesheets/modules/admin-panel/user-list.scss b/services/web/frontend/stylesheets/modules/admin-tools/user-list.scss similarity index 100% rename from services/web/frontend/stylesheets/modules/admin-panel/user-list.scss rename to services/web/frontend/stylesheets/modules/admin-tools/user-list.scss diff --git a/services/web/frontend/stylesheets/modules/all.scss b/services/web/frontend/stylesheets/modules/all.scss index 805ae653a2..73c4982388 100644 --- a/services/web/frontend/stylesheets/modules/all.scss +++ b/services/web/frontend/stylesheets/modules/all.scss @@ -9,5 +9,5 @@ @import 'symbol-palette'; @import 'writefull'; @import 'labs'; -@import 'admin-panel/user-list'; -@import 'admin-panel/user-list-ds-nav'; +@import 'admin-tools/user-list'; +@import 'admin-tools/user-list-ds-nav'; diff --git a/services/web/modules/admin-tools/app/src/ProjectListController.mjs b/services/web/modules/admin-tools/app/src/ProjectListController.mjs index c7e37c722e..24d6bf0786 100644 --- a/services/web/modules/admin-tools/app/src/ProjectListController.mjs +++ b/services/web/modules/admin-tools/app/src/ProjectListController.mjs @@ -4,17 +4,17 @@ import { fileURLToPath } from 'node:url' import { expressify } from '@overleaf/promise-utils' import logger from '@overleaf/logger' import Metrics from '@overleaf/metrics' -import ProjectHelper from '../../../../app/src/Features/Project/ProjectHelper.js' +import ProjectHelper from '../../../../app/src/Features/Project/ProjectHelper.mjs' import ProjectGetter from '../../../../app/src/Features/Project/ProjectGetter.mjs' -import PrivilegeLevels from '../../../../app/src/Features/Authorization/PrivilegeLevels.js' -import SessionManager from '../../../../app/src/Features/Authentication/SessionManager.js' -import UserGetter from '../../../../app/src/Features/User/UserGetter.js' +import PrivilegeLevels from '../../../../app/src/Features/Authorization/PrivilegeLevels.mjs' +import SessionManager from '../../../../app/src/Features/Authentication/SessionManager.mjs' +import UserGetter from '../../../../app/src/Features/User/UserGetter.mjs' import { OError } from '../../../../app/src/Features/Errors/Errors.js' -import { User } from '../../../../app/src/models/User.js' -import { Project } from '../../../../app/src/models/Project.js' -import { DeletedProject } from '../../../../app/src/models/DeletedProject.js' +import { User } from '../../../../app/src/models/User.mjs' +import { Project } from '../../../../app/src/models/Project.mjs' +import { DeletedProject } from '../../../../app/src/models/DeletedProject.mjs' import ProjectDeleter from '../../../../app/src/Features/Project/ProjectDeleter.mjs' -import HttpErrorHandler from '../../../../app/src/Features/Errors/HttpErrorHandler.js' +import HttpErrorHandler from '../../../../app/src/Features/Errors/HttpErrorHandler.mjs' const __dirname = Path.dirname(fileURLToPath(import.meta.url)) diff --git a/services/web/modules/admin-tools/app/src/UserListController.mjs b/services/web/modules/admin-tools/app/src/UserListController.mjs index 7976ad63e5..f3eaeec396 100644 --- a/services/web/modules/admin-tools/app/src/UserListController.mjs +++ b/services/web/modules/admin-tools/app/src/UserListController.mjs @@ -5,23 +5,23 @@ import crypto from 'crypto' import Settings from '@overleaf/settings' import Metrics from '@overleaf/metrics' import logger from '@overleaf/logger' -import { User } from '../../../../app/src/models/User.js' -import { DeletedUser } from '../../../../app/src/models/DeletedUser.js' -import { DeletedProject } from '../../../../app/src/models/DeletedProject.js' +import { User } from '../../../../app/src/models/User.mjs' +import { DeletedUser } from '../../../../app/src/models/DeletedUser.mjs' +import { DeletedProject } from '../../../../app/src/models/DeletedProject.mjs' import { expressify, promiseMapWithLimit } from '@overleaf/promise-utils' -import SessionManager from '../../../../app/src/Features/Authentication/SessionManager.js' +import SessionManager from '../../../../app/src/Features/Authentication/SessionManager.mjs' import UserRegistrationHandler from '../../../../app/src/Features/User/UserRegistrationHandler.mjs' -import EmailHandler from '../../../../app/src/Features/Email/EmailHandler.js' -import OneTimeTokenHandler from '../../../../app/src/Features/Security/OneTimeTokenHandler.js' -import UserGetter from '../../../../app/src/Features/User/UserGetter.js' -import UserUpdater from '../../../../app/src/Features/User/UserUpdater.js' +import EmailHandler from '../../../../app/src/Features/Email/EmailHandler.mjs' +import OneTimeTokenHandler from '../../../../app/src/Features/Security/OneTimeTokenHandler.mjs' +import UserGetter from '../../../../app/src/Features/User/UserGetter.mjs' +import UserUpdater from '../../../../app/src/Features/User/UserUpdater.mjs' import UserDeleter from '../../../../app/src/Features/User/UserDeleter.mjs' import ProjectDeleter from '../../../../app/src/Features/Project/ProjectDeleter.mjs' import OwnershipTransferHandler from '../../../../app/src/Features/Collaborators/OwnershipTransferHandler.mjs' -import HttpErrorHandler from '../../../../app/src/Features/Errors/HttpErrorHandler.js' +import HttpErrorHandler from '../../../../app/src/Features/Errors/HttpErrorHandler.mjs' import ErrorController from '../../../../app/src/Features/Errors/ErrorController.mjs' import Errors, { OError } from '../../../../app/src/Features/Errors/Errors.js' -import { db } from '../../../../app/src/infrastructure/mongodb.js' +import { db } from '../../../../app/src/infrastructure/mongodb.mjs' const __dirname = Path.dirname(fileURLToPath(import.meta.url))