Compare commits
44 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 32acf6dc17 | |||
| 6b87e8a1fe | |||
| 3247f28c87 | |||
| 891e8b83ed | |||
| ae1f347549 | |||
| 7e62ff6d9a | |||
| adcc9afe05 | |||
| 24d1e472a2 | |||
| da1b210865 | |||
| eadf630c61 | |||
| 4fb073a1ff | |||
| 9ddfa0c3c7 | |||
| a92e188f84 | |||
| dcf181d640 | |||
| 1a8556df68 | |||
| a5f0c41cba | |||
| 268093d223 | |||
| c64a7b8d44 | |||
| 0b368b09fa | |||
| 212dd1c435 | |||
| 69af324b1b | |||
| 5758074f6f | |||
| 5b9e14b442 | |||
| 618e3e84be | |||
| 2ff7fbd9e7 | |||
| 8a94d83e7e | |||
| 07590f1c4f | |||
| 3c7a73853d | |||
| 9b4f1ce197 | |||
| 5735e3008d | |||
| 626ae02df0 | |||
| 7f47ca84fa | |||
| eac4fb423e | |||
| 14ac0f46de | |||
| 5a565f8165 | |||
| 12cbc68db6 | |||
| 699574e345 | |||
| 35c1a861f5 | |||
| 27101bbdd6 | |||
| 6ba04effcf | |||
| 913825f596 | |||
| 93ce3e07f0 | |||
| 25c6934801 | |||
| fcf96590bb |
@@ -27,3 +27,5 @@ tmp/
|
||||
bin/
|
||||
|
||||
.cgcignore
|
||||
|
||||
POSIX/
|
||||
@@ -0,0 +1,52 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
|
||||
"moku-backend/internal/config"
|
||||
"moku-backend/internal/database"
|
||||
"moku-backend/internal/posixproj"
|
||||
)
|
||||
|
||||
func main() {
|
||||
command := "rebuild"
|
||||
if len(os.Args) > 1 {
|
||||
command = os.Args[1]
|
||||
}
|
||||
|
||||
switch command {
|
||||
case "rebuild":
|
||||
if err := rebuildProjection(context.Background()); err != nil {
|
||||
log.Fatalf("rebuild POSIX projection: %v", err)
|
||||
}
|
||||
default:
|
||||
log.Fatalf("unsupported posix command %q (supported: rebuild)", command)
|
||||
}
|
||||
}
|
||||
|
||||
func rebuildProjection(ctx context.Context) error {
|
||||
cfg := config.Load()
|
||||
|
||||
db, err := database.NewPostgres(cfg.PostgresURL)
|
||||
if err != nil {
|
||||
return fmt.Errorf("connect database: %w", err)
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
summary, err := posixproj.NewProjector(db, cfg.POSIXRoot).RebuildWithSummary(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Printf(
|
||||
"POSIX projection rebuilt from %s\n total nodes: %d\n directories: %d\n files: %d\n",
|
||||
cfg.POSIXRoot,
|
||||
summary.TotalNodes,
|
||||
summary.DirectoryCount,
|
||||
summary.FileCount,
|
||||
)
|
||||
return nil
|
||||
}
|
||||
@@ -1,10 +1,16 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"log"
|
||||
"os/signal"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"moku-backend/internal/bootstrap"
|
||||
"moku-backend/internal/process"
|
||||
"moku-backend/internal/jobs"
|
||||
"moku-backend/internal/worker"
|
||||
)
|
||||
|
||||
func main() {
|
||||
@@ -18,9 +24,25 @@ func main() {
|
||||
}
|
||||
}()
|
||||
|
||||
app.Logger.Info("worker ready", "service", app.ServiceName, "environment", app.Config.Environment)
|
||||
jobStore := jobs.NewStore(app.Database)
|
||||
runner := worker.NewRunner(jobStore, app.Logger, time.Second)
|
||||
runner.Register(jobs.KindBootstrapStructureMaterialize, func(ctx context.Context, job jobs.Job) error {
|
||||
var payload jobs.BootstrapStructureMaterializePayload
|
||||
if len(job.Payload) > 0 {
|
||||
if err := json.Unmarshal(job.Payload, &payload); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
if err := process.WaitForShutdown(app.ServiceName, app.Logger); err != nil {
|
||||
return bootstrap.NewService(app.Database, app.Config.POSIXRoot).ProcessBootstrapStructureMaterialization(ctx, payload.InstallationID)
|
||||
})
|
||||
|
||||
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
||||
defer stop()
|
||||
|
||||
app.Logger.Info("worker ready", "service", app.ServiceName, "environment", app.Config.Environment, "pollInterval", time.Second)
|
||||
|
||||
if err := runner.Run(ctx); err != nil {
|
||||
app.Logger.Error("worker stopped", "error", err)
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,180 @@
|
||||
-- +goose Up
|
||||
|
||||
CREATE TYPE instance_mode AS ENUM ('personal', 'organizational');
|
||||
CREATE TYPE instance_access AS ENUM ('local', 'remote');
|
||||
CREATE TYPE instance_protocol AS ENUM ('http', 'https');
|
||||
CREATE TYPE workspace_kind AS ENUM ('organization', 'department', 'team', 'project');
|
||||
CREATE TYPE membership_role AS ENUM ('owner', 'admin', 'member');
|
||||
|
||||
CREATE TABLE IF NOT EXISTS installations (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
singleton BOOLEAN NOT NULL DEFAULT TRUE UNIQUE,
|
||||
mode instance_mode NOT NULL,
|
||||
access instance_access NOT NULL,
|
||||
protocol instance_protocol NOT NULL DEFAULT 'http',
|
||||
host TEXT NOT NULL,
|
||||
is_bootstrapped BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
bootstrapped_at TIMESTAMPTZ,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS users (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
email TEXT NOT NULL,
|
||||
display_name TEXT NOT NULL,
|
||||
password_hash TEXT NOT NULL,
|
||||
is_instance_admin BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||
);
|
||||
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS idx_users_email_unique ON users (LOWER(email));
|
||||
|
||||
CREATE TABLE IF NOT EXISTS user_homes (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
user_id UUID NOT NULL UNIQUE REFERENCES users(id) ON DELETE CASCADE,
|
||||
title TEXT NOT NULL,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||
);
|
||||
|
||||
ALTER TABLE organizations
|
||||
ADD COLUMN IF NOT EXISTS created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS organization_memberships (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
organization_id UUID NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,
|
||||
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||
role membership_role NOT NULL DEFAULT 'member',
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
UNIQUE (organization_id, user_id)
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_organization_memberships_user_id ON organization_memberships (user_id);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS departments (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
organization_id UUID NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,
|
||||
name TEXT NOT NULL,
|
||||
slug TEXT NOT NULL,
|
||||
created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
UNIQUE (organization_id, slug)
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_departments_organization_id ON departments (organization_id);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS teams (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
organization_id UUID NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,
|
||||
department_id UUID REFERENCES departments(id) ON DELETE SET NULL,
|
||||
name TEXT NOT NULL,
|
||||
slug TEXT NOT NULL,
|
||||
created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
UNIQUE (organization_id, slug)
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_teams_organization_id ON teams (organization_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_teams_department_id ON teams (department_id);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS team_memberships (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
team_id UUID NOT NULL REFERENCES teams(id) ON DELETE CASCADE,
|
||||
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||
role membership_role NOT NULL DEFAULT 'member',
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
UNIQUE (team_id, user_id)
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_team_memberships_user_id ON team_memberships (user_id);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS projects (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
organization_id UUID NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,
|
||||
department_id UUID REFERENCES departments(id) ON DELETE SET NULL,
|
||||
team_id UUID REFERENCES teams(id) ON DELETE SET NULL,
|
||||
name TEXT NOT NULL,
|
||||
slug TEXT NOT NULL,
|
||||
created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
UNIQUE (organization_id, slug)
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_projects_organization_id ON projects (organization_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_projects_department_id ON projects (department_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_projects_team_id ON projects (team_id);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS project_memberships (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
project_id UUID NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
|
||||
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||
role membership_role NOT NULL DEFAULT 'member',
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
UNIQUE (project_id, user_id)
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_project_memberships_user_id ON project_memberships (user_id);
|
||||
|
||||
ALTER TABLE workspaces
|
||||
ADD COLUMN IF NOT EXISTS kind workspace_kind NOT NULL DEFAULT 'organization',
|
||||
ADD COLUMN IF NOT EXISTS created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL,
|
||||
ADD COLUMN IF NOT EXISTS department_id UUID REFERENCES departments(id) ON DELETE SET NULL,
|
||||
ADD COLUMN IF NOT EXISTS team_id UUID REFERENCES teams(id) ON DELETE SET NULL,
|
||||
ADD COLUMN IF NOT EXISTS project_id UUID REFERENCES projects(id) ON DELETE SET NULL;
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_workspaces_department_id ON workspaces (department_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_workspaces_team_id ON workspaces (team_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_workspaces_project_id ON workspaces (project_id);
|
||||
|
||||
-- +goose Down
|
||||
|
||||
DROP INDEX IF EXISTS idx_workspaces_project_id;
|
||||
DROP INDEX IF EXISTS idx_workspaces_team_id;
|
||||
DROP INDEX IF EXISTS idx_workspaces_department_id;
|
||||
|
||||
ALTER TABLE workspaces
|
||||
DROP COLUMN IF EXISTS project_id,
|
||||
DROP COLUMN IF EXISTS team_id,
|
||||
DROP COLUMN IF EXISTS department_id,
|
||||
DROP COLUMN IF EXISTS created_by_user_id,
|
||||
DROP COLUMN IF EXISTS kind;
|
||||
|
||||
DROP INDEX IF EXISTS idx_project_memberships_user_id;
|
||||
DROP TABLE IF EXISTS project_memberships;
|
||||
|
||||
DROP INDEX IF EXISTS idx_projects_team_id;
|
||||
DROP INDEX IF EXISTS idx_projects_department_id;
|
||||
DROP INDEX IF EXISTS idx_projects_organization_id;
|
||||
DROP TABLE IF EXISTS projects;
|
||||
|
||||
DROP INDEX IF EXISTS idx_team_memberships_user_id;
|
||||
DROP TABLE IF EXISTS team_memberships;
|
||||
|
||||
DROP INDEX IF EXISTS idx_teams_department_id;
|
||||
DROP INDEX IF EXISTS idx_teams_organization_id;
|
||||
DROP TABLE IF EXISTS teams;
|
||||
|
||||
DROP INDEX IF EXISTS idx_departments_organization_id;
|
||||
DROP TABLE IF EXISTS departments;
|
||||
|
||||
DROP INDEX IF EXISTS idx_organization_memberships_user_id;
|
||||
DROP TABLE IF EXISTS organization_memberships;
|
||||
|
||||
ALTER TABLE organizations
|
||||
DROP COLUMN IF EXISTS created_by_user_id;
|
||||
|
||||
DROP TABLE IF EXISTS user_homes;
|
||||
DROP INDEX IF EXISTS idx_users_email_unique;
|
||||
DROP TABLE IF EXISTS users;
|
||||
DROP TABLE IF EXISTS installations;
|
||||
|
||||
DROP TYPE IF EXISTS membership_role;
|
||||
DROP TYPE IF EXISTS workspace_kind;
|
||||
DROP TYPE IF EXISTS instance_protocol;
|
||||
DROP TYPE IF EXISTS instance_access;
|
||||
DROP TYPE IF EXISTS instance_mode;
|
||||
@@ -0,0 +1,9 @@
|
||||
-- +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;
|
||||
@@ -0,0 +1,45 @@
|
||||
-- +goose Up
|
||||
|
||||
CREATE TYPE posix_node_kind AS ENUM ('directory', 'file');
|
||||
|
||||
CREATE TABLE IF NOT EXISTS posix_nodes (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
path TEXT NOT NULL UNIQUE,
|
||||
parent_path TEXT,
|
||||
name TEXT NOT NULL,
|
||||
depth INTEGER NOT NULL,
|
||||
node_kind posix_node_kind NOT NULL,
|
||||
logical_type TEXT NOT NULL DEFAULT 'generic',
|
||||
file_role TEXT,
|
||||
resource_id TEXT,
|
||||
resource_name TEXT,
|
||||
resource_slug TEXT,
|
||||
installation_id TEXT,
|
||||
organization_id TEXT,
|
||||
organization_slug TEXT,
|
||||
department_slug TEXT,
|
||||
team_slug TEXT,
|
||||
project_slug TEXT,
|
||||
personal_slug TEXT,
|
||||
content_json JSONB,
|
||||
size_bytes BIGINT NOT NULL DEFAULT 0,
|
||||
checksum TEXT,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_posix_nodes_parent_path ON posix_nodes (parent_path);
|
||||
CREATE INDEX IF NOT EXISTS idx_posix_nodes_logical_type ON posix_nodes (logical_type);
|
||||
CREATE INDEX IF NOT EXISTS idx_posix_nodes_project_slug ON posix_nodes (project_slug);
|
||||
CREATE INDEX IF NOT EXISTS idx_posix_nodes_department_slug ON posix_nodes (department_slug);
|
||||
CREATE INDEX IF NOT EXISTS idx_posix_nodes_team_slug ON posix_nodes (team_slug);
|
||||
|
||||
-- +goose Down
|
||||
|
||||
DROP INDEX IF EXISTS idx_posix_nodes_team_slug;
|
||||
DROP INDEX IF EXISTS idx_posix_nodes_department_slug;
|
||||
DROP INDEX IF EXISTS idx_posix_nodes_project_slug;
|
||||
DROP INDEX IF EXISTS idx_posix_nodes_logical_type;
|
||||
DROP INDEX IF EXISTS idx_posix_nodes_parent_path;
|
||||
DROP TABLE IF EXISTS posix_nodes;
|
||||
DROP TYPE IF EXISTS posix_node_kind;
|
||||
@@ -0,0 +1,64 @@
|
||||
-- +goose Up
|
||||
|
||||
CREATE TYPE bootstrap_materialization_status AS ENUM ('not_started', 'pending', 'running', 'succeeded', 'failed');
|
||||
CREATE TYPE background_job_status AS ENUM ('pending', 'running', 'succeeded', 'failed');
|
||||
|
||||
ALTER TABLE installations
|
||||
ADD COLUMN IF NOT EXISTS materialization_status bootstrap_materialization_status NOT NULL DEFAULT 'not_started',
|
||||
ADD COLUMN IF NOT EXISTS materialization_error TEXT,
|
||||
ADD COLUMN IF NOT EXISTS materialization_requested_at TIMESTAMPTZ,
|
||||
ADD COLUMN IF NOT EXISTS materialization_started_at TIMESTAMPTZ,
|
||||
ADD COLUMN IF NOT EXISTS materialization_finished_at TIMESTAMPTZ;
|
||||
|
||||
UPDATE installations
|
||||
SET
|
||||
materialization_status = CASE
|
||||
WHEN is_bootstrapped THEN 'succeeded'::bootstrap_materialization_status
|
||||
ELSE 'not_started'::bootstrap_materialization_status
|
||||
END,
|
||||
materialization_error = NULL,
|
||||
materialization_requested_at = CASE
|
||||
WHEN is_bootstrapped THEN COALESCE(bootstrapped_at, created_at, NOW())
|
||||
ELSE NULL
|
||||
END,
|
||||
materialization_started_at = CASE
|
||||
WHEN is_bootstrapped THEN COALESCE(bootstrapped_at, created_at, NOW())
|
||||
ELSE NULL
|
||||
END,
|
||||
materialization_finished_at = CASE
|
||||
WHEN is_bootstrapped THEN COALESCE(bootstrapped_at, created_at, NOW())
|
||||
ELSE NULL
|
||||
END
|
||||
WHERE materialization_status = 'not_started'::bootstrap_materialization_status;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS background_jobs (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
kind TEXT NOT NULL,
|
||||
status background_job_status NOT NULL DEFAULT 'pending',
|
||||
payload JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||
attempts INTEGER NOT NULL DEFAULT 0,
|
||||
max_attempts INTEGER NOT NULL DEFAULT 1,
|
||||
available_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
started_at TIMESTAMPTZ,
|
||||
finished_at TIMESTAMPTZ,
|
||||
last_error TEXT,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_background_jobs_claim ON background_jobs (status, available_at, created_at);
|
||||
|
||||
-- +goose Down
|
||||
|
||||
DROP INDEX IF EXISTS idx_background_jobs_claim;
|
||||
DROP TABLE IF EXISTS background_jobs;
|
||||
|
||||
ALTER TABLE installations
|
||||
DROP COLUMN IF EXISTS materialization_finished_at,
|
||||
DROP COLUMN IF EXISTS materialization_started_at,
|
||||
DROP COLUMN IF EXISTS materialization_requested_at,
|
||||
DROP COLUMN IF EXISTS materialization_error,
|
||||
DROP COLUMN IF EXISTS materialization_status;
|
||||
|
||||
DROP TYPE IF EXISTS background_job_status;
|
||||
DROP TYPE IF EXISTS bootstrap_materialization_status;
|
||||
+39
-3
@@ -23,14 +23,50 @@ target "dev-image" {
|
||||
tags = ["${REGISTRY}/moku/work-backend:dev-${TAG}"]
|
||||
}
|
||||
|
||||
target "prod-api" {
|
||||
inherits = ["_app"]
|
||||
target = "runtime"
|
||||
args = {
|
||||
SERVICE_NAME = "api"
|
||||
}
|
||||
tags = ["moku/work-backend:local-prod-api"]
|
||||
}
|
||||
|
||||
target "prod-worker" {
|
||||
inherits = ["_app"]
|
||||
target = "runtime"
|
||||
args = {
|
||||
SERVICE_NAME = "worker"
|
||||
}
|
||||
tags = ["moku/work-backend:local-prod-worker"]
|
||||
}
|
||||
|
||||
target "prod-api-image" {
|
||||
inherits = ["_app"]
|
||||
target = "runtime"
|
||||
args = {
|
||||
SERVICE_NAME = "api"
|
||||
}
|
||||
tags = ["${REGISTRY}/moku/work-backend:prod-api-${TAG}"]
|
||||
}
|
||||
|
||||
target "prod-worker-image" {
|
||||
inherits = ["_app"]
|
||||
target = "runtime"
|
||||
args = {
|
||||
SERVICE_NAME = "worker"
|
||||
}
|
||||
tags = ["${REGISTRY}/moku/work-backend:prod-worker-${TAG}"]
|
||||
}
|
||||
|
||||
group "local" {
|
||||
targets = ["dev"]
|
||||
targets = ["dev", "prod-api", "prod-worker"]
|
||||
}
|
||||
|
||||
group "registry" {
|
||||
targets = ["dev-image"]
|
||||
targets = ["dev-image", "prod-api-image", "prod-worker-image"]
|
||||
}
|
||||
|
||||
group "default" {
|
||||
targets = ["dev"]
|
||||
targets = ["dev", "prod-api", "prod-worker"]
|
||||
}
|
||||
|
||||
@@ -0,0 +1,159 @@
|
||||
package bootstrap
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"strings"
|
||||
|
||||
"github.com/jackc/pgx/v5"
|
||||
)
|
||||
|
||||
const (
|
||||
materializationNotStarted = "not_started"
|
||||
materializationPending = "pending"
|
||||
materializationRunning = "running"
|
||||
materializationSucceeded = "succeeded"
|
||||
materializationFailed = "failed"
|
||||
)
|
||||
|
||||
type bootstrapStructurePrerequisites struct {
|
||||
installation InstallationRecord
|
||||
admin AdminSummary
|
||||
}
|
||||
|
||||
func (service *Service) GetInstallation(ctx context.Context) (*InstallationRecord, error) {
|
||||
record, err := scanInstallationRecord(service.db.Pool.QueryRow(ctx, `
|
||||
SELECT
|
||||
id::text,
|
||||
name,
|
||||
mode::text,
|
||||
access::text,
|
||||
protocol::text,
|
||||
host,
|
||||
is_bootstrapped,
|
||||
materialization_status::text,
|
||||
materialization_error
|
||||
FROM installations
|
||||
WHERE singleton = TRUE
|
||||
LIMIT 1;
|
||||
`))
|
||||
if err != nil {
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &record, nil
|
||||
}
|
||||
|
||||
func loadInstallation(ctx context.Context, tx pgx.Tx) (InstallationRecord, error) {
|
||||
return scanInstallationRecord(tx.QueryRow(ctx, `
|
||||
SELECT
|
||||
id::text,
|
||||
name,
|
||||
mode::text,
|
||||
access::text,
|
||||
protocol::text,
|
||||
host,
|
||||
is_bootstrapped,
|
||||
materialization_status::text,
|
||||
materialization_error
|
||||
FROM installations
|
||||
WHERE singleton = TRUE
|
||||
LIMIT 1;
|
||||
`))
|
||||
}
|
||||
|
||||
func updateBootstrappedInstallation(ctx context.Context, tx pgx.Tx) (InstallationRecord, error) {
|
||||
return scanInstallationRecord(tx.QueryRow(ctx, `
|
||||
UPDATE installations
|
||||
SET
|
||||
is_bootstrapped = TRUE,
|
||||
bootstrapped_at = COALESCE(bootstrapped_at, NOW()),
|
||||
materialization_status = 'pending'::bootstrap_materialization_status,
|
||||
materialization_error = NULL,
|
||||
materialization_requested_at = NOW(),
|
||||
materialization_started_at = NULL,
|
||||
materialization_finished_at = NULL,
|
||||
updated_at = NOW()
|
||||
WHERE singleton = TRUE
|
||||
RETURNING
|
||||
id::text,
|
||||
name,
|
||||
mode::text,
|
||||
access::text,
|
||||
protocol::text,
|
||||
host,
|
||||
is_bootstrapped,
|
||||
materialization_status::text,
|
||||
materialization_error;
|
||||
`))
|
||||
}
|
||||
|
||||
func scanInstallationRecord(row pgx.Row) (InstallationRecord, error) {
|
||||
var record InstallationRecord
|
||||
if err := row.Scan(
|
||||
&record.ID,
|
||||
&record.Name,
|
||||
&record.Mode,
|
||||
&record.Access,
|
||||
&record.Protocol,
|
||||
&record.Host,
|
||||
&record.IsBootstrapped,
|
||||
&record.MaterializationStatus,
|
||||
&record.MaterializationError,
|
||||
); err != nil {
|
||||
return InstallationRecord{}, err
|
||||
}
|
||||
|
||||
if strings.TrimSpace(record.MaterializationStatus) == "" {
|
||||
record.MaterializationStatus = materializationNotStarted
|
||||
}
|
||||
|
||||
return record, nil
|
||||
}
|
||||
|
||||
func loadPrimaryAdmin(ctx context.Context, tx pgx.Tx) (AdminSummary, error) {
|
||||
var admin AdminSummary
|
||||
if err := tx.QueryRow(ctx, `
|
||||
SELECT id::text, email, display_name
|
||||
FROM users
|
||||
WHERE is_instance_admin = TRUE
|
||||
ORDER BY created_at ASC
|
||||
LIMIT 1;
|
||||
`).Scan(&admin.ID, &admin.Email, &admin.DisplayName); err != nil {
|
||||
return AdminSummary{}, err
|
||||
}
|
||||
|
||||
return admin, nil
|
||||
}
|
||||
|
||||
func (service *Service) loadBootstrapStructurePrerequisites(
|
||||
ctx context.Context,
|
||||
tx pgx.Tx,
|
||||
) (bootstrapStructurePrerequisites, error) {
|
||||
installation, err := loadInstallation(ctx, tx)
|
||||
if err != nil {
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return bootstrapStructurePrerequisites{}, ErrInstallationNotConfigured
|
||||
}
|
||||
|
||||
return bootstrapStructurePrerequisites{}, err
|
||||
}
|
||||
|
||||
admin, err := loadPrimaryAdmin(ctx, tx)
|
||||
if err != nil {
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return bootstrapStructurePrerequisites{}, ErrAdminNotConfigured
|
||||
}
|
||||
|
||||
return bootstrapStructurePrerequisites{}, err
|
||||
}
|
||||
|
||||
return bootstrapStructurePrerequisites{
|
||||
installation: installation,
|
||||
admin: admin,
|
||||
}, nil
|
||||
}
|
||||
@@ -0,0 +1,180 @@
|
||||
package bootstrap
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"moku-backend/internal/jobs"
|
||||
"moku-backend/internal/posixproj"
|
||||
)
|
||||
|
||||
func (service *Service) enqueueBootstrapStructureMaterialization(
|
||||
ctx context.Context,
|
||||
installation *InstallationRecord,
|
||||
) error {
|
||||
if installation == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
jobStore := jobs.NewStore(service.db)
|
||||
if _, err := jobStore.Enqueue(ctx, jobs.EnqueueInput{
|
||||
Kind: jobs.KindBootstrapStructureMaterialize,
|
||||
Payload: jobs.BootstrapStructureMaterializePayload{
|
||||
InstallationID: installation.ID,
|
||||
},
|
||||
}); err != nil {
|
||||
failure := fmt.Sprintf("enqueue bootstrap materialization job: %v", err)
|
||||
if markErr := service.markBootstrapMaterializationFailed(ctx, installation.ID, failure); markErr != nil {
|
||||
return errors.Join(err, markErr)
|
||||
}
|
||||
|
||||
// The relational bootstrap write already committed successfully, so keep the
|
||||
// response successful and surface the enqueue problem via materialization state.
|
||||
installation.MaterializationStatus = materializationFailed
|
||||
installation.MaterializationError = &failure
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (service *Service) ProcessBootstrapStructureMaterialization(ctx context.Context, installationID string) error {
|
||||
trimmedInstallationID := strings.TrimSpace(installationID)
|
||||
if trimmedInstallationID == "" {
|
||||
return ErrInstallationNotConfigured
|
||||
}
|
||||
|
||||
installation, err := service.GetInstallation(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if installation == nil || installation.ID != trimmedInstallationID {
|
||||
return ErrInstallationNotConfigured
|
||||
}
|
||||
|
||||
if err := service.markBootstrapMaterializationRunning(ctx, trimmedInstallationID); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := service.materializeBootstrapStructure(ctx, *installation); err != nil {
|
||||
failure := strings.TrimSpace(err.Error())
|
||||
if failure == "" {
|
||||
failure = "bootstrap materialization failed"
|
||||
}
|
||||
|
||||
if markErr := service.markBootstrapMaterializationFailed(ctx, trimmedInstallationID, failure); markErr != nil {
|
||||
return errors.Join(err, markErr)
|
||||
}
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
return service.markBootstrapMaterializationSucceeded(ctx, trimmedInstallationID)
|
||||
}
|
||||
|
||||
func (service *Service) materializeBootstrapStructure(ctx context.Context, installation InstallationRecord) error {
|
||||
admin, err := service.GetAdmin(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if admin == nil {
|
||||
return ErrAdminNotConfigured
|
||||
}
|
||||
|
||||
organization, err := service.loadPrimaryOrganization(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if organization == nil {
|
||||
return ErrBootstrapStructureMissing
|
||||
}
|
||||
|
||||
department, err := service.loadPrimaryDepartment(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if department == nil {
|
||||
return ErrBootstrapStructureMissing
|
||||
}
|
||||
|
||||
team, err := service.loadPrimaryTeam(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if team == nil {
|
||||
return ErrBootstrapStructureMissing
|
||||
}
|
||||
|
||||
project, err := service.loadPrimaryProject(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if project == nil {
|
||||
return ErrBootstrapStructureMissing
|
||||
}
|
||||
|
||||
if err := service.ensureBootstrapPOSIXSkeleton(
|
||||
installation,
|
||||
AdminSummary{ID: admin.ID, Email: admin.Email, DisplayName: admin.DisplayName},
|
||||
namedRecord{ID: organization.ID, Name: organization.Name, Slug: organization.Slug},
|
||||
namedRecord{ID: department.ID, Name: department.Name, Slug: department.Slug},
|
||||
namedRecord{ID: team.ID, Name: team.Name, Slug: team.Slug},
|
||||
namedRecord{ID: project.ID, Name: project.Name, Slug: project.Slug},
|
||||
); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return service.rebuildProjection(ctx)
|
||||
}
|
||||
|
||||
func (service *Service) rebuildProjection(ctx context.Context) error {
|
||||
if err := posixproj.NewProjector(service.db, service.posixRoot).Rebuild(ctx); err != nil {
|
||||
return fmt.Errorf("rebuild POSIX projection: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (service *Service) markBootstrapMaterializationRunning(ctx context.Context, installationID string) error {
|
||||
_, err := service.db.Pool.Exec(ctx, `
|
||||
UPDATE installations
|
||||
SET
|
||||
materialization_status = 'running'::bootstrap_materialization_status,
|
||||
materialization_error = NULL,
|
||||
materialization_started_at = NOW(),
|
||||
materialization_finished_at = NULL,
|
||||
updated_at = NOW()
|
||||
WHERE id = $1::uuid;
|
||||
`, strings.TrimSpace(installationID))
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
func (service *Service) markBootstrapMaterializationSucceeded(ctx context.Context, installationID string) error {
|
||||
_, err := service.db.Pool.Exec(ctx, `
|
||||
UPDATE installations
|
||||
SET
|
||||
materialization_status = 'succeeded'::bootstrap_materialization_status,
|
||||
materialization_error = NULL,
|
||||
materialization_finished_at = NOW(),
|
||||
updated_at = NOW()
|
||||
WHERE id = $1::uuid;
|
||||
`, strings.TrimSpace(installationID))
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
func (service *Service) markBootstrapMaterializationFailed(ctx context.Context, installationID, failure string) error {
|
||||
_, err := service.db.Pool.Exec(ctx, `
|
||||
UPDATE installations
|
||||
SET
|
||||
materialization_status = 'failed'::bootstrap_materialization_status,
|
||||
materialization_error = $2,
|
||||
materialization_finished_at = NOW(),
|
||||
updated_at = NOW()
|
||||
WHERE id = $1::uuid;
|
||||
`, strings.TrimSpace(installationID), strings.TrimSpace(failure))
|
||||
|
||||
return err
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
package bootstrap
|
||||
|
||||
import "context"
|
||||
|
||||
func (service *Service) GetState(ctx context.Context) (BootstrapState, error) {
|
||||
installation, err := service.GetInstallation(ctx)
|
||||
if err != nil {
|
||||
return BootstrapState{}, err
|
||||
}
|
||||
|
||||
admin, err := service.GetAdmin(ctx)
|
||||
if err != nil {
|
||||
return BootstrapState{}, err
|
||||
}
|
||||
|
||||
structure, err := service.GetStructure(ctx)
|
||||
if err != nil {
|
||||
return BootstrapState{}, err
|
||||
}
|
||||
|
||||
return BootstrapState{
|
||||
Installation: installation,
|
||||
Admin: admin,
|
||||
Structure: structure,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (service *Service) GetAppShellState(ctx context.Context) (AppShellState, error) {
|
||||
installation, err := service.GetInstallation(ctx)
|
||||
if err != nil {
|
||||
return AppShellState{}, err
|
||||
}
|
||||
|
||||
admin, err := service.GetAdmin(ctx)
|
||||
if err != nil {
|
||||
return AppShellState{}, err
|
||||
}
|
||||
|
||||
organizations, err := service.listOrganizations(ctx)
|
||||
if err != nil {
|
||||
return AppShellState{}, err
|
||||
}
|
||||
|
||||
departments, err := service.listDepartments(ctx)
|
||||
if err != nil {
|
||||
return AppShellState{}, err
|
||||
}
|
||||
|
||||
teams, err := service.listTeams(ctx)
|
||||
if err != nil {
|
||||
return AppShellState{}, err
|
||||
}
|
||||
|
||||
projects, err := service.listProjects(ctx)
|
||||
if err != nil {
|
||||
return AppShellState{}, err
|
||||
}
|
||||
|
||||
workspaces, err := service.listWorkspaces(ctx)
|
||||
if err != nil {
|
||||
return AppShellState{}, err
|
||||
}
|
||||
|
||||
return AppShellState{
|
||||
Installation: installation,
|
||||
Admin: admin,
|
||||
Organizations: organizations,
|
||||
Departments: departments,
|
||||
Teams: teams,
|
||||
Projects: projects,
|
||||
Workspaces: workspaces,
|
||||
}, nil
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,639 @@
|
||||
package bootstrap
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
type fakeRow struct {
|
||||
scan func(dest ...any) error
|
||||
}
|
||||
|
||||
func (row fakeRow) Scan(dest ...any) error {
|
||||
return row.scan(dest...)
|
||||
}
|
||||
|
||||
func TestScanInstallationRecordDefaultsMaterializationStatus(t *testing.T) {
|
||||
record, err := scanInstallationRecord(fakeRow{scan: func(dest ...any) error {
|
||||
*(dest[0].(*string)) = "installation-1"
|
||||
*(dest[1].(*string)) = "MangoPig"
|
||||
*(dest[2].(*string)) = "personal"
|
||||
*(dest[3].(*string)) = "local"
|
||||
*(dest[4].(*string)) = "http"
|
||||
*(dest[5].(*string)) = "localhost"
|
||||
*(dest[6].(*bool)) = true
|
||||
*(dest[7].(*string)) = ""
|
||||
*(dest[8].(**string)) = nil
|
||||
return nil
|
||||
}})
|
||||
if err != nil {
|
||||
t.Fatalf("scanInstallationRecord: %v", err)
|
||||
}
|
||||
|
||||
if record.MaterializationStatus != materializationNotStarted {
|
||||
t.Fatalf("expected default materialization status %q, got %q", materializationNotStarted, record.MaterializationStatus)
|
||||
}
|
||||
if record.MaterializationError != nil {
|
||||
t.Fatalf("expected nil materialization error, got %#v", record.MaterializationError)
|
||||
}
|
||||
}
|
||||
|
||||
func TestScanInstallationRecordPreservesMaterializationFields(t *testing.T) {
|
||||
failure := "projection rebuild failed"
|
||||
|
||||
record, err := scanInstallationRecord(fakeRow{scan: func(dest ...any) error {
|
||||
*(dest[0].(*string)) = "installation-2"
|
||||
*(dest[1].(*string)) = "MangoPig"
|
||||
*(dest[2].(*string)) = "personal"
|
||||
*(dest[3].(*string)) = "local"
|
||||
*(dest[4].(*string)) = "http"
|
||||
*(dest[5].(*string)) = "localhost"
|
||||
*(dest[6].(*bool)) = true
|
||||
*(dest[7].(*string)) = materializationFailed
|
||||
*(dest[8].(**string)) = &failure
|
||||
return nil
|
||||
}})
|
||||
if err != nil {
|
||||
t.Fatalf("scanInstallationRecord: %v", err)
|
||||
}
|
||||
|
||||
if record.MaterializationStatus != materializationFailed {
|
||||
t.Fatalf("expected materialization status %q, got %q", materializationFailed, record.MaterializationStatus)
|
||||
}
|
||||
if record.MaterializationError == nil || *record.MaterializationError != failure {
|
||||
t.Fatalf("expected materialization error %q, got %#v", failure, record.MaterializationError)
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnsureBootstrapPOSIXSkeletonInitializesEmptyRoot(t *testing.T) {
|
||||
rootPath := filepath.Join(t.TempDir(), "POSIX")
|
||||
t.Setenv("POSIX_ROOT", rootPath)
|
||||
|
||||
if _, err := os.Stat(rootPath); !os.IsNotExist(err) {
|
||||
t.Fatalf("expected isolated POSIX root to start absent, got err=%v", err)
|
||||
}
|
||||
|
||||
service := NewService(nil, os.Getenv("POSIX_ROOT"))
|
||||
|
||||
err := service.ensureBootstrapPOSIXSkeleton(
|
||||
InstallationRecord{
|
||||
ID: "installation-1",
|
||||
Name: "MangoPig",
|
||||
Mode: "personal",
|
||||
Access: "local",
|
||||
Protocol: "http",
|
||||
Host: "localhost",
|
||||
IsBootstrapped: true,
|
||||
},
|
||||
AdminSummary{
|
||||
ID: "admin-1",
|
||||
Email: "ronald@example.com",
|
||||
DisplayName: "Ronald",
|
||||
},
|
||||
namedRecord{ID: "org-1", Name: "Primary Organization", Slug: "primary-organization"},
|
||||
namedRecord{ID: "dept-1", Name: "Primary Department", Slug: "primary-department"},
|
||||
namedRecord{ID: "team-1", Name: "Primary Team", Slug: "primary-team"},
|
||||
namedRecord{ID: "project-1", Name: "Primary Project", Slug: "primary-project"},
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("ensure bootstrap POSIX skeleton: %v", err)
|
||||
}
|
||||
|
||||
requiredPaths := []string{
|
||||
filepath.Join(rootPath, "settings.json"),
|
||||
filepath.Join(rootPath, "layout.json"),
|
||||
filepath.Join(rootPath, "catalog", "packs"),
|
||||
filepath.Join(rootPath, "catalog", "standalone"),
|
||||
filepath.Join(rootPath, "departments", "department-primary-department", "settings.json"),
|
||||
filepath.Join(rootPath, "departments", "department-primary-department", "users.json"),
|
||||
filepath.Join(rootPath, "departments", "department-primary-department", "teams", "team-primary-team", "settings.json"),
|
||||
filepath.Join(rootPath, "departments", "department-primary-department", "teams", "team-primary-team", "users.json"),
|
||||
filepath.Join(rootPath, "projects", "project-primary-project", "settings.json"),
|
||||
filepath.Join(rootPath, "projects", "project-primary-project", "home.json"),
|
||||
filepath.Join(rootPath, "projects", "project-primary-project", "acl.json"),
|
||||
filepath.Join(rootPath, "projects", "project-primary-project", "children"),
|
||||
filepath.Join(rootPath, "projects", "project-primary-project", "tree"),
|
||||
filepath.Join(rootPath, "users", "settings.json"),
|
||||
filepath.Join(rootPath, "users", "data.json"),
|
||||
filepath.Join(rootPath, "users", "personals"),
|
||||
filepath.Join(rootPath, "users", "personals", "personal-ronald", "settings.json"),
|
||||
filepath.Join(rootPath, "users", "personals", "personal-ronald", "layout.json"),
|
||||
filepath.Join(rootPath, "users", "personals", "personal-ronald", "home.json"),
|
||||
filepath.Join(rootPath, "users", "personals", "personal-ronald", "tree"),
|
||||
}
|
||||
|
||||
for _, path := range requiredPaths {
|
||||
if _, err := os.Stat(path); err != nil {
|
||||
t.Fatalf("expected path to exist %s: %v", path, err)
|
||||
}
|
||||
}
|
||||
|
||||
settingsPayload := readJSONFileForTest[map[string]any](t, filepath.Join(rootPath, "settings.json"))
|
||||
installationPayload, ok := settingsPayload["installation"].(map[string]any)
|
||||
if !ok {
|
||||
t.Fatalf("settings.json missing installation object: %#v", settingsPayload)
|
||||
}
|
||||
if installationPayload["name"] != "MangoPig" {
|
||||
t.Fatalf("expected installation name MangoPig, got %#v", installationPayload["name"])
|
||||
}
|
||||
if installationPayload["isBootstrapped"] != true {
|
||||
t.Fatalf("expected installation to be bootstrapped, got %#v", installationPayload["isBootstrapped"])
|
||||
}
|
||||
|
||||
layoutPayload := readJSONFileForTest[map[string]any](t, filepath.Join(rootPath, "layout.json"))
|
||||
homePayload, ok := layoutPayload["home"].(map[string]any)
|
||||
if !ok {
|
||||
t.Fatalf("layout.json missing home object: %#v", layoutPayload)
|
||||
}
|
||||
if homePayload["defaultProjectSlug"] != "primary-project" {
|
||||
t.Fatalf("expected default project slug primary-project, got %#v", homePayload["defaultProjectSlug"])
|
||||
}
|
||||
|
||||
projectSettings := readJSONFileForTest[map[string]any](t, filepath.Join(rootPath, "projects", "project-primary-project", "settings.json"))
|
||||
if projectSettings["type"] != "project" {
|
||||
t.Fatalf("expected project settings type project, got %#v", projectSettings["type"])
|
||||
}
|
||||
|
||||
projectACL := readJSONFileForTest[map[string]any](t, filepath.Join(rootPath, "projects", "project-primary-project", "acl.json"))
|
||||
if projectACL["inherits"] != true {
|
||||
t.Fatalf("expected project acl to inherit by default, got %#v", projectACL["inherits"])
|
||||
}
|
||||
|
||||
usersSettings := readJSONFileForTest[map[string]any](t, filepath.Join(rootPath, "users", "settings.json"))
|
||||
if usersSettings["primaryAdminId"] != "admin-1" {
|
||||
t.Fatalf("expected primary admin id admin-1, got %#v", usersSettings["primaryAdminId"])
|
||||
}
|
||||
|
||||
personalSettings := readJSONFileForTest[map[string]any](t, filepath.Join(rootPath, "users", "personals", "personal-ronald", "settings.json"))
|
||||
if personalSettings["type"] != "personal" {
|
||||
t.Fatalf("expected personal settings type personal, got %#v", personalSettings["type"])
|
||||
}
|
||||
if personalSettings["name"] != "Ronald" {
|
||||
t.Fatalf("expected personal name Ronald, got %#v", personalSettings["name"])
|
||||
}
|
||||
if personalSettings["slug"] != "ronald" {
|
||||
t.Fatalf("expected personal slug ronald, got %#v", personalSettings["slug"])
|
||||
}
|
||||
|
||||
personalHome := readJSONFileForTest[map[string]any](t, filepath.Join(rootPath, "users", "personals", "personal-ronald", "home.json"))
|
||||
if personalHome["type"] != "personal-home" {
|
||||
t.Fatalf("expected personal home type personal-home, got %#v", personalHome["type"])
|
||||
}
|
||||
if personalHome["title"] != "Ronald's Home" {
|
||||
t.Fatalf("expected personal home title Ronald's Home, got %#v", personalHome["title"])
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateProjectHierarchyFolderOnDiskCreatesExpectedFolderShape(t *testing.T) {
|
||||
rootPath := filepath.Join(t.TempDir(), "POSIX")
|
||||
service := NewService(nil, rootPath)
|
||||
|
||||
err := service.ensureBootstrapPOSIXSkeleton(
|
||||
InstallationRecord{ID: "installation-1", Name: "MangoPig", Mode: "personal", Access: "local", Protocol: "http", Host: "localhost", IsBootstrapped: true},
|
||||
AdminSummary{ID: "admin-1", Email: "ronald@example.com", DisplayName: "Ronald"},
|
||||
namedRecord{ID: "org-1", Name: "Primary Organization", Slug: "primary-organization"},
|
||||
namedRecord{ID: "dept-1", Name: "Primary Department", Slug: "primary-department"},
|
||||
namedRecord{ID: "team-1", Name: "Primary Team", Slug: "primary-team"},
|
||||
namedRecord{ID: "project-1", Name: "Primary Project", Slug: "primary-project"},
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("ensure bootstrap POSIX skeleton: %v", err)
|
||||
}
|
||||
|
||||
createdPath, createdSlug, err := service.createProjectHierarchyFolderOnDisk("primary-project", "", "Design System")
|
||||
if err != nil {
|
||||
t.Fatalf("createProjectHierarchyFolderOnDisk root folder: %v", err)
|
||||
}
|
||||
if createdPath != "projects/project-primary-project/children/folder-design-system" {
|
||||
t.Fatalf("unexpected created path: %s", createdPath)
|
||||
}
|
||||
if createdSlug != "design-system" {
|
||||
t.Fatalf("unexpected created slug: %s", createdSlug)
|
||||
}
|
||||
|
||||
createdFolderPath := filepath.Join(rootPath, "projects", "project-primary-project", "children", "folder-design-system")
|
||||
for _, path := range []string{
|
||||
filepath.Join(createdFolderPath, "folder.json"),
|
||||
filepath.Join(createdFolderPath, "acl.json"),
|
||||
filepath.Join(createdFolderPath, "children"),
|
||||
} {
|
||||
if _, err := os.Stat(path); err != nil {
|
||||
t.Fatalf("expected path to exist %s: %v", path, err)
|
||||
}
|
||||
}
|
||||
|
||||
folderPayload := readJSONFileForTest[map[string]any](t, filepath.Join(createdFolderPath, "folder.json"))
|
||||
if strings.TrimSpace(asStringForTest(folderPayload["id"])) == "" {
|
||||
t.Fatalf("expected created folder to have stable id, got %#v", folderPayload["id"])
|
||||
}
|
||||
if folderPayload["name"] != "Design System" {
|
||||
t.Fatalf("expected folder name Design System, got %#v", folderPayload["name"])
|
||||
}
|
||||
if folderPayload["slug"] != "design-system" {
|
||||
t.Fatalf("expected folder slug design-system, got %#v", folderPayload["slug"])
|
||||
}
|
||||
|
||||
nestedPath, nestedSlug, err := service.createProjectHierarchyFolderOnDisk("primary-project", createdPath, "Research")
|
||||
if err != nil {
|
||||
t.Fatalf("createProjectHierarchyFolderOnDisk nested folder: %v", err)
|
||||
}
|
||||
if nestedPath != "projects/project-primary-project/children/folder-design-system/children/folder-research" {
|
||||
t.Fatalf("unexpected nested path: %s", nestedPath)
|
||||
}
|
||||
if nestedSlug != "research" {
|
||||
t.Fatalf("unexpected nested slug: %s", nestedSlug)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateProjectTreeFolderOnDiskCreatesExpectedFolderShape(t *testing.T) {
|
||||
rootPath := filepath.Join(t.TempDir(), "POSIX")
|
||||
service := NewService(nil, rootPath)
|
||||
|
||||
err := service.ensureBootstrapPOSIXSkeleton(
|
||||
InstallationRecord{ID: "installation-1", Name: "MangoPig", Mode: "personal", Access: "local", Protocol: "http", Host: "localhost", IsBootstrapped: true},
|
||||
AdminSummary{ID: "admin-1", Email: "ronald@example.com", DisplayName: "Ronald"},
|
||||
namedRecord{ID: "org-1", Name: "Primary Organization", Slug: "primary-organization"},
|
||||
namedRecord{ID: "dept-1", Name: "Primary Department", Slug: "primary-department"},
|
||||
namedRecord{ID: "team-1", Name: "Primary Team", Slug: "primary-team"},
|
||||
namedRecord{ID: "project-1", Name: "Primary Project", Slug: "primary-project"},
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("ensure bootstrap POSIX skeleton: %v", err)
|
||||
}
|
||||
|
||||
createdPath, createdSlug, err := service.createProjectTreeFolderOnDisk("primary-project", "", "Docs")
|
||||
if err != nil {
|
||||
t.Fatalf("createProjectTreeFolderOnDisk root folder: %v", err)
|
||||
}
|
||||
if createdPath != "projects/project-primary-project/tree/folder-docs" {
|
||||
t.Fatalf("unexpected created path: %s", createdPath)
|
||||
}
|
||||
if createdSlug != "docs" {
|
||||
t.Fatalf("unexpected created slug: %s", createdSlug)
|
||||
}
|
||||
|
||||
createdFolderPath := filepath.Join(rootPath, "projects", "project-primary-project", "tree", "folder-docs")
|
||||
for _, path := range []string{
|
||||
filepath.Join(createdFolderPath, "folder.json"),
|
||||
filepath.Join(createdFolderPath, "acl.json"),
|
||||
filepath.Join(createdFolderPath, "children"),
|
||||
} {
|
||||
if _, err := os.Stat(path); err != nil {
|
||||
t.Fatalf("expected path to exist %s: %v", path, err)
|
||||
}
|
||||
}
|
||||
|
||||
nestedPath, nestedSlug, err := service.createProjectTreeFolderOnDisk("primary-project", createdPath, "Research")
|
||||
if err != nil {
|
||||
t.Fatalf("createProjectTreeFolderOnDisk nested folder: %v", err)
|
||||
}
|
||||
if nestedPath != "projects/project-primary-project/tree/folder-docs/children/folder-research" {
|
||||
t.Fatalf("unexpected nested path: %s", nestedPath)
|
||||
}
|
||||
if nestedSlug != "research" {
|
||||
t.Fatalf("unexpected nested slug: %s", nestedSlug)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRenameProjectHierarchyFolderOnDiskRenamesFolderShape(t *testing.T) {
|
||||
rootPath := filepath.Join(t.TempDir(), "POSIX")
|
||||
service := NewService(nil, rootPath)
|
||||
|
||||
err := service.ensureBootstrapPOSIXSkeleton(
|
||||
InstallationRecord{ID: "installation-1", Name: "MangoPig", Mode: "personal", Access: "local", Protocol: "http", Host: "localhost", IsBootstrapped: true},
|
||||
AdminSummary{ID: "admin-1", Email: "ronald@example.com", DisplayName: "Ronald"},
|
||||
namedRecord{ID: "org-1", Name: "Primary Organization", Slug: "primary-organization"},
|
||||
namedRecord{ID: "dept-1", Name: "Primary Department", Slug: "primary-department"},
|
||||
namedRecord{ID: "team-1", Name: "Primary Team", Slug: "primary-team"},
|
||||
namedRecord{ID: "project-1", Name: "Primary Project", Slug: "primary-project"},
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("ensure bootstrap POSIX skeleton: %v", err)
|
||||
}
|
||||
|
||||
createdPath, _, err := service.createProjectHierarchyFolderOnDisk("primary-project", "", "Design System")
|
||||
if err != nil {
|
||||
t.Fatalf("createProjectHierarchyFolderOnDisk root folder: %v", err)
|
||||
}
|
||||
|
||||
nestedPath, _, err := service.createProjectHierarchyFolderOnDisk("primary-project", createdPath, "Research")
|
||||
if err != nil {
|
||||
t.Fatalf("createProjectHierarchyFolderOnDisk nested folder: %v", err)
|
||||
}
|
||||
|
||||
previousPath, renamedPath, err := service.renameProjectHierarchyFolderOnDisk("primary-project", createdPath, "Platform Design")
|
||||
if err != nil {
|
||||
t.Fatalf("renameProjectHierarchyFolderOnDisk: %v", err)
|
||||
}
|
||||
if previousPath != createdPath {
|
||||
t.Fatalf("expected previous path %s, got %s", createdPath, previousPath)
|
||||
}
|
||||
if renamedPath != "projects/project-primary-project/children/folder-platform-design" {
|
||||
t.Fatalf("unexpected renamed path: %s", renamedPath)
|
||||
}
|
||||
|
||||
if _, err := os.Stat(filepath.Join(rootPath, filepath.FromSlash(createdPath))); !os.IsNotExist(err) {
|
||||
t.Fatalf("expected previous folder path to be gone, got err=%v", err)
|
||||
}
|
||||
|
||||
renamedFolderPath := filepath.Join(rootPath, filepath.FromSlash(renamedPath))
|
||||
if _, err := os.Stat(filepath.Join(renamedFolderPath, "children", filepath.Base(nestedPath))); err != nil {
|
||||
t.Fatalf("expected nested child folder to move with renamed parent: %v", err)
|
||||
}
|
||||
|
||||
folderPayload := readJSONFileForTest[map[string]any](t, filepath.Join(renamedFolderPath, "folder.json"))
|
||||
if strings.TrimSpace(asStringForTest(folderPayload["id"])) == "" {
|
||||
t.Fatalf("expected renamed folder to preserve stable id, got %#v", folderPayload["id"])
|
||||
}
|
||||
if folderPayload["name"] != "Platform Design" {
|
||||
t.Fatalf("expected renamed folder name Platform Design, got %#v", folderPayload["name"])
|
||||
}
|
||||
if folderPayload["slug"] != "platform-design" {
|
||||
t.Fatalf("expected renamed folder slug platform-design, got %#v", folderPayload["slug"])
|
||||
}
|
||||
if folderPayload["type"] != "folder" {
|
||||
t.Fatalf("expected renamed folder type folder, got %#v", folderPayload["type"])
|
||||
}
|
||||
}
|
||||
|
||||
func TestRenameProjectTreeFolderOnDiskRenamesFolderShape(t *testing.T) {
|
||||
rootPath := filepath.Join(t.TempDir(), "POSIX")
|
||||
service := NewService(nil, rootPath)
|
||||
|
||||
err := service.ensureBootstrapPOSIXSkeleton(
|
||||
InstallationRecord{ID: "installation-1", Name: "MangoPig", Mode: "personal", Access: "local", Protocol: "http", Host: "localhost", IsBootstrapped: true},
|
||||
AdminSummary{ID: "admin-1", Email: "ronald@example.com", DisplayName: "Ronald"},
|
||||
namedRecord{ID: "org-1", Name: "Primary Organization", Slug: "primary-organization"},
|
||||
namedRecord{ID: "dept-1", Name: "Primary Department", Slug: "primary-department"},
|
||||
namedRecord{ID: "team-1", Name: "Primary Team", Slug: "primary-team"},
|
||||
namedRecord{ID: "project-1", Name: "Primary Project", Slug: "primary-project"},
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("ensure bootstrap POSIX skeleton: %v", err)
|
||||
}
|
||||
|
||||
createdPath, _, err := service.createProjectTreeFolderOnDisk("primary-project", "", "Docs")
|
||||
if err != nil {
|
||||
t.Fatalf("createProjectTreeFolderOnDisk root folder: %v", err)
|
||||
}
|
||||
|
||||
previousPath, renamedPath, err := service.renameProjectTreeFolderOnDisk("primary-project", createdPath, "Specifications")
|
||||
if err != nil {
|
||||
t.Fatalf("renameProjectTreeFolderOnDisk: %v", err)
|
||||
}
|
||||
if previousPath != createdPath {
|
||||
t.Fatalf("expected previous path %s, got %s", createdPath, previousPath)
|
||||
}
|
||||
if renamedPath != "projects/project-primary-project/tree/folder-specifications" {
|
||||
t.Fatalf("unexpected renamed path: %s", renamedPath)
|
||||
}
|
||||
|
||||
folderPayload := readJSONFileForTest[map[string]any](t, filepath.Join(rootPath, filepath.FromSlash(renamedPath), "folder.json"))
|
||||
if folderPayload["name"] != "Specifications" {
|
||||
t.Fatalf("expected renamed folder name Specifications, got %#v", folderPayload["name"])
|
||||
}
|
||||
if folderPayload["slug"] != "specifications" {
|
||||
t.Fatalf("expected renamed folder slug specifications, got %#v", folderPayload["slug"])
|
||||
}
|
||||
}
|
||||
|
||||
func TestMoveProjectHierarchyFolderOnDiskMovesFolderToNewParent(t *testing.T) {
|
||||
rootPath := filepath.Join(t.TempDir(), "POSIX")
|
||||
service := NewService(nil, rootPath)
|
||||
|
||||
err := service.ensureBootstrapPOSIXSkeleton(
|
||||
InstallationRecord{ID: "installation-1", Name: "MangoPig", Mode: "personal", Access: "local", Protocol: "http", Host: "localhost", IsBootstrapped: true},
|
||||
AdminSummary{ID: "admin-1", Email: "ronald@example.com", DisplayName: "Ronald"},
|
||||
namedRecord{ID: "org-1", Name: "Primary Organization", Slug: "primary-organization"},
|
||||
namedRecord{ID: "dept-1", Name: "Primary Department", Slug: "primary-department"},
|
||||
namedRecord{ID: "team-1", Name: "Primary Team", Slug: "primary-team"},
|
||||
namedRecord{ID: "project-1", Name: "Primary Project", Slug: "primary-project"},
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("ensure bootstrap POSIX skeleton: %v", err)
|
||||
}
|
||||
|
||||
designPath, _, err := service.createProjectHierarchyFolderOnDisk("primary-project", "", "Design")
|
||||
if err != nil {
|
||||
t.Fatalf("create design folder: %v", err)
|
||||
}
|
||||
operationsPath, _, err := service.createProjectHierarchyFolderOnDisk("primary-project", "", "Operations")
|
||||
if err != nil {
|
||||
t.Fatalf("create operations folder: %v", err)
|
||||
}
|
||||
researchPath, _, err := service.createProjectHierarchyFolderOnDisk("primary-project", designPath, "Research")
|
||||
if err != nil {
|
||||
t.Fatalf("create research folder: %v", err)
|
||||
}
|
||||
nestedPath, _, err := service.createProjectHierarchyFolderOnDisk("primary-project", researchPath, "Interview Notes")
|
||||
if err != nil {
|
||||
t.Fatalf("create nested folder: %v", err)
|
||||
}
|
||||
|
||||
previousPath, movedPath, err := service.moveProjectHierarchyFolderOnDisk("primary-project", researchPath, operationsPath)
|
||||
if err != nil {
|
||||
t.Fatalf("moveProjectHierarchyFolderOnDisk: %v", err)
|
||||
}
|
||||
if previousPath != researchPath {
|
||||
t.Fatalf("expected previous path %s, got %s", researchPath, previousPath)
|
||||
}
|
||||
if movedPath != "projects/project-primary-project/children/folder-operations/children/folder-research" {
|
||||
t.Fatalf("unexpected moved path: %s", movedPath)
|
||||
}
|
||||
|
||||
if _, err := os.Stat(filepath.Join(rootPath, filepath.FromSlash(researchPath))); !os.IsNotExist(err) {
|
||||
t.Fatalf("expected previous folder path to be gone, got err=%v", err)
|
||||
}
|
||||
|
||||
movedFolderPath := filepath.Join(rootPath, filepath.FromSlash(movedPath))
|
||||
if _, err := os.Stat(filepath.Join(movedFolderPath, "children", filepath.Base(nestedPath))); err != nil {
|
||||
t.Fatalf("expected nested child folder to move with moved parent: %v", err)
|
||||
}
|
||||
|
||||
folderPayload := readJSONFileForTest[map[string]any](t, filepath.Join(movedFolderPath, "folder.json"))
|
||||
if strings.TrimSpace(asStringForTest(folderPayload["id"])) == "" {
|
||||
t.Fatalf("expected moved folder to preserve stable id, got %#v", folderPayload["id"])
|
||||
}
|
||||
if folderPayload["name"] != "Research" {
|
||||
t.Fatalf("expected moved folder name Research, got %#v", folderPayload["name"])
|
||||
}
|
||||
if folderPayload["slug"] != "research" {
|
||||
t.Fatalf("expected moved folder slug research, got %#v", folderPayload["slug"])
|
||||
}
|
||||
if folderPayload["type"] != "folder" {
|
||||
t.Fatalf("expected moved folder type folder, got %#v", folderPayload["type"])
|
||||
}
|
||||
}
|
||||
|
||||
func TestMoveProjectTreeFolderOnDiskMovesFolderToNewParent(t *testing.T) {
|
||||
rootPath := filepath.Join(t.TempDir(), "POSIX")
|
||||
service := NewService(nil, rootPath)
|
||||
|
||||
err := service.ensureBootstrapPOSIXSkeleton(
|
||||
InstallationRecord{ID: "installation-1", Name: "MangoPig", Mode: "personal", Access: "local", Protocol: "http", Host: "localhost", IsBootstrapped: true},
|
||||
AdminSummary{ID: "admin-1", Email: "ronald@example.com", DisplayName: "Ronald"},
|
||||
namedRecord{ID: "org-1", Name: "Primary Organization", Slug: "primary-organization"},
|
||||
namedRecord{ID: "dept-1", Name: "Primary Department", Slug: "primary-department"},
|
||||
namedRecord{ID: "team-1", Name: "Primary Team", Slug: "primary-team"},
|
||||
namedRecord{ID: "project-1", Name: "Primary Project", Slug: "primary-project"},
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("ensure bootstrap POSIX skeleton: %v", err)
|
||||
}
|
||||
|
||||
docsPath, _, err := service.createProjectTreeFolderOnDisk("primary-project", "", "Docs")
|
||||
if err != nil {
|
||||
t.Fatalf("create docs folder: %v", err)
|
||||
}
|
||||
archivePath, _, err := service.createProjectTreeFolderOnDisk("primary-project", "", "Archive")
|
||||
if err != nil {
|
||||
t.Fatalf("create archive folder: %v", err)
|
||||
}
|
||||
|
||||
previousPath, movedPath, err := service.moveProjectTreeFolderOnDisk("primary-project", docsPath, archivePath)
|
||||
if err != nil {
|
||||
t.Fatalf("moveProjectTreeFolderOnDisk: %v", err)
|
||||
}
|
||||
if previousPath != docsPath {
|
||||
t.Fatalf("expected previous path %s, got %s", docsPath, previousPath)
|
||||
}
|
||||
if movedPath != "projects/project-primary-project/tree/folder-archive/children/folder-docs" {
|
||||
t.Fatalf("unexpected moved path: %s", movedPath)
|
||||
}
|
||||
|
||||
folderPayload := readJSONFileForTest[map[string]any](t, filepath.Join(rootPath, filepath.FromSlash(movedPath), "folder.json"))
|
||||
if folderPayload["name"] != "Docs" {
|
||||
t.Fatalf("expected moved folder name Docs, got %#v", folderPayload["name"])
|
||||
}
|
||||
if folderPayload["slug"] != "docs" {
|
||||
t.Fatalf("expected moved folder slug docs, got %#v", folderPayload["slug"])
|
||||
}
|
||||
}
|
||||
|
||||
func TestMoveProjectHierarchyFolderOnDiskRejectsDescendantTarget(t *testing.T) {
|
||||
rootPath := filepath.Join(t.TempDir(), "POSIX")
|
||||
service := NewService(nil, rootPath)
|
||||
|
||||
err := service.ensureBootstrapPOSIXSkeleton(
|
||||
InstallationRecord{ID: "installation-1", Name: "MangoPig", Mode: "personal", Access: "local", Protocol: "http", Host: "localhost", IsBootstrapped: true},
|
||||
AdminSummary{ID: "admin-1", Email: "ronald@example.com", DisplayName: "Ronald"},
|
||||
namedRecord{ID: "org-1", Name: "Primary Organization", Slug: "primary-organization"},
|
||||
namedRecord{ID: "dept-1", Name: "Primary Department", Slug: "primary-department"},
|
||||
namedRecord{ID: "team-1", Name: "Primary Team", Slug: "primary-team"},
|
||||
namedRecord{ID: "project-1", Name: "Primary Project", Slug: "primary-project"},
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("ensure bootstrap POSIX skeleton: %v", err)
|
||||
}
|
||||
|
||||
parentPath, _, err := service.createProjectHierarchyFolderOnDisk("primary-project", "", "Parent")
|
||||
if err != nil {
|
||||
t.Fatalf("create parent folder: %v", err)
|
||||
}
|
||||
childPath, _, err := service.createProjectHierarchyFolderOnDisk("primary-project", parentPath, "Child")
|
||||
if err != nil {
|
||||
t.Fatalf("create child folder: %v", err)
|
||||
}
|
||||
|
||||
_, _, err = service.moveProjectHierarchyFolderOnDisk("primary-project", parentPath, childPath)
|
||||
if !errors.Is(err, ErrInvalidProjectFolderMove) {
|
||||
t.Fatalf("expected ErrInvalidProjectFolderMove, got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestBuildProjectHierarchyFolderTreeBuildsNestedStructure(t *testing.T) {
|
||||
rows := []projectHierarchyFolderRow{
|
||||
{ID: "folder-design-id", Path: "projects/project-primary-project/children/folder-design", ParentPath: projectHierarchyRootPath("primary-project"), Label: "Design"},
|
||||
{ID: "folder-research-id", Path: "projects/project-primary-project/children/folder-design/children/folder-research", ParentPath: "projects/project-primary-project/children/folder-design/children", Label: "Research"},
|
||||
{ID: "folder-ops-id", Path: "projects/project-primary-project/children/folder-ops", ParentPath: projectHierarchyRootPath("primary-project"), Label: "Ops"},
|
||||
}
|
||||
|
||||
folders := buildProjectHierarchyFolderTree(rows, projectHierarchyRootPath("primary-project"))
|
||||
if len(folders) != 2 {
|
||||
t.Fatalf("expected 2 top-level folders, got %d", len(folders))
|
||||
}
|
||||
if folders[0].Label != "Design" || folders[1].Label != "Ops" {
|
||||
t.Fatalf("unexpected top-level folder labels: %#v", folders)
|
||||
}
|
||||
if len(folders[0].Children) != 1 || folders[0].Children[0].Label != "Research" {
|
||||
t.Fatalf("unexpected nested folder structure: %#v", folders[0].Children)
|
||||
}
|
||||
if folders[0].ID != "folder-design-id" || folders[0].Path != "projects/project-primary-project/children/folder-design" {
|
||||
t.Fatalf("expected design folder to retain stable id/path, got %#v", folders[0])
|
||||
}
|
||||
if folders[0].Children[0].ID != "folder-research-id" || folders[1].ID != "folder-ops-id" {
|
||||
t.Fatalf("expected nested/top-level folder ids to be preserved, got %#v / %#v", folders[0].Children[0], folders[1])
|
||||
}
|
||||
}
|
||||
|
||||
func TestApplyProjectHierarchyFolderOrderingOrdersRootAndChildrenByStableID(t *testing.T) {
|
||||
folders := []ProjectHierarchyFolderRecord{
|
||||
{
|
||||
ID: "folder-design-id",
|
||||
Path: "projects/project-primary-project/children/folder-design",
|
||||
Label: "Design",
|
||||
Children: []ProjectHierarchyFolderRecord{
|
||||
{ID: "folder-research-id", Path: "projects/project-primary-project/children/folder-design/children/folder-research", Label: "Research"},
|
||||
{ID: "folder-assets-id", Path: "projects/project-primary-project/children/folder-design/children/folder-assets", Label: "Assets"},
|
||||
},
|
||||
},
|
||||
{ID: "folder-ops-id", Path: "projects/project-primary-project/children/folder-ops", Label: "Ops"},
|
||||
{ID: "folder-qa-id", Path: "projects/project-primary-project/children/folder-qa", Label: "QA"},
|
||||
}
|
||||
|
||||
ordered := applyProjectHierarchyFolderOrdering(folders, map[string][]string{
|
||||
projectFolderOrderRootKey: {"folder-qa-id", "folder-design-id"},
|
||||
"folder-design-id": {"folder-assets-id", "folder-research-id"},
|
||||
})
|
||||
|
||||
if len(ordered) != 3 {
|
||||
t.Fatalf("expected 3 ordered root folders, got %d", len(ordered))
|
||||
}
|
||||
if ordered[0].ID != "folder-qa-id" || ordered[1].ID != "folder-design-id" || ordered[2].ID != "folder-ops-id" {
|
||||
t.Fatalf("unexpected ordered root ids: %#v", ordered)
|
||||
}
|
||||
if len(ordered[1].Children) != 2 {
|
||||
t.Fatalf("expected design folder children to be preserved, got %#v", ordered[1].Children)
|
||||
}
|
||||
if ordered[1].Children[0].ID != "folder-assets-id" || ordered[1].Children[1].ID != "folder-research-id" {
|
||||
t.Fatalf("unexpected ordered child ids: %#v", ordered[1].Children)
|
||||
}
|
||||
}
|
||||
|
||||
func TestInsertFolderOrderReordersWithinSameParent(t *testing.T) {
|
||||
folderOrder := map[string][]string{
|
||||
projectFolderOrderRootKey: {"folder-a", "folder-b", "folder-c"},
|
||||
}
|
||||
|
||||
insertFolderOrder(folderOrder, "", "folder-c", 0)
|
||||
|
||||
got := folderOrder[projectFolderOrderRootKey]
|
||||
if len(got) != 3 || got[0] != "folder-c" || got[1] != "folder-a" || got[2] != "folder-b" {
|
||||
t.Fatalf("unexpected reordered root children: %#v", got)
|
||||
}
|
||||
}
|
||||
|
||||
func asStringForTest(value any) string {
|
||||
text, _ := value.(string)
|
||||
return text
|
||||
}
|
||||
|
||||
func readJSONFileForTest[T any](t *testing.T, path string) T {
|
||||
t.Helper()
|
||||
|
||||
data, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
t.Fatalf("read %s: %v", path, err)
|
||||
}
|
||||
|
||||
var payload T
|
||||
if err := json.Unmarshal(data, &payload); err != nil {
|
||||
t.Fatalf("unmarshal %s: %v", path, err)
|
||||
}
|
||||
|
||||
return payload
|
||||
}
|
||||
@@ -17,6 +17,7 @@ type Config struct {
|
||||
APIPort string
|
||||
PostgresURL string
|
||||
ValkeyURL string
|
||||
POSIXRoot string
|
||||
ShutdownTimeout time.Duration
|
||||
}
|
||||
|
||||
@@ -29,6 +30,7 @@ func Load() *Config {
|
||||
APIPort: getEnv("BACKEND_API_PORT", "8081"),
|
||||
PostgresURL: getEnv("DATABASE_URL", "postgres://moku:moku_dev_password@localhost:5432/moku?sslmode=disable"),
|
||||
ValkeyURL: getEnv("VALKEY_URL", "redis://localhost:6379/0"),
|
||||
POSIXRoot: getEnv("POSIX_ROOT", "../POSIX"),
|
||||
ShutdownTimeout: getDurationEnv("BACKEND_SHUTDOWN_TIMEOUT", 10*time.Second),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,396 @@
|
||||
// Path: Backend/internal/httpx/api_bootstrap_routes.go
|
||||
|
||||
package httpx
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"io"
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
bootstrapservice "moku-backend/internal/bootstrap"
|
||||
)
|
||||
|
||||
type bootstrapInstanceStepRequest struct {
|
||||
Protocol string `json:"protocol"`
|
||||
Access string `json:"access"`
|
||||
Host string `json:"host"`
|
||||
}
|
||||
|
||||
type bootstrapModeStepRequest struct {
|
||||
Mode string `json:"mode"`
|
||||
Name string `json:"name"`
|
||||
}
|
||||
|
||||
type bootstrapAdminStepRequest struct {
|
||||
DisplayName string `json:"displayName"`
|
||||
Email string `json:"email"`
|
||||
Password string `json:"password"`
|
||||
}
|
||||
|
||||
type bootstrapStructureStepRequest struct {
|
||||
OrganizationName string `json:"organizationName"`
|
||||
DepartmentName string `json:"departmentName"`
|
||||
TeamName string `json:"teamName"`
|
||||
ProjectName string `json:"projectName"`
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleBootstrapOverview(w http.ResponseWriter, _ *http.Request) {
|
||||
WriteJSON(w, http.StatusOK, map[string]any{
|
||||
"data": map[string]any{
|
||||
"resource": "bootstrap",
|
||||
"status": "persisted",
|
||||
"steps": []map[string]string{
|
||||
{
|
||||
"id": "instance",
|
||||
"method": http.MethodPost,
|
||||
"path": "/v1/bootstrap/steps/instance",
|
||||
},
|
||||
{
|
||||
"id": "mode",
|
||||
"method": http.MethodPost,
|
||||
"path": "/v1/bootstrap/steps/mode",
|
||||
},
|
||||
{
|
||||
"id": "admin",
|
||||
"method": http.MethodPost,
|
||||
"path": "/v1/bootstrap/steps/admin",
|
||||
},
|
||||
{
|
||||
"id": "structure",
|
||||
"method": http.MethodPost,
|
||||
"path": "/v1/bootstrap/steps/structure",
|
||||
},
|
||||
{
|
||||
"id": "installation",
|
||||
"method": http.MethodGet,
|
||||
"path": "/v1/bootstrap/installation",
|
||||
},
|
||||
{
|
||||
"id": "admin-state",
|
||||
"method": http.MethodGet,
|
||||
"path": "/v1/bootstrap/admin",
|
||||
},
|
||||
{
|
||||
"id": "structure-state",
|
||||
"method": http.MethodGet,
|
||||
"path": "/v1/bootstrap/structure",
|
||||
},
|
||||
{
|
||||
"id": "bootstrap-state",
|
||||
"method": http.MethodGet,
|
||||
"path": "/v1/bootstrap/state",
|
||||
},
|
||||
{
|
||||
"id": "app-shell",
|
||||
"method": http.MethodGet,
|
||||
"path": "/v1/app-shell",
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleBootstrapInstallation(w http.ResponseWriter, r *http.Request) {
|
||||
record, err := routes.bootstrapService().GetInstallation(r.Context())
|
||||
if err != nil {
|
||||
routes.writeBootstrapPersistenceError(w, r, err)
|
||||
return
|
||||
}
|
||||
|
||||
WriteJSON(w, http.StatusOK, map[string]any{
|
||||
"data": record,
|
||||
"meta": map[string]any{
|
||||
"resource": "bootstrap-installation",
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleBootstrapAdmin(w http.ResponseWriter, r *http.Request) {
|
||||
record, err := routes.bootstrapService().GetAdmin(r.Context())
|
||||
if err != nil {
|
||||
routes.writeBootstrapPersistenceError(w, r, err)
|
||||
return
|
||||
}
|
||||
|
||||
WriteJSON(w, http.StatusOK, map[string]any{
|
||||
"data": record,
|
||||
"meta": map[string]any{
|
||||
"resource": "bootstrap-admin",
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleBootstrapStructure(w http.ResponseWriter, r *http.Request) {
|
||||
record, err := routes.bootstrapService().GetStructure(r.Context())
|
||||
if err != nil {
|
||||
routes.writeBootstrapPersistenceError(w, r, err)
|
||||
return
|
||||
}
|
||||
|
||||
WriteJSON(w, http.StatusOK, map[string]any{
|
||||
"data": record,
|
||||
"meta": map[string]any{
|
||||
"resource": "bootstrap-structure",
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleBootstrapState(w http.ResponseWriter, r *http.Request) {
|
||||
record, err := routes.bootstrapService().GetState(r.Context())
|
||||
if err != nil {
|
||||
routes.writeBootstrapPersistenceError(w, r, err)
|
||||
return
|
||||
}
|
||||
|
||||
WriteJSON(w, http.StatusOK, map[string]any{
|
||||
"data": record,
|
||||
"meta": map[string]any{
|
||||
"resource": "bootstrap-state",
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleAppShellState(w http.ResponseWriter, r *http.Request) {
|
||||
record, err := routes.bootstrapService().GetAppShellState(r.Context())
|
||||
if err != nil {
|
||||
routes.writeBootstrapPersistenceError(w, r, err)
|
||||
return
|
||||
}
|
||||
|
||||
WriteJSON(w, http.StatusOK, map[string]any{
|
||||
"data": record,
|
||||
"meta": map[string]any{
|
||||
"resource": "app-shell",
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleDevelopmentBootstrapReset(w http.ResponseWriter, r *http.Request) {
|
||||
if !routes.cfg.Config.IsDevelopment() {
|
||||
WriteError(w, http.StatusNotFound, RequestIDFromContext(r.Context()), "not_found", "The requested endpoint does not exist.")
|
||||
return
|
||||
}
|
||||
|
||||
if err := routes.bootstrapService().ResetDevelopmentState(r.Context()); err != nil {
|
||||
routes.writeBootstrapPersistenceError(w, r, err)
|
||||
return
|
||||
}
|
||||
|
||||
WriteJSON(w, http.StatusOK, map[string]any{
|
||||
"data": map[string]any{
|
||||
"reset": true,
|
||||
},
|
||||
"meta": map[string]any{
|
||||
"resource": "development-bootstrap-reset",
|
||||
"developmentOnly": true,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleBootstrapInstanceStep(w http.ResponseWriter, r *http.Request) {
|
||||
payload, ok := decodeBootstrapRequest[bootstrapInstanceStepRequest](w, r)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
payload.Protocol = strings.ToLower(strings.TrimSpace(payload.Protocol))
|
||||
payload.Access = strings.ToLower(strings.TrimSpace(payload.Access))
|
||||
payload.Host = strings.TrimSpace(payload.Host)
|
||||
|
||||
if payload.Protocol != "http" && payload.Protocol != "https" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Protocol must be either 'http' or 'https'.")
|
||||
return
|
||||
}
|
||||
|
||||
if payload.Access != "local" && payload.Access != "remote" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Access must be either 'local' or 'remote'.")
|
||||
return
|
||||
}
|
||||
|
||||
if payload.Host == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Host is required.")
|
||||
return
|
||||
}
|
||||
|
||||
record, err := routes.bootstrapService().SaveInstance(r.Context(), bootstrapservice.SaveInstanceInput{
|
||||
Protocol: payload.Protocol,
|
||||
Access: payload.Access,
|
||||
Host: payload.Host,
|
||||
})
|
||||
if err != nil {
|
||||
routes.writeBootstrapPersistenceError(w, r, err)
|
||||
return
|
||||
}
|
||||
|
||||
routes.writeBootstrapStepResponse(w, http.StatusOK, "instance", map[string]any{
|
||||
"request": payload,
|
||||
"installation": record,
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleBootstrapModeStep(w http.ResponseWriter, r *http.Request) {
|
||||
payload, ok := decodeBootstrapRequest[bootstrapModeStepRequest](w, r)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
payload.Mode = strings.ToLower(strings.TrimSpace(payload.Mode))
|
||||
payload.Name = strings.TrimSpace(payload.Name)
|
||||
|
||||
if payload.Mode != "personal" && payload.Mode != "organizational" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Mode must be either 'personal' or 'organizational'.")
|
||||
return
|
||||
}
|
||||
|
||||
if payload.Name == "" {
|
||||
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 {
|
||||
routes.writeBootstrapPersistenceError(w, r, err)
|
||||
return
|
||||
}
|
||||
|
||||
routes.writeBootstrapStepResponse(w, http.StatusOK, "mode", map[string]any{
|
||||
"request": payload,
|
||||
"installation": record,
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleBootstrapAdminStep(w http.ResponseWriter, r *http.Request) {
|
||||
payload, ok := decodeBootstrapRequest[bootstrapAdminStepRequest](w, r)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
payload.DisplayName = strings.TrimSpace(payload.DisplayName)
|
||||
payload.Email = strings.ToLower(strings.TrimSpace(payload.Email))
|
||||
|
||||
if payload.DisplayName == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Display name is required.")
|
||||
return
|
||||
}
|
||||
|
||||
if payload.Email == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Email is required.")
|
||||
return
|
||||
}
|
||||
|
||||
if strings.TrimSpace(payload.Password) == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Password is required.")
|
||||
return
|
||||
}
|
||||
|
||||
record, err := routes.bootstrapService().SaveAdmin(r.Context(), bootstrapservice.SaveAdminInput{
|
||||
DisplayName: payload.DisplayName,
|
||||
Email: payload.Email,
|
||||
Password: payload.Password,
|
||||
})
|
||||
if err != nil {
|
||||
routes.writeBootstrapPersistenceError(w, r, err)
|
||||
return
|
||||
}
|
||||
|
||||
routes.writeBootstrapStepResponse(w, http.StatusOK, "admin", map[string]any{
|
||||
"request": payload,
|
||||
"admin": record,
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleBootstrapStructureStep(w http.ResponseWriter, r *http.Request) {
|
||||
payload, ok := decodeBootstrapRequest[bootstrapStructureStepRequest](w, r)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
payload.OrganizationName = strings.TrimSpace(payload.OrganizationName)
|
||||
payload.DepartmentName = strings.TrimSpace(payload.DepartmentName)
|
||||
payload.TeamName = strings.TrimSpace(payload.TeamName)
|
||||
payload.ProjectName = strings.TrimSpace(payload.ProjectName)
|
||||
|
||||
if payload.DepartmentName == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Department name is required.")
|
||||
return
|
||||
}
|
||||
|
||||
if payload.TeamName == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Team name is required.")
|
||||
return
|
||||
}
|
||||
|
||||
if payload.ProjectName == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Project name is required.")
|
||||
return
|
||||
}
|
||||
|
||||
record, err := routes.bootstrapService().SaveStructure(r.Context(), bootstrapservice.SaveStructureInput{
|
||||
OrganizationName: payload.OrganizationName,
|
||||
DepartmentName: payload.DepartmentName,
|
||||
TeamName: payload.TeamName,
|
||||
ProjectName: payload.ProjectName,
|
||||
})
|
||||
if err != nil {
|
||||
routes.writeBootstrapPersistenceError(w, r, err)
|
||||
return
|
||||
}
|
||||
|
||||
routes.writeBootstrapStepResponse(w, http.StatusOK, "structure", map[string]any{
|
||||
"request": payload,
|
||||
"structure": record,
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) bootstrapService() *bootstrapservice.Service {
|
||||
return bootstrapservice.NewService(routes.cfg.Database, routes.cfg.Config.POSIXRoot)
|
||||
}
|
||||
|
||||
func (routes apiRoutes) writeBootstrapStepResponse(w http.ResponseWriter, status int, step string, payload any) {
|
||||
WriteJSON(w, status, map[string]any{
|
||||
"data": map[string]any{
|
||||
"step": step,
|
||||
"result": payload,
|
||||
},
|
||||
"meta": map[string]any{
|
||||
"resource": "bootstrap-step",
|
||||
"persisted": true,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) writeBootstrapPersistenceError(w http.ResponseWriter, r *http.Request, err error) {
|
||||
switch {
|
||||
case errors.Is(err, bootstrapservice.ErrInstallationNotConfigured), errors.Is(err, bootstrapservice.ErrAdminNotConfigured):
|
||||
WriteError(w, http.StatusConflict, RequestIDFromContext(r.Context()), "bootstrap_prerequisite_missing", err.Error())
|
||||
default:
|
||||
routes.cfg.Logger.Error("persist bootstrap step", "error", err, "path", r.URL.Path)
|
||||
message := "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)
|
||||
}
|
||||
}
|
||||
|
||||
func decodeBootstrapRequest[T any](w http.ResponseWriter, r *http.Request) (T, bool) {
|
||||
var payload T
|
||||
|
||||
decoder := json.NewDecoder(r.Body)
|
||||
decoder.DisallowUnknownFields()
|
||||
|
||||
if err := decoder.Decode(&payload); err != nil {
|
||||
if errors.Is(err, io.EOF) {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_json", "The request body is required and must be valid JSON for this bootstrap step.")
|
||||
return payload, false
|
||||
}
|
||||
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_json", "The request body must be valid JSON for this bootstrap step.")
|
||||
return payload, false
|
||||
}
|
||||
|
||||
if err := decoder.Decode(&struct{}{}); !errors.Is(err, io.EOF) {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_json", "The request body must contain a single JSON object.")
|
||||
return payload, false
|
||||
}
|
||||
|
||||
return payload, true
|
||||
}
|
||||
@@ -0,0 +1,487 @@
|
||||
package httpx
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"io"
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
bootstrapservice "moku-backend/internal/bootstrap"
|
||||
|
||||
"github.com/go-chi/chi/v5"
|
||||
)
|
||||
|
||||
type createProjectFolderRequest struct {
|
||||
Name string `json:"name"`
|
||||
ParentFolderPath string `json:"parentFolderId"`
|
||||
}
|
||||
|
||||
type renameProjectFolderRequest struct {
|
||||
FolderPath string `json:"folderId"`
|
||||
Name string `json:"name"`
|
||||
}
|
||||
|
||||
type deleteProjectFolderRequest struct {
|
||||
FolderPath string `json:"folderId"`
|
||||
}
|
||||
|
||||
// Keep the existing JSON contract for the frontend, but use clearer path-vs-stable-ID
|
||||
// names internally so the move flow is easier to reason about.
|
||||
type moveProjectFolderRequest struct {
|
||||
FolderPath string `json:"folderId"`
|
||||
FolderStableID string `json:"folderNodeId"`
|
||||
ParentFolderPath string `json:"parentFolderId"`
|
||||
ParentStableID string `json:"parentNodeId"`
|
||||
TargetIndex int `json:"targetIndex"`
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleProjectFolders(w http.ResponseWriter, r *http.Request) {
|
||||
projectID := strings.TrimSpace(chi.URLParam(r, "projectId"))
|
||||
if projectID == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Project ID is required.")
|
||||
return
|
||||
}
|
||||
|
||||
folders, err := routes.bootstrapService().GetProjectHierarchyFolders(r.Context(), projectID)
|
||||
if err != nil {
|
||||
routes.writeProjectFolderError(w, r, err, "load")
|
||||
return
|
||||
}
|
||||
|
||||
WriteJSON(w, http.StatusOK, map[string]any{
|
||||
"data": map[string]any{
|
||||
"projectId": projectID,
|
||||
"folders": folders,
|
||||
},
|
||||
"meta": map[string]any{
|
||||
"resource": "project-folders",
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleCreateProjectFolder(w http.ResponseWriter, r *http.Request) {
|
||||
projectID := strings.TrimSpace(chi.URLParam(r, "projectId"))
|
||||
if projectID == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Project ID is required.")
|
||||
return
|
||||
}
|
||||
|
||||
payload, ok := decodeProjectFolderRequest(w, r)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
|
||||
payload.Name = strings.TrimSpace(payload.Name)
|
||||
payload.ParentFolderPath = strings.TrimSpace(payload.ParentFolderPath)
|
||||
if payload.Name == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Folder name is required.")
|
||||
return
|
||||
}
|
||||
|
||||
result, err := routes.bootstrapService().CreateProjectFolder(r.Context(), bootstrapservice.CreateProjectFolderInput{
|
||||
ProjectID: projectID,
|
||||
ParentFolderPath: payload.ParentFolderPath,
|
||||
Name: payload.Name,
|
||||
})
|
||||
if err != nil {
|
||||
routes.writeProjectFolderError(w, r, err, "persist")
|
||||
return
|
||||
}
|
||||
|
||||
WriteJSON(w, http.StatusCreated, map[string]any{
|
||||
"data": result,
|
||||
"meta": map[string]any{
|
||||
"resource": "project-folder-create",
|
||||
"persisted": true,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleDeleteProjectFolder(w http.ResponseWriter, r *http.Request) {
|
||||
projectID := strings.TrimSpace(chi.URLParam(r, "projectId"))
|
||||
if projectID == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Project ID is required.")
|
||||
return
|
||||
}
|
||||
|
||||
payload := decodeDeleteProjectFolderRequest(r)
|
||||
if strings.TrimSpace(payload.FolderPath) == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Folder ID is required.")
|
||||
return
|
||||
}
|
||||
|
||||
result, err := routes.bootstrapService().DeleteProjectFolder(r.Context(), bootstrapservice.DeleteProjectFolderInput{
|
||||
ProjectID: projectID,
|
||||
FolderPath: payload.FolderPath,
|
||||
})
|
||||
if err != nil {
|
||||
routes.writeProjectFolderError(w, r, err, "delete")
|
||||
return
|
||||
}
|
||||
|
||||
WriteJSON(w, http.StatusOK, map[string]any{
|
||||
"data": result,
|
||||
"meta": map[string]any{
|
||||
"resource": "project-folder-delete",
|
||||
"persisted": true,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleRenameProjectFolder(w http.ResponseWriter, r *http.Request) {
|
||||
projectID := strings.TrimSpace(chi.URLParam(r, "projectId"))
|
||||
if projectID == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Project ID is required.")
|
||||
return
|
||||
}
|
||||
|
||||
payload, ok := decodeRenameProjectFolderRequest(w, r)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
|
||||
payload.FolderPath = strings.TrimSpace(payload.FolderPath)
|
||||
payload.Name = strings.TrimSpace(payload.Name)
|
||||
if payload.FolderPath == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Folder ID is required.")
|
||||
return
|
||||
}
|
||||
if payload.Name == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Folder name is required.")
|
||||
return
|
||||
}
|
||||
|
||||
result, err := routes.bootstrapService().RenameProjectFolder(r.Context(), bootstrapservice.RenameProjectFolderInput{
|
||||
ProjectID: projectID,
|
||||
FolderPath: payload.FolderPath,
|
||||
Name: payload.Name,
|
||||
})
|
||||
if err != nil {
|
||||
routes.writeProjectFolderError(w, r, err, "rename")
|
||||
return
|
||||
}
|
||||
|
||||
WriteJSON(w, http.StatusOK, map[string]any{
|
||||
"data": result,
|
||||
"meta": map[string]any{
|
||||
"resource": "project-folder-rename",
|
||||
"persisted": true,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleMoveProjectFolder(w http.ResponseWriter, r *http.Request) {
|
||||
projectID := strings.TrimSpace(chi.URLParam(r, "projectId"))
|
||||
if projectID == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Project ID is required.")
|
||||
return
|
||||
}
|
||||
|
||||
payload, ok := decodeMoveProjectFolderRequest(w, r)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
|
||||
payload.FolderPath = strings.TrimSpace(payload.FolderPath)
|
||||
payload.FolderStableID = strings.TrimSpace(payload.FolderStableID)
|
||||
payload.ParentFolderPath = strings.TrimSpace(payload.ParentFolderPath)
|
||||
payload.ParentStableID = strings.TrimSpace(payload.ParentStableID)
|
||||
if payload.FolderPath == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Folder ID is required.")
|
||||
return
|
||||
}
|
||||
|
||||
result, err := routes.bootstrapService().MoveProjectFolder(r.Context(), bootstrapservice.MoveProjectFolderInput{
|
||||
ProjectID: projectID,
|
||||
FolderPath: payload.FolderPath,
|
||||
FolderStableID: payload.FolderStableID,
|
||||
ParentFolderPath: payload.ParentFolderPath,
|
||||
ParentStableID: payload.ParentStableID,
|
||||
TargetIndex: payload.TargetIndex,
|
||||
})
|
||||
if err != nil {
|
||||
routes.writeProjectFolderError(w, r, err, "move")
|
||||
return
|
||||
}
|
||||
|
||||
WriteJSON(w, http.StatusOK, map[string]any{
|
||||
"data": result,
|
||||
"meta": map[string]any{
|
||||
"resource": "project-folder-move",
|
||||
"persisted": true,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleProjectTreeFolders(w http.ResponseWriter, r *http.Request) {
|
||||
projectID := strings.TrimSpace(chi.URLParam(r, "projectId"))
|
||||
if projectID == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Project ID is required.")
|
||||
return
|
||||
}
|
||||
|
||||
folders, err := routes.bootstrapService().GetProjectTreeFolders(r.Context(), projectID)
|
||||
if err != nil {
|
||||
routes.writeProjectFolderError(w, r, err, "load")
|
||||
return
|
||||
}
|
||||
|
||||
WriteJSON(w, http.StatusOK, map[string]any{
|
||||
"data": map[string]any{
|
||||
"projectId": projectID,
|
||||
"folders": folders,
|
||||
},
|
||||
"meta": map[string]any{
|
||||
"resource": "project-tree-folders",
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleCreateProjectTreeFolder(w http.ResponseWriter, r *http.Request) {
|
||||
projectID := strings.TrimSpace(chi.URLParam(r, "projectId"))
|
||||
if projectID == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Project ID is required.")
|
||||
return
|
||||
}
|
||||
|
||||
payload, ok := decodeProjectFolderRequest(w, r)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
|
||||
payload.Name = strings.TrimSpace(payload.Name)
|
||||
payload.ParentFolderPath = strings.TrimSpace(payload.ParentFolderPath)
|
||||
if payload.Name == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Folder name is required.")
|
||||
return
|
||||
}
|
||||
|
||||
result, err := routes.bootstrapService().CreateProjectTreeFolder(r.Context(), bootstrapservice.CreateProjectFolderInput{
|
||||
ProjectID: projectID,
|
||||
ParentFolderPath: payload.ParentFolderPath,
|
||||
Name: payload.Name,
|
||||
})
|
||||
if err != nil {
|
||||
routes.writeProjectFolderError(w, r, err, "persist")
|
||||
return
|
||||
}
|
||||
|
||||
WriteJSON(w, http.StatusCreated, map[string]any{
|
||||
"data": result,
|
||||
"meta": map[string]any{
|
||||
"resource": "project-tree-folder-create",
|
||||
"persisted": true,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleDeleteProjectTreeFolder(w http.ResponseWriter, r *http.Request) {
|
||||
projectID := strings.TrimSpace(chi.URLParam(r, "projectId"))
|
||||
if projectID == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Project ID is required.")
|
||||
return
|
||||
}
|
||||
|
||||
payload := decodeDeleteProjectFolderRequest(r)
|
||||
if strings.TrimSpace(payload.FolderPath) == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Folder ID is required.")
|
||||
return
|
||||
}
|
||||
|
||||
result, err := routes.bootstrapService().DeleteProjectTreeFolder(r.Context(), bootstrapservice.DeleteProjectFolderInput{
|
||||
ProjectID: projectID,
|
||||
FolderPath: payload.FolderPath,
|
||||
})
|
||||
if err != nil {
|
||||
routes.writeProjectFolderError(w, r, err, "delete")
|
||||
return
|
||||
}
|
||||
|
||||
WriteJSON(w, http.StatusOK, map[string]any{
|
||||
"data": result,
|
||||
"meta": map[string]any{
|
||||
"resource": "project-tree-folder-delete",
|
||||
"persisted": true,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleRenameProjectTreeFolder(w http.ResponseWriter, r *http.Request) {
|
||||
projectID := strings.TrimSpace(chi.URLParam(r, "projectId"))
|
||||
if projectID == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Project ID is required.")
|
||||
return
|
||||
}
|
||||
|
||||
payload, ok := decodeRenameProjectFolderRequest(w, r)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
|
||||
payload.FolderPath = strings.TrimSpace(payload.FolderPath)
|
||||
payload.Name = strings.TrimSpace(payload.Name)
|
||||
if payload.FolderPath == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Folder ID is required.")
|
||||
return
|
||||
}
|
||||
if payload.Name == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Folder name is required.")
|
||||
return
|
||||
}
|
||||
|
||||
result, err := routes.bootstrapService().RenameProjectTreeFolder(r.Context(), bootstrapservice.RenameProjectFolderInput{
|
||||
ProjectID: projectID,
|
||||
FolderPath: payload.FolderPath,
|
||||
Name: payload.Name,
|
||||
})
|
||||
if err != nil {
|
||||
routes.writeProjectFolderError(w, r, err, "rename")
|
||||
return
|
||||
}
|
||||
|
||||
WriteJSON(w, http.StatusOK, map[string]any{
|
||||
"data": result,
|
||||
"meta": map[string]any{
|
||||
"resource": "project-tree-folder-rename",
|
||||
"persisted": true,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) handleMoveProjectTreeFolder(w http.ResponseWriter, r *http.Request) {
|
||||
projectID := strings.TrimSpace(chi.URLParam(r, "projectId"))
|
||||
if projectID == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Project ID is required.")
|
||||
return
|
||||
}
|
||||
|
||||
payload, ok := decodeMoveProjectFolderRequest(w, r)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
|
||||
payload.FolderPath = strings.TrimSpace(payload.FolderPath)
|
||||
payload.FolderStableID = strings.TrimSpace(payload.FolderStableID)
|
||||
payload.ParentFolderPath = strings.TrimSpace(payload.ParentFolderPath)
|
||||
payload.ParentStableID = strings.TrimSpace(payload.ParentStableID)
|
||||
if payload.FolderPath == "" {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", "Folder ID is required.")
|
||||
return
|
||||
}
|
||||
|
||||
result, err := routes.bootstrapService().MoveProjectTreeFolder(r.Context(), bootstrapservice.MoveProjectFolderInput{
|
||||
ProjectID: projectID,
|
||||
FolderPath: payload.FolderPath,
|
||||
FolderStableID: payload.FolderStableID,
|
||||
ParentFolderPath: payload.ParentFolderPath,
|
||||
ParentStableID: payload.ParentStableID,
|
||||
TargetIndex: payload.TargetIndex,
|
||||
})
|
||||
if err != nil {
|
||||
routes.writeProjectFolderError(w, r, err, "move")
|
||||
return
|
||||
}
|
||||
|
||||
WriteJSON(w, http.StatusOK, map[string]any{
|
||||
"data": result,
|
||||
"meta": map[string]any{
|
||||
"resource": "project-tree-folder-move",
|
||||
"persisted": true,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (routes apiRoutes) writeProjectFolderError(w http.ResponseWriter, r *http.Request, err error, operation string) {
|
||||
switch {
|
||||
case errors.Is(err, bootstrapservice.ErrProjectNotFound), errors.Is(err, bootstrapservice.ErrProjectFolderNotFound):
|
||||
WriteError(w, http.StatusNotFound, RequestIDFromContext(r.Context()), "not_found", err.Error())
|
||||
case errors.Is(err, bootstrapservice.ErrInvalidProjectFolderMove):
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_request", err.Error())
|
||||
default:
|
||||
routes.cfg.Logger.Error(operation+" project folder", "error", err, "path", r.URL.Path)
|
||||
message := "Failed to " + operation + " project folder."
|
||||
if routes.cfg.Config.IsDevelopment() {
|
||||
message = message + " " + err.Error()
|
||||
}
|
||||
WriteError(w, http.StatusInternalServerError, RequestIDFromContext(r.Context()), "project_folder_"+operation+"_failed", message)
|
||||
}
|
||||
}
|
||||
|
||||
func decodeMoveProjectFolderRequest(w http.ResponseWriter, r *http.Request) (moveProjectFolderRequest, bool) {
|
||||
var payload moveProjectFolderRequest
|
||||
|
||||
decoder := json.NewDecoder(r.Body)
|
||||
decoder.DisallowUnknownFields()
|
||||
|
||||
if err := decoder.Decode(&payload); err != nil {
|
||||
if errors.Is(err, io.EOF) {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_json", "The request body is required and must be valid JSON.")
|
||||
return payload, false
|
||||
}
|
||||
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_json", "The request body must be valid JSON.")
|
||||
return payload, false
|
||||
}
|
||||
|
||||
if err := decoder.Decode(&struct{}{}); !errors.Is(err, io.EOF) {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_json", "The request body must contain a single JSON object.")
|
||||
return payload, false
|
||||
}
|
||||
|
||||
return payload, true
|
||||
}
|
||||
|
||||
func decodeDeleteProjectFolderRequest(r *http.Request) deleteProjectFolderRequest {
|
||||
return deleteProjectFolderRequest{
|
||||
FolderPath: strings.TrimSpace(r.URL.Query().Get("folderId")),
|
||||
}
|
||||
}
|
||||
|
||||
func decodeRenameProjectFolderRequest(w http.ResponseWriter, r *http.Request) (renameProjectFolderRequest, bool) {
|
||||
var payload renameProjectFolderRequest
|
||||
|
||||
decoder := json.NewDecoder(r.Body)
|
||||
decoder.DisallowUnknownFields()
|
||||
|
||||
if err := decoder.Decode(&payload); err != nil {
|
||||
if errors.Is(err, io.EOF) {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_json", "The request body is required and must be valid JSON.")
|
||||
return payload, false
|
||||
}
|
||||
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_json", "The request body must be valid JSON.")
|
||||
return payload, false
|
||||
}
|
||||
|
||||
if err := decoder.Decode(&struct{}{}); !errors.Is(err, io.EOF) {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_json", "The request body must contain a single JSON object.")
|
||||
return payload, false
|
||||
}
|
||||
|
||||
return payload, true
|
||||
}
|
||||
|
||||
func decodeProjectFolderRequest(w http.ResponseWriter, r *http.Request) (createProjectFolderRequest, bool) {
|
||||
var payload createProjectFolderRequest
|
||||
|
||||
decoder := json.NewDecoder(r.Body)
|
||||
decoder.DisallowUnknownFields()
|
||||
|
||||
if err := decoder.Decode(&payload); err != nil {
|
||||
if errors.Is(err, io.EOF) {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_json", "The request body is required and must be valid JSON.")
|
||||
return payload, false
|
||||
}
|
||||
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_json", "The request body must be valid JSON.")
|
||||
return payload, false
|
||||
}
|
||||
|
||||
if err := decoder.Decode(&struct{}{}); !errors.Is(err, io.EOF) {
|
||||
WriteError(w, http.StatusBadRequest, RequestIDFromContext(r.Context()), "invalid_json", "The request body must contain a single JSON object.")
|
||||
return payload, false
|
||||
}
|
||||
|
||||
return payload, true
|
||||
}
|
||||
@@ -19,8 +19,36 @@ func newAPIRoutes(cfg RouterConfig) routeRegistrar {
|
||||
func (routes apiRoutes) Register(router chi.Router) {
|
||||
router.Route("/v1", func(apiRouter chi.Router) {
|
||||
apiRouter.Get("/", routes.handleIndex)
|
||||
apiRouter.Get("/bootstrap", routes.handleBootstrapOverview)
|
||||
apiRouter.Get("/bootstrap/installation", routes.handleBootstrapInstallation)
|
||||
apiRouter.Get("/bootstrap/admin", routes.handleBootstrapAdmin)
|
||||
apiRouter.Get("/bootstrap/structure", routes.handleBootstrapStructure)
|
||||
apiRouter.Get("/bootstrap/state", routes.handleBootstrapState)
|
||||
apiRouter.Route("/bootstrap/steps", func(bootstrapRouter chi.Router) {
|
||||
bootstrapRouter.Post("/instance", routes.handleBootstrapInstanceStep)
|
||||
bootstrapRouter.Post("/mode", routes.handleBootstrapModeStep)
|
||||
bootstrapRouter.Post("/admin", routes.handleBootstrapAdminStep)
|
||||
bootstrapRouter.Post("/structure", routes.handleBootstrapStructureStep)
|
||||
})
|
||||
apiRouter.Get("/app-shell", routes.handleAppShellState)
|
||||
apiRouter.Get("/organizations", routes.handleOrganizations)
|
||||
apiRouter.Get("/workspaces", routes.handleWorkspaces)
|
||||
apiRouter.Route("/projects/{projectId}", func(projectRouter chi.Router) {
|
||||
projectRouter.Get("/folders", routes.handleProjectFolders)
|
||||
projectRouter.Post("/folders", routes.handleCreateProjectFolder)
|
||||
projectRouter.Patch("/folders", routes.handleRenameProjectFolder)
|
||||
projectRouter.Patch("/folders/move", routes.handleMoveProjectFolder)
|
||||
projectRouter.Delete("/folders", routes.handleDeleteProjectFolder)
|
||||
projectRouter.Get("/tree/folders", routes.handleProjectTreeFolders)
|
||||
projectRouter.Post("/tree/folders", routes.handleCreateProjectTreeFolder)
|
||||
projectRouter.Patch("/tree/folders", routes.handleRenameProjectTreeFolder)
|
||||
projectRouter.Patch("/tree/folders/move", routes.handleMoveProjectTreeFolder)
|
||||
projectRouter.Delete("/tree/folders", routes.handleDeleteProjectTreeFolder)
|
||||
})
|
||||
|
||||
if routes.cfg.Config.IsDevelopment() {
|
||||
apiRouter.Post("/dev/bootstrap/reset", routes.handleDevelopmentBootstrapReset)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,196 @@
|
||||
package jobs
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/jackc/pgx/v5"
|
||||
|
||||
"moku-backend/internal/database"
|
||||
)
|
||||
|
||||
const (
|
||||
KindBootstrapStructureMaterialize = "bootstrap.structure.materialize"
|
||||
)
|
||||
|
||||
type Status string
|
||||
|
||||
const (
|
||||
StatusPending Status = "pending"
|
||||
StatusRunning Status = "running"
|
||||
StatusSucceeded Status = "succeeded"
|
||||
StatusFailed Status = "failed"
|
||||
)
|
||||
|
||||
type BootstrapStructureMaterializePayload struct {
|
||||
InstallationID string `json:"installationId"`
|
||||
}
|
||||
|
||||
type Job struct {
|
||||
ID string
|
||||
Kind string
|
||||
Status Status
|
||||
Payload json.RawMessage
|
||||
Attempts int
|
||||
MaxAttempts int
|
||||
AvailableAt time.Time
|
||||
StartedAt *time.Time
|
||||
FinishedAt *time.Time
|
||||
LastError *string
|
||||
CreatedAt time.Time
|
||||
UpdatedAt time.Time
|
||||
}
|
||||
|
||||
type EnqueueInput struct {
|
||||
Kind string
|
||||
Payload any
|
||||
AvailableAt time.Time
|
||||
MaxAttempts int
|
||||
}
|
||||
|
||||
type Store struct {
|
||||
db *database.DB
|
||||
}
|
||||
|
||||
func NewStore(db *database.DB) *Store {
|
||||
return &Store{db: db}
|
||||
}
|
||||
|
||||
func (store *Store) Enqueue(ctx context.Context, input EnqueueInput) (Job, error) {
|
||||
payload := json.RawMessage([]byte(`{}`))
|
||||
if input.Payload != nil {
|
||||
encoded, err := json.Marshal(input.Payload)
|
||||
if err != nil {
|
||||
return Job{}, err
|
||||
}
|
||||
payload = encoded
|
||||
}
|
||||
|
||||
availableAt := input.AvailableAt
|
||||
if availableAt.IsZero() {
|
||||
availableAt = time.Now().UTC()
|
||||
}
|
||||
|
||||
maxAttempts := input.MaxAttempts
|
||||
if maxAttempts < 1 {
|
||||
maxAttempts = 1
|
||||
}
|
||||
|
||||
return scanJob(store.db.Pool.QueryRow(ctx, `
|
||||
INSERT INTO background_jobs (kind, status, payload, attempts, max_attempts, available_at)
|
||||
VALUES ($1, 'pending'::background_job_status, $2::jsonb, 0, $3, $4)
|
||||
RETURNING
|
||||
id::text,
|
||||
kind,
|
||||
status::text,
|
||||
payload,
|
||||
attempts,
|
||||
max_attempts,
|
||||
available_at,
|
||||
started_at,
|
||||
finished_at,
|
||||
last_error,
|
||||
created_at,
|
||||
updated_at;
|
||||
`, strings.TrimSpace(input.Kind), payload, maxAttempts, availableAt))
|
||||
}
|
||||
|
||||
func (store *Store) ClaimNext(ctx context.Context) (*Job, error) {
|
||||
job, err := scanJob(store.db.Pool.QueryRow(ctx, `
|
||||
WITH next_job AS (
|
||||
SELECT id
|
||||
FROM background_jobs
|
||||
WHERE status = 'pending'::background_job_status
|
||||
AND available_at <= NOW()
|
||||
ORDER BY created_at ASC
|
||||
LIMIT 1
|
||||
FOR UPDATE SKIP LOCKED
|
||||
)
|
||||
UPDATE background_jobs AS jobs
|
||||
SET
|
||||
status = 'running'::background_job_status,
|
||||
attempts = jobs.attempts + 1,
|
||||
started_at = NOW(),
|
||||
finished_at = NULL,
|
||||
last_error = NULL,
|
||||
updated_at = NOW()
|
||||
FROM next_job
|
||||
WHERE jobs.id = next_job.id
|
||||
RETURNING
|
||||
jobs.id::text,
|
||||
jobs.kind,
|
||||
jobs.status::text,
|
||||
jobs.payload,
|
||||
jobs.attempts,
|
||||
jobs.max_attempts,
|
||||
jobs.available_at,
|
||||
jobs.started_at,
|
||||
jobs.finished_at,
|
||||
jobs.last_error,
|
||||
jobs.created_at,
|
||||
jobs.updated_at;
|
||||
`))
|
||||
if err != nil {
|
||||
if err == pgx.ErrNoRows {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &job, nil
|
||||
}
|
||||
|
||||
func (store *Store) MarkSucceeded(ctx context.Context, jobID string) error {
|
||||
_, err := store.db.Pool.Exec(ctx, `
|
||||
UPDATE background_jobs
|
||||
SET
|
||||
status = 'succeeded'::background_job_status,
|
||||
finished_at = NOW(),
|
||||
last_error = NULL,
|
||||
updated_at = NOW()
|
||||
WHERE id = $1::uuid;
|
||||
`, strings.TrimSpace(jobID))
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
func (store *Store) MarkFailed(ctx context.Context, jobID, failure string) error {
|
||||
_, err := store.db.Pool.Exec(ctx, `
|
||||
UPDATE background_jobs
|
||||
SET
|
||||
status = 'failed'::background_job_status,
|
||||
finished_at = NOW(),
|
||||
last_error = $2,
|
||||
updated_at = NOW()
|
||||
WHERE id = $1::uuid;
|
||||
`, strings.TrimSpace(jobID), strings.TrimSpace(failure))
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
func scanJob(row pgx.Row) (Job, error) {
|
||||
var job Job
|
||||
var status string
|
||||
if err := row.Scan(
|
||||
&job.ID,
|
||||
&job.Kind,
|
||||
&status,
|
||||
&job.Payload,
|
||||
&job.Attempts,
|
||||
&job.MaxAttempts,
|
||||
&job.AvailableAt,
|
||||
&job.StartedAt,
|
||||
&job.FinishedAt,
|
||||
&job.LastError,
|
||||
&job.CreatedAt,
|
||||
&job.UpdatedAt,
|
||||
); err != nil {
|
||||
return Job{}, err
|
||||
}
|
||||
|
||||
job.Status = Status(status)
|
||||
return job, nil
|
||||
}
|
||||
@@ -0,0 +1,553 @@
|
||||
package posixproj
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"moku-backend/internal/database"
|
||||
)
|
||||
|
||||
const rootProjectionPath = "/"
|
||||
|
||||
type Projector struct {
|
||||
db *database.DB
|
||||
root string
|
||||
}
|
||||
|
||||
type RebuildSummary struct {
|
||||
TotalNodes int
|
||||
DirectoryCount int
|
||||
FileCount int
|
||||
}
|
||||
|
||||
type NodeKind string
|
||||
|
||||
const (
|
||||
NodeKindDirectory NodeKind = "directory"
|
||||
NodeKindFile NodeKind = "file"
|
||||
)
|
||||
|
||||
type Scope struct {
|
||||
InstallationID string
|
||||
OrganizationID string
|
||||
OrganizationSlug string
|
||||
DepartmentSlug string
|
||||
TeamSlug string
|
||||
ProjectSlug string
|
||||
PersonalSlug string
|
||||
}
|
||||
|
||||
type Node struct {
|
||||
Path string
|
||||
ParentPath *string
|
||||
Name string
|
||||
Depth int
|
||||
NodeKind NodeKind
|
||||
LogicalType string
|
||||
FileRole string
|
||||
ResourceID string
|
||||
ResourceName string
|
||||
ResourceSlug string
|
||||
InstallationID string
|
||||
OrganizationID string
|
||||
OrganizationSlug string
|
||||
DepartmentSlug string
|
||||
TeamSlug string
|
||||
ProjectSlug string
|
||||
PersonalSlug string
|
||||
ContentJSON []byte
|
||||
SizeBytes int64
|
||||
Checksum string
|
||||
}
|
||||
|
||||
func NewProjector(db *database.DB, root string) *Projector {
|
||||
return &Projector{db: db, root: strings.TrimSpace(root)}
|
||||
}
|
||||
|
||||
func (projector *Projector) Rebuild(ctx context.Context) error {
|
||||
_, err := projector.RebuildWithSummary(ctx)
|
||||
return err
|
||||
}
|
||||
|
||||
func (projector *Projector) RebuildWithSummary(ctx context.Context) (RebuildSummary, error) {
|
||||
if projector == nil || projector.db == nil || projector.db.Pool == nil {
|
||||
return RebuildSummary{}, nil
|
||||
}
|
||||
|
||||
nodes, err := ScanRoot(projector.root)
|
||||
if err != nil {
|
||||
return RebuildSummary{}, err
|
||||
}
|
||||
|
||||
summary := summarizeNodes(nodes)
|
||||
|
||||
tx, err := projector.db.Pool.Begin(ctx)
|
||||
if err != nil {
|
||||
return RebuildSummary{}, err
|
||||
}
|
||||
defer func() {
|
||||
_ = tx.Rollback(ctx)
|
||||
}()
|
||||
|
||||
if _, err := tx.Exec(ctx, `DELETE FROM posix_nodes;`); err != nil {
|
||||
return RebuildSummary{}, fmt.Errorf("clear posix_nodes: %w", err)
|
||||
}
|
||||
|
||||
for _, node := range nodes {
|
||||
if _, err := tx.Exec(ctx, `
|
||||
INSERT INTO posix_nodes (
|
||||
path,
|
||||
parent_path,
|
||||
name,
|
||||
depth,
|
||||
node_kind,
|
||||
logical_type,
|
||||
file_role,
|
||||
resource_id,
|
||||
resource_name,
|
||||
resource_slug,
|
||||
installation_id,
|
||||
organization_id,
|
||||
organization_slug,
|
||||
department_slug,
|
||||
team_slug,
|
||||
project_slug,
|
||||
personal_slug,
|
||||
content_json,
|
||||
size_bytes,
|
||||
checksum
|
||||
) VALUES (
|
||||
$1, $2, $3, $4, $5::posix_node_kind, $6, $7, $8, $9, $10,
|
||||
$11, $12, $13, $14, $15, $16, $17, $18::jsonb, $19, $20
|
||||
);
|
||||
`,
|
||||
node.Path,
|
||||
node.ParentPath,
|
||||
node.Name,
|
||||
node.Depth,
|
||||
string(node.NodeKind),
|
||||
node.LogicalType,
|
||||
node.FileRole,
|
||||
node.ResourceID,
|
||||
node.ResourceName,
|
||||
node.ResourceSlug,
|
||||
node.InstallationID,
|
||||
node.OrganizationID,
|
||||
node.OrganizationSlug,
|
||||
node.DepartmentSlug,
|
||||
node.TeamSlug,
|
||||
node.ProjectSlug,
|
||||
node.PersonalSlug,
|
||||
node.ContentJSON,
|
||||
node.SizeBytes,
|
||||
node.Checksum,
|
||||
); err != nil {
|
||||
return RebuildSummary{}, fmt.Errorf("insert posix node %s: %w", node.Path, err)
|
||||
}
|
||||
}
|
||||
|
||||
if err := tx.Commit(ctx); err != nil {
|
||||
return RebuildSummary{}, err
|
||||
}
|
||||
|
||||
return summary, nil
|
||||
}
|
||||
|
||||
func ScanRoot(root string) ([]Node, error) {
|
||||
rootPath := strings.TrimSpace(root)
|
||||
if rootPath == "" {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
info, err := os.Stat(rootPath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("stat POSIX root: %w", err)
|
||||
}
|
||||
if !info.IsDir() {
|
||||
return nil, fmt.Errorf("POSIX root is not a directory: %s", rootPath)
|
||||
}
|
||||
|
||||
rootScope, err := loadRootScope(rootPath)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
nodes := []Node{{
|
||||
Path: rootProjectionPath,
|
||||
ParentPath: nil,
|
||||
Name: filepath.Base(rootPath),
|
||||
Depth: 0,
|
||||
NodeKind: NodeKindDirectory,
|
||||
LogicalType: "tenant_root",
|
||||
InstallationID: rootScope.InstallationID,
|
||||
OrganizationID: rootScope.OrganizationID,
|
||||
OrganizationSlug: rootScope.OrganizationSlug,
|
||||
}}
|
||||
|
||||
err = filepath.WalkDir(rootPath, func(path string, entry fs.DirEntry, walkErr error) error {
|
||||
if walkErr != nil {
|
||||
return walkErr
|
||||
}
|
||||
if path == rootPath {
|
||||
return nil
|
||||
}
|
||||
|
||||
relPath, err := filepath.Rel(rootPath, path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
relPath = filepath.ToSlash(relPath)
|
||||
if relPath == "." {
|
||||
return nil
|
||||
}
|
||||
|
||||
node, err := buildNode(rootPath, relPath, entry, rootScope)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
nodes = append(nodes, node)
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("scan POSIX root: %w", err)
|
||||
}
|
||||
|
||||
return nodes, nil
|
||||
}
|
||||
|
||||
func loadRootScope(rootPath string) (Scope, error) {
|
||||
settingsPath := filepath.Join(rootPath, "settings.json")
|
||||
content, err := os.ReadFile(settingsPath)
|
||||
if err != nil {
|
||||
if errorsIsNotExist(err) {
|
||||
return Scope{}, nil
|
||||
}
|
||||
return Scope{}, fmt.Errorf("read root settings.json: %w", err)
|
||||
}
|
||||
|
||||
var payload map[string]any
|
||||
if err := json.Unmarshal(content, &payload); err != nil {
|
||||
return Scope{}, fmt.Errorf("decode root settings.json: %w", err)
|
||||
}
|
||||
|
||||
installation, _ := payload["installation"].(map[string]any)
|
||||
organization, _ := payload["organization"].(map[string]any)
|
||||
|
||||
return Scope{
|
||||
InstallationID: stringValue(installation["id"]),
|
||||
OrganizationID: stringValue(organization["id"]),
|
||||
OrganizationSlug: stringValue(organization["slug"]),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func buildNode(rootPath, relPath string, entry fs.DirEntry, rootScope Scope) (Node, error) {
|
||||
scope := deriveScope(relPath, rootScope)
|
||||
parentPath := projectionParentPath(relPath)
|
||||
logicalType, fileRole := classifyPath(relPath, entry.IsDir())
|
||||
|
||||
node := Node{
|
||||
Path: relPath,
|
||||
ParentPath: parentPath,
|
||||
Name: entry.Name(),
|
||||
Depth: strings.Count(relPath, "/") + 1,
|
||||
NodeKind: NodeKindDirectory,
|
||||
LogicalType: logicalType,
|
||||
FileRole: fileRole,
|
||||
InstallationID: scope.InstallationID,
|
||||
OrganizationID: scope.OrganizationID,
|
||||
OrganizationSlug: scope.OrganizationSlug,
|
||||
DepartmentSlug: scope.DepartmentSlug,
|
||||
TeamSlug: scope.TeamSlug,
|
||||
ProjectSlug: scope.ProjectSlug,
|
||||
PersonalSlug: scope.PersonalSlug,
|
||||
}
|
||||
|
||||
if entry.IsDir() {
|
||||
return node, nil
|
||||
}
|
||||
|
||||
absPath := filepath.Join(rootPath, filepath.FromSlash(relPath))
|
||||
content, err := os.ReadFile(absPath)
|
||||
if err != nil {
|
||||
return Node{}, fmt.Errorf("read POSIX file %s: %w", relPath, err)
|
||||
}
|
||||
|
||||
hash := sha256.Sum256(content)
|
||||
node.NodeKind = NodeKindFile
|
||||
node.SizeBytes = int64(len(content))
|
||||
node.Checksum = hex.EncodeToString(hash[:])
|
||||
|
||||
if strings.EqualFold(filepath.Ext(entry.Name()), ".json") {
|
||||
var payload map[string]any
|
||||
if err := json.Unmarshal(content, &payload); err == nil {
|
||||
jsonContent, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
return Node{}, fmt.Errorf("remarshal POSIX file %s: %w", relPath, err)
|
||||
}
|
||||
node.ContentJSON = jsonContent
|
||||
node.ResourceID = stringValue(payload["id"])
|
||||
node.ResourceName = stringValue(payload["name"])
|
||||
node.ResourceSlug = stringValue(payload["slug"])
|
||||
if node.ResourceID == "" && fileRole == "settings" && logicalType == "tenant" {
|
||||
installation, _ := payload["installation"].(map[string]any)
|
||||
organization, _ := payload["organization"].(map[string]any)
|
||||
node.ResourceID = stringValue(installation["id"])
|
||||
node.ResourceName = stringValue(installation["name"])
|
||||
node.InstallationID = stringValue(installation["id"])
|
||||
node.OrganizationID = stringValue(organization["id"])
|
||||
node.OrganizationSlug = firstNonEmpty(node.OrganizationSlug, stringValue(organization["slug"]))
|
||||
}
|
||||
if node.ResourceID == "" && fileRole == "users" {
|
||||
node.ResourceName = firstNonEmpty(node.ResourceName, parentEntityName(logicalType, scope))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if node.ResourceSlug == "" {
|
||||
node.ResourceSlug = inferredResourceSlug(logicalType, scope)
|
||||
}
|
||||
|
||||
return node, nil
|
||||
}
|
||||
|
||||
func deriveScope(relPath string, rootScope Scope) Scope {
|
||||
scope := rootScope
|
||||
parts := strings.Split(relPath, "/")
|
||||
for _, part := range parts {
|
||||
switch {
|
||||
case strings.HasPrefix(part, "department-"):
|
||||
scope.DepartmentSlug = strings.TrimPrefix(part, "department-")
|
||||
case strings.HasPrefix(part, "team-"):
|
||||
scope.TeamSlug = strings.TrimPrefix(part, "team-")
|
||||
case strings.HasPrefix(part, "project-"):
|
||||
scope.ProjectSlug = strings.TrimPrefix(part, "project-")
|
||||
case strings.HasPrefix(part, "personal-"):
|
||||
scope.PersonalSlug = strings.TrimPrefix(part, "personal-")
|
||||
}
|
||||
}
|
||||
return scope
|
||||
}
|
||||
|
||||
func classifyPath(relPath string, isDir bool) (logicalType, fileRole string) {
|
||||
parts := strings.Split(relPath, "/")
|
||||
name := parts[len(parts)-1]
|
||||
if !isDir {
|
||||
fileRole = strings.TrimSuffix(name, filepath.Ext(name))
|
||||
}
|
||||
|
||||
hasChildrenAncestor := pathContainsSegment(parts, "children")
|
||||
hasTreeAncestor := pathContainsSegment(parts, "tree")
|
||||
parentName := ""
|
||||
if len(parts) >= 2 {
|
||||
parentName = parts[len(parts)-2]
|
||||
}
|
||||
|
||||
switch {
|
||||
case relPath == "settings.json":
|
||||
return "tenant", "settings"
|
||||
case relPath == "layout.json":
|
||||
return "tenant", "layout"
|
||||
case len(parts) >= 1 && parts[0] == "catalog":
|
||||
if isDir {
|
||||
if len(parts) == 1 {
|
||||
return "catalog", ""
|
||||
}
|
||||
if len(parts) >= 2 && parts[1] == "packs" {
|
||||
if len(parts) == 2 {
|
||||
return "catalog_packs", ""
|
||||
}
|
||||
if len(parts) == 3 {
|
||||
return "catalog_pack", ""
|
||||
}
|
||||
if len(parts) >= 4 && parts[3] == "entries" {
|
||||
return "catalog_pack_entries", ""
|
||||
}
|
||||
return "catalog_entry", ""
|
||||
}
|
||||
if len(parts) >= 2 && parts[1] == "standalone" {
|
||||
if len(parts) == 2 {
|
||||
return "catalog_standalone", ""
|
||||
}
|
||||
return "catalog_entry", ""
|
||||
}
|
||||
}
|
||||
return "catalog", fileRole
|
||||
case len(parts) >= 2 && parts[0] == "departments" && strings.HasPrefix(parts[1], "department-"):
|
||||
if isDir {
|
||||
if len(parts) == 2 {
|
||||
return "department", ""
|
||||
}
|
||||
if len(parts) == 3 && parts[2] == "teams" {
|
||||
return "department_teams", ""
|
||||
}
|
||||
if len(parts) >= 4 && strings.HasPrefix(parts[3], "team-") {
|
||||
return "team", ""
|
||||
}
|
||||
}
|
||||
if len(parts) >= 4 && strings.HasPrefix(parts[3], "team-") {
|
||||
return "team", fileRole
|
||||
}
|
||||
return "department", fileRole
|
||||
case len(parts) >= 2 && parts[0] == "projects" && strings.HasPrefix(parts[1], "project-"):
|
||||
if isDir {
|
||||
if strings.HasPrefix(name, "project-") {
|
||||
return "project", ""
|
||||
}
|
||||
if name == "children" {
|
||||
return "project_children", ""
|
||||
}
|
||||
if name == "tree" {
|
||||
return "project_tree", ""
|
||||
}
|
||||
if hasChildrenAncestor && strings.HasPrefix(name, "folder-") {
|
||||
return "hierarchy_folder", ""
|
||||
}
|
||||
if hasTreeAncestor && strings.HasPrefix(name, "folder-") {
|
||||
return "hierarchy_folder", ""
|
||||
}
|
||||
if hasTreeAncestor && strings.HasPrefix(name, "item-") {
|
||||
return "item", ""
|
||||
}
|
||||
}
|
||||
if hasChildrenAncestor && strings.HasPrefix(parentName, "folder-") {
|
||||
return "hierarchy_folder", fileRole
|
||||
}
|
||||
if hasTreeAncestor {
|
||||
if strings.HasPrefix(parentName, "item-") {
|
||||
return "item", fileRole
|
||||
}
|
||||
if strings.HasPrefix(parentName, "folder-") {
|
||||
return "hierarchy_folder", fileRole
|
||||
}
|
||||
}
|
||||
return "project", fileRole
|
||||
case len(parts) >= 1 && parts[0] == "users":
|
||||
if isDir {
|
||||
if len(parts) == 1 {
|
||||
return "users", ""
|
||||
}
|
||||
if len(parts) == 2 && parts[1] == "personals" {
|
||||
return "personals", ""
|
||||
}
|
||||
if len(parts) >= 3 && parts[1] == "personals" && strings.HasPrefix(parts[2], "personal-") {
|
||||
return "personal", ""
|
||||
}
|
||||
if strings.Contains(relPath, "/tree/") || strings.HasSuffix(relPath, "/tree") {
|
||||
if strings.HasPrefix(name, "folder-") {
|
||||
return "folder", ""
|
||||
}
|
||||
if strings.HasPrefix(name, "item-") {
|
||||
return "item", ""
|
||||
}
|
||||
}
|
||||
}
|
||||
if len(parts) >= 3 && parts[1] == "personals" && strings.HasPrefix(parts[2], "personal-") {
|
||||
if strings.Contains(relPath, "/tree/") {
|
||||
if strings.HasPrefix(parts[len(parts)-2], "item-") {
|
||||
return "item", fileRole
|
||||
}
|
||||
if strings.HasPrefix(parts[len(parts)-2], "folder-") {
|
||||
return "folder", fileRole
|
||||
}
|
||||
}
|
||||
return "personal", fileRole
|
||||
}
|
||||
return "users", fileRole
|
||||
default:
|
||||
if isDir {
|
||||
return "directory", ""
|
||||
}
|
||||
return "file", fileRole
|
||||
}
|
||||
}
|
||||
|
||||
func pathContainsSegment(parts []string, target string) bool {
|
||||
for _, part := range parts {
|
||||
if part == target {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func projectionParentPath(relPath string) *string {
|
||||
if relPath == "" || relPath == rootProjectionPath {
|
||||
return nil
|
||||
}
|
||||
parent := filepath.ToSlash(filepath.Dir(relPath))
|
||||
if parent == "." || parent == "" {
|
||||
root := rootProjectionPath
|
||||
return &root
|
||||
}
|
||||
return &parent
|
||||
}
|
||||
|
||||
func inferredResourceSlug(logicalType string, scope Scope) string {
|
||||
switch logicalType {
|
||||
case "department":
|
||||
return scope.DepartmentSlug
|
||||
case "team":
|
||||
return scope.TeamSlug
|
||||
case "project":
|
||||
return scope.ProjectSlug
|
||||
case "personal":
|
||||
return scope.PersonalSlug
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
func parentEntityName(logicalType string, scope Scope) string {
|
||||
switch logicalType {
|
||||
case "department":
|
||||
return scope.DepartmentSlug
|
||||
case "team":
|
||||
return scope.TeamSlug
|
||||
case "project":
|
||||
return scope.ProjectSlug
|
||||
case "personal":
|
||||
return scope.PersonalSlug
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
func stringValue(value any) string {
|
||||
stringValue, _ := value.(string)
|
||||
return strings.TrimSpace(stringValue)
|
||||
}
|
||||
|
||||
func firstNonEmpty(values ...string) string {
|
||||
for _, value := range values {
|
||||
trimmed := strings.TrimSpace(value)
|
||||
if trimmed != "" {
|
||||
return trimmed
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func summarizeNodes(nodes []Node) RebuildSummary {
|
||||
summary := RebuildSummary{TotalNodes: len(nodes)}
|
||||
for _, node := range nodes {
|
||||
switch node.NodeKind {
|
||||
case NodeKindDirectory:
|
||||
summary.DirectoryCount++
|
||||
case NodeKindFile:
|
||||
summary.FileCount++
|
||||
}
|
||||
}
|
||||
return summary
|
||||
}
|
||||
|
||||
func errorsIsNotExist(err error) bool {
|
||||
return err != nil && os.IsNotExist(err)
|
||||
}
|
||||
@@ -0,0 +1,232 @@
|
||||
package posixproj
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestScanRootBuildsProjectedNodesFromBootstrapShape(t *testing.T) {
|
||||
root := filepath.Join(t.TempDir(), "POSIX")
|
||||
|
||||
mustMkdirAll(t, filepath.Join(root, "catalog", "packs"))
|
||||
mustMkdirAll(t, filepath.Join(root, "catalog", "standalone"))
|
||||
mustMkdirAll(t, filepath.Join(root, "departments", "department-primary-department", "teams", "team-primary-team"))
|
||||
mustMkdirAll(t, filepath.Join(root, "projects", "project-primary-project", "children", "folder-design", "children", "project-web", "children"))
|
||||
mustMkdirAll(t, filepath.Join(root, "projects", "project-primary-project", "children", "folder-design", "children", "project-web", "tree"))
|
||||
mustMkdirAll(t, filepath.Join(root, "projects", "project-primary-project", "tree"))
|
||||
mustMkdirAll(t, filepath.Join(root, "projects", "project-primary-project", "tree", "folder-docs", "children"))
|
||||
mustMkdirAll(t, filepath.Join(root, "projects", "project-primary-project", "tree", "folder-docs", "item-roadmap"))
|
||||
mustMkdirAll(t, filepath.Join(root, "users", "personals"))
|
||||
|
||||
mustWriteJSON(t, filepath.Join(root, "settings.json"), map[string]any{
|
||||
"installation": map[string]any{
|
||||
"id": "installation-1",
|
||||
"name": "MangoPig",
|
||||
"isBootstrapped": true,
|
||||
},
|
||||
"organization": map[string]any{
|
||||
"id": "org-1",
|
||||
"name": "Primary Organization",
|
||||
"slug": "primary-organization",
|
||||
},
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "layout.json"), map[string]any{
|
||||
"type": "tenant-layout",
|
||||
"home": map[string]any{"defaultProjectSlug": "primary-project"},
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "departments", "department-primary-department", "settings.json"), map[string]any{
|
||||
"id": "dept-1",
|
||||
"name": "Primary Department",
|
||||
"slug": "primary-department",
|
||||
"type": "department",
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "departments", "department-primary-department", "users.json"), map[string]any{
|
||||
"users": []map[string]any{{"id": "admin-1"}},
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "departments", "department-primary-department", "teams", "team-primary-team", "settings.json"), map[string]any{
|
||||
"id": "team-1",
|
||||
"name": "Primary Team",
|
||||
"slug": "primary-team",
|
||||
"type": "team",
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "projects", "project-primary-project", "settings.json"), map[string]any{
|
||||
"id": "project-1",
|
||||
"name": "Primary Project",
|
||||
"slug": "primary-project",
|
||||
"type": "project",
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "projects", "project-primary-project", "home.json"), map[string]any{
|
||||
"type": "project-home",
|
||||
"project": "primary-project",
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "projects", "project-primary-project", "acl.json"), map[string]any{
|
||||
"inherits": true,
|
||||
"rules": []any{},
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "projects", "project-primary-project", "children", "folder-design", "folder.json"), map[string]any{
|
||||
"name": "Design",
|
||||
"slug": "design",
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "projects", "project-primary-project", "children", "folder-design", "acl.json"), map[string]any{
|
||||
"inherits": true,
|
||||
"rules": []any{},
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "projects", "project-primary-project", "children", "folder-design", "children", "project-web", "settings.json"), map[string]any{
|
||||
"id": "project-2",
|
||||
"name": "Web Project",
|
||||
"slug": "web",
|
||||
"type": "project",
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "projects", "project-primary-project", "children", "folder-design", "children", "project-web", "home.json"), map[string]any{
|
||||
"type": "project-home",
|
||||
"project": "web",
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "projects", "project-primary-project", "children", "folder-design", "children", "project-web", "acl.json"), map[string]any{
|
||||
"inherits": true,
|
||||
"rules": []any{},
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "projects", "project-primary-project", "tree", "folder-docs", "folder.json"), map[string]any{
|
||||
"name": "Docs",
|
||||
"slug": "docs",
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "projects", "project-primary-project", "tree", "folder-docs", "item-roadmap", "item.json"), map[string]any{
|
||||
"id": "item-1",
|
||||
"name": "Roadmap",
|
||||
"slug": "roadmap",
|
||||
"type": "board",
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "projects", "project-primary-project", "tree", "folder-docs", "item-roadmap", "schema.json"), map[string]any{
|
||||
"type": "object",
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "projects", "project-primary-project", "tree", "folder-docs", "item-roadmap", "data.json"), map[string]any{
|
||||
"title": "Roadmap",
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "users", "settings.json"), map[string]any{
|
||||
"primaryAdminId": "admin-1",
|
||||
})
|
||||
mustWriteJSON(t, filepath.Join(root, "users", "data.json"), map[string]any{
|
||||
"users": []map[string]any{{"id": "admin-1", "email": "ronald@example.com"}},
|
||||
})
|
||||
|
||||
nodes, err := ScanRoot(root)
|
||||
if err != nil {
|
||||
t.Fatalf("ScanRoot() error = %v", err)
|
||||
}
|
||||
|
||||
index := make(map[string]Node, len(nodes))
|
||||
for _, node := range nodes {
|
||||
index[node.Path] = node
|
||||
}
|
||||
|
||||
rootNode, ok := index[rootProjectionPath]
|
||||
if !ok {
|
||||
t.Fatalf("expected synthetic root node")
|
||||
}
|
||||
if rootNode.LogicalType != "tenant_root" {
|
||||
t.Fatalf("expected root logical type tenant_root, got %q", rootNode.LogicalType)
|
||||
}
|
||||
if rootNode.OrganizationSlug != "primary-organization" {
|
||||
t.Fatalf("expected root organization slug primary-organization, got %q", rootNode.OrganizationSlug)
|
||||
}
|
||||
|
||||
tenantSettings := index["settings.json"]
|
||||
if tenantSettings.LogicalType != "tenant" || tenantSettings.FileRole != "settings" {
|
||||
t.Fatalf("unexpected tenant settings classification: %#v", tenantSettings)
|
||||
}
|
||||
if tenantSettings.InstallationID != "installation-1" {
|
||||
t.Fatalf("expected installation id installation-1, got %q", tenantSettings.InstallationID)
|
||||
}
|
||||
|
||||
deptSettings := index["departments/department-primary-department/settings.json"]
|
||||
if deptSettings.DepartmentSlug != "primary-department" {
|
||||
t.Fatalf("expected department slug primary-department, got %q", deptSettings.DepartmentSlug)
|
||||
}
|
||||
if deptSettings.ResourceID != "dept-1" {
|
||||
t.Fatalf("expected department resource id dept-1, got %q", deptSettings.ResourceID)
|
||||
}
|
||||
|
||||
teamSettings := index["departments/department-primary-department/teams/team-primary-team/settings.json"]
|
||||
if teamSettings.TeamSlug != "primary-team" {
|
||||
t.Fatalf("expected team slug primary-team, got %q", teamSettings.TeamSlug)
|
||||
}
|
||||
|
||||
projectSettings := index["projects/project-primary-project/settings.json"]
|
||||
if projectSettings.ProjectSlug != "primary-project" {
|
||||
t.Fatalf("expected project slug primary-project, got %q", projectSettings.ProjectSlug)
|
||||
}
|
||||
if projectSettings.ResourceName != "Primary Project" {
|
||||
t.Fatalf("expected project resource name Primary Project, got %q", projectSettings.ResourceName)
|
||||
}
|
||||
|
||||
projectTree := index["projects/project-primary-project/tree"]
|
||||
if projectTree.LogicalType != "project_tree" || projectTree.NodeKind != NodeKindDirectory {
|
||||
t.Fatalf("unexpected project tree node: %#v", projectTree)
|
||||
}
|
||||
|
||||
projectChildren := index["projects/project-primary-project/children"]
|
||||
if projectChildren.LogicalType != "project_children" || projectChildren.NodeKind != NodeKindDirectory {
|
||||
t.Fatalf("unexpected project children node: %#v", projectChildren)
|
||||
}
|
||||
|
||||
hierarchyFolder := index["projects/project-primary-project/children/folder-design"]
|
||||
if hierarchyFolder.LogicalType != "hierarchy_folder" || hierarchyFolder.ProjectSlug != "primary-project" {
|
||||
t.Fatalf("unexpected hierarchy folder node: %#v", hierarchyFolder)
|
||||
}
|
||||
|
||||
hierarchyFolderACL := index["projects/project-primary-project/children/folder-design/acl.json"]
|
||||
if hierarchyFolderACL.LogicalType != "hierarchy_folder" || hierarchyFolderACL.FileRole != "acl" {
|
||||
t.Fatalf("unexpected hierarchy folder acl classification: %#v", hierarchyFolderACL)
|
||||
}
|
||||
|
||||
childProjectSettings := index["projects/project-primary-project/children/folder-design/children/project-web/settings.json"]
|
||||
if childProjectSettings.LogicalType != "project" || childProjectSettings.ProjectSlug != "web" {
|
||||
t.Fatalf("unexpected child project classification: %#v", childProjectSettings)
|
||||
}
|
||||
|
||||
treeFolder := index["projects/project-primary-project/tree/folder-docs"]
|
||||
if treeFolder.LogicalType != "hierarchy_folder" || treeFolder.ProjectSlug != "primary-project" {
|
||||
t.Fatalf("unexpected tree folder node: %#v", treeFolder)
|
||||
}
|
||||
|
||||
treeFolderACL := index["projects/project-primary-project/tree/folder-docs/folder.json"]
|
||||
if treeFolderACL.LogicalType != "hierarchy_folder" || treeFolderACL.FileRole != "folder" {
|
||||
t.Fatalf("unexpected tree folder file classification: %#v", treeFolderACL)
|
||||
}
|
||||
|
||||
treeItem := index["projects/project-primary-project/tree/folder-docs/item-roadmap/item.json"]
|
||||
if treeItem.LogicalType != "item" || treeItem.FileRole != "item" {
|
||||
t.Fatalf("unexpected tree item classification: %#v", treeItem)
|
||||
}
|
||||
if treeItem.ResourceSlug != "roadmap" {
|
||||
t.Fatalf("expected tree item resource slug roadmap, got %#v", treeItem.ResourceSlug)
|
||||
}
|
||||
|
||||
usersData := index["users/data.json"]
|
||||
if usersData.LogicalType != "users" || usersData.FileRole != "data" {
|
||||
t.Fatalf("unexpected users data classification: %#v", usersData)
|
||||
}
|
||||
if usersData.Checksum == "" || usersData.SizeBytes == 0 {
|
||||
t.Fatalf("expected users/data.json checksum and size to be populated: %#v", usersData)
|
||||
}
|
||||
}
|
||||
|
||||
func mustMkdirAll(t *testing.T, path string) {
|
||||
t.Helper()
|
||||
if err := os.MkdirAll(path, 0o755); err != nil {
|
||||
t.Fatalf("MkdirAll(%q) error = %v", path, err)
|
||||
}
|
||||
}
|
||||
|
||||
func mustWriteJSON(t *testing.T, path string, payload any) {
|
||||
t.Helper()
|
||||
bytes, err := json.MarshalIndent(payload, "", " ")
|
||||
if err != nil {
|
||||
t.Fatalf("MarshalIndent(%q) error = %v", path, err)
|
||||
}
|
||||
bytes = append(bytes, '\n')
|
||||
if err := os.WriteFile(path, bytes, 0o644); err != nil {
|
||||
t.Fatalf("WriteFile(%q) error = %v", path, err)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,124 @@
|
||||
package worker
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"moku-backend/internal/jobs"
|
||||
)
|
||||
|
||||
type JobStore interface {
|
||||
ClaimNext(ctx context.Context) (*jobs.Job, error)
|
||||
MarkSucceeded(ctx context.Context, jobID string) error
|
||||
MarkFailed(ctx context.Context, jobID, failure string) error
|
||||
}
|
||||
|
||||
type Handler func(ctx context.Context, job jobs.Job) error
|
||||
|
||||
type Runner struct {
|
||||
store JobStore
|
||||
logger *slog.Logger
|
||||
pollInterval time.Duration
|
||||
handlers map[string]Handler
|
||||
}
|
||||
|
||||
func NewRunner(store JobStore, logger *slog.Logger, pollInterval time.Duration) *Runner {
|
||||
interval := pollInterval
|
||||
if interval <= 0 {
|
||||
interval = time.Second
|
||||
}
|
||||
|
||||
return &Runner{
|
||||
store: store,
|
||||
logger: logger,
|
||||
pollInterval: interval,
|
||||
handlers: make(map[string]Handler),
|
||||
}
|
||||
}
|
||||
|
||||
func (runner *Runner) Register(kind string, handler Handler) {
|
||||
runner.handlers[strings.TrimSpace(kind)] = handler
|
||||
}
|
||||
|
||||
func (runner *Runner) Run(ctx context.Context) error {
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return nil
|
||||
default:
|
||||
}
|
||||
|
||||
job, err := runner.store.ClaimNext(ctx)
|
||||
if err != nil {
|
||||
if ctx.Err() != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
runner.logger.Error("worker claim failed", "error", err)
|
||||
|
||||
if err := waitForNextPoll(ctx, runner.pollInterval); err != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
if job == nil {
|
||||
if err := waitForNextPoll(ctx, runner.pollInterval); err != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
handler, ok := runner.handlers[job.Kind]
|
||||
if !ok {
|
||||
failure := fmt.Sprintf("no handler registered for job kind %q", job.Kind)
|
||||
if err := runner.store.MarkFailed(ctx, job.ID, failure); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
runner.logger.Error("worker job failed", "jobID", job.ID, "kind", job.Kind, "error", failure)
|
||||
continue
|
||||
}
|
||||
|
||||
if err := handler(ctx, *job); err != nil {
|
||||
if ctx.Err() != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
failure := strings.TrimSpace(err.Error())
|
||||
if failure == "" {
|
||||
failure = "job handler returned an empty error"
|
||||
}
|
||||
|
||||
if markErr := runner.store.MarkFailed(ctx, job.ID, failure); markErr != nil {
|
||||
return markErr
|
||||
}
|
||||
|
||||
runner.logger.Error("worker job failed", "jobID", job.ID, "kind", job.Kind, "error", failure)
|
||||
continue
|
||||
}
|
||||
|
||||
if err := runner.store.MarkSucceeded(ctx, job.ID); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
runner.logger.Info("worker job succeeded", "jobID", job.ID, "kind", job.Kind)
|
||||
}
|
||||
}
|
||||
|
||||
func waitForNextPoll(ctx context.Context, interval time.Duration) error {
|
||||
timer := time.NewTimer(interval)
|
||||
defer timer.Stop()
|
||||
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return ctx.Err()
|
||||
case <-timer.C:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,209 @@
|
||||
package worker
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"io"
|
||||
"log/slog"
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"moku-backend/internal/jobs"
|
||||
)
|
||||
|
||||
func TestRunnerProcessesRegisteredJob(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
|
||||
store := &fakeJobStore{
|
||||
job: &jobs.Job{
|
||||
ID: "job-1",
|
||||
Kind: jobs.KindBootstrapStructureMaterialize,
|
||||
Payload: []byte(`{"installationId":"installation-1"}`),
|
||||
},
|
||||
cancel: cancel,
|
||||
}
|
||||
runner := NewRunner(store, slog.New(slog.NewTextHandler(io.Discard, nil)), 0)
|
||||
|
||||
handlerCalled := false
|
||||
runner.Register(jobs.KindBootstrapStructureMaterialize, func(ctx context.Context, job jobs.Job) error {
|
||||
handlerCalled = true
|
||||
if job.ID != "job-1" {
|
||||
t.Fatalf("expected job id job-1, got %s", job.ID)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
|
||||
if err := runner.Run(ctx); err != nil {
|
||||
t.Fatalf("runner returned error: %v", err)
|
||||
}
|
||||
|
||||
if !handlerCalled {
|
||||
t.Fatal("expected handler to be called")
|
||||
}
|
||||
if len(store.succeeded) != 1 || store.succeeded[0] != "job-1" {
|
||||
t.Fatalf("expected job to be marked succeeded once, got %#v", store.succeeded)
|
||||
}
|
||||
if len(store.failed) != 0 {
|
||||
t.Fatalf("expected no failed jobs, got %#v", store.failed)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerMarksFailedWhenHandlerErrors(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
|
||||
store := &fakeJobStore{
|
||||
job: &jobs.Job{
|
||||
ID: "job-2",
|
||||
Kind: jobs.KindBootstrapStructureMaterialize,
|
||||
},
|
||||
cancel: cancel,
|
||||
}
|
||||
runner := NewRunner(store, slog.New(slog.NewTextHandler(io.Discard, nil)), 0)
|
||||
runner.Register(jobs.KindBootstrapStructureMaterialize, func(ctx context.Context, job jobs.Job) error {
|
||||
return errors.New("boom")
|
||||
})
|
||||
|
||||
if err := runner.Run(ctx); err != nil {
|
||||
t.Fatalf("runner returned error: %v", err)
|
||||
}
|
||||
|
||||
if len(store.succeeded) != 0 {
|
||||
t.Fatalf("expected no succeeded jobs, got %#v", store.succeeded)
|
||||
}
|
||||
if len(store.failed) != 1 {
|
||||
t.Fatalf("expected one failed job, got %#v", store.failed)
|
||||
}
|
||||
if store.failed[0].jobID != "job-2" {
|
||||
t.Fatalf("expected failed job id job-2, got %#v", store.failed[0])
|
||||
}
|
||||
if !strings.Contains(store.failed[0].failure, "boom") {
|
||||
t.Fatalf("expected failure to mention handler error, got %#v", store.failed[0])
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerMarksFailedWhenHandlerMissing(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
|
||||
store := &fakeJobStore{
|
||||
job: &jobs.Job{
|
||||
ID: "job-3",
|
||||
Kind: "unknown.kind",
|
||||
},
|
||||
cancel: cancel,
|
||||
}
|
||||
runner := NewRunner(store, slog.New(slog.NewTextHandler(io.Discard, nil)), 0)
|
||||
|
||||
if err := runner.Run(ctx); err != nil {
|
||||
t.Fatalf("runner returned error: %v", err)
|
||||
}
|
||||
|
||||
if len(store.failed) != 1 {
|
||||
t.Fatalf("expected one failed job, got %#v", store.failed)
|
||||
}
|
||||
if !strings.Contains(store.failed[0].failure, "no handler registered") {
|
||||
t.Fatalf("expected missing handler failure, got %#v", store.failed[0])
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunnerRetriesClaimErrors(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
|
||||
store := &fakeJobStore{
|
||||
claimErrors: []error{errors.New("relation \"background_jobs\" does not exist")},
|
||||
job: &jobs.Job{
|
||||
ID: "job-4",
|
||||
Kind: jobs.KindBootstrapStructureMaterialize,
|
||||
},
|
||||
cancel: cancel,
|
||||
}
|
||||
runner := NewRunner(store, slog.New(slog.NewTextHandler(io.Discard, nil)), time.Millisecond)
|
||||
|
||||
handlerCalled := false
|
||||
runner.Register(jobs.KindBootstrapStructureMaterialize, func(ctx context.Context, job jobs.Job) error {
|
||||
handlerCalled = true
|
||||
return nil
|
||||
})
|
||||
|
||||
if err := runner.Run(ctx); err != nil {
|
||||
t.Fatalf("runner returned error: %v", err)
|
||||
}
|
||||
|
||||
if !handlerCalled {
|
||||
t.Fatal("expected handler to be called after claim retry")
|
||||
}
|
||||
if store.claimAttempts < 2 {
|
||||
t.Fatalf("expected at least two claim attempts, got %d", store.claimAttempts)
|
||||
}
|
||||
if len(store.succeeded) != 1 || store.succeeded[0] != "job-4" {
|
||||
t.Fatalf("expected job to be marked succeeded once, got %#v", store.succeeded)
|
||||
}
|
||||
if len(store.failed) != 0 {
|
||||
t.Fatalf("expected no failed jobs, got %#v", store.failed)
|
||||
}
|
||||
}
|
||||
|
||||
type fakeJobStore struct {
|
||||
mu sync.Mutex
|
||||
job *jobs.Job
|
||||
claimed bool
|
||||
claimErrors []error
|
||||
claimAttempts int
|
||||
succeeded []string
|
||||
failed []fakeFailure
|
||||
cancel context.CancelFunc
|
||||
}
|
||||
|
||||
type fakeFailure struct {
|
||||
jobID string
|
||||
failure string
|
||||
}
|
||||
|
||||
func (store *fakeJobStore) ClaimNext(ctx context.Context) (*jobs.Job, error) {
|
||||
store.mu.Lock()
|
||||
defer store.mu.Unlock()
|
||||
store.claimAttempts++
|
||||
|
||||
if len(store.claimErrors) > 0 {
|
||||
err := store.claimErrors[0]
|
||||
store.claimErrors = store.claimErrors[1:]
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if store.claimed || store.job == nil {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
store.claimed = true
|
||||
job := *store.job
|
||||
return &job, nil
|
||||
}
|
||||
|
||||
func (store *fakeJobStore) MarkSucceeded(ctx context.Context, jobID string) error {
|
||||
store.mu.Lock()
|
||||
store.succeeded = append(store.succeeded, jobID)
|
||||
store.mu.Unlock()
|
||||
|
||||
if store.cancel != nil {
|
||||
store.cancel()
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (store *fakeJobStore) MarkFailed(ctx context.Context, jobID, failure string) error {
|
||||
store.mu.Lock()
|
||||
store.failed = append(store.failed, fakeFailure{jobID: jobID, failure: failure})
|
||||
store.mu.Unlock()
|
||||
|
||||
if store.cancel != nil {
|
||||
store.cancel()
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -9,18 +9,22 @@ migrate-up:
|
||||
migrate-down:
|
||||
cd '{{backend_dir}}' && go run ./cmd/migrate down
|
||||
|
||||
# Reset all embedded database migrations and reapply from scratch.
|
||||
# Reset all embedded database migrations.
|
||||
migrate-reset:
|
||||
cd '{{backend_dir}}' && go run ./cmd/migrate reset
|
||||
|
||||
# Reset embedded database migrations and apply them again from scratch.
|
||||
migrate-rebuild:
|
||||
cd '{{backend_dir}}' && go run ./cmd/migrate reset && go run ./cmd/migrate up
|
||||
|
||||
# Show the embedded database migration status.
|
||||
migrate-status:
|
||||
cd '{{backend_dir}}' && go run ./cmd/migrate status
|
||||
|
||||
# Rebuild the POSIX-to-DB projection from the current POSIX root.
|
||||
posix-rebuild:
|
||||
cd '{{backend_dir}}' && go run ./cmd/posix rebuild
|
||||
|
||||
# Format backend Go source files.
|
||||
fmt:
|
||||
cd '{{backend_dir}}' && gofmt -w ./cmd ./db ./internal
|
||||
|
||||
# Run backend test suite.
|
||||
test:
|
||||
cd '{{backend_dir}}' && go test ./...
|
||||
|
||||
@@ -1,11 +1,15 @@
|
||||
project_root := justfile_directory()
|
||||
proxy_bake := project_root + "/Proxy/docker-bake.hcl"
|
||||
backend_bake := project_root + "/Backend/docker-bake.hcl"
|
||||
local_compose := project_root + "/Docker/docker-compose.local.prod.yaml"
|
||||
proxy_image := "moku/work-proxy:local-prod"
|
||||
backend_api_image := "moku/work-backend:local-prod-api"
|
||||
backend_worker_image := "moku/work-backend:local-prod-worker"
|
||||
|
||||
# Build the local production proxy image locally.
|
||||
build:
|
||||
cd '{{project_root}}' && docker buildx bake -f '{{proxy_bake}}' prod
|
||||
cd '{{project_root}}' && docker buildx bake -f '{{backend_bake}}' prod-api prod-worker
|
||||
|
||||
# Start the local production stack in the background using the current image.
|
||||
up:
|
||||
@@ -17,6 +21,7 @@ start: build up
|
||||
# Rebuild the local production proxy image locally.
|
||||
rebuild:
|
||||
cd '{{project_root}}' && docker buildx bake -f '{{proxy_bake}}' --set '*.no-cache=true' prod
|
||||
cd '{{project_root}}' && docker buildx bake -f '{{backend_bake}}' --set '*.no-cache=true' prod-api prod-worker
|
||||
docker compose -f '{{local_compose}}' up -d --remove-orphans --force-recreate
|
||||
|
||||
# Stop and remove the local production stack.
|
||||
@@ -35,3 +40,5 @@ restart:
|
||||
clean:
|
||||
docker compose -f '{{local_compose}}' down --remove-orphans --volumes
|
||||
docker image rm -f '{{proxy_image}}' >/dev/null 2>&1 || true
|
||||
docker image rm -f '{{backend_api_image}}' >/dev/null 2>&1 || true
|
||||
docker image rm -f '{{backend_worker_image}}' >/dev/null 2>&1 || true
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
project_root := justfile_directory()
|
||||
backend_dir := project_root + "/Backend"
|
||||
|
||||
# Run the full backend test suite.
|
||||
[default]
|
||||
all:
|
||||
cd '{{backend_dir}}' && go test ./...
|
||||
|
||||
# Run the isolated POSIX bootstrap smoke test.
|
||||
posix-bootstrap:
|
||||
cd '{{backend_dir}}' && go test ./internal/bootstrap -run TestEnsureBootstrapPOSIXSkeletonInitializesEmptyRoot -count=1 -v
|
||||
@@ -0,0 +1 @@
|
||||
mod backend
|
||||
@@ -6,6 +6,7 @@ x-backend-service: &backend-service
|
||||
environment:
|
||||
DATABASE_URL: postgres://moku:moku_dev_password@postgres:5432/moku?sslmode=disable
|
||||
VALKEY_URL: redis://valkey:6379/0
|
||||
POSIX_ROOT: /posix
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
@@ -13,6 +14,7 @@ x-backend-service: &backend-service
|
||||
condition: service_healthy
|
||||
volumes:
|
||||
- ../Backend:/app
|
||||
- ../POSIX:/posix
|
||||
- moku_work_backend_go_pkg:/go/pkg/mod
|
||||
- moku_work_backend_go_build:/root/.cache/go-build
|
||||
|
||||
|
||||
@@ -1,7 +1,70 @@
|
||||
x-backend-service: &backend-service
|
||||
restart: unless-stopped
|
||||
env_file:
|
||||
- ../Env/.env.local
|
||||
environment:
|
||||
DATABASE_URL: postgres://moku:moku_dev_password@postgres:5432/moku?sslmode=disable
|
||||
VALKEY_URL: redis://valkey:6379/0
|
||||
POSIX_ROOT: /posix
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
valkey:
|
||||
condition: service_healthy
|
||||
volumes:
|
||||
- ../POSIX:/posix
|
||||
|
||||
services:
|
||||
proxy:
|
||||
image: moku/work-proxy:local-prod
|
||||
container_name: moku-work-proxy-local
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "8080:80"
|
||||
postgres:
|
||||
image: postgres:17-alpine
|
||||
container_name: moku-work-postgres-prod
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
POSTGRES_DB: moku
|
||||
POSTGRES_USER: moku
|
||||
POSTGRES_PASSWORD: moku_dev_password
|
||||
volumes:
|
||||
- moku_work_postgres_prod_data:/var/lib/postgresql/data
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U moku -d moku"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 10s
|
||||
|
||||
valkey:
|
||||
image: valkey/valkey:8-alpine
|
||||
container_name: moku-work-valkey-prod
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- moku_work_valkey_prod_data:/data
|
||||
healthcheck:
|
||||
test: ["CMD", "valkey-cli", "ping"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 5s
|
||||
|
||||
api:
|
||||
<<: *backend-service
|
||||
image: moku/work-backend:local-prod-api
|
||||
container_name: moku-work-backend-api-prod
|
||||
|
||||
worker:
|
||||
<<: *backend-service
|
||||
image: moku/work-backend:local-prod-worker
|
||||
container_name: moku-work-backend-worker-prod
|
||||
|
||||
proxy:
|
||||
image: moku/work-proxy:local-prod
|
||||
container_name: moku-work-proxy-local
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
api:
|
||||
condition: service_started
|
||||
ports:
|
||||
- "8080:80"
|
||||
|
||||
volumes:
|
||||
moku_work_postgres_prod_data:
|
||||
moku_work_valkey_prod_data:
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
# POSIX Structure
|
||||
|
||||
[Filetree Link](https://tree.nathanfriend.com/?s=(%27optiUs!(%27fancy!Yue~fullPath!fbq~YailingSlash!Yue~rootDot!fbq)~R(%27R%27PJ%20or%20OrganizatiU%20%7Bqrver%7DM*46layout6cNlog7packs7*pack37A2*enYies75W5A_standbUe7WA6HwH30LZ2teamw5teamGL5Z6FwF30LKTC058T5C7XFG5LXKXTXC7XI7I05QG5BN2*8QG5BN6Z04_dN_pJw*pJGlayout2L*KI70%27)~vEiU!%271%27)*%20%200M52_*3-%3Cslug%3E4qttings5**69M*7%2F08VG*V259.jsUA5manifestBQ25*schema25*dCchildrenEersFprojectG305HdepartmentI*YeeJEUbKhome2L*42M%5CnNataQitemRsource!Tacl2UonVfolderW*app37X55YtrZusE_90balqsews0%01wqb_ZYXWVUTRQNMLKJIHGFECBA987654320*)
|
||||
|
||||
``` markdown
|
||||
Personal or Organization (server)/
|
||||
├── settings.json
|
||||
├── layout.json
|
||||
├── catalog/
|
||||
│ ├── packs/
|
||||
│ │ └── pack-<slug>/
|
||||
│ │ ├── manifest.json
|
||||
│ │ └── entries/
|
||||
│ │ └── app-<slug>/
|
||||
│ │ └── manifest.json
|
||||
│ └── standalone/
|
||||
│ └── app-<slug>/
|
||||
│ └── manifest.json
|
||||
├── departments/
|
||||
│ └── department-<slug>/
|
||||
│ ├── settings.json
|
||||
│ ├── users.json
|
||||
│ └── teams/
|
||||
│ └── team-<slug>/
|
||||
│ ├── settings.json
|
||||
│ └── users.json
|
||||
├── projects/
|
||||
│ └── project-<slug>/
|
||||
│ ├── settings.json
|
||||
│ ├── home.json
|
||||
│ ├── acl.json
|
||||
│ ├── children/
|
||||
│ │ └── folder-<slug>/
|
||||
│ │ ├── folder.json
|
||||
│ │ ├── acl.json
|
||||
│ │ └── children/
|
||||
│ │ └── project-<slug>/
|
||||
│ │ ├── settings.json
|
||||
│ │ ├── home.json
|
||||
│ │ ├── acl.json
|
||||
│ │ ├── children/
|
||||
│ │ └── tree/
|
||||
│ └── tree/
|
||||
│ ├── item-<slug>/
|
||||
│ │ ├── item.json
|
||||
│ │ ├── schema.json
|
||||
│ │ └── data.json
|
||||
│ └── folder-<slug>/
|
||||
│ ├── folder.json
|
||||
│ └── item-<slug>/
|
||||
│ ├── item.json
|
||||
│ ├── schema.json
|
||||
│ └── data.json
|
||||
└── users/
|
||||
├── settings.json
|
||||
├── data.json
|
||||
└── personals/
|
||||
└── personal-<slug>/
|
||||
├── layout.json
|
||||
├── settings.json
|
||||
├── home.json
|
||||
└── tree/
|
||||
```
|
||||
|
||||
## File Responsibilities
|
||||
|
||||
- `settings.json` — Metadata and presentation config for the thing, such as display name, icon, description, and simple settings.
|
||||
- `layout.json` — Layout configuration for the current server or personal space.
|
||||
- `home.json` — Home surface configuration, such as widgets, sections, and how they are arranged.
|
||||
- `folder.json` — Metadata for a folder node in a tree.
|
||||
- `item.json` — Instance metadata for a created item, including what it is and how it should behave.
|
||||
- `schema.json` — The structure expected by that item's data.
|
||||
- `data.json` — The actual content or state data for that item.
|
||||
- `manifest.json` — Catalog definition metadata, including versioning, description, and capabilities for reusable apps or entries.
|
||||
- `users.json` — User membership or assignment data for departments and teams.
|
||||
+114
-52
@@ -4,87 +4,149 @@
|
||||
|
||||
### Version 0.1.0
|
||||
|
||||
**Goal:** Barebone frontend with a real backend core.
|
||||
**Goal:** Finish the base application shell, auth, and platform foundations.
|
||||
|
||||
#### Architecture
|
||||
#### Architecture and Delivery
|
||||
|
||||
- [ ] Project-Structure
|
||||
- [ ] Stack-Decisions
|
||||
- [ ] Proxy
|
||||
- [ ] Local-Prod-NGINX-Proxy
|
||||
- [ ] Static-Frontend-Serving
|
||||
- [ ] First-Request-Web-Loader
|
||||
- [ ] Bootstrap-Document
|
||||
- [ ] Route-Intent-Handoff
|
||||
- [ ] Tiny-First-Paint-Budget
|
||||
- [ ] Dev-and-Prod-Builds
|
||||
- [x] Project-Structure
|
||||
- [x] Stack-Decisions
|
||||
- [x] Proxy
|
||||
- [x] Local-Dev-Vite-Proxy
|
||||
- [x] Local-Prod-NGINX-Proxy
|
||||
- [x] First-Request-Web-Loader
|
||||
- [x] Bootstrap-Document
|
||||
- [x] Route-Intent-Handoff
|
||||
- [x] Tiny-First-Paint-Budget
|
||||
- [x] Dev-and-Prod-Builds
|
||||
- [x] Local-Dev-Just-Commands
|
||||
- [x] Local-Dev-Docker-Compose
|
||||
- [ ] Local-Prod-Just-Commands
|
||||
- [ ] Local-Prod-Docker-Compose
|
||||
- [ ] Frontend-Production-Dockerfile
|
||||
- [ ] Frontend-docker-bake
|
||||
- [x] Local-Prod-Just-Commands
|
||||
- [x] Local-Prod-Docker-Compose
|
||||
- [x] Frontend-Production-Dockerfile
|
||||
- [x] Frontend-docker-bake
|
||||
|
||||
#### Backend
|
||||
#### Backend — Done Foundations
|
||||
|
||||
- [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
|
||||
- [ ] Session-Flow
|
||||
- [ ] Login-Logout-Foundation
|
||||
- [ ] Authentication
|
||||
- [ ] User
|
||||
- [ ] Base-Model
|
||||
- [ ] Current-User-Implementation
|
||||
- [ ] POSIX-Lite-File-Persistence-Foundation
|
||||
- [ ] 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
|
||||
- [ ] Folders-and-Subfolders
|
||||
- [ ] Boards
|
||||
- [ ] Dashboard
|
||||
- [ ] Organization
|
||||
- [ ] Base-Model
|
||||
- [ ] Access-Rules-and-Membership
|
||||
- [ ] Workspace
|
||||
- [ ] Folders-and-Subfolders
|
||||
- [ ] Boards
|
||||
- [ ] Dashboard
|
||||
- [ ] API
|
||||
- [ ] Real-Organizations-Read-Endpoint
|
||||
- [ ] Real-Workspaces-Read-Endpoint
|
||||
- [ ] Tree-Mutation-Endpoints
|
||||
- [ ] Project-Creation-Endpoint
|
||||
|
||||
#### Frontend
|
||||
#### Frontend — Done Foundations
|
||||
|
||||
- [x] Foundation
|
||||
- [x] Typography
|
||||
- [x] Icons
|
||||
- [ ] App Shell
|
||||
- [x] 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
|
||||
- [ ] Button
|
||||
- [ ] IconButton
|
||||
- [ ] Input
|
||||
- [ ] Surface
|
||||
- [ ] Nav-Bar
|
||||
- [ ] Workspace-Switching
|
||||
- [ ] Workspace-Home
|
||||
- [ ] Real-Workspace-Home
|
||||
- [ ] Real-Workspace-Tree-Hydration
|
||||
- [ ] Create-Project-Flow
|
||||
- [ ] Persist-Tree-Mutations
|
||||
- [ ] Connect-Tree-Interactions-To-Backend-Data
|
||||
|
||||
### Version 0.2.0
|
||||
|
||||
**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
|
||||
**Goal:** Build the plugin app system on top of the base platform. And core app plugins like calendar, board, docs and text channels
|
||||
|
||||
### Version 0.3.0
|
||||
|
||||
**Goal:** Documents and system hardening.
|
||||
|
||||
- [ ] Document
|
||||
- [ ] Accessibility-Rules
|
||||
- [ ] Motion-Foundation
|
||||
**Goal:** Communications and Collaboration (Email System, Reminder System, and Live Collaboration on Documents)
|
||||
|
||||
### Version 0.4.0
|
||||
|
||||
- [ ] Gantt-Board
|
||||
- [ ] Calendar
|
||||
- [ ] Timeline
|
||||
**Goal:** Introduce the POSIX-based file system drive direction with OnlyOffice + S3 blob storage + Per File Versioning
|
||||
|
||||
### Version 0.5.0
|
||||
|
||||
**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)
|
||||
|
||||
@@ -10,3 +10,10 @@ BACKEND_SHUTDOWN_TIMEOUT=10s
|
||||
|
||||
DATABASE_URL=postgres://moku:moku_dev_password@localhost:5432/moku?sslmode=disable
|
||||
VALKEY_URL=redis://localhost:6379/0
|
||||
POSIX_ROOT=../POSIX
|
||||
|
||||
VITE_API_BASE_URL=/v1
|
||||
|
||||
# Local frontend dev uses the Vite proxy for /v1 requests.
|
||||
# Override only if the browser must call the API directly:
|
||||
# VITE_API_BASE_URL=http://localhost:8081/v1
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import type { JSX } from "solid-js";
|
||||
import { AppShell } from "./components/shell/AppShell/AppShell";
|
||||
import "./styles/main.scss";
|
||||
import "./styles/user-overrides.scss";
|
||||
|
||||
const App = (): JSX.Element => {
|
||||
return <AppShell />;
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import { createSignal, onCleanup, onMount, Show, type JSX } from "solid-js";
|
||||
import { getDocumentTheme, setTheme, type Theme } from "../../../theme/runtime";
|
||||
import { WorkspaceHome } from "../../workspace-home/WorkspaceHome/WorkspaceHome";
|
||||
import { AppShellDataProvider, useAppShellData } from "../data/app-shell.context";
|
||||
import { LeftRail } from "../LeftRail/LeftRail";
|
||||
import { MobileBottomNav } from "../MobileBottomNav/MobileBottomNav";
|
||||
import { MobileWorkspaceBrowser } from "../MobileWorkspaceBrowser/MobileWorkspaceBrowser";
|
||||
@@ -16,13 +17,14 @@ import styles from "./AppShell.module.scss";
|
||||
type MobileWorkspaceView = "notifications" | "profile" | null;
|
||||
const MOBILE_VIEWPORT_QUERY = "(max-width: 48rem)";
|
||||
|
||||
export const AppShell = (): JSX.Element => {
|
||||
const AppShellContent = (): JSX.Element => {
|
||||
const [themeState, setThemeState] = createSignal<Theme>("light");
|
||||
const [isRailCollapsed, setIsRailCollapsed] = createSignal(false);
|
||||
const [isSidebarCollapsed, setIsSidebarCollapsed] = createSignal(false);
|
||||
const [isMobileViewport, setIsMobileViewport] = createSignal(false);
|
||||
const [isMobileWorkspaceBrowserOpen, setIsMobileWorkspaceBrowserOpen] = createSignal(false);
|
||||
const [activeMobileWorkspaceView, setActiveMobileWorkspaceView] = createSignal<MobileWorkspaceView>(null);
|
||||
const appShellData = useAppShellData();
|
||||
|
||||
onMount((): void => {
|
||||
setThemeState(getDocumentTheme());
|
||||
@@ -79,7 +81,7 @@ export const AppShell = (): JSX.Element => {
|
||||
};
|
||||
|
||||
return (
|
||||
<div class={styles.shell}>
|
||||
<div class={styles.shell} data-ui="app-shell" data-app-shell-status={appShellData.status()}>
|
||||
<TopBar
|
||||
theme={themeState()}
|
||||
onToggleTheme={toggleTheme}
|
||||
@@ -96,15 +98,18 @@ export const AppShell = (): JSX.Element => {
|
||||
[styles.bodyRailCollapsed]: isRailCollapsed(),
|
||||
[styles.bodySidebarCollapsed]: isSidebarCollapsed(),
|
||||
}}
|
||||
data-slot="shell-body"
|
||||
data-rail-collapsed={isRailCollapsed() ? "true" : "false"}
|
||||
data-sidebar-collapsed={isSidebarCollapsed() ? "true" : "false"}
|
||||
>
|
||||
{/* Left server rail */}
|
||||
<div class={styles.railColumn}>
|
||||
<div class={styles.railColumn} data-slot="rail-column">
|
||||
<LeftRail collapsed={isRailCollapsed()} />
|
||||
</div>
|
||||
|
||||
{/* Sidebar + main workspace frame */}
|
||||
<div class={styles.workspaceRegion}>
|
||||
<div class={styles.sidebarColumn}>
|
||||
<div class={styles.workspaceRegion} data-slot="workspace-region">
|
||||
<div class={styles.sidebarColumn} data-slot="sidebar-column">
|
||||
<WorkspaceSidebar
|
||||
collapsed={isSidebarCollapsed()}
|
||||
railCollapsed={isRailCollapsed()}
|
||||
@@ -114,7 +119,7 @@ export const AppShell = (): JSX.Element => {
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class={styles.workspaceMain}>
|
||||
<div class={styles.workspaceMain} data-slot="workspace-main">
|
||||
{/* On mobile, top-bar menus become full workspace views instead of popovers. */}
|
||||
<Show
|
||||
when={isMobileViewport() && activeMobileWorkspaceView() !== null}
|
||||
@@ -127,7 +132,7 @@ export const AppShell = (): JSX.Element => {
|
||||
/>
|
||||
}
|
||||
>
|
||||
<div class={styles.mobileWorkspaceView}>
|
||||
<div class={styles.mobileWorkspaceView} data-slot="mobile-workspace-view" data-view={activeMobileWorkspaceView() ?? undefined}>
|
||||
<Show when={activeMobileWorkspaceView() === "notifications"}>
|
||||
<NotificationsMenu id="mobile-workspace-notifications" onSelect={closeMobileWorkspaceView} variant="workspace" />
|
||||
</Show>
|
||||
@@ -140,7 +145,7 @@ export const AppShell = (): JSX.Element => {
|
||||
</div>
|
||||
|
||||
{/* Floating server dock overlay */}
|
||||
<div class={styles.sidebarDock}>
|
||||
<div class={styles.sidebarDock} data-slot="sidebar-dock">
|
||||
<ServerDock />
|
||||
</div>
|
||||
</div>
|
||||
@@ -160,3 +165,11 @@ export const AppShell = (): JSX.Element => {
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export const AppShell = (): JSX.Element => {
|
||||
return (
|
||||
<AppShellDataProvider>
|
||||
<AppShellContent />
|
||||
</AppShellDataProvider>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -1,22 +1,29 @@
|
||||
import { For, createSignal, onCleanup, onMount, type JSX } from "solid-js";
|
||||
import { For, createEffect, createSignal, onCleanup, onMount, type JSX } from "solid-js";
|
||||
import { ChevronDown } from "../../../lib/icons";
|
||||
import { activeDepartment, departmentItems, type DepartmentItem } from "../data/shell.data";
|
||||
import { useAppShellData } from "../data/app-shell.context";
|
||||
import { type DepartmentItem } from "../data/shell.data";
|
||||
import styles from "./DepartmentSelector.module.scss";
|
||||
|
||||
const defaultDepartment = departmentItems.find((item) => item.id === activeDepartment.id) ?? departmentItems[0];
|
||||
const defaultTeamName = departmentItems
|
||||
.find((item) => item.id === activeDepartment.id)
|
||||
?.teams.find((teamName) => teamName === activeDepartment.teamName)
|
||||
?? defaultDepartment?.teams[0]
|
||||
?? "";
|
||||
|
||||
export const DepartmentSelector = (): JSX.Element => {
|
||||
const appShellData = useAppShellData();
|
||||
const [isOpen, setIsOpen] = createSignal(false);
|
||||
const [selectedDepartment, setSelectedDepartment] = createSignal<DepartmentItem>(defaultDepartment);
|
||||
const [selectedTeamName, setSelectedTeamName] = createSignal(defaultTeamName);
|
||||
const [selectedDepartment, setSelectedDepartment] = createSignal<DepartmentItem>(appShellData.departmentItems()[0] ?? appShellData.activeDepartment());
|
||||
const [selectedTeamName, setSelectedTeamName] = createSignal(appShellData.activeDepartment().teamName);
|
||||
|
||||
let rootRef: HTMLDivElement | undefined;
|
||||
|
||||
createEffect(() => {
|
||||
const activeDepartment = appShellData.activeDepartment();
|
||||
const matchingDepartment = appShellData.departmentItems().find((item) => item.id === activeDepartment.id) ?? appShellData.departmentItems()[0];
|
||||
|
||||
if (!matchingDepartment) {
|
||||
return;
|
||||
}
|
||||
|
||||
setSelectedDepartment(matchingDepartment);
|
||||
setSelectedTeamName(activeDepartment.teamName || matchingDepartment.teams[0] || "");
|
||||
});
|
||||
|
||||
onMount(() => {
|
||||
const handlePointerDown = (event: PointerEvent): void => {
|
||||
if (!isOpen()) return;
|
||||
@@ -66,7 +73,7 @@ export const DepartmentSelector = (): JSX.Element => {
|
||||
<div class={styles.menuSection}>
|
||||
<span class={styles.menuSectionLabel}>Departments</span>
|
||||
|
||||
<For each={departmentItems}>
|
||||
<For each={appShellData.departmentItems()}>
|
||||
{(item): JSX.Element => (
|
||||
<button
|
||||
classList={{ [styles.menuItem]: true, [styles.menuItemActive]: item.id === selectedDepartment().id }}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
// Path: Frontend/src/components/shell/LeftRail/LeftRail.tsx
|
||||
|
||||
import { For, Show, type JSX } from "solid-js";
|
||||
import { railItems, type RailItem } from "../data/shell.data";
|
||||
import { useAppShellData } from "../data/app-shell.context";
|
||||
import { type RailItem } from "../data/shell.data";
|
||||
import styles from "./LeftRail.module.scss";
|
||||
|
||||
type RailEntryProps = {
|
||||
@@ -46,8 +47,9 @@ type LeftRailProps = {
|
||||
};
|
||||
|
||||
export const LeftRail = (props: LeftRailProps): JSX.Element => {
|
||||
const personalItem = railItems.find((item) => item.kind === "personal");
|
||||
const organizationItems = railItems.filter((item) => item.kind === "organization");
|
||||
const appShellData = useAppShellData();
|
||||
const personalItem = () => appShellData.railItems().find((item) => item.kind === "personal");
|
||||
const organizationItems = () => appShellData.railItems().filter((item) => item.kind === "organization");
|
||||
|
||||
return (
|
||||
<aside
|
||||
@@ -58,7 +60,7 @@ export const LeftRail = (props: LeftRailProps): JSX.Element => {
|
||||
aria-label="Server rail"
|
||||
>
|
||||
<div class={styles.topCluster}>
|
||||
<Show when={!props.collapsed && personalItem}>
|
||||
<Show when={!props.collapsed && personalItem()}>
|
||||
{(item): JSX.Element => (
|
||||
<RailEntry item={item()} label={item().label} abbreviation={item().abbreviation} personal />
|
||||
)}
|
||||
@@ -71,7 +73,7 @@ export const LeftRail = (props: LeftRailProps): JSX.Element => {
|
||||
|
||||
<Show when={!props.collapsed}>
|
||||
<div class={styles.items}>
|
||||
<For each={organizationItems}>
|
||||
<For each={organizationItems()}>
|
||||
{(item): JSX.Element => <RailEntry item={item} label={item.label} abbreviation={item.abbreviation} />}
|
||||
</For>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
// Path: Frontend/src/components/shell/MobileBottomNav/MobileBottomNav.tsx
|
||||
|
||||
import { For, type JSX } from "solid-js";
|
||||
import { activeProject, activeServer, mobileBottomNavItems, type MobileBottomNavItem } from "../data/shell.data";
|
||||
import { useAppShellData } from "../data/app-shell.context";
|
||||
import { mobileBottomNavItems, type MobileBottomNavItem } from "../data/shell.data";
|
||||
import styles from "./MobileBottomNav.module.scss";
|
||||
|
||||
type MobileBottomNavProps = {
|
||||
@@ -39,12 +40,14 @@ const MobileNavEntry = (props: {
|
||||
};
|
||||
|
||||
export const MobileBottomNav = (props: MobileBottomNavProps): JSX.Element => {
|
||||
const appShellData = useAppShellData();
|
||||
|
||||
return (
|
||||
<nav class={styles.mobileNav} aria-label="Mobile workspace navigation">
|
||||
<div class={styles.contextBar}>
|
||||
<span class={styles.contextServer}>{activeServer.name}</span>
|
||||
<span class={styles.contextServer}>{appShellData.activeServer().name}</span>
|
||||
<span class={styles.contextDivider}>/</span>
|
||||
<span class={styles.contextProject}>{activeProject.name}</span>
|
||||
<span class={styles.contextProject}>{appShellData.activeProject().name}</span>
|
||||
</div>
|
||||
|
||||
<div class={styles.navGrid}>
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
import { For, Show, createSignal, type JSX } from "solid-js";
|
||||
import { ChevronRight, Plus, X } from "../../../lib/icons";
|
||||
import { useAppShellData } from "../data/app-shell.context";
|
||||
import { createLongPressGesture } from "../createLongPressGesture";
|
||||
import {
|
||||
activeProject,
|
||||
activeServer,
|
||||
createWorkspaceStaticTarget,
|
||||
createWorkspaceSurfaceTarget,
|
||||
createWorkspaceTreeTarget,
|
||||
getWorkspaceNodeIcon,
|
||||
workspaceStaticItems,
|
||||
workspaceTree,
|
||||
type SidebarItem,
|
||||
type WorkspaceContextMenuAction,
|
||||
type WorkspaceContextMenuTarget,
|
||||
@@ -25,7 +24,7 @@ type MobileWorkspaceBrowserProps = {
|
||||
|
||||
const TreeRow = (props: { node: WorkspaceTreeNode; depth?: number }): JSX.Element => {
|
||||
const depth = props.depth ?? 0;
|
||||
const Icon = props.node.icon;
|
||||
const Icon = getWorkspaceNodeIcon(props.node);
|
||||
const hasChildren = (props.node.children?.length ?? 0) > 0;
|
||||
|
||||
return (
|
||||
@@ -37,6 +36,10 @@ const TreeRow = (props: { node: WorkspaceTreeNode; depth?: number }): JSX.Elemen
|
||||
}}
|
||||
type="button"
|
||||
style={{ "--tree-depth": `${depth}` }}
|
||||
data-slot="mobile-workspace-tree-row"
|
||||
data-kind={props.node.kind}
|
||||
data-item-type={props.node.kind === "item" ? props.node.itemType : undefined}
|
||||
data-active={props.node.active ? "true" : "false"}
|
||||
>
|
||||
<span class={styles.treeRowLead}>
|
||||
<Icon size={16} strokeWidth={2} />
|
||||
@@ -59,7 +62,7 @@ const StaticRow = (props: { item: SidebarItem }): JSX.Element => {
|
||||
const Icon = props.item.icon;
|
||||
|
||||
return (
|
||||
<button classList={{ [styles.treeRow]: true, [styles.treeRowActive]: props.item.active ?? false }} type="button" style={{ "--tree-depth": "0" }}>
|
||||
<button classList={{ [styles.treeRow]: true, [styles.treeRowActive]: props.item.active ?? false }} type="button" style={{ "--tree-depth": "0" }} data-slot="mobile-workspace-static-row" data-active={props.item.active ? "true" : "false"}>
|
||||
<span class={styles.treeRowLead}>
|
||||
<Icon size={16} strokeWidth={2} />
|
||||
<span class={styles.treeLabel}>{props.item.label}</span>
|
||||
@@ -87,6 +90,8 @@ const WorkspaceStaticRow = (props: {
|
||||
return (
|
||||
<li
|
||||
class={styles.treeListItem}
|
||||
data-slot="mobile-workspace-static-item"
|
||||
data-target-kind={target.kind}
|
||||
onContextMenu={(event): void => {
|
||||
event.preventDefault();
|
||||
props.onOpenActionSheet(target);
|
||||
@@ -118,6 +123,9 @@ const WorkspaceTreeBranch = (props: {
|
||||
return (
|
||||
<li
|
||||
class={styles.treeListItem}
|
||||
data-slot="mobile-workspace-tree-item"
|
||||
data-kind={node.kind}
|
||||
data-item-type={node.kind === "item" ? node.itemType : undefined}
|
||||
onContextMenu={(event): void => {
|
||||
event.preventDefault();
|
||||
props.onOpenActionSheet(target);
|
||||
@@ -139,10 +147,11 @@ const WorkspaceTreeBranch = (props: {
|
||||
};
|
||||
|
||||
export const MobileWorkspaceBrowser = (props: MobileWorkspaceBrowserProps): JSX.Element => {
|
||||
const appShellData = useAppShellData();
|
||||
const [actionSheetTarget, setActionSheetTarget] = createSignal<WorkspaceContextMenuTarget | null>(null);
|
||||
const sectionNodes = workspaceTree.filter((node) => (node.children?.length ?? 0) > 0);
|
||||
const looseNodes = workspaceTree.filter((node) => (node.children?.length ?? 0) === 0);
|
||||
const workspaceTarget = createWorkspaceSurfaceTarget(activeProject);
|
||||
const sectionNodes = () => appShellData.workspaceTree().filter((node) => (node.children?.length ?? 0) > 0);
|
||||
const looseNodes = () => appShellData.workspaceTree().filter((node) => (node.children?.length ?? 0) === 0);
|
||||
const workspaceTarget = () => createWorkspaceSurfaceTarget(appShellData.activeProject());
|
||||
const openActionSheet = (target: WorkspaceContextMenuTarget): void => {
|
||||
setActionSheetTarget(target);
|
||||
};
|
||||
@@ -150,7 +159,7 @@ export const MobileWorkspaceBrowser = (props: MobileWorkspaceBrowserProps): JSX.
|
||||
setActionSheetTarget(null);
|
||||
};
|
||||
const openWorkspaceActionSheet = (): void => {
|
||||
openActionSheet(workspaceTarget);
|
||||
openActionSheet(workspaceTarget());
|
||||
};
|
||||
|
||||
const handleActionSelect = (_action: WorkspaceContextMenuAction, _target: WorkspaceContextMenuTarget): void => {
|
||||
@@ -163,11 +172,12 @@ export const MobileWorkspaceBrowser = (props: MobileWorkspaceBrowserProps): JSX.
|
||||
|
||||
return (
|
||||
<Show when={props.open}>
|
||||
<div class={styles.browserLayer}>
|
||||
<section class={styles.sheet} aria-label="Mobile workspace browser">
|
||||
<header class={styles.sheetHeader}>
|
||||
<div class={styles.browserLayer} data-ui="mobile-workspace-browser">
|
||||
<section class={styles.sheet} aria-label="Mobile workspace browser" data-slot="mobile-workspace-sheet">
|
||||
<header class={styles.sheetHeader} data-slot="mobile-workspace-header">
|
||||
<div
|
||||
class={styles.brandBlock}
|
||||
data-slot="mobile-workspace-brand"
|
||||
onContextMenu={(event): void => {
|
||||
event.preventDefault();
|
||||
openWorkspaceActionSheet();
|
||||
@@ -176,49 +186,50 @@ export const MobileWorkspaceBrowser = (props: MobileWorkspaceBrowserProps): JSX.
|
||||
>
|
||||
{/* Long-pressing the browser header exposes workspace-level actions on mobile. */}
|
||||
<span class={styles.brandEyebrow}>Moku Work</span>
|
||||
<strong class={styles.brandTitle}>{activeProject.name}</strong>
|
||||
<span class={styles.brandContext}>{activeServer.name}</span>
|
||||
<strong class={styles.brandTitle}>{appShellData.activeProject().name}</strong>
|
||||
<span class={styles.brandContext}>{appShellData.activeServer().name}</span>
|
||||
</div>
|
||||
|
||||
<div class={styles.headerActions}>
|
||||
<div class={styles.headerActions} data-slot="mobile-workspace-header-actions">
|
||||
<button
|
||||
class={styles.createButton}
|
||||
type="button"
|
||||
aria-label="Create"
|
||||
data-slot="mobile-workspace-create"
|
||||
onClick={openWorkspaceActionSheet}
|
||||
>
|
||||
<Plus size={16} strokeWidth={2.25} />
|
||||
<span>Create</span>
|
||||
</button>
|
||||
|
||||
<button class={styles.closeButton} type="button" aria-label="Close workspace browser" onClick={props.onClose}>
|
||||
<button class={styles.closeButton} type="button" aria-label="Close workspace browser" data-slot="mobile-workspace-close" onClick={props.onClose}>
|
||||
<X size={18} strokeWidth={2} />
|
||||
</button>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<div class={styles.sheetBody}>
|
||||
<section class={styles.sectionBlock}>
|
||||
<div class={styles.sheetBody} data-slot="mobile-workspace-body">
|
||||
<section class={styles.sectionBlock} data-slot="mobile-workspace-section" data-section-id="workspace">
|
||||
<span class={styles.sectionLabel}>Workspace</span>
|
||||
<ul class={styles.treeList}>
|
||||
<ul class={styles.treeList} data-slot="mobile-workspace-list" data-section-id="workspace">
|
||||
<For each={workspaceStaticItems}>
|
||||
{(item): JSX.Element => <WorkspaceStaticRow item={item} onOpenActionSheet={openActionSheet} />}
|
||||
</For>
|
||||
</ul>
|
||||
</section>
|
||||
|
||||
<section class={styles.sectionBlock}>
|
||||
<section class={styles.sectionBlock} data-slot="mobile-workspace-section" data-section-id="items">
|
||||
<span class={styles.sectionLabel}>Items</span>
|
||||
<ul class={styles.treeList}>
|
||||
<WorkspaceTreeBranch nodes={sectionNodes} onOpenActionSheet={openActionSheet} />
|
||||
<ul class={styles.treeList} data-slot="mobile-workspace-list" data-section-id="items">
|
||||
<WorkspaceTreeBranch nodes={sectionNodes()} onOpenActionSheet={openActionSheet} />
|
||||
</ul>
|
||||
</section>
|
||||
|
||||
<Show when={looseNodes.length > 0}>
|
||||
<section class={styles.sectionBlock}>
|
||||
<Show when={looseNodes().length > 0}>
|
||||
<section class={styles.sectionBlock} data-slot="mobile-workspace-section" data-section-id="more">
|
||||
<span class={styles.sectionLabel}>More</span>
|
||||
<ul class={styles.treeList}>
|
||||
<WorkspaceTreeBranch nodes={looseNodes} onOpenActionSheet={openActionSheet} />
|
||||
<ul class={styles.treeList} data-slot="mobile-workspace-list" data-section-id="more">
|
||||
<WorkspaceTreeBranch nodes={looseNodes()} onOpenActionSheet={openActionSheet} />
|
||||
</ul>
|
||||
</section>
|
||||
</Show>
|
||||
|
||||
@@ -0,0 +1,204 @@
|
||||
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
@@ -0,0 +1,120 @@
|
||||
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;
|
||||
},
|
||||
};
|
||||
};
|
||||
@@ -1,3 +1,5 @@
|
||||
@use "../shared/tree-nav" as treeNav;
|
||||
|
||||
.root {
|
||||
display: grid;
|
||||
--project-drawer-gap: var(--space-3);
|
||||
@@ -9,6 +11,15 @@
|
||||
justify-items: center;
|
||||
}
|
||||
|
||||
.rootDragMode {
|
||||
user-select: none;
|
||||
cursor: grabbing;
|
||||
}
|
||||
|
||||
.rootDragMode .treeItem {
|
||||
cursor: grabbing;
|
||||
}
|
||||
|
||||
.trigger {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
@@ -38,9 +49,9 @@
|
||||
}
|
||||
|
||||
.triggerOpen {
|
||||
border-color: color-mix(in srgb, var(--color-border-strong) 22%, transparent);
|
||||
background: color-mix(in srgb, var(--color-surface) 92%, transparent);
|
||||
box-shadow: var(--shadow-soft);
|
||||
border-color: color-mix(in srgb, var(--color-accent-strong) 22%, var(--color-border-strong));
|
||||
background: color-mix(in srgb, var(--color-accent-soft) 26%, var(--color-surface));
|
||||
box-shadow: 0 10px 28px color-mix(in srgb, black 8%, transparent);
|
||||
}
|
||||
|
||||
.triggerCompact {
|
||||
@@ -83,19 +94,14 @@
|
||||
gap: 0.12rem;
|
||||
}
|
||||
|
||||
.eyebrow,
|
||||
.projectItemDescription {
|
||||
.eyebrow {
|
||||
@include text-caption;
|
||||
color: var(--color-text-muted);
|
||||
}
|
||||
|
||||
.eyebrow {
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.08em;
|
||||
}
|
||||
|
||||
.value,
|
||||
.projectItemName {
|
||||
.value {
|
||||
@include text-label;
|
||||
}
|
||||
|
||||
@@ -175,7 +181,7 @@
|
||||
min-height: 0;
|
||||
display: grid;
|
||||
align-content: start;
|
||||
gap: var(--space-3);
|
||||
gap: var(--space-2);
|
||||
padding: var(--space-4);
|
||||
overflow-y: auto;
|
||||
overscroll-behavior: contain;
|
||||
@@ -186,49 +192,132 @@
|
||||
width: 0;
|
||||
}
|
||||
|
||||
.projectList {
|
||||
list-style: none;
|
||||
display: grid;
|
||||
gap: 0.2rem;
|
||||
padding: 0;
|
||||
.treeSectionLabel {
|
||||
@include treeNav.section-label;
|
||||
margin: 0;
|
||||
padding: 0 var(--space-3);
|
||||
}
|
||||
|
||||
.projectItem {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
min-height: calc(var(--control-size-md) + var(--space-2));
|
||||
padding: var(--space-2) var(--space-3);
|
||||
border: 1px solid transparent;
|
||||
border-radius: var(--radius-sm);
|
||||
background: transparent;
|
||||
color: var(--color-text-muted);
|
||||
transition:
|
||||
background 160ms var(--easing-standard),
|
||||
color 160ms var(--easing-standard),
|
||||
border-color 160ms var(--easing-standard),
|
||||
transform 180ms var(--easing-standard);
|
||||
text-align: left;
|
||||
.treeSectionHeader {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: var(--space-2);
|
||||
margin-bottom: var(--space-2);
|
||||
padding-right: var(--space-1);
|
||||
}
|
||||
|
||||
.projectItem:hover {
|
||||
background: color-mix(in srgb, var(--color-surface-hover) 82%, transparent);
|
||||
color: var(--color-text);
|
||||
border-color: color-mix(in srgb, var(--color-border) 22%, transparent);
|
||||
.treeControls {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: var(--space-1);
|
||||
flex-wrap: wrap;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
.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);
|
||||
box-shadow: none;
|
||||
.treeControlButton {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: calc(var(--control-size-md) - var(--space-1));
|
||||
height: calc(var(--control-size-md) - var(--space-1));
|
||||
@include text-caption;
|
||||
padding: 0;
|
||||
border: 1px solid color-mix(in srgb, var(--color-border) 46%, transparent);
|
||||
border-radius: var(--radius-pill);
|
||||
background: color-mix(in srgb, var(--color-surface) 95%, transparent);
|
||||
color: var(--color-text-muted);
|
||||
transition:
|
||||
border-color 160ms var(--easing-standard),
|
||||
background 160ms var(--easing-standard),
|
||||
color 160ms var(--easing-standard);
|
||||
}
|
||||
|
||||
.projectItemCopy {
|
||||
min-width: 0;
|
||||
display: grid;
|
||||
gap: 0.05rem;
|
||||
.treeControlButton:hover,
|
||||
.treeControlButton:focus-visible {
|
||||
border-color: color-mix(in srgb, var(--color-border-strong) 56%, transparent);
|
||||
background: var(--color-surface-hover);
|
||||
color: var(--color-text);
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.projectItemDescription {
|
||||
color: color-mix(in srgb, var(--color-text-muted) 84%, transparent);
|
||||
.treeControlButton:disabled {
|
||||
opacity: 0.45;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
.treeList {
|
||||
@include treeNav.tree-list;
|
||||
}
|
||||
|
||||
.treeEmptySlot {
|
||||
@include treeNav.empty-slot;
|
||||
}
|
||||
|
||||
.treeInputRow {
|
||||
@include treeNav.input-row;
|
||||
}
|
||||
|
||||
.treeInput {
|
||||
@include treeNav.input;
|
||||
}
|
||||
|
||||
.treeItem {
|
||||
@include treeNav.item;
|
||||
}
|
||||
|
||||
.treeItem:hover,
|
||||
.treeItem:focus-visible {
|
||||
@include treeNav.item-hover;
|
||||
}
|
||||
|
||||
.treeItemFolder {
|
||||
@include treeNav.item-folder;
|
||||
}
|
||||
|
||||
.treeItemDragging {
|
||||
@include treeNav.item-dragging;
|
||||
}
|
||||
|
||||
.treeItemDropBefore {
|
||||
@include treeNav.item-drop-before;
|
||||
}
|
||||
|
||||
.treeItemDropAfter {
|
||||
@include treeNav.item-drop-after;
|
||||
}
|
||||
|
||||
.treeItemDropInside {
|
||||
@include treeNav.item-drop-inside;
|
||||
}
|
||||
|
||||
.folderChevron {
|
||||
@include treeNav.folder-chevron;
|
||||
}
|
||||
|
||||
.folderChevronOpen {
|
||||
@include treeNav.folder-chevron-open;
|
||||
}
|
||||
|
||||
.treeItemActive {
|
||||
@include treeNav.item-active;
|
||||
}
|
||||
|
||||
.icon {
|
||||
@include treeNav.icon;
|
||||
}
|
||||
|
||||
.label {
|
||||
@include treeNav.label;
|
||||
}
|
||||
|
||||
.itemMeta {
|
||||
@include treeNav.item-meta;
|
||||
}
|
||||
|
||||
@media (max-width: 720px) {
|
||||
.rootCompact .scrim,
|
||||
.rootCompact .drawer {
|
||||
width: min(18rem, calc(100vw - 5rem));
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,38 +1,41 @@
|
||||
// Path: Frontend/src/components/shell/ServerDock/ServerDock.tsx
|
||||
|
||||
import { For, Show, type JSX } from "solid-js";
|
||||
import { activeServer } from "../data/shell.data";
|
||||
import { useAppShellData } from "../data/app-shell.context";
|
||||
import styles from "./ServerDock.module.scss";
|
||||
|
||||
export const ServerDock = (): JSX.Element => {
|
||||
const appShellData = useAppShellData();
|
||||
const activeServer = () => appShellData.activeServer();
|
||||
|
||||
return (
|
||||
<section class={styles.panel} aria-label="Server dock">
|
||||
<div class={styles.identity}>
|
||||
<section class={styles.panel} aria-label="Server dock" data-ui="server-dock" data-server-kind={activeServer().kind}>
|
||||
<div class={styles.identity} data-slot="server-dock-identity">
|
||||
<div class={styles.glyph} aria-hidden="true">
|
||||
{activeServer.abbreviation}
|
||||
{activeServer().abbreviation}
|
||||
</div>
|
||||
<div class={styles.copy}>
|
||||
<span class={styles.name}>{activeServer.name}</span>
|
||||
<div class={styles.copy} data-slot="server-dock-copy">
|
||||
<span class={styles.name}>{activeServer().name}</span>
|
||||
<Show
|
||||
when={activeServer.kind === "organization"}
|
||||
fallback={<span class={styles.subtitle}>{activeServer.subtitle}</span>}
|
||||
when={activeServer().kind === "organization"}
|
||||
fallback={<span class={styles.subtitle}>{activeServer().subtitle}</span>}
|
||||
>
|
||||
<span class={styles.status}>
|
||||
<span class={styles.statusDot} aria-hidden="true" />
|
||||
<span>{activeServer.connectedLabel}</span>
|
||||
<span>{activeServer().connectedLabel}</span>
|
||||
</span>
|
||||
</Show>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<Show when={activeServer.dockActions.length > 0}>
|
||||
<div class={styles.actions}>
|
||||
<For each={activeServer.dockActions}>
|
||||
<Show when={activeServer().dockActions.length > 0}>
|
||||
<div class={styles.actions} data-slot="server-dock-actions">
|
||||
<For each={activeServer().dockActions}>
|
||||
{(item): JSX.Element => {
|
||||
const Icon = item.icon;
|
||||
|
||||
return (
|
||||
<button type="button" class={styles.action} aria-label={item.label} title={item.label}>
|
||||
<button type="button" class={styles.action} aria-label={item.label} title={item.label} data-slot="server-dock-action" data-action-id={item.id}>
|
||||
<Icon size={16} strokeWidth={2} />
|
||||
<span class={styles.actionLabel}>{item.label}</span>
|
||||
</button>
|
||||
|
||||
@@ -27,9 +27,11 @@ export const NotificationsMenu = (props: NotificationsMenuProps): JSX.Element =>
|
||||
role="menu"
|
||||
aria-label="Notifications"
|
||||
ref={props.menuRef}
|
||||
data-ui="notifications-menu"
|
||||
data-variant={variant}
|
||||
>
|
||||
<div class={styles.header}>
|
||||
<div class={styles.headerCopy}>
|
||||
<div class={styles.header} data-slot="notifications-header">
|
||||
<div class={styles.headerCopy} data-slot="notifications-header-copy">
|
||||
<strong class={styles.title}>Notifications</strong>
|
||||
<span class={styles.subtitle}>
|
||||
{unreadNotificationCount > 0
|
||||
@@ -45,7 +47,7 @@ export const NotificationsMenu = (props: NotificationsMenuProps): JSX.Element =>
|
||||
</Show>
|
||||
</div>
|
||||
|
||||
<div class={styles.listWrap}>
|
||||
<div class={styles.listWrap} data-slot="notifications-body">
|
||||
<Show when={!hasNotifications}>
|
||||
<div class={styles.stateCard}>
|
||||
<span class={styles.stateIcon} aria-hidden="true">
|
||||
@@ -67,12 +69,12 @@ export const NotificationsMenu = (props: NotificationsMenuProps): JSX.Element =>
|
||||
</Show>
|
||||
|
||||
<Show when={unreadItems.length > 0}>
|
||||
<section class={styles.section} aria-label="Unread notifications">
|
||||
<section class={styles.section} aria-label="Unread notifications" data-slot="notifications-section" data-section-id="unread">
|
||||
<span class={styles.sectionLabel}>Unread</span>
|
||||
<div class={styles.list}>
|
||||
<div class={styles.list} data-slot="notifications-list" data-section-id="unread">
|
||||
<For each={unreadItems}>
|
||||
{(item): JSX.Element => (
|
||||
<button type="button" role="menuitem" classList={{ [styles.item]: true, [styles.itemUnread]: true }} onClick={props.onSelect}>
|
||||
<button type="button" role="menuitem" classList={{ [styles.item]: true, [styles.itemUnread]: true }} data-slot="notification-item" data-state="unread" onClick={props.onSelect}>
|
||||
<span class={styles.itemMarker} aria-hidden="true" />
|
||||
<div class={styles.itemBody}>
|
||||
<span class={styles.itemTitle}>{item.title}</span>
|
||||
@@ -87,12 +89,12 @@ export const NotificationsMenu = (props: NotificationsMenuProps): JSX.Element =>
|
||||
</Show>
|
||||
|
||||
<Show when={earlierItems.length > 0}>
|
||||
<section class={styles.section} aria-label="Earlier notifications">
|
||||
<section class={styles.section} aria-label="Earlier notifications" data-slot="notifications-section" data-section-id="earlier">
|
||||
<span class={styles.sectionLabel}>Earlier</span>
|
||||
<div class={styles.list}>
|
||||
<div class={styles.list} data-slot="notifications-list" data-section-id="earlier">
|
||||
<For each={earlierItems}>
|
||||
{(item): JSX.Element => (
|
||||
<button type="button" role="menuitem" class={styles.item} onClick={props.onSelect}>
|
||||
<button type="button" role="menuitem" class={styles.item} data-slot="notification-item" data-state="read" onClick={props.onSelect}>
|
||||
<span class={styles.itemMarkerMuted} aria-hidden="true" />
|
||||
<div class={styles.itemBody}>
|
||||
<span class={styles.itemTitle}>{item.title}</span>
|
||||
@@ -107,7 +109,7 @@ export const NotificationsMenu = (props: NotificationsMenuProps): JSX.Element =>
|
||||
</Show>
|
||||
</div>
|
||||
|
||||
<div class={styles.footer}>
|
||||
<div class={styles.footer} data-slot="notifications-footer">
|
||||
<button type="button" role="menuitem" class={styles.footerAction} onClick={props.onSelect}>
|
||||
<Settings size={16} strokeWidth={2} />
|
||||
<span>Notification settings</span>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { For, type JSX } from "solid-js";
|
||||
import { User } from "../../../lib/icons";
|
||||
import { activeUserProfile, profileMenuSections } from "../data/shell.data";
|
||||
import { useAppShellData } from "../data/app-shell.context";
|
||||
import { profileMenuSections } from "../data/shell.data";
|
||||
import styles from "./ProfileMenu.module.scss";
|
||||
|
||||
type ProfileMenuProps = {
|
||||
@@ -12,6 +13,8 @@ type ProfileMenuProps = {
|
||||
|
||||
export const ProfileMenu = (props: ProfileMenuProps): JSX.Element => {
|
||||
const variant = props.variant ?? "popover";
|
||||
const appShellData = useAppShellData();
|
||||
const activeUserProfile = () => appShellData.activeUserProfile();
|
||||
|
||||
return (
|
||||
<div
|
||||
@@ -23,8 +26,10 @@ export const ProfileMenu = (props: ProfileMenuProps): JSX.Element => {
|
||||
role="menu"
|
||||
aria-label="Profile menu"
|
||||
ref={props.menuRef}
|
||||
data-ui="profile-menu"
|
||||
data-variant={variant}
|
||||
>
|
||||
<div class={styles.summary}>
|
||||
<div class={styles.summary} data-slot="profile-summary">
|
||||
<div class={styles.avatar} aria-hidden="true">
|
||||
<span class={styles.avatarRing} />
|
||||
<span class={styles.avatarCore}>
|
||||
@@ -33,17 +38,17 @@ export const ProfileMenu = (props: ProfileMenuProps): JSX.Element => {
|
||||
</div>
|
||||
|
||||
<div class={styles.summaryCopy}>
|
||||
<strong class={styles.name}>{activeUserProfile.name}</strong>
|
||||
<span class={styles.email}>{activeUserProfile.email}</span>
|
||||
<span class={styles.role}>{activeUserProfile.roleLabel}</span>
|
||||
<span class={styles.context}>{activeUserProfile.contextLabel}</span>
|
||||
<strong class={styles.name}>{activeUserProfile().name}</strong>
|
||||
<span class={styles.email}>{activeUserProfile().email}</span>
|
||||
<span class={styles.role}>{activeUserProfile().roleLabel}</span>
|
||||
<span class={styles.context}>{activeUserProfile().contextLabel}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class={styles.sections}>
|
||||
<div class={styles.sections} data-slot="profile-sections">
|
||||
<For each={profileMenuSections}>
|
||||
{(section): JSX.Element => (
|
||||
<div class={styles.section}>
|
||||
<div class={styles.section} data-slot="profile-section" data-section-id={section.id}>
|
||||
<For each={section.items}>
|
||||
{(item): JSX.Element => {
|
||||
const Icon = item.icon;
|
||||
@@ -52,11 +57,14 @@ export const ProfileMenu = (props: ProfileMenuProps): JSX.Element => {
|
||||
<button
|
||||
type="button"
|
||||
role="menuitem"
|
||||
classList={{
|
||||
[styles.item]: true,
|
||||
[styles.itemDanger]: item.tone === "danger",
|
||||
}}
|
||||
onClick={props.onSelect}
|
||||
classList={{
|
||||
[styles.item]: true,
|
||||
[styles.itemDanger]: item.tone === "danger",
|
||||
}}
|
||||
data-slot="profile-action"
|
||||
data-action-id={item.id}
|
||||
data-tone={item.tone ?? "default"}
|
||||
onClick={props.onSelect}
|
||||
>
|
||||
<span class={styles.itemIcon} aria-hidden="true">
|
||||
<Icon size={16} strokeWidth={2} />
|
||||
|
||||
@@ -21,20 +21,20 @@ type TopBarProps = {
|
||||
|
||||
export const TopBar = (props: TopBarProps): JSX.Element => {
|
||||
return (
|
||||
<header class={styles.topBar}>
|
||||
<div class={styles.identity}>
|
||||
<header class={styles.topBar} data-ui="top-bar">
|
||||
<div class={styles.identity} data-slot="top-bar-identity">
|
||||
<span class={styles.eyebrow}>Moku Work</span>
|
||||
<DepartmentSelector />
|
||||
</div>
|
||||
|
||||
<div class={styles.controls}>
|
||||
<div class={styles.actions}>
|
||||
<div class={styles.controls} data-slot="top-bar-controls">
|
||||
<div class={styles.actions} data-slot="top-bar-actions">
|
||||
<For each={topBarActions}>
|
||||
{(item): JSX.Element => {
|
||||
const Icon = item.icon;
|
||||
|
||||
return (
|
||||
<button class={styles.actionButton} type="button" aria-label={item.label} title={item.label}>
|
||||
<button class={styles.actionButton} type="button" aria-label={item.label} title={item.label} data-slot="top-bar-action" data-action-id={item.id}>
|
||||
<Icon size={18} strokeWidth={2} />
|
||||
</button>
|
||||
);
|
||||
|
||||
@@ -121,47 +121,55 @@ export const WorkspaceContextMenu = (props: WorkspaceContextMenuProps): JSX.Elem
|
||||
class={styles.menu}
|
||||
role="menu"
|
||||
aria-label={`${target.label} context menu`}
|
||||
data-ui="workspace-context-menu"
|
||||
data-target-kind={target.kind}
|
||||
data-item-type={target.kind === "item" ? target.itemType : undefined}
|
||||
style={{
|
||||
left: `${position.x}px`,
|
||||
top: `${position.y}px`,
|
||||
}}
|
||||
>
|
||||
<Show when={target.kind !== "workspace"}>
|
||||
<header class={styles.header}>
|
||||
<header class={styles.header} data-slot="context-menu-header">
|
||||
<span class={styles.eyebrow}>{getWorkspaceContextMenuEyebrow(target)}</span>
|
||||
<strong class={styles.title}>{target.label}</strong>
|
||||
</header>
|
||||
</Show>
|
||||
|
||||
<div classList={{ [styles.sectionList]: true, [styles.sectionListCompact]: !sectionHasLabel() }}>
|
||||
<div classList={{ [styles.sectionList]: true, [styles.sectionListCompact]: !sectionHasLabel() }} data-slot="context-menu-sections">
|
||||
<For each={sections()}>
|
||||
{(section): JSX.Element => (
|
||||
<section class={styles.section}>
|
||||
<section class={styles.section} data-slot="context-menu-section" data-section-id={section.id}>
|
||||
<Show when={section.label}>
|
||||
<span class={styles.sectionLabel}>{section.label}</span>
|
||||
</Show>
|
||||
|
||||
<div class={styles.actionList}>
|
||||
<div class={styles.actionList} data-slot="context-menu-action-list">
|
||||
<For each={section.items}>
|
||||
{(action): JSX.Element => {
|
||||
const isSubmenuOpen = () => activeSubmenuActionId() === action.id;
|
||||
|
||||
return (
|
||||
<div
|
||||
class={styles.actionItem}
|
||||
onMouseEnter={() => {
|
||||
<div
|
||||
class={styles.actionItem}
|
||||
data-slot="context-menu-action-item"
|
||||
data-action-id={action.id}
|
||||
onMouseEnter={() => {
|
||||
setActiveSubmenuActionId(action.children ? action.id : null);
|
||||
}}
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
role="menuitem"
|
||||
<button
|
||||
type="button"
|
||||
role="menuitem"
|
||||
classList={{
|
||||
[styles.action]: true,
|
||||
[styles.actionCreate]: action.id === "create",
|
||||
[styles.actionDanger]: action.tone === "danger",
|
||||
[styles.actionSubmenuOpen]: isSubmenuOpen(),
|
||||
}}
|
||||
[styles.actionDanger]: action.tone === "danger",
|
||||
[styles.actionSubmenuOpen]: isSubmenuOpen(),
|
||||
}}
|
||||
data-slot="context-menu-action"
|
||||
data-action-id={action.id}
|
||||
data-tone={action.tone ?? "default"}
|
||||
onClick={() => {
|
||||
if (action.children) {
|
||||
setActiveSubmenuActionId(isSubmenuOpen() ? null : action.id);
|
||||
@@ -188,18 +196,21 @@ export const WorkspaceContextMenu = (props: WorkspaceContextMenuProps): JSX.Elem
|
||||
</button>
|
||||
|
||||
<Show when={action.children && isSubmenuOpen()}>
|
||||
<div class={styles.submenu} role="menu" aria-label={`${action.label} submenu`}>
|
||||
<div class={styles.submenuList}>
|
||||
<div class={styles.submenu} role="menu" aria-label={`${action.label} submenu`} data-slot="context-menu-submenu">
|
||||
<div class={styles.submenuList} data-slot="context-menu-submenu-list">
|
||||
<For each={action.children ?? []}>
|
||||
{(childAction): JSX.Element => (
|
||||
<button
|
||||
type="button"
|
||||
role="menuitem"
|
||||
<button
|
||||
type="button"
|
||||
role="menuitem"
|
||||
classList={{
|
||||
[styles.action]: true,
|
||||
[styles.actionDanger]: childAction.tone === "danger",
|
||||
}}
|
||||
onClick={() => handleActionSelect(childAction, target)}
|
||||
[styles.action]: true,
|
||||
[styles.actionDanger]: childAction.tone === "danger",
|
||||
}}
|
||||
data-slot="context-menu-submenu-action"
|
||||
data-action-id={childAction.id}
|
||||
data-tone={childAction.tone ?? "default"}
|
||||
onClick={() => handleActionSelect(childAction, target)}
|
||||
>
|
||||
<span class={styles.actionLabel}>{childAction.label}</span>
|
||||
<div class={styles.actionMeta}>
|
||||
|
||||
+13
-10
@@ -76,32 +76,32 @@ export const WorkspaceMobileActionSheet = (props: WorkspaceMobileActionSheetProp
|
||||
|
||||
return (
|
||||
<Portal>
|
||||
<div class={styles.layer}>
|
||||
<button class={styles.backdrop} type="button" aria-label="Close action sheet" onClick={props.onClose} />
|
||||
<div class={styles.layer} data-ui="workspace-mobile-action-sheet" data-target-kind={target.kind} data-item-type={target.kind === "item" ? target.itemType : undefined}>
|
||||
<button class={styles.backdrop} type="button" aria-label="Close action sheet" data-slot="mobile-action-sheet-backdrop" onClick={props.onClose} />
|
||||
|
||||
<section class={styles.sheet} aria-label={`${target.label} actions`}>
|
||||
<div class={styles.handle} aria-hidden="true" />
|
||||
<section class={styles.sheet} aria-label={`${target.label} actions`} data-slot="mobile-action-sheet-panel">
|
||||
<div class={styles.handle} data-slot="mobile-action-sheet-handle" aria-hidden="true" />
|
||||
|
||||
<header class={styles.header}>
|
||||
<div class={styles.headerCopy}>
|
||||
<header class={styles.header} data-slot="mobile-action-sheet-header">
|
||||
<div class={styles.headerCopy} data-slot="mobile-action-sheet-header-copy">
|
||||
<span class={styles.eyebrow}>{getWorkspaceContextMenuEyebrow(target)}</span>
|
||||
<strong class={styles.title}>{target.label}</strong>
|
||||
</div>
|
||||
|
||||
<button class={styles.closeButton} type="button" aria-label="Close action sheet" onClick={props.onClose}>
|
||||
<button class={styles.closeButton} type="button" aria-label="Close action sheet" data-slot="mobile-action-sheet-close" onClick={props.onClose}>
|
||||
<X size={18} strokeWidth={2} />
|
||||
</button>
|
||||
</header>
|
||||
|
||||
<div class={styles.sectionList}>
|
||||
<div class={styles.sectionList} data-slot="mobile-action-sheet-sections">
|
||||
<For each={sections}>
|
||||
{(section): JSX.Element => (
|
||||
<section class={styles.section}>
|
||||
<section class={styles.section} data-slot="mobile-action-sheet-section" data-section-id={section.id}>
|
||||
<Show when={section.label}>
|
||||
<span class={styles.sectionLabel}>{section.label}</span>
|
||||
</Show>
|
||||
|
||||
<div class={styles.actionList}>
|
||||
<div class={styles.actionList} data-slot="mobile-action-sheet-action-list">
|
||||
<For each={section.items}>
|
||||
{(action): JSX.Element => (
|
||||
<button
|
||||
@@ -110,6 +110,9 @@ export const WorkspaceMobileActionSheet = (props: WorkspaceMobileActionSheetProp
|
||||
[styles.action]: true,
|
||||
[styles.actionDanger]: action.tone === "danger",
|
||||
}}
|
||||
data-slot="mobile-action-sheet-action"
|
||||
data-action-id={action.id}
|
||||
data-tone={action.tone ?? "default"}
|
||||
onClick={() => handleActionSelect(action, target)}
|
||||
>
|
||||
<span class={styles.actionLabel}>{action.label}</span>
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
@use "../shared/tree-nav" as treeNav;
|
||||
|
||||
.sidebar {
|
||||
--sidebar-nav-item-min-height: var(--control-size-lg);
|
||||
position: relative;
|
||||
@@ -12,6 +14,15 @@
|
||||
isolation: isolate;
|
||||
}
|
||||
|
||||
.sidebarDragMode {
|
||||
user-select: none;
|
||||
cursor: grabbing;
|
||||
}
|
||||
|
||||
.sidebarDragMode .treeItem {
|
||||
cursor: grabbing;
|
||||
}
|
||||
|
||||
.header {
|
||||
display: grid;
|
||||
gap: var(--space-3);
|
||||
@@ -108,19 +119,25 @@
|
||||
}
|
||||
|
||||
.treeSectionLabel {
|
||||
@include text-caption;
|
||||
@include treeNav.section-label;
|
||||
margin: var(--space-3) 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;
|
||||
display: grid;
|
||||
gap: var(--space-1);
|
||||
padding: 0;
|
||||
@include treeNav.tree-list;
|
||||
}
|
||||
|
||||
.treeEmptySlot {
|
||||
@include treeNav.empty-slot;
|
||||
}
|
||||
|
||||
.treeInputRow {
|
||||
@include treeNav.input-row;
|
||||
}
|
||||
|
||||
.treeInput {
|
||||
@include treeNav.input;
|
||||
}
|
||||
|
||||
.navItem {
|
||||
@@ -138,42 +155,44 @@
|
||||
}
|
||||
|
||||
.treeItem {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
display: grid;
|
||||
grid-template-columns: 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-left: calc(var(--space-3) + (var(--tree-depth, 0) * var(--space-4)));
|
||||
border: 1px solid transparent;
|
||||
border-radius: var(--radius-lg);
|
||||
background: transparent;
|
||||
color: var(--color-text-muted);
|
||||
text-align: left;
|
||||
transition:
|
||||
background 160ms var(--easing-standard),
|
||||
color 160ms var(--easing-standard),
|
||||
border-color 160ms var(--easing-standard),
|
||||
transform 180ms var(--easing-standard);
|
||||
@include treeNav.item;
|
||||
}
|
||||
|
||||
.treeItem:hover,
|
||||
.treeItem:focus-visible {
|
||||
background: var(--color-surface-hover);
|
||||
color: var(--color-text);
|
||||
@include treeNav.item-hover;
|
||||
}
|
||||
|
||||
.treeItemFolder {
|
||||
color: var(--color-text);
|
||||
@include treeNav.item-folder;
|
||||
}
|
||||
|
||||
.treeItemDragging {
|
||||
@include treeNav.item-dragging;
|
||||
}
|
||||
|
||||
.treeItemDropBefore {
|
||||
@include treeNav.item-drop-before;
|
||||
}
|
||||
|
||||
.treeItemDropAfter {
|
||||
@include treeNav.item-drop-after;
|
||||
}
|
||||
|
||||
.treeItemDropInside {
|
||||
@include treeNav.item-drop-inside;
|
||||
}
|
||||
|
||||
.folderChevron {
|
||||
@include treeNav.folder-chevron;
|
||||
}
|
||||
|
||||
.folderChevronOpen {
|
||||
@include treeNav.folder-chevron-open;
|
||||
}
|
||||
|
||||
.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);
|
||||
@include treeNav.item-active;
|
||||
}
|
||||
|
||||
.navItemActive {
|
||||
@@ -184,18 +203,15 @@
|
||||
}
|
||||
|
||||
.icon {
|
||||
color: inherit;
|
||||
opacity: 0.85;
|
||||
@include treeNav.icon;
|
||||
}
|
||||
|
||||
.label {
|
||||
@include text-label;
|
||||
min-width: 0;
|
||||
@include treeNav.label;
|
||||
}
|
||||
|
||||
.itemMeta {
|
||||
@include text-caption;
|
||||
color: var(--color-text-muted);
|
||||
@include treeNav.item-meta;
|
||||
}
|
||||
|
||||
.sidebarCollapsed {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,375 @@
|
||||
// Path: Frontend/src/components/shell/data/app-shell.context.tsx
|
||||
|
||||
import {
|
||||
createContext,
|
||||
createMemo,
|
||||
createSignal,
|
||||
onMount,
|
||||
useContext,
|
||||
type Accessor,
|
||||
type JSX,
|
||||
} from "solid-js";
|
||||
import { Folder } from "../../../lib/icons";
|
||||
import { resolveAPIBase } from "../../../lib/api";
|
||||
import {
|
||||
activeDepartment as fallbackActiveDepartment,
|
||||
activeProject as fallbackActiveProject,
|
||||
activeServer as fallbackActiveServer,
|
||||
activeUserProfile as fallbackActiveUserProfile,
|
||||
departmentItems as fallbackDepartmentItems,
|
||||
organizationAdminDockActions,
|
||||
personalDockActions,
|
||||
projectItems as fallbackProjectItems,
|
||||
railItems as fallbackRailItems,
|
||||
workspaceTree as fallbackWorkspaceTree,
|
||||
type ActiveDepartment,
|
||||
type ActiveProject,
|
||||
type ActiveServer,
|
||||
type ActiveUserProfile,
|
||||
type DepartmentItem,
|
||||
type ProjectItem,
|
||||
type RailItem,
|
||||
type WorkspaceTreeNode,
|
||||
} from "./shell.data";
|
||||
|
||||
type AppShellInstallation = {
|
||||
id: string;
|
||||
name: string;
|
||||
mode: "personal" | "organizational" | string;
|
||||
access: string;
|
||||
protocol: string;
|
||||
host: string;
|
||||
isBootstrapped: boolean;
|
||||
materializationStatus: "not_started" | "pending" | "running" | "succeeded" | "failed" | string;
|
||||
materializationError?: string;
|
||||
};
|
||||
|
||||
type AppShellAdmin = {
|
||||
id: string;
|
||||
email: string;
|
||||
displayName: string;
|
||||
isInstanceAdmin: boolean;
|
||||
homeTitle: string;
|
||||
};
|
||||
|
||||
type AppShellOrganization = {
|
||||
id: string;
|
||||
name: string;
|
||||
slug: string;
|
||||
};
|
||||
|
||||
type AppShellDepartment = {
|
||||
id: string;
|
||||
organizationId: string;
|
||||
name: string;
|
||||
slug: string;
|
||||
};
|
||||
|
||||
type AppShellTeam = {
|
||||
id: string;
|
||||
organizationId: string;
|
||||
departmentId?: string;
|
||||
name: string;
|
||||
slug: string;
|
||||
};
|
||||
|
||||
type AppShellProject = {
|
||||
id: string;
|
||||
organizationId: string;
|
||||
departmentId?: string;
|
||||
teamId?: string;
|
||||
name: string;
|
||||
slug: string;
|
||||
};
|
||||
|
||||
type AppShellWorkspace = {
|
||||
id: string;
|
||||
organizationId: string;
|
||||
name: string;
|
||||
slug: string;
|
||||
kind: "organization" | "department" | "team" | "project" | string;
|
||||
departmentId?: string;
|
||||
teamId?: string;
|
||||
projectId?: string;
|
||||
};
|
||||
|
||||
type AppShellPayload = {
|
||||
installation?: AppShellInstallation;
|
||||
admin?: AppShellAdmin;
|
||||
organizations: AppShellOrganization[];
|
||||
departments: AppShellDepartment[];
|
||||
teams: AppShellTeam[];
|
||||
projects: AppShellProject[];
|
||||
workspaces: AppShellWorkspace[];
|
||||
};
|
||||
|
||||
const normalizeInstallation = (
|
||||
installation: AppShellInstallation | null | undefined,
|
||||
): AppShellInstallation | undefined => {
|
||||
if (!installation) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const materializationStatus = installation.materializationStatus?.trim()
|
||||
? installation.materializationStatus
|
||||
: installation.isBootstrapped
|
||||
? "succeeded"
|
||||
: "not_started";
|
||||
const materializationError = installation.materializationError?.trim() || undefined;
|
||||
|
||||
return {
|
||||
...installation,
|
||||
materializationStatus,
|
||||
materializationError,
|
||||
};
|
||||
};
|
||||
|
||||
const normalizeAppShellPayload = (payload: AppShellPayload | null | undefined): AppShellPayload => ({
|
||||
installation: normalizeInstallation(payload?.installation),
|
||||
admin: payload?.admin,
|
||||
organizations: Array.isArray(payload?.organizations) ? payload.organizations : [],
|
||||
departments: Array.isArray(payload?.departments) ? payload.departments : [],
|
||||
teams: Array.isArray(payload?.teams) ? payload.teams : [],
|
||||
projects: Array.isArray(payload?.projects) ? payload.projects : [],
|
||||
workspaces: Array.isArray(payload?.workspaces) ? payload.workspaces : [],
|
||||
});
|
||||
|
||||
type AppShellContextValue = {
|
||||
status: Accessor<"idle" | "loading" | "success" | "error">;
|
||||
error: Accessor<string>;
|
||||
installation: Accessor<AppShellInstallation | undefined>;
|
||||
railItems: Accessor<readonly RailItem[]>;
|
||||
activeServer: Accessor<ActiveServer>;
|
||||
activeProject: Accessor<ActiveProject>;
|
||||
activeDepartment: Accessor<ActiveDepartment>;
|
||||
projectItems: Accessor<readonly ProjectItem[]>;
|
||||
departmentItems: Accessor<readonly DepartmentItem[]>;
|
||||
workspaceTree: Accessor<readonly WorkspaceTreeNode[]>;
|
||||
activeUserProfile: Accessor<ActiveUserProfile>;
|
||||
reload: () => Promise<void>;
|
||||
};
|
||||
|
||||
const AppShellContext = createContext<AppShellContextValue>();
|
||||
|
||||
const buildAbbreviation = (name: string, fallback: string): string => {
|
||||
const parts = name
|
||||
.trim()
|
||||
.split(/\s+/)
|
||||
.filter(Boolean);
|
||||
|
||||
if (parts.length === 0) {
|
||||
return fallback;
|
||||
}
|
||||
|
||||
const abbreviation = parts
|
||||
.slice(0, 2)
|
||||
.map((part) => part[0]?.toUpperCase() ?? "")
|
||||
.join("");
|
||||
|
||||
return abbreviation || fallback;
|
||||
};
|
||||
|
||||
const buildRailItems = (payload: AppShellPayload | null): readonly RailItem[] => {
|
||||
if (!payload?.installation || payload.organizations.length === 0) {
|
||||
return fallbackRailItems;
|
||||
}
|
||||
|
||||
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) => ({
|
||||
id: organization.id,
|
||||
label: serverName || organization.name,
|
||||
abbreviation: buildAbbreviation(serverName || organization.name, kind === "personal" ? "P" : "O"),
|
||||
kind,
|
||||
active: index === 0,
|
||||
}));
|
||||
};
|
||||
|
||||
const buildActiveServer = (payload: AppShellPayload | null): ActiveServer => {
|
||||
const installation = payload?.installation;
|
||||
const organization = payload?.organizations[0];
|
||||
|
||||
if (!installation || !organization) {
|
||||
return fallbackActiveServer;
|
||||
}
|
||||
|
||||
const kind = installation.mode === "personal" ? "personal" : "organization";
|
||||
const serverName = installation.name || organization.name || installation.host;
|
||||
|
||||
return {
|
||||
id: installation.id,
|
||||
name: serverName || fallbackActiveServer.name,
|
||||
abbreviation: buildAbbreviation(serverName, kind === "personal" ? "P" : "O"),
|
||||
kind,
|
||||
connectedLabel: kind === "organization" ? `${payload?.teams.length ?? 0} connected` : undefined,
|
||||
subtitle: kind === "personal" ? installation.host || payload?.admin?.homeTitle || "Personal home" : undefined,
|
||||
dockActions: kind === "personal" ? personalDockActions : organizationAdminDockActions,
|
||||
};
|
||||
};
|
||||
|
||||
const buildProjectItems = (payload: AppShellPayload | null): readonly ProjectItem[] => {
|
||||
if (!payload?.projects.length) {
|
||||
return fallbackProjectItems;
|
||||
}
|
||||
|
||||
return payload.projects.map((project, index) => ({
|
||||
id: project.id,
|
||||
name: project.name,
|
||||
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,
|
||||
}));
|
||||
};
|
||||
|
||||
const buildActiveProject = (payload: AppShellPayload | null): ActiveProject => {
|
||||
const firstProject = payload?.projects[0];
|
||||
|
||||
if (!firstProject) {
|
||||
return fallbackActiveProject;
|
||||
}
|
||||
|
||||
return {
|
||||
id: firstProject.id,
|
||||
name: firstProject.name,
|
||||
};
|
||||
};
|
||||
|
||||
const buildDepartmentItems = (payload: AppShellPayload | null): readonly DepartmentItem[] => {
|
||||
if (!payload?.departments.length) {
|
||||
return fallbackDepartmentItems;
|
||||
}
|
||||
|
||||
return payload.departments.map((department, index) => ({
|
||||
id: department.id,
|
||||
name: department.name,
|
||||
teams: payload.teams
|
||||
.filter((team) => team.departmentId === department.id)
|
||||
.map((team) => team.name),
|
||||
active: index === 0,
|
||||
}));
|
||||
};
|
||||
|
||||
const buildActiveDepartment = (payload: AppShellPayload | null): ActiveDepartment => {
|
||||
const firstDepartment = payload?.departments[0];
|
||||
|
||||
if (!firstDepartment) {
|
||||
return fallbackActiveDepartment;
|
||||
}
|
||||
|
||||
const firstTeamName = payload?.teams.find((team) => team.departmentId === firstDepartment.id)?.name ?? "";
|
||||
|
||||
return {
|
||||
id: firstDepartment.id,
|
||||
name: firstDepartment.name,
|
||||
teamName: firstTeamName,
|
||||
};
|
||||
};
|
||||
|
||||
const buildWorkspaceTree = (payload: AppShellPayload | null): readonly WorkspaceTreeNode[] => {
|
||||
if (!payload?.projects.length) {
|
||||
return fallbackWorkspaceTree;
|
||||
}
|
||||
|
||||
// The workspace tree should represent items inside the current project, not the
|
||||
// project container itself. We do not have project-contents hydration yet, so
|
||||
// return an empty tree rather than showing the project root as a fake item.
|
||||
return [];
|
||||
};
|
||||
|
||||
const buildActiveUserProfile = (payload: AppShellPayload | null): ActiveUserProfile => {
|
||||
if (!payload?.admin) {
|
||||
return fallbackActiveUserProfile;
|
||||
}
|
||||
|
||||
const organizationName = payload.installation?.name || payload.organizations[0]?.name || fallbackActiveServer.name;
|
||||
const departmentName = payload.departments[0]?.name;
|
||||
|
||||
return {
|
||||
name: payload.admin.displayName,
|
||||
email: payload.admin.email,
|
||||
roleLabel: payload.admin.isInstanceAdmin ? "Instance admin" : "Member",
|
||||
contextLabel: departmentName ? `${organizationName} • ${departmentName}` : organizationName,
|
||||
};
|
||||
};
|
||||
|
||||
export const AppShellDataProvider = (props: { children: JSX.Element }): JSX.Element => {
|
||||
const [status, setStatus] = createSignal<"idle" | "loading" | "success" | "error">("idle");
|
||||
const [error, setError] = createSignal("");
|
||||
const [payload, setPayload] = createSignal<AppShellPayload | null>(null);
|
||||
|
||||
const load = async (): Promise<void> => {
|
||||
setStatus("loading");
|
||||
setError("");
|
||||
|
||||
try {
|
||||
const response = await fetch(`${resolveAPIBase()}/app-shell`, {
|
||||
headers: {
|
||||
Accept: "application/json",
|
||||
},
|
||||
});
|
||||
|
||||
const body = (await response.json()) as {
|
||||
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) {
|
||||
throw new Error(errorMessage || "Failed to load app shell state.");
|
||||
}
|
||||
|
||||
setPayload(normalizeAppShellPayload(body.data));
|
||||
setStatus("success");
|
||||
} catch (loadError) {
|
||||
setStatus("error");
|
||||
setError(loadError instanceof Error ? loadError.message : "Failed to load app shell state.");
|
||||
}
|
||||
};
|
||||
|
||||
onMount(() => {
|
||||
void load();
|
||||
});
|
||||
|
||||
const value: AppShellContextValue = {
|
||||
status,
|
||||
error,
|
||||
installation: createMemo(() => payload()?.installation),
|
||||
railItems: createMemo(() => buildRailItems(payload())),
|
||||
activeServer: createMemo(() => buildActiveServer(payload())),
|
||||
activeProject: createMemo(() => buildActiveProject(payload())),
|
||||
activeDepartment: createMemo(() => buildActiveDepartment(payload())),
|
||||
projectItems: createMemo(() => buildProjectItems(payload())),
|
||||
departmentItems: createMemo(() => buildDepartmentItems(payload())),
|
||||
workspaceTree: createMemo(() => buildWorkspaceTree(payload())),
|
||||
activeUserProfile: createMemo(() => buildActiveUserProfile(payload())),
|
||||
reload: load,
|
||||
};
|
||||
|
||||
return <AppShellContext.Provider value={value}>{props.children}</AppShellContext.Provider>;
|
||||
};
|
||||
|
||||
export const useAppShellData = (): AppShellContextValue => {
|
||||
const context = useContext(AppShellContext);
|
||||
|
||||
if (!context) {
|
||||
throw new Error("useAppShellData must be used within AppShellDataProvider");
|
||||
}
|
||||
|
||||
return context;
|
||||
};
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
Home,
|
||||
Keyboard,
|
||||
LayoutGrid,
|
||||
ListCollapse,
|
||||
LogOut,
|
||||
Repeat,
|
||||
Search,
|
||||
@@ -71,9 +72,43 @@ export type ProjectItem = {
|
||||
id: string;
|
||||
name: string;
|
||||
description: string;
|
||||
groupLabel?: string;
|
||||
parentLabel?: string;
|
||||
meta?: string;
|
||||
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 = {
|
||||
id: string;
|
||||
label: string;
|
||||
@@ -84,20 +119,49 @@ export type SidebarItem = {
|
||||
|
||||
export type WorkspaceStaticKind = "workspace" | "home" | "settings";
|
||||
|
||||
// Keep this open-ended so future server-driven or plugin-provided item types do
|
||||
// not require a frontend source edit before they can be represented safely.
|
||||
export type WorkspaceItemTypeId = string;
|
||||
|
||||
export type WorkspaceStaticItem = SidebarItem & {
|
||||
contextKind: WorkspaceStaticKind;
|
||||
};
|
||||
|
||||
export type WorkspaceTreeNode = {
|
||||
export type WorkspaceFolderNode = {
|
||||
id: string;
|
||||
path?: string;
|
||||
label: string;
|
||||
kind: "folder" | "board" | "doc";
|
||||
kind: "folder";
|
||||
icon: ShellIcon;
|
||||
active?: boolean;
|
||||
meta?: string;
|
||||
children?: readonly WorkspaceTreeNode[];
|
||||
};
|
||||
|
||||
export type WorkspaceItemNode = {
|
||||
id: string;
|
||||
label: string;
|
||||
kind: "item";
|
||||
itemType: WorkspaceItemTypeId;
|
||||
active?: boolean;
|
||||
meta?: string;
|
||||
children?: undefined;
|
||||
};
|
||||
|
||||
export type WorkspaceTreeNode = WorkspaceFolderNode | WorkspaceItemNode;
|
||||
|
||||
export type WorkspaceItemTypeDefinition = {
|
||||
id: WorkspaceItemTypeId;
|
||||
label: string;
|
||||
shortLabel: string;
|
||||
icon: ShellIcon;
|
||||
noun: string;
|
||||
actionPrefix: string;
|
||||
defaultCreateLabel: string;
|
||||
includeInWorkspaceCreate?: boolean;
|
||||
description?: string;
|
||||
};
|
||||
|
||||
export type SidebarHeaderAction = {
|
||||
id: string;
|
||||
label: string;
|
||||
@@ -117,11 +181,23 @@ export type MobileBottomNavItem = {
|
||||
active?: boolean;
|
||||
};
|
||||
|
||||
export type WorkspaceContextMenuTarget = {
|
||||
id: string;
|
||||
label: string;
|
||||
kind: WorkspaceStaticKind | WorkspaceTreeNode["kind"];
|
||||
};
|
||||
export type WorkspaceContextMenuTarget =
|
||||
| {
|
||||
id: string;
|
||||
label: string;
|
||||
kind: WorkspaceStaticKind;
|
||||
}
|
||||
| {
|
||||
id: string;
|
||||
label: string;
|
||||
kind: "folder";
|
||||
}
|
||||
| {
|
||||
id: string;
|
||||
label: string;
|
||||
kind: "item";
|
||||
itemType: WorkspaceItemTypeId;
|
||||
};
|
||||
|
||||
export type WorkspaceContextMenuAction = {
|
||||
id: string;
|
||||
@@ -146,6 +222,81 @@ export type WorkspaceContextMenuSection = {
|
||||
items: readonly WorkspaceContextMenuAction[];
|
||||
};
|
||||
|
||||
export const firstPartyWorkspaceItemTypes: readonly WorkspaceItemTypeDefinition[] = [
|
||||
{
|
||||
id: "core.doc",
|
||||
label: "Doc",
|
||||
shortLabel: "Doc",
|
||||
icon: FileText,
|
||||
noun: "doc",
|
||||
actionPrefix: "doc",
|
||||
defaultCreateLabel: "New doc",
|
||||
includeInWorkspaceCreate: true,
|
||||
description: "Rich text documents and notes.",
|
||||
},
|
||||
{
|
||||
id: "core.board.kanban",
|
||||
label: "Kanban board",
|
||||
shortLabel: "Board",
|
||||
icon: LayoutGrid,
|
||||
noun: "board",
|
||||
actionPrefix: "board",
|
||||
defaultCreateLabel: "New board",
|
||||
includeInWorkspaceCreate: true,
|
||||
description: "Default board-style workspace item.",
|
||||
},
|
||||
{
|
||||
id: "core.board.list",
|
||||
label: "List board",
|
||||
shortLabel: "Board",
|
||||
icon: LayoutGrid,
|
||||
noun: "board",
|
||||
actionPrefix: "list-board",
|
||||
defaultCreateLabel: "New list board",
|
||||
description: "Alternate first-party board view prepared for the future registry.",
|
||||
},
|
||||
] as const;
|
||||
|
||||
const workspaceItemTypeMap = new Map<WorkspaceItemTypeId, WorkspaceItemTypeDefinition>(
|
||||
firstPartyWorkspaceItemTypes.map((definition) => [definition.id, definition]),
|
||||
);
|
||||
|
||||
const createUnknownWorkspaceItemTypeDefinition = (
|
||||
itemType: WorkspaceItemTypeId,
|
||||
): WorkspaceItemTypeDefinition => ({
|
||||
id: itemType,
|
||||
label: "Item",
|
||||
shortLabel: "Item",
|
||||
icon: FileText,
|
||||
noun: "item",
|
||||
actionPrefix: "item",
|
||||
defaultCreateLabel: "New item",
|
||||
description: "Fallback definition for unknown or future workspace item types.",
|
||||
});
|
||||
|
||||
export const getWorkspaceItemTypeDefinition = (itemType: WorkspaceItemTypeId): WorkspaceItemTypeDefinition => {
|
||||
return workspaceItemTypeMap.get(itemType) ?? createUnknownWorkspaceItemTypeDefinition(itemType);
|
||||
};
|
||||
|
||||
export const getWorkspaceNodeIcon = (node: WorkspaceTreeNode): ShellIcon =>
|
||||
node.kind === "folder" ? node.icon : getWorkspaceItemTypeDefinition(node.itemType).icon;
|
||||
|
||||
const getWorkspaceCreateActions = (): readonly WorkspaceContextMenuAction[] => [
|
||||
{ id: "new-folder", label: "New folder", shortcut: { modifiers: ["alt"], key: "f" } },
|
||||
...firstPartyWorkspaceItemTypes
|
||||
.filter((definition) => definition.includeInWorkspaceCreate)
|
||||
.map((definition) => ({
|
||||
id: `create-${definition.actionPrefix}`,
|
||||
label: definition.defaultCreateLabel,
|
||||
shortcut:
|
||||
definition.id === "core.board.kanban"
|
||||
? ({ modifiers: ["alt"], key: "b" } as const)
|
||||
: definition.id === "core.doc"
|
||||
? ({ modifiers: ["alt"], key: "d" } as const)
|
||||
: undefined,
|
||||
})),
|
||||
];
|
||||
|
||||
export const getWorkspaceContextMenuEyebrow = (target: WorkspaceContextMenuTarget): string => {
|
||||
switch (target.kind) {
|
||||
case "workspace":
|
||||
@@ -155,10 +306,8 @@ export const getWorkspaceContextMenuEyebrow = (target: WorkspaceContextMenuTarge
|
||||
return "Configuration";
|
||||
case "folder":
|
||||
return "Folder";
|
||||
case "board":
|
||||
return "Board";
|
||||
case "doc":
|
||||
return "Doc";
|
||||
case "item":
|
||||
return getWorkspaceItemTypeDefinition(target.itemType).shortLabel;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -177,7 +326,12 @@ export const createWorkspaceStaticTarget = (item: WorkspaceStaticItem): Workspac
|
||||
export const createWorkspaceTreeTarget = (node: WorkspaceTreeNode): WorkspaceContextMenuTarget => ({
|
||||
id: node.id,
|
||||
label: node.label,
|
||||
kind: node.kind,
|
||||
...(node.kind === "folder"
|
||||
? { kind: "folder" as const }
|
||||
: {
|
||||
kind: "item" as const,
|
||||
itemType: node.itemType,
|
||||
}),
|
||||
});
|
||||
|
||||
export type NotificationItem = {
|
||||
@@ -207,12 +361,12 @@ export type ActiveUserProfile = {
|
||||
contextLabel: string;
|
||||
};
|
||||
|
||||
const personalDockActions: readonly ServerDockAction[] = [
|
||||
export const personalDockActions: readonly ServerDockAction[] = [
|
||||
{ id: "account", label: "Account", icon: User },
|
||||
{ id: "settings", label: "Settings", icon: Settings },
|
||||
] as const;
|
||||
|
||||
const organizationAdminDockActions: readonly ServerDockAction[] = [
|
||||
export const organizationAdminDockActions: readonly ServerDockAction[] = [
|
||||
{ id: "members", label: "Members", icon: User },
|
||||
{ id: "server", label: "Server", icon: Settings },
|
||||
] as const;
|
||||
@@ -246,9 +400,31 @@ export const activeDepartment: ActiveDepartment = {
|
||||
};
|
||||
|
||||
export const projectItems: readonly ProjectItem[] = [
|
||||
{ id: "general", name: "General", description: "Default shared project", active: true },
|
||||
{ id: "operations", name: "Operations", description: "Cross-team planning and delivery" },
|
||||
{ id: "hiring", name: "Hiring", description: "Candidate pipeline and interview loops" },
|
||||
{
|
||||
id: "general",
|
||||
name: "General",
|
||||
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;
|
||||
|
||||
export const departmentItems: readonly DepartmentItem[] = [
|
||||
@@ -264,7 +440,8 @@ export const workspaceStaticItems: readonly WorkspaceStaticItem[] = [
|
||||
{ id: "workspace-settings", label: "Settings", icon: Settings, contextKind: "settings" },
|
||||
] as const;
|
||||
|
||||
// Freeform workspace tree scaffold: folders, boards, and docs are first-class siblings.
|
||||
// Freeform workspace tree scaffold: folders are structural, while non-folder
|
||||
// nodes already flow through the future-safe itemType registry seam.
|
||||
export const workspaceTree: readonly WorkspaceTreeNode[] = [
|
||||
{
|
||||
id: "product-workspace",
|
||||
@@ -272,16 +449,16 @@ export const workspaceTree: readonly WorkspaceTreeNode[] = [
|
||||
kind: "folder",
|
||||
icon: Folder,
|
||||
children: [
|
||||
{ id: "roadmap-board", label: "Roadmap", kind: "board", icon: LayoutGrid, active: true },
|
||||
{ id: "launch-brief", label: "Launch Brief", kind: "doc", icon: FileText },
|
||||
{ id: "roadmap-board", label: "Roadmap", kind: "item", itemType: "core.board.kanban", active: true },
|
||||
{ id: "launch-brief", label: "Launch Brief", kind: "item", itemType: "core.doc" },
|
||||
{
|
||||
id: "research-folder",
|
||||
label: "Research",
|
||||
kind: "folder",
|
||||
icon: Folder,
|
||||
children: [
|
||||
{ id: "interviews-doc", label: "Interviews", kind: "doc", icon: FileText },
|
||||
{ id: "signals-board", label: "Signals", kind: "board", icon: LayoutGrid, meta: "2" },
|
||||
{ id: "interviews-doc", label: "Interviews", kind: "item", itemType: "core.doc" },
|
||||
{ id: "signals-board", label: "Signals", kind: "item", itemType: "core.board.kanban", meta: "2" },
|
||||
],
|
||||
},
|
||||
],
|
||||
@@ -292,15 +469,16 @@ export const workspaceTree: readonly WorkspaceTreeNode[] = [
|
||||
kind: "folder",
|
||||
icon: Folder,
|
||||
children: [
|
||||
{ id: "system-doc", label: "Design System", kind: "doc", icon: FileText },
|
||||
{ id: "review-board", label: "Review Queue", kind: "board", icon: LayoutGrid },
|
||||
{ id: "system-doc", label: "Design System", kind: "item", itemType: "core.doc" },
|
||||
{ id: "review-board", label: "Review Queue", kind: "item", itemType: "core.board.kanban" },
|
||||
],
|
||||
},
|
||||
{ id: "general-notes", label: "General Notes", kind: "doc", icon: FileText },
|
||||
{ id: "general-notes", label: "General Notes", kind: "item", itemType: "core.doc" },
|
||||
] as const;
|
||||
|
||||
export const workspaceSidebarHeaderActions: readonly SidebarHeaderAction[] = [
|
||||
{ id: "search-workspace", label: "Search workspace", icon: Search },
|
||||
{ id: "toggle-workspace-folders", label: "Collapse all folders", icon: ListCollapse },
|
||||
] as const;
|
||||
|
||||
export const mobileBottomNavItems: readonly MobileBottomNavItem[] = [
|
||||
@@ -314,11 +492,7 @@ export const mobileBottomNavItems: readonly MobileBottomNavItem[] = [
|
||||
export const getWorkspaceContextMenuSections = (
|
||||
target: WorkspaceContextMenuTarget,
|
||||
): readonly WorkspaceContextMenuSection[] => {
|
||||
const createActions = [
|
||||
{ id: "new-folder", label: "New folder", shortcut: { modifiers: ["alt"], key: "f" } },
|
||||
{ id: "new-board", label: "New board", shortcut: { modifiers: ["alt"], key: "b" } },
|
||||
{ id: "new-doc", label: "New doc", shortcut: { modifiers: ["alt"], key: "d" } },
|
||||
] as const;
|
||||
const createActions = getWorkspaceCreateActions();
|
||||
|
||||
const createSubmenuAction = {
|
||||
id: "create",
|
||||
@@ -385,48 +559,103 @@ export const getWorkspaceContextMenuSections = (
|
||||
id: "organize",
|
||||
label: undefined,
|
||||
items: [
|
||||
{ id: "duplicate-folder", label: "Duplicate", shortcut: { modifiers: ["meta"], key: "d" } },
|
||||
{ id: "move-folder", label: "Move", shortcut: { modifiers: ["meta"], key: "m" } },
|
||||
{ id: "delete-folder", label: "Delete", shortcut: { modifiers: ["meta"], key: "delete" }, tone: "danger" },
|
||||
],
|
||||
},
|
||||
] as const;
|
||||
case "board":
|
||||
case "item": {
|
||||
const definition = getWorkspaceItemTypeDefinition(target.itemType);
|
||||
const actionPrefix = definition.actionPrefix;
|
||||
const nounLabel = definition.noun;
|
||||
|
||||
return [
|
||||
{
|
||||
id: "board",
|
||||
id: `${actionPrefix}-primary`,
|
||||
items: [
|
||||
{ id: "open-board", label: "Open board", shortcut: { key: "enter" } },
|
||||
{ id: "rename-board", label: "Rename", shortcut: { modifiers: ["meta"], key: "r" } },
|
||||
{ id: `open-${actionPrefix}`, label: `Open ${nounLabel}`, shortcut: { key: "enter" } },
|
||||
{ id: `rename-${actionPrefix}`, label: "Rename", shortcut: { modifiers: ["meta"], key: "r" } },
|
||||
],
|
||||
},
|
||||
{
|
||||
id: "organize",
|
||||
label: undefined,
|
||||
items: [
|
||||
{ id: "duplicate-board", label: "Duplicate", shortcut: { modifiers: ["meta"], key: "d" } },
|
||||
{ id: "move-board", label: "Move", shortcut: { modifiers: ["meta"], key: "m" } },
|
||||
{ id: "delete-board", label: "Delete", shortcut: { modifiers: ["meta"], key: "delete" }, tone: "danger" },
|
||||
{ id: `delete-${actionPrefix}`, label: "Delete", shortcut: { modifiers: ["meta"], key: "delete" }, tone: "danger" },
|
||||
],
|
||||
},
|
||||
] as const;
|
||||
case "doc":
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const getProjectCreateActions = (): readonly ProjectContextMenuAction[] =>
|
||||
[
|
||||
{ id: "new-project", label: "New project" },
|
||||
{ id: "new-folder", label: "New folder" },
|
||||
] as const;
|
||||
|
||||
const getProjectFolderDangerActions = (): readonly ProjectContextMenuAction[] =>
|
||||
[
|
||||
{ id: "rename-folder", label: "Rename", shortcut: { modifiers: ["meta"], key: "r" } },
|
||||
{ id: "delete-folder", label: "Delete", shortcut: { modifiers: ["meta"], key: "delete" }, tone: "danger" },
|
||||
] 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: "doc",
|
||||
items: [
|
||||
{ id: "open-doc", label: "Open doc", shortcut: { key: "enter" } },
|
||||
{ id: "rename-doc", label: "Rename", shortcut: { modifiers: ["meta"], key: "r" } },
|
||||
],
|
||||
id: "create",
|
||||
items: createActions,
|
||||
},
|
||||
] as const;
|
||||
case "folder":
|
||||
return [
|
||||
{
|
||||
id: "create",
|
||||
items: createActions,
|
||||
},
|
||||
{
|
||||
id: "organize",
|
||||
label: undefined,
|
||||
items: [
|
||||
{ id: "duplicate-doc", label: "Duplicate", shortcut: { modifiers: ["meta"], key: "d" } },
|
||||
{ id: "move-doc", label: "Move", shortcut: { modifiers: ["meta"], key: "m" } },
|
||||
{ id: "delete-doc", label: "Delete", shortcut: { modifiers: ["meta"], key: "delete" }, tone: "danger" },
|
||||
],
|
||||
items: getProjectFolderDangerActions(),
|
||||
},
|
||||
] as const;
|
||||
case "project":
|
||||
return [
|
||||
{
|
||||
id: "create",
|
||||
items: createActions,
|
||||
},
|
||||
] as const;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,188 @@
|
||||
@use "../../../styles/tools/mixins" as *;
|
||||
|
||||
@mixin section-label {
|
||||
@include text-caption;
|
||||
color: var(--color-text-subtle);
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.04em;
|
||||
}
|
||||
|
||||
@mixin tree-list {
|
||||
list-style: none;
|
||||
display: grid;
|
||||
gap: var(--space-1);
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
@mixin empty-slot {
|
||||
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;
|
||||
}
|
||||
|
||||
@mixin input-row {
|
||||
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);
|
||||
}
|
||||
|
||||
@mixin input {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
border: 0;
|
||||
background: transparent;
|
||||
color: var(--color-text);
|
||||
font: inherit;
|
||||
outline: none;
|
||||
|
||||
&::placeholder {
|
||||
color: var(--color-text-muted);
|
||||
}
|
||||
}
|
||||
|
||||
@mixin item {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
display: grid;
|
||||
position: relative;
|
||||
isolation: isolate;
|
||||
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-left: calc(var(--space-3) + (var(--tree-depth, 0) * var(--space-4)));
|
||||
border: 0;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
color: var(--color-text-muted);
|
||||
text-align: left;
|
||||
transition:
|
||||
color 160ms var(--easing-standard),
|
||||
box-shadow 160ms var(--easing-standard),
|
||||
transform 180ms var(--easing-standard);
|
||||
|
||||
&::after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
border: 1px solid transparent;
|
||||
border-radius: var(--radius-lg);
|
||||
background: transparent;
|
||||
transition:
|
||||
background 160ms var(--easing-standard),
|
||||
border-color 160ms var(--easing-standard),
|
||||
box-shadow 160ms var(--easing-standard);
|
||||
pointer-events: none;
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
> * {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
}
|
||||
}
|
||||
|
||||
@mixin item-hover {
|
||||
color: var(--color-text);
|
||||
|
||||
&::after {
|
||||
background: color-mix(in srgb, var(--color-surface-hover) 80%, var(--color-accent-soft) 20%);
|
||||
box-shadow: inset 0 1px 0 color-mix(in srgb, white 4%, transparent);
|
||||
}
|
||||
}
|
||||
|
||||
@mixin item-folder {
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
@mixin item-dragging {
|
||||
opacity: 0.45;
|
||||
transform: scale(0.985);
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
@mixin item-drop-before {
|
||||
&::before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
left: calc(var(--space-3) + (var(--tree-depth, 0) * var(--space-4)));
|
||||
right: var(--space-3);
|
||||
top: calc((var(--space-1) * -0.5) - 1px);
|
||||
height: 2px;
|
||||
border-radius: 999px;
|
||||
background: color-mix(in srgb, var(--color-accent-strong) 78%, transparent);
|
||||
pointer-events: none;
|
||||
z-index: 2;
|
||||
}
|
||||
}
|
||||
|
||||
@mixin item-drop-after {
|
||||
&::before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
left: calc(var(--space-3) + (var(--tree-depth, 0) * var(--space-4)));
|
||||
right: var(--space-3);
|
||||
bottom: calc((var(--space-1) * -0.5) - 1px);
|
||||
height: 2px;
|
||||
border-radius: 999px;
|
||||
background: color-mix(in srgb, var(--color-accent-strong) 78%, transparent);
|
||||
pointer-events: none;
|
||||
z-index: 2;
|
||||
}
|
||||
}
|
||||
|
||||
@mixin item-drop-inside {
|
||||
color: var(--color-text);
|
||||
|
||||
&::after {
|
||||
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));
|
||||
box-shadow: inset 0 1px 0 color-mix(in srgb, white 4%, transparent);
|
||||
}
|
||||
}
|
||||
|
||||
@mixin folder-chevron {
|
||||
color: var(--color-text-muted);
|
||||
transition: transform 160ms var(--easing-standard);
|
||||
}
|
||||
|
||||
@mixin folder-chevron-open {
|
||||
transform: rotate(90deg);
|
||||
}
|
||||
|
||||
@mixin item-active {
|
||||
color: var(--color-text);
|
||||
|
||||
&::after {
|
||||
border-color: var(--color-border);
|
||||
background: var(--color-surface);
|
||||
box-shadow: inset 0 1px 0 color-mix(in srgb, white 4%, transparent);
|
||||
}
|
||||
}
|
||||
|
||||
@mixin icon {
|
||||
color: inherit;
|
||||
opacity: 0.85;
|
||||
}
|
||||
|
||||
@mixin label {
|
||||
@include text-label;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
@mixin item-meta {
|
||||
@include text-caption;
|
||||
color: var(--color-text-muted);
|
||||
}
|
||||
@@ -0,0 +1,278 @@
|
||||
export type NavTreeDropIntent = "before" | "after" | "inside";
|
||||
|
||||
export type NavTreeDropTarget = {
|
||||
parentId: string | null;
|
||||
index: number;
|
||||
intent: NavTreeDropIntent;
|
||||
targetNodeId?: string;
|
||||
};
|
||||
|
||||
export type NavTreeDragState = {
|
||||
draggedNodeId: string;
|
||||
dropTarget: NavTreeDropTarget | null;
|
||||
};
|
||||
|
||||
export type NavTreeLocation<TNode> = {
|
||||
parentId: string | null;
|
||||
index: number;
|
||||
node: TNode;
|
||||
};
|
||||
|
||||
export type NavTreeAdapter<TNode> = {
|
||||
getNodeId: (node: TNode) => string;
|
||||
isBranchNode: (node: TNode) => boolean;
|
||||
getChildren: (node: TNode) => readonly TNode[];
|
||||
withChildren: (node: TNode, children: readonly TNode[]) => TNode;
|
||||
};
|
||||
|
||||
const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
|
||||
|
||||
export const isUuidString = (value: string | null | undefined): boolean => {
|
||||
if (typeof value !== "string") {
|
||||
return false;
|
||||
}
|
||||
|
||||
return UUID_PATTERN.test(value.trim());
|
||||
};
|
||||
|
||||
export const collectBranchNodeIds = <TNode>(
|
||||
nodes: readonly TNode[],
|
||||
adapter: NavTreeAdapter<TNode>,
|
||||
): string[] => {
|
||||
const ids: string[] = [];
|
||||
|
||||
for (const node of nodes) {
|
||||
if (!adapter.isBranchNode(node)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
ids.push(adapter.getNodeId(node));
|
||||
ids.push(...collectBranchNodeIds(adapter.getChildren(node), adapter));
|
||||
}
|
||||
|
||||
return ids;
|
||||
};
|
||||
|
||||
export const findTreeNodeLocation = <TNode>(
|
||||
nodes: readonly TNode[],
|
||||
nodeId: string,
|
||||
adapter: NavTreeAdapter<TNode>,
|
||||
parentId: string | null = null,
|
||||
): NavTreeLocation<TNode> | null => {
|
||||
for (let index = 0; index < nodes.length; index += 1) {
|
||||
const node = nodes[index];
|
||||
|
||||
if (adapter.getNodeId(node) === nodeId) {
|
||||
return { parentId, index, node };
|
||||
}
|
||||
|
||||
if (!adapter.isBranchNode(node)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const nestedLocation = findTreeNodeLocation(adapter.getChildren(node), nodeId, adapter, adapter.getNodeId(node));
|
||||
if (nestedLocation) {
|
||||
return nestedLocation;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
};
|
||||
|
||||
export const findTreeNodeDepth = <TNode>(
|
||||
nodes: readonly TNode[],
|
||||
nodeId: string,
|
||||
adapter: NavTreeAdapter<TNode>,
|
||||
depth = 0,
|
||||
): number | null => {
|
||||
for (const node of nodes) {
|
||||
if (adapter.getNodeId(node) === nodeId) {
|
||||
return depth;
|
||||
}
|
||||
|
||||
if (!adapter.isBranchNode(node)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const nestedDepth = findTreeNodeDepth(adapter.getChildren(node), nodeId, adapter, depth + 1);
|
||||
if (nestedDepth !== null) {
|
||||
return nestedDepth;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
};
|
||||
|
||||
export const treeContainsNode = <TNode>(
|
||||
nodes: readonly TNode[],
|
||||
nodeId: string,
|
||||
adapter: NavTreeAdapter<TNode>,
|
||||
): boolean => {
|
||||
for (const node of nodes) {
|
||||
if (adapter.getNodeId(node) === nodeId) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (adapter.isBranchNode(node) && treeContainsNode(adapter.getChildren(node), nodeId, adapter)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
|
||||
export const removeTreeNode = <TNode>(
|
||||
nodes: readonly TNode[],
|
||||
nodeId: string,
|
||||
adapter: NavTreeAdapter<TNode>,
|
||||
): { nodes: TNode[]; removed: TNode | null } => {
|
||||
const nextNodes: TNode[] = [];
|
||||
let removed: TNode | null = null;
|
||||
|
||||
for (const node of nodes) {
|
||||
if (adapter.getNodeId(node) === nodeId) {
|
||||
removed = node;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (adapter.isBranchNode(node)) {
|
||||
const result = removeTreeNode(adapter.getChildren(node), nodeId, adapter);
|
||||
|
||||
if (result.removed) {
|
||||
removed = result.removed;
|
||||
nextNodes.push(adapter.withChildren(node, result.nodes));
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
nextNodes.push(node);
|
||||
}
|
||||
|
||||
return { nodes: nextNodes, removed };
|
||||
};
|
||||
|
||||
export const insertTreeNode = <TNode>(
|
||||
nodes: readonly TNode[],
|
||||
parentId: string | null,
|
||||
index: number,
|
||||
nodeToInsert: TNode,
|
||||
adapter: NavTreeAdapter<TNode>,
|
||||
): TNode[] => {
|
||||
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 (!adapter.isBranchNode(node)) {
|
||||
return node;
|
||||
}
|
||||
|
||||
if (adapter.getNodeId(node) === parentId) {
|
||||
const nextChildren = [...adapter.getChildren(node)];
|
||||
nextChildren.splice(Math.max(0, Math.min(index, nextChildren.length)), 0, nodeToInsert);
|
||||
return adapter.withChildren(node, nextChildren);
|
||||
}
|
||||
|
||||
return adapter.withChildren(node, insertTreeNode(adapter.getChildren(node), parentId, index, nodeToInsert, adapter));
|
||||
});
|
||||
};
|
||||
|
||||
export const moveTreeNode = <TNode>(
|
||||
nodes: readonly TNode[],
|
||||
draggedNodeId: string,
|
||||
dropTarget: NavTreeDropTarget,
|
||||
adapter: NavTreeAdapter<TNode>,
|
||||
): TNode[] => {
|
||||
const location = findTreeNodeLocation(nodes, draggedNodeId, adapter);
|
||||
|
||||
if (!location) {
|
||||
return [...nodes];
|
||||
}
|
||||
|
||||
if (
|
||||
adapter.isBranchNode(location.node) &&
|
||||
dropTarget.parentId !== null &&
|
||||
(treeContainsNode(adapter.getChildren(location.node), dropTarget.parentId, adapter) ||
|
||||
dropTarget.parentId === adapter.getNodeId(location.node))
|
||||
) {
|
||||
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 = removeTreeNode(nodes, draggedNodeId, adapter);
|
||||
if (!removalResult.removed) {
|
||||
return [...nodes];
|
||||
}
|
||||
|
||||
return insertTreeNode(removalResult.nodes, dropTarget.parentId, normalizedIndex, removalResult.removed, adapter);
|
||||
};
|
||||
|
||||
export const getPointerRelativeY = (event: PointerEvent): number | null => {
|
||||
const currentTarget = event.currentTarget;
|
||||
if (!(currentTarget instanceof HTMLElement)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const bounds = currentTarget.getBoundingClientRect();
|
||||
return bounds.height <= 0 ? 0.5 : (event.clientY - bounds.top) / bounds.height;
|
||||
};
|
||||
|
||||
export const resolveTreeDropTarget = <TNode>(params: {
|
||||
parentId: string | null;
|
||||
index: number;
|
||||
node: TNode;
|
||||
relativeY: number;
|
||||
adapter: NavTreeAdapter<TNode>;
|
||||
beforeThreshold?: number;
|
||||
beforeThresholdFirstSibling?: number;
|
||||
afterThreshold?: number;
|
||||
}): NavTreeDropTarget => {
|
||||
const {
|
||||
parentId,
|
||||
index,
|
||||
node,
|
||||
relativeY,
|
||||
adapter,
|
||||
beforeThreshold = 0.28,
|
||||
beforeThresholdFirstSibling = 0.42,
|
||||
afterThreshold = 0.72,
|
||||
} = params;
|
||||
|
||||
const targetNodeId = adapter.getNodeId(node);
|
||||
|
||||
if (adapter.isBranchNode(node)) {
|
||||
const nextBeforeThreshold = index === 0 ? beforeThresholdFirstSibling : beforeThreshold;
|
||||
|
||||
if (relativeY < nextBeforeThreshold) {
|
||||
return { parentId, index, intent: "before", targetNodeId };
|
||||
}
|
||||
|
||||
if (relativeY > afterThreshold) {
|
||||
return { parentId, index: index + 1, intent: "after", targetNodeId };
|
||||
}
|
||||
|
||||
return {
|
||||
parentId: targetNodeId,
|
||||
index: adapter.getChildren(node).length,
|
||||
intent: "inside",
|
||||
targetNodeId,
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
parentId,
|
||||
index: relativeY < 0.5 ? index : index + 1,
|
||||
intent: relativeY < 0.5 ? "before" : "after",
|
||||
targetNodeId,
|
||||
};
|
||||
};
|
||||
@@ -0,0 +1,173 @@
|
||||
// Path: Frontend/src/components/workspace-home/WorkspaceHome/WorkspaceHome.data.ts
|
||||
|
||||
export type BootstrapStepKey = "persona" | "instance" | "mode" | "admin" | "structure";
|
||||
|
||||
export type BootstrapStepDefinition = {
|
||||
id: BootstrapStepKey;
|
||||
title: string;
|
||||
buttonLabel: string;
|
||||
};
|
||||
|
||||
export type InstanceForm = {
|
||||
protocol: "http" | "https";
|
||||
access: "local" | "remote";
|
||||
host: string;
|
||||
};
|
||||
|
||||
export type ModeForm = {
|
||||
mode: "personal" | "organizational";
|
||||
name: string;
|
||||
};
|
||||
|
||||
export type AdminForm = {
|
||||
displayName: string;
|
||||
email: string;
|
||||
password: string;
|
||||
};
|
||||
|
||||
export type StructureForm = {
|
||||
departmentName: string;
|
||||
teamName: string;
|
||||
projectName: string;
|
||||
};
|
||||
|
||||
export type BootstrapPersona = "personal" | "enthusiast" | "team" | "organization";
|
||||
|
||||
export type BootstrapPersonaDefinition = {
|
||||
id: BootstrapPersona;
|
||||
title: string;
|
||||
isAvailable: boolean;
|
||||
bestFor: string;
|
||||
bullets: readonly string[];
|
||||
defaults: {
|
||||
protocol: InstanceForm["protocol"];
|
||||
access: InstanceForm["access"];
|
||||
host: string;
|
||||
mode: ModeForm["mode"];
|
||||
namePlaceholder: string;
|
||||
departmentName: string;
|
||||
teamName: string;
|
||||
projectName: string;
|
||||
};
|
||||
};
|
||||
|
||||
export const bootstrapStepDefinitions: readonly BootstrapStepDefinition[] = [
|
||||
{ id: "persona", title: "What are you setting up your server for?", buttonLabel: "Continue" },
|
||||
{ id: "instance", title: "Connection details", buttonLabel: "Save and continue" },
|
||||
{ id: "mode", title: "Server identity", buttonLabel: "Save and continue" },
|
||||
{ id: "admin", title: "Admin account", buttonLabel: "Save and continue" },
|
||||
{ id: "structure", title: "Initial structure", buttonLabel: "Submit" },
|
||||
];
|
||||
|
||||
export const defaultInstanceForm: InstanceForm = {
|
||||
protocol: "http",
|
||||
access: "local",
|
||||
host: "localhost",
|
||||
};
|
||||
|
||||
export const defaultModeForm: ModeForm = {
|
||||
mode: "personal",
|
||||
name: "",
|
||||
};
|
||||
|
||||
export const defaultAdminForm: AdminForm = {
|
||||
displayName: "Admin",
|
||||
email: "admin@example.com",
|
||||
password: "",
|
||||
};
|
||||
|
||||
export const personalStructureDefaults = {
|
||||
departmentName: "Default",
|
||||
teamName: "Personal",
|
||||
};
|
||||
|
||||
export const organizationalStructureDefaults = {
|
||||
departmentName: "Department",
|
||||
teamName: "Team",
|
||||
};
|
||||
|
||||
export const defaultStructureForm: StructureForm = {
|
||||
...personalStructureDefaults,
|
||||
projectName: "Project",
|
||||
};
|
||||
|
||||
export const bootstrapPersonaDefinitions: readonly BootstrapPersonaDefinition[] = [
|
||||
{
|
||||
id: "personal",
|
||||
title: "Personal",
|
||||
isAvailable: true,
|
||||
bestFor: "Best for low maintenance, personal use",
|
||||
bullets: ["Preconfigured for personal use", "Low setup time", "Easy to manage"],
|
||||
defaults: {
|
||||
protocol: "http",
|
||||
access: "local",
|
||||
host: "localhost",
|
||||
mode: "personal",
|
||||
namePlaceholder: "Personal Server",
|
||||
departmentName: "Default",
|
||||
teamName: "Personal",
|
||||
projectName: "Project",
|
||||
},
|
||||
},
|
||||
{
|
||||
id: "enthusiast",
|
||||
title: "Self Hosted Enthusiast",
|
||||
isAvailable: true,
|
||||
bestFor: "Best for people who want to customize their server",
|
||||
bullets: ["Networking knowledge", "Comfortable with tinkering", "Willing to troubleshoot issues"],
|
||||
defaults: {
|
||||
protocol: "https",
|
||||
access: "remote",
|
||||
host: "moku.local",
|
||||
mode: "personal",
|
||||
namePlaceholder: "Personal Server",
|
||||
departmentName: "Default",
|
||||
teamName: "Personal",
|
||||
projectName: "Project",
|
||||
},
|
||||
},
|
||||
{
|
||||
id: "team",
|
||||
title: "Team",
|
||||
isAvailable: true,
|
||||
bestFor: "Best for low maintenance but for small team",
|
||||
bullets: ["Built-in collaboration with low setup time", "Keeps the shared structure simple", "Good for a small product, design, or delivery team"],
|
||||
defaults: {
|
||||
protocol: "http",
|
||||
access: "local",
|
||||
host: "localhost",
|
||||
mode: "organizational",
|
||||
namePlaceholder: "Team Server",
|
||||
departmentName: "Default",
|
||||
teamName: "Core Team",
|
||||
projectName: "Project",
|
||||
},
|
||||
},
|
||||
{
|
||||
id: "organization",
|
||||
title: "Organization",
|
||||
isAvailable: true,
|
||||
bestFor: "Best for multiple teams and shared ownership",
|
||||
bullets: ["SME to Organization", "Fine grained access control", "Better fit for teams with multiple departments"],
|
||||
defaults: {
|
||||
protocol: "https",
|
||||
access: "remote",
|
||||
host: "workspace.example.com",
|
||||
mode: "organizational",
|
||||
namePlaceholder: "Organization server name",
|
||||
departmentName: "Operations",
|
||||
teamName: "Platform Team",
|
||||
projectName: "Moku",
|
||||
},
|
||||
},
|
||||
];
|
||||
|
||||
export const workspaceHomeFieldTooltips = {
|
||||
protocol: "Usually people use http for a local-only setup and https when the server will be reached over a domain or reverse proxy.",
|
||||
access: "Usually people use local when Moku is only reached on the same machine or LAN, and remote when they plan to reach it from another network or public domain.",
|
||||
host: "Examples people usually set here are localhost, moku.local, or a real domain like workspace.example.com depending on how they plan to reach the server.",
|
||||
serverName: "This is the friendly name people usually give the server itself, for example Personal Server, Ronald's Server, Homelab, Studio, or Workspace.",
|
||||
department: "Departments are the highest-level grouping for work. People usually use names like Default, Operations, Product, Design, or Engineering.",
|
||||
team: "Teams sit inside a department. Common examples are Personal, Platform Team, Core Team, Delivery, or Design Systems.",
|
||||
project: "Projects are the workspace or initiative people work inside. Common examples are Project, Shared Workspace, Moku, Client Portal, or Website Redesign.",
|
||||
} as const;
|
||||
@@ -0,0 +1,542 @@
|
||||
// Path: Frontend/src/components/workspace-home/WorkspaceHome/WorkspaceHome.hook.ts
|
||||
|
||||
import { createEffect, createMemo, createSignal, onCleanup } from "solid-js";
|
||||
import { createStore } from "solid-js/store";
|
||||
import { resolveAPIBase } from "../../../lib/api";
|
||||
import {
|
||||
bootstrapPersonaDefinitions,
|
||||
bootstrapStepDefinitions,
|
||||
defaultAdminForm,
|
||||
defaultInstanceForm,
|
||||
defaultModeForm,
|
||||
defaultStructureForm,
|
||||
organizationalStructureDefaults,
|
||||
personalStructureDefaults,
|
||||
type AdminForm,
|
||||
type BootstrapPersona,
|
||||
type BootstrapPersonaDefinition,
|
||||
type BootstrapStepDefinition,
|
||||
type BootstrapStepKey,
|
||||
type InstanceForm,
|
||||
type ModeForm,
|
||||
type StructureForm,
|
||||
} from "./WorkspaceHome.data";
|
||||
|
||||
type AppShellBootstrapAdapter = {
|
||||
installation: () => { isBootstrapped?: boolean; materializationStatus?: string; materializationError?: string } | undefined;
|
||||
status: () => string;
|
||||
reload: () => Promise<void>;
|
||||
};
|
||||
|
||||
export type BootstrapSubmissionState = {
|
||||
status: "idle" | "submitting" | "success" | "error";
|
||||
error: string;
|
||||
};
|
||||
|
||||
export type MaterializationState = "not_started" | "pending" | "running" | "succeeded" | "failed";
|
||||
|
||||
export type FieldTooltipState = {
|
||||
text: string;
|
||||
left: number;
|
||||
top: number;
|
||||
placement: "top" | "bottom";
|
||||
};
|
||||
|
||||
const initialSubmissionState = (): BootstrapSubmissionState => ({
|
||||
status: "idle",
|
||||
error: "",
|
||||
});
|
||||
|
||||
const materializationPollIntervalMs = 2000;
|
||||
|
||||
const readResponseBody = async (response: Response): Promise<unknown> => {
|
||||
const raw = await response.text();
|
||||
|
||||
if (!raw.trim()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
return JSON.parse(raw);
|
||||
} catch {
|
||||
return raw;
|
||||
}
|
||||
};
|
||||
|
||||
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(", ")})`;
|
||||
};
|
||||
|
||||
export const useWorkspaceHomeWizard = (appShellData: AppShellBootstrapAdapter) => {
|
||||
const [instanceForm, setInstanceForm] = createStore<InstanceForm>({ ...defaultInstanceForm });
|
||||
const [modeForm, setModeForm] = createStore<ModeForm>({ ...defaultModeForm });
|
||||
const [adminForm, setAdminForm] = createStore<AdminForm>({ ...defaultAdminForm });
|
||||
const [structureForm, setStructureForm] = createStore<StructureForm>({ ...defaultStructureForm });
|
||||
const [selectedPersona, setSelectedPersona] = createSignal<BootstrapPersona>("enthusiast");
|
||||
const [hasChosenPersona, setHasChosenPersona] = createSignal(false);
|
||||
const [stepState, setStepState] = createStore<Record<BootstrapStepKey, BootstrapSubmissionState>>({
|
||||
persona: initialSubmissionState(),
|
||||
instance: initialSubmissionState(),
|
||||
mode: initialSubmissionState(),
|
||||
admin: initialSubmissionState(),
|
||||
structure: initialSubmissionState(),
|
||||
});
|
||||
const [isBootstrapStateResolved, setIsBootstrapStateResolved] = createSignal(false);
|
||||
const [isBootstrapComplete, setIsBootstrapComplete] = createSignal(false);
|
||||
const [isWizardOpen, setIsWizardOpen] = createSignal(false);
|
||||
const [isFinishingBootstrapFlow, setIsFinishingBootstrapFlow] = createSignal(false);
|
||||
const [currentStepIndex, setCurrentStepIndex] = createSignal(0);
|
||||
const [fieldTooltip, setFieldTooltip] = createSignal<FieldTooltipState | null>(null);
|
||||
|
||||
const installation = createMemo(() => appShellData.installation());
|
||||
const materializationState = createMemo<MaterializationState>(() => {
|
||||
const status = installation()?.materializationStatus;
|
||||
|
||||
switch (status) {
|
||||
case "pending":
|
||||
case "running":
|
||||
case "failed":
|
||||
case "succeeded":
|
||||
case "not_started":
|
||||
return status;
|
||||
default:
|
||||
return installation()?.isBootstrapped ? "succeeded" : "not_started";
|
||||
}
|
||||
});
|
||||
const isBootstrapPersisted = createMemo(() => installation()?.isBootstrapped ?? false);
|
||||
const isMaterializationInFlight = createMemo(() => materializationState() === "pending" || materializationState() === "running");
|
||||
const hasMaterializationFailed = createMemo(() => materializationState() === "failed");
|
||||
const showBootstrapFinishingState = createMemo(() => isFinishingBootstrapFlow() && (isMaterializationInFlight() || hasMaterializationFailed()));
|
||||
const materializationStatusLabel = createMemo(() => {
|
||||
switch (materializationState()) {
|
||||
case "pending":
|
||||
return "Materialization queued";
|
||||
case "running":
|
||||
return "Materialization running";
|
||||
case "failed":
|
||||
return "Materialization failed";
|
||||
case "succeeded":
|
||||
return "Ready";
|
||||
default:
|
||||
return "Not started";
|
||||
}
|
||||
});
|
||||
const materializationMessage = createMemo(() => {
|
||||
if (isMaterializationInFlight()) {
|
||||
return "Your bootstrap is saved. The worker is still creating the POSIX skeleton and rebuilding the app shell index.";
|
||||
}
|
||||
|
||||
if (hasMaterializationFailed()) {
|
||||
return installation()?.materializationError || "Bootstrap saved, but background materialization did not finish cleanly.";
|
||||
}
|
||||
|
||||
return "";
|
||||
});
|
||||
const personaDefinition = createMemo<BootstrapPersonaDefinition>(() => bootstrapPersonaDefinitions.find((persona) => persona.id === selectedPersona()) ?? bootstrapPersonaDefinitions[0]!);
|
||||
const selectedPersonaIsAvailable = createMemo(() => personaDefinition().isAvailable);
|
||||
const usesCondensedBootstrapFlow = createMemo(() => selectedPersona() === "personal" || selectedPersona() === "team");
|
||||
const activeBootstrapSteps = createMemo<readonly BootstrapStepDefinition[]>(() => {
|
||||
if (usesCondensedBootstrapFlow()) {
|
||||
return [bootstrapStepDefinitions[0]!, bootstrapStepDefinitions[2]!, bootstrapStepDefinitions[3]!];
|
||||
}
|
||||
|
||||
return bootstrapStepDefinitions;
|
||||
});
|
||||
const activeWizardSteps = createMemo(() => activeBootstrapSteps().filter((step) => step.id !== "persona"));
|
||||
|
||||
createEffect(() => {
|
||||
const defaults = personaDefinition().defaults;
|
||||
|
||||
setInstanceForm({
|
||||
protocol: defaults.protocol,
|
||||
access: defaults.access,
|
||||
host: defaults.host,
|
||||
});
|
||||
setModeForm("mode", defaults.mode);
|
||||
setStructureForm({
|
||||
departmentName: defaults.departmentName,
|
||||
teamName: defaults.teamName,
|
||||
projectName: defaults.projectName,
|
||||
});
|
||||
});
|
||||
|
||||
createEffect(() => {
|
||||
if (modeForm.mode === "personal") {
|
||||
setStructureForm("departmentName", personalStructureDefaults.departmentName);
|
||||
setStructureForm("teamName", personalStructureDefaults.teamName);
|
||||
return;
|
||||
}
|
||||
|
||||
if (structureForm.departmentName === personalStructureDefaults.departmentName) {
|
||||
setStructureForm("departmentName", organizationalStructureDefaults.departmentName);
|
||||
}
|
||||
|
||||
if (structureForm.teamName === personalStructureDefaults.teamName) {
|
||||
setStructureForm("teamName", organizationalStructureDefaults.teamName);
|
||||
}
|
||||
});
|
||||
|
||||
const resetWizardState = (): void => {
|
||||
setSelectedPersona("enthusiast");
|
||||
setHasChosenPersona(false);
|
||||
setInstanceForm({ ...defaultInstanceForm });
|
||||
setModeForm({ ...defaultModeForm });
|
||||
setAdminForm({ ...defaultAdminForm });
|
||||
setStructureForm({ ...defaultStructureForm });
|
||||
setStepState({
|
||||
persona: initialSubmissionState(),
|
||||
instance: initialSubmissionState(),
|
||||
mode: initialSubmissionState(),
|
||||
admin: initialSubmissionState(),
|
||||
structure: initialSubmissionState(),
|
||||
});
|
||||
setCurrentStepIndex(0);
|
||||
setIsFinishingBootstrapFlow(false);
|
||||
};
|
||||
|
||||
createEffect(() => {
|
||||
const shellStatus = appShellData.status();
|
||||
|
||||
if (shellStatus === "idle" || shellStatus === "loading") {
|
||||
return;
|
||||
}
|
||||
|
||||
if (shellStatus !== "success") {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!isBootstrapPersisted()) {
|
||||
setIsFinishingBootstrapFlow(false);
|
||||
resetWizardState();
|
||||
}
|
||||
|
||||
setIsBootstrapComplete(isBootstrapPersisted() && !isMaterializationInFlight());
|
||||
setIsWizardOpen(!isBootstrapPersisted() || showBootstrapFinishingState());
|
||||
setIsBootstrapStateResolved(true);
|
||||
});
|
||||
|
||||
createEffect(() => {
|
||||
if (!isFinishingBootstrapFlow()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (isMaterializationInFlight() || hasMaterializationFailed()) {
|
||||
return;
|
||||
}
|
||||
|
||||
setIsFinishingBootstrapFlow(false);
|
||||
setIsWizardOpen(false);
|
||||
});
|
||||
|
||||
createEffect(() => {
|
||||
if (!isBootstrapPersisted() || !isMaterializationInFlight()) {
|
||||
return;
|
||||
}
|
||||
|
||||
let cancelled = false;
|
||||
let timeoutId: number | undefined;
|
||||
|
||||
const scheduleReload = (): void => {
|
||||
timeoutId = window.setTimeout(async () => {
|
||||
if (cancelled) {
|
||||
return;
|
||||
}
|
||||
|
||||
await appShellData.reload();
|
||||
|
||||
if (!cancelled && isBootstrapPersisted() && isMaterializationInFlight()) {
|
||||
scheduleReload();
|
||||
}
|
||||
}, materializationPollIntervalMs);
|
||||
};
|
||||
|
||||
scheduleReload();
|
||||
|
||||
onCleanup(() => {
|
||||
cancelled = true;
|
||||
|
||||
if (timeoutId !== undefined) {
|
||||
window.clearTimeout(timeoutId);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
const apiBase = (): string => resolveAPIBase();
|
||||
const bootstrapNamePlaceholder = (): string => personaDefinition().defaults.namePlaceholder;
|
||||
const bootstrapStepCount = createMemo(() => activeWizardSteps().length);
|
||||
const currentStep = createMemo<BootstrapStepDefinition>(() => activeBootstrapSteps()[currentStepIndex()] ?? activeBootstrapSteps()[0] ?? bootstrapStepDefinitions[0]!);
|
||||
const currentWizardStepIndex = createMemo(() => {
|
||||
const visibleIndex = activeWizardSteps().findIndex((step) => step.id === currentStep().id);
|
||||
|
||||
return visibleIndex >= 0 ? visibleIndex : 0;
|
||||
});
|
||||
const wizardProgressPercent = createMemo(() => {
|
||||
const totalSteps = bootstrapStepCount();
|
||||
const activeIndex = Math.max(currentWizardStepIndex(), 0);
|
||||
|
||||
if (totalSteps <= 1) {
|
||||
return 100;
|
||||
}
|
||||
|
||||
return (activeIndex / (totalSteps - 1)) * 100;
|
||||
});
|
||||
const wizardProgressFillWidth = createMemo(() => {
|
||||
if (currentStepIndex() <= 0) {
|
||||
return `${wizardProgressPercent()}%`;
|
||||
}
|
||||
|
||||
return `calc(${wizardProgressPercent()}% + ((var(--control-size-md) - var(--space-2)) / 2))`;
|
||||
});
|
||||
const currentStepState = createMemo<BootstrapSubmissionState>(() => stepState[currentStep().id]);
|
||||
const isFirstStep = (): boolean => currentStepIndex() === 0;
|
||||
const isLastStep = (): boolean => currentStepIndex() === activeBootstrapSteps().length - 1;
|
||||
const canDismissWizard = (): boolean => isBootstrapPersisted() && !isMaterializationInFlight();
|
||||
|
||||
createEffect(() => {
|
||||
setCurrentStepIndex((index) => Math.min(index, activeBootstrapSteps().length - 1));
|
||||
});
|
||||
|
||||
const submitStep = async (step: BootstrapStepKey, payload: unknown): Promise<boolean> => {
|
||||
setStepState(step, { status: "submitting", error: "" });
|
||||
|
||||
try {
|
||||
const response = await fetch(`${apiBase()}/bootstrap/steps/${step}`, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
Accept: "application/json",
|
||||
},
|
||||
body: JSON.stringify(payload),
|
||||
});
|
||||
const data = await readResponseBody(response);
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(readResponseError(step, data));
|
||||
}
|
||||
|
||||
setStepState(step, {
|
||||
status: "success",
|
||||
error: "",
|
||||
});
|
||||
|
||||
return true;
|
||||
} catch (error) {
|
||||
setStepState(step, {
|
||||
status: "error",
|
||||
error: error instanceof Error ? error.message : `Bootstrap ${step} request failed.`,
|
||||
});
|
||||
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
const payloadForStep = (step: BootstrapStepKey): unknown => {
|
||||
switch (step) {
|
||||
case "instance":
|
||||
return instanceForm;
|
||||
case "mode":
|
||||
return modeForm;
|
||||
case "admin":
|
||||
return adminForm;
|
||||
case "structure":
|
||||
return structureForm;
|
||||
}
|
||||
};
|
||||
|
||||
const applyPersonaSelection = (persona: BootstrapPersona): void => {
|
||||
const definition = bootstrapPersonaDefinitions.find((candidate) => candidate.id === persona);
|
||||
|
||||
if (!definition?.isAvailable) {
|
||||
return;
|
||||
}
|
||||
|
||||
setSelectedPersona(persona);
|
||||
setHasChosenPersona(true);
|
||||
setStepState("persona", {
|
||||
status: "success",
|
||||
error: "",
|
||||
});
|
||||
setCurrentStepIndex((index) => Math.min(index + 1, activeBootstrapSteps().length - 1));
|
||||
};
|
||||
|
||||
const statusLabel = (state: BootstrapSubmissionState): string => {
|
||||
switch (state.status) {
|
||||
case "submitting":
|
||||
return "Sending";
|
||||
case "error":
|
||||
return "Request failed";
|
||||
default:
|
||||
return "";
|
||||
}
|
||||
};
|
||||
|
||||
const submitCurrentStep = async (): Promise<void> => {
|
||||
const step = currentStep().id;
|
||||
|
||||
if (step === "persona") {
|
||||
applyPersonaSelection(selectedPersona());
|
||||
return;
|
||||
}
|
||||
|
||||
if (step === "mode" && usesCondensedBootstrapFlow() && stepState.instance.status !== "success") {
|
||||
const didPersistInstanceDefaults = await submitStep("instance", instanceForm);
|
||||
|
||||
if (!didPersistInstanceDefaults) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
const didSucceed = await submitStep(step, payloadForStep(step));
|
||||
|
||||
if (!didSucceed) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (step === "admin" && usesCondensedBootstrapFlow()) {
|
||||
const didPersistStructureDefaults = await submitStep("structure", structureForm);
|
||||
|
||||
if (!didPersistStructureDefaults) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (isLastStep()) {
|
||||
await appShellData.reload();
|
||||
|
||||
const shouldShowFinishingState = isBootstrapPersisted() && (isMaterializationInFlight() || hasMaterializationFailed());
|
||||
setIsFinishingBootstrapFlow(shouldShowFinishingState);
|
||||
setIsBootstrapComplete(isBootstrapPersisted() && !isMaterializationInFlight());
|
||||
setIsWizardOpen(!isBootstrapPersisted() || shouldShowFinishingState);
|
||||
setIsBootstrapStateResolved(true);
|
||||
return;
|
||||
}
|
||||
|
||||
setCurrentStepIndex((index) => Math.min(index + 1, activeBootstrapSteps().length - 1));
|
||||
};
|
||||
|
||||
const showFieldTooltip = (target: HTMLElement, text: string): void => {
|
||||
const rect = target.getBoundingClientRect();
|
||||
const placement = rect.top > 96 ? "top" : "bottom";
|
||||
const viewportPadding = 20;
|
||||
const left = Math.min(Math.max(rect.left + rect.width / 2, viewportPadding), window.innerWidth - viewportPadding);
|
||||
const top = placement === "top" ? rect.top - 10 : rect.bottom + 10;
|
||||
|
||||
setFieldTooltip({ text, left, top, placement });
|
||||
};
|
||||
|
||||
const hideFieldTooltip = (): void => {
|
||||
setFieldTooltip(null);
|
||||
};
|
||||
|
||||
const stepStatusLabel = (step: BootstrapStepDefinition): string => {
|
||||
const state = stepState[step.id];
|
||||
|
||||
if (state.status === "success") {
|
||||
return "Done";
|
||||
}
|
||||
|
||||
if (state.status === "error") {
|
||||
return "Needs retry";
|
||||
}
|
||||
|
||||
return "";
|
||||
};
|
||||
|
||||
return {
|
||||
instanceForm,
|
||||
setInstanceForm,
|
||||
modeForm,
|
||||
setModeForm,
|
||||
adminForm,
|
||||
setAdminForm,
|
||||
structureForm,
|
||||
setStructureForm,
|
||||
selectedPersona,
|
||||
setSelectedPersona,
|
||||
hasChosenPersona,
|
||||
stepState,
|
||||
isBootstrapStateResolved,
|
||||
isBootstrapComplete,
|
||||
isWizardOpen,
|
||||
setIsWizardOpen,
|
||||
isFinishingBootstrapFlow,
|
||||
setIsFinishingBootstrapFlow,
|
||||
fieldTooltip,
|
||||
materializationState,
|
||||
isMaterializationInFlight,
|
||||
hasMaterializationFailed,
|
||||
showBootstrapFinishingState,
|
||||
materializationStatusLabel,
|
||||
materializationMessage,
|
||||
personaDefinition,
|
||||
selectedPersonaIsAvailable,
|
||||
usesCondensedBootstrapFlow,
|
||||
activeWizardSteps,
|
||||
bootstrapNamePlaceholder,
|
||||
bootstrapStepCount,
|
||||
currentStep,
|
||||
currentWizardStepIndex,
|
||||
wizardProgressFillWidth,
|
||||
currentStepState,
|
||||
isFirstStep,
|
||||
canDismissWizard,
|
||||
resetWizardState,
|
||||
handleCurrentStepSubmit: (event: SubmitEvent & { currentTarget: HTMLFormElement; target: Element }): void => {
|
||||
event.preventDefault();
|
||||
void submitCurrentStep();
|
||||
},
|
||||
applyPersonaSelection,
|
||||
statusLabel,
|
||||
showFieldTooltip,
|
||||
hideFieldTooltip,
|
||||
stepStatusLabel,
|
||||
navigateBack: (): void => {
|
||||
setCurrentStepIndex((index) => Math.max(index - 1, 0));
|
||||
},
|
||||
navigateToVisibleStep: (index: number): void => {
|
||||
setCurrentStepIndex(index + 1);
|
||||
},
|
||||
};
|
||||
};
|
||||
@@ -1,6 +1,13 @@
|
||||
.viewport {
|
||||
/* Path: Frontend/src/components/workspace-home/WorkspaceHome/WorkspaceHome.module.scss */
|
||||
|
||||
.viewport,
|
||||
.wizardLayer {
|
||||
--workspace-content-max-width: var(--content-width-wide);
|
||||
--workspace-card-min-height: calc(var(--space-12) * 3);
|
||||
--bootstrap-accent: var(--color-accent-primary, var(--color-primary-2, hsl(272 80% 70%)));
|
||||
--bootstrap-accent-contrast: var(--color-accent-primary-contrast, white);
|
||||
}
|
||||
|
||||
.viewport {
|
||||
min-width: 0;
|
||||
min-height: 0;
|
||||
display: grid;
|
||||
@@ -14,14 +21,14 @@
|
||||
display: grid;
|
||||
grid-template-columns: auto minmax(0, 1fr) auto;
|
||||
align-items: center;
|
||||
gap: var(--space-2);
|
||||
min-height: calc(var(--control-size-md) - var(--space-3));
|
||||
padding: 0;
|
||||
gap: var(--space-2);
|
||||
min-height: calc(var(--control-size-md) - var(--space-3));
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.workspaceTopBarStart,
|
||||
.workspaceTopBarEnd {
|
||||
min-width: calc(var(--control-size-md) - 0.5rem);
|
||||
min-width: calc(var(--control-size-md) - 0.5rem);
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
}
|
||||
@@ -37,7 +44,7 @@
|
||||
}
|
||||
|
||||
.workspaceBreadcrumb {
|
||||
@include text-caption;
|
||||
@include text-caption;
|
||||
min-width: 0;
|
||||
color: var(--color-text-muted);
|
||||
white-space: nowrap;
|
||||
@@ -49,8 +56,8 @@
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: calc(var(--control-size-md) - 0.5rem);
|
||||
height: calc(var(--control-size-md) - 0.5rem);
|
||||
width: calc(var(--control-size-md) - 0.5rem);
|
||||
height: calc(var(--control-size-md) - 0.5rem);
|
||||
border: 1px solid color-mix(in srgb, var(--color-border-strong) 44%, transparent);
|
||||
border-radius: var(--radius-pill);
|
||||
background: color-mix(in srgb, var(--color-surface) 94%, transparent);
|
||||
@@ -81,10 +88,25 @@
|
||||
max-width: var(--workspace-content-max-width);
|
||||
}
|
||||
|
||||
.eyebrow {
|
||||
@include text-caption;
|
||||
.heroActions {
|
||||
display: flex;
|
||||
gap: var(--space-3);
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.heroStatus {
|
||||
display: grid;
|
||||
gap: var(--space-2);
|
||||
justify-items: start;
|
||||
}
|
||||
|
||||
.heroStatusMessage {
|
||||
max-width: 64ch;
|
||||
color: var(--color-text-muted);
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.heroStatusMessage[data-status="failed"] {
|
||||
color: var(--color-danger-text, var(--color-text));
|
||||
}
|
||||
|
||||
.title {
|
||||
@@ -98,18 +120,12 @@
|
||||
color: var(--color-text-muted);
|
||||
}
|
||||
|
||||
.grid {
|
||||
width: 100%;
|
||||
max-width: var(--workspace-content-max-width);
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||
gap: var(--space-4);
|
||||
}
|
||||
|
||||
.card {
|
||||
.overviewCard,
|
||||
.summaryCard,
|
||||
.wizardSidebarSection,
|
||||
.wizardStepPanel {
|
||||
display: grid;
|
||||
gap: var(--space-2);
|
||||
min-height: var(--workspace-card-min-height);
|
||||
padding: var(--space-4);
|
||||
border: 1px solid var(--color-border);
|
||||
border-radius: var(--radius-xl);
|
||||
@@ -117,23 +133,771 @@
|
||||
box-shadow: var(--shadow-soft);
|
||||
}
|
||||
|
||||
.cardTitle {
|
||||
.overviewCard {
|
||||
width: 100%;
|
||||
max-width: var(--workspace-content-max-width);
|
||||
gap: var(--space-3);
|
||||
}
|
||||
|
||||
.summaryGrid {
|
||||
width: 100%;
|
||||
max-width: var(--workspace-content-max-width);
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
gap: var(--space-4);
|
||||
}
|
||||
|
||||
.summaryCard {
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
.summaryCardHeader {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: var(--space-3);
|
||||
}
|
||||
|
||||
.summaryStepNumber,
|
||||
.wizardStepEyebrow {
|
||||
@include text-caption;
|
||||
color: var(--color-text-muted);
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.06em;
|
||||
}
|
||||
|
||||
.sectionHeader {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
justify-content: space-between;
|
||||
gap: var(--space-3);
|
||||
}
|
||||
|
||||
.sectionTitle,
|
||||
.cardTitle,
|
||||
.wizardTitle,
|
||||
.sidebarTitle {
|
||||
@include text-title;
|
||||
}
|
||||
|
||||
.cardCopy {
|
||||
.sectionCopy,
|
||||
.cardCopy,
|
||||
.cardMeta {
|
||||
color: var(--color-text-muted);
|
||||
}
|
||||
|
||||
.statusBadge {
|
||||
@include text-caption;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-height: calc(var(--control-size-sm) - 0.25rem);
|
||||
padding: 0 var(--space-2);
|
||||
border-radius: var(--radius-pill);
|
||||
border: 1px solid color-mix(in srgb, var(--color-border-strong) 44%, transparent);
|
||||
background: color-mix(in srgb, var(--color-surface-secondary) 92%, transparent);
|
||||
color: var(--color-text-muted);
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.statusBadge[data-status="submitting"] {
|
||||
color: var(--bootstrap-accent);
|
||||
border-color: color-mix(in srgb, var(--bootstrap-accent) 38%, transparent);
|
||||
}
|
||||
|
||||
.statusBadge[data-status="success"] {
|
||||
color: var(--color-success-text, var(--color-text));
|
||||
border-color: color-mix(in srgb, var(--color-success-border, var(--color-border)) 64%, transparent);
|
||||
background: color-mix(in srgb, var(--color-success-surface, var(--color-surface-secondary)) 80%, transparent);
|
||||
}
|
||||
|
||||
.statusBadge[data-status="pending"],
|
||||
.statusBadge[data-status="running"] {
|
||||
color: var(--bootstrap-accent);
|
||||
border-color: color-mix(in srgb, var(--bootstrap-accent) 38%, transparent);
|
||||
background: color-mix(in srgb, var(--bootstrap-accent) 10%, var(--color-surface-secondary));
|
||||
}
|
||||
|
||||
.statusBadge[data-status="failed"] {
|
||||
color: var(--color-danger-text, var(--color-text));
|
||||
border-color: color-mix(in srgb, var(--color-danger-border, var(--color-border)) 68%, transparent);
|
||||
background: color-mix(in srgb, var(--color-danger-surface, var(--color-surface-secondary)) 80%, transparent);
|
||||
}
|
||||
|
||||
.statusBadge[data-status="error"] {
|
||||
color: var(--color-danger-text, var(--color-text));
|
||||
border-color: color-mix(in srgb, var(--color-danger-border, var(--color-border)) 68%, transparent);
|
||||
background: color-mix(in srgb, var(--color-danger-surface, var(--color-surface-secondary)) 80%, transparent);
|
||||
}
|
||||
|
||||
.endpointMeta {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: var(--space-2);
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.endpointMeta span {
|
||||
@include text-caption;
|
||||
color: var(--color-text-muted);
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.endpointMeta code,
|
||||
.cardMeta {
|
||||
@include text-caption;
|
||||
}
|
||||
|
||||
.endpointMeta code {
|
||||
padding: 0.125rem 0.5rem;
|
||||
border-radius: var(--radius-pill);
|
||||
background: color-mix(in srgb, var(--color-surface-secondary) 90%, transparent);
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
.form {
|
||||
display: grid;
|
||||
gap: var(--space-3);
|
||||
}
|
||||
|
||||
.field {
|
||||
display: grid;
|
||||
gap: var(--space-1);
|
||||
}
|
||||
|
||||
.fieldLabel {
|
||||
@include text-caption;
|
||||
color: var(--color-text-muted);
|
||||
}
|
||||
|
||||
.fieldLabelRow {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.35rem;
|
||||
}
|
||||
|
||||
.fieldInfoButton {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
background: transparent;
|
||||
color: var(--color-text-muted);
|
||||
cursor: help;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.fieldInfoButton:hover,
|
||||
.fieldInfoButton:focus-visible {
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
.fieldTooltip {
|
||||
position: fixed;
|
||||
z-index: calc(var(--z-modal, 1000) + 4);
|
||||
pointer-events: none;
|
||||
transform: translateX(-50%);
|
||||
max-width: min(18rem, calc(100vw - 2rem));
|
||||
}
|
||||
|
||||
.fieldTooltip[data-placement="top"] {
|
||||
transform: translate(-50%, -100%);
|
||||
}
|
||||
|
||||
.fieldTooltip[data-placement="bottom"] {
|
||||
transform: translate(-50%, 0);
|
||||
}
|
||||
|
||||
.fieldTooltipBubble {
|
||||
position: relative;
|
||||
padding: 0.45rem 0.6rem;
|
||||
border: 1px solid color-mix(in srgb, var(--color-border-strong) 48%, transparent);
|
||||
border-radius: var(--radius-md);
|
||||
background: color-mix(in srgb, var(--color-surface-elevated, var(--color-surface)) 96%, black 4%);
|
||||
box-shadow: var(--shadow-soft);
|
||||
color: var(--color-text);
|
||||
white-space: normal;
|
||||
text-align: left;
|
||||
line-height: 1.35;
|
||||
}
|
||||
|
||||
.fieldTooltipBubble::after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
width: 0.55rem;
|
||||
height: 0.55rem;
|
||||
background: color-mix(in srgb, var(--color-surface-elevated, var(--color-surface)) 96%, black 4%);
|
||||
transform: translateX(-50%) rotate(45deg);
|
||||
}
|
||||
|
||||
.fieldTooltip[data-placement="top"] .fieldTooltipBubble::after {
|
||||
top: calc(100% - 0.3rem);
|
||||
border-right: 1px solid color-mix(in srgb, var(--color-border-strong) 48%, transparent);
|
||||
border-bottom: 1px solid color-mix(in srgb, var(--color-border-strong) 48%, transparent);
|
||||
}
|
||||
|
||||
.fieldTooltip[data-placement="bottom"] .fieldTooltipBubble::after {
|
||||
bottom: calc(100% - 0.3rem);
|
||||
border-top: 1px solid color-mix(in srgb, var(--color-border-strong) 48%, transparent);
|
||||
border-left: 1px solid color-mix(in srgb, var(--color-border-strong) 48%, transparent);
|
||||
}
|
||||
|
||||
.fieldHelp {
|
||||
@include text-caption;
|
||||
color: var(--color-text-muted);
|
||||
}
|
||||
|
||||
.personaIntro {
|
||||
display: grid;
|
||||
gap: var(--space-2);
|
||||
}
|
||||
|
||||
.personaGrid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
gap: var(--space-3);
|
||||
}
|
||||
|
||||
.personaCard {
|
||||
appearance: none;
|
||||
position: relative;
|
||||
display: grid;
|
||||
padding: var(--space-3);
|
||||
border: 1px solid color-mix(in srgb, var(--color-border) 88%, transparent);
|
||||
border-radius: var(--radius-xl);
|
||||
background: color-mix(in srgb, var(--color-surface-secondary) 84%, transparent);
|
||||
text-align: left;
|
||||
overflow: hidden;
|
||||
transition:
|
||||
transform 180ms var(--easing-standard),
|
||||
border-color 160ms var(--easing-standard),
|
||||
background 160ms var(--easing-standard),
|
||||
box-shadow 160ms var(--easing-standard);
|
||||
}
|
||||
|
||||
.personaCard:hover,
|
||||
.personaCard:focus-visible,
|
||||
.personaCard[data-selected="true"] {
|
||||
transform: translateY(-1px);
|
||||
border-color: color-mix(in srgb, var(--bootstrap-accent) 32%, var(--color-border));
|
||||
background: color-mix(in srgb, var(--bootstrap-accent) 7%, var(--color-surface));
|
||||
box-shadow: var(--shadow-soft);
|
||||
}
|
||||
|
||||
.personaCard:focus-visible {
|
||||
outline: none;
|
||||
box-shadow:
|
||||
var(--shadow-soft),
|
||||
0 0 0 3px color-mix(in srgb, var(--bootstrap-accent) 16%, transparent);
|
||||
}
|
||||
|
||||
.personaCard[data-available="false"] {
|
||||
opacity: 0.9;
|
||||
}
|
||||
|
||||
.personaCard[data-available="false"]:hover,
|
||||
.personaCard[data-available="false"]:focus-visible,
|
||||
.personaCard[data-available="false"][data-selected="true"] {
|
||||
transform: none;
|
||||
border-color: color-mix(in srgb, var(--color-border) 88%, transparent);
|
||||
background: color-mix(in srgb, var(--color-surface-secondary) 84%, transparent);
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.personaCardMedia {
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
justify-self: center;
|
||||
align-self: center;
|
||||
width: min(100%, 16rem);
|
||||
aspect-ratio: 1 / 1;
|
||||
border: 1px dashed color-mix(in srgb, var(--color-border-strong) 40%, transparent);
|
||||
border-radius: calc(var(--radius-xl) - var(--space-1));
|
||||
background: linear-gradient(
|
||||
135deg,
|
||||
color-mix(in srgb, var(--color-surface-elevated) 92%, transparent),
|
||||
color-mix(in srgb, var(--color-surface-secondary) 88%, transparent)
|
||||
);
|
||||
transition:
|
||||
filter 180ms var(--easing-standard),
|
||||
opacity 180ms var(--easing-standard),
|
||||
transform 180ms var(--easing-standard);
|
||||
}
|
||||
|
||||
.personaCardBody {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
display: grid;
|
||||
align-content: space-between;
|
||||
gap: var(--space-3);
|
||||
padding: var(--space-3);
|
||||
pointer-events: none;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.personaCardTitle {
|
||||
@include text-title;
|
||||
margin: 0;
|
||||
max-width: min(100%, 14rem);
|
||||
padding: 0.35rem 0.65rem;
|
||||
border-radius: var(--radius-md);
|
||||
background: color-mix(in srgb, var(--color-surface) 84%, transparent);
|
||||
backdrop-filter: blur(10px);
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
.personaCardDetails {
|
||||
display: grid;
|
||||
gap: var(--space-2);
|
||||
max-height: 0;
|
||||
opacity: 0;
|
||||
overflow: hidden;
|
||||
align-self: end;
|
||||
padding: var(--space-3);
|
||||
border-radius: var(--radius-lg);
|
||||
background: linear-gradient(
|
||||
180deg,
|
||||
color-mix(in srgb, var(--color-surface) 18%, transparent),
|
||||
color-mix(in srgb, var(--color-surface) 92%, transparent)
|
||||
);
|
||||
backdrop-filter: blur(12px);
|
||||
transition:
|
||||
max-height 180ms var(--easing-standard),
|
||||
opacity 160ms var(--easing-standard);
|
||||
}
|
||||
|
||||
.personaCard:hover .personaCardMedia,
|
||||
.personaCard:focus-visible .personaCardMedia,
|
||||
.personaCard[data-selected="true"] .personaCardMedia {
|
||||
filter: brightness(0.72);
|
||||
opacity: 0.92;
|
||||
transform: scale(0.985);
|
||||
}
|
||||
|
||||
.personaCard:hover .personaCardDetails,
|
||||
.personaCard:focus-visible .personaCardDetails,
|
||||
.personaCard[data-selected="true"] .personaCardDetails {
|
||||
max-height: 12rem;
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.personaCard[data-available="false"]:hover .personaCardMedia,
|
||||
.personaCard[data-available="false"]:focus-visible .personaCardMedia,
|
||||
.personaCard[data-available="false"][data-selected="true"] .personaCardMedia {
|
||||
filter: brightness(0.82);
|
||||
opacity: 0.96;
|
||||
transform: none;
|
||||
}
|
||||
|
||||
.personaBestFor,
|
||||
.personaBulletList {
|
||||
margin: 0;
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
.personaBulletList {
|
||||
padding-left: 1rem;
|
||||
display: grid;
|
||||
gap: 0.25rem;
|
||||
}
|
||||
|
||||
.personaAvailability {
|
||||
@include text-caption;
|
||||
margin: 0;
|
||||
color: var(--color-text-muted);
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.06em;
|
||||
}
|
||||
|
||||
.field input,
|
||||
.field select {
|
||||
min-height: var(--control-size-md);
|
||||
width: 100%;
|
||||
font: inherit;
|
||||
border: 1px solid var(--color-border);
|
||||
border-radius: var(--radius-lg);
|
||||
background: var(--color-surface-elevated);
|
||||
color: var(--color-text);
|
||||
padding: 0 var(--space-3);
|
||||
transition:
|
||||
border-color 160ms var(--easing-standard),
|
||||
box-shadow 160ms var(--easing-standard),
|
||||
background 160ms var(--easing-standard);
|
||||
}
|
||||
|
||||
.field input:disabled,
|
||||
.field select:disabled {
|
||||
cursor: not-allowed;
|
||||
color: var(--color-text-muted);
|
||||
background: color-mix(in srgb, var(--color-surface-secondary) 92%, transparent);
|
||||
border-color: color-mix(in srgb, var(--color-border) 72%, transparent);
|
||||
}
|
||||
|
||||
.field input:focus-visible,
|
||||
.field select:focus-visible {
|
||||
outline: none;
|
||||
border-color: color-mix(in srgb, var(--bootstrap-accent) 60%, var(--color-border));
|
||||
box-shadow: 0 0 0 3px color-mix(in srgb, var(--bootstrap-accent) 16%, transparent);
|
||||
}
|
||||
|
||||
.wizardFormActions,
|
||||
.heroActions,
|
||||
.primaryButton,
|
||||
.secondaryButton {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.wizardFormActions {
|
||||
justify-content: space-between;
|
||||
gap: var(--space-3);
|
||||
flex-wrap: nowrap;
|
||||
}
|
||||
|
||||
.wizardFormActions .primaryButton {
|
||||
margin-left: auto;
|
||||
}
|
||||
|
||||
.primaryButton,
|
||||
.secondaryButton,
|
||||
.wizardStepButton,
|
||||
.wizardCloseButton {
|
||||
appearance: none;
|
||||
justify-content: center;
|
||||
gap: var(--space-2);
|
||||
min-height: var(--control-size-md);
|
||||
border-radius: var(--radius-pill);
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
transition:
|
||||
transform 180ms var(--easing-standard),
|
||||
background 160ms var(--easing-standard),
|
||||
border-color 160ms var(--easing-standard),
|
||||
color 160ms var(--easing-standard),
|
||||
box-shadow 160ms var(--easing-standard);
|
||||
}
|
||||
|
||||
.primaryButton,
|
||||
.secondaryButton,
|
||||
.wizardCloseButton {
|
||||
padding: 0 var(--space-4);
|
||||
}
|
||||
|
||||
.primaryButton {
|
||||
border: 1px solid color-mix(in srgb, var(--bootstrap-accent) 72%, black 8%);
|
||||
background: linear-gradient(
|
||||
180deg,
|
||||
color-mix(in srgb, var(--bootstrap-accent) 88%, white 12%),
|
||||
color-mix(in srgb, var(--bootstrap-accent) 92%, black 8%)
|
||||
);
|
||||
color: var(--bootstrap-accent-contrast);
|
||||
box-shadow:
|
||||
inset 0 1px 0 color-mix(in srgb, white 28%, transparent),
|
||||
0 10px 24px color-mix(in srgb, var(--bootstrap-accent) 26%, transparent);
|
||||
}
|
||||
|
||||
.secondaryButton,
|
||||
.wizardCloseButton {
|
||||
border: 1px solid var(--color-border);
|
||||
background: var(--color-surface-secondary);
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
.primaryButton:hover,
|
||||
.secondaryButton:hover,
|
||||
.wizardCloseButton:hover,
|
||||
.wizardProgressStep:hover {
|
||||
transform: translateY(-1px);
|
||||
}
|
||||
|
||||
.primaryButton:hover,
|
||||
.primaryButton:focus-visible {
|
||||
background: linear-gradient(
|
||||
180deg,
|
||||
color-mix(in srgb, var(--bootstrap-accent) 84%, white 16%),
|
||||
color-mix(in srgb, var(--bootstrap-accent) 90%, black 10%)
|
||||
);
|
||||
border-color: color-mix(in srgb, var(--bootstrap-accent) 78%, black 10%);
|
||||
box-shadow:
|
||||
inset 0 1px 0 color-mix(in srgb, white 32%, transparent),
|
||||
0 14px 32px color-mix(in srgb, var(--bootstrap-accent) 30%, transparent);
|
||||
}
|
||||
|
||||
.primaryButton:disabled,
|
||||
.secondaryButton:disabled {
|
||||
opacity: 0.72;
|
||||
cursor: not-allowed;
|
||||
transform: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.errorText {
|
||||
@include text-caption;
|
||||
color: var(--color-danger-text, var(--color-text));
|
||||
}
|
||||
|
||||
.wizardLayer {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: var(--z-modal);
|
||||
}
|
||||
|
||||
.wizardBackdrop {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
border: 0;
|
||||
background: color-mix(in srgb, black 56%, transparent);
|
||||
backdrop-filter: blur(var(--blur-overlay));
|
||||
}
|
||||
|
||||
.wizardPanel {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
width: min(calc(100vw - (var(--space-6) * 2)), 72rem);
|
||||
max-height: calc(100dvh - (var(--space-6) * 2));
|
||||
margin: var(--space-6) auto;
|
||||
display: grid;
|
||||
gap: var(--space-4);
|
||||
padding: var(--space-4);
|
||||
border: 1px solid color-mix(in srgb, var(--color-border) 88%, transparent);
|
||||
border-radius: var(--radius-xl);
|
||||
background: color-mix(in srgb, var(--color-surface) 94%, var(--color-surface-elevated, var(--color-surface)) 6%);
|
||||
box-shadow: var(--shadow-strong);
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.wizardHeader {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
justify-content: space-between;
|
||||
gap: var(--space-4);
|
||||
}
|
||||
|
||||
.wizardHeaderCopy {
|
||||
min-width: 0;
|
||||
display: grid;
|
||||
gap: var(--space-1);
|
||||
}
|
||||
|
||||
.wizardBody {
|
||||
display: grid;
|
||||
gap: var(--space-4);
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
.wizardProgress {
|
||||
position: relative;
|
||||
display: grid;
|
||||
gap: var(--space-3);
|
||||
}
|
||||
|
||||
.wizardProgressTrack {
|
||||
position: absolute;
|
||||
left: calc((var(--control-size-md) - var(--space-2)) / 2);
|
||||
right: calc((var(--control-size-md) - var(--space-2)) / 2);
|
||||
top: calc((var(--control-size-md) - var(--space-2)) / 2);
|
||||
height: 2px;
|
||||
background: color-mix(in srgb, var(--color-border) 72%, transparent);
|
||||
transform: translateY(-50%);
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.wizardProgressFill {
|
||||
height: 100%;
|
||||
border-radius: 999px;
|
||||
background: color-mix(in srgb, var(--bootstrap-accent) 72%, white 8%);
|
||||
transition: width 220ms var(--easing-standard);
|
||||
}
|
||||
|
||||
.wizardProgressSteps {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 0;
|
||||
}
|
||||
|
||||
.wizardProgressStep {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
flex: 0 0 auto;
|
||||
display: inline-flex;
|
||||
justify-content: center;
|
||||
justify-items: center;
|
||||
text-align: center;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.wizardProgressStep:disabled {
|
||||
cursor: not-allowed;
|
||||
transform: none;
|
||||
}
|
||||
|
||||
.wizardProgressIndex {
|
||||
width: calc(var(--control-size-md) - var(--space-2));
|
||||
height: calc(var(--control-size-md) - var(--space-2));
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-radius: 999px;
|
||||
border: 1px solid color-mix(in srgb, var(--color-border) 88%, transparent);
|
||||
background: color-mix(in srgb, var(--color-surface) 92%, transparent);
|
||||
color: var(--color-text-muted);
|
||||
transition:
|
||||
border-color 160ms var(--easing-standard),
|
||||
background 160ms var(--easing-standard),
|
||||
color 160ms var(--easing-standard),
|
||||
box-shadow 160ms var(--easing-standard),
|
||||
transform 180ms var(--easing-standard);
|
||||
}
|
||||
|
||||
.wizardProgressStep[data-active="true"] .wizardProgressIndex,
|
||||
.wizardProgressStep[data-complete="true"] .wizardProgressIndex {
|
||||
border-color: color-mix(in srgb, var(--bootstrap-accent) 42%, transparent);
|
||||
background: color-mix(in srgb, var(--bootstrap-accent) 12%, var(--color-surface));
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
.wizardProgressStep[data-active="true"] .wizardProgressIndex {
|
||||
box-shadow: 0 0 0 3px color-mix(in srgb, var(--bootstrap-accent) 14%, transparent);
|
||||
}
|
||||
|
||||
.wizardProgressStep:not(:disabled):hover .wizardProgressIndex,
|
||||
.wizardProgressStep:not(:disabled):focus-visible .wizardProgressIndex {
|
||||
transform: translateY(-1px);
|
||||
border-color: color-mix(in srgb, var(--bootstrap-accent) 36%, var(--color-border));
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
.wizardStepPanel {
|
||||
align-content: start;
|
||||
gap: var(--space-3);
|
||||
}
|
||||
|
||||
.wizardFinishPanel {
|
||||
display: grid;
|
||||
gap: var(--space-4);
|
||||
justify-items: stretch;
|
||||
padding: var(--space-2) 0 0;
|
||||
min-height: min(14rem, 32dvh);
|
||||
align-content: center;
|
||||
}
|
||||
|
||||
.wizardFinishShell {
|
||||
display: grid;
|
||||
gap: var(--space-4);
|
||||
width: min(100%, 40rem);
|
||||
padding: 0;
|
||||
border: 0;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.wizardFinishStatusRow {
|
||||
display: grid;
|
||||
grid-template-columns: auto minmax(0, 1fr);
|
||||
gap: var(--space-3);
|
||||
align-items: start;
|
||||
}
|
||||
|
||||
.wizardFinishIndicator {
|
||||
width: 2.5rem;
|
||||
height: 2.5rem;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-radius: 999px;
|
||||
border: 1px solid color-mix(in srgb, var(--bootstrap-accent) 18%, transparent);
|
||||
background: color-mix(in srgb, var(--bootstrap-accent) 8%, transparent);
|
||||
}
|
||||
|
||||
.wizardFinishIndicator[data-status="failed"] {
|
||||
border-color: color-mix(in srgb, var(--color-danger-border, var(--color-border)) 44%, transparent);
|
||||
background: color-mix(in srgb, var(--color-danger-surface, var(--color-surface-secondary)) 36%, transparent);
|
||||
}
|
||||
|
||||
.wizardFinishSpinner {
|
||||
width: 1.25rem;
|
||||
height: 1.25rem;
|
||||
border-radius: 999px;
|
||||
border: 2px solid color-mix(in srgb, var(--bootstrap-accent) 18%, transparent);
|
||||
border-top-color: var(--bootstrap-accent);
|
||||
animation: wizardFinishSpin 900ms linear infinite;
|
||||
}
|
||||
|
||||
.wizardFinishIndicator[data-status="failed"] .wizardFinishSpinner {
|
||||
border: 2px solid color-mix(in srgb, var(--color-danger-border, var(--color-border)) 22%, transparent);
|
||||
border-top-color: var(--color-danger-text, var(--color-text));
|
||||
animation: none;
|
||||
transform: rotate(45deg);
|
||||
border-radius: var(--radius-sm);
|
||||
width: 1rem;
|
||||
height: 1rem;
|
||||
}
|
||||
|
||||
.wizardFinishCopy {
|
||||
display: grid;
|
||||
gap: var(--space-1);
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.wizardFinishTitle {
|
||||
@include text-title;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.wizardFinishDescription,
|
||||
.wizardFinishMessage,
|
||||
.wizardFinishHint {
|
||||
margin: 0;
|
||||
color: var(--color-text-muted);
|
||||
}
|
||||
|
||||
.wizardFinishMessage[data-status="failed"] {
|
||||
color: var(--color-danger-text, var(--color-text));
|
||||
}
|
||||
|
||||
.wizardFinishHint {
|
||||
@include text-caption;
|
||||
}
|
||||
|
||||
.wizardFinishActions {
|
||||
display: flex;
|
||||
gap: var(--space-3);
|
||||
flex-wrap: wrap;
|
||||
padding-top: var(--space-1);
|
||||
}
|
||||
|
||||
@keyframes wizardFinishSpin {
|
||||
from {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
|
||||
to {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
@include respond-down(tablet) {
|
||||
.grid {
|
||||
.personaGrid {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.summaryGrid,
|
||||
.wizardBody {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.sectionHeader,
|
||||
.wizardHeader {
|
||||
display: grid;
|
||||
}
|
||||
}
|
||||
|
||||
@include respond-down(mobile) {
|
||||
@@ -155,4 +919,50 @@
|
||||
.workspaceTopBarCenter {
|
||||
justify-content: flex-start;
|
||||
}
|
||||
|
||||
.summaryGrid {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.wizardPanel {
|
||||
width: 100vw;
|
||||
max-height: 100dvh;
|
||||
margin: 0;
|
||||
padding: var(--space-3);
|
||||
padding-bottom: calc(var(--space-3) + env(safe-area-inset-bottom, 0px));
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
.wizardHeader,
|
||||
.wizardBody {
|
||||
gap: var(--space-3);
|
||||
}
|
||||
|
||||
.wizardProgressSteps {
|
||||
justify-content: flex-start;
|
||||
gap: var(--space-8);
|
||||
overflow-x: auto;
|
||||
padding-bottom: var(--space-1);
|
||||
scrollbar-width: thin;
|
||||
}
|
||||
|
||||
.wizardProgressStep {
|
||||
min-width: calc(var(--control-size-md) - var(--space-2));
|
||||
}
|
||||
|
||||
.wizardFormActions {
|
||||
gap: var(--space-2);
|
||||
flex-direction: column-reverse;
|
||||
align-items: stretch;
|
||||
}
|
||||
|
||||
.wizardFormActions .primaryButton {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
.wizardFormActions .primaryButton,
|
||||
.wizardFormActions .secondaryButton,
|
||||
.wizardCloseButton {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,285 @@
|
||||
import { For, Show, type JSX } from "solid-js";
|
||||
import { CircleHelp } from "../../../lib/icons";
|
||||
import {
|
||||
organizationalStructureDefaults,
|
||||
workspaceHomeFieldTooltips,
|
||||
type AdminForm,
|
||||
type BootstrapPersona,
|
||||
type BootstrapPersonaDefinition,
|
||||
type BootstrapStepDefinition,
|
||||
type BootstrapStepKey,
|
||||
type InstanceForm,
|
||||
type ModeForm,
|
||||
type StructureForm,
|
||||
} from "./WorkspaceHome.data";
|
||||
import styles from "./WorkspaceHome.module.scss";
|
||||
|
||||
type BootstrapSubmissionState = {
|
||||
status: "idle" | "submitting" | "success" | "error";
|
||||
error: string;
|
||||
};
|
||||
|
||||
type MaterializationState = "not_started" | "pending" | "running" | "succeeded" | "failed";
|
||||
|
||||
type TooltipHandlers = {
|
||||
onShowTooltip: (target: HTMLElement, text: string) => void;
|
||||
onHideTooltip: () => void;
|
||||
};
|
||||
|
||||
type FieldLabelWithTooltipProps = TooltipHandlers & {
|
||||
label: string;
|
||||
tooltip?: string;
|
||||
};
|
||||
|
||||
export const FieldLabelWithTooltip = (props: FieldLabelWithTooltipProps): JSX.Element => (
|
||||
<span class={styles.fieldLabelRow}>
|
||||
<span class={styles.fieldLabel}>{props.label}</span>
|
||||
<Show when={props.tooltip}>
|
||||
<button
|
||||
type="button"
|
||||
class={styles.fieldInfoButton}
|
||||
aria-label={`${props.label} help: ${props.tooltip}`}
|
||||
onMouseEnter={(event): void => props.onShowTooltip(event.currentTarget, props.tooltip!)}
|
||||
onMouseLeave={props.onHideTooltip}
|
||||
onFocus={(event): void => props.onShowTooltip(event.currentTarget, props.tooltip!)}
|
||||
onBlur={props.onHideTooltip}
|
||||
>
|
||||
<CircleHelp size={14} strokeWidth={2} />
|
||||
</button>
|
||||
</Show>
|
||||
</span>
|
||||
);
|
||||
|
||||
type BootstrapFinishingStateProps = {
|
||||
materializationState: MaterializationState;
|
||||
statusLabel: string;
|
||||
message: string;
|
||||
isInFlight: boolean;
|
||||
hasFailed: boolean;
|
||||
onClose: () => void;
|
||||
};
|
||||
|
||||
export const BootstrapFinishingState = (props: BootstrapFinishingStateProps): JSX.Element => (
|
||||
<div class={styles.wizardFinishPanel} data-slot="bootstrap-wizard-finishing-state">
|
||||
<div class={styles.wizardFinishShell}>
|
||||
<div class={styles.wizardFinishStatusRow}>
|
||||
<div class={styles.wizardFinishIndicator} data-status={props.materializationState} aria-hidden="true">
|
||||
<div class={styles.wizardFinishSpinner} />
|
||||
</div>
|
||||
<div class={styles.wizardFinishCopy}>
|
||||
<span class={styles.wizardStepEyebrow}>Bootstrap status</span>
|
||||
<h3 class={styles.wizardFinishTitle}>Finishing setup</h3>
|
||||
<p class={styles.wizardFinishDescription}>
|
||||
We saved your initial bootstrap. The server is finishing the last background setup steps now.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class={styles.statusBadge} data-status={props.materializationState}>{props.statusLabel}</div>
|
||||
<Show when={props.message}>
|
||||
<p class={styles.wizardFinishMessage} data-status={props.materializationState}>{props.message}</p>
|
||||
</Show>
|
||||
<Show when={props.isInFlight}>
|
||||
<p class={styles.wizardFinishHint}>This window will close automatically when setup is complete.</p>
|
||||
</Show>
|
||||
</div>
|
||||
<Show when={props.hasFailed}>
|
||||
<div class={styles.wizardFinishActions}>
|
||||
<button type="button" class={styles.secondaryButton} onClick={props.onClose}>Close</button>
|
||||
</div>
|
||||
</Show>
|
||||
</div>
|
||||
);
|
||||
|
||||
type BootstrapWizardProgressProps = {
|
||||
steps: readonly BootstrapStepDefinition[];
|
||||
currentStepId: BootstrapStepKey;
|
||||
currentWizardStepIndex: number;
|
||||
stepState: Record<BootstrapStepKey, BootstrapSubmissionState>;
|
||||
bootstrapStepCount: number;
|
||||
wizardProgressFillWidth: string;
|
||||
stepStatusLabel: (step: BootstrapStepDefinition) => string;
|
||||
onSelectStep: (index: number) => void;
|
||||
};
|
||||
|
||||
export const BootstrapWizardProgress = (props: BootstrapWizardProgressProps): JSX.Element => (
|
||||
<div class={styles.wizardProgress} data-slot="bootstrap-wizard-progress">
|
||||
<div class={styles.wizardProgressTrack} aria-hidden="true">
|
||||
<div class={styles.wizardProgressFill} style={{ width: props.wizardProgressFillWidth }} />
|
||||
</div>
|
||||
<nav class={styles.wizardProgressSteps} aria-label="Bootstrap steps" style={{ "--wizard-progress-step-count": props.bootstrapStepCount }}>
|
||||
<For each={props.steps}>
|
||||
{(step, index): JSX.Element => (
|
||||
<button
|
||||
type="button"
|
||||
class={styles.wizardProgressStep}
|
||||
data-active={step.id === props.currentStepId ? "true" : "false"}
|
||||
data-complete={props.stepState[step.id].status === "success" ? "true" : "false"}
|
||||
disabled={index() > props.currentWizardStepIndex}
|
||||
onClick={(): void => {
|
||||
if (index() <= props.currentWizardStepIndex) {
|
||||
props.onSelectStep(index());
|
||||
}
|
||||
}}
|
||||
aria-label={`Step ${index() + 1}${props.stepStatusLabel(step) ? `, ${props.stepStatusLabel(step)}` : ""}`}
|
||||
>
|
||||
<span class={styles.wizardProgressIndex}>{index() + 1}</span>
|
||||
</button>
|
||||
)}
|
||||
</For>
|
||||
</nav>
|
||||
</div>
|
||||
);
|
||||
|
||||
type BootstrapPersonaStepProps = {
|
||||
personas: readonly BootstrapPersonaDefinition[];
|
||||
hasChosenPersona: boolean;
|
||||
selectedPersona: BootstrapPersona;
|
||||
selectedPersonaIsAvailable: boolean;
|
||||
onSelectPersona: (persona: BootstrapPersona) => void;
|
||||
};
|
||||
|
||||
export const BootstrapPersonaStep = (props: BootstrapPersonaStepProps): JSX.Element => (
|
||||
<>
|
||||
<div class={styles.personaGrid}>
|
||||
<For each={props.personas}>
|
||||
{(persona): JSX.Element => (
|
||||
<button
|
||||
type="button"
|
||||
class={styles.personaCard}
|
||||
data-selected={props.hasChosenPersona && persona.id === props.selectedPersona ? "true" : "false"}
|
||||
data-available={persona.isAvailable ? "true" : "false"}
|
||||
aria-pressed={props.hasChosenPersona && persona.id === props.selectedPersona}
|
||||
onClick={(): void => props.onSelectPersona(persona.id)}
|
||||
>
|
||||
<div class={styles.personaCardMedia} aria-hidden="true" />
|
||||
<div class={styles.personaCardBody}>
|
||||
<h4 class={styles.personaCardTitle}>{persona.title}</h4>
|
||||
<div class={styles.personaCardDetails}>
|
||||
<p class={styles.personaBestFor}>{persona.bestFor}</p>
|
||||
<ul class={styles.personaBulletList}>
|
||||
<For each={persona.bullets}>{(bullet): JSX.Element => <li>{bullet}</li>}</For>
|
||||
</ul>
|
||||
<Show when={!persona.isAvailable}><p class={styles.personaAvailability}>Coming later</p></Show>
|
||||
</div>
|
||||
</div>
|
||||
</button>
|
||||
)}
|
||||
</For>
|
||||
</div>
|
||||
<Show when={!props.selectedPersonaIsAvailable}>
|
||||
<p class={styles.fieldHelp}>Only <strong>Self Hosted Enthusiast</strong> is wired up right now. The other setup paths will come next.</p>
|
||||
</Show>
|
||||
</>
|
||||
);
|
||||
|
||||
type BootstrapInstanceStepProps = TooltipHandlers & {
|
||||
instanceForm: InstanceForm;
|
||||
onProtocolChange: (value: InstanceForm["protocol"]) => void;
|
||||
onAccessChange: (value: InstanceForm["access"]) => void;
|
||||
onHostChange: (value: string) => void;
|
||||
};
|
||||
|
||||
export const BootstrapInstanceStep = (props: BootstrapInstanceStepProps): JSX.Element => (
|
||||
<>
|
||||
<label class={styles.field}>
|
||||
<FieldLabelWithTooltip label="Protocol" tooltip={workspaceHomeFieldTooltips.protocol} onShowTooltip={props.onShowTooltip} onHideTooltip={props.onHideTooltip} />
|
||||
<select value={props.instanceForm.protocol} onInput={(event): void => props.onProtocolChange(event.currentTarget.value as InstanceForm["protocol"])}>
|
||||
<option value="http">http</option>
|
||||
<option value="https">https</option>
|
||||
</select>
|
||||
</label>
|
||||
<label class={styles.field}>
|
||||
<FieldLabelWithTooltip label="Access" tooltip={workspaceHomeFieldTooltips.access} onShowTooltip={props.onShowTooltip} onHideTooltip={props.onHideTooltip} />
|
||||
<select value={props.instanceForm.access} onInput={(event): void => props.onAccessChange(event.currentTarget.value as InstanceForm["access"])}>
|
||||
<option value="local">local</option>
|
||||
<option value="remote">remote</option>
|
||||
</select>
|
||||
</label>
|
||||
<label class={styles.field}>
|
||||
<FieldLabelWithTooltip label="Host" tooltip={workspaceHomeFieldTooltips.host} onShowTooltip={props.onShowTooltip} onHideTooltip={props.onHideTooltip} />
|
||||
<input type="text" value={props.instanceForm.host} onInput={(event): void => props.onHostChange(event.currentTarget.value)} placeholder="localhost or app.example.com" />
|
||||
</label>
|
||||
</>
|
||||
);
|
||||
|
||||
type BootstrapModeStepProps = TooltipHandlers & {
|
||||
modeForm: ModeForm;
|
||||
structureForm: StructureForm;
|
||||
usesCondensedBootstrapFlow: boolean;
|
||||
selectedPersona: BootstrapPersona;
|
||||
namePlaceholder: string;
|
||||
onNameChange: (value: string) => void;
|
||||
onProjectNameChange: (value: string) => void;
|
||||
onTeamNameChange: (value: string) => void;
|
||||
};
|
||||
|
||||
export const BootstrapModeStep = (props: BootstrapModeStepProps): JSX.Element => (
|
||||
<>
|
||||
<label class={styles.field}>
|
||||
<FieldLabelWithTooltip label="Server name" tooltip={workspaceHomeFieldTooltips.serverName} onShowTooltip={props.onShowTooltip} onHideTooltip={props.onHideTooltip} />
|
||||
<input type="text" value={props.modeForm.name} required onInput={(event): void => props.onNameChange(event.currentTarget.value)} placeholder={props.namePlaceholder} />
|
||||
</label>
|
||||
<Show when={props.usesCondensedBootstrapFlow}>
|
||||
<label class={styles.field}>
|
||||
<FieldLabelWithTooltip label="Default Project" tooltip={workspaceHomeFieldTooltips.project} onShowTooltip={props.onShowTooltip} onHideTooltip={props.onHideTooltip} />
|
||||
<input type="text" value={props.structureForm.projectName} onInput={(event): void => props.onProjectNameChange(event.currentTarget.value)} placeholder="Project" />
|
||||
</label>
|
||||
</Show>
|
||||
<Show when={props.selectedPersona === "team"}>
|
||||
<label class={styles.field}>
|
||||
<FieldLabelWithTooltip label="Team name" tooltip={workspaceHomeFieldTooltips.team} onShowTooltip={props.onShowTooltip} onHideTooltip={props.onHideTooltip} />
|
||||
<input type="text" value={props.structureForm.teamName} onInput={(event): void => props.onTeamNameChange(event.currentTarget.value)} placeholder="Core Team" />
|
||||
</label>
|
||||
</Show>
|
||||
</>
|
||||
);
|
||||
|
||||
type BootstrapAdminStepProps = {
|
||||
adminForm: AdminForm;
|
||||
onDisplayNameChange: (value: string) => void;
|
||||
onEmailChange: (value: string) => void;
|
||||
onPasswordChange: (value: string) => void;
|
||||
};
|
||||
|
||||
export const BootstrapAdminStep = (props: BootstrapAdminStepProps): JSX.Element => (
|
||||
<>
|
||||
<label class={styles.field}>
|
||||
<span class={styles.fieldLabel}>Display name</span>
|
||||
<input type="text" value={props.adminForm.displayName} onInput={(event): void => props.onDisplayNameChange(event.currentTarget.value)} placeholder="Admin" />
|
||||
</label>
|
||||
<label class={styles.field}>
|
||||
<span class={styles.fieldLabel}>Email</span>
|
||||
<input type="email" value={props.adminForm.email} onInput={(event): void => props.onEmailChange(event.currentTarget.value)} placeholder="admin@example.com" />
|
||||
</label>
|
||||
<label class={styles.field}>
|
||||
<span class={styles.fieldLabel}>Password</span>
|
||||
<input type="password" value={props.adminForm.password} onInput={(event): void => props.onPasswordChange(event.currentTarget.value)} placeholder="Create a strong password" />
|
||||
<small class={styles.fieldHelp}>Use at least 12 characters with uppercase, lowercase, numbers, and symbols.</small>
|
||||
</label>
|
||||
</>
|
||||
);
|
||||
|
||||
type BootstrapStructureStepProps = TooltipHandlers & {
|
||||
mode: ModeForm["mode"];
|
||||
structureForm: StructureForm;
|
||||
onDepartmentNameChange: (value: string) => void;
|
||||
onTeamNameChange: (value: string) => void;
|
||||
onProjectNameChange: (value: string) => void;
|
||||
};
|
||||
|
||||
export const BootstrapStructureStep = (props: BootstrapStructureStepProps): JSX.Element => (
|
||||
<>
|
||||
<label class={styles.field}>
|
||||
<FieldLabelWithTooltip label="Department" tooltip={workspaceHomeFieldTooltips.department} onShowTooltip={props.onShowTooltip} onHideTooltip={props.onHideTooltip} />
|
||||
<input type="text" value={props.structureForm.departmentName} disabled={props.mode === "personal"} onInput={(event): void => props.onDepartmentNameChange(event.currentTarget.value)} placeholder={organizationalStructureDefaults.departmentName} />
|
||||
</label>
|
||||
<label class={styles.field}>
|
||||
<FieldLabelWithTooltip label="Team" tooltip={workspaceHomeFieldTooltips.team} onShowTooltip={props.onShowTooltip} onHideTooltip={props.onHideTooltip} />
|
||||
<input type="text" value={props.structureForm.teamName} disabled={props.mode === "personal"} onInput={(event): void => props.onTeamNameChange(event.currentTarget.value)} placeholder={organizationalStructureDefaults.teamName} />
|
||||
</label>
|
||||
<label class={styles.field}>
|
||||
<FieldLabelWithTooltip label="Project" tooltip={workspaceHomeFieldTooltips.project} onShowTooltip={props.onShowTooltip} onHideTooltip={props.onHideTooltip} />
|
||||
<input type="text" value={props.structureForm.projectName} onInput={(event): void => props.onProjectNameChange(event.currentTarget.value)} placeholder="Moku" />
|
||||
</label>
|
||||
</>
|
||||
);
|
||||
@@ -1,33 +1,13 @@
|
||||
// Path: Frontend/src/components/workspace-home/WorkspaceHome/WorkspaceHome.tsx
|
||||
|
||||
import { For, type JSX } from "solid-js";
|
||||
import { Show, createMemo, type JSX } from "solid-js";
|
||||
import { Portal } from "solid-js/web";
|
||||
import { ChevronLeft, ChevronRight } from "../../../lib/icons";
|
||||
import { activeProject, activeServer } from "../../shell/data/shell.data";
|
||||
import { useAppShellData } from "../../shell/data/app-shell.context";
|
||||
import { bootstrapPersonaDefinitions } from "./WorkspaceHome.data";
|
||||
import { useWorkspaceHomeWizard } from "./WorkspaceHome.hook";
|
||||
import styles from "./WorkspaceHome.module.scss";
|
||||
|
||||
type ShellCheckpointCard = {
|
||||
title: string;
|
||||
copy: string;
|
||||
meta: string;
|
||||
};
|
||||
|
||||
const shellCheckpointCards: readonly ShellCheckpointCard[] = [
|
||||
{
|
||||
title: "Server shell",
|
||||
copy: "Top bar, server rail, sidebar, and content viewport are now split into modular components.",
|
||||
meta: "Layout foundation",
|
||||
},
|
||||
{
|
||||
title: "Presence foundation",
|
||||
copy: "The dock now distinguishes personal and organization servers, leaving clear space for future presence and server-aware controls.",
|
||||
meta: "Server foundation",
|
||||
},
|
||||
{
|
||||
title: "Next build target",
|
||||
copy: "You can now plug in auth state, server onboarding, and live presence without redesigning the whole frame.",
|
||||
meta: "Ready for v0.1.0 work",
|
||||
},
|
||||
];
|
||||
import { BootstrapAdminStep, BootstrapFinishingState, BootstrapInstanceStep, BootstrapModeStep, BootstrapPersonaStep, BootstrapStructureStep, BootstrapWizardProgress } from "./WorkspaceHome.parts";
|
||||
|
||||
type WorkspaceHomeProps = {
|
||||
sidebarCollapsed: boolean;
|
||||
@@ -35,50 +15,257 @@ type WorkspaceHomeProps = {
|
||||
};
|
||||
|
||||
export const WorkspaceHome = (props: WorkspaceHomeProps): JSX.Element => {
|
||||
const appShellData = useAppShellData();
|
||||
const {
|
||||
instanceForm,
|
||||
setInstanceForm,
|
||||
modeForm,
|
||||
setModeForm,
|
||||
adminForm,
|
||||
setAdminForm,
|
||||
structureForm,
|
||||
setStructureForm,
|
||||
selectedPersona,
|
||||
hasChosenPersona,
|
||||
stepState,
|
||||
isBootstrapStateResolved,
|
||||
isWizardOpen,
|
||||
setIsWizardOpen,
|
||||
setIsFinishingBootstrapFlow,
|
||||
fieldTooltip,
|
||||
materializationState,
|
||||
isMaterializationInFlight,
|
||||
hasMaterializationFailed,
|
||||
showBootstrapFinishingState,
|
||||
materializationStatusLabel,
|
||||
materializationMessage,
|
||||
personaDefinition,
|
||||
selectedPersonaIsAvailable,
|
||||
usesCondensedBootstrapFlow,
|
||||
activeWizardSteps,
|
||||
bootstrapNamePlaceholder,
|
||||
bootstrapStepCount,
|
||||
currentStep,
|
||||
currentWizardStepIndex,
|
||||
wizardProgressFillWidth,
|
||||
currentStepState,
|
||||
isFirstStep,
|
||||
canDismissWizard,
|
||||
handleCurrentStepSubmit,
|
||||
applyPersonaSelection,
|
||||
statusLabel,
|
||||
showFieldTooltip,
|
||||
hideFieldTooltip,
|
||||
stepStatusLabel,
|
||||
navigateBack,
|
||||
navigateToVisibleStep,
|
||||
} = useWorkspaceHomeWizard(appShellData);
|
||||
const isBootstrapPersisted = createMemo(() => appShellData.installation()?.isBootstrapped ?? false);
|
||||
|
||||
const sidebarToggleLabel = (): string => (props.sidebarCollapsed ? "Expand left workspace sidebar" : "Collapse left workspace sidebar");
|
||||
const breadcrumb = (): string => `${activeServer.name} / ${activeProject.name} / Home`;
|
||||
const breadcrumb = (): string => `${appShellData.activeServer().name} / ${appShellData.activeProject().name} / Home`;
|
||||
|
||||
return (
|
||||
<main class={styles.viewport}>
|
||||
<div class={styles.workspaceTopBar}>
|
||||
<div class={styles.workspaceTopBarStart}>
|
||||
<button
|
||||
type="button"
|
||||
class={styles.workspaceCollapseButton}
|
||||
aria-label={sidebarToggleLabel()}
|
||||
title={sidebarToggleLabel()}
|
||||
onClick={props.onToggleSidebarCollapse}
|
||||
>
|
||||
{props.sidebarCollapsed ? <ChevronRight size={16} strokeWidth={2} /> : <ChevronLeft size={16} strokeWidth={2} />}
|
||||
</button>
|
||||
<>
|
||||
<main class={styles.viewport} data-ui="workspace-home">
|
||||
<div class={styles.workspaceTopBar} data-slot="workspace-home-top-bar">
|
||||
<div class={styles.workspaceTopBarStart} data-slot="workspace-home-top-bar-start">
|
||||
<button type="button" class={styles.workspaceCollapseButton} aria-label={sidebarToggleLabel()} title={sidebarToggleLabel()} data-slot="workspace-home-sidebar-toggle" onClick={props.onToggleSidebarCollapse}>
|
||||
{props.sidebarCollapsed ? <ChevronRight size={16} strokeWidth={2} /> : <ChevronLeft size={16} strokeWidth={2} />}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class={styles.workspaceTopBarCenter} data-slot="workspace-home-top-bar-center">
|
||||
<span class={styles.workspaceBreadcrumb}>{breadcrumb()}</span>
|
||||
</div>
|
||||
|
||||
<div class={styles.workspaceTopBarEnd} data-slot="workspace-home-top-bar-end" aria-hidden="true" />
|
||||
</div>
|
||||
|
||||
<div class={styles.workspaceTopBarCenter}>
|
||||
<span class={styles.workspaceBreadcrumb}>{breadcrumb()}</span>
|
||||
</div>
|
||||
<section class={styles.hero} data-slot="workspace-home-hero">
|
||||
<h1 class={styles.title}>{isBootstrapPersisted() ? appShellData.activeServer().name : "Server"}</h1>
|
||||
<Show when={isBootstrapStateResolved() && !isBootstrapPersisted()}>
|
||||
<div class={styles.heroActions}>
|
||||
<button
|
||||
type="button"
|
||||
class={styles.primaryButton}
|
||||
onClick={(): void => {
|
||||
setIsWizardOpen(true);
|
||||
}}
|
||||
>
|
||||
Open bootstrap wizard
|
||||
</button>
|
||||
</div>
|
||||
</Show>
|
||||
</section>
|
||||
</main>
|
||||
|
||||
<div class={styles.workspaceTopBarEnd} aria-hidden="true" />
|
||||
</div>
|
||||
<Show when={isBootstrapStateResolved() && isWizardOpen()}>
|
||||
<Portal>
|
||||
<div class={styles.wizardLayer} data-ui="bootstrap-wizard" data-step={currentStep().id}>
|
||||
<div class={styles.wizardBackdrop} aria-hidden="true" />
|
||||
|
||||
<section class={styles.hero}>
|
||||
<span class={styles.eyebrow}>Server home</span>
|
||||
<h1 class={styles.title}>{activeServer.name} is ready for its first real shell.</h1>
|
||||
<p class={styles.description}>
|
||||
This is the barebone app frame for v0.1.0 — enough structure to start building a real self-hosted server experience on top of the backend core.
|
||||
</p>
|
||||
</section>
|
||||
<section class={styles.wizardPanel} role="dialog" aria-modal="true" aria-labelledby="bootstrap-wizard-title" data-slot="bootstrap-wizard-panel">
|
||||
<header class={styles.wizardHeader} data-slot="bootstrap-wizard-header">
|
||||
<div class={styles.wizardHeaderCopy}>
|
||||
<h2 id="bootstrap-wizard-title" class={styles.wizardTitle}>
|
||||
Bootstrap Server
|
||||
</h2>
|
||||
</div>
|
||||
<Show when={canDismissWizard()}>
|
||||
<button
|
||||
type="button"
|
||||
class={styles.wizardCloseButton}
|
||||
onClick={(): void => {
|
||||
setIsWizardOpen(false);
|
||||
}}
|
||||
>
|
||||
Close
|
||||
</button>
|
||||
</Show>
|
||||
</header>
|
||||
|
||||
<section class={styles.grid} aria-label="Shell checkpoints">
|
||||
<For each={shellCheckpointCards}>
|
||||
{(card): JSX.Element => (
|
||||
<article class={styles.card}>
|
||||
<h2 class={styles.cardTitle}>{card.title}</h2>
|
||||
<p class={styles.cardCopy}>{card.copy}</p>
|
||||
<span class={styles.cardMeta}>{card.meta}</span>
|
||||
</article>
|
||||
)}
|
||||
</For>
|
||||
</section>
|
||||
</main>
|
||||
<Show
|
||||
when={!showBootstrapFinishingState()}
|
||||
fallback={
|
||||
<BootstrapFinishingState
|
||||
materializationState={materializationState()}
|
||||
statusLabel={materializationStatusLabel()}
|
||||
message={materializationMessage()}
|
||||
isInFlight={isMaterializationInFlight()}
|
||||
hasFailed={hasMaterializationFailed()}
|
||||
onClose={(): void => {
|
||||
setIsFinishingBootstrapFlow(false);
|
||||
setIsWizardOpen(false);
|
||||
}}
|
||||
/>
|
||||
}
|
||||
>
|
||||
<div class={styles.wizardBody}>
|
||||
<Show when={currentStep().id !== "persona"}>
|
||||
<BootstrapWizardProgress
|
||||
steps={activeWizardSteps()}
|
||||
currentStepId={currentStep().id}
|
||||
currentWizardStepIndex={currentWizardStepIndex()}
|
||||
stepState={stepState}
|
||||
bootstrapStepCount={bootstrapStepCount()}
|
||||
wizardProgressFillWidth={wizardProgressFillWidth()}
|
||||
stepStatusLabel={stepStatusLabel}
|
||||
onSelectStep={navigateToVisibleStep}
|
||||
/>
|
||||
</Show>
|
||||
|
||||
<div class={styles.wizardStepPanel} data-slot="bootstrap-wizard-step-panel">
|
||||
<Show when={currentStep().id !== "persona" || statusLabel(currentStepState())}>
|
||||
<div class={styles.sectionHeader}>
|
||||
<Show when={currentStep().id !== "persona"}>
|
||||
<div>
|
||||
<span class={styles.wizardStepEyebrow}>{`Step ${currentWizardStepIndex() + 1} of ${bootstrapStepCount()}`}</span>
|
||||
</div>
|
||||
</Show>
|
||||
<Show when={statusLabel(currentStepState())}>
|
||||
<div class={styles.statusBadge} data-status={currentStepState().status}>
|
||||
{statusLabel(currentStepState())}
|
||||
</div>
|
||||
</Show>
|
||||
</div>
|
||||
</Show>
|
||||
|
||||
<form class={styles.form} onSubmit={handleCurrentStepSubmit}>
|
||||
<Show when={currentStep().id === "persona"}>
|
||||
<BootstrapPersonaStep
|
||||
personas={bootstrapPersonaDefinitions}
|
||||
hasChosenPersona={hasChosenPersona()}
|
||||
selectedPersona={selectedPersona()}
|
||||
selectedPersonaIsAvailable={selectedPersonaIsAvailable()}
|
||||
onSelectPersona={applyPersonaSelection}
|
||||
/>
|
||||
</Show>
|
||||
|
||||
<Show when={currentStep().id === "instance"}>
|
||||
<BootstrapInstanceStep
|
||||
instanceForm={instanceForm}
|
||||
onProtocolChange={(value): void => setInstanceForm("protocol", value)}
|
||||
onAccessChange={(value): void => setInstanceForm("access", value)}
|
||||
onHostChange={(value): void => setInstanceForm("host", value)}
|
||||
onShowTooltip={showFieldTooltip}
|
||||
onHideTooltip={hideFieldTooltip}
|
||||
/>
|
||||
</Show>
|
||||
|
||||
<Show when={currentStep().id === "mode"}>
|
||||
<BootstrapModeStep
|
||||
modeForm={modeForm}
|
||||
structureForm={structureForm}
|
||||
usesCondensedBootstrapFlow={usesCondensedBootstrapFlow()}
|
||||
selectedPersona={selectedPersona()}
|
||||
namePlaceholder={bootstrapNamePlaceholder()}
|
||||
onNameChange={(value): void => setModeForm("name", value)}
|
||||
onProjectNameChange={(value): void => setStructureForm("projectName", value)}
|
||||
onTeamNameChange={(value): void => setStructureForm("teamName", value)}
|
||||
onShowTooltip={showFieldTooltip}
|
||||
onHideTooltip={hideFieldTooltip}
|
||||
/>
|
||||
</Show>
|
||||
|
||||
<Show when={currentStep().id === "admin"}>
|
||||
<BootstrapAdminStep
|
||||
adminForm={adminForm}
|
||||
onDisplayNameChange={(value): void => setAdminForm("displayName", value)}
|
||||
onEmailChange={(value): void => setAdminForm("email", value)}
|
||||
onPasswordChange={(value): void => setAdminForm("password", value)}
|
||||
/>
|
||||
</Show>
|
||||
|
||||
<Show when={currentStep().id === "structure"}>
|
||||
<BootstrapStructureStep
|
||||
mode={modeForm.mode}
|
||||
structureForm={structureForm}
|
||||
onDepartmentNameChange={(value): void => setStructureForm("departmentName", value)}
|
||||
onTeamNameChange={(value): void => setStructureForm("teamName", value)}
|
||||
onProjectNameChange={(value): void => setStructureForm("projectName", value)}
|
||||
onShowTooltip={showFieldTooltip}
|
||||
onHideTooltip={hideFieldTooltip}
|
||||
/>
|
||||
</Show>
|
||||
|
||||
<Show when={currentStep().id !== "persona"}>
|
||||
<div class={styles.wizardFormActions}>
|
||||
<button type="button" class={styles.secondaryButton} disabled={isFirstStep()} onClick={navigateBack}>
|
||||
Back
|
||||
</button>
|
||||
<button type="submit" class={styles.primaryButton} disabled={currentStepState().status === "submitting"}>
|
||||
{currentStep().buttonLabel}
|
||||
</button>
|
||||
</div>
|
||||
</Show>
|
||||
</form>
|
||||
|
||||
<Show when={currentStepState().error}>
|
||||
<p class={styles.errorText}>{currentStepState().error}</p>
|
||||
</Show>
|
||||
</div>
|
||||
</div>
|
||||
</Show>
|
||||
</section>
|
||||
|
||||
<Show when={fieldTooltip()}>
|
||||
{(tooltip): JSX.Element => (
|
||||
<div
|
||||
class={styles.fieldTooltip}
|
||||
data-placement={tooltip().placement}
|
||||
style={{
|
||||
left: `${tooltip().left}px`,
|
||||
top: `${tooltip().top}px`,
|
||||
}}
|
||||
>
|
||||
<div class={styles.fieldTooltipBubble}>{tooltip().text}</div>
|
||||
</div>
|
||||
)}
|
||||
</Show>
|
||||
</div>
|
||||
</Portal>
|
||||
</Show>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
Vendored
+8
@@ -1,3 +1,11 @@
|
||||
// Path: Frontend/src/global.d.ts
|
||||
|
||||
/// <reference types="@solidjs/start/env" />
|
||||
|
||||
interface ImportMetaEnv {
|
||||
readonly VITE_API_BASE_URL?: string;
|
||||
}
|
||||
|
||||
interface ImportMeta {
|
||||
readonly env: ImportMetaEnv;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
// Path: Frontend/src/lib/api.ts
|
||||
|
||||
export const resolveAPIBase = (): string => {
|
||||
const configuredBase = import.meta.env.VITE_API_BASE_URL?.trim();
|
||||
|
||||
if (!configuredBase) {
|
||||
return "/v1";
|
||||
}
|
||||
|
||||
return configuredBase.replace(/\/$/, "");
|
||||
};
|
||||
@@ -10,6 +10,7 @@ export { default as Folder } from "lucide-solid/icons/folder";
|
||||
export { default as Home } from "lucide-solid/icons/house";
|
||||
export { default as Keyboard } from "lucide-solid/icons/keyboard";
|
||||
export { default as LayoutGrid } from "lucide-solid/icons/layout-grid";
|
||||
export { default as ListCollapse } from "lucide-solid/icons/list-collapse";
|
||||
export { default as LogOut } from "lucide-solid/icons/log-out";
|
||||
export { default as Moon } from "lucide-solid/icons/moon";
|
||||
export { default as Plus } from "lucide-solid/icons/plus";
|
||||
@@ -18,5 +19,6 @@ export { default as Search } from "lucide-solid/icons/search";
|
||||
export { default as Settings } from "lucide-solid/icons/settings";
|
||||
export { default as Shield } from "lucide-solid/icons/shield";
|
||||
export { default as Sun } from "lucide-solid/icons/sun";
|
||||
export { default as UnfoldVertical } from "lucide-solid/icons/unfold-vertical";
|
||||
export { default as User } from "lucide-solid/icons/user";
|
||||
export { default as X } from "lucide-solid/icons/x";
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
/* Path: Frontend/src/styles/user-overrides.scss */
|
||||
|
||||
/*
|
||||
Optional global frontend override seam.
|
||||
|
||||
This file is imported after the core app styles so user or deployment-specific
|
||||
overrides can layer on top without reshaping component code first.
|
||||
|
||||
Examples for later:
|
||||
- import a tenant branding bundle
|
||||
- apply a self-hosted custom theme
|
||||
- override shared shell spacing or color tokens
|
||||
- target stable `data-ui`, `data-slot`, or state attributes added in the app shell
|
||||
|
||||
You can either place raw overrides here directly or layer another stylesheet:
|
||||
|
||||
@use "./my-brand" as *;
|
||||
*/
|
||||
|
||||
/*
|
||||
Stable override hooks are intentionally exposed with global data attributes so
|
||||
manual overrides do not depend on CSS module hash names.
|
||||
|
||||
Examples:
|
||||
|
||||
[data-ui="top-bar"] {
|
||||
backdrop-filter: blur(24px);
|
||||
}
|
||||
|
||||
[data-ui="workspace-sidebar"] [data-slot="workspace-tree-item"][data-kind="item"] {
|
||||
border-radius: 12px;
|
||||
}
|
||||
|
||||
[data-ui="workspace-context-menu"] [data-action-id="delete"] {
|
||||
letter-spacing: 0.01em;
|
||||
}
|
||||
|
||||
[data-ui="notifications-menu"][data-variant="workspace"] {
|
||||
max-width: none;
|
||||
}
|
||||
*/
|
||||
@@ -9,10 +9,22 @@ const extraAllowedHosts = (process.env.ALLOWED_HOSTS ?? "")
|
||||
.map((host) => host.trim())
|
||||
.filter(Boolean);
|
||||
|
||||
const backendAPIport = process.env.BACKEND_API_PORT?.trim() || "8081";
|
||||
const devAPIProxyTarget =
|
||||
process.env.FRONTEND_API_PROXY_TARGET?.trim() ||
|
||||
process.env.VITE_DEV_PROXY_TARGET?.trim() ||
|
||||
`http://api:${backendAPIport}`;
|
||||
|
||||
export default defineConfig({
|
||||
plugins: [solidStart({ ssr: false })],
|
||||
server: {
|
||||
allowedHosts: ["localhost", ...extraAllowedHosts],
|
||||
proxy: {
|
||||
"/v1": {
|
||||
target: devAPIProxyTarget,
|
||||
changeOrigin: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
preview: {
|
||||
allowedHosts: ["localhost", ...extraAllowedHosts],
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
set shell := ["bash", "-cu"]
|
||||
|
||||
mod local "Commands/Local"
|
||||
mod test "Commands/Test"
|
||||
|
||||
[default]
|
||||
help:
|
||||
|
||||
@@ -25,6 +25,15 @@ server {
|
||||
try_files $uri $uri/ $moku_bootstrap_document;
|
||||
}
|
||||
|
||||
location ^~ /v1/ {
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_pass http://api:8081;
|
||||
}
|
||||
|
||||
location /favicon.ico {
|
||||
try_files $uri =404;
|
||||
access_log off;
|
||||
|
||||
Reference in New Issue
Block a user