Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 MangoPig
|
8b169c11c0 |
@@ -1,9 +0,0 @@
|
|||||||
-- +goose Up
|
|
||||||
|
|
||||||
ALTER TABLE installations
|
|
||||||
ADD COLUMN IF NOT EXISTS name TEXT NOT NULL DEFAULT '';
|
|
||||||
|
|
||||||
-- +goose Down
|
|
||||||
|
|
||||||
ALTER TABLE installations
|
|
||||||
DROP COLUMN IF EXISTS name;
|
|
||||||
@@ -52,7 +52,6 @@ type SaveInstanceInput struct {
|
|||||||
|
|
||||||
type SaveModeInput struct {
|
type SaveModeInput struct {
|
||||||
Mode string
|
Mode string
|
||||||
Name string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type SaveAdminInput struct {
|
type SaveAdminInput struct {
|
||||||
@@ -70,7 +69,6 @@ type SaveStructureInput struct {
|
|||||||
|
|
||||||
type InstallationRecord struct {
|
type InstallationRecord struct {
|
||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
Name string `json:"name"`
|
|
||||||
Mode string `json:"mode"`
|
Mode string `json:"mode"`
|
||||||
Access string `json:"access"`
|
Access string `json:"access"`
|
||||||
Protocol string `json:"protocol"`
|
Protocol string `json:"protocol"`
|
||||||
@@ -178,10 +176,9 @@ func NewService(db *database.DB) *Service {
|
|||||||
|
|
||||||
func (service *Service) SaveInstance(ctx context.Context, input SaveInstanceInput) (InstallationRecord, error) {
|
func (service *Service) SaveInstance(ctx context.Context, input SaveInstanceInput) (InstallationRecord, error) {
|
||||||
row := service.db.Pool.QueryRow(ctx, `
|
row := service.db.Pool.QueryRow(ctx, `
|
||||||
INSERT INTO installations (singleton, name, mode, access, protocol, host)
|
INSERT INTO installations (singleton, mode, access, protocol, host)
|
||||||
VALUES (
|
VALUES (
|
||||||
TRUE,
|
TRUE,
|
||||||
COALESCE((SELECT name FROM installations WHERE singleton = TRUE LIMIT 1), ''),
|
|
||||||
COALESCE((SELECT mode FROM installations WHERE singleton = TRUE LIMIT 1), 'personal'::instance_mode),
|
COALESCE((SELECT mode FROM installations WHERE singleton = TRUE LIMIT 1), 'personal'::instance_mode),
|
||||||
$1::instance_access,
|
$1::instance_access,
|
||||||
$2::instance_protocol,
|
$2::instance_protocol,
|
||||||
@@ -193,7 +190,7 @@ func (service *Service) SaveInstance(ctx context.Context, input SaveInstanceInpu
|
|||||||
protocol = EXCLUDED.protocol,
|
protocol = EXCLUDED.protocol,
|
||||||
host = EXCLUDED.host,
|
host = EXCLUDED.host,
|
||||||
updated_at = NOW()
|
updated_at = NOW()
|
||||||
RETURNING id::text, name, mode::text, access::text, protocol::text, host, is_bootstrapped;
|
RETURNING id::text, mode::text, access::text, protocol::text, host, is_bootstrapped;
|
||||||
`, input.Access, input.Protocol, input.Host)
|
`, input.Access, input.Protocol, input.Host)
|
||||||
|
|
||||||
return scanInstallationRecord(row)
|
return scanInstallationRecord(row)
|
||||||
@@ -201,22 +198,20 @@ func (service *Service) SaveInstance(ctx context.Context, input SaveInstanceInpu
|
|||||||
|
|
||||||
func (service *Service) SaveMode(ctx context.Context, input SaveModeInput) (InstallationRecord, error) {
|
func (service *Service) SaveMode(ctx context.Context, input SaveModeInput) (InstallationRecord, error) {
|
||||||
row := service.db.Pool.QueryRow(ctx, `
|
row := service.db.Pool.QueryRow(ctx, `
|
||||||
INSERT INTO installations (singleton, name, mode, access, protocol, host)
|
INSERT INTO installations (singleton, mode, access, protocol, host)
|
||||||
VALUES (
|
VALUES (
|
||||||
TRUE,
|
TRUE,
|
||||||
$2,
|
|
||||||
$1::instance_mode,
|
$1::instance_mode,
|
||||||
COALESCE((SELECT access FROM installations WHERE singleton = TRUE LIMIT 1), 'local'::instance_access),
|
COALESCE((SELECT access FROM installations WHERE singleton = TRUE LIMIT 1), 'local'::instance_access),
|
||||||
COALESCE((SELECT protocol FROM installations WHERE singleton = TRUE LIMIT 1), 'http'::instance_protocol),
|
COALESCE((SELECT protocol FROM installations WHERE singleton = TRUE LIMIT 1), 'http'::instance_protocol),
|
||||||
COALESCE((SELECT host FROM installations WHERE singleton = TRUE LIMIT 1), $3)
|
COALESCE((SELECT host FROM installations WHERE singleton = TRUE LIMIT 1), $2)
|
||||||
)
|
)
|
||||||
ON CONFLICT (singleton) DO UPDATE
|
ON CONFLICT (singleton) DO UPDATE
|
||||||
SET
|
SET
|
||||||
name = EXCLUDED.name,
|
|
||||||
mode = EXCLUDED.mode,
|
mode = EXCLUDED.mode,
|
||||||
updated_at = NOW()
|
updated_at = NOW()
|
||||||
RETURNING id::text, name, mode::text, access::text, protocol::text, host, is_bootstrapped;
|
RETURNING id::text, mode::text, access::text, protocol::text, host, is_bootstrapped;
|
||||||
`, input.Mode, input.Name, defaultInstallationHost)
|
`, input.Mode, defaultInstallationHost)
|
||||||
|
|
||||||
return scanInstallationRecord(row)
|
return scanInstallationRecord(row)
|
||||||
}
|
}
|
||||||
@@ -306,7 +301,7 @@ func (service *Service) SaveStructure(ctx context.Context, input SaveStructureIn
|
|||||||
|
|
||||||
organizationName := strings.TrimSpace(input.OrganizationName)
|
organizationName := strings.TrimSpace(input.OrganizationName)
|
||||||
if organizationName == "" {
|
if organizationName == "" {
|
||||||
organizationName = defaultRootOrganizationName(installation.Name, installation.Mode, installation.Host, admin.DisplayName)
|
organizationName = defaultRootOrganizationName(installation.Mode, installation.Host, admin.DisplayName)
|
||||||
}
|
}
|
||||||
|
|
||||||
organization, err := upsertNamedRecord(ctx, tx, `
|
organization, err := upsertNamedRecord(ctx, tx, `
|
||||||
@@ -447,7 +442,7 @@ func (service *Service) ResetDevelopmentState(ctx context.Context) error {
|
|||||||
|
|
||||||
func (service *Service) GetInstallation(ctx context.Context) (*InstallationRecord, error) {
|
func (service *Service) GetInstallation(ctx context.Context) (*InstallationRecord, error) {
|
||||||
record, err := scanInstallationRecord(service.db.Pool.QueryRow(ctx, `
|
record, err := scanInstallationRecord(service.db.Pool.QueryRow(ctx, `
|
||||||
SELECT id::text, name, mode::text, access::text, protocol::text, host, is_bootstrapped
|
SELECT id::text, mode::text, access::text, protocol::text, host, is_bootstrapped
|
||||||
FROM installations
|
FROM installations
|
||||||
WHERE singleton = TRUE
|
WHERE singleton = TRUE
|
||||||
LIMIT 1;
|
LIMIT 1;
|
||||||
@@ -602,7 +597,7 @@ func (service *Service) GetAppShellState(ctx context.Context) (AppShellState, er
|
|||||||
|
|
||||||
func scanInstallationRecord(row pgx.Row) (InstallationRecord, error) {
|
func scanInstallationRecord(row pgx.Row) (InstallationRecord, error) {
|
||||||
var record InstallationRecord
|
var record InstallationRecord
|
||||||
if err := row.Scan(&record.ID, &record.Name, &record.Mode, &record.Access, &record.Protocol, &record.Host, &record.IsBootstrapped); err != nil {
|
if err := row.Scan(&record.ID, &record.Mode, &record.Access, &record.Protocol, &record.Host, &record.IsBootstrapped); err != nil {
|
||||||
return InstallationRecord{}, err
|
return InstallationRecord{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -807,7 +802,7 @@ func (service *Service) listWorkspaces(ctx context.Context) ([]WorkspaceRecord,
|
|||||||
|
|
||||||
func loadInstallation(ctx context.Context, tx pgx.Tx) (InstallationRecord, error) {
|
func loadInstallation(ctx context.Context, tx pgx.Tx) (InstallationRecord, error) {
|
||||||
return scanInstallationRecord(tx.QueryRow(ctx, `
|
return scanInstallationRecord(tx.QueryRow(ctx, `
|
||||||
SELECT id::text, name, mode::text, access::text, protocol::text, host, is_bootstrapped
|
SELECT id::text, mode::text, access::text, protocol::text, host, is_bootstrapped
|
||||||
FROM installations
|
FROM installations
|
||||||
WHERE singleton = TRUE
|
WHERE singleton = TRUE
|
||||||
LIMIT 1;
|
LIMIT 1;
|
||||||
@@ -834,7 +829,7 @@ func updateBootstrappedInstallation(ctx context.Context, tx pgx.Tx) (Installatio
|
|||||||
UPDATE installations
|
UPDATE installations
|
||||||
SET is_bootstrapped = TRUE, bootstrapped_at = COALESCE(bootstrapped_at, NOW()), updated_at = NOW()
|
SET is_bootstrapped = TRUE, bootstrapped_at = COALESCE(bootstrapped_at, NOW()), updated_at = NOW()
|
||||||
WHERE singleton = TRUE
|
WHERE singleton = TRUE
|
||||||
RETURNING id::text, name, mode::text, access::text, protocol::text, host, is_bootstrapped;
|
RETURNING id::text, mode::text, access::text, protocol::text, host, is_bootstrapped;
|
||||||
`))
|
`))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -865,15 +860,10 @@ func upsertWorkspace(ctx context.Context, tx pgx.Tx, organizationID, name, slug,
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func defaultRootOrganizationName(installationName, mode, host, adminDisplayName string) string {
|
func defaultRootOrganizationName(mode, host, adminDisplayName string) string {
|
||||||
trimmedInstallationName := strings.TrimSpace(installationName)
|
|
||||||
trimmedHost := strings.TrimSpace(host)
|
trimmedHost := strings.TrimSpace(host)
|
||||||
trimmedAdminDisplayName := strings.TrimSpace(adminDisplayName)
|
trimmedAdminDisplayName := strings.TrimSpace(adminDisplayName)
|
||||||
|
|
||||||
if trimmedInstallationName != "" {
|
|
||||||
return trimmedInstallationName
|
|
||||||
}
|
|
||||||
|
|
||||||
if strings.EqualFold(mode, defaultInstallationMode) {
|
if strings.EqualFold(mode, defaultInstallationMode) {
|
||||||
if trimmedAdminDisplayName != "" {
|
if trimmedAdminDisplayName != "" {
|
||||||
return fmt.Sprintf("%s %s", trimmedAdminDisplayName, defaultPersonalServerSuffix)
|
return fmt.Sprintf("%s %s", trimmedAdminDisplayName, defaultPersonalServerSuffix)
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ type bootstrapInstanceStepRequest struct {
|
|||||||
|
|
||||||
type bootstrapModeStepRequest struct {
|
type bootstrapModeStepRequest struct {
|
||||||
Mode string `json:"mode"`
|
Mode string `json:"mode"`
|
||||||
Name string `json:"name"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type bootstrapAdminStepRequest struct {
|
type bootstrapAdminStepRequest struct {
|
||||||
@@ -235,19 +234,13 @@ func (routes apiRoutes) handleBootstrapModeStep(w http.ResponseWriter, r *http.R
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
payload.Mode = strings.ToLower(strings.TrimSpace(payload.Mode))
|
payload.Mode = strings.ToLower(strings.TrimSpace(payload.Mode))
|
||||||
payload.Name = strings.TrimSpace(payload.Name)
|
|
||||||
|
|
||||||
if payload.Mode != "personal" && payload.Mode != "organizational" {
|
if payload.Mode != "personal" && payload.Mode != "organizational" {
|
||||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Mode must be either 'personal' or 'organizational'.")
|
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Mode must be either 'personal' or 'organizational'.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if payload.Name == "" {
|
record, err := routes.bootstrapService().SaveMode(r.Context(), bootstrapservice.SaveModeInput{Mode: payload.Mode})
|
||||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Name is required.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
record, err := routes.bootstrapService().SaveMode(r.Context(), bootstrapservice.SaveModeInput{Mode: payload.Mode, Name: payload.Name})
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
routes.writeBootstrapPersistenceError(w, r, err)
|
routes.writeBootstrapPersistenceError(w, r, err)
|
||||||
return
|
return
|
||||||
@@ -363,11 +356,7 @@ func (routes apiRoutes) writeBootstrapPersistenceError(w http.ResponseWriter, r
|
|||||||
WriteError(w, http.StatusConflict, RequestIDFromContext(r.Context()), "bootstrap_prerequisite_missing", err.Error())
|
WriteError(w, http.StatusConflict, RequestIDFromContext(r.Context()), "bootstrap_prerequisite_missing", err.Error())
|
||||||
default:
|
default:
|
||||||
routes.cfg.Logger.Error("persist bootstrap step", "error", err, "path", r.URL.Path)
|
routes.cfg.Logger.Error("persist bootstrap step", "error", err, "path", r.URL.Path)
|
||||||
message := "Failed to persist bootstrap data."
|
WriteError(w, http.StatusInternalServerError, RequestIDFromContext(r.Context()), "bootstrap_persist_failed", "Failed to persist bootstrap data.")
|
||||||
if routes.cfg.Config.IsDevelopment() {
|
|
||||||
message = message + " " + err.Error()
|
|
||||||
}
|
|
||||||
WriteError(w, http.StatusInternalServerError, RequestIDFromContext(r.Context()), "bootstrap_persist_failed", message)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+52
-114
@@ -4,149 +4,87 @@
|
|||||||
|
|
||||||
### Version 0.1.0
|
### Version 0.1.0
|
||||||
|
|
||||||
**Goal:** Finish the base application shell, auth, and platform foundations.
|
**Goal:** Barebone frontend with a real backend core.
|
||||||
|
|
||||||
#### Architecture and Delivery
|
#### Architecture
|
||||||
|
|
||||||
- [x] Project-Structure
|
- [ ] Project-Structure
|
||||||
- [x] Stack-Decisions
|
- [ ] Stack-Decisions
|
||||||
- [x] Proxy
|
- [ ] Proxy
|
||||||
- [x] Local-Dev-Vite-Proxy
|
- [ ] Local-Prod-NGINX-Proxy
|
||||||
- [x] Local-Prod-NGINX-Proxy
|
- [ ] Static-Frontend-Serving
|
||||||
- [x] First-Request-Web-Loader
|
- [ ] First-Request-Web-Loader
|
||||||
- [x] Bootstrap-Document
|
- [ ] Bootstrap-Document
|
||||||
- [x] Route-Intent-Handoff
|
- [ ] Route-Intent-Handoff
|
||||||
- [x] Tiny-First-Paint-Budget
|
- [ ] Tiny-First-Paint-Budget
|
||||||
- [x] Dev-and-Prod-Builds
|
- [ ] Dev-and-Prod-Builds
|
||||||
- [x] Local-Dev-Just-Commands
|
- [x] Local-Dev-Just-Commands
|
||||||
- [x] Local-Dev-Docker-Compose
|
- [x] Local-Dev-Docker-Compose
|
||||||
- [x] Local-Prod-Just-Commands
|
- [ ] Local-Prod-Just-Commands
|
||||||
- [x] Local-Prod-Docker-Compose
|
- [ ] Local-Prod-Docker-Compose
|
||||||
- [x] Frontend-Production-Dockerfile
|
- [ ] Frontend-Production-Dockerfile
|
||||||
- [x] Frontend-docker-bake
|
- [ ] Frontend-docker-bake
|
||||||
|
|
||||||
#### Backend — Done Foundations
|
#### Backend
|
||||||
|
|
||||||
- [x] Bootstrap-Persistence
|
|
||||||
- [x] Installation-Step
|
|
||||||
- [x] Mode-Step
|
|
||||||
- [x] Admin-Step
|
|
||||||
- [x] Structure-Step
|
|
||||||
- [x] Bootstrap-State-Authority
|
|
||||||
- [x] Development-Bootstrap-Reset
|
|
||||||
- [x] Base-Schema
|
|
||||||
- [x] Installations
|
|
||||||
- [x] Users
|
|
||||||
- [x] User-Homes
|
|
||||||
- [x] Organizations
|
|
||||||
- [x] Departments
|
|
||||||
- [x] Teams
|
|
||||||
- [x] Projects
|
|
||||||
- [x] Workspaces
|
|
||||||
- [x] Membership-Tables
|
|
||||||
- [x] App-Shell-Read-API
|
|
||||||
- [x] App-Shell-State-Endpoint
|
|
||||||
- [x] Bootstrap-Read-Endpoints
|
|
||||||
- [x] Shell-Tree-Hydration
|
|
||||||
- [x] Web-Route-Scaffolds
|
|
||||||
- [x] Session-Endpoint-Scaffold
|
|
||||||
- [x] Bootstrap-Endpoint-Scaffold
|
|
||||||
- [x] Current-User-Endpoint-Scaffold
|
|
||||||
|
|
||||||
#### Backend — Remaining for 0.1.0
|
|
||||||
|
|
||||||
- [ ] Auth
|
- [ ] Auth
|
||||||
- [ ] Session-Flow
|
- [ ] Session-Flow
|
||||||
- [ ] Login-Logout-Foundation
|
- [ ] Login-Logout-Foundation
|
||||||
- [ ] Authentication
|
- [ ] Authentication
|
||||||
- [ ] Current-User-Implementation
|
- [ ] User
|
||||||
- [ ] POSIX-Lite-File-Persistence-Foundation
|
- [ ] Base-Model
|
||||||
- [ ] Mounted-Storage-Root-Config
|
|
||||||
- [ ] Project-Folder-Creation-On-Backend
|
|
||||||
- [ ] moku.project.json
|
|
||||||
- [ ] Item-Folder-Creation
|
|
||||||
- [ ] item.json
|
|
||||||
- [ ] schema.json
|
|
||||||
- [ ] data.json
|
|
||||||
- [ ] DB-To-Files-Write-Flow
|
|
||||||
- [ ] User-and-Workspace-Domain-Readiness
|
|
||||||
- [ ] Base-Workspace
|
- [ ] Base-Workspace
|
||||||
- [ ] Boards
|
- [ ] Folders-and-Subfolders
|
||||||
- [ ] Dashboard
|
- [ ] Boards
|
||||||
|
- [ ] Dashboard
|
||||||
|
- [ ] Organization
|
||||||
|
- [ ] Base-Model
|
||||||
|
- [ ] Access-Rules-and-Membership
|
||||||
|
- [ ] Workspace
|
||||||
|
- [ ] Folders-and-Subfolders
|
||||||
- [ ] API
|
- [ ] API
|
||||||
- [ ] Real-Organizations-Read-Endpoint
|
|
||||||
- [ ] Real-Workspaces-Read-Endpoint
|
|
||||||
- [ ] Tree-Mutation-Endpoints
|
|
||||||
- [ ] Project-Creation-Endpoint
|
|
||||||
|
|
||||||
#### Frontend — Done Foundations
|
#### Frontend
|
||||||
|
|
||||||
- [x] Foundation
|
- [x] Foundation
|
||||||
- [x] Typography
|
- [x] Typography
|
||||||
- [x] Icons
|
- [x] Icons
|
||||||
- [x] App-Shell
|
- [ ] App Shell
|
||||||
- [x] Left-Rail
|
|
||||||
- [x] Top-Bar
|
|
||||||
- [x] Server-Dock
|
|
||||||
- [x] Department-Selector
|
|
||||||
- [x] Theme-Toggle
|
|
||||||
- [x] Notifications-Menu
|
|
||||||
- [x] Profile-Menu
|
|
||||||
- [x] Responsive-Shell
|
|
||||||
- [x] Collapsible-Shell
|
|
||||||
- [x] Mobile-Bottom-Nav
|
|
||||||
- [x] Mobile-Workspace-Browser
|
|
||||||
- [x] Mobile-Workspace-Views
|
|
||||||
- [x] Context-Menus
|
|
||||||
- [x] Workspace-Context-Menu
|
|
||||||
- [x] Project-Context-Menu
|
|
||||||
- [x] Bootstrap-Workspace-Home
|
|
||||||
- [x] Bootstrap-Wizard
|
|
||||||
- [x] Bootstrap-Step-Submission
|
|
||||||
- [x] App-Shell-Reload-After-Bootstrap
|
|
||||||
- [x] Project-Menu
|
|
||||||
- [x] Folders-and-Subfolders
|
|
||||||
- [x] Rooted-From-Department
|
|
||||||
- [x] Long-Press-Drag-and-Drop
|
|
||||||
- [x] Workspace-Tree
|
|
||||||
- [x] Folders-and-Subfolders
|
|
||||||
- [x] Long-Press-Drag-and-Drop
|
|
||||||
- [x] App-Shell-Hydration
|
|
||||||
|
|
||||||
#### Frontend — Remaining for 0.1.0
|
|
||||||
|
|
||||||
- [ ] Primitives
|
- [ ] Primitives
|
||||||
- [ ] Button
|
- [ ] Button
|
||||||
- [ ] IconButton
|
- [ ] IconButton
|
||||||
- [ ] Input
|
- [ ] Input
|
||||||
- [ ] Surface
|
- [ ] Surface
|
||||||
|
- [ ] Nav-Bar
|
||||||
- [ ] Workspace-Switching
|
- [ ] Workspace-Switching
|
||||||
- [ ] Real-Workspace-Home
|
- [ ] Workspace-Home
|
||||||
- [ ] Real-Workspace-Tree-Hydration
|
|
||||||
- [ ] Create-Project-Flow
|
|
||||||
- [ ] Persist-Tree-Mutations
|
|
||||||
- [ ] Connect-Tree-Interactions-To-Backend-Data
|
|
||||||
|
|
||||||
### Version 0.2.0
|
### Version 0.2.0
|
||||||
|
|
||||||
**Goal:** Build the plugin app system on top of the base platform. And core app plugins like calendar, board, docs and text channels
|
**Goal:** First real work surface.
|
||||||
|
|
||||||
|
- [ ] Table
|
||||||
|
- [ ] CVA
|
||||||
|
- [ ] Storyboard
|
||||||
|
- [ ] Theme-System
|
||||||
|
- [ ] Theme-Registry
|
||||||
|
- [ ] Built-In-Theme-Presets
|
||||||
|
- [ ] Active-Theme-Persistence
|
||||||
|
- [ ] Theme-Switcher
|
||||||
|
- [ ] Theme-JSON-Upload
|
||||||
|
- [ ] Theme-JSON-Import-Validation
|
||||||
|
- [ ] Community-Theme-Readiness
|
||||||
|
|
||||||
### Version 0.3.0
|
### Version 0.3.0
|
||||||
|
|
||||||
**Goal:** Communications and Collaboration (Email System, Reminder System, and Live Collaboration on Documents)
|
**Goal:** Documents and system hardening.
|
||||||
|
|
||||||
|
- [ ] Document
|
||||||
|
- [ ] Accessibility-Rules
|
||||||
|
- [ ] Motion-Foundation
|
||||||
|
|
||||||
### Version 0.4.0
|
### Version 0.4.0
|
||||||
|
|
||||||
**Goal:** Introduce the POSIX-based file system drive direction with OnlyOffice + S3 blob storage
|
- [ ] Gantt-Board
|
||||||
|
- [ ] Calendar
|
||||||
### Version 0.5.0
|
- [ ] Timeline
|
||||||
|
|
||||||
**Goal:** File Sharing and Per File Permissions
|
|
||||||
|
|
||||||
### Version 0.6.0
|
|
||||||
|
|
||||||
**Goal:** Git as a core plugin
|
|
||||||
|
|
||||||
### Version 0.7.0
|
|
||||||
|
|
||||||
**Goal:** Full Automation System (Extensive)
|
|
||||||
|
|||||||
@@ -1,204 +0,0 @@
|
|||||||
import { For, Show, createEffect, createMemo, createSignal, onMount, type JSX } from "solid-js";
|
|
||||||
import { Portal } from "solid-js/web";
|
|
||||||
import { ChevronRight, Plus } from "../../../lib/icons";
|
|
||||||
import {
|
|
||||||
getProjectContextMenuEyebrow,
|
|
||||||
getProjectContextMenuSections,
|
|
||||||
type ProjectContextMenuAction,
|
|
||||||
type ProjectMenuTarget,
|
|
||||||
type WorkspaceContextMenuShortcut,
|
|
||||||
} from "../data/shell.data";
|
|
||||||
import styles from "../WorkspaceContextMenu/WorkspaceContextMenu.module.scss";
|
|
||||||
|
|
||||||
type ShortcutPlatform = "mac" | "windows";
|
|
||||||
|
|
||||||
type NavigatorWithUserAgentData = Navigator & {
|
|
||||||
userAgentData?: {
|
|
||||||
platform?: string;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
type ProjectContextMenuPosition = {
|
|
||||||
x: number;
|
|
||||||
y: number;
|
|
||||||
};
|
|
||||||
|
|
||||||
type ProjectContextMenuProps = {
|
|
||||||
target: ProjectMenuTarget | null;
|
|
||||||
position: ProjectContextMenuPosition | null;
|
|
||||||
onClose: VoidFunction;
|
|
||||||
onSelect: (action: ProjectContextMenuAction, target: ProjectMenuTarget) => void;
|
|
||||||
menuRef: (element: HTMLDivElement) => void;
|
|
||||||
};
|
|
||||||
|
|
||||||
const getShortcutPlatform = (): ShortcutPlatform => {
|
|
||||||
if (typeof navigator === "undefined") {
|
|
||||||
return "mac";
|
|
||||||
}
|
|
||||||
|
|
||||||
const navigatorWithUserAgentData = navigator as NavigatorWithUserAgentData;
|
|
||||||
const platform =
|
|
||||||
typeof navigatorWithUserAgentData.userAgentData?.platform === "string"
|
|
||||||
? navigatorWithUserAgentData.userAgentData.platform
|
|
||||||
: navigator.platform;
|
|
||||||
|
|
||||||
return /mac|iphone|ipad|ipod/i.test(platform) ? "mac" : "windows";
|
|
||||||
};
|
|
||||||
|
|
||||||
const formatShortcut = (shortcut: WorkspaceContextMenuShortcut, platform: ShortcutPlatform): string => {
|
|
||||||
const keyLabel = (() => {
|
|
||||||
switch (shortcut.key) {
|
|
||||||
case "enter":
|
|
||||||
return platform === "mac" ? "↩" : "Enter";
|
|
||||||
case "delete":
|
|
||||||
return platform === "mac" ? "⌫" : "Del";
|
|
||||||
default:
|
|
||||||
return shortcut.key.toUpperCase();
|
|
||||||
}
|
|
||||||
})();
|
|
||||||
|
|
||||||
const modifierLabels =
|
|
||||||
shortcut.modifiers?.map((modifier) => {
|
|
||||||
switch (modifier) {
|
|
||||||
case "meta":
|
|
||||||
return platform === "mac" ? "⌘" : "Ctrl";
|
|
||||||
case "alt":
|
|
||||||
return platform === "mac" ? "⌥" : "Alt";
|
|
||||||
case "shift":
|
|
||||||
return platform === "mac" ? "⇧" : "Shift";
|
|
||||||
}
|
|
||||||
}) ?? [];
|
|
||||||
|
|
||||||
return platform === "mac" ? `${modifierLabels.join("")}${keyLabel}` : [...modifierLabels, keyLabel].join("+");
|
|
||||||
};
|
|
||||||
|
|
||||||
export const ProjectContextMenu = (props: ProjectContextMenuProps): JSX.Element => {
|
|
||||||
const [activeSubmenuActionId, setActiveSubmenuActionId] = createSignal<string | null>(null);
|
|
||||||
const [shortcutPlatform, setShortcutPlatform] = createSignal<ShortcutPlatform>("mac");
|
|
||||||
const sections = createMemo(() => (props.target ? getProjectContextMenuSections(props.target) : []));
|
|
||||||
const isCreateAction = (action: ProjectContextMenuAction): boolean => action.id.startsWith("new-");
|
|
||||||
const menuState = createMemo<{
|
|
||||||
target: ProjectMenuTarget;
|
|
||||||
position: ProjectContextMenuPosition;
|
|
||||||
} | null>(() => (props.target && props.position ? { target: props.target, position: props.position } : null));
|
|
||||||
|
|
||||||
onMount(() => {
|
|
||||||
setShortcutPlatform(getShortcutPlatform());
|
|
||||||
});
|
|
||||||
|
|
||||||
createEffect(() => {
|
|
||||||
void props.target;
|
|
||||||
setActiveSubmenuActionId(null);
|
|
||||||
});
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Show when={menuState()}>
|
|
||||||
{(resolvedMenuState): JSX.Element => {
|
|
||||||
const target = resolvedMenuState().target;
|
|
||||||
const position = resolvedMenuState().position;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Portal>
|
|
||||||
<div
|
|
||||||
ref={props.menuRef}
|
|
||||||
class={styles.menu}
|
|
||||||
role="menu"
|
|
||||||
aria-label={`${target.label} project context menu`}
|
|
||||||
style={{ left: `${position.x}px`, top: `${position.y}px` }}
|
|
||||||
>
|
|
||||||
<Show when={target.kind !== "surface"}>
|
|
||||||
<header class={styles.header}>
|
|
||||||
<span class={styles.eyebrow}>{getProjectContextMenuEyebrow(target)}</span>
|
|
||||||
<strong class={styles.title}>{target.label}</strong>
|
|
||||||
</header>
|
|
||||||
</Show>
|
|
||||||
|
|
||||||
<div class={styles.sectionList}>
|
|
||||||
<For each={sections()}>
|
|
||||||
{(section): JSX.Element => (
|
|
||||||
<section class={styles.section}>
|
|
||||||
<Show when={section.label}>
|
|
||||||
<span class={styles.sectionLabel}>{section.label}</span>
|
|
||||||
</Show>
|
|
||||||
<div class={styles.actionList}>
|
|
||||||
<For each={section.items}>
|
|
||||||
{(action): JSX.Element => {
|
|
||||||
const isSubmenuOpen = () => activeSubmenuActionId() === action.id;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div class={styles.actionItem} onMouseEnter={() => setActiveSubmenuActionId(action.children ? action.id : null)}>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
role="menuitem"
|
|
||||||
classList={{
|
|
||||||
[styles.action]: true,
|
|
||||||
[styles.actionCreate]: isCreateAction(action),
|
|
||||||
[styles.actionDanger]: action.tone === "danger",
|
|
||||||
[styles.actionSubmenuOpen]: isSubmenuOpen(),
|
|
||||||
}}
|
|
||||||
onClick={() => {
|
|
||||||
if (action.children) {
|
|
||||||
setActiveSubmenuActionId(isSubmenuOpen() ? null : action.id);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
props.onSelect(action, target);
|
|
||||||
props.onClose();
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<Show when={isCreateAction(action)}>
|
|
||||||
<span class={styles.actionCreateIcon} aria-hidden="true">
|
|
||||||
<Plus size={14} strokeWidth={2.25} />
|
|
||||||
</span>
|
|
||||||
</Show>
|
|
||||||
<span class={styles.actionLabel}>{action.label}</span>
|
|
||||||
<div class={styles.actionMeta}>
|
|
||||||
<Show when={action.shortcut}>
|
|
||||||
<span class={styles.actionShortcut}>{formatShortcut(action.shortcut!, shortcutPlatform())}</span>
|
|
||||||
</Show>
|
|
||||||
<Show when={action.children}>
|
|
||||||
<ChevronRight class={styles.actionChevron} size={16} strokeWidth={2} />
|
|
||||||
</Show>
|
|
||||||
</div>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<Show when={action.children && isSubmenuOpen()}>
|
|
||||||
<div class={styles.submenu} role="menu" aria-label={`${action.label} submenu`}>
|
|
||||||
<div class={styles.submenuList}>
|
|
||||||
<For each={action.children ?? []}>
|
|
||||||
{(childAction): JSX.Element => (
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
role="menuitem"
|
|
||||||
classList={{
|
|
||||||
[styles.action]: true,
|
|
||||||
[styles.actionDanger]: childAction.tone === "danger",
|
|
||||||
}}
|
|
||||||
onClick={() => {
|
|
||||||
props.onSelect(childAction, target);
|
|
||||||
props.onClose();
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<span class={styles.actionLabel}>{childAction.label}</span>
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
</For>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</Show>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}}
|
|
||||||
</For>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
)}
|
|
||||||
</For>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</Portal>
|
|
||||||
);
|
|
||||||
}}
|
|
||||||
</Show>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
-120
@@ -1,120 +0,0 @@
|
|||||||
import { createEffect, createSignal, onCleanup } from "solid-js";
|
|
||||||
import type { ProjectMenuTarget } from "../data/shell.data";
|
|
||||||
|
|
||||||
type ProjectContextMenuState = {
|
|
||||||
target: ProjectMenuTarget;
|
|
||||||
x: number;
|
|
||||||
y: number;
|
|
||||||
};
|
|
||||||
|
|
||||||
const readRootPixelToken = (name: string, fallback: number): number => {
|
|
||||||
if (typeof window === "undefined") {
|
|
||||||
return fallback;
|
|
||||||
}
|
|
||||||
|
|
||||||
const value = window.getComputedStyle(document.documentElement).getPropertyValue(name).trim();
|
|
||||||
const parsed = Number.parseFloat(value);
|
|
||||||
|
|
||||||
if (!Number.isFinite(parsed)) {
|
|
||||||
return fallback;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (value.endsWith("px")) {
|
|
||||||
return parsed;
|
|
||||||
}
|
|
||||||
|
|
||||||
return parsed * 16;
|
|
||||||
};
|
|
||||||
|
|
||||||
const clampMenuPosition = (value: number, min: number, max: number): number => {
|
|
||||||
if (max <= min) {
|
|
||||||
return min;
|
|
||||||
}
|
|
||||||
|
|
||||||
return Math.min(Math.max(value, min), max);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const createProjectContextMenuController = () => {
|
|
||||||
const [menuState, setMenuState] = createSignal<ProjectContextMenuState | null>(null);
|
|
||||||
let menuRef: HTMLDivElement | undefined;
|
|
||||||
|
|
||||||
const closeMenu = (): void => {
|
|
||||||
setMenuState(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
const repositionMenu = (): void => {
|
|
||||||
if (typeof window === "undefined" || !menuRef) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const current = menuState();
|
|
||||||
|
|
||||||
if (!current) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const viewportPadding = readRootPixelToken("--space-4", 16);
|
|
||||||
const rect = menuRef.getBoundingClientRect();
|
|
||||||
const nextX = clampMenuPosition(current.x, viewportPadding, window.innerWidth - rect.width - viewportPadding);
|
|
||||||
const nextY = clampMenuPosition(current.y, viewportPadding, window.innerHeight - rect.height - viewportPadding);
|
|
||||||
|
|
||||||
if (nextX === current.x && nextY === current.y) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setMenuState({ ...current, x: nextX, y: nextY });
|
|
||||||
};
|
|
||||||
|
|
||||||
const openMenu = (event: MouseEvent, target: ProjectMenuTarget): void => {
|
|
||||||
event.preventDefault();
|
|
||||||
setMenuState({ target, x: event.clientX, y: event.clientY });
|
|
||||||
};
|
|
||||||
|
|
||||||
createEffect(() => {
|
|
||||||
if (!menuState() || typeof window === "undefined") {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const frame = window.requestAnimationFrame(() => {
|
|
||||||
repositionMenu();
|
|
||||||
});
|
|
||||||
|
|
||||||
const handlePointerDown = (event: PointerEvent): void => {
|
|
||||||
if (!menuRef?.contains(event.target as Node)) {
|
|
||||||
closeMenu();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleKeyDown = (event: KeyboardEvent): void => {
|
|
||||||
if (event.key === "Escape") {
|
|
||||||
closeMenu();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleViewportChange = (): void => {
|
|
||||||
closeMenu();
|
|
||||||
};
|
|
||||||
|
|
||||||
document.addEventListener("pointerdown", handlePointerDown);
|
|
||||||
window.addEventListener("resize", handleViewportChange);
|
|
||||||
window.addEventListener("scroll", handleViewportChange, true);
|
|
||||||
window.addEventListener("keydown", handleKeyDown);
|
|
||||||
|
|
||||||
onCleanup(() => {
|
|
||||||
window.cancelAnimationFrame(frame);
|
|
||||||
document.removeEventListener("pointerdown", handlePointerDown);
|
|
||||||
window.removeEventListener("resize", handleViewportChange);
|
|
||||||
window.removeEventListener("scroll", handleViewportChange, true);
|
|
||||||
window.removeEventListener("keydown", handleKeyDown);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
|
||||||
menuState,
|
|
||||||
openMenu,
|
|
||||||
closeMenu,
|
|
||||||
setMenuRef: (element: HTMLDivElement): void => {
|
|
||||||
menuRef = element;
|
|
||||||
},
|
|
||||||
};
|
|
||||||
};
|
|
||||||
@@ -9,15 +9,6 @@
|
|||||||
justify-items: center;
|
justify-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.rootDragMode {
|
|
||||||
user-select: none;
|
|
||||||
cursor: grabbing;
|
|
||||||
}
|
|
||||||
|
|
||||||
.rootDragMode .treeItem {
|
|
||||||
cursor: grabbing;
|
|
||||||
}
|
|
||||||
|
|
||||||
.trigger {
|
.trigger {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
@@ -47,9 +38,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.triggerOpen {
|
.triggerOpen {
|
||||||
border-color: color-mix(in srgb, var(--color-accent-strong) 22%, var(--color-border-strong));
|
border-color: color-mix(in srgb, var(--color-border-strong) 22%, transparent);
|
||||||
background: color-mix(in srgb, var(--color-accent-soft) 26%, var(--color-surface));
|
background: color-mix(in srgb, var(--color-surface) 92%, transparent);
|
||||||
box-shadow: 0 10px 28px color-mix(in srgb, black 8%, transparent);
|
box-shadow: var(--shadow-soft);
|
||||||
}
|
}
|
||||||
|
|
||||||
.triggerCompact {
|
.triggerCompact {
|
||||||
@@ -92,14 +83,19 @@
|
|||||||
gap: 0.12rem;
|
gap: 0.12rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.eyebrow {
|
.eyebrow,
|
||||||
|
.projectItemDescription {
|
||||||
@include text-caption;
|
@include text-caption;
|
||||||
color: var(--color-text-muted);
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.eyebrow {
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
letter-spacing: 0.08em;
|
letter-spacing: 0.08em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.value {
|
.value,
|
||||||
|
.projectItemName {
|
||||||
@include text-label;
|
@include text-label;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -179,7 +175,7 @@
|
|||||||
min-height: 0;
|
min-height: 0;
|
||||||
display: grid;
|
display: grid;
|
||||||
align-content: start;
|
align-content: start;
|
||||||
gap: var(--space-2);
|
gap: var(--space-3);
|
||||||
padding: var(--space-4);
|
padding: var(--space-4);
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
overscroll-behavior: contain;
|
overscroll-behavior: contain;
|
||||||
@@ -190,148 +186,49 @@
|
|||||||
width: 0;
|
width: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.treeSectionLabel {
|
.projectList {
|
||||||
@include text-caption;
|
|
||||||
margin: 0 0 var(--space-2);
|
|
||||||
padding: 0 var(--space-3);
|
|
||||||
color: var(--color-text-subtle);
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.04em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.treeList {
|
|
||||||
list-style: none;
|
list-style: none;
|
||||||
display: grid;
|
display: grid;
|
||||||
gap: var(--space-1);
|
gap: 0.2rem;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.treeEmptySlot {
|
.projectItem {
|
||||||
min-height: calc(var(--control-size-lg) - var(--space-2));
|
|
||||||
padding-left: calc(var(--space-3) + (var(--tree-depth, 0) * var(--space-4)));
|
|
||||||
border-radius: var(--radius-lg);
|
|
||||||
border: 1px dashed color-mix(in srgb, var(--color-border) 38%, transparent);
|
|
||||||
opacity: 0.35;
|
|
||||||
}
|
|
||||||
|
|
||||||
.treeInputRow {
|
|
||||||
width: 100%;
|
|
||||||
min-width: 0;
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: auto minmax(0, 1fr);
|
|
||||||
align-items: center;
|
|
||||||
gap: var(--space-2);
|
|
||||||
min-height: calc(var(--control-size-lg) - var(--space-2));
|
|
||||||
padding: var(--space-2) var(--space-3);
|
|
||||||
padding-left: calc(var(--space-3) + (var(--tree-depth, 0) * var(--space-4)));
|
|
||||||
border: 1px solid color-mix(in srgb, var(--color-border) 42%, transparent);
|
|
||||||
border-radius: var(--radius-lg);
|
|
||||||
background: color-mix(in srgb, var(--color-surface) 94%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.treeInput {
|
|
||||||
width: 100%;
|
|
||||||
min-width: 0;
|
|
||||||
border: 0;
|
|
||||||
background: transparent;
|
|
||||||
color: var(--color-text);
|
|
||||||
font: inherit;
|
|
||||||
outline: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.treeInput::placeholder {
|
|
||||||
color: var(--color-text-muted);
|
|
||||||
}
|
|
||||||
|
|
||||||
.treeItem {
|
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
display: grid;
|
min-height: calc(var(--control-size-md) + var(--space-2));
|
||||||
grid-template-columns: auto auto minmax(0, 1fr) auto;
|
|
||||||
align-items: center;
|
|
||||||
gap: var(--space-2);
|
|
||||||
min-height: calc(var(--control-size-lg) - var(--space-2));
|
|
||||||
padding: var(--space-2) var(--space-3);
|
padding: var(--space-2) var(--space-3);
|
||||||
padding-left: calc(var(--space-3) + (var(--tree-depth, 0) * var(--space-4)));
|
|
||||||
border: 1px solid transparent;
|
border: 1px solid transparent;
|
||||||
border-radius: var(--radius-lg);
|
border-radius: var(--radius-sm);
|
||||||
background: transparent;
|
background: transparent;
|
||||||
color: var(--color-text-muted);
|
color: var(--color-text-muted);
|
||||||
transition:
|
transition:
|
||||||
background 160ms var(--easing-standard),
|
background 160ms var(--easing-standard),
|
||||||
color 160ms var(--easing-standard),
|
color 160ms var(--easing-standard),
|
||||||
border-color 160ms var(--easing-standard),
|
border-color 160ms var(--easing-standard),
|
||||||
box-shadow 160ms var(--easing-standard),
|
|
||||||
transform 180ms var(--easing-standard);
|
transform 180ms var(--easing-standard);
|
||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
.treeItem:hover,
|
.projectItem:hover {
|
||||||
.treeItem:focus-visible {
|
background: color-mix(in srgb, var(--color-surface-hover) 82%, transparent);
|
||||||
background: color-mix(in srgb, var(--color-surface-hover) 80%, var(--color-accent-soft) 20%);
|
|
||||||
color: var(--color-text);
|
color: var(--color-text);
|
||||||
box-shadow: inset 0 1px 0 color-mix(in srgb, white 4%, transparent);
|
border-color: color-mix(in srgb, var(--color-border) 22%, transparent);
|
||||||
}
|
}
|
||||||
|
|
||||||
.treeItemFolder {
|
.projectItemActive {
|
||||||
|
border-color: color-mix(in srgb, var(--color-border) 28%, transparent);
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 82%, transparent);
|
||||||
color: var(--color-text);
|
color: var(--color-text);
|
||||||
|
box-shadow: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.treeItemDragging {
|
.projectItemCopy {
|
||||||
opacity: 0.45;
|
|
||||||
transform: scale(0.985);
|
|
||||||
box-shadow: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.treeItemDropBefore {
|
|
||||||
box-shadow: inset 0 2px 0 color-mix(in srgb, var(--color-accent-strong) 78%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.treeItemDropAfter {
|
|
||||||
box-shadow: inset 0 -2px 0 color-mix(in srgb, var(--color-accent-strong) 78%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.treeItemDropInside {
|
|
||||||
border-color: color-mix(in srgb, var(--color-accent-strong) 55%, transparent);
|
|
||||||
background: color-mix(in srgb, var(--color-accent-soft) 36%, var(--color-surface));
|
|
||||||
color: var(--color-text);
|
|
||||||
box-shadow: inset 0 1px 0 color-mix(in srgb, white 4%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.folderChevron {
|
|
||||||
color: var(--color-text-muted);
|
|
||||||
transition: transform 160ms var(--easing-standard);
|
|
||||||
}
|
|
||||||
|
|
||||||
.folderChevronOpen {
|
|
||||||
transform: rotate(90deg);
|
|
||||||
}
|
|
||||||
|
|
||||||
.treeItemActive {
|
|
||||||
border-color: var(--color-border);
|
|
||||||
background: var(--color-surface);
|
|
||||||
color: var(--color-text);
|
|
||||||
box-shadow: inset 0 1px 0 color-mix(in srgb, white 4%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon {
|
|
||||||
color: inherit;
|
|
||||||
opacity: 0.85;
|
|
||||||
}
|
|
||||||
|
|
||||||
.label {
|
|
||||||
@include text-label;
|
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
|
display: grid;
|
||||||
|
gap: 0.05rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.itemMeta {
|
.projectItemDescription {
|
||||||
@include text-caption;
|
color: color-mix(in srgb, var(--color-text-muted) 84%, transparent);
|
||||||
color: var(--color-text-muted);
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 720px) {
|
|
||||||
.rootCompact .scrim,
|
|
||||||
.rootCompact .drawer {
|
|
||||||
width: min(18rem, calc(100vw - 5rem));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +1,8 @@
|
|||||||
// Path: Frontend/src/components/shell/ProjectSelector/ProjectSelector.tsx
|
// Path: Frontend/src/components/shell/ProjectSelector/ProjectSelector.tsx
|
||||||
|
|
||||||
import { For, Show, createEffect, createSignal, onCleanup, onMount, type JSX } from "solid-js";
|
import { For, createEffect, createSignal, onCleanup, onMount, type JSX } from "solid-js";
|
||||||
import { ChevronDown, ChevronRight, Folder, LayoutGrid } from "../../../lib/icons";
|
import { ChevronDown, Folder } from "../../../lib/icons";
|
||||||
import { ProjectContextMenu } from "../ProjectContextMenu/ProjectContextMenu";
|
|
||||||
import { useAppShellData } from "../data/app-shell.context";
|
import { useAppShellData } from "../data/app-shell.context";
|
||||||
import {
|
|
||||||
createProjectFolderTarget,
|
|
||||||
createProjectSurfaceTarget,
|
|
||||||
createProjectTarget,
|
|
||||||
type ProjectItem,
|
|
||||||
type ProjectMenuTarget,
|
|
||||||
} from "../data/shell.data";
|
|
||||||
import { createProjectContextMenuController } from "../ProjectContextMenu/createProjectContextMenuController";
|
|
||||||
import styles from "./ProjectSelector.module.scss";
|
import styles from "./ProjectSelector.module.scss";
|
||||||
|
|
||||||
type ProjectSelectorProps = {
|
type ProjectSelectorProps = {
|
||||||
@@ -21,621 +12,41 @@ type ProjectSelectorProps = {
|
|||||||
onClose: () => void;
|
onClose: () => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
type ProjectFolderNode = {
|
|
||||||
kind: "folder";
|
|
||||||
id: string;
|
|
||||||
label: string;
|
|
||||||
meta?: string;
|
|
||||||
children: ProjectTreeNode[];
|
|
||||||
};
|
|
||||||
|
|
||||||
type ProjectLeafNode = {
|
|
||||||
kind: "project";
|
|
||||||
item: ProjectItem;
|
|
||||||
};
|
|
||||||
|
|
||||||
type ProjectTreeNode = ProjectFolderNode | ProjectLeafNode;
|
|
||||||
|
|
||||||
type PendingProjectFolderDraft = {
|
|
||||||
parentId: string | null;
|
|
||||||
depth: number;
|
|
||||||
};
|
|
||||||
|
|
||||||
type ProjectDragTarget = {
|
|
||||||
parentId: string | null;
|
|
||||||
index: number;
|
|
||||||
intent: "before" | "after" | "inside";
|
|
||||||
targetNodeId?: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
type ProjectDragState = {
|
|
||||||
draggedNodeId: string;
|
|
||||||
dropTarget: ProjectDragTarget | null;
|
|
||||||
};
|
|
||||||
|
|
||||||
type ProjectNodeLocation = {
|
|
||||||
parentId: string | null;
|
|
||||||
index: number;
|
|
||||||
node: ProjectTreeNode;
|
|
||||||
};
|
|
||||||
|
|
||||||
const LONG_PRESS_MS = 320;
|
|
||||||
|
|
||||||
const createProjectFolderId = (): string => `project-folder-${Math.random().toString(36).slice(2, 10)}`;
|
|
||||||
|
|
||||||
const getProjectTreeNodeId = (node: ProjectTreeNode): string =>
|
|
||||||
node.kind === "folder" ? node.id : node.item.id;
|
|
||||||
|
|
||||||
const buildProjectTree = (items: readonly ProjectItem[]): ProjectTreeNode[] =>
|
|
||||||
items.map((item) => ({
|
|
||||||
kind: "project",
|
|
||||||
item,
|
|
||||||
}));
|
|
||||||
|
|
||||||
const cloneProjectTreeNode = (node: ProjectTreeNode): ProjectTreeNode => {
|
|
||||||
if (node.kind === "project") {
|
|
||||||
return {
|
|
||||||
kind: "project",
|
|
||||||
item: { ...node.item },
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
kind: "folder",
|
|
||||||
id: node.id,
|
|
||||||
label: node.label,
|
|
||||||
meta: node.meta,
|
|
||||||
children: node.children.map(cloneProjectTreeNode),
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
const insertProjectFolderNode = (
|
|
||||||
nodes: readonly ProjectTreeNode[],
|
|
||||||
parentId: string | null,
|
|
||||||
folder: ProjectFolderNode,
|
|
||||||
): ProjectTreeNode[] => {
|
|
||||||
if (parentId === null) {
|
|
||||||
return [...nodes, folder];
|
|
||||||
}
|
|
||||||
|
|
||||||
return nodes.map((node) => {
|
|
||||||
if (node.kind !== "folder") {
|
|
||||||
return node;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node.id === parentId) {
|
|
||||||
return {
|
|
||||||
...node,
|
|
||||||
children: [...node.children, folder],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
...node,
|
|
||||||
children: insertProjectFolderNode(node.children, parentId, folder),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const findProjectNodeLocation = (
|
|
||||||
nodes: readonly ProjectTreeNode[],
|
|
||||||
nodeId: string,
|
|
||||||
parentId: string | null = null,
|
|
||||||
): ProjectNodeLocation | null => {
|
|
||||||
for (let index = 0; index < nodes.length; index += 1) {
|
|
||||||
const node = nodes[index];
|
|
||||||
|
|
||||||
if (getProjectTreeNodeId(node) === nodeId) {
|
|
||||||
return { parentId, index, node };
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node.kind === "folder") {
|
|
||||||
const nestedLocation = findProjectNodeLocation(node.children, nodeId, node.id);
|
|
||||||
|
|
||||||
if (nestedLocation) {
|
|
||||||
return nestedLocation;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
};
|
|
||||||
|
|
||||||
const findProjectNodeDepth = (nodes: readonly ProjectTreeNode[], nodeId: string, depth = 0): number | null => {
|
|
||||||
for (const node of nodes) {
|
|
||||||
if (getProjectTreeNodeId(node) === nodeId) {
|
|
||||||
return depth;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node.kind === "folder") {
|
|
||||||
const nestedDepth = findProjectNodeDepth(node.children, nodeId, depth + 1);
|
|
||||||
|
|
||||||
if (nestedDepth !== null) {
|
|
||||||
return nestedDepth;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
};
|
|
||||||
|
|
||||||
const projectTreeContainsNode = (nodes: readonly ProjectTreeNode[], nodeId: string): boolean => {
|
|
||||||
for (const node of nodes) {
|
|
||||||
if (getProjectTreeNodeId(node) === nodeId) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node.kind === "folder" && projectTreeContainsNode(node.children, nodeId)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
|
|
||||||
const removeProjectTreeNode = (
|
|
||||||
nodes: readonly ProjectTreeNode[],
|
|
||||||
nodeId: string,
|
|
||||||
): { nodes: ProjectTreeNode[]; removed: ProjectTreeNode | null } => {
|
|
||||||
const nextNodes: ProjectTreeNode[] = [];
|
|
||||||
let removed: ProjectTreeNode | null = null;
|
|
||||||
|
|
||||||
for (const node of nodes) {
|
|
||||||
if (getProjectTreeNodeId(node) === nodeId) {
|
|
||||||
removed = node;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node.kind === "folder") {
|
|
||||||
const result = removeProjectTreeNode(node.children, nodeId);
|
|
||||||
|
|
||||||
if (result.removed) {
|
|
||||||
removed = result.removed;
|
|
||||||
nextNodes.push({
|
|
||||||
...node,
|
|
||||||
children: result.nodes,
|
|
||||||
});
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
nextNodes.push(node);
|
|
||||||
}
|
|
||||||
|
|
||||||
return { nodes: nextNodes, removed };
|
|
||||||
};
|
|
||||||
|
|
||||||
const insertProjectTreeNode = (
|
|
||||||
nodes: readonly ProjectTreeNode[],
|
|
||||||
parentId: string | null,
|
|
||||||
index: number,
|
|
||||||
nodeToInsert: ProjectTreeNode,
|
|
||||||
): ProjectTreeNode[] => {
|
|
||||||
if (parentId === null) {
|
|
||||||
const nextNodes = [...nodes];
|
|
||||||
nextNodes.splice(Math.max(0, Math.min(index, nextNodes.length)), 0, nodeToInsert);
|
|
||||||
return nextNodes;
|
|
||||||
}
|
|
||||||
|
|
||||||
return nodes.map((node) => {
|
|
||||||
if (node.kind !== "folder") {
|
|
||||||
return node;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node.id === parentId) {
|
|
||||||
const nextChildren = [...node.children];
|
|
||||||
nextChildren.splice(Math.max(0, Math.min(index, nextChildren.length)), 0, nodeToInsert);
|
|
||||||
return {
|
|
||||||
...node,
|
|
||||||
children: nextChildren,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
...node,
|
|
||||||
children: insertProjectTreeNode(node.children, parentId, index, nodeToInsert),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const moveProjectTreeNode = (
|
|
||||||
nodes: readonly ProjectTreeNode[],
|
|
||||||
draggedNodeId: string,
|
|
||||||
dropTarget: ProjectDragTarget,
|
|
||||||
): ProjectTreeNode[] => {
|
|
||||||
const location = findProjectNodeLocation(nodes, draggedNodeId);
|
|
||||||
|
|
||||||
if (!location) {
|
|
||||||
return [...nodes];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (
|
|
||||||
location.node.kind === "folder" &&
|
|
||||||
dropTarget.parentId !== null &&
|
|
||||||
(projectTreeContainsNode(location.node.children, dropTarget.parentId) || dropTarget.parentId === location.node.id)
|
|
||||||
) {
|
|
||||||
return [...nodes];
|
|
||||||
}
|
|
||||||
|
|
||||||
let normalizedIndex = dropTarget.index;
|
|
||||||
|
|
||||||
if (dropTarget.parentId === location.parentId && dropTarget.index > location.index) {
|
|
||||||
normalizedIndex -= 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dropTarget.parentId === location.parentId && normalizedIndex === location.index) {
|
|
||||||
return [...nodes];
|
|
||||||
}
|
|
||||||
|
|
||||||
const removalResult = removeProjectTreeNode(nodes, draggedNodeId);
|
|
||||||
|
|
||||||
if (!removalResult.removed) {
|
|
||||||
return [...nodes];
|
|
||||||
}
|
|
||||||
|
|
||||||
return insertProjectTreeNode(removalResult.nodes, dropTarget.parentId, normalizedIndex, removalResult.removed);
|
|
||||||
};
|
|
||||||
|
|
||||||
const ProjectFolderDraftRow = (props: {
|
|
||||||
depth: number;
|
|
||||||
value: string;
|
|
||||||
onInput: (value: string) => void;
|
|
||||||
onSubmit: () => void;
|
|
||||||
onCancel: () => void;
|
|
||||||
}): JSX.Element => {
|
|
||||||
let inputRef: HTMLInputElement | undefined;
|
|
||||||
|
|
||||||
queueMicrotask(() => inputRef?.focus());
|
|
||||||
|
|
||||||
return (
|
|
||||||
<li>
|
|
||||||
<div class={styles.treeInputRow} style={{ "--tree-depth": String(props.depth) }}>
|
|
||||||
<Folder class={styles.icon} size={18} strokeWidth={2} />
|
|
||||||
<input
|
|
||||||
ref={inputRef}
|
|
||||||
type="text"
|
|
||||||
class={styles.treeInput}
|
|
||||||
value={props.value}
|
|
||||||
placeholder="Folder name"
|
|
||||||
onInput={(event): void => props.onInput(event.currentTarget.value)}
|
|
||||||
onBlur={props.onSubmit}
|
|
||||||
onKeyDown={(event): void => {
|
|
||||||
if (event.key === "Enter") {
|
|
||||||
event.preventDefault();
|
|
||||||
event.currentTarget.blur();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (event.key === "Escape") {
|
|
||||||
event.preventDefault();
|
|
||||||
props.onCancel();
|
|
||||||
event.currentTarget.blur();
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const ProjectFolderBranch = (props: {
|
|
||||||
nodes: readonly ProjectTreeNode[];
|
|
||||||
depth: number;
|
|
||||||
parentId: string | null;
|
|
||||||
selectedProjectId: string;
|
|
||||||
isFolderCollapsed: (folderId: string) => boolean;
|
|
||||||
onToggleFolder: (folderId: string) => void;
|
|
||||||
onSelectProject: (projectId: string) => void;
|
|
||||||
onOpenFolderMenu: (event: MouseEvent, folder: ProjectFolderNode) => void;
|
|
||||||
onOpenProjectMenu: (event: MouseEvent, item: ProjectItem) => void;
|
|
||||||
onNodePointerDown: (event: PointerEvent, nodeId: string) => void;
|
|
||||||
onNodePointerMove: (event: PointerEvent, parentId: string | null, index: number, node: ProjectTreeNode) => void;
|
|
||||||
pendingFolderDraft: PendingProjectFolderDraft | null;
|
|
||||||
pendingFolderName: string;
|
|
||||||
onPendingFolderNameChange: (value: string) => void;
|
|
||||||
onSubmitPendingFolder: () => void;
|
|
||||||
onCancelPendingFolder: () => void;
|
|
||||||
dragState: ProjectDragState | null;
|
|
||||||
}): JSX.Element => (
|
|
||||||
<ul class={styles.treeList} role="list">
|
|
||||||
<Show when={props.nodes.length === 0 && props.pendingFolderDraft?.parentId !== props.parentId}>
|
|
||||||
<li>
|
|
||||||
<div class={styles.treeEmptySlot} style={{ "--tree-depth": String(props.depth) }} />
|
|
||||||
</li>
|
|
||||||
</Show>
|
|
||||||
|
|
||||||
<For each={props.nodes}>
|
|
||||||
{(node, indexAccessor): JSX.Element => {
|
|
||||||
const nodeId = (): string => getProjectTreeNodeId(node);
|
|
||||||
const isDraggedNode = (): boolean => props.dragState?.draggedNodeId === nodeId();
|
|
||||||
const dropIntent = (): ProjectDragTarget["intent"] | null => {
|
|
||||||
if (props.dragState?.dropTarget?.targetNodeId !== nodeId()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return props.dragState.dropTarget.intent;
|
|
||||||
};
|
|
||||||
|
|
||||||
if (node.kind === "folder") {
|
|
||||||
const isCollapsed = (): boolean => props.isFolderCollapsed(node.id);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<li>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
classList={{
|
|
||||||
[styles.treeItem]: true,
|
|
||||||
[styles.treeItemFolder]: true,
|
|
||||||
[styles.treeItemDragging]: isDraggedNode(),
|
|
||||||
[styles.treeItemDropBefore]: dropIntent() === "before",
|
|
||||||
[styles.treeItemDropAfter]: dropIntent() === "after",
|
|
||||||
[styles.treeItemDropInside]: dropIntent() === "inside",
|
|
||||||
}}
|
|
||||||
style={{ "--tree-depth": String(props.depth) }}
|
|
||||||
aria-expanded={!isCollapsed()}
|
|
||||||
onClick={() => {
|
|
||||||
if (props.dragState || suppressNextTreeClick()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
props.onToggleFolder(node.id);
|
|
||||||
}}
|
|
||||||
onContextMenu={(event): void => props.onOpenFolderMenu(event, node)}
|
|
||||||
onPointerDown={(event): void => props.onNodePointerDown(event, node.id)}
|
|
||||||
onPointerMove={(event): void =>
|
|
||||||
props.onNodePointerMove(event, props.parentId, indexAccessor(), node)
|
|
||||||
}
|
|
||||||
onPointerEnter={(event): void =>
|
|
||||||
props.onNodePointerMove(event, props.parentId, indexAccessor(), node)
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<ChevronRight
|
|
||||||
classList={{
|
|
||||||
[styles.folderChevron]: true,
|
|
||||||
[styles.folderChevronOpen]: !isCollapsed(),
|
|
||||||
}}
|
|
||||||
size={16}
|
|
||||||
strokeWidth={2}
|
|
||||||
/>
|
|
||||||
<Folder class={styles.icon} size={18} strokeWidth={2} />
|
|
||||||
<span class={styles.label}>{node.label}</span>
|
|
||||||
<Show when={node.meta}>
|
|
||||||
<span class={styles.itemMeta}>{node.meta}</span>
|
|
||||||
</Show>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<Show when={!isCollapsed() && (node.children.length > 0 || props.pendingFolderDraft?.parentId === node.id)}>
|
|
||||||
<ProjectFolderBranch
|
|
||||||
nodes={node.children}
|
|
||||||
depth={props.depth + 1}
|
|
||||||
parentId={node.id}
|
|
||||||
selectedProjectId={props.selectedProjectId}
|
|
||||||
isFolderCollapsed={props.isFolderCollapsed}
|
|
||||||
onToggleFolder={props.onToggleFolder}
|
|
||||||
onSelectProject={props.onSelectProject}
|
|
||||||
onOpenFolderMenu={props.onOpenFolderMenu}
|
|
||||||
onOpenProjectMenu={props.onOpenProjectMenu}
|
|
||||||
onNodePointerDown={props.onNodePointerDown}
|
|
||||||
onNodePointerMove={props.onNodePointerMove}
|
|
||||||
pendingFolderDraft={props.pendingFolderDraft}
|
|
||||||
pendingFolderName={props.pendingFolderName}
|
|
||||||
onPendingFolderNameChange={props.onPendingFolderNameChange}
|
|
||||||
onSubmitPendingFolder={props.onSubmitPendingFolder}
|
|
||||||
onCancelPendingFolder={props.onCancelPendingFolder}
|
|
||||||
dragState={props.dragState}
|
|
||||||
/>
|
|
||||||
</Show>
|
|
||||||
</li>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<li>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
classList={{
|
|
||||||
[styles.treeItem]: true,
|
|
||||||
[styles.treeItemActive]: props.selectedProjectId === node.item.id,
|
|
||||||
[styles.treeItemDragging]: isDraggedNode(),
|
|
||||||
[styles.treeItemDropBefore]: dropIntent() === "before",
|
|
||||||
[styles.treeItemDropAfter]: dropIntent() === "after",
|
|
||||||
}}
|
|
||||||
style={{ "--tree-depth": String(props.depth) }}
|
|
||||||
onClick={(): void => {
|
|
||||||
if (props.dragState || suppressNextTreeClick()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
props.onSelectProject(node.item.id);
|
|
||||||
}}
|
|
||||||
onContextMenu={(event): void => props.onOpenProjectMenu(event, node.item)}
|
|
||||||
onPointerDown={(event): void => props.onNodePointerDown(event, node.item.id)}
|
|
||||||
onPointerMove={(event): void =>
|
|
||||||
props.onNodePointerMove(event, props.parentId, indexAccessor(), node)
|
|
||||||
}
|
|
||||||
onPointerEnter={(event): void =>
|
|
||||||
props.onNodePointerMove(event, props.parentId, indexAccessor(), node)
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<LayoutGrid class={styles.icon} size={18} strokeWidth={2} />
|
|
||||||
<span class={styles.label}>{node.item.name}</span>
|
|
||||||
<Show when={node.item.meta}>
|
|
||||||
<span class={styles.itemMeta}>{node.item.meta}</span>
|
|
||||||
</Show>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
);
|
|
||||||
}}
|
|
||||||
</For>
|
|
||||||
|
|
||||||
<Show when={props.pendingFolderDraft?.parentId === props.parentId}>
|
|
||||||
<ProjectFolderDraftRow
|
|
||||||
depth={props.pendingFolderDraft?.depth ?? props.depth}
|
|
||||||
value={props.pendingFolderName}
|
|
||||||
onInput={props.onPendingFolderNameChange}
|
|
||||||
onSubmit={props.onSubmitPendingFolder}
|
|
||||||
onCancel={props.onCancelPendingFolder}
|
|
||||||
/>
|
|
||||||
</Show>
|
|
||||||
</ul>
|
|
||||||
);
|
|
||||||
|
|
||||||
export const ProjectSelector = (props: ProjectSelectorProps): JSX.Element => {
|
export const ProjectSelector = (props: ProjectSelectorProps): JSX.Element => {
|
||||||
const appShellData = useAppShellData();
|
const appShellData = useAppShellData();
|
||||||
const [selectedProject, setSelectedProject] = createSignal(appShellData.activeProject());
|
const [selectedProject, setSelectedProject] = createSignal(appShellData.activeProject());
|
||||||
const [drawerTop, setDrawerTop] = createSignal<number>(0);
|
const [drawerTop, setDrawerTop] = createSignal<number>(0);
|
||||||
const [collapsedFolderIds, setCollapsedFolderIds] = createSignal<readonly string[]>([]);
|
|
||||||
const [projectTreeNodes, setProjectTreeNodes] = createSignal<ProjectTreeNode[]>(
|
|
||||||
buildProjectTree(appShellData.projectItems()),
|
|
||||||
);
|
|
||||||
const [pendingFolderDraft, setPendingFolderDraft] = createSignal<PendingProjectFolderDraft | null>(null);
|
|
||||||
const [pendingFolderName, setPendingFolderName] = createSignal("");
|
|
||||||
const [dragState, setDragState] = createSignal<ProjectDragState | null>(null);
|
|
||||||
const [suppressNextTreeClick, setSuppressNextTreeClick] = createSignal(false);
|
|
||||||
let rootRef: HTMLDivElement | undefined;
|
|
||||||
let triggerRef: HTMLButtonElement | undefined;
|
let triggerRef: HTMLButtonElement | undefined;
|
||||||
let contextMenuRef: HTMLDivElement | undefined;
|
|
||||||
let longPressTimer: number | undefined;
|
|
||||||
let suppressClickTimer: number | undefined;
|
|
||||||
const contextMenu = createProjectContextMenuController();
|
|
||||||
|
|
||||||
const clearLongPressTimer = (): void => {
|
|
||||||
if (longPressTimer !== undefined) {
|
|
||||||
window.clearTimeout(longPressTimer);
|
|
||||||
longPressTimer = undefined;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const suppressTreeClickTemporarily = (): void => {
|
|
||||||
setSuppressNextTreeClick(true);
|
|
||||||
|
|
||||||
if (suppressClickTimer !== undefined) {
|
|
||||||
window.clearTimeout(suppressClickTimer);
|
|
||||||
}
|
|
||||||
|
|
||||||
suppressClickTimer = window.setTimeout(() => {
|
|
||||||
setSuppressNextTreeClick(false);
|
|
||||||
suppressClickTimer = undefined;
|
|
||||||
}, 80);
|
|
||||||
};
|
|
||||||
|
|
||||||
const isFolderCollapsed = (folderId: string): boolean => collapsedFolderIds().includes(folderId);
|
|
||||||
|
|
||||||
const toggleFolder = (folderId: string): void => {
|
|
||||||
setCollapsedFolderIds((current) =>
|
|
||||||
current.includes(folderId) ? current.filter((id) => id !== folderId) : [...current, folderId],
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
createEffect(() => {
|
createEffect(() => {
|
||||||
setSelectedProject(appShellData.activeProject());
|
setSelectedProject(appShellData.activeProject());
|
||||||
});
|
});
|
||||||
|
|
||||||
createEffect(() => {
|
|
||||||
setProjectTreeNodes(buildProjectTree(appShellData.projectItems()));
|
|
||||||
setCollapsedFolderIds([]);
|
|
||||||
setPendingFolderDraft(null);
|
|
||||||
setPendingFolderName("");
|
|
||||||
setDragState(null);
|
|
||||||
});
|
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
if (triggerRef) {
|
if (!triggerRef) {
|
||||||
const updateDrawerTop = (): void => {
|
return;
|
||||||
if (!triggerRef) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setDrawerTop(triggerRef.offsetTop + triggerRef.offsetHeight + 8);
|
|
||||||
};
|
|
||||||
|
|
||||||
updateDrawerTop();
|
|
||||||
|
|
||||||
const observer = new ResizeObserver(() => {
|
|
||||||
updateDrawerTop();
|
|
||||||
});
|
|
||||||
|
|
||||||
observer.observe(triggerRef);
|
|
||||||
window.addEventListener("resize", updateDrawerTop);
|
|
||||||
|
|
||||||
onCleanup(() => {
|
|
||||||
observer.disconnect();
|
|
||||||
window.removeEventListener("resize", updateDrawerTop);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const handlePointerDown = (event: PointerEvent): void => {
|
const updateDrawerTop = (): void => {
|
||||||
if (!props.isOpen || !rootRef) {
|
if (!triggerRef) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const target = event.target;
|
setDrawerTop(triggerRef.offsetTop + triggerRef.offsetHeight);
|
||||||
|
|
||||||
if (target instanceof Node && rootRef.contains(target)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (target instanceof Node && contextMenuRef?.contains(target)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
props.onClose();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const handlePointerUp = (): void => {
|
updateDrawerTop();
|
||||||
clearLongPressTimer();
|
|
||||||
|
|
||||||
const nextDragState = dragState();
|
const observer = new ResizeObserver(() => {
|
||||||
|
updateDrawerTop();
|
||||||
|
});
|
||||||
|
|
||||||
if (!nextDragState?.dropTarget) {
|
observer.observe(triggerRef);
|
||||||
if (nextDragState) {
|
window.addEventListener("resize", updateDrawerTop);
|
||||||
suppressTreeClickTemporarily();
|
|
||||||
}
|
|
||||||
setDragState(null);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
suppressTreeClickTemporarily();
|
|
||||||
setProjectTreeNodes((current) =>
|
|
||||||
moveProjectTreeNode(current, nextDragState.draggedNodeId, nextDragState.dropTarget as ProjectDragTarget),
|
|
||||||
);
|
|
||||||
setDragState(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleEscape = (event: KeyboardEvent): void => {
|
|
||||||
if (event.key !== "Escape") {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
clearLongPressTimer();
|
|
||||||
|
|
||||||
if (dragState()) {
|
|
||||||
setDragState(null);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!props.isOpen) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
props.onClose();
|
|
||||||
triggerRef?.focus();
|
|
||||||
};
|
|
||||||
|
|
||||||
document.addEventListener("pointerdown", handlePointerDown);
|
|
||||||
window.addEventListener("pointerup", handlePointerUp);
|
|
||||||
window.addEventListener("pointercancel", handlePointerUp);
|
|
||||||
window.addEventListener("keydown", handleEscape);
|
|
||||||
|
|
||||||
onCleanup(() => {
|
onCleanup(() => {
|
||||||
clearLongPressTimer();
|
observer.disconnect();
|
||||||
if (suppressClickTimer !== undefined) {
|
window.removeEventListener("resize", updateDrawerTop);
|
||||||
window.clearTimeout(suppressClickTimer);
|
|
||||||
}
|
|
||||||
document.removeEventListener("pointerdown", handlePointerDown);
|
|
||||||
window.removeEventListener("pointerup", handlePointerUp);
|
|
||||||
window.removeEventListener("pointercancel", handlePointerUp);
|
|
||||||
window.removeEventListener("keydown", handleEscape);
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -649,163 +60,27 @@ export const ProjectSelector = (props: ProjectSelectorProps): JSX.Element => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const selectProject = (projectId: string): void => {
|
const selectProject = (projectId: string): void => {
|
||||||
const location = findProjectNodeLocation(projectTreeNodes(), projectId);
|
const nextProject = appShellData.projectItems().find((item): boolean => item.id === projectId);
|
||||||
|
|
||||||
if (!location || location.node.kind !== "project") {
|
if (!nextProject) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
setSelectedProject({ id: location.node.item.id, name: location.node.item.name });
|
setSelectedProject({ id: nextProject.id, name: nextProject.name });
|
||||||
props.onClose();
|
props.onClose();
|
||||||
};
|
};
|
||||||
|
|
||||||
const beginFolderDraft = (parentId: string | null, depth: number): void => {
|
|
||||||
if (parentId) {
|
|
||||||
setCollapsedFolderIds((current) => current.filter((id) => id !== parentId));
|
|
||||||
}
|
|
||||||
|
|
||||||
setPendingFolderName("");
|
|
||||||
setPendingFolderDraft({ parentId, depth });
|
|
||||||
};
|
|
||||||
|
|
||||||
const submitPendingFolder = (): void => {
|
|
||||||
const name = pendingFolderName().trim();
|
|
||||||
const draft = pendingFolderDraft();
|
|
||||||
|
|
||||||
if (!draft) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!name) {
|
|
||||||
setPendingFolderDraft(null);
|
|
||||||
setPendingFolderName("");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setProjectTreeNodes((current) =>
|
|
||||||
insertProjectFolderNode(current, draft.parentId, {
|
|
||||||
kind: "folder",
|
|
||||||
id: createProjectFolderId(),
|
|
||||||
label: name,
|
|
||||||
children: [],
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
setPendingFolderDraft(null);
|
|
||||||
setPendingFolderName("");
|
|
||||||
};
|
|
||||||
|
|
||||||
const cancelPendingFolder = (): void => {
|
|
||||||
setPendingFolderDraft(null);
|
|
||||||
setPendingFolderName("");
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleContextActionSelect = (action: { id: string; label: string }, target: ProjectMenuTarget): void => {
|
|
||||||
if (action.id !== "new-folder") {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (target.kind) {
|
|
||||||
case "surface":
|
|
||||||
beginFolderDraft(null, 0);
|
|
||||||
return;
|
|
||||||
case "folder":
|
|
||||||
beginFolderDraft(target.id, (findProjectNodeDepth(projectTreeNodes(), target.id) ?? 0) + 1);
|
|
||||||
return;
|
|
||||||
case "project": {
|
|
||||||
const parentId = findProjectNodeLocation(projectTreeNodes(), target.id)?.parentId ?? null;
|
|
||||||
beginFolderDraft(parentId, parentId ? (findProjectNodeDepth(projectTreeNodes(), parentId) ?? 0) + 1 : 0);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleSurfaceContextMenu = (event: MouseEvent): void => {
|
|
||||||
event.stopPropagation();
|
|
||||||
contextMenu.openMenu(event, createProjectSurfaceTarget("Projects"));
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleNodePointerDown = (event: PointerEvent, nodeId: string): void => {
|
|
||||||
if (event.button !== 0 || pendingFolderDraft()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
clearLongPressTimer();
|
|
||||||
longPressTimer = window.setTimeout(() => {
|
|
||||||
suppressTreeClickTemporarily();
|
|
||||||
setDragState({ draggedNodeId: nodeId, dropTarget: null });
|
|
||||||
}, LONG_PRESS_MS);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleNodePointerMove = (
|
|
||||||
event: PointerEvent,
|
|
||||||
parentId: string | null,
|
|
||||||
index: number,
|
|
||||||
node: ProjectTreeNode,
|
|
||||||
): void => {
|
|
||||||
const nextDragState = dragState();
|
|
||||||
|
|
||||||
if (!nextDragState) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nextDragState.draggedNodeId === getProjectTreeNodeId(node)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const bounds = event.currentTarget.getBoundingClientRect();
|
|
||||||
const relativeY = bounds.height <= 0 ? 0.5 : (event.clientY - bounds.top) / bounds.height;
|
|
||||||
let nextTarget: ProjectDragTarget;
|
|
||||||
|
|
||||||
if (node.kind === "folder") {
|
|
||||||
if (relativeY < 0.28) {
|
|
||||||
nextTarget = {
|
|
||||||
parentId,
|
|
||||||
index,
|
|
||||||
intent: "before",
|
|
||||||
targetNodeId: node.id,
|
|
||||||
};
|
|
||||||
} else if (relativeY > 0.72) {
|
|
||||||
nextTarget = {
|
|
||||||
parentId,
|
|
||||||
index: index + 1,
|
|
||||||
intent: "after",
|
|
||||||
targetNodeId: node.id,
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
nextTarget = {
|
|
||||||
parentId: node.id,
|
|
||||||
index: node.children.length,
|
|
||||||
intent: "inside",
|
|
||||||
targetNodeId: node.id,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
nextTarget = {
|
|
||||||
parentId,
|
|
||||||
index: relativeY < 0.5 ? index : index + 1,
|
|
||||||
intent: relativeY < 0.5 ? "before" : "after",
|
|
||||||
targetNodeId: node.item.id,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
setDragState({
|
|
||||||
...nextDragState,
|
|
||||||
dropTarget: nextTarget,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
ref={rootRef}
|
|
||||||
classList={{
|
classList={{
|
||||||
[styles.root]: true,
|
[styles.root]: true,
|
||||||
[styles.rootCompact]: !!props.compact,
|
[styles.rootCompact]: !!props.compact,
|
||||||
[styles.rootDragMode]: !!dragState(),
|
|
||||||
}}
|
}}
|
||||||
style={{
|
style={{
|
||||||
"--project-drawer-top": `${drawerTop()}px`,
|
"--project-drawer-top": `${drawerTop()}px`,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
{/* Project trigger */}
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
ref={triggerRef}
|
ref={triggerRef}
|
||||||
@@ -814,9 +89,8 @@ export const ProjectSelector = (props: ProjectSelectorProps): JSX.Element => {
|
|||||||
[styles.triggerCompact]: !!props.compact,
|
[styles.triggerCompact]: !!props.compact,
|
||||||
[styles.triggerOpen]: props.isOpen,
|
[styles.triggerOpen]: props.isOpen,
|
||||||
}}
|
}}
|
||||||
aria-label={`Open project menu for ${selectedProject().name}`}
|
aria-label={`Open left workspace sidebar menu for ${selectedProject().name}`}
|
||||||
aria-expanded={props.isOpen}
|
aria-expanded={props.isOpen}
|
||||||
aria-haspopup="menu"
|
|
||||||
title={selectedProject().name}
|
title={selectedProject().name}
|
||||||
onClick={toggleOpen}
|
onClick={toggleOpen}
|
||||||
>
|
>
|
||||||
@@ -839,75 +113,54 @@ export const ProjectSelector = (props: ProjectSelectorProps): JSX.Element => {
|
|||||||
/>
|
/>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<Show when={props.isOpen}>
|
{/* Outside-click scrim */}
|
||||||
<>
|
<button
|
||||||
<button
|
type="button"
|
||||||
type="button"
|
classList={{
|
||||||
classList={{
|
[styles.scrim]: true,
|
||||||
[styles.scrim]: true,
|
[styles.scrimOpen]: props.isOpen,
|
||||||
[styles.scrimOpen]: props.isOpen,
|
|
||||||
}}
|
|
||||||
aria-hidden={!props.isOpen}
|
|
||||||
tabIndex={props.isOpen ? 0 : -1}
|
|
||||||
onClick={props.onClose}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<div
|
|
||||||
classList={{
|
|
||||||
[styles.drawer]: true,
|
|
||||||
[styles.drawerOpen]: props.isOpen,
|
|
||||||
}}
|
|
||||||
aria-hidden={!props.isOpen}
|
|
||||||
onContextMenu={handleSurfaceContextMenu}
|
|
||||||
>
|
|
||||||
<div class={styles.drawerBody}>
|
|
||||||
<Show when={!props.compact}>
|
|
||||||
<div class={styles.treeSectionLabel}>Projects</div>
|
|
||||||
</Show>
|
|
||||||
|
|
||||||
<ProjectFolderBranch
|
|
||||||
nodes={projectTreeNodes()}
|
|
||||||
depth={0}
|
|
||||||
parentId={null}
|
|
||||||
selectedProjectId={selectedProject().id}
|
|
||||||
isFolderCollapsed={isFolderCollapsed}
|
|
||||||
onToggleFolder={toggleFolder}
|
|
||||||
onSelectProject={selectProject}
|
|
||||||
onOpenFolderMenu={(event, folder): void => {
|
|
||||||
event.stopPropagation();
|
|
||||||
contextMenu.openMenu(event, createProjectFolderTarget(folder.id, folder.label));
|
|
||||||
}}
|
|
||||||
onOpenProjectMenu={(event, item): void => {
|
|
||||||
event.stopPropagation();
|
|
||||||
contextMenu.openMenu(event, createProjectTarget(item));
|
|
||||||
}}
|
|
||||||
onNodePointerDown={handleNodePointerDown}
|
|
||||||
onNodePointerMove={handleNodePointerMove}
|
|
||||||
pendingFolderDraft={pendingFolderDraft()}
|
|
||||||
pendingFolderName={pendingFolderName()}
|
|
||||||
onPendingFolderNameChange={setPendingFolderName}
|
|
||||||
onSubmitPendingFolder={submitPendingFolder}
|
|
||||||
onCancelPendingFolder={cancelPendingFolder}
|
|
||||||
dragState={dragState()}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
</Show>
|
|
||||||
|
|
||||||
<ProjectContextMenu
|
|
||||||
target={contextMenu.menuState()?.target ?? null}
|
|
||||||
position={(() => {
|
|
||||||
const state = contextMenu.menuState();
|
|
||||||
return state ? { x: state.x, y: state.y } : null;
|
|
||||||
})()}
|
|
||||||
menuRef={(element) => {
|
|
||||||
contextMenuRef = element;
|
|
||||||
contextMenu.setMenuRef(element);
|
|
||||||
}}
|
}}
|
||||||
onClose={contextMenu.closeMenu}
|
aria-hidden={!props.isOpen}
|
||||||
onSelect={handleContextActionSelect}
|
tabIndex={props.isOpen ? 0 : -1}
|
||||||
|
onClick={props.onClose}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
{/* Slide-out project list */}
|
||||||
|
<div
|
||||||
|
classList={{
|
||||||
|
[styles.drawer]: true,
|
||||||
|
[styles.drawerOpen]: props.isOpen,
|
||||||
|
}}
|
||||||
|
aria-hidden={!props.isOpen}
|
||||||
|
>
|
||||||
|
<div class={styles.drawerBody}>
|
||||||
|
<ul class={styles.projectList} role="list">
|
||||||
|
<For each={appShellData.projectItems()}>
|
||||||
|
{(item): JSX.Element => {
|
||||||
|
const isSelected = (): boolean => selectedProject().id === item.id;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<li>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
classList={{
|
||||||
|
[styles.projectItem]: true,
|
||||||
|
[styles.projectItemActive]: isSelected(),
|
||||||
|
}}
|
||||||
|
onClick={(): void => selectProject(item.id)}
|
||||||
|
>
|
||||||
|
<span class={styles.projectItemCopy}>
|
||||||
|
<span class={styles.projectItemName}>{item.name}</span>
|
||||||
|
<span class={styles.projectItemDescription}>{item.description}</span>
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
</For>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -12,15 +12,6 @@
|
|||||||
isolation: isolate;
|
isolation: isolate;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sidebarDragMode {
|
|
||||||
user-select: none;
|
|
||||||
cursor: grabbing;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebarDragMode .treeItem {
|
|
||||||
cursor: grabbing;
|
|
||||||
}
|
|
||||||
|
|
||||||
.header {
|
.header {
|
||||||
display: grid;
|
display: grid;
|
||||||
gap: var(--space-3);
|
gap: var(--space-3);
|
||||||
@@ -132,43 +123,6 @@
|
|||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.treeEmptySlot {
|
|
||||||
min-height: calc(var(--control-size-lg) - var(--space-2));
|
|
||||||
padding-left: calc(var(--space-3) + (var(--tree-depth, 0) * var(--space-4)));
|
|
||||||
border-radius: var(--radius-lg);
|
|
||||||
border: 1px dashed color-mix(in srgb, var(--color-border) 38%, transparent);
|
|
||||||
opacity: 0.35;
|
|
||||||
}
|
|
||||||
|
|
||||||
.treeInputRow {
|
|
||||||
width: 100%;
|
|
||||||
min-width: 0;
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: auto minmax(0, 1fr);
|
|
||||||
align-items: center;
|
|
||||||
gap: var(--space-2);
|
|
||||||
min-height: calc(var(--control-size-lg) - var(--space-2));
|
|
||||||
padding: var(--space-2) var(--space-3);
|
|
||||||
padding-left: calc(var(--space-3) + (var(--tree-depth, 0) * var(--space-4)));
|
|
||||||
border: 1px solid color-mix(in srgb, var(--color-border) 42%, transparent);
|
|
||||||
border-radius: var(--radius-lg);
|
|
||||||
background: color-mix(in srgb, var(--color-surface) 94%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.treeInput {
|
|
||||||
width: 100%;
|
|
||||||
min-width: 0;
|
|
||||||
border: 0;
|
|
||||||
background: transparent;
|
|
||||||
color: var(--color-text);
|
|
||||||
font: inherit;
|
|
||||||
outline: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.treeInput::placeholder {
|
|
||||||
color: var(--color-text-muted);
|
|
||||||
}
|
|
||||||
|
|
||||||
.navItem {
|
.navItem {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
@@ -187,7 +141,7 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: auto auto minmax(0, 1fr) auto;
|
grid-template-columns: auto minmax(0, 1fr) auto;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: var(--space-2);
|
gap: var(--space-2);
|
||||||
min-height: calc(var(--control-size-lg) - var(--space-2));
|
min-height: calc(var(--control-size-lg) - var(--space-2));
|
||||||
@@ -202,51 +156,19 @@
|
|||||||
background 160ms var(--easing-standard),
|
background 160ms var(--easing-standard),
|
||||||
color 160ms var(--easing-standard),
|
color 160ms var(--easing-standard),
|
||||||
border-color 160ms var(--easing-standard),
|
border-color 160ms var(--easing-standard),
|
||||||
box-shadow 160ms var(--easing-standard),
|
|
||||||
transform 180ms var(--easing-standard);
|
transform 180ms var(--easing-standard);
|
||||||
}
|
}
|
||||||
|
|
||||||
.treeItem:hover,
|
.treeItem:hover,
|
||||||
.treeItem:focus-visible {
|
.treeItem:focus-visible {
|
||||||
background: color-mix(in srgb, var(--color-surface-hover) 80%, var(--color-accent-soft) 20%);
|
background: var(--color-surface-hover);
|
||||||
color: var(--color-text);
|
color: var(--color-text);
|
||||||
box-shadow: inset 0 1px 0 color-mix(in srgb, white 4%, transparent);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.treeItemFolder {
|
.treeItemFolder {
|
||||||
color: var(--color-text);
|
color: var(--color-text);
|
||||||
}
|
}
|
||||||
|
|
||||||
.treeItemDragging {
|
|
||||||
opacity: 0.45;
|
|
||||||
transform: scale(0.985);
|
|
||||||
box-shadow: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.treeItemDropBefore {
|
|
||||||
box-shadow: inset 0 2px 0 color-mix(in srgb, var(--color-accent-strong) 78%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.treeItemDropAfter {
|
|
||||||
box-shadow: inset 0 -2px 0 color-mix(in srgb, var(--color-accent-strong) 78%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.treeItemDropInside {
|
|
||||||
border-color: color-mix(in srgb, var(--color-accent-strong) 55%, transparent);
|
|
||||||
background: color-mix(in srgb, var(--color-accent-soft) 36%, var(--color-surface));
|
|
||||||
color: var(--color-text);
|
|
||||||
box-shadow: inset 0 1px 0 color-mix(in srgb, white 4%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.folderChevron {
|
|
||||||
color: var(--color-text-muted);
|
|
||||||
transition: transform 160ms var(--easing-standard);
|
|
||||||
}
|
|
||||||
|
|
||||||
.folderChevronOpen {
|
|
||||||
transform: rotate(90deg);
|
|
||||||
}
|
|
||||||
|
|
||||||
.treeItemActive {
|
.treeItemActive {
|
||||||
border-color: var(--color-border);
|
border-color: var(--color-border);
|
||||||
background: var(--color-surface);
|
background: var(--color-surface);
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
// Path: Frontend/src/components/shell/WorkspaceSidebar/WorkspaceSidebar.tsx
|
// Path: Frontend/src/components/shell/WorkspaceSidebar/WorkspaceSidebar.tsx
|
||||||
|
|
||||||
import { For, Show, createEffect, createSignal, onCleanup, onMount, type JSX } from "solid-js";
|
import { For, Show, createMemo, createSignal, type JSX } from "solid-js";
|
||||||
import { ChevronLeft, ChevronRight, Folder } from "../../../lib/icons";
|
import { ChevronLeft, ChevronRight } from "../../../lib/icons";
|
||||||
import { useAppShellData } from "../data/app-shell.context";
|
import { useAppShellData } from "../data/app-shell.context";
|
||||||
import { ProjectSelector } from "../ProjectSelector/ProjectSelector";
|
import { ProjectSelector } from "../ProjectSelector/ProjectSelector";
|
||||||
import {
|
import {
|
||||||
@@ -26,276 +26,12 @@ type WorkspaceSidebarProps = {
|
|||||||
onToggleRailCollapse: () => void;
|
onToggleRailCollapse: () => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
type PendingWorkspaceFolderDraft = {
|
|
||||||
parentId: string | null;
|
|
||||||
depth: number;
|
|
||||||
};
|
|
||||||
|
|
||||||
type WorkspaceDragTarget = {
|
|
||||||
parentId: string | null;
|
|
||||||
index: number;
|
|
||||||
intent: "before" | "after" | "inside";
|
|
||||||
targetNodeId?: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
type WorkspaceDragState = {
|
|
||||||
draggedNodeId: string;
|
|
||||||
dropTarget: WorkspaceDragTarget | null;
|
|
||||||
};
|
|
||||||
|
|
||||||
type WorkspaceNodeLocation = {
|
|
||||||
parentId: string | null;
|
|
||||||
index: number;
|
|
||||||
node: WorkspaceTreeNode;
|
|
||||||
};
|
|
||||||
|
|
||||||
const LONG_PRESS_MS = 320;
|
|
||||||
|
|
||||||
const createWorkspaceFolderId = (): string => `folder-${Math.random().toString(36).slice(2, 10)}`;
|
|
||||||
|
|
||||||
const getWorkspaceTreeNodeId = (node: WorkspaceTreeNode): string => node.id;
|
|
||||||
|
|
||||||
const insertWorkspaceFolderNode = (
|
|
||||||
nodes: readonly WorkspaceTreeNode[],
|
|
||||||
parentId: string | null,
|
|
||||||
folder: WorkspaceTreeNode,
|
|
||||||
): readonly WorkspaceTreeNode[] => {
|
|
||||||
if (parentId === null) {
|
|
||||||
return [...nodes, folder];
|
|
||||||
}
|
|
||||||
|
|
||||||
return nodes.map((node) => {
|
|
||||||
if (node.kind !== "folder") {
|
|
||||||
return node;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node.id === parentId) {
|
|
||||||
return {
|
|
||||||
...node,
|
|
||||||
children: [...(node.children ?? []), folder],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
...node,
|
|
||||||
children: node.children ? insertWorkspaceFolderNode(node.children, parentId, folder) : node.children,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const findWorkspaceFolderDepth = (nodes: readonly WorkspaceTreeNode[], folderId: string, depth = 0): number | null => {
|
|
||||||
for (const node of nodes) {
|
|
||||||
if (node.kind !== "folder") {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node.id === folderId) {
|
|
||||||
return depth;
|
|
||||||
}
|
|
||||||
|
|
||||||
const nestedDepth = node.children ? findWorkspaceFolderDepth(node.children, folderId, depth + 1) : null;
|
|
||||||
if (nestedDepth !== null) {
|
|
||||||
return nestedDepth;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
};
|
|
||||||
|
|
||||||
const findWorkspaceNodeLocation = (
|
|
||||||
nodes: readonly WorkspaceTreeNode[],
|
|
||||||
nodeId: string,
|
|
||||||
parentId: string | null = null,
|
|
||||||
): WorkspaceNodeLocation | null => {
|
|
||||||
for (let index = 0; index < nodes.length; index += 1) {
|
|
||||||
const node = nodes[index];
|
|
||||||
|
|
||||||
if (node.id === nodeId) {
|
|
||||||
return { parentId, index, node };
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node.kind === "folder" && node.children) {
|
|
||||||
const nestedLocation = findWorkspaceNodeLocation(node.children, nodeId, node.id);
|
|
||||||
|
|
||||||
if (nestedLocation) {
|
|
||||||
return nestedLocation;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
};
|
|
||||||
|
|
||||||
const workspaceTreeContainsNode = (nodes: readonly WorkspaceTreeNode[], nodeId: string): boolean => {
|
|
||||||
for (const node of nodes) {
|
|
||||||
if (node.id === nodeId) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node.kind === "folder" && node.children && workspaceTreeContainsNode(node.children, nodeId)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
|
|
||||||
const removeWorkspaceTreeNode = (
|
|
||||||
nodes: readonly WorkspaceTreeNode[],
|
|
||||||
nodeId: string,
|
|
||||||
): { nodes: WorkspaceTreeNode[]; removed: WorkspaceTreeNode | null } => {
|
|
||||||
const nextNodes: WorkspaceTreeNode[] = [];
|
|
||||||
let removed: WorkspaceTreeNode | null = null;
|
|
||||||
|
|
||||||
for (const node of nodes) {
|
|
||||||
if (node.id === nodeId) {
|
|
||||||
removed = node;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node.kind === "folder" && node.children) {
|
|
||||||
const result = removeWorkspaceTreeNode(node.children, nodeId);
|
|
||||||
|
|
||||||
if (result.removed) {
|
|
||||||
removed = result.removed;
|
|
||||||
nextNodes.push({
|
|
||||||
...node,
|
|
||||||
children: result.nodes,
|
|
||||||
});
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
nextNodes.push(node);
|
|
||||||
}
|
|
||||||
|
|
||||||
return { nodes: nextNodes, removed };
|
|
||||||
};
|
|
||||||
|
|
||||||
const insertWorkspaceTreeNode = (
|
|
||||||
nodes: readonly WorkspaceTreeNode[],
|
|
||||||
parentId: string | null,
|
|
||||||
index: number,
|
|
||||||
nodeToInsert: WorkspaceTreeNode,
|
|
||||||
): WorkspaceTreeNode[] => {
|
|
||||||
if (parentId === null) {
|
|
||||||
const nextNodes = [...nodes];
|
|
||||||
nextNodes.splice(Math.max(0, Math.min(index, nextNodes.length)), 0, nodeToInsert);
|
|
||||||
return nextNodes;
|
|
||||||
}
|
|
||||||
|
|
||||||
return nodes.map((node) => {
|
|
||||||
if (node.kind !== "folder") {
|
|
||||||
return node;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node.id === parentId) {
|
|
||||||
const nextChildren = [...(node.children ?? [])];
|
|
||||||
nextChildren.splice(Math.max(0, Math.min(index, nextChildren.length)), 0, nodeToInsert);
|
|
||||||
return {
|
|
||||||
...node,
|
|
||||||
children: nextChildren,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
...node,
|
|
||||||
children: node.children ? insertWorkspaceTreeNode(node.children, parentId, index, nodeToInsert) : node.children,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const moveWorkspaceTreeNode = (
|
|
||||||
nodes: readonly WorkspaceTreeNode[],
|
|
||||||
draggedNodeId: string,
|
|
||||||
dropTarget: WorkspaceDragTarget,
|
|
||||||
): WorkspaceTreeNode[] => {
|
|
||||||
const location = findWorkspaceNodeLocation(nodes, draggedNodeId);
|
|
||||||
|
|
||||||
if (!location) {
|
|
||||||
return [...nodes];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (
|
|
||||||
location.node.kind === "folder" &&
|
|
||||||
dropTarget.parentId !== null &&
|
|
||||||
((location.node.children && workspaceTreeContainsNode(location.node.children, dropTarget.parentId)) ||
|
|
||||||
dropTarget.parentId === location.node.id)
|
|
||||||
) {
|
|
||||||
return [...nodes];
|
|
||||||
}
|
|
||||||
|
|
||||||
let normalizedIndex = dropTarget.index;
|
|
||||||
|
|
||||||
if (dropTarget.parentId === location.parentId && dropTarget.index > location.index) {
|
|
||||||
normalizedIndex -= 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dropTarget.parentId === location.parentId && normalizedIndex === location.index) {
|
|
||||||
return [...nodes];
|
|
||||||
}
|
|
||||||
|
|
||||||
const removalResult = removeWorkspaceTreeNode(nodes, draggedNodeId);
|
|
||||||
|
|
||||||
if (!removalResult.removed) {
|
|
||||||
return [...nodes];
|
|
||||||
}
|
|
||||||
|
|
||||||
return insertWorkspaceTreeNode(removalResult.nodes, dropTarget.parentId, normalizedIndex, removalResult.removed);
|
|
||||||
};
|
|
||||||
|
|
||||||
const FolderDraftRow = (props: {
|
|
||||||
depth: number;
|
|
||||||
value: string;
|
|
||||||
onInput: (value: string) => void;
|
|
||||||
onSubmit: () => void;
|
|
||||||
onCancel: () => void;
|
|
||||||
}): JSX.Element => {
|
|
||||||
let inputRef: HTMLInputElement | undefined;
|
|
||||||
|
|
||||||
queueMicrotask(() => inputRef?.focus());
|
|
||||||
|
|
||||||
return (
|
|
||||||
<li>
|
|
||||||
<div class={styles.treeInputRow} style={{ "--tree-depth": String(props.depth) }}>
|
|
||||||
<Folder class={styles.icon} size={18} strokeWidth={2} />
|
|
||||||
<input
|
|
||||||
ref={inputRef}
|
|
||||||
type="text"
|
|
||||||
class={styles.treeInput}
|
|
||||||
value={props.value}
|
|
||||||
placeholder="Folder name"
|
|
||||||
onInput={(event): void => props.onInput(event.currentTarget.value)}
|
|
||||||
onBlur={props.onSubmit}
|
|
||||||
onKeyDown={(event): void => {
|
|
||||||
if (event.key === "Enter") {
|
|
||||||
event.preventDefault();
|
|
||||||
event.currentTarget.blur();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (event.key === "Escape") {
|
|
||||||
event.preventDefault();
|
|
||||||
props.onCancel();
|
|
||||||
event.currentTarget.blur();
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const isContextMenuKeyboardTrigger = (event: KeyboardEvent): boolean => event.key === "ContextMenu" || (event.shiftKey && event.key === "F10");
|
const isContextMenuKeyboardTrigger = (event: KeyboardEvent): boolean => event.key === "ContextMenu" || (event.shiftKey && event.key === "F10");
|
||||||
|
|
||||||
const WorkspaceHomeEntry = (props: {
|
const WorkspaceHomeEntry = (props: {
|
||||||
item: WorkspaceStaticItem;
|
item: WorkspaceStaticItem;
|
||||||
onOpenContextMenu: (event: MouseEvent, target: WorkspaceContextMenuTarget) => void;
|
onOpenContextMenu: (event: MouseEvent, target: WorkspaceContextMenuTarget) => void;
|
||||||
onOpenContextMenuFromKeyboard: (element: HTMLElement, target: WorkspaceContextMenuTarget) => void;
|
onOpenContextMenuFromKeyboard: (element: HTMLElement, target: WorkspaceContextMenuTarget) => void;
|
||||||
onNodePointerDown: (event: PointerEvent, nodeId: string) => void;
|
|
||||||
onNodePointerMove: (event: PointerEvent, parentId: string | null, index: number, node: WorkspaceTreeNode) => void;
|
|
||||||
dragState: WorkspaceDragState | null;
|
|
||||||
isTreeClickSuppressed: () => boolean;
|
|
||||||
}): JSX.Element => {
|
}): JSX.Element => {
|
||||||
const Icon = props.item.icon;
|
const Icon = props.item.icon;
|
||||||
const target = createWorkspaceStaticTarget(props.item);
|
const target = createWorkspaceStaticTarget(props.item);
|
||||||
@@ -339,41 +75,18 @@ const WorkspaceHomeEntry = (props: {
|
|||||||
|
|
||||||
const WorkspaceTreeBranch = (props: {
|
const WorkspaceTreeBranch = (props: {
|
||||||
nodes: readonly WorkspaceTreeNode[];
|
nodes: readonly WorkspaceTreeNode[];
|
||||||
parentId?: string | null;
|
|
||||||
depth?: number;
|
depth?: number;
|
||||||
isFolderCollapsed: (folderId: string) => boolean;
|
|
||||||
onToggleFolder: (folderId: string) => void;
|
|
||||||
pendingFolderDraft: PendingWorkspaceFolderDraft | null;
|
|
||||||
pendingFolderName: string;
|
|
||||||
onPendingFolderNameChange: (value: string) => void;
|
|
||||||
onSubmitPendingFolder: () => void;
|
|
||||||
onCancelPendingFolder: () => void;
|
|
||||||
onOpenContextMenu: (event: MouseEvent, target: WorkspaceContextMenuTarget) => void;
|
onOpenContextMenu: (event: MouseEvent, target: WorkspaceContextMenuTarget) => void;
|
||||||
onOpenContextMenuFromKeyboard: (element: HTMLElement, target: WorkspaceContextMenuTarget) => void;
|
onOpenContextMenuFromKeyboard: (element: HTMLElement, target: WorkspaceContextMenuTarget) => void;
|
||||||
}): JSX.Element => {
|
}): JSX.Element => {
|
||||||
const depth = () => props.depth ?? 0;
|
const depth = () => props.depth ?? 0;
|
||||||
const parentId = () => props.parentId ?? null;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ul class={styles.treeList} role="list">
|
<ul class={styles.treeList} role="list">
|
||||||
<Show when={props.nodes.length === 0 && props.pendingFolderDraft?.parentId !== parentId()}>
|
|
||||||
<li>
|
|
||||||
<div class={styles.treeEmptySlot} style={{ "--tree-depth": String(depth()) }} />
|
|
||||||
</li>
|
|
||||||
</Show>
|
|
||||||
<For each={props.nodes}>
|
<For each={props.nodes}>
|
||||||
{(node, indexAccessor): JSX.Element => {
|
{(node): JSX.Element => {
|
||||||
const Icon = getWorkspaceNodeIcon(node);
|
const Icon = getWorkspaceNodeIcon(node);
|
||||||
const target = createWorkspaceTreeTarget(node);
|
const target = createWorkspaceTreeTarget(node);
|
||||||
const isCollapsed = (): boolean => (node.kind === "folder" ? props.isFolderCollapsed(node.id) : false);
|
|
||||||
const isDraggedNode = (): boolean => props.dragState?.draggedNodeId === node.id;
|
|
||||||
const dropIntent = (): WorkspaceDragTarget["intent"] | null => {
|
|
||||||
if (props.dragState?.dropTarget?.targetNodeId !== node.id) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return props.dragState.dropTarget.intent;
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<li>
|
<li>
|
||||||
@@ -383,13 +96,8 @@ const WorkspaceTreeBranch = (props: {
|
|||||||
[styles.treeItem]: true,
|
[styles.treeItem]: true,
|
||||||
[styles.treeItemActive]: !!node.active,
|
[styles.treeItemActive]: !!node.active,
|
||||||
[styles.treeItemFolder]: node.kind === "folder",
|
[styles.treeItemFolder]: node.kind === "folder",
|
||||||
[styles.treeItemDragging]: isDraggedNode(),
|
|
||||||
[styles.treeItemDropBefore]: dropIntent() === "before",
|
|
||||||
[styles.treeItemDropAfter]: dropIntent() === "after",
|
|
||||||
[styles.treeItemDropInside]: dropIntent() === "inside",
|
|
||||||
}}
|
}}
|
||||||
style={{ "--tree-depth": String(depth()) }}
|
style={{ "--tree-depth": String(depth()) }}
|
||||||
aria-expanded={node.kind === "folder" ? !isCollapsed() : undefined}
|
|
||||||
aria-current={node.active ? "page" : undefined}
|
aria-current={node.active ? "page" : undefined}
|
||||||
aria-label={node.label}
|
aria-label={node.label}
|
||||||
title={node.label}
|
title={node.label}
|
||||||
@@ -397,28 +105,10 @@ const WorkspaceTreeBranch = (props: {
|
|||||||
data-kind={node.kind}
|
data-kind={node.kind}
|
||||||
data-item-type={node.kind === "item" ? node.itemType : undefined}
|
data-item-type={node.kind === "item" ? node.itemType : undefined}
|
||||||
data-active={node.active ? "true" : "false"}
|
data-active={node.active ? "true" : "false"}
|
||||||
onClick={(): void => {
|
|
||||||
if (props.dragState || props.isTreeClickSuppressed()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node.kind !== "folder") {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
props.onToggleFolder(node.id);
|
|
||||||
}}
|
|
||||||
onContextMenu={(event): void => {
|
onContextMenu={(event): void => {
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
props.onOpenContextMenu(event, target);
|
props.onOpenContextMenu(event, target);
|
||||||
}}
|
}}
|
||||||
onPointerDown={(event): void => props.onNodePointerDown(event, node.id)}
|
|
||||||
onPointerMove={(event): void =>
|
|
||||||
props.onNodePointerMove(event, parentId(), indexAccessor(), node)
|
|
||||||
}
|
|
||||||
onPointerEnter={(event): void =>
|
|
||||||
props.onNodePointerMove(event, parentId(), indexAccessor(), node)
|
|
||||||
}
|
|
||||||
onKeyDown={(event): void => {
|
onKeyDown={(event): void => {
|
||||||
if (!isContextMenuKeyboardTrigger(event)) {
|
if (!isContextMenuKeyboardTrigger(event)) {
|
||||||
return;
|
return;
|
||||||
@@ -428,16 +118,6 @@ const WorkspaceTreeBranch = (props: {
|
|||||||
props.onOpenContextMenuFromKeyboard(event.currentTarget, target);
|
props.onOpenContextMenuFromKeyboard(event.currentTarget, target);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Show when={node.kind === "folder"}>
|
|
||||||
<ChevronRight
|
|
||||||
classList={{
|
|
||||||
[styles.folderChevron]: true,
|
|
||||||
[styles.folderChevronOpen]: !isCollapsed(),
|
|
||||||
}}
|
|
||||||
size={16}
|
|
||||||
strokeWidth={2}
|
|
||||||
/>
|
|
||||||
</Show>
|
|
||||||
<Icon class={styles.icon} size={18} strokeWidth={2} />
|
<Icon class={styles.icon} size={18} strokeWidth={2} />
|
||||||
<span class={styles.label}>{node.label}</span>
|
<span class={styles.label}>{node.label}</span>
|
||||||
<Show when={node.meta}>
|
<Show when={node.meta}>
|
||||||
@@ -445,40 +125,18 @@ const WorkspaceTreeBranch = (props: {
|
|||||||
</Show>
|
</Show>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<Show when={node.kind === "folder" && !isCollapsed() && (((node.children?.length ?? 0) > 0) || props.pendingFolderDraft?.parentId === node.id)}>
|
<Show when={node.children?.length}>
|
||||||
<WorkspaceTreeBranch
|
<WorkspaceTreeBranch
|
||||||
nodes={node.children ?? []}
|
nodes={node.children ?? []}
|
||||||
parentId={node.id}
|
|
||||||
depth={depth() + 1}
|
depth={depth() + 1}
|
||||||
isFolderCollapsed={props.isFolderCollapsed}
|
|
||||||
onToggleFolder={props.onToggleFolder}
|
|
||||||
pendingFolderDraft={props.pendingFolderDraft}
|
|
||||||
pendingFolderName={props.pendingFolderName}
|
|
||||||
onPendingFolderNameChange={props.onPendingFolderNameChange}
|
|
||||||
onSubmitPendingFolder={props.onSubmitPendingFolder}
|
|
||||||
onCancelPendingFolder={props.onCancelPendingFolder}
|
|
||||||
onOpenContextMenu={props.onOpenContextMenu}
|
onOpenContextMenu={props.onOpenContextMenu}
|
||||||
onOpenContextMenuFromKeyboard={props.onOpenContextMenuFromKeyboard}
|
onOpenContextMenuFromKeyboard={props.onOpenContextMenuFromKeyboard}
|
||||||
onNodePointerDown={props.onNodePointerDown}
|
|
||||||
onNodePointerMove={props.onNodePointerMove}
|
|
||||||
dragState={props.dragState}
|
|
||||||
isTreeClickSuppressed={props.isTreeClickSuppressed}
|
|
||||||
/>
|
/>
|
||||||
</Show>
|
</Show>
|
||||||
</li>
|
</li>
|
||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
</For>
|
</For>
|
||||||
|
|
||||||
<Show when={props.pendingFolderDraft && props.pendingFolderDraft.parentId === parentId()}>
|
|
||||||
<FolderDraftRow
|
|
||||||
depth={props.pendingFolderDraft?.depth ?? depth()}
|
|
||||||
value={props.pendingFolderName}
|
|
||||||
onInput={props.onPendingFolderNameChange}
|
|
||||||
onSubmit={props.onSubmitPendingFolder}
|
|
||||||
onCancel={props.onCancelPendingFolder}
|
|
||||||
/>
|
|
||||||
</Show>
|
|
||||||
</ul>
|
</ul>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -486,209 +144,23 @@ const WorkspaceTreeBranch = (props: {
|
|||||||
export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
||||||
const appShellData = useAppShellData();
|
const appShellData = useAppShellData();
|
||||||
const [isProjectDrawerOpen, setIsProjectDrawerOpen] = createSignal(false);
|
const [isProjectDrawerOpen, setIsProjectDrawerOpen] = createSignal(false);
|
||||||
const [workspaceTreeNodes, setWorkspaceTreeNodes] = createSignal<readonly WorkspaceTreeNode[]>(appShellData.workspaceTree());
|
|
||||||
const [collapsedFolderIds, setCollapsedFolderIds] = createSignal<readonly string[]>([]);
|
|
||||||
const [pendingFolderDraft, setPendingFolderDraft] = createSignal<PendingWorkspaceFolderDraft | null>(null);
|
|
||||||
const [pendingFolderName, setPendingFolderName] = createSignal("");
|
|
||||||
const [dragState, setDragState] = createSignal<WorkspaceDragState | null>(null);
|
|
||||||
const [suppressNextTreeClick, setSuppressNextTreeClick] = createSignal(false);
|
|
||||||
const contextMenu = createWorkspaceContextMenuController();
|
const contextMenu = createWorkspaceContextMenuController();
|
||||||
let longPressTimer: number | undefined;
|
|
||||||
let suppressClickTimer: number | undefined;
|
|
||||||
const railToggleLabel = (): string => (props.railCollapsed ? "Expand server rail" : "Collapse server rail");
|
const railToggleLabel = (): string => (props.railCollapsed ? "Expand server rail" : "Collapse server rail");
|
||||||
const sidebarContextMenuTarget = createWorkspaceSurfaceTarget(appShellData.activeProject());
|
const sidebarContextMenuTarget = createMemo(() => createWorkspaceSurfaceTarget(appShellData.activeProject()));
|
||||||
const isFolderCollapsed = (folderId: string): boolean => collapsedFolderIds().includes(folderId);
|
const contextMenuTarget = createMemo(() => contextMenu.menuState()?.target ?? null);
|
||||||
const toggleFolder = (folderId: string): void => {
|
const contextMenuPosition = createMemo(() => {
|
||||||
setCollapsedFolderIds((current) =>
|
const state = contextMenu.menuState();
|
||||||
current.includes(folderId) ? current.filter((id) => id !== folderId) : [...current, folderId],
|
|
||||||
);
|
|
||||||
};
|
|
||||||
const clearLongPressTimer = (): void => {
|
|
||||||
if (longPressTimer !== undefined) {
|
|
||||||
window.clearTimeout(longPressTimer);
|
|
||||||
longPressTimer = undefined;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
const suppressTreeClickTemporarily = (): void => {
|
|
||||||
setSuppressNextTreeClick(true);
|
|
||||||
|
|
||||||
if (suppressClickTimer !== undefined) {
|
return state
|
||||||
window.clearTimeout(suppressClickTimer);
|
? {
|
||||||
}
|
x: state.x,
|
||||||
|
y: state.y,
|
||||||
suppressClickTimer = window.setTimeout(() => {
|
}
|
||||||
setSuppressNextTreeClick(false);
|
: null;
|
||||||
suppressClickTimer = undefined;
|
|
||||||
}, 80);
|
|
||||||
};
|
|
||||||
|
|
||||||
createEffect(() => {
|
|
||||||
setWorkspaceTreeNodes(appShellData.workspaceTree());
|
|
||||||
setCollapsedFolderIds([]);
|
|
||||||
setPendingFolderDraft(null);
|
|
||||||
setPendingFolderName("");
|
|
||||||
setDragState(null);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
onMount(() => {
|
const handleContextActionSelect = (_action: WorkspaceContextMenuAction, _target: WorkspaceContextMenuTarget): void => {
|
||||||
const handlePointerUp = (): void => {
|
// Initial implementation only establishes the menu IA and placement.
|
||||||
clearLongPressTimer();
|
|
||||||
|
|
||||||
const nextDragState = dragState();
|
|
||||||
|
|
||||||
if (!nextDragState?.dropTarget) {
|
|
||||||
if (nextDragState) {
|
|
||||||
suppressTreeClickTemporarily();
|
|
||||||
}
|
|
||||||
setDragState(null);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
suppressTreeClickTemporarily();
|
|
||||||
setWorkspaceTreeNodes((current) =>
|
|
||||||
moveWorkspaceTreeNode(current, nextDragState.draggedNodeId, nextDragState.dropTarget as WorkspaceDragTarget),
|
|
||||||
);
|
|
||||||
setDragState(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleEscape = (event: KeyboardEvent): void => {
|
|
||||||
if (event.key !== "Escape") {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
clearLongPressTimer();
|
|
||||||
|
|
||||||
if (dragState()) {
|
|
||||||
setDragState(null);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
window.addEventListener("pointerup", handlePointerUp);
|
|
||||||
window.addEventListener("pointercancel", handlePointerUp);
|
|
||||||
window.addEventListener("keydown", handleEscape);
|
|
||||||
|
|
||||||
onCleanup(() => {
|
|
||||||
clearLongPressTimer();
|
|
||||||
if (suppressClickTimer !== undefined) {
|
|
||||||
window.clearTimeout(suppressClickTimer);
|
|
||||||
}
|
|
||||||
window.removeEventListener("pointerup", handlePointerUp);
|
|
||||||
window.removeEventListener("pointercancel", handlePointerUp);
|
|
||||||
window.removeEventListener("keydown", handleEscape);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
const beginFolderDraft = (parentId: string | null, depth: number): void => {
|
|
||||||
if (parentId) {
|
|
||||||
setCollapsedFolderIds((current) => current.filter((id) => id !== parentId));
|
|
||||||
}
|
|
||||||
|
|
||||||
setPendingFolderName("");
|
|
||||||
setPendingFolderDraft({ parentId, depth });
|
|
||||||
};
|
|
||||||
|
|
||||||
const submitPendingFolder = (): void => {
|
|
||||||
const name = pendingFolderName().trim();
|
|
||||||
const draft = pendingFolderDraft();
|
|
||||||
|
|
||||||
if (!draft) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!name) {
|
|
||||||
setPendingFolderDraft(null);
|
|
||||||
setPendingFolderName("");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setWorkspaceTreeNodes((current) =>
|
|
||||||
insertWorkspaceFolderNode(current, draft.parentId, {
|
|
||||||
id: createWorkspaceFolderId(),
|
|
||||||
label: name,
|
|
||||||
kind: "folder",
|
|
||||||
icon: Folder,
|
|
||||||
children: [],
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
setPendingFolderDraft(null);
|
|
||||||
setPendingFolderName("");
|
|
||||||
};
|
|
||||||
|
|
||||||
const cancelPendingFolder = (): void => {
|
|
||||||
setPendingFolderDraft(null);
|
|
||||||
setPendingFolderName("");
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleNodePointerDown = (event: PointerEvent, nodeId: string): void => {
|
|
||||||
if (event.button !== 0 || pendingFolderDraft()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
clearLongPressTimer();
|
|
||||||
longPressTimer = window.setTimeout(() => {
|
|
||||||
suppressTreeClickTemporarily();
|
|
||||||
setDragState({ draggedNodeId: nodeId, dropTarget: null });
|
|
||||||
}, LONG_PRESS_MS);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleNodePointerMove = (
|
|
||||||
event: PointerEvent,
|
|
||||||
parentId: string | null,
|
|
||||||
index: number,
|
|
||||||
node: WorkspaceTreeNode,
|
|
||||||
): void => {
|
|
||||||
const nextDragState = dragState();
|
|
||||||
|
|
||||||
if (!nextDragState || nextDragState.draggedNodeId === getWorkspaceTreeNodeId(node)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const bounds = event.currentTarget.getBoundingClientRect();
|
|
||||||
const relativeY = bounds.height <= 0 ? 0.5 : (event.clientY - bounds.top) / bounds.height;
|
|
||||||
let nextTarget: WorkspaceDragTarget;
|
|
||||||
|
|
||||||
if (node.kind === "folder") {
|
|
||||||
if (relativeY < 0.28) {
|
|
||||||
nextTarget = { parentId, index, intent: "before", targetNodeId: node.id };
|
|
||||||
} else if (relativeY > 0.72) {
|
|
||||||
nextTarget = { parentId, index: index + 1, intent: "after", targetNodeId: node.id };
|
|
||||||
} else {
|
|
||||||
nextTarget = {
|
|
||||||
parentId: node.id,
|
|
||||||
index: (node.children ?? []).length,
|
|
||||||
intent: "inside",
|
|
||||||
targetNodeId: node.id,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
nextTarget = {
|
|
||||||
parentId,
|
|
||||||
index: relativeY < 0.5 ? index : index + 1,
|
|
||||||
intent: relativeY < 0.5 ? "before" : "after",
|
|
||||||
targetNodeId: node.id,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
setDragState({ ...nextDragState, dropTarget: nextTarget });
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleContextActionSelect = (action: WorkspaceContextMenuAction, target: WorkspaceContextMenuTarget): void => {
|
|
||||||
if (action.id !== "new-folder") {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (target.kind) {
|
|
||||||
case "workspace":
|
|
||||||
case "home":
|
|
||||||
beginFolderDraft(null, 0);
|
|
||||||
return;
|
|
||||||
case "folder":
|
|
||||||
beginFolderDraft(target.id, (findWorkspaceFolderDepth(workspaceTreeNodes(), target.id) ?? 0) + 1);
|
|
||||||
return;
|
|
||||||
case "settings":
|
|
||||||
case "item":
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -697,13 +169,12 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
|||||||
classList={{
|
classList={{
|
||||||
[styles.sidebar]: true,
|
[styles.sidebar]: true,
|
||||||
[styles.sidebarCollapsed]: props.collapsed,
|
[styles.sidebarCollapsed]: props.collapsed,
|
||||||
[styles.sidebarDragMode]: !!dragState(),
|
|
||||||
}}
|
}}
|
||||||
aria-label="Left workspace sidebar"
|
aria-label="Left workspace sidebar"
|
||||||
data-ui="workspace-sidebar"
|
data-ui="workspace-sidebar"
|
||||||
data-collapsed={props.collapsed ? "true" : "false"}
|
data-collapsed={props.collapsed ? "true" : "false"}
|
||||||
onContextMenu={(event): void => {
|
onContextMenu={(event): void => {
|
||||||
contextMenu.openMenu(event, sidebarContextMenuTarget);
|
contextMenu.openMenu(event, sidebarContextMenuTarget());
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
@@ -784,39 +255,19 @@ export const WorkspaceSidebar = (props: WorkspaceSidebarProps): JSX.Element => {
|
|||||||
</Show>
|
</Show>
|
||||||
|
|
||||||
<div data-slot="workspace-tree-root">
|
<div data-slot="workspace-tree-root">
|
||||||
<WorkspaceTreeBranch
|
<WorkspaceTreeBranch
|
||||||
nodes={workspaceTreeNodes()}
|
nodes={appShellData.workspaceTree()}
|
||||||
parentId={null}
|
onOpenContextMenu={contextMenu.openMenu}
|
||||||
isFolderCollapsed={isFolderCollapsed}
|
onOpenContextMenuFromKeyboard={contextMenu.openMenuFromElement}
|
||||||
onToggleFolder={toggleFolder}
|
/>
|
||||||
pendingFolderDraft={pendingFolderDraft()}
|
|
||||||
pendingFolderName={pendingFolderName()}
|
|
||||||
onPendingFolderNameChange={setPendingFolderName}
|
|
||||||
onSubmitPendingFolder={submitPendingFolder}
|
|
||||||
onCancelPendingFolder={cancelPendingFolder}
|
|
||||||
onOpenContextMenu={contextMenu.openMenu}
|
|
||||||
onOpenContextMenuFromKeyboard={contextMenu.openMenuFromElement}
|
|
||||||
onNodePointerDown={handleNodePointerDown}
|
|
||||||
onNodePointerMove={handleNodePointerMove}
|
|
||||||
dragState={dragState()}
|
|
||||||
isTreeClickSuppressed={suppressNextTreeClick}
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</aside>
|
</aside>
|
||||||
|
|
||||||
<WorkspaceContextMenu
|
<WorkspaceContextMenu
|
||||||
target={contextMenu.menuState()?.target ?? null}
|
target={contextMenuTarget()}
|
||||||
position={(() => {
|
position={contextMenuPosition()}
|
||||||
const state = contextMenu.menuState();
|
|
||||||
return state
|
|
||||||
? {
|
|
||||||
x: state.x,
|
|
||||||
y: state.y,
|
|
||||||
}
|
|
||||||
: null;
|
|
||||||
})()}
|
|
||||||
menuRef={contextMenu.setMenuRef}
|
menuRef={contextMenu.setMenuRef}
|
||||||
onClose={contextMenu.closeMenu}
|
onClose={contextMenu.closeMenu}
|
||||||
onSelect={handleContextActionSelect}
|
onSelect={handleContextActionSelect}
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ import {
|
|||||||
|
|
||||||
type AppShellInstallation = {
|
type AppShellInstallation = {
|
||||||
id: string;
|
id: string;
|
||||||
name: string;
|
|
||||||
mode: "personal" | "organizational" | string;
|
mode: "personal" | "organizational" | string;
|
||||||
access: string;
|
access: string;
|
||||||
protocol: string;
|
protocol: string;
|
||||||
@@ -152,12 +151,11 @@ const buildRailItems = (payload: AppShellPayload | null): readonly RailItem[] =>
|
|||||||
}
|
}
|
||||||
|
|
||||||
const kind = payload.installation.mode === "personal" ? "personal" : "organization";
|
const kind = payload.installation.mode === "personal" ? "personal" : "organization";
|
||||||
const serverName = payload.installation.name || payload.organizations[0]?.name || payload.installation.host;
|
|
||||||
|
|
||||||
return payload.organizations.map((organization, index) => ({
|
return payload.organizations.map((organization, index) => ({
|
||||||
id: organization.id,
|
id: organization.id,
|
||||||
label: serverName || organization.name,
|
label: organization.name,
|
||||||
abbreviation: buildAbbreviation(serverName || organization.name, kind === "personal" ? "P" : "O"),
|
abbreviation: buildAbbreviation(organization.name, kind === "personal" ? "P" : "O"),
|
||||||
kind,
|
kind,
|
||||||
active: index === 0,
|
active: index === 0,
|
||||||
}));
|
}));
|
||||||
@@ -172,12 +170,11 @@ const buildActiveServer = (payload: AppShellPayload | null): ActiveServer => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const kind = installation.mode === "personal" ? "personal" : "organization";
|
const kind = installation.mode === "personal" ? "personal" : "organization";
|
||||||
const serverName = installation.name || organization.name || installation.host;
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id: installation.id,
|
id: installation.id,
|
||||||
name: serverName || fallbackActiveServer.name,
|
name: organization.name || installation.host || fallbackActiveServer.name,
|
||||||
abbreviation: buildAbbreviation(serverName, kind === "personal" ? "P" : "O"),
|
abbreviation: buildAbbreviation(organization.name || installation.host, kind === "personal" ? "P" : "O"),
|
||||||
kind,
|
kind,
|
||||||
connectedLabel: kind === "organization" ? `${payload?.teams.length ?? 0} connected` : undefined,
|
connectedLabel: kind === "organization" ? `${payload?.teams.length ?? 0} connected` : undefined,
|
||||||
subtitle: kind === "personal" ? installation.host || payload?.admin?.homeTitle || "Personal home" : undefined,
|
subtitle: kind === "personal" ? installation.host || payload?.admin?.homeTitle || "Personal home" : undefined,
|
||||||
@@ -194,16 +191,6 @@ const buildProjectItems = (payload: AppShellPayload | null): readonly ProjectIte
|
|||||||
id: project.id,
|
id: project.id,
|
||||||
name: project.name,
|
name: project.name,
|
||||||
description: project.slug || "Persisted project workspace",
|
description: project.slug || "Persisted project workspace",
|
||||||
groupLabel: payload.departments.find((department) => department.id === project.departmentId)?.name || "Projects",
|
|
||||||
parentLabel:
|
|
||||||
payload.teams.find((team) => team.id === project.teamId)?.name ||
|
|
||||||
payload.departments.find((department) => department.id === project.departmentId)?.name ||
|
|
||||||
"Shared project",
|
|
||||||
meta: (() => {
|
|
||||||
const workspaceCount = payload.workspaces.filter((workspace) => workspace.projectId === project.id).length;
|
|
||||||
|
|
||||||
return workspaceCount > 0 ? `${workspaceCount} workspace${workspaceCount === 1 ? "" : "s"}` : undefined;
|
|
||||||
})(),
|
|
||||||
active: index === 0,
|
active: index === 0,
|
||||||
}));
|
}));
|
||||||
};
|
};
|
||||||
@@ -268,7 +255,7 @@ const buildActiveUserProfile = (payload: AppShellPayload | null): ActiveUserProf
|
|||||||
return fallbackActiveUserProfile;
|
return fallbackActiveUserProfile;
|
||||||
}
|
}
|
||||||
|
|
||||||
const organizationName = payload.installation?.name || payload.organizations[0]?.name || fallbackActiveServer.name;
|
const organizationName = payload.organizations[0]?.name ?? fallbackActiveServer.name;
|
||||||
const departmentName = payload.departments[0]?.name;
|
const departmentName = payload.departments[0]?.name;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -295,20 +282,10 @@ export const AppShellDataProvider = (props: { children: JSX.Element }): JSX.Elem
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const body = (await response.json()) as {
|
const body = (await response.json()) as { data?: AppShellPayload; error?: { message?: string } };
|
||||||
data?: AppShellPayload;
|
|
||||||
error?: { message?: string } | string;
|
|
||||||
message?: string;
|
|
||||||
};
|
|
||||||
const errorMessage =
|
|
||||||
typeof body.message === "string"
|
|
||||||
? body.message
|
|
||||||
: typeof body.error === "string"
|
|
||||||
? body.error
|
|
||||||
: body.error?.message;
|
|
||||||
|
|
||||||
if (!response.ok || !body.data) {
|
if (!response.ok || !body.data) {
|
||||||
throw new Error(errorMessage || "Failed to load app shell state.");
|
throw new Error(body.error?.message || "Failed to load app shell state.");
|
||||||
}
|
}
|
||||||
|
|
||||||
setPayload(normalizeAppShellPayload(body.data));
|
setPayload(normalizeAppShellPayload(body.data));
|
||||||
|
|||||||
@@ -71,43 +71,9 @@ export type ProjectItem = {
|
|||||||
id: string;
|
id: string;
|
||||||
name: string;
|
name: string;
|
||||||
description: string;
|
description: string;
|
||||||
groupLabel?: string;
|
|
||||||
parentLabel?: string;
|
|
||||||
meta?: string;
|
|
||||||
active?: boolean;
|
active?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type ProjectMenuTarget =
|
|
||||||
| {
|
|
||||||
id: string;
|
|
||||||
label: string;
|
|
||||||
kind: "surface";
|
|
||||||
}
|
|
||||||
| {
|
|
||||||
id: string;
|
|
||||||
label: string;
|
|
||||||
kind: "folder";
|
|
||||||
}
|
|
||||||
| {
|
|
||||||
id: string;
|
|
||||||
label: string;
|
|
||||||
kind: "project";
|
|
||||||
};
|
|
||||||
|
|
||||||
export type ProjectContextMenuAction = {
|
|
||||||
id: string;
|
|
||||||
label: string;
|
|
||||||
tone?: "default" | "danger";
|
|
||||||
shortcut?: WorkspaceContextMenuShortcut;
|
|
||||||
children?: readonly ProjectContextMenuAction[];
|
|
||||||
};
|
|
||||||
|
|
||||||
export type ProjectContextMenuSection = {
|
|
||||||
id: string;
|
|
||||||
label?: string;
|
|
||||||
items: readonly ProjectContextMenuAction[];
|
|
||||||
};
|
|
||||||
|
|
||||||
export type SidebarItem = {
|
export type SidebarItem = {
|
||||||
id: string;
|
id: string;
|
||||||
label: string;
|
label: string;
|
||||||
@@ -398,31 +364,9 @@ export const activeDepartment: ActiveDepartment = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const projectItems: readonly ProjectItem[] = [
|
export const projectItems: readonly ProjectItem[] = [
|
||||||
{
|
{ id: "general", name: "General", description: "Default shared project", active: true },
|
||||||
id: "general",
|
{ id: "operations", name: "Operations", description: "Cross-team planning and delivery" },
|
||||||
name: "General",
|
{ id: "hiring", name: "Hiring", description: "Candidate pipeline and interview loops" },
|
||||||
description: "Default shared project",
|
|
||||||
groupLabel: "Shared space",
|
|
||||||
parentLabel: "Workspace home",
|
|
||||||
meta: "1 workspace",
|
|
||||||
active: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: "operations",
|
|
||||||
name: "Operations",
|
|
||||||
description: "Cross-team planning and delivery",
|
|
||||||
groupLabel: "Team folders",
|
|
||||||
parentLabel: "Shared Services",
|
|
||||||
meta: "2 workspaces",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: "hiring",
|
|
||||||
name: "Hiring",
|
|
||||||
description: "Candidate pipeline and interview loops",
|
|
||||||
groupLabel: "Team folders",
|
|
||||||
parentLabel: "People Ops",
|
|
||||||
meta: "1 workspace",
|
|
||||||
},
|
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
export const departmentItems: readonly DepartmentItem[] = [
|
export const departmentItems: readonly DepartmentItem[] = [
|
||||||
@@ -589,69 +533,6 @@ export const getWorkspaceContextMenuSections = (
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const getProjectCreateActions = (): readonly ProjectContextMenuAction[] =>
|
|
||||||
[
|
|
||||||
{ id: "new-project", label: "New project" },
|
|
||||||
{ id: "new-folder", label: "New folder" },
|
|
||||||
] as const;
|
|
||||||
|
|
||||||
export const createProjectSurfaceTarget = (label = "Projects"): ProjectMenuTarget => ({
|
|
||||||
id: "project-surface",
|
|
||||||
label,
|
|
||||||
kind: "surface",
|
|
||||||
});
|
|
||||||
|
|
||||||
export const createProjectFolderTarget = (id: string, label: string): ProjectMenuTarget => ({
|
|
||||||
id,
|
|
||||||
label,
|
|
||||||
kind: "folder",
|
|
||||||
});
|
|
||||||
|
|
||||||
export const createProjectTarget = (project: ProjectItem): ProjectMenuTarget => ({
|
|
||||||
id: project.id,
|
|
||||||
label: project.name,
|
|
||||||
kind: "project",
|
|
||||||
});
|
|
||||||
|
|
||||||
export const getProjectContextMenuEyebrow = (target: ProjectMenuTarget): string => {
|
|
||||||
switch (target.kind) {
|
|
||||||
case "surface":
|
|
||||||
return "Projects";
|
|
||||||
case "folder":
|
|
||||||
return "Folder";
|
|
||||||
case "project":
|
|
||||||
return "Project";
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getProjectContextMenuSections = (target: ProjectMenuTarget): readonly ProjectContextMenuSection[] => {
|
|
||||||
const createActions = getProjectCreateActions();
|
|
||||||
|
|
||||||
switch (target.kind) {
|
|
||||||
case "surface":
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
id: "create",
|
|
||||||
items: createActions,
|
|
||||||
},
|
|
||||||
] as const;
|
|
||||||
case "folder":
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
id: "create",
|
|
||||||
items: createActions,
|
|
||||||
},
|
|
||||||
] as const;
|
|
||||||
case "project":
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
id: "create",
|
|
||||||
items: createActions,
|
|
||||||
},
|
|
||||||
] as const;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export const topBarActions: readonly TopBarAction[] = [
|
export const topBarActions: readonly TopBarAction[] = [
|
||||||
{ id: "search", label: "Search", icon: Search },
|
{ id: "search", label: "Search", icon: Search },
|
||||||
] as const;
|
] as const;
|
||||||
|
|||||||
@@ -92,6 +92,12 @@
|
|||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.eyebrow {
|
||||||
|
@include text-caption;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
text-transform: uppercase;
|
||||||
|
}
|
||||||
|
|
||||||
.title {
|
.title {
|
||||||
@include text-display;
|
@include text-display;
|
||||||
font-family: var(--font-family-display);
|
font-family: var(--font-family-display);
|
||||||
@@ -240,16 +246,10 @@
|
|||||||
color: var(--color-text-muted);
|
color: var(--color-text-muted);
|
||||||
}
|
}
|
||||||
|
|
||||||
.fieldHelp {
|
|
||||||
@include text-caption;
|
|
||||||
color: var(--color-text-muted);
|
|
||||||
}
|
|
||||||
|
|
||||||
.field input,
|
.field input,
|
||||||
.field select {
|
.field select {
|
||||||
min-height: var(--control-size-md);
|
min-height: var(--control-size-md);
|
||||||
width: 100%;
|
width: 100%;
|
||||||
font: inherit;
|
|
||||||
border: 1px solid var(--color-border);
|
border: 1px solid var(--color-border);
|
||||||
border-radius: var(--radius-lg);
|
border-radius: var(--radius-lg);
|
||||||
background: var(--color-surface-elevated);
|
background: var(--color-surface-elevated);
|
||||||
@@ -527,45 +527,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.wizardPanel {
|
.wizardPanel {
|
||||||
width: 100vw;
|
width: calc(100vw - (var(--space-4) * 2));
|
||||||
max-height: 100dvh;
|
max-height: calc(100dvh - (var(--space-4) * 2));
|
||||||
margin: 0;
|
margin: var(--space-4) auto;
|
||||||
padding: var(--space-3);
|
padding: var(--space-3);
|
||||||
padding-bottom: calc(var(--space-3) + env(safe-area-inset-bottom, 0px));
|
|
||||||
border-radius: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizardHeader,
|
|
||||||
.wizardBody,
|
|
||||||
.wizardSidebar {
|
|
||||||
gap: var(--space-3);
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizardSteps {
|
|
||||||
grid-auto-flow: column;
|
|
||||||
grid-auto-columns: minmax(10rem, 1fr);
|
|
||||||
overflow-x: auto;
|
|
||||||
padding-bottom: var(--space-1);
|
|
||||||
scrollbar-width: thin;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizardStepButton {
|
|
||||||
min-width: 10rem;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.wizardFormActions {
|
.wizardFormActions {
|
||||||
gap: var(--space-2);
|
gap: var(--space-2);
|
||||||
flex-direction: column-reverse;
|
|
||||||
align-items: stretch;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizardFormActions .primaryButton {
|
|
||||||
margin-left: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wizardFormActions .primaryButton,
|
|
||||||
.wizardFormActions .secondaryButton,
|
|
||||||
.wizardCloseButton {
|
|
||||||
width: 100%;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,7 +52,6 @@ const defaultInstanceForm = {
|
|||||||
|
|
||||||
const defaultModeForm = {
|
const defaultModeForm = {
|
||||||
mode: "personal",
|
mode: "personal",
|
||||||
name: "",
|
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
const defaultAdminForm = {
|
const defaultAdminForm = {
|
||||||
@@ -95,52 +94,6 @@ const readResponseBody = async (response: Response): Promise<unknown> => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const readResponseError = (step: BootstrapStepKey, data: unknown): string => {
|
|
||||||
const fallback = `Bootstrap ${step} request failed.`;
|
|
||||||
|
|
||||||
if (typeof data === "string") {
|
|
||||||
const message = data.trim();
|
|
||||||
return message || fallback;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!data || typeof data !== "object") {
|
|
||||||
return fallback;
|
|
||||||
}
|
|
||||||
|
|
||||||
const record = data as {
|
|
||||||
error?: string;
|
|
||||||
message?: string;
|
|
||||||
requestId?: string;
|
|
||||||
};
|
|
||||||
const message = typeof record.message === "string" ? record.message.trim() : "";
|
|
||||||
const errorCode = typeof record.error === "string" ? record.error.trim() : "";
|
|
||||||
const requestId = typeof record.requestId === "string" ? record.requestId.trim() : "";
|
|
||||||
|
|
||||||
if (!message && !errorCode && !requestId) {
|
|
||||||
return fallback;
|
|
||||||
}
|
|
||||||
|
|
||||||
const details: string[] = [];
|
|
||||||
|
|
||||||
if (errorCode) {
|
|
||||||
details.push(`code: ${errorCode}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (requestId) {
|
|
||||||
details.push(`request: ${requestId}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (message && details.length > 0) {
|
|
||||||
return `${message} (${details.join(", ")})`;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (message) {
|
|
||||||
return message;
|
|
||||||
}
|
|
||||||
|
|
||||||
return `${fallback} (${details.join(", ")})`;
|
|
||||||
};
|
|
||||||
|
|
||||||
type WorkspaceHomeProps = {
|
type WorkspaceHomeProps = {
|
||||||
sidebarCollapsed: boolean;
|
sidebarCollapsed: boolean;
|
||||||
onToggleSidebarCollapse: () => void;
|
onToggleSidebarCollapse: () => void;
|
||||||
@@ -193,14 +146,15 @@ export const WorkspaceHome = (props: WorkspaceHomeProps): JSX.Element => {
|
|||||||
const installationAccessor = appShellData.installation;
|
const installationAccessor = appShellData.installation;
|
||||||
const installation = typeof installationAccessor === "function" ? installationAccessor() : undefined;
|
const installation = typeof installationAccessor === "function" ? installationAccessor() : undefined;
|
||||||
const isPersistedBootstrap = installation?.isBootstrapped ?? false;
|
const isPersistedBootstrap = installation?.isBootstrapped ?? false;
|
||||||
|
const wasComplete = isBootstrapComplete();
|
||||||
if (!isPersistedBootstrap) {
|
|
||||||
resetWizardState();
|
|
||||||
}
|
|
||||||
|
|
||||||
setIsBootstrapComplete(isPersistedBootstrap);
|
setIsBootstrapComplete(isPersistedBootstrap);
|
||||||
setIsWizardOpen(!isPersistedBootstrap);
|
setIsWizardOpen(!isPersistedBootstrap);
|
||||||
setIsBootstrapStateResolved(true);
|
setIsBootstrapStateResolved(true);
|
||||||
|
|
||||||
|
if (!isPersistedBootstrap && wasComplete) {
|
||||||
|
resetWizardState();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const sidebarToggleLabel = (): string =>
|
const sidebarToggleLabel = (): string =>
|
||||||
@@ -209,8 +163,6 @@ export const WorkspaceHome = (props: WorkspaceHomeProps): JSX.Element => {
|
|||||||
const apiBase = (): string => resolveAPIBase();
|
const apiBase = (): string => resolveAPIBase();
|
||||||
const bootstrapTargetLabel = (): string =>
|
const bootstrapTargetLabel = (): string =>
|
||||||
modeForm.mode === "personal" ? "Personal server" : "Organization server";
|
modeForm.mode === "personal" ? "Personal server" : "Organization server";
|
||||||
const bootstrapNamePlaceholder = (): string =>
|
|
||||||
modeForm.mode === "personal" ? "Personal server name" : "Organization server name";
|
|
||||||
const currentStep = createMemo<BootstrapStepDefinition>(
|
const currentStep = createMemo<BootstrapStepDefinition>(
|
||||||
() => bootstrapStepDefinitions[currentStepIndex()] ?? bootstrapStepDefinitions[0]!,
|
() => bootstrapStepDefinitions[currentStepIndex()] ?? bootstrapStepDefinitions[0]!,
|
||||||
);
|
);
|
||||||
@@ -248,7 +200,11 @@ export const WorkspaceHome = (props: WorkspaceHomeProps): JSX.Element => {
|
|||||||
const data = await readResponseBody(response);
|
const data = await readResponseBody(response);
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error(readResponseError(step, data));
|
throw new Error(
|
||||||
|
typeof data?.error?.message === "string"
|
||||||
|
? data.error.message
|
||||||
|
: `Bootstrap ${step} request failed.`,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
setStepState(step, {
|
setStepState(step, {
|
||||||
@@ -360,6 +316,7 @@ export const WorkspaceHome = (props: WorkspaceHomeProps): JSX.Element => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<section class={styles.hero} data-slot="workspace-home-hero">
|
<section class={styles.hero} data-slot="workspace-home-hero">
|
||||||
|
<span class={styles.eyebrow}>Bootstrap</span>
|
||||||
<h1 class={styles.title}>{isBootstrapComplete() ? appShellData.activeServer().name : bootstrapTargetLabel()}</h1>
|
<h1 class={styles.title}>{isBootstrapComplete() ? appShellData.activeServer().name : bootstrapTargetLabel()}</h1>
|
||||||
<Show when={isBootstrapStateResolved() && !isBootstrapComplete()}>
|
<Show when={isBootstrapStateResolved() && !isBootstrapComplete()}>
|
||||||
<div class={styles.heroActions}>
|
<div class={styles.heroActions}>
|
||||||
@@ -457,27 +414,15 @@ export const WorkspaceHome = (props: WorkspaceHomeProps): JSX.Element => {
|
|||||||
</>
|
</>
|
||||||
</Show>
|
</Show>
|
||||||
|
|
||||||
<Show when={currentStep().id === "mode"}>
|
<Show when={currentStep().id === "mode"}>
|
||||||
<>
|
<label class={styles.field}>
|
||||||
<label class={styles.field}>
|
<span class={styles.fieldLabel}>Mode</span>
|
||||||
<span class={styles.fieldLabel}>Mode</span>
|
<select value={modeForm.mode} onInput={(event): void => setModeForm("mode", event.currentTarget.value)}>
|
||||||
<select value={modeForm.mode} onInput={(event): void => setModeForm("mode", event.currentTarget.value)}>
|
<option value="personal">personal</option>
|
||||||
<option value="personal">personal</option>
|
<option value="organizational">organizational</option>
|
||||||
<option value="organizational">organizational</option>
|
</select>
|
||||||
</select>
|
</label>
|
||||||
</label>
|
</Show>
|
||||||
<label class={styles.field}>
|
|
||||||
<span class={styles.fieldLabel}>Server name</span>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
value={modeForm.name}
|
|
||||||
required
|
|
||||||
onInput={(event): void => setModeForm("name", event.currentTarget.value)}
|
|
||||||
placeholder={bootstrapNamePlaceholder()}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
</>
|
|
||||||
</Show>
|
|
||||||
|
|
||||||
<Show when={currentStep().id === "admin"}>
|
<Show when={currentStep().id === "admin"}>
|
||||||
<>
|
<>
|
||||||
@@ -501,16 +446,13 @@ export const WorkspaceHome = (props: WorkspaceHomeProps): JSX.Element => {
|
|||||||
</label>
|
</label>
|
||||||
<label class={styles.field}>
|
<label class={styles.field}>
|
||||||
<span class={styles.fieldLabel}>Password</span>
|
<span class={styles.fieldLabel}>Password</span>
|
||||||
<input
|
<input
|
||||||
type="password"
|
type="password"
|
||||||
value={adminForm.password}
|
value={adminForm.password}
|
||||||
onInput={(event): void => setAdminForm("password", event.currentTarget.value)}
|
onInput={(event): void => setAdminForm("password", event.currentTarget.value)}
|
||||||
placeholder="Create a strong password"
|
placeholder="Temporary for echo testing"
|
||||||
/>
|
/>
|
||||||
<small class={styles.fieldHelp}>
|
</label>
|
||||||
Use at least 12 characters with uppercase, lowercase, numbers, and symbols.
|
|
||||||
</small>
|
|
||||||
</label>
|
|
||||||
</>
|
</>
|
||||||
</Show>
|
</Show>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user