Merge branch 'develop-2' into develop

frontend/app/features/admin/AdminPages.tsx

@@ -1,8 +0,0 @@
-import "../../styles/admin.css";
-import "../../styles/dashboard.css";
-import "../../styles/platform.css";
-
-export { DashboardPage } from "../../components/admin/DashboardPage";
-export { UserManagementPage } from "../../components/admin/UserManagementPage";
-export { ProjectManagementPage } from "../../components/admin/ProjectManagementPage";
-export { SystemAdminPage } from "./SystemAdminPage";

frontend/app/features/admin/ProjectManagementPage.tsx

@@ -2,9 +2,11 @@ import { useEffect, useState } from "react";
 
 import { ApiRequestError, type Employee, type Workspace, type WorkspaceMember } from "../../services/api";
 import { useApi, useAuth } from "../../context/AuthContext";
-import Icon from "../common/Icon";
+import Icon from "../../components/common/Icon";
 import { UserMultiSelect } from "./UserMultiSelect";
 
+import "../../styles/admin.css";
+
 const EMPTY_PROJECT_FORM = {
   workspace_code: "",
   workspace_name: "",

frontend/app/features/admin/SystemAdminPage.tsx

@@ -1,8 +1,8 @@
 import { useState } from "react";
 
 import Icon from "../../components/common/Icon";
-import { UserManagementPage } from "../../components/admin/UserManagementPage";
-import { ProjectManagementPage } from "../../components/admin/ProjectManagementPage";
+import { UserManagementPage } from "./UserManagementPage";
+import { ProjectManagementPage } from "./ProjectManagementPage";
 
 import "../../styles/admin.css";
 

frontend/app/features/admin/UserManagementPage.tsx

@@ -4,6 +4,8 @@ import { ApiRequestError, type Employee } from "../../services/api";
 import { useApi, useAuth } from "../../context/AuthContext";
 import Icon from "../../components/common/Icon";
 
+import "../../styles/admin.css";
+
 const EMPTY_FORM = {
   username: "",
   display_name: "",

frontend/app/features/platform/CreateFolderModal.tsx

@@ -1,5 +1,5 @@
 import { type FormEvent } from "react";
-import Icon from "../common/Icon";
+import Icon from "../../components/common/Icon";
 
 type CreateFolderModalProps = {
   open: boolean;

frontend/app/features/platform/CreateScriptModal.tsx

@@ -1,5 +1,5 @@
 import { type FormEvent } from "react";
-import Icon from "../common/Icon";
+import Icon from "../../components/common/Icon";
 import type { ScriptType, Visibility } from "../../services/api";
 
 type NewScriptForm = {

frontend/app/features/platform/DashboardRoute.tsx

@@ -2,7 +2,7 @@ import { useEffect } from "react";
 import { useNavigate } from "react-router";
 
 import { useAuth } from "~/context/AuthContext";
-import { DashboardPage } from "../../components/admin/DashboardPage";
+import { DashboardPage } from "../admin/DashboardPage";
 import { useScriptWorkspaceStore } from "./state/scriptWorkspaceStore";
 
 export default function DashboardRoute() {

frontend/app/features/platform/DataResourceUploadModal.tsx

@@ -1,5 +1,5 @@
 import { type FormEvent } from "react";
-import Icon from "../common/Icon";
+import Icon from "../../components/common/Icon";
 import type { Visibility } from "../../services/api";
 
 type DataResourceUploadModalProps = {

frontend/app/features/platform/PublishModal.tsx

@@ -1,5 +1,5 @@
 import { type FormEvent } from "react";
-import Icon from "../common/Icon";
+import Icon from "../../components/common/Icon";
 import type { ScriptItem, Visibility } from "../../services/api";
 import { scriptIcon } from "../../features/platform/WorkspaceTree";
 

frontend/app/features/platform/ScriptExplorer.tsx

@@ -1,5 +1,5 @@
 import { type ChangeEvent, type MouseEvent as ReactMouseEvent, type RefObject, useMemo } from "react";
-import Icon from "../common/Icon";
+import Icon from "../../components/common/Icon";
 import { WorkspaceTreeGroup } from "~/features/platform/WorkspaceTree";
 import { useScriptWorkspaceStore } from "~/features/platform/state/scriptWorkspaceStore";
 import type { ScriptItem, WorkspaceDirectory } from "~/services/api";

frontend/app/features/platform/ScriptsPage.tsx

@@ -1,14 +1,14 @@
 import { type FormEvent, useEffect, useMemo, useRef } from "react";
 
 import { useAuth } from "../../context/AuthContext";
-import { CreateFolderModal } from "../../components/platform/CreateFolderModal";
-import { CreateScriptModal } from "../../components/platform/CreateScriptModal";
-import { DataResourceUploadModal } from "../../components/platform/DataResourceUploadModal";
+import { CreateFolderModal } from "./CreateFolderModal";
+import { CreateScriptModal } from "./CreateScriptModal";
+import { DataResourceUploadModal } from "./DataResourceUploadModal";
 import Icon from "../../components/common/Icon";
-import { PublishModal } from "../../components/platform/PublishModal";
-import { ScriptExplorer } from "../../components/platform/ScriptExplorer";
-import { TreeContextMenu } from "../../components/platform/TreeContextMenu";
-import { VersionReceiptModal } from "../../components/platform/VersionReceiptModal";
+import { PublishModal } from "./PublishModal";
+import { ScriptExplorer } from "./ScriptExplorer";
+import { TreeContextMenu } from "./TreeContextMenu";
+import { VersionReceiptModal } from "./VersionReceiptModal";
 
 import { getSessionCache, useScriptWorkspaceStore } from "./state/scriptWorkspaceStore";
 import { useUiStore } from "./state/uiStore";

frontend/app/features/platform/TreeContextMenu.tsx

@@ -1,4 +1,4 @@
-import Icon from "../common/Icon";
+import Icon from "../../components/common/Icon";
 import type { ScriptItem, ScriptType } from "../../services/api";
 
 type ContextMenuState = {

frontend/app/features/platform/VersionReceiptModal.tsx

@@ -1,4 +1,4 @@
-import Icon from "../common/Icon";
+import Icon from "../../components/common/Icon";
 import type { StableVersion } from "../../services/api";
 import { copyToClipboard } from "../../lib/clipboard";