Compare commits
6 Commits
be6e34914e
...
frontendau
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1d610f0d2b | ||
|
|
fbfaf7bb9f | ||
|
|
2f0aeb948b | ||
|
|
0ad62cbf8d | ||
|
|
5a80f33078 | ||
|
|
57f27d28cd |
@@ -7,7 +7,7 @@ Use this checklist to ensure proper implementation of the field type system in y
|
||||
### Database
|
||||
- [ ] Run migration: `npm run migrate:tenant` to add `ui_metadata` column
|
||||
- [ ] Verify migration succeeded: Check `field_definitions` table has `ui_metadata` column
|
||||
- [ ] (Optional) Run seed: `knex seed:run --specific=example_account_fields_with_ui_metadata.js`
|
||||
- [ ] (Optional) Run seed: `knex seed:run --specific=example_contact_fields_with_ui_metadata.js`
|
||||
- [ ] Test database access with sample queries
|
||||
|
||||
### Services
|
||||
|
||||
@@ -1,302 +0,0 @@
|
||||
# Tenant Migration Guide
|
||||
|
||||
## Quick Start
|
||||
|
||||
### Create a New Migration
|
||||
```bash
|
||||
cd backend
|
||||
npm run migrate:make add_your_feature_name
|
||||
```
|
||||
|
||||
Edit the generated file in `backend/migrations/tenant/`
|
||||
|
||||
### Test on Single Tenant
|
||||
```bash
|
||||
npm run migrate:tenant acme-corp
|
||||
```
|
||||
|
||||
### Apply to All Tenants
|
||||
```bash
|
||||
npm run migrate:all-tenants
|
||||
```
|
||||
|
||||
## Available Commands
|
||||
|
||||
| Command | Description |
|
||||
|---------|-------------|
|
||||
| `npm run migrate:make <name>` | Create a new migration file |
|
||||
| `npm run migrate:tenant <slug>` | Run migrations for a specific tenant |
|
||||
| `npm run migrate:all-tenants` | Run migrations for all active tenants |
|
||||
| `npm run migrate:latest` | Run migrations (default DB - rarely used) |
|
||||
| `npm run migrate:rollback` | Rollback last migration (default DB) |
|
||||
|
||||
## Architecture
|
||||
|
||||
### Multi-Tenant Database Structure
|
||||
|
||||
```
|
||||
┌─────────────────────────┐
|
||||
│ Central Database │
|
||||
│ │
|
||||
│ - tenants table │
|
||||
│ - users table │
|
||||
│ - (encrypted creds) │
|
||||
└─────────────────────────┘
|
||||
│
|
||||
│ manages
|
||||
│
|
||||
┌───────┴────────┐
|
||||
│ │
|
||||
┌───▼────┐ ┌───▼────┐
|
||||
│ Tenant │ │ Tenant │
|
||||
│ DB1 │ ... │ DBN │
|
||||
│ │ │ │
|
||||
│ - users│ │ - users│
|
||||
│ - roles│ │ - roles│
|
||||
│ - apps │ │ - apps │
|
||||
│ - ... │ │ - ... │
|
||||
└────────┘ └────────┘
|
||||
```
|
||||
|
||||
### How Migrations Work
|
||||
|
||||
1. **New Tenant Provisioning** (Automatic)
|
||||
- User creates tenant via API
|
||||
- `TenantProvisioningService.provisionTenant()` is called
|
||||
- Database is created
|
||||
- All migrations in `migrations/tenant/` are automatically run
|
||||
- Tenant status set to ACTIVE
|
||||
|
||||
2. **Existing Tenants** (Manual)
|
||||
- Developer creates new migration file
|
||||
- Tests on single tenant: `npm run migrate:tenant test-tenant`
|
||||
- Applies to all: `npm run migrate:all-tenants`
|
||||
- Each tenant database is updated independently
|
||||
|
||||
### Migration Scripts
|
||||
|
||||
#### `migrate-tenant.ts`
|
||||
- Accepts tenant slug or ID as argument
|
||||
- Fetches tenant from central database
|
||||
- Decrypts database password
|
||||
- Creates Knex connection to tenant DB
|
||||
- Runs pending migrations
|
||||
- Reports success/failure
|
||||
|
||||
#### `migrate-all-tenants.ts`
|
||||
- Fetches all ACTIVE tenants from central DB
|
||||
- Iterates through each tenant
|
||||
- Runs migrations sequentially
|
||||
- Collects success/failure results
|
||||
- Provides comprehensive summary
|
||||
- Exits with error if any tenant fails
|
||||
|
||||
## Security
|
||||
|
||||
### Password Encryption
|
||||
|
||||
Tenant database passwords are encrypted using **AES-256-CBC** and stored in the central database.
|
||||
|
||||
**Required Environment Variable:**
|
||||
```bash
|
||||
DB_ENCRYPTION_KEY=your-32-character-secret-key!!
|
||||
```
|
||||
|
||||
This key must:
|
||||
- Be exactly 32 characters (256 bits)
|
||||
- Match the key used by backend services
|
||||
- Be kept secure (never commit to git)
|
||||
- Be the same across all environments accessing tenant DBs
|
||||
|
||||
### Encryption Flow
|
||||
|
||||
```
|
||||
Tenant Creation:
|
||||
Plain Password → Encrypt → Store in Central DB
|
||||
|
||||
Migration Time:
|
||||
Encrypted Password → Decrypt → Connect to Tenant DB → Run Migrations
|
||||
```
|
||||
|
||||
## Example Workflow
|
||||
|
||||
### Adding a New Field to All Tenants
|
||||
|
||||
```bash
|
||||
# 1. Create migration
|
||||
cd backend
|
||||
npm run migrate:make add_priority_to_tasks
|
||||
|
||||
# 2. Edit the migration file
|
||||
# migrations/tenant/20250127120000_add_priority_to_tasks.js
|
||||
|
||||
# 3. Test on staging tenant
|
||||
npm run migrate:tenant staging-company
|
||||
|
||||
# 4. Verify it worked
|
||||
# Connect to staging DB and check schema
|
||||
|
||||
# 5. Apply to all tenants
|
||||
npm run migrate:all-tenants
|
||||
```
|
||||
|
||||
Expected output:
|
||||
```
|
||||
🚀 Starting migration for all tenants...
|
||||
|
||||
📋 Found 5 active tenant(s)
|
||||
|
||||
🔄 Migrating tenant: Acme Corp (acme_corp_db)
|
||||
✅ Acme Corp: Ran 1 migrations:
|
||||
- 20250127120000_add_priority_to_tasks.js
|
||||
|
||||
🔄 Migrating tenant: TechStart (techstart_db)
|
||||
✅ TechStart: Ran 1 migrations:
|
||||
- 20250127120000_add_priority_to_tasks.js
|
||||
|
||||
...
|
||||
|
||||
============================================================
|
||||
📊 Migration Summary
|
||||
============================================================
|
||||
✅ Successful: 5
|
||||
❌ Failed: 0
|
||||
|
||||
🎉 All tenant migrations completed successfully!
|
||||
```
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### Error: "Cannot find module '../prisma/generated-central/client'"
|
||||
|
||||
**Solution:** Generate Prisma client
|
||||
```bash
|
||||
cd backend
|
||||
npx prisma generate --schema=prisma/schema-central.prisma
|
||||
```
|
||||
|
||||
### Error: "Invalid encrypted password format"
|
||||
|
||||
**Solution:** Check `DB_ENCRYPTION_KEY` environment variable matches the one used for encryption.
|
||||
|
||||
### Error: "Migration failed: Table already exists"
|
||||
|
||||
**Cause:** Migration was partially applied or run manually
|
||||
|
||||
**Solution:**
|
||||
```bash
|
||||
# Check migration status in tenant DB
|
||||
mysql -h <host> -u <user> -p<pass> <dbname> -e "SELECT * FROM knex_migrations"
|
||||
|
||||
# If migration is listed, it's already applied
|
||||
# If not, investigate why table exists and fix manually
|
||||
```
|
||||
|
||||
### Migration Hangs
|
||||
|
||||
**Possible causes:**
|
||||
- Network connection to database lost
|
||||
- Database server down
|
||||
- Migration has long-running query
|
||||
|
||||
**Solution:** Add timeout to migration and check database connectivity
|
||||
|
||||
## Best Practices
|
||||
|
||||
1. ✅ **Test first**: Always test migrations on a single tenant before applying to all
|
||||
2. ✅ **Rollback ready**: Write `down()` functions for every migration
|
||||
3. ✅ **Idempotent**: Use `IF NOT EXISTS` clauses where possible
|
||||
4. ✅ **Backup**: Take database backups before major migrations
|
||||
5. ✅ **Monitor**: Watch the output of `migrate:all-tenants` carefully
|
||||
6. ✅ **Version control**: Commit migration files to git
|
||||
7. ✅ **Document**: Add comments explaining complex migrations
|
||||
|
||||
8. ❌ **Don't skip testing**: Never run untested migrations on production
|
||||
9. ❌ **Don't modify**: Never modify existing migration files after they're deployed
|
||||
10. ❌ **Don't forget down()**: Always implement rollback logic
|
||||
|
||||
## Integration with TenantProvisioningService
|
||||
|
||||
The migrations are also used during tenant provisioning:
|
||||
|
||||
```typescript
|
||||
// src/tenant/tenant-provisioning.service.ts
|
||||
|
||||
async provisionTenant(tenantId: string): Promise<void> {
|
||||
// ... create database ...
|
||||
|
||||
// Run migrations automatically
|
||||
await this.runTenantMigrations(tenant);
|
||||
|
||||
// ... update tenant status ...
|
||||
}
|
||||
|
||||
async runTenantMigrations(tenant: any): Promise<void> {
|
||||
const knexConfig = {
|
||||
client: 'mysql2',
|
||||
connection: {
|
||||
host: tenant.dbHost,
|
||||
port: tenant.dbPort,
|
||||
user: tenant.dbUser,
|
||||
password: decryptedPassword,
|
||||
database: tenant.dbName,
|
||||
},
|
||||
migrations: {
|
||||
directory: './migrations/tenant',
|
||||
},
|
||||
};
|
||||
|
||||
const knexInstance = knex(knexConfig);
|
||||
await knexInstance.migrate.latest();
|
||||
await knexInstance.destroy();
|
||||
}
|
||||
```
|
||||
|
||||
This ensures every new tenant starts with the complete schema.
|
||||
|
||||
## CI/CD Integration
|
||||
|
||||
### Docker Compose
|
||||
```yaml
|
||||
services:
|
||||
backend:
|
||||
image: your-backend:latest
|
||||
command: sh -c "npm run migrate:all-tenants && npm run start:prod"
|
||||
environment:
|
||||
- DB_ENCRYPTION_KEY=${DB_ENCRYPTION_KEY}
|
||||
```
|
||||
|
||||
### Kubernetes Job
|
||||
```yaml
|
||||
apiVersion: batch/v1
|
||||
kind: Job
|
||||
metadata:
|
||||
name: tenant-migrations
|
||||
spec:
|
||||
template:
|
||||
spec:
|
||||
containers:
|
||||
- name: migrate
|
||||
image: your-backend:latest
|
||||
command: ["npm", "run", "migrate:all-tenants"]
|
||||
env:
|
||||
- name: DB_ENCRYPTION_KEY
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: db-secrets
|
||||
key: encryption-key
|
||||
restartPolicy: OnFailure
|
||||
```
|
||||
|
||||
## Further Documentation
|
||||
|
||||
- [Backend Scripts README](backend/scripts/README.md) - Detailed script documentation
|
||||
- [Multi-Tenant Implementation](MULTI_TENANT_IMPLEMENTATION.md) - Architecture overview
|
||||
- [Multi-Tenant Migration](MULTI_TENANT_MIGRATION.md) - Migration strategy
|
||||
|
||||
## Support
|
||||
|
||||
For questions or issues:
|
||||
1. Check the [Backend Scripts README](backend/scripts/README.md)
|
||||
2. Review existing migration files in `backend/migrations/tenant/`
|
||||
3. Check Knex documentation: https://knexjs.org/guide/migrations.html
|
||||
@@ -1,374 +0,0 @@
|
||||
# Tenant Migration Implementation - Complete
|
||||
|
||||
## ✅ Implementation Summary
|
||||
|
||||
All tenant migration functionality has been successfully added to the backend. This implementation provides comprehensive tools for managing database schema changes across all tenants in the multi-tenant platform.
|
||||
|
||||
## 📁 Files Created
|
||||
|
||||
### Scripts Directory: `/root/neo/backend/scripts/`
|
||||
|
||||
1. **`migrate-tenant.ts`** (167 lines)
|
||||
- Migrates a single tenant by slug or ID
|
||||
- Handles password decryption
|
||||
- Provides detailed progress output
|
||||
- Usage: `npm run migrate:tenant <slug-or-id>`
|
||||
|
||||
2. **`migrate-all-tenants.ts`** (170 lines)
|
||||
- Migrates all active tenants in sequence
|
||||
- Collects success/failure statistics
|
||||
- Provides comprehensive summary
|
||||
- Exits with error code if any tenant fails
|
||||
- Usage: `npm run migrate:all-tenants`
|
||||
|
||||
3. **`check-migration-status.ts`** (181 lines)
|
||||
- Checks migration status across all tenants
|
||||
- Shows completed and pending migrations
|
||||
- Identifies which tenants need updates
|
||||
- Usage: `npm run migrate:status`
|
||||
|
||||
4. **`README.md`** (Comprehensive documentation)
|
||||
- Detailed usage instructions
|
||||
- Security notes on password encryption
|
||||
- Troubleshooting guide
|
||||
- Best practices
|
||||
- Example workflows
|
||||
|
||||
### Documentation Files
|
||||
|
||||
5. **`/root/neo/TENANT_MIGRATION_GUIDE.md`** (Root level guide)
|
||||
- Quick start guide
|
||||
- Architecture diagrams
|
||||
- Complete workflow examples
|
||||
- CI/CD integration examples
|
||||
- Security documentation
|
||||
|
||||
### Updated Files
|
||||
|
||||
6. **`/root/neo/backend/package.json`**
|
||||
- Added 6 new migration scripts to the `scripts` section
|
||||
|
||||
## 🚀 Available Commands
|
||||
|
||||
| Command | Description |
|
||||
|---------|-------------|
|
||||
| `npm run migrate:make <name>` | Create a new migration file in `migrations/tenant/` |
|
||||
| `npm run migrate:status` | Check migration status for all tenants |
|
||||
| `npm run migrate:tenant <slug>` | Run pending migrations for a specific tenant |
|
||||
| `npm run migrate:all-tenants` | Run pending migrations for all active tenants |
|
||||
| `npm run migrate:latest` | Run migrations on default database (rarely used) |
|
||||
| `npm run migrate:rollback` | Rollback last migration on default database |
|
||||
|
||||
## 🔧 How It Works
|
||||
|
||||
### Architecture
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────────────┐
|
||||
│ Central Database │
|
||||
│ │
|
||||
│ ┌──────────┐ ┌──────────┐ ┌──────────┐ │
|
||||
│ │ Tenant │ │ Tenant │ │ Tenant │ │
|
||||
│ │ 1 │ │ 2 │ │ N │ │
|
||||
│ └──────────┘ └──────────┘ └──────────┘ │
|
||||
│ │ │ │ │
|
||||
│ │ (encrypted │ │ │
|
||||
│ │ password) │ │ │
|
||||
└───────┼──────────────┼──────────────┼───────────────────┘
|
||||
│ │ │
|
||||
▼ ▼ ▼
|
||||
┌───────────┐ ┌───────────┐ ┌───────────┐
|
||||
│ Tenant │ │ Tenant │ │ Tenant │
|
||||
│ DB 1 │ │ DB 2 │ │ DB N │
|
||||
│ │ │ │ │ │
|
||||
│ Migrations│ │ Migrations│ │ Migrations│
|
||||
│ Applied │ │ Applied │ │ Applied │
|
||||
└───────────┘ └───────────┘ └───────────┘
|
||||
```
|
||||
|
||||
### Migration Flow
|
||||
|
||||
1. **Creating a Migration**
|
||||
```bash
|
||||
npm run migrate:make add_custom_fields
|
||||
# Creates: migrations/tenant/20250127123456_add_custom_fields.js
|
||||
```
|
||||
|
||||
2. **Testing on Single Tenant**
|
||||
```bash
|
||||
npm run migrate:tenant acme-corp
|
||||
# Output:
|
||||
# 📋 Tenant: Acme Corp (acme-corp)
|
||||
# 📊 Database: acme_corp_db
|
||||
# 🔄 Running migrations...
|
||||
# ✅ Ran 1 migration(s):
|
||||
# - 20250127123456_add_custom_fields.js
|
||||
```
|
||||
|
||||
3. **Checking Status**
|
||||
```bash
|
||||
npm run migrate:status
|
||||
# Shows which tenants have pending migrations
|
||||
```
|
||||
|
||||
4. **Applying to All Tenants**
|
||||
```bash
|
||||
npm run migrate:all-tenants
|
||||
# Migrates all active tenants sequentially
|
||||
# Provides summary of successes/failures
|
||||
```
|
||||
|
||||
## 🔐 Security Features
|
||||
|
||||
### Password Encryption
|
||||
- Tenant database passwords are encrypted using **AES-256-CBC**
|
||||
- Stored encrypted in central database
|
||||
- Automatically decrypted during migration
|
||||
- Requires `DB_ENCRYPTION_KEY` environment variable
|
||||
|
||||
### Environment Setup
|
||||
```bash
|
||||
# Required for migration scripts
|
||||
export DB_ENCRYPTION_KEY="your-32-character-secret-key!!"
|
||||
```
|
||||
|
||||
This key must match the key used by `TenantService` for encryption/decryption.
|
||||
|
||||
## 📋 Example Workflows
|
||||
|
||||
### Scenario 1: Adding a Field to All Tenants
|
||||
|
||||
```bash
|
||||
# 1. Create migration
|
||||
npm run migrate:make add_priority_field
|
||||
|
||||
# 2. Edit the generated file
|
||||
# migrations/tenant/20250127120000_add_priority_field.js
|
||||
|
||||
# 3. Test on one tenant
|
||||
npm run migrate:tenant test-company
|
||||
|
||||
# 4. Check status
|
||||
npm run migrate:status
|
||||
|
||||
# 5. Apply to all
|
||||
npm run migrate:all-tenants
|
||||
```
|
||||
|
||||
### Scenario 2: Checking Migration Status
|
||||
|
||||
```bash
|
||||
npm run migrate:status
|
||||
|
||||
# Output:
|
||||
# 📋 Found 3 active tenant(s)
|
||||
#
|
||||
# 📦 Acme Corp (acme-corp)
|
||||
# Database: acme_corp_db
|
||||
# Completed: 5 migration(s)
|
||||
# ✅ Up to date
|
||||
#
|
||||
# 📦 TechStart (techstart)
|
||||
# Database: techstart_db
|
||||
# Completed: 4 migration(s)
|
||||
# ⚠️ Pending: 1 migration(s)
|
||||
# - 20250127120000_add_priority_field.js
|
||||
#
|
||||
# 💡 Run: npm run migrate:all-tenants
|
||||
```
|
||||
|
||||
### Scenario 3: New Tenant Provisioning (Automatic)
|
||||
|
||||
When a new tenant is created via the API:
|
||||
```typescript
|
||||
// Happens automatically in TenantProvisioningService
|
||||
POST /tenants
|
||||
{
|
||||
"name": "New Company",
|
||||
"slug": "new-company"
|
||||
}
|
||||
|
||||
// Backend automatically:
|
||||
// 1. Creates database
|
||||
// 2. Runs all migrations
|
||||
// 3. Sets tenant status to ACTIVE
|
||||
```
|
||||
|
||||
## 🛠️ Technical Implementation
|
||||
|
||||
### Script Structure
|
||||
|
||||
All scripts follow this pattern:
|
||||
|
||||
1. **Import Dependencies**
|
||||
```typescript
|
||||
import { PrismaClient as CentralPrismaClient } from '../prisma/generated-central/client';
|
||||
import knex, { Knex } from 'knex';
|
||||
import { createDecipheriv } from 'crypto';
|
||||
```
|
||||
|
||||
2. **Decrypt Password**
|
||||
```typescript
|
||||
function decryptPassword(encryptedPassword: string): string {
|
||||
// AES-256-CBC decryption
|
||||
}
|
||||
```
|
||||
|
||||
3. **Create Tenant Connection**
|
||||
```typescript
|
||||
function createTenantKnexConnection(tenant: any): Knex {
|
||||
const decryptedPassword = decryptPassword(tenant.dbPassword);
|
||||
return knex({ /* config */ });
|
||||
}
|
||||
```
|
||||
|
||||
4. **Run Migrations**
|
||||
```typescript
|
||||
const [batchNo, log] = await tenantKnex.migrate.latest();
|
||||
```
|
||||
|
||||
5. **Report Results**
|
||||
```typescript
|
||||
console.log(`✅ Ran ${log.length} migrations`);
|
||||
```
|
||||
|
||||
## 🧪 Testing the Implementation
|
||||
|
||||
### 1. Verify Scripts Are Available
|
||||
```bash
|
||||
cd /root/neo/backend
|
||||
npm run | grep migrate
|
||||
```
|
||||
|
||||
Expected output:
|
||||
```
|
||||
migrate:make
|
||||
migrate:latest
|
||||
migrate:rollback
|
||||
migrate:status
|
||||
migrate:tenant
|
||||
migrate:all-tenants
|
||||
```
|
||||
|
||||
### 2. Test Creating a Migration
|
||||
```bash
|
||||
npm run migrate:make test_migration
|
||||
```
|
||||
|
||||
Should create a file in `migrations/tenant/`
|
||||
|
||||
### 3. Check Status (if tenants exist)
|
||||
```bash
|
||||
npm run migrate:status
|
||||
```
|
||||
|
||||
### 4. Test Single Tenant Migration (if tenants exist)
|
||||
```bash
|
||||
npm run migrate:tenant <your-tenant-slug>
|
||||
```
|
||||
|
||||
## 📚 Documentation Locations
|
||||
|
||||
- **Quick Reference**: `/root/neo/TENANT_MIGRATION_GUIDE.md`
|
||||
- **Detailed Scripts Docs**: `/root/neo/backend/scripts/README.md`
|
||||
- **Architecture Overview**: `/root/neo/MULTI_TENANT_IMPLEMENTATION.md`
|
||||
|
||||
## 🎯 Key Features
|
||||
|
||||
✅ **Single Tenant Migration** - Target specific tenants for testing
|
||||
✅ **Bulk Migration** - Update all tenants at once
|
||||
✅ **Status Checking** - See which tenants need updates
|
||||
✅ **Progress Tracking** - Detailed output for each operation
|
||||
✅ **Error Handling** - Graceful failure with detailed error messages
|
||||
✅ **Security** - Encrypted password storage and decryption
|
||||
✅ **Comprehensive Docs** - Multiple levels of documentation
|
||||
|
||||
## 🔄 Integration Points
|
||||
|
||||
### With Existing Code
|
||||
|
||||
1. **TenantProvisioningService**
|
||||
- Already uses `runTenantMigrations()` method
|
||||
- New scripts complement automatic provisioning
|
||||
- Same migration directory: `migrations/tenant/`
|
||||
|
||||
2. **Knex Configuration**
|
||||
- Uses existing `knexfile.js`
|
||||
- Same migration table: `knex_migrations`
|
||||
- Compatible with existing migrations
|
||||
|
||||
3. **Prisma Central Client**
|
||||
- Scripts use central DB to fetch tenant list
|
||||
- Same encryption/decryption logic as backend services
|
||||
|
||||
## 🚦 Next Steps
|
||||
|
||||
### To Use This Implementation:
|
||||
|
||||
1. **Ensure Environment Variables**
|
||||
```bash
|
||||
export DB_ENCRYPTION_KEY="your-32-character-secret-key!!"
|
||||
```
|
||||
|
||||
2. **Generate Prisma Client** (if not already done)
|
||||
```bash
|
||||
cd /root/neo/backend
|
||||
npx prisma generate --schema=prisma/schema-central.prisma
|
||||
```
|
||||
|
||||
3. **Check Current Status**
|
||||
```bash
|
||||
npm run migrate:status
|
||||
```
|
||||
|
||||
4. **Create Your First Migration**
|
||||
```bash
|
||||
npm run migrate:make add_my_feature
|
||||
```
|
||||
|
||||
5. **Test and Apply**
|
||||
```bash
|
||||
# Test on one tenant
|
||||
npm run migrate:tenant <slug>
|
||||
|
||||
# Apply to all
|
||||
npm run migrate:all-tenants
|
||||
```
|
||||
|
||||
## 📊 Complete File List
|
||||
|
||||
```
|
||||
/root/neo/
|
||||
├── TENANT_MIGRATION_GUIDE.md (new)
|
||||
└── backend/
|
||||
├── package.json (updated - 6 new scripts)
|
||||
├── knexfile.js (existing)
|
||||
├── migrations/
|
||||
│ └── tenant/ (existing)
|
||||
│ ├── 20250126000001_create_users_and_rbac.js
|
||||
│ ├── 20250126000002_create_object_definitions.js
|
||||
│ ├── 20250126000003_create_apps.js
|
||||
│ ├── 20250126000004_create_standard_objects.js
|
||||
│ └── 20250126000005_add_ui_metadata_to_fields.js
|
||||
├── scripts/ (new directory)
|
||||
│ ├── README.md (new)
|
||||
│ ├── migrate-tenant.ts (new)
|
||||
│ ├── migrate-all-tenants.ts (new)
|
||||
│ └── check-migration-status.ts (new)
|
||||
└── src/
|
||||
└── tenant/
|
||||
└── tenant-provisioning.service.ts (existing - uses migrations)
|
||||
```
|
||||
|
||||
## ✨ Summary
|
||||
|
||||
The tenant migration system is now fully implemented with:
|
||||
- ✅ 3 TypeScript migration scripts
|
||||
- ✅ 6 npm commands
|
||||
- ✅ 2 comprehensive documentation files
|
||||
- ✅ Full integration with existing architecture
|
||||
- ✅ Security features (password encryption)
|
||||
- ✅ Error handling and progress reporting
|
||||
- ✅ Status checking capabilities
|
||||
|
||||
You can now manage database migrations across all tenants efficiently and safely! 🎉
|
||||
@@ -1,91 +0,0 @@
|
||||
╔══════════════════════════════════════════════════════════════════════╗
|
||||
║ TENANT MIGRATION - QUICK REFERENCE ║
|
||||
╚══════════════════════════════════════════════════════════════════════╝
|
||||
|
||||
📍 LOCATION: /root/neo/backend
|
||||
|
||||
┌─────────────────────────────────────────────────────────────────────┐
|
||||
│ COMMON COMMANDS │
|
||||
└─────────────────────────────────────────────────────────────────────┘
|
||||
|
||||
Create Migration:
|
||||
$ npm run migrate:make add_my_feature
|
||||
|
||||
Check Status:
|
||||
$ npm run migrate:status
|
||||
|
||||
Test on One Tenant:
|
||||
$ npm run migrate:tenant acme-corp
|
||||
|
||||
Apply to All Tenants:
|
||||
$ npm run migrate:all-tenants
|
||||
|
||||
|
||||
┌─────────────────────────────────────────────────────────────────────┐
|
||||
│ ALL AVAILABLE COMMANDS │
|
||||
└─────────────────────────────────────────────────────────────────────┘
|
||||
|
||||
npm run migrate:make <name> Create new migration file
|
||||
npm run migrate:status Check status across all tenants
|
||||
npm run migrate:tenant <slug> Migrate specific tenant
|
||||
npm run migrate:all-tenants Migrate all active tenants
|
||||
npm run migrate:latest Migrate default DB (rarely used)
|
||||
npm run migrate:rollback Rollback default DB (rarely used)
|
||||
|
||||
|
||||
┌─────────────────────────────────────────────────────────────────────┐
|
||||
│ TYPICAL WORKFLOW │
|
||||
└─────────────────────────────────────────────────────────────────────┘
|
||||
|
||||
1. Create: npm run migrate:make add_priority_field
|
||||
2. Edit: vim migrations/tenant/20250127_*.js
|
||||
3. Test: npm run migrate:tenant test-company
|
||||
4. Status: npm run migrate:status
|
||||
5. Deploy: npm run migrate:all-tenants
|
||||
|
||||
|
||||
┌─────────────────────────────────────────────────────────────────────┐
|
||||
│ ENVIRONMENT REQUIRED │
|
||||
└─────────────────────────────────────────────────────────────────────┘
|
||||
|
||||
export DB_ENCRYPTION_KEY="your-32-character-secret-key!!"
|
||||
|
||||
|
||||
┌─────────────────────────────────────────────────────────────────────┐
|
||||
│ FILE LOCATIONS │
|
||||
└─────────────────────────────────────────────────────────────────────┘
|
||||
|
||||
Scripts: backend/scripts/migrate-*.ts
|
||||
Migrations: backend/migrations/tenant/
|
||||
Config: backend/knexfile.js
|
||||
Docs: TENANT_MIGRATION_GUIDE.md
|
||||
|
||||
|
||||
┌─────────────────────────────────────────────────────────────────────┐
|
||||
│ DOCUMENTATION │
|
||||
└─────────────────────────────────────────────────────────────────────┘
|
||||
|
||||
Quick Guide: cat TENANT_MIGRATION_GUIDE.md
|
||||
Script Docs: cat backend/scripts/README.md
|
||||
Complete: cat TENANT_MIGRATION_IMPLEMENTATION_COMPLETE.md
|
||||
|
||||
|
||||
┌─────────────────────────────────────────────────────────────────────┐
|
||||
│ TROUBLESHOOTING │
|
||||
└─────────────────────────────────────────────────────────────────────┘
|
||||
|
||||
Missing Prisma Client:
|
||||
$ npx prisma generate --schema=prisma/schema-central.prisma
|
||||
|
||||
Check Scripts Available:
|
||||
$ npm run | grep migrate
|
||||
|
||||
Connection Error:
|
||||
- Check DB_ENCRYPTION_KEY matches encryption key
|
||||
- Verify central database is accessible
|
||||
- Ensure tenant databases are online
|
||||
|
||||
|
||||
╔══════════════════════════════════════════════════════════════════════╗
|
||||
║ For detailed help: cat TENANT_MIGRATION_GUIDE.md ║
|
||||
╚══════════════════════════════════════════════════════════════════════╝
|
||||
@@ -1,11 +0,0 @@
|
||||
exports.up = function (knex) {
|
||||
return knex.schema.table('object_definitions', (table) => {
|
||||
table.string('nameField', 255).comment('API name of the field to use as record display name');
|
||||
});
|
||||
};
|
||||
|
||||
exports.down = function (knex) {
|
||||
return knex.schema.table('object_definitions', (table) => {
|
||||
table.dropColumn('nameField');
|
||||
});
|
||||
};
|
||||
@@ -1,22 +0,0 @@
|
||||
exports.up = function (knex) {
|
||||
return knex.schema.table('object_definitions', (table) => {
|
||||
table.uuid('app_id').nullable()
|
||||
.comment('Optional: App that this object belongs to');
|
||||
|
||||
table
|
||||
.foreign('app_id')
|
||||
.references('id')
|
||||
.inTable('apps')
|
||||
.onDelete('SET NULL');
|
||||
|
||||
table.index(['app_id']);
|
||||
});
|
||||
};
|
||||
|
||||
exports.down = function (knex) {
|
||||
return knex.schema.table('object_definitions', (table) => {
|
||||
table.dropForeign('app_id');
|
||||
table.dropIndex('app_id');
|
||||
table.dropColumn('app_id');
|
||||
});
|
||||
};
|
||||
@@ -17,13 +17,7 @@
|
||||
"test:watch": "jest --watch",
|
||||
"test:cov": "jest --coverage",
|
||||
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
|
||||
"test:e2e": "jest --config ./test/jest-e2e.json",
|
||||
"migrate:make": "knex migrate:make --knexfile=knexfile.js",
|
||||
"migrate:latest": "knex migrate:latest --knexfile=knexfile.js",
|
||||
"migrate:rollback": "knex migrate:rollback --knexfile=knexfile.js",
|
||||
"migrate:status": "ts-node -r tsconfig-paths/register scripts/check-migration-status.ts",
|
||||
"migrate:tenant": "ts-node -r tsconfig-paths/register scripts/migrate-tenant.ts",
|
||||
"migrate:all-tenants": "ts-node -r tsconfig-paths/register scripts/migrate-all-tenants.ts"
|
||||
"test:e2e": "jest --config ./test/jest-e2e.json"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nestjs/bullmq": "^10.1.0",
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
// Tenant-specific database schema
|
||||
// This schema is applied to each tenant's database
|
||||
// NOTE: Each tenant has its own database, so there is NO tenantId column in these tables
|
||||
|
||||
generator client {
|
||||
provider = "prisma-client-js"
|
||||
@@ -12,10 +11,30 @@ datasource db {
|
||||
url = env("TENANT_DATABASE_URL")
|
||||
}
|
||||
|
||||
// Multi-tenancy
|
||||
model Tenant {
|
||||
id String @id @default(uuid())
|
||||
name String
|
||||
slug String @unique
|
||||
isActive Boolean @default(true)
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
users User[]
|
||||
objectDefinitions ObjectDefinition[]
|
||||
accounts Account[]
|
||||
apps App[]
|
||||
roles Role[]
|
||||
permissions Permission[]
|
||||
|
||||
@@map("tenants")
|
||||
}
|
||||
|
||||
// User & Auth
|
||||
model User {
|
||||
id String @id @default(uuid())
|
||||
email String @unique
|
||||
tenantId String
|
||||
email String
|
||||
password String
|
||||
firstName String?
|
||||
lastName String?
|
||||
@@ -23,39 +42,48 @@ model User {
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
tenant Tenant @relation(fields: [tenantId], references: [id], onDelete: Cascade)
|
||||
userRoles UserRole[]
|
||||
accounts Account[]
|
||||
|
||||
@@unique([tenantId, email])
|
||||
@@index([tenantId])
|
||||
@@map("users")
|
||||
}
|
||||
|
||||
// RBAC - Spatie-like
|
||||
model Role {
|
||||
id String @id @default(uuid())
|
||||
tenantId String
|
||||
name String
|
||||
guardName String @default("api")
|
||||
description String?
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
tenant Tenant @relation(fields: [tenantId], references: [id], onDelete: Cascade)
|
||||
userRoles UserRole[]
|
||||
rolePermissions RolePermission[]
|
||||
|
||||
@@unique([name, guardName])
|
||||
@@unique([tenantId, name, guardName])
|
||||
@@index([tenantId])
|
||||
@@map("roles")
|
||||
}
|
||||
|
||||
model Permission {
|
||||
id String @id @default(uuid())
|
||||
tenantId String
|
||||
name String
|
||||
guardName String @default("api")
|
||||
description String?
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
tenant Tenant @relation(fields: [tenantId], references: [id], onDelete: Cascade)
|
||||
rolePermissions RolePermission[]
|
||||
|
||||
@@unique([name, guardName])
|
||||
@@unique([tenantId, name, guardName])
|
||||
@@index([tenantId])
|
||||
@@map("permissions")
|
||||
}
|
||||
|
||||
@@ -92,59 +120,66 @@ model RolePermission {
|
||||
// Object Definition (Metadata)
|
||||
model ObjectDefinition {
|
||||
id String @id @default(uuid())
|
||||
apiName String @unique
|
||||
tenantId String
|
||||
apiName String
|
||||
label String
|
||||
pluralLabel String?
|
||||
description String? @db.Text
|
||||
isSystem Boolean @default(false)
|
||||
isCustom Boolean @default(true)
|
||||
createdAt DateTime @default(now()) @map("created_at")
|
||||
updatedAt DateTime @updatedAt @map("updated_at")
|
||||
tableName String?
|
||||
isActive Boolean @default(true)
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
tenant Tenant @relation(fields: [tenantId], references: [id], onDelete: Cascade)
|
||||
fields FieldDefinition[]
|
||||
pages AppPage[]
|
||||
|
||||
@@unique([tenantId, apiName])
|
||||
@@index([tenantId])
|
||||
@@map("object_definitions")
|
||||
}
|
||||
|
||||
model FieldDefinition {
|
||||
id String @id @default(uuid())
|
||||
objectDefinitionId String
|
||||
objectId String
|
||||
apiName String
|
||||
label String
|
||||
type String // String, Number, Date, Boolean, Reference, etc.
|
||||
length Int?
|
||||
precision Int?
|
||||
scale Int?
|
||||
referenceObject String?
|
||||
defaultValue String? @db.Text
|
||||
type String // text, number, boolean, date, datetime, lookup, picklist, etc.
|
||||
description String? @db.Text
|
||||
isRequired Boolean @default(false)
|
||||
isUnique Boolean @default(false)
|
||||
isSystem Boolean @default(false)
|
||||
isCustom Boolean @default(true)
|
||||
displayOrder Int @default(0)
|
||||
createdAt DateTime @default(now()) @map("created_at")
|
||||
updatedAt DateTime @updatedAt @map("updated_at")
|
||||
isReadonly Boolean @default(false)
|
||||
isLookup Boolean @default(false)
|
||||
referenceTo String? // objectApiName for lookup fields
|
||||
defaultValue String?
|
||||
options Json? // for picklist fields
|
||||
validationRules Json? // custom validation rules
|
||||
isActive Boolean @default(true)
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
object ObjectDefinition @relation(fields: [objectDefinitionId], references: [id], onDelete: Cascade)
|
||||
object ObjectDefinition @relation(fields: [objectId], references: [id], onDelete: Cascade)
|
||||
|
||||
@@unique([objectDefinitionId, apiName])
|
||||
@@index([objectDefinitionId])
|
||||
@@unique([objectId, apiName])
|
||||
@@index([objectId])
|
||||
@@map("field_definitions")
|
||||
}
|
||||
|
||||
// Example static object: Account
|
||||
model Account {
|
||||
id String @id @default(uuid())
|
||||
tenantId String
|
||||
name String
|
||||
status String @default("active")
|
||||
ownerId String
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
tenant Tenant @relation(fields: [tenantId], references: [id], onDelete: Cascade)
|
||||
owner User @relation(fields: [ownerId], references: [id])
|
||||
|
||||
@@index([tenantId])
|
||||
@@index([ownerId])
|
||||
@@map("accounts")
|
||||
}
|
||||
@@ -152,7 +187,8 @@ model Account {
|
||||
// Application Builder
|
||||
model App {
|
||||
id String @id @default(uuid())
|
||||
slug String @unique
|
||||
tenantId String
|
||||
slug String
|
||||
label String
|
||||
description String? @db.Text
|
||||
icon String?
|
||||
@@ -160,8 +196,11 @@ model App {
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
tenant Tenant @relation(fields: [tenantId], references: [id], onDelete: Cascade)
|
||||
pages AppPage[]
|
||||
|
||||
@@unique([tenantId, slug])
|
||||
@@index([tenantId])
|
||||
@@map("apps")
|
||||
}
|
||||
|
||||
|
||||
@@ -1,194 +0,0 @@
|
||||
# Tenant Migration Scripts
|
||||
|
||||
This directory contains scripts for managing database migrations across all tenants in the multi-tenant platform.
|
||||
|
||||
## Available Scripts
|
||||
|
||||
### 1. Create a New Migration
|
||||
|
||||
```bash
|
||||
npm run migrate:make <migration_name>
|
||||
```
|
||||
|
||||
Creates a new migration file in `migrations/tenant/` directory.
|
||||
|
||||
**Example:**
|
||||
```bash
|
||||
npm run migrate:make add_status_field_to_contacts
|
||||
```
|
||||
|
||||
### 2. Migrate a Single Tenant
|
||||
|
||||
```bash
|
||||
npm run migrate:tenant <tenant-slug-or-id>
|
||||
```
|
||||
|
||||
Runs all pending migrations for a specific tenant. You can identify the tenant by its slug or ID.
|
||||
|
||||
**Example:**
|
||||
```bash
|
||||
npm run migrate:tenant acme-corp
|
||||
npm run migrate:tenant cm5a1b2c3d4e5f6g7h8i9j0k
|
||||
```
|
||||
|
||||
### 3. Migrate All Tenants
|
||||
|
||||
```bash
|
||||
npm run migrate:all-tenants
|
||||
```
|
||||
|
||||
Runs all pending migrations for **all active tenants** in the system. This is useful when:
|
||||
- You've created a new migration that needs to be applied to all tenants
|
||||
- You're updating the schema across the entire platform
|
||||
- You need to ensure all tenants are up to date
|
||||
|
||||
**Output:**
|
||||
- Shows progress for each tenant
|
||||
- Lists which migrations were applied
|
||||
- Provides a summary at the end
|
||||
- Exits with error code if any tenant fails
|
||||
|
||||
### 4. Rollback Migration (Manual)
|
||||
|
||||
```bash
|
||||
npm run migrate:rollback
|
||||
```
|
||||
|
||||
⚠️ **Warning:** This runs a rollback on the **default database** configured in `knexfile.js`. For tenant-specific rollbacks, you'll need to manually configure the connection.
|
||||
|
||||
## Migration Flow
|
||||
|
||||
### During New Tenant Provisioning
|
||||
|
||||
When a new tenant is created via the API, migrations are automatically run as part of the provisioning process:
|
||||
|
||||
1. Tenant database is created
|
||||
2. `TenantProvisioningService.runTenantMigrations()` is called
|
||||
3. All migrations in `migrations/tenant/` are executed
|
||||
|
||||
### For Existing Tenants
|
||||
|
||||
When you add a new migration file and need to apply it to existing tenants:
|
||||
|
||||
1. Create the migration:
|
||||
```bash
|
||||
npm run migrate:make add_new_feature
|
||||
```
|
||||
|
||||
2. Edit the generated migration file in `migrations/tenant/`
|
||||
|
||||
3. Test on a single tenant first:
|
||||
```bash
|
||||
npm run migrate:tenant test-tenant
|
||||
```
|
||||
|
||||
4. If successful, apply to all tenants:
|
||||
```bash
|
||||
npm run migrate:all-tenants
|
||||
```
|
||||
|
||||
## Migration Directory Structure
|
||||
|
||||
```
|
||||
backend/
|
||||
├── migrations/
|
||||
│ └── tenant/ # Tenant-specific migrations
|
||||
│ ├── 20250126000001_create_users_and_rbac.js
|
||||
│ ├── 20250126000002_create_object_definitions.js
|
||||
│ └── ...
|
||||
├── scripts/
|
||||
│ ├── migrate-tenant.ts # Single tenant migration
|
||||
│ └── migrate-all-tenants.ts # All tenants migration
|
||||
└── knexfile.js # Knex configuration
|
||||
```
|
||||
|
||||
## Security Notes
|
||||
|
||||
### Database Password Encryption
|
||||
|
||||
Tenant database passwords are encrypted in the central database using AES-256-CBC encryption. The migration scripts automatically:
|
||||
|
||||
1. Fetch tenant connection details from the central database
|
||||
2. Decrypt the database password using the `DB_ENCRYPTION_KEY` environment variable
|
||||
3. Connect to the tenant database
|
||||
4. Run migrations
|
||||
5. Close the connection
|
||||
|
||||
**Required Environment Variable:**
|
||||
```bash
|
||||
DB_ENCRYPTION_KEY=your-32-character-secret-key!!
|
||||
```
|
||||
|
||||
This key must match the key used by `TenantService` for encryption.
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### Migration Fails for One Tenant
|
||||
|
||||
If `migrate:all-tenants` fails for a specific tenant:
|
||||
|
||||
1. Check the error message in the output
|
||||
2. Investigate the tenant's database directly
|
||||
3. Fix the issue (manual SQL, data cleanup, etc.)
|
||||
4. Re-run migrations for that tenant: `npm run migrate:tenant <slug>`
|
||||
5. Once fixed, run `migrate:all-tenants` again to ensure others are updated
|
||||
|
||||
### Migration Already Exists
|
||||
|
||||
Knex tracks which migrations have been run in the `knex_migrations` table in each tenant database. If a migration was already applied, it will be skipped automatically.
|
||||
|
||||
### Connection Issues
|
||||
|
||||
If you see connection errors:
|
||||
|
||||
1. Verify the central database is accessible
|
||||
2. Check that tenant database credentials are correct
|
||||
3. Ensure `DB_ENCRYPTION_KEY` matches the one used for encryption
|
||||
4. Verify the tenant's database server is running and accessible
|
||||
|
||||
## Example Migration File
|
||||
|
||||
```javascript
|
||||
// migrations/tenant/20250126000006_add_custom_fields.js
|
||||
|
||||
exports.up = async function(knex) {
|
||||
await knex.schema.table('field_definitions', (table) => {
|
||||
table.boolean('is_custom').defaultTo(false);
|
||||
table.string('custom_type', 50).nullable();
|
||||
});
|
||||
};
|
||||
|
||||
exports.down = async function(knex) {
|
||||
await knex.schema.table('field_definitions', (table) => {
|
||||
table.dropColumn('is_custom');
|
||||
table.dropColumn('custom_type');
|
||||
});
|
||||
};
|
||||
```
|
||||
|
||||
## Best Practices
|
||||
|
||||
1. **Always test on a single tenant first** before running migrations on all tenants
|
||||
2. **Include rollback logic** in your `down()` function
|
||||
3. **Use transactions** for complex multi-step migrations
|
||||
4. **Backup production databases** before running migrations
|
||||
5. **Monitor the output** when running `migrate:all-tenants` to catch any failures
|
||||
6. **Version control** your migration files
|
||||
7. **Document breaking changes** in migration comments
|
||||
8. **Consider data migrations** separately from schema migrations when dealing with large datasets
|
||||
|
||||
## CI/CD Integration
|
||||
|
||||
In your deployment pipeline, you can automatically migrate all tenants:
|
||||
|
||||
```bash
|
||||
# After deploying new code
|
||||
npm run migrate:all-tenants
|
||||
```
|
||||
|
||||
Or integrate it into your Docker deployment:
|
||||
|
||||
```dockerfile
|
||||
# In your Dockerfile or docker-compose.yml
|
||||
CMD npm run migrate:all-tenants && npm run start:prod
|
||||
```
|
||||
@@ -1,181 +0,0 @@
|
||||
import { PrismaClient as CentralPrismaClient } from '.prisma/central';
|
||||
import knex, { Knex } from 'knex';
|
||||
import { createDecipheriv } from 'crypto';
|
||||
|
||||
// Encryption configuration
|
||||
const ALGORITHM = 'aes-256-cbc';
|
||||
|
||||
/**
|
||||
* Decrypt a tenant's database password
|
||||
*/
|
||||
function decryptPassword(encryptedPassword: string): string {
|
||||
try {
|
||||
// Check if password is already plaintext (for legacy/development)
|
||||
if (!encryptedPassword.includes(':')) {
|
||||
return encryptedPassword;
|
||||
}
|
||||
|
||||
const key = Buffer.from(process.env.ENCRYPTION_KEY, 'hex');
|
||||
const parts = encryptedPassword.split(':');
|
||||
if (parts.length !== 2) {
|
||||
throw new Error('Invalid encrypted password format');
|
||||
}
|
||||
|
||||
const iv = Buffer.from(parts[0], 'hex');
|
||||
const encrypted = parts[1];
|
||||
|
||||
const decipher = createDecipheriv(ALGORITHM, key, iv);
|
||||
|
||||
let decrypted = decipher.update(encrypted, 'hex', 'utf8');
|
||||
decrypted += decipher.final('utf8');
|
||||
|
||||
return decrypted;
|
||||
} catch (error) {
|
||||
console.error('Error decrypting password:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a Knex connection for a specific tenant
|
||||
*/
|
||||
function createTenantKnexConnection(tenant: any): Knex {
|
||||
const decryptedPassword = decryptPassword(tenant.dbPassword);
|
||||
|
||||
return knex({
|
||||
client: 'mysql2',
|
||||
connection: {
|
||||
host: tenant.dbHost,
|
||||
port: tenant.dbPort,
|
||||
user: tenant.dbUsername,
|
||||
password: decryptedPassword,
|
||||
database: tenant.dbName,
|
||||
},
|
||||
migrations: {
|
||||
tableName: 'knex_migrations',
|
||||
directory: './migrations/tenant',
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Get migration status for a specific tenant
|
||||
*/
|
||||
async function getTenantMigrationStatus(tenant: any): Promise<{
|
||||
completed: string[];
|
||||
pending: string[];
|
||||
}> {
|
||||
const tenantKnex = createTenantKnexConnection(tenant);
|
||||
|
||||
try {
|
||||
const [completed, pending] = await tenantKnex.migrate.list();
|
||||
return {
|
||||
completed: completed[1] || [],
|
||||
pending: pending || [],
|
||||
};
|
||||
} catch (error) {
|
||||
throw error;
|
||||
} finally {
|
||||
await tenantKnex.destroy();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Check migration status across all tenants
|
||||
*/
|
||||
async function checkMigrationStatus() {
|
||||
console.log('🔍 Checking migration status for all tenants...\n');
|
||||
|
||||
const centralPrisma = new CentralPrismaClient();
|
||||
|
||||
try {
|
||||
// Fetch all active tenants
|
||||
const tenants = await centralPrisma.tenant.findMany({
|
||||
where: {
|
||||
status: 'ACTIVE',
|
||||
},
|
||||
orderBy: {
|
||||
name: 'asc',
|
||||
},
|
||||
});
|
||||
|
||||
if (tenants.length === 0) {
|
||||
console.log('⚠️ No active tenants found.');
|
||||
return;
|
||||
}
|
||||
|
||||
console.log(`📋 Found ${tenants.length} active tenant(s)\n`);
|
||||
console.log('='.repeat(80));
|
||||
|
||||
let allUpToDate = true;
|
||||
const tenantsWithPending: { name: string; pending: string[] }[] = [];
|
||||
|
||||
// Check each tenant
|
||||
for (const tenant of tenants) {
|
||||
try {
|
||||
const status = await getTenantMigrationStatus(tenant);
|
||||
|
||||
console.log(`\n📦 ${tenant.name} (${tenant.slug})`);
|
||||
console.log(` Database: ${tenant.dbName}`);
|
||||
console.log(` Completed: ${status.completed.length} migration(s)`);
|
||||
|
||||
if (status.pending.length > 0) {
|
||||
allUpToDate = false;
|
||||
console.log(` ⚠️ Pending: ${status.pending.length} migration(s)`);
|
||||
status.pending.forEach((migration) => {
|
||||
console.log(` - ${migration}`);
|
||||
});
|
||||
tenantsWithPending.push({
|
||||
name: tenant.name,
|
||||
pending: status.pending,
|
||||
});
|
||||
} else {
|
||||
console.log(` ✅ Up to date`);
|
||||
}
|
||||
|
||||
// Show last 3 completed migrations
|
||||
if (status.completed.length > 0) {
|
||||
const recent = status.completed.slice(-3);
|
||||
console.log(` Recent migrations:`);
|
||||
recent.forEach((migration) => {
|
||||
console.log(` - ${migration}`);
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
console.log(`\n❌ ${tenant.name}: Failed to check status`);
|
||||
console.log(` Error: ${error.message}`);
|
||||
allUpToDate = false;
|
||||
}
|
||||
}
|
||||
|
||||
// Print summary
|
||||
console.log('\n' + '='.repeat(80));
|
||||
console.log('📊 Summary');
|
||||
console.log('='.repeat(80));
|
||||
|
||||
if (allUpToDate) {
|
||||
console.log('✅ All tenants are up to date!');
|
||||
} else {
|
||||
console.log(`⚠️ ${tenantsWithPending.length} tenant(s) have pending migrations:\n`);
|
||||
tenantsWithPending.forEach(({ name, pending }) => {
|
||||
console.log(` ${name}: ${pending.length} pending`);
|
||||
});
|
||||
console.log('\n💡 Run: npm run migrate:all-tenants');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('❌ Fatal error:', error);
|
||||
process.exit(1);
|
||||
} finally {
|
||||
await centralPrisma.$disconnect();
|
||||
}
|
||||
}
|
||||
|
||||
// Run the status check
|
||||
checkMigrationStatus()
|
||||
.then(() => {
|
||||
process.exit(0);
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('Unhandled error:', error);
|
||||
process.exit(1);
|
||||
});
|
||||
@@ -1,165 +0,0 @@
|
||||
import { PrismaClient as CentralPrismaClient } from '.prisma/central';
|
||||
import knex, { Knex } from 'knex';
|
||||
import { createDecipheriv } from 'crypto';
|
||||
|
||||
// Encryption configuration - must match the one used in tenant service
|
||||
const ALGORITHM = 'aes-256-cbc';
|
||||
|
||||
/**
|
||||
* Decrypt a tenant's database password
|
||||
*/
|
||||
function decryptPassword(encryptedPassword: string): string {
|
||||
try {
|
||||
// Check if password is already plaintext (for legacy/development)
|
||||
if (!encryptedPassword.includes(':')) {
|
||||
console.warn('⚠️ Password appears to be unencrypted, using as-is');
|
||||
return encryptedPassword;
|
||||
}
|
||||
|
||||
const key = Buffer.from(process.env.ENCRYPTION_KEY, 'hex');
|
||||
const parts = encryptedPassword.split(':');
|
||||
if (parts.length !== 2) {
|
||||
throw new Error('Invalid encrypted password format');
|
||||
}
|
||||
|
||||
const iv = Buffer.from(parts[0], 'hex');
|
||||
const encrypted = parts[1];
|
||||
|
||||
const decipher = createDecipheriv(ALGORITHM, key, iv);
|
||||
|
||||
let decrypted = decipher.update(encrypted, 'hex', 'utf8');
|
||||
decrypted += decipher.final('utf8');
|
||||
|
||||
return decrypted;
|
||||
} catch (error) {
|
||||
console.error('Error decrypting password:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a Knex connection for a specific tenant
|
||||
*/
|
||||
function createTenantKnexConnection(tenant: any): Knex {
|
||||
const decryptedPassword = decryptPassword(tenant.dbPassword);
|
||||
|
||||
return knex({
|
||||
client: 'mysql2',
|
||||
connection: {
|
||||
host: tenant.dbHost,
|
||||
port: tenant.dbPort,
|
||||
user: tenant.dbUsername,
|
||||
password: decryptedPassword,
|
||||
database: tenant.dbName,
|
||||
},
|
||||
migrations: {
|
||||
tableName: 'knex_migrations',
|
||||
directory: './migrations/tenant',
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Run migrations for a specific tenant
|
||||
*/
|
||||
async function migrateTenant(tenant: any): Promise<void> {
|
||||
console.log(`\n🔄 Migrating tenant: ${tenant.name} (${tenant.dbName})`);
|
||||
|
||||
const tenantKnex = createTenantKnexConnection(tenant);
|
||||
|
||||
try {
|
||||
const [batchNo, log] = await tenantKnex.migrate.latest();
|
||||
|
||||
if (log.length === 0) {
|
||||
console.log(`✅ ${tenant.name}: Already up to date`);
|
||||
} else {
|
||||
console.log(`✅ ${tenant.name}: Ran ${log.length} migrations:`);
|
||||
log.forEach((migration) => {
|
||||
console.log(` - ${migration}`);
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`❌ ${tenant.name}: Migration failed:`, error.message);
|
||||
throw error;
|
||||
} finally {
|
||||
await tenantKnex.destroy();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Main function to migrate all active tenants
|
||||
*/
|
||||
async function migrateAllTenants() {
|
||||
console.log('🚀 Starting migration for all tenants...\n');
|
||||
|
||||
const centralPrisma = new CentralPrismaClient();
|
||||
|
||||
try {
|
||||
// Fetch all active tenants
|
||||
const tenants = await centralPrisma.tenant.findMany({
|
||||
where: {
|
||||
status: 'ACTIVE',
|
||||
},
|
||||
orderBy: {
|
||||
name: 'asc',
|
||||
},
|
||||
});
|
||||
|
||||
if (tenants.length === 0) {
|
||||
console.log('⚠️ No active tenants found.');
|
||||
return;
|
||||
}
|
||||
|
||||
console.log(`📋 Found ${tenants.length} active tenant(s)\n`);
|
||||
|
||||
let successCount = 0;
|
||||
let failureCount = 0;
|
||||
const failures: { tenant: string; error: string }[] = [];
|
||||
|
||||
// Migrate each tenant sequentially
|
||||
for (const tenant of tenants) {
|
||||
try {
|
||||
await migrateTenant(tenant);
|
||||
successCount++;
|
||||
} catch (error) {
|
||||
failureCount++;
|
||||
failures.push({
|
||||
tenant: tenant.name,
|
||||
error: error.message,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Print summary
|
||||
console.log('\n' + '='.repeat(60));
|
||||
console.log('📊 Migration Summary');
|
||||
console.log('='.repeat(60));
|
||||
console.log(`✅ Successful: ${successCount}`);
|
||||
console.log(`❌ Failed: ${failureCount}`);
|
||||
|
||||
if (failures.length > 0) {
|
||||
console.log('\n❌ Failed Tenants:');
|
||||
failures.forEach(({ tenant, error }) => {
|
||||
console.log(` - ${tenant}: ${error}`);
|
||||
});
|
||||
process.exit(1);
|
||||
} else {
|
||||
console.log('\n🎉 All tenant migrations completed successfully!');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('❌ Fatal error:', error);
|
||||
process.exit(1);
|
||||
} finally {
|
||||
await centralPrisma.$disconnect();
|
||||
}
|
||||
}
|
||||
|
||||
// Run the migration
|
||||
migrateAllTenants()
|
||||
.then(() => {
|
||||
process.exit(0);
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('Unhandled error:', error);
|
||||
process.exit(1);
|
||||
});
|
||||
@@ -1,134 +0,0 @@
|
||||
import { PrismaClient as CentralPrismaClient } from '.prisma/central';
|
||||
import knex, { Knex } from 'knex';
|
||||
import { createDecipheriv } from 'crypto';
|
||||
|
||||
// Encryption configuration
|
||||
const ALGORITHM = 'aes-256-cbc';
|
||||
|
||||
/**
|
||||
* Decrypt a tenant's database password
|
||||
*/
|
||||
function decryptPassword(encryptedPassword: string): string {
|
||||
try {
|
||||
// Check if password is already plaintext (for legacy/development)
|
||||
if (!encryptedPassword.includes(':')) {
|
||||
console.warn('⚠️ Password appears to be unencrypted, using as-is');
|
||||
return encryptedPassword;
|
||||
}
|
||||
|
||||
const key = Buffer.from(process.env.ENCRYPTION_KEY, 'hex');
|
||||
const parts = encryptedPassword.split(':');
|
||||
if (parts.length !== 2) {
|
||||
throw new Error('Invalid encrypted password format');
|
||||
}
|
||||
|
||||
const iv = Buffer.from(parts[0], 'hex');
|
||||
const encrypted = parts[1];
|
||||
|
||||
const decipher = createDecipheriv(ALGORITHM, key, iv);
|
||||
|
||||
let decrypted = decipher.update(encrypted, 'hex', 'utf8');
|
||||
decrypted += decipher.final('utf8');
|
||||
|
||||
return decrypted;
|
||||
} catch (error) {
|
||||
console.error('Error decrypting password:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a Knex connection for a specific tenant
|
||||
*/
|
||||
function createTenantKnexConnection(tenant: any): Knex {
|
||||
const decryptedPassword = decryptPassword(tenant.dbPassword);
|
||||
|
||||
return knex({
|
||||
client: 'mysql2',
|
||||
connection: {
|
||||
host: tenant.dbHost,
|
||||
port: tenant.dbPort,
|
||||
user: tenant.dbUsername,
|
||||
password: decryptedPassword,
|
||||
database: tenant.dbName,
|
||||
},
|
||||
migrations: {
|
||||
tableName: 'knex_migrations',
|
||||
directory: './migrations/tenant',
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Migrate a specific tenant by slug or ID
|
||||
*/
|
||||
async function migrateTenant() {
|
||||
const tenantIdentifier = process.argv[2];
|
||||
|
||||
if (!tenantIdentifier) {
|
||||
console.error('❌ Usage: npm run migrate:tenant <tenant-slug-or-id>');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
console.log(`🔍 Looking for tenant: ${tenantIdentifier}\n`);
|
||||
|
||||
const centralPrisma = new CentralPrismaClient();
|
||||
|
||||
try {
|
||||
// Find tenant by slug or ID
|
||||
const tenant = await centralPrisma.tenant.findFirst({
|
||||
where: {
|
||||
OR: [
|
||||
{ slug: tenantIdentifier },
|
||||
{ id: tenantIdentifier },
|
||||
],
|
||||
},
|
||||
});
|
||||
|
||||
if (!tenant) {
|
||||
console.error(`❌ Tenant not found: ${tenantIdentifier}`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
console.log(`📋 Tenant: ${tenant.name} (${tenant.slug})`);
|
||||
console.log(`📊 Database: ${tenant.dbName}`);
|
||||
console.log(`🔄 Running migrations...\n`);
|
||||
|
||||
const tenantKnex = createTenantKnexConnection(tenant);
|
||||
|
||||
try {
|
||||
const [batchNo, log] = await tenantKnex.migrate.latest();
|
||||
|
||||
if (log.length === 0) {
|
||||
console.log(`✅ Already up to date (batch ${batchNo})`);
|
||||
} else {
|
||||
console.log(`✅ Ran ${log.length} migration(s) (batch ${batchNo}):`);
|
||||
log.forEach((migration) => {
|
||||
console.log(` - ${migration}`);
|
||||
});
|
||||
}
|
||||
|
||||
console.log('\n🎉 Migration completed successfully!');
|
||||
} catch (error) {
|
||||
console.error('❌ Migration failed:', error.message);
|
||||
throw error;
|
||||
} finally {
|
||||
await tenantKnex.destroy();
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('❌ Fatal error:', error);
|
||||
process.exit(1);
|
||||
} finally {
|
||||
await centralPrisma.$disconnect();
|
||||
}
|
||||
}
|
||||
|
||||
// Run the migration
|
||||
migrateTenant()
|
||||
.then(() => {
|
||||
process.exit(0);
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('Unhandled error:', error);
|
||||
process.exit(1);
|
||||
});
|
||||
@@ -1,72 +0,0 @@
|
||||
import { getCentralPrisma } from '../src/prisma/central-prisma.service';
|
||||
import * as knex from 'knex';
|
||||
import * as crypto from 'crypto';
|
||||
|
||||
function decrypt(text: string): string {
|
||||
const parts = text.split(':');
|
||||
const iv = Buffer.from(parts.shift()!, 'hex');
|
||||
const encryptedText = Buffer.from(parts.join(':'), 'hex');
|
||||
const key = Buffer.from(process.env.ENCRYPTION_KEY, 'hex');
|
||||
const decipher = crypto.createDecipheriv(
|
||||
'aes-256-cbc',
|
||||
key,
|
||||
iv,
|
||||
);
|
||||
let decrypted = decipher.update(encryptedText);
|
||||
decrypted = Buffer.concat([decrypted, decipher.final()]);
|
||||
return decrypted.toString();
|
||||
}
|
||||
|
||||
async function updateNameField() {
|
||||
const centralPrisma = getCentralPrisma();
|
||||
|
||||
try {
|
||||
// Find tenant1
|
||||
const tenant = await centralPrisma.tenant.findFirst({
|
||||
where: {
|
||||
OR: [
|
||||
{ id: 'tenant1' },
|
||||
{ slug: 'tenant1' },
|
||||
],
|
||||
},
|
||||
});
|
||||
|
||||
if (!tenant) {
|
||||
console.error('❌ Tenant tenant1 not found');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
console.log(`📋 Tenant: ${tenant.name} (${tenant.slug})`);
|
||||
console.log(`📊 Database: ${tenant.dbName}`);
|
||||
|
||||
// Decrypt password
|
||||
const password = decrypt(tenant.dbPassword);
|
||||
|
||||
// Create connection
|
||||
const tenantKnex = knex.default({
|
||||
client: 'mysql2',
|
||||
connection: {
|
||||
host: tenant.dbHost,
|
||||
port: tenant.dbPort,
|
||||
user: tenant.dbUsername,
|
||||
password: password,
|
||||
database: tenant.dbName,
|
||||
},
|
||||
});
|
||||
|
||||
// Update Account object
|
||||
await tenantKnex('object_definitions')
|
||||
.where({ apiName: 'Account' })
|
||||
.update({ nameField: 'name' });
|
||||
|
||||
console.log('✅ Updated Account object nameField to "name"');
|
||||
|
||||
await tenantKnex.destroy();
|
||||
await centralPrisma.$disconnect();
|
||||
} catch (error) {
|
||||
console.error('❌ Error:', error);
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
updateNameField();
|
||||
@@ -1,147 +0,0 @@
|
||||
/**
|
||||
* Example seed data for Account object with UI metadata
|
||||
* Run this after migrations to add UI metadata to existing Account fields
|
||||
*/
|
||||
|
||||
exports.seed = async function(knex) {
|
||||
// Get the Account object
|
||||
const accountObj = await knex('object_definitions')
|
||||
.where({ apiName: 'Account' })
|
||||
.first();
|
||||
|
||||
if (!accountObj) {
|
||||
console.log('Account object not found. Please run migrations first.');
|
||||
return;
|
||||
}
|
||||
|
||||
console.log(`Found Account object with ID: ${accountObj.id}`);
|
||||
|
||||
// Update existing Account fields with UI metadata
|
||||
const fieldsToUpdate = [
|
||||
{
|
||||
apiName: 'name',
|
||||
ui_metadata: JSON.stringify({
|
||||
fieldType: 'TEXT',
|
||||
placeholder: 'Enter account name',
|
||||
helpText: 'The name of the organization or company',
|
||||
showOnList: true,
|
||||
showOnDetail: true,
|
||||
showOnEdit: true,
|
||||
sortable: true,
|
||||
section: 'basic',
|
||||
sectionLabel: 'Basic Information',
|
||||
sectionOrder: 1,
|
||||
validationRules: [
|
||||
{ type: 'required', message: 'Account name is required' },
|
||||
{ type: 'minLength', value: 2, message: 'Account name must be at least 2 characters' },
|
||||
{ type: 'maxLength', value: 255, message: 'Account name cannot exceed 255 characters' }
|
||||
]
|
||||
})
|
||||
},
|
||||
{
|
||||
apiName: 'website',
|
||||
ui_metadata: JSON.stringify({
|
||||
fieldType: 'URL',
|
||||
placeholder: 'https://www.example.com',
|
||||
helpText: 'Company website URL',
|
||||
showOnList: true,
|
||||
showOnDetail: true,
|
||||
showOnEdit: true,
|
||||
sortable: true,
|
||||
section: 'basic',
|
||||
sectionLabel: 'Basic Information',
|
||||
sectionOrder: 1,
|
||||
validationRules: [
|
||||
{ type: 'url', message: 'Please enter a valid URL' }
|
||||
]
|
||||
})
|
||||
},
|
||||
{
|
||||
apiName: 'phone',
|
||||
ui_metadata: JSON.stringify({
|
||||
fieldType: 'TEXT',
|
||||
placeholder: '+1 (555) 000-0000',
|
||||
helpText: 'Primary phone number',
|
||||
showOnList: true,
|
||||
showOnDetail: true,
|
||||
showOnEdit: true,
|
||||
sortable: false,
|
||||
section: 'contact',
|
||||
sectionLabel: 'Contact Information',
|
||||
sectionOrder: 2,
|
||||
validationRules: [
|
||||
{ type: 'pattern', value: '^\\+?[0-9\\s\\-\\(\\)]+$', message: 'Please enter a valid phone number' }
|
||||
]
|
||||
})
|
||||
},
|
||||
{
|
||||
apiName: 'industry',
|
||||
ui_metadata: JSON.stringify({
|
||||
fieldType: 'SELECT',
|
||||
placeholder: 'Select industry',
|
||||
helpText: 'The primary industry this account operates in',
|
||||
showOnList: true,
|
||||
showOnDetail: true,
|
||||
showOnEdit: true,
|
||||
sortable: true,
|
||||
section: 'details',
|
||||
sectionLabel: 'Account Details',
|
||||
sectionOrder: 3,
|
||||
options: [
|
||||
{ value: 'technology', label: 'Technology' },
|
||||
{ value: 'finance', label: 'Finance' },
|
||||
{ value: 'healthcare', label: 'Healthcare' },
|
||||
{ value: 'manufacturing', label: 'Manufacturing' },
|
||||
{ value: 'retail', label: 'Retail' },
|
||||
{ value: 'education', label: 'Education' },
|
||||
{ value: 'government', label: 'Government' },
|
||||
{ value: 'nonprofit', label: 'Non-Profit' },
|
||||
{ value: 'other', label: 'Other' }
|
||||
]
|
||||
})
|
||||
},
|
||||
{
|
||||
apiName: 'ownerId',
|
||||
ui_metadata: JSON.stringify({
|
||||
fieldType: 'SELECT',
|
||||
placeholder: 'Select owner',
|
||||
helpText: 'The user who owns this account',
|
||||
showOnList: true,
|
||||
showOnDetail: true,
|
||||
showOnEdit: true,
|
||||
sortable: true,
|
||||
section: 'system',
|
||||
sectionLabel: 'System Information',
|
||||
sectionOrder: 4,
|
||||
// This would be dynamically populated from the users table
|
||||
// For now, providing static structure
|
||||
isReference: true,
|
||||
referenceObject: 'User',
|
||||
referenceDisplayField: 'name'
|
||||
})
|
||||
}
|
||||
];
|
||||
|
||||
// Update each field with UI metadata
|
||||
for (const fieldUpdate of fieldsToUpdate) {
|
||||
const result = await knex('field_definitions')
|
||||
.where({
|
||||
objectDefinitionId: accountObj.id,
|
||||
apiName: fieldUpdate.apiName
|
||||
})
|
||||
.update({
|
||||
ui_metadata: fieldUpdate.ui_metadata,
|
||||
updated_at: knex.fn.now()
|
||||
});
|
||||
|
||||
if (result > 0) {
|
||||
console.log(`✓ Updated ${fieldUpdate.apiName} with UI metadata`);
|
||||
} else {
|
||||
console.log(`✗ Field ${fieldUpdate.apiName} not found`);
|
||||
}
|
||||
}
|
||||
|
||||
console.log('\n✅ Account fields UI metadata seed completed successfully!');
|
||||
console.log('You can now fetch the Account object UI config via:');
|
||||
console.log('GET /api/setup/objects/Account/ui-config');
|
||||
};
|
||||
@@ -12,7 +12,7 @@ import { JwtAuthGuard } from '../auth/jwt-auth.guard';
|
||||
import { TenantId } from '../tenant/tenant.decorator';
|
||||
|
||||
@Controller('setup/apps')
|
||||
@UseGuards(JwtAuthGuard)
|
||||
//@UseGuards(JwtAuthGuard)
|
||||
export class SetupAppController {
|
||||
constructor(private appBuilderService: AppBuilderService) {}
|
||||
|
||||
|
||||
@@ -79,12 +79,4 @@ export class AuthController {
|
||||
|
||||
return user;
|
||||
}
|
||||
|
||||
@HttpCode(HttpStatus.OK)
|
||||
@Post('logout')
|
||||
async logout() {
|
||||
// For stateless JWT, logout is handled on client-side
|
||||
// This endpoint exists for consistency and potential future enhancements
|
||||
return { message: 'Logged out successfully' };
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,6 +47,7 @@ export class AuthService {
|
||||
const payload = {
|
||||
sub: user.id,
|
||||
email: user.email,
|
||||
tenantId: user.tenantId,
|
||||
};
|
||||
|
||||
return {
|
||||
@@ -56,6 +57,7 @@ export class AuthService {
|
||||
email: user.email,
|
||||
firstName: user.firstName,
|
||||
lastName: user.lastName,
|
||||
tenantId: user.tenantId,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,62 +1,42 @@
|
||||
import { Injectable, NotFoundException } from '@nestjs/common';
|
||||
import { TenantDatabaseService } from '../tenant/tenant-database.service';
|
||||
import { PrismaService } from '../prisma/prisma.service';
|
||||
|
||||
@Injectable()
|
||||
export class ObjectService {
|
||||
constructor(private tenantDbService: TenantDatabaseService) {}
|
||||
constructor(private prisma: PrismaService) {}
|
||||
|
||||
// Setup endpoints - Object metadata management
|
||||
async getObjectDefinitions(tenantId: string) {
|
||||
const knex = await this.tenantDbService.getTenantKnex(tenantId);
|
||||
|
||||
const objects = await knex('object_definitions')
|
||||
.select('object_definitions.*')
|
||||
.orderBy('label', 'asc');
|
||||
|
||||
// Fetch app information for objects that have app_id
|
||||
for (const obj of objects) {
|
||||
if (obj.app_id) {
|
||||
const app = await knex('apps')
|
||||
.where({ id: obj.app_id })
|
||||
.select('id', 'slug', 'label', 'description')
|
||||
.first();
|
||||
obj.app = app;
|
||||
}
|
||||
}
|
||||
|
||||
return objects;
|
||||
return this.prisma.objectDefinition.findMany({
|
||||
where: { tenantId },
|
||||
include: {
|
||||
fields: true,
|
||||
},
|
||||
orderBy: { label: 'asc' },
|
||||
});
|
||||
}
|
||||
|
||||
async getObjectDefinition(tenantId: string, apiName: string) {
|
||||
const knex = await this.tenantDbService.getTenantKnex(tenantId);
|
||||
|
||||
const obj = await knex('object_definitions')
|
||||
.where({ apiName })
|
||||
.first();
|
||||
const obj = await this.prisma.objectDefinition.findUnique({
|
||||
where: {
|
||||
tenantId_apiName: {
|
||||
tenantId,
|
||||
apiName,
|
||||
},
|
||||
},
|
||||
include: {
|
||||
fields: {
|
||||
where: { isActive: true },
|
||||
orderBy: { label: 'asc' },
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
if (!obj) {
|
||||
throw new NotFoundException(`Object ${apiName} not found`);
|
||||
}
|
||||
|
||||
// Get fields for this object
|
||||
const fields = await knex('field_definitions')
|
||||
.where({ objectDefinitionId: obj.id })
|
||||
.orderBy('label', 'asc');
|
||||
|
||||
// Get app information if object belongs to an app
|
||||
let app = null;
|
||||
if (obj.app_id) {
|
||||
app = await knex('apps')
|
||||
.where({ id: obj.app_id })
|
||||
.select('id', 'slug', 'label', 'description')
|
||||
.first();
|
||||
}
|
||||
|
||||
return {
|
||||
...obj,
|
||||
fields,
|
||||
app,
|
||||
};
|
||||
return obj;
|
||||
}
|
||||
|
||||
async createObjectDefinition(
|
||||
@@ -69,15 +49,13 @@ export class ObjectService {
|
||||
isSystem?: boolean;
|
||||
},
|
||||
) {
|
||||
const knex = await this.tenantDbService.getTenantKnex(tenantId);
|
||||
const [id] = await knex('object_definitions').insert({
|
||||
id: knex.raw('(UUID())'),
|
||||
return this.prisma.objectDefinition.create({
|
||||
data: {
|
||||
tenantId,
|
||||
...data,
|
||||
created_at: knex.fn.now(),
|
||||
updated_at: knex.fn.now(),
|
||||
tableName: `custom_${data.apiName.toLowerCase()}`,
|
||||
},
|
||||
});
|
||||
|
||||
return knex('object_definitions').where({ id }).first();
|
||||
}
|
||||
|
||||
async createFieldDefinition(
|
||||
@@ -90,41 +68,20 @@ export class ObjectService {
|
||||
description?: string;
|
||||
isRequired?: boolean;
|
||||
isUnique?: boolean;
|
||||
referenceObject?: string;
|
||||
isLookup?: boolean;
|
||||
referenceTo?: string;
|
||||
defaultValue?: string;
|
||||
options?: any;
|
||||
},
|
||||
) {
|
||||
const knex = await this.tenantDbService.getTenantKnex(tenantId);
|
||||
const obj = await this.getObjectDefinition(tenantId, objectApiName);
|
||||
|
||||
const [id] = await knex('field_definitions').insert({
|
||||
id: knex.raw('(UUID())'),
|
||||
objectDefinitionId: obj.id,
|
||||
return this.prisma.fieldDefinition.create({
|
||||
data: {
|
||||
objectId: obj.id,
|
||||
...data,
|
||||
created_at: knex.fn.now(),
|
||||
updated_at: knex.fn.now(),
|
||||
},
|
||||
});
|
||||
|
||||
return knex('field_definitions').where({ id }).first();
|
||||
}
|
||||
|
||||
// Helper to get table name from object definition
|
||||
private getTableName(objectApiName: string): string {
|
||||
// Convert CamelCase to snake_case and pluralize
|
||||
// Account -> accounts, ContactPerson -> contact_persons
|
||||
const snakeCase = objectApiName
|
||||
.replace(/([A-Z])/g, '_$1')
|
||||
.toLowerCase()
|
||||
.replace(/^_/, '');
|
||||
|
||||
// Simple pluralization (can be enhanced)
|
||||
if (snakeCase.endsWith('y')) {
|
||||
return snakeCase.slice(0, -1) + 'ies';
|
||||
} else if (snakeCase.endsWith('s')) {
|
||||
return snakeCase;
|
||||
} else {
|
||||
return snakeCase + 's';
|
||||
}
|
||||
}
|
||||
|
||||
// Runtime endpoints - CRUD operations
|
||||
@@ -134,27 +91,20 @@ export class ObjectService {
|
||||
userId: string,
|
||||
filters?: any,
|
||||
) {
|
||||
const knex = await this.tenantDbService.getTenantKnex(tenantId);
|
||||
|
||||
// Verify object exists
|
||||
await this.getObjectDefinition(tenantId, objectApiName);
|
||||
|
||||
const tableName = this.getTableName(objectApiName);
|
||||
|
||||
let query = knex(tableName);
|
||||
|
||||
// Add ownership filter if ownerId field exists
|
||||
const hasOwner = await knex.schema.hasColumn(tableName, 'ownerId');
|
||||
if (hasOwner) {
|
||||
query = query.where({ ownerId: userId });
|
||||
// For demonstration, using Account as example static object
|
||||
if (objectApiName === 'Account') {
|
||||
return this.prisma.account.findMany({
|
||||
where: {
|
||||
tenantId,
|
||||
ownerId: userId, // Basic sharing rule
|
||||
...filters,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
// Apply additional filters
|
||||
if (filters) {
|
||||
query = query.where(filters);
|
||||
}
|
||||
|
||||
return query.select('*');
|
||||
// For custom objects, you'd need dynamic query building
|
||||
// This is a simplified version
|
||||
throw new Error(`Runtime queries for ${objectApiName} not yet implemented`);
|
||||
}
|
||||
|
||||
async getRecord(
|
||||
@@ -163,22 +113,14 @@ export class ObjectService {
|
||||
recordId: string,
|
||||
userId: string,
|
||||
) {
|
||||
const knex = await this.tenantDbService.getTenantKnex(tenantId);
|
||||
|
||||
// Verify object exists
|
||||
await this.getObjectDefinition(tenantId, objectApiName);
|
||||
|
||||
const tableName = this.getTableName(objectApiName);
|
||||
|
||||
let query = knex(tableName).where({ id: recordId });
|
||||
|
||||
// Add ownership filter if ownerId field exists
|
||||
const hasOwner = await knex.schema.hasColumn(tableName, 'ownerId');
|
||||
if (hasOwner) {
|
||||
query = query.where({ ownerId: userId });
|
||||
}
|
||||
|
||||
const record = await query.first();
|
||||
if (objectApiName === 'Account') {
|
||||
const record = await this.prisma.account.findFirst({
|
||||
where: {
|
||||
id: recordId,
|
||||
tenantId,
|
||||
ownerId: userId,
|
||||
},
|
||||
});
|
||||
|
||||
if (!record) {
|
||||
throw new NotFoundException('Record not found');
|
||||
@@ -187,36 +129,26 @@ export class ObjectService {
|
||||
return record;
|
||||
}
|
||||
|
||||
throw new Error(`Runtime queries for ${objectApiName} not yet implemented`);
|
||||
}
|
||||
|
||||
async createRecord(
|
||||
tenantId: string,
|
||||
objectApiName: string,
|
||||
data: any,
|
||||
userId: string,
|
||||
) {
|
||||
const knex = await this.tenantDbService.getTenantKnex(tenantId);
|
||||
|
||||
// Verify object exists
|
||||
await this.getObjectDefinition(tenantId, objectApiName);
|
||||
|
||||
const tableName = this.getTableName(objectApiName);
|
||||
|
||||
// Check if table has ownerId column
|
||||
const hasOwner = await knex.schema.hasColumn(tableName, 'ownerId');
|
||||
|
||||
const recordData: any = {
|
||||
id: knex.raw('(UUID())'),
|
||||
if (objectApiName === 'Account') {
|
||||
return this.prisma.account.create({
|
||||
data: {
|
||||
tenantId,
|
||||
ownerId: userId,
|
||||
...data,
|
||||
created_at: knex.fn.now(),
|
||||
updated_at: knex.fn.now(),
|
||||
};
|
||||
|
||||
if (hasOwner) {
|
||||
recordData.ownerId = userId;
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
const [id] = await knex(tableName).insert(recordData);
|
||||
|
||||
return knex(tableName).where({ id }).first();
|
||||
throw new Error(`Runtime queries for ${objectApiName} not yet implemented`);
|
||||
}
|
||||
|
||||
async updateRecord(
|
||||
@@ -226,18 +158,17 @@ export class ObjectService {
|
||||
data: any,
|
||||
userId: string,
|
||||
) {
|
||||
const knex = await this.tenantDbService.getTenantKnex(tenantId);
|
||||
|
||||
// Verify object exists and user has access
|
||||
if (objectApiName === 'Account') {
|
||||
// Verify ownership
|
||||
await this.getRecord(tenantId, objectApiName, recordId, userId);
|
||||
|
||||
const tableName = this.getTableName(objectApiName);
|
||||
return this.prisma.account.update({
|
||||
where: { id: recordId },
|
||||
data,
|
||||
});
|
||||
}
|
||||
|
||||
await knex(tableName)
|
||||
.where({ id: recordId })
|
||||
.update({ ...data, updated_at: knex.fn.now() });
|
||||
|
||||
return knex(tableName).where({ id: recordId }).first();
|
||||
throw new Error(`Runtime queries for ${objectApiName} not yet implemented`);
|
||||
}
|
||||
|
||||
async deleteRecord(
|
||||
@@ -246,15 +177,15 @@ export class ObjectService {
|
||||
recordId: string,
|
||||
userId: string,
|
||||
) {
|
||||
const knex = await this.tenantDbService.getTenantKnex(tenantId);
|
||||
|
||||
// Verify object exists and user has access
|
||||
if (objectApiName === 'Account') {
|
||||
// Verify ownership
|
||||
await this.getRecord(tenantId, objectApiName, recordId, userId);
|
||||
|
||||
const tableName = this.getTableName(objectApiName);
|
||||
return this.prisma.account.delete({
|
||||
where: { id: recordId },
|
||||
});
|
||||
}
|
||||
|
||||
await knex(tableName).where({ id: recordId }).delete();
|
||||
|
||||
return { success: true };
|
||||
throw new Error(`Runtime queries for ${objectApiName} not yet implemented`);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Injectable, OnModuleInit, OnModuleDestroy } from '@nestjs/common';
|
||||
import { PrismaClient } from '.prisma/tenant';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
|
||||
@Injectable()
|
||||
export class PrismaService
|
||||
|
||||
@@ -22,8 +22,6 @@
|
||||
--input: 214.3 31.8% 91.4%;
|
||||
--ring: 222.2 84% 4.9%;
|
||||
--radius: 0.5rem;
|
||||
--popover: 0 0% 100%;
|
||||
--popover-foreground: 222.2 84% 4.9%;
|
||||
--sidebar-background: 0 0% 98%;
|
||||
--sidebar-foreground: 240 5.3% 26.1%;
|
||||
--sidebar-primary: 240 5.9% 10%;
|
||||
@@ -52,8 +50,6 @@
|
||||
--border: 217.2 32.6% 17.5%;
|
||||
--input: 217.2 32.6% 17.5%;
|
||||
--ring: 212.7 26.8% 83.9%;
|
||||
--popover: 222.2 84% 4.9%;
|
||||
--popover-foreground: 210 40% 98%;
|
||||
--sidebar-background: 240 5.9% 10%;
|
||||
--sidebar-foreground: 240 4.8% 95.9%;
|
||||
--sidebar-primary: 224.3 76.3% 48%;
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted } from 'vue'
|
||||
import {
|
||||
Sidebar,
|
||||
SidebarContent,
|
||||
@@ -17,56 +16,9 @@ import {
|
||||
SidebarRail,
|
||||
} from '@/components/ui/sidebar'
|
||||
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible'
|
||||
import { LayoutGrid, Boxes, Settings, Home, ChevronRight, Database, Layers, LogOut } from 'lucide-vue-next'
|
||||
import { LayoutGrid, Boxes, Settings, Home, ChevronRight, Database, Layers } from 'lucide-vue-next'
|
||||
|
||||
const { logout } = useAuth()
|
||||
const { api } = useApi()
|
||||
|
||||
const handleLogout = async () => {
|
||||
await logout()
|
||||
}
|
||||
|
||||
// Fetch objects and group by app
|
||||
const apps = ref<any[]>([])
|
||||
const topLevelObjects = ref<any[]>([])
|
||||
const loading = ref(true)
|
||||
|
||||
onMounted(async () => {
|
||||
try {
|
||||
const response = await api.get('/setup/objects')
|
||||
const allObjects = response.data || response || []
|
||||
|
||||
// Group objects by app
|
||||
const appMap = new Map<string, any>()
|
||||
const noAppObjects: any[] = []
|
||||
|
||||
allObjects.forEach((obj: any) => {
|
||||
const appId = obj.app_id || obj.appId
|
||||
if (appId) {
|
||||
if (!appMap.has(appId)) {
|
||||
appMap.set(appId, {
|
||||
id: appId,
|
||||
name: obj.app?.name || obj.app?.label || 'Unknown App',
|
||||
label: obj.app?.label || obj.app?.name || 'Unknown App',
|
||||
objects: []
|
||||
})
|
||||
}
|
||||
appMap.get(appId)!.objects.push(obj)
|
||||
} else {
|
||||
noAppObjects.push(obj)
|
||||
}
|
||||
})
|
||||
|
||||
apps.value = Array.from(appMap.values())
|
||||
topLevelObjects.value = noAppObjects
|
||||
} catch (e) {
|
||||
console.error('Failed to load objects:', e)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
})
|
||||
|
||||
const staticMenuItems = [
|
||||
const menuItems = [
|
||||
{
|
||||
title: 'Home',
|
||||
url: '/',
|
||||
@@ -88,6 +40,17 @@ const staticMenuItems = [
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
title: 'Runtime',
|
||||
icon: Database,
|
||||
items: [
|
||||
{
|
||||
title: 'My Apps',
|
||||
url: '/app',
|
||||
icon: Layers,
|
||||
},
|
||||
],
|
||||
},
|
||||
]
|
||||
</script>
|
||||
|
||||
@@ -113,12 +76,11 @@ const staticMenuItems = [
|
||||
</SidebarMenu>
|
||||
</SidebarHeader>
|
||||
<SidebarContent>
|
||||
<!-- Static Menu Items -->
|
||||
<SidebarGroup>
|
||||
<SidebarGroupLabel>Navigation</SidebarGroupLabel>
|
||||
<SidebarGroupLabel>Application</SidebarGroupLabel>
|
||||
<SidebarGroupContent>
|
||||
<SidebarMenu>
|
||||
<template v-for="item in staticMenuItems" :key="item.title">
|
||||
<template v-for="item in menuItems" :key="item.title">
|
||||
<!-- Simple menu item -->
|
||||
<SidebarMenuItem v-if="!item.items">
|
||||
<SidebarMenuButton as-child>
|
||||
@@ -159,70 +121,12 @@ const staticMenuItems = [
|
||||
</SidebarMenu>
|
||||
</SidebarGroupContent>
|
||||
</SidebarGroup>
|
||||
|
||||
<!-- Top-level Objects (no app) -->
|
||||
<SidebarGroup v-if="!loading && topLevelObjects.length > 0">
|
||||
<SidebarGroupLabel>Objects</SidebarGroupLabel>
|
||||
<SidebarGroupContent>
|
||||
<SidebarMenu>
|
||||
<SidebarMenuItem v-for="obj in topLevelObjects" :key="obj.id">
|
||||
<SidebarMenuButton as-child>
|
||||
<NuxtLink :to="`/${obj.apiName.toLowerCase()}`">
|
||||
<Database class="h-4 w-4" />
|
||||
<span>{{ obj.label || obj.apiName }}</span>
|
||||
</NuxtLink>
|
||||
</SidebarMenuButton>
|
||||
</SidebarMenuItem>
|
||||
</SidebarMenu>
|
||||
</SidebarGroupContent>
|
||||
</SidebarGroup>
|
||||
|
||||
<!-- App-grouped Objects -->
|
||||
<SidebarGroup v-if="!loading && apps.length > 0">
|
||||
<SidebarGroupLabel>Apps</SidebarGroupLabel>
|
||||
<SidebarGroupContent>
|
||||
<SidebarMenu>
|
||||
<Collapsible
|
||||
v-for="app in apps"
|
||||
:key="app.id"
|
||||
as-child
|
||||
:default-open="true"
|
||||
class="group/collapsible"
|
||||
>
|
||||
<SidebarMenuItem>
|
||||
<CollapsibleTrigger as-child>
|
||||
<SidebarMenuButton :tooltip="app.label">
|
||||
<LayoutGrid class="h-4 w-4" />
|
||||
<span>{{ app.label }}</span>
|
||||
<ChevronRight
|
||||
class="ml-auto transition-transform duration-200 group-data-[state=open]/collapsible:rotate-90"
|
||||
/>
|
||||
</SidebarMenuButton>
|
||||
</CollapsibleTrigger>
|
||||
<CollapsibleContent>
|
||||
<SidebarMenuSub>
|
||||
<SidebarMenuSubItem v-for="obj in app.objects" :key="obj.id">
|
||||
<SidebarMenuSubButton as-child>
|
||||
<NuxtLink :to="`/${obj.apiName.toLowerCase()}`">
|
||||
<Database class="h-4 w-4" />
|
||||
<span>{{ obj.label || obj.apiName }}</span>
|
||||
</NuxtLink>
|
||||
</SidebarMenuSubButton>
|
||||
</SidebarMenuSubItem>
|
||||
</SidebarMenuSub>
|
||||
</CollapsibleContent>
|
||||
</SidebarMenuItem>
|
||||
</Collapsible>
|
||||
</SidebarMenu>
|
||||
</SidebarGroupContent>
|
||||
</SidebarGroup>
|
||||
</SidebarContent>
|
||||
<SidebarFooter>
|
||||
<SidebarMenu>
|
||||
<SidebarMenuItem>
|
||||
<SidebarMenuButton @click="handleLogout" class="cursor-pointer hover:bg-accent">
|
||||
<LogOut class="h-4 w-4" />
|
||||
<span>Logout</span>
|
||||
<SidebarMenuButton>
|
||||
<span class="text-sm text-muted-foreground">Logged in as user</span>
|
||||
</SidebarMenuButton>
|
||||
</SidebarMenuItem>
|
||||
</SidebarMenu>
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
<script setup lang="ts">
|
||||
import type { PrimitiveProps } from "reka-ui"
|
||||
import type { HTMLAttributes } from "vue"
|
||||
import type { ButtonVariants } from "."
|
||||
import { Primitive } from "reka-ui"
|
||||
import { cn } from "@/lib/utils"
|
||||
import { buttonVariants } from "."
|
||||
import type { PrimitiveProps } from 'reka-ui'
|
||||
import type { HTMLAttributes } from 'vue'
|
||||
import type { ButtonVariants } from '.'
|
||||
import { Primitive } from 'reka-ui'
|
||||
import { cn } from '@/lib/utils'
|
||||
import { buttonVariants } from '.'
|
||||
|
||||
interface Props extends PrimitiveProps {
|
||||
variant?: ButtonVariants["variant"]
|
||||
size?: ButtonVariants["size"]
|
||||
class?: HTMLAttributes["class"]
|
||||
variant?: ButtonVariants['variant']
|
||||
size?: ButtonVariants['size']
|
||||
class?: HTMLAttributes['class']
|
||||
}
|
||||
|
||||
const props = withDefaults(defineProps<Props>(), {
|
||||
as: "button",
|
||||
as: 'button',
|
||||
})
|
||||
</script>
|
||||
|
||||
|
||||
@@ -1,38 +1,36 @@
|
||||
import type { VariantProps } from "class-variance-authority"
|
||||
import { cva } from "class-variance-authority"
|
||||
import type { VariantProps } from 'class-variance-authority'
|
||||
import { cva } from 'class-variance-authority'
|
||||
|
||||
export { default as Button } from "./Button.vue"
|
||||
export { default as Button } from './Button.vue'
|
||||
|
||||
export const buttonVariants = cva(
|
||||
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
|
||||
'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
|
||||
{
|
||||
variants: {
|
||||
variant: {
|
||||
default: "bg-primary text-primary-foreground shadow hover:bg-primary/90",
|
||||
destructive:
|
||||
"bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90",
|
||||
default: 'bg-primary text-primary-foreground shadow hover:bg-primary/90',
|
||||
destructive: 'bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90',
|
||||
outline:
|
||||
"border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground",
|
||||
secondary:
|
||||
"bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80",
|
||||
ghost: "hover:bg-accent hover:text-accent-foreground",
|
||||
link: "text-primary underline-offset-4 hover:underline",
|
||||
'border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground',
|
||||
secondary: 'bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80',
|
||||
ghost: 'hover:bg-accent hover:text-accent-foreground',
|
||||
link: 'text-primary underline-offset-4 hover:underline',
|
||||
},
|
||||
size: {
|
||||
"default": "h-9 px-4 py-2",
|
||||
"xs": "h-7 rounded px-2",
|
||||
"sm": "h-8 rounded-md px-3 text-xs",
|
||||
"lg": "h-10 rounded-md px-8",
|
||||
"icon": "h-9 w-9",
|
||||
"icon-sm": "size-8",
|
||||
"icon-lg": "size-10",
|
||||
default: 'h-9 px-4 py-2',
|
||||
xs: 'h-7 rounded px-2',
|
||||
sm: 'h-8 rounded-md px-3 text-xs',
|
||||
lg: 'h-10 rounded-md px-8',
|
||||
icon: 'h-9 w-9',
|
||||
'icon-sm': 'size-8',
|
||||
'icon-lg': 'size-10',
|
||||
},
|
||||
},
|
||||
defaultVariants: {
|
||||
variant: "default",
|
||||
size: "default",
|
||||
},
|
||||
variant: 'default',
|
||||
size: 'default',
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
export type ButtonVariants = VariantProps<typeof buttonVariants>
|
||||
|
||||
@@ -5,7 +5,6 @@ import { Button } from '@/components/ui/button'
|
||||
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
|
||||
import { CalendarIcon } from 'lucide-vue-next'
|
||||
import { cn } from '@/lib/utils'
|
||||
import { CalendarDate, type DateValue } from '@internationalized/date'
|
||||
|
||||
interface Props {
|
||||
modelValue?: Date | string | null
|
||||
@@ -23,27 +22,18 @@ const emit = defineEmits<{
|
||||
'update:modelValue': [value: Date | null]
|
||||
}>()
|
||||
|
||||
const placeholder = ref<DateValue>(new CalendarDate(new Date().getFullYear(), new Date().getMonth() + 1, new Date().getDate()))
|
||||
|
||||
const value = computed<DateValue | undefined>({
|
||||
const value = computed({
|
||||
get: () => {
|
||||
if (!props.modelValue) return undefined
|
||||
const date = props.modelValue instanceof Date ? props.modelValue : new Date(props.modelValue)
|
||||
return new CalendarDate(date.getFullYear(), date.getMonth() + 1, date.getDate())
|
||||
return props.modelValue instanceof Date ? props.modelValue : new Date(props.modelValue)
|
||||
},
|
||||
set: (dateValue) => {
|
||||
if (!dateValue) {
|
||||
emit('update:modelValue', null)
|
||||
return
|
||||
}
|
||||
const jsDate = new Date(dateValue.year, dateValue.month - 1, dateValue.day)
|
||||
emit('update:modelValue', jsDate)
|
||||
set: (date) => {
|
||||
emit('update:modelValue', date || null)
|
||||
},
|
||||
})
|
||||
|
||||
const formatDate = (dateValue: DateValue | undefined) => {
|
||||
if (!dateValue) return props.placeholder
|
||||
const date = new Date(dateValue.year, dateValue.month - 1, dateValue.day)
|
||||
const formatDate = (date: Date | undefined) => {
|
||||
if (!date) return props.placeholder
|
||||
return date.toLocaleDateString('en-US', {
|
||||
year: 'numeric',
|
||||
month: 'long',
|
||||
@@ -68,7 +58,7 @@ const formatDate = (dateValue: DateValue | undefined) => {
|
||||
</Button>
|
||||
</PopoverTrigger>
|
||||
<PopoverContent class="w-auto p-0">
|
||||
<Calendar v-model="value" :placeholder="placeholder" />
|
||||
<Calendar v-model="value" initial-focus />
|
||||
</PopoverContent>
|
||||
</Popover>
|
||||
</template>
|
||||
|
||||
@@ -4,6 +4,7 @@ import type { HTMLAttributes } from "vue"
|
||||
import { reactiveOmit } from "@vueuse/core"
|
||||
import {
|
||||
PopoverContent,
|
||||
PopoverPortal,
|
||||
useForwardPropsEmits,
|
||||
} from "reka-ui"
|
||||
import { cn } from "@/lib/utils"
|
||||
@@ -27,6 +28,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<PopoverPortal>
|
||||
<PopoverContent
|
||||
v-bind="{ ...forwarded, ...$attrs }"
|
||||
:class="
|
||||
@@ -38,4 +40,5 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
|
||||
>
|
||||
<slot />
|
||||
</PopoverContent>
|
||||
</PopoverPortal>
|
||||
</template>
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
<script setup lang="ts">
|
||||
import { TabsRoot, type TabsRootProps } from 'radix-vue'
|
||||
import { computed, type HTMLAttributes } from 'vue'
|
||||
import { cn } from '@/lib/utils'
|
||||
|
||||
const props = defineProps<TabsRootProps & { class?: HTMLAttributes['class'] }>()
|
||||
|
||||
const delegatedProps = computed(() => {
|
||||
const { class: _, ...delegated } = props
|
||||
return delegated
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<TabsRoot v-bind="delegatedProps" :class="cn('', props.class)">
|
||||
<slot />
|
||||
</TabsRoot>
|
||||
</template>
|
||||
@@ -1,26 +0,0 @@
|
||||
<script setup lang="ts">
|
||||
import { TabsContent, type TabsContentProps } from 'radix-vue'
|
||||
import { computed, type HTMLAttributes } from 'vue'
|
||||
import { cn } from '@/lib/utils'
|
||||
|
||||
const props = defineProps<TabsContentProps & { class?: HTMLAttributes['class'] }>()
|
||||
|
||||
const delegatedProps = computed(() => {
|
||||
const { class: _, ...delegated } = props
|
||||
return delegated
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<TabsContent
|
||||
v-bind="delegatedProps"
|
||||
:class="
|
||||
cn(
|
||||
'mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2',
|
||||
props.class
|
||||
)
|
||||
"
|
||||
>
|
||||
<slot />
|
||||
</TabsContent>
|
||||
</template>
|
||||
@@ -1,26 +0,0 @@
|
||||
<script setup lang="ts">
|
||||
import { TabsList, type TabsListProps } from 'radix-vue'
|
||||
import { computed, type HTMLAttributes } from 'vue'
|
||||
import { cn } from '@/lib/utils'
|
||||
|
||||
const props = defineProps<TabsListProps & { class?: HTMLAttributes['class'] }>()
|
||||
|
||||
const delegatedProps = computed(() => {
|
||||
const { class: _, ...delegated } = props
|
||||
return delegated
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<TabsList
|
||||
v-bind="delegatedProps"
|
||||
:class="
|
||||
cn(
|
||||
'inline-flex h-9 items-center justify-center rounded-lg bg-muted p-1 text-muted-foreground',
|
||||
props.class
|
||||
)
|
||||
"
|
||||
>
|
||||
<slot />
|
||||
</TabsList>
|
||||
</template>
|
||||
@@ -1,26 +0,0 @@
|
||||
<script setup lang="ts">
|
||||
import { TabsTrigger, type TabsTriggerProps } from 'radix-vue'
|
||||
import { computed, type HTMLAttributes } from 'vue'
|
||||
import { cn } from '@/lib/utils'
|
||||
|
||||
const props = defineProps<TabsTriggerProps & { class?: HTMLAttributes['class'] }>()
|
||||
|
||||
const delegatedProps = computed(() => {
|
||||
const { class: _, ...delegated } = props
|
||||
return delegated
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<TabsTrigger
|
||||
v-bind="delegatedProps"
|
||||
:class="
|
||||
cn(
|
||||
'inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow',
|
||||
props.class
|
||||
)
|
||||
"
|
||||
>
|
||||
<slot />
|
||||
</TabsTrigger>
|
||||
</template>
|
||||
@@ -1,4 +0,0 @@
|
||||
export { default as Tabs } from './Tabs.vue'
|
||||
export { default as TabsContent } from './TabsContent.vue'
|
||||
export { default as TabsList } from './TabsList.vue'
|
||||
export { default as TabsTrigger } from './TabsTrigger.vue'
|
||||
@@ -139,7 +139,7 @@ const getFieldsBySection = (section: FieldSection) => {
|
||||
<div class="grid gap-6 md:grid-cols-2">
|
||||
<FieldRenderer
|
||||
v-for="field in getFieldsBySection(section)"
|
||||
:key="field?.id"
|
||||
:key="field.id"
|
||||
:field="field"
|
||||
:model-value="data[field.apiName]"
|
||||
:mode="ViewMode.DETAIL"
|
||||
|
||||
@@ -47,22 +47,18 @@ const sections = computed<FieldSection[]>(() => {
|
||||
}
|
||||
|
||||
// Default section with all visible fields
|
||||
const visibleFields = props.config.fields
|
||||
.filter(f => f.showOnEdit !== false)
|
||||
.map(f => f.apiName)
|
||||
|
||||
return [{
|
||||
title: 'Details',
|
||||
fields: visibleFields,
|
||||
fields: props.config.fields
|
||||
.filter(f => f.showOnEdit !== false)
|
||||
.map(f => f.apiName),
|
||||
}]
|
||||
})
|
||||
|
||||
const getFieldsBySection = (section: FieldSection) => {
|
||||
const fields = section.fields
|
||||
return section.fields
|
||||
.map(apiName => props.config.fields.find(f => f.apiName === apiName))
|
||||
.filter(Boolean)
|
||||
|
||||
return fields
|
||||
}
|
||||
|
||||
const validateField = (field: any): string | null => {
|
||||
|
||||
@@ -231,12 +231,4 @@ const handleAction = (actionId: string) => {
|
||||
.list-view {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.list-view :deep(.border) {
|
||||
background-color: hsl(var(--card));
|
||||
}
|
||||
|
||||
.list-view :deep(input) {
|
||||
background-color: hsl(var(--background));
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -63,63 +63,15 @@ export const useApi = () => {
|
||||
}
|
||||
|
||||
if (!response.ok) {
|
||||
// Try to get error details from response
|
||||
const text = await response.text()
|
||||
console.error('API Error Response:', {
|
||||
status: response.status,
|
||||
statusText: response.statusText,
|
||||
body: text
|
||||
})
|
||||
|
||||
let errorMessage = `HTTP error! status: ${response.status}`
|
||||
if (text) {
|
||||
try {
|
||||
const errorData = JSON.parse(text)
|
||||
errorMessage = errorData.message || errorData.error || errorMessage
|
||||
} catch (e) {
|
||||
// If not JSON, use the text directly if it's not too long
|
||||
if (text.length < 200) {
|
||||
errorMessage = text
|
||||
}
|
||||
}
|
||||
throw new Error(`HTTP error! status: ${response.status}`)
|
||||
}
|
||||
|
||||
throw new Error(errorMessage)
|
||||
}
|
||||
|
||||
// Handle empty responses
|
||||
const text = await response.text()
|
||||
if (!text) {
|
||||
return {}
|
||||
}
|
||||
|
||||
try {
|
||||
return JSON.parse(text)
|
||||
} catch (e) {
|
||||
console.error('Failed to parse JSON response:', text)
|
||||
throw new Error('Invalid JSON response from server')
|
||||
}
|
||||
return response.json()
|
||||
}
|
||||
|
||||
const api = {
|
||||
async get(path: string, options?: { params?: Record<string, any> }) {
|
||||
let url = `${getApiBaseUrl()}/api${path}`
|
||||
|
||||
// Add query parameters if provided
|
||||
if (options?.params) {
|
||||
const searchParams = new URLSearchParams()
|
||||
Object.entries(options.params).forEach(([key, value]) => {
|
||||
if (value !== undefined && value !== null) {
|
||||
searchParams.append(key, String(value))
|
||||
}
|
||||
})
|
||||
const queryString = searchParams.toString()
|
||||
if (queryString) {
|
||||
url += `?${queryString}`
|
||||
}
|
||||
}
|
||||
|
||||
const response = await fetch(url, {
|
||||
async get(path: string) {
|
||||
const response = await fetch(`${getApiBaseUrl()}/api${path}`, {
|
||||
headers: getHeaders(),
|
||||
})
|
||||
return handleResponse(response)
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
export const useAuth = () => {
|
||||
const tokenCookie = useCookie('token')
|
||||
const authMessageCookie = useCookie('authMessage')
|
||||
const router = useRouter()
|
||||
const config = useRuntimeConfig()
|
||||
|
||||
const isLoggedIn = () => {
|
||||
if (!import.meta.client) return false
|
||||
@@ -11,40 +8,14 @@ export const useAuth = () => {
|
||||
return !!(token && tenantId)
|
||||
}
|
||||
|
||||
const logout = async () => {
|
||||
const logout = () => {
|
||||
if (import.meta.client) {
|
||||
// Call backend logout endpoint
|
||||
try {
|
||||
const token = localStorage.getItem('token')
|
||||
const tenantId = localStorage.getItem('tenantId')
|
||||
|
||||
if (token) {
|
||||
await fetch(`${config.public.apiBaseUrl}/api/auth/logout`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Authorization': `Bearer ${token}`,
|
||||
...(tenantId && { 'x-tenant-id': tenantId }),
|
||||
},
|
||||
})
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Logout error:', error)
|
||||
}
|
||||
|
||||
// Clear local storage
|
||||
localStorage.removeItem('token')
|
||||
localStorage.removeItem('tenantId')
|
||||
localStorage.removeItem('user')
|
||||
|
||||
}
|
||||
// Clear cookie for server-side check
|
||||
tokenCookie.value = null
|
||||
|
||||
// Set flash message for login page
|
||||
authMessageCookie.value = 'Logged out successfully'
|
||||
|
||||
// Redirect to login page
|
||||
router.push('/login')
|
||||
}
|
||||
}
|
||||
|
||||
const getUser = () => {
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
import { ref } from 'vue'
|
||||
|
||||
// Shared state for breadcrumbs
|
||||
const customBreadcrumbs = ref<Array<{ name: string; path?: string; isLast?: boolean }>>([])
|
||||
|
||||
export function useBreadcrumbs() {
|
||||
const setBreadcrumbs = (crumbs: Array<{ name: string; path?: string; isLast?: boolean }>) => {
|
||||
customBreadcrumbs.value = crumbs
|
||||
}
|
||||
|
||||
const clearBreadcrumbs = () => {
|
||||
customBreadcrumbs.value = []
|
||||
}
|
||||
|
||||
return {
|
||||
breadcrumbs: customBreadcrumbs,
|
||||
setBreadcrumbs,
|
||||
clearBreadcrumbs
|
||||
}
|
||||
}
|
||||
@@ -10,12 +10,6 @@ export const useFields = () => {
|
||||
* Convert backend field definition to frontend FieldConfig
|
||||
*/
|
||||
const mapFieldDefinitionToConfig = (fieldDef: any): FieldConfig => {
|
||||
// Convert isSystem to boolean (handle 0/1 from database)
|
||||
const isSystemField = Boolean(fieldDef.isSystem)
|
||||
|
||||
// Only truly system fields (id, createdAt, updatedAt, etc.) should be hidden on edit
|
||||
const isAutoGeneratedField = ['id', 'createdAt', 'updatedAt', 'createdBy', 'updatedBy'].includes(fieldDef.apiName)
|
||||
|
||||
return {
|
||||
id: fieldDef.id,
|
||||
apiName: fieldDef.apiName,
|
||||
@@ -29,13 +23,13 @@ export const useFields = () => {
|
||||
|
||||
// Validation
|
||||
isRequired: fieldDef.isRequired,
|
||||
isReadOnly: isAutoGeneratedField || fieldDef.uiMetadata?.isReadOnly,
|
||||
isReadOnly: fieldDef.isSystem || fieldDef.uiMetadata?.isReadOnly,
|
||||
validationRules: fieldDef.uiMetadata?.validationRules || [],
|
||||
|
||||
// View options - only hide auto-generated fields by default
|
||||
// View options
|
||||
showOnList: fieldDef.uiMetadata?.showOnList ?? true,
|
||||
showOnDetail: fieldDef.uiMetadata?.showOnDetail ?? true,
|
||||
showOnEdit: fieldDef.uiMetadata?.showOnEdit ?? !isAutoGeneratedField,
|
||||
showOnEdit: fieldDef.uiMetadata?.showOnEdit ?? !fieldDef.isSystem,
|
||||
sortable: fieldDef.uiMetadata?.sortable ?? true,
|
||||
|
||||
// Field type specific
|
||||
@@ -182,15 +176,14 @@ export const useViewState = <T extends { id?: string }>(
|
||||
const saving = ref(false)
|
||||
const error = ref<string | null>(null)
|
||||
|
||||
const { api } = useApi()
|
||||
const api = useApi()
|
||||
|
||||
const fetchRecords = async (params?: Record<string, any>) => {
|
||||
loading.value = true
|
||||
error.value = null
|
||||
try {
|
||||
const response = await api.get(apiEndpoint, { params })
|
||||
// Handle response - data might be directly in response or in response.data
|
||||
records.value = response.data || response || []
|
||||
records.value = response.data
|
||||
} catch (e: any) {
|
||||
error.value = e.message
|
||||
console.error('Failed to fetch records:', e)
|
||||
@@ -204,8 +197,7 @@ export const useViewState = <T extends { id?: string }>(
|
||||
error.value = null
|
||||
try {
|
||||
const response = await api.get(`${apiEndpoint}/${id}`)
|
||||
// Handle response - data might be directly in response or in response.data
|
||||
currentRecord.value = response.data || response
|
||||
currentRecord.value = response.data
|
||||
} catch (e: any) {
|
||||
error.value = e.message
|
||||
console.error('Failed to fetch record:', e)
|
||||
@@ -219,12 +211,9 @@ export const useViewState = <T extends { id?: string }>(
|
||||
error.value = null
|
||||
try {
|
||||
const response = await api.post(apiEndpoint, data)
|
||||
|
||||
// Handle response - it might be the data directly or wrapped in { data: ... }
|
||||
const recordData = response.data || response
|
||||
records.value.push(recordData)
|
||||
currentRecord.value = recordData
|
||||
return recordData
|
||||
records.value.push(response.data)
|
||||
currentRecord.value = response.data
|
||||
return response.data
|
||||
} catch (e: any) {
|
||||
error.value = e.message
|
||||
console.error('Failed to create record:', e)
|
||||
@@ -238,18 +227,13 @@ export const useViewState = <T extends { id?: string }>(
|
||||
saving.value = true
|
||||
error.value = null
|
||||
try {
|
||||
// Remove auto-generated fields that shouldn't be updated
|
||||
const { id: _id, createdAt, created_at, updatedAt, updated_at, createdBy, updatedBy, ...updateData } = data as any
|
||||
|
||||
const response = await api.put(`${apiEndpoint}/${id}`, updateData)
|
||||
// Handle response - data might be directly in response or in response.data
|
||||
const recordData = response.data || response
|
||||
const response = await api.put(`${apiEndpoint}/${id}`, data)
|
||||
const idx = records.value.findIndex(r => r.id === id)
|
||||
if (idx !== -1) {
|
||||
records.value[idx] = recordData
|
||||
records.value[idx] = response.data
|
||||
}
|
||||
currentRecord.value = recordData
|
||||
return recordData
|
||||
currentRecord.value = response.data
|
||||
return response.data
|
||||
} catch (e: any) {
|
||||
error.value = e.message
|
||||
console.error('Failed to update record:', e)
|
||||
@@ -308,13 +292,12 @@ export const useViewState = <T extends { id?: string }>(
|
||||
}
|
||||
|
||||
const handleSave = async (data: T) => {
|
||||
let savedRecord
|
||||
if (data.id) {
|
||||
savedRecord = await updateRecord(data.id, data)
|
||||
await updateRecord(data.id, data)
|
||||
} else {
|
||||
savedRecord = await createRecord(data)
|
||||
await createRecord(data)
|
||||
}
|
||||
return savedRecord
|
||||
showDetail(currentRecord.value!)
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue'
|
||||
import AppSidebar from '@/components/AppSidebar.vue'
|
||||
import AIChatBar from '@/components/AIChatBar.vue'
|
||||
import {
|
||||
@@ -14,15 +13,8 @@ import { Separator } from '@/components/ui/separator'
|
||||
import { SidebarInset, SidebarProvider, SidebarTrigger } from '@/components/ui/sidebar'
|
||||
|
||||
const route = useRoute()
|
||||
const { breadcrumbs: customBreadcrumbs } = useBreadcrumbs()
|
||||
|
||||
const breadcrumbs = computed(() => {
|
||||
// If custom breadcrumbs are set by the page, use those
|
||||
if (customBreadcrumbs.value.length > 0) {
|
||||
return customBreadcrumbs.value
|
||||
}
|
||||
|
||||
// Otherwise, fall back to URL-based breadcrumbs
|
||||
const paths = route.path.split('/').filter(Boolean)
|
||||
return paths.map((path, index) => ({
|
||||
name: path.charAt(0).toUpperCase() + path.slice(1),
|
||||
|
||||
@@ -41,11 +41,6 @@ export default defineNuxtConfig({
|
||||
|
||||
typescript: {
|
||||
strict: true,
|
||||
tsConfig: {
|
||||
compilerOptions: {
|
||||
verbatimModuleSyntax: false,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
features: {
|
||||
@@ -53,14 +48,11 @@ export default defineNuxtConfig({
|
||||
},
|
||||
|
||||
vite: {
|
||||
optimizeDeps: {
|
||||
include: ['@internationalized/date'],
|
||||
},
|
||||
server: {
|
||||
hmr: {
|
||||
clientPort: 3001,
|
||||
},
|
||||
allowedHosts: ['.routebox.co', 'localhost', '127.0.0.1'],
|
||||
allowedHosts: ['.routebox.co', 'localhost', '127.0.0.1',],
|
||||
},
|
||||
},
|
||||
|
||||
|
||||
7
frontend/package-lock.json
generated
7
frontend/package-lock.json
generated
@@ -9,7 +9,6 @@
|
||||
"version": "0.0.1",
|
||||
"hasInstallScript": true,
|
||||
"dependencies": {
|
||||
"@internationalized/date": "^3.10.1",
|
||||
"@nuxtjs/tailwindcss": "^6.11.4",
|
||||
"@vueuse/core": "^10.11.1",
|
||||
"class-variance-authority": "^0.7.0",
|
||||
@@ -1260,9 +1259,9 @@
|
||||
"peer": true
|
||||
},
|
||||
"node_modules/@internationalized/date": {
|
||||
"version": "3.10.1",
|
||||
"resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.10.1.tgz",
|
||||
"integrity": "sha512-oJrXtQiAXLvT9clCf1K4kxp3eKsQhIaZqxEyowkBcsvZDdZkbWrVmnGknxs5flTD0VGsxrxKgBCZty1EzoiMzA==",
|
||||
"version": "3.10.0",
|
||||
"resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.10.0.tgz",
|
||||
"integrity": "sha512-oxDR/NTEJ1k+UFVQElaNIk65E/Z83HK1z1WI3lQyhTtnNg4R5oVXaPzK3jcpKG8UHKDVuDQHzn+wsxSz8RP3aw==",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@swc/helpers": "^0.5.0"
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
"format": "prettier --write \"**/*.{js,ts,vue,json,css,scss,md}\""
|
||||
},
|
||||
"dependencies": {
|
||||
"@internationalized/date": "^3.10.1",
|
||||
"@nuxtjs/tailwindcss": "^6.11.4",
|
||||
"@vueuse/core": "^10.11.1",
|
||||
"class-variance-authority": "^0.7.0",
|
||||
|
||||
@@ -1,301 +0,0 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, computed, onMounted, watch, nextTick } from 'vue'
|
||||
import { useRoute, useRouter } from 'vue-router'
|
||||
import { useApi } from '@/composables/useApi'
|
||||
import { useFields, useViewState } from '@/composables/useFieldViews'
|
||||
import ListView from '@/components/views/ListView.vue'
|
||||
import DetailView from '@/components/views/DetailView.vue'
|
||||
import EditView from '@/components/views/EditView.vue'
|
||||
|
||||
const route = useRoute()
|
||||
const router = useRouter()
|
||||
const { api } = useApi()
|
||||
const { buildListViewConfig, buildDetailViewConfig, buildEditViewConfig } = useFields()
|
||||
|
||||
// Use breadcrumbs composable
|
||||
const { setBreadcrumbs } = useBreadcrumbs()
|
||||
|
||||
// Get object API name from route (case-insensitive)
|
||||
const objectApiName = computed(() => {
|
||||
const name = route.params.objectName as string
|
||||
// We'll look up the actual case-sensitive name from the backend
|
||||
return name
|
||||
})
|
||||
const recordId = computed(() => route.params.recordId as string)
|
||||
const view = computed(() => {
|
||||
// If recordId is 'new', default to 'edit' view
|
||||
if (route.params.recordId === 'new' && !route.params.view) {
|
||||
return 'edit'
|
||||
}
|
||||
return (route.params.view as 'list' | 'detail' | 'edit') || 'list'
|
||||
})
|
||||
|
||||
// State
|
||||
const objectDefinition = ref<any>(null)
|
||||
const loading = ref(true)
|
||||
const error = ref<string | null>(null)
|
||||
|
||||
// Use view state composable
|
||||
const {
|
||||
records,
|
||||
currentRecord,
|
||||
loading: dataLoading,
|
||||
saving,
|
||||
fetchRecords,
|
||||
fetchRecord,
|
||||
deleteRecord,
|
||||
deleteRecords,
|
||||
handleSave,
|
||||
} = useViewState(`/runtime/objects/${objectApiName.value}/records`)
|
||||
|
||||
// Compute breadcrumbs based on the current route and object data
|
||||
const updateBreadcrumbs = () => {
|
||||
if (!objectDefinition.value) {
|
||||
return
|
||||
}
|
||||
|
||||
const crumbs: Array<{ name: string; path?: string; isLast?: boolean }> = []
|
||||
|
||||
// Add app breadcrumb if object belongs to an app
|
||||
if (objectDefinition.value?.app) {
|
||||
crumbs.push({
|
||||
name: objectDefinition.value.app.label || objectDefinition.value.app.name,
|
||||
path: undefined, // No path for app grouping
|
||||
})
|
||||
}
|
||||
|
||||
// Add object breadcrumb - always use plural
|
||||
const objectLabel = objectDefinition.value?.pluralLabel || objectDefinition.value?.label || objectApiName.value
|
||||
|
||||
crumbs.push({
|
||||
name: objectLabel,
|
||||
path: `/${objectApiName.value.toLowerCase()}`,
|
||||
})
|
||||
|
||||
// Add record name if viewing/editing a specific record
|
||||
if (recordId.value && recordId.value !== 'new' && currentRecord.value) {
|
||||
const nameField = objectDefinition.value?.nameField
|
||||
let recordName = recordId.value // fallback to ID
|
||||
|
||||
// Try to get the display name from the nameField
|
||||
if (nameField && currentRecord.value[nameField]) {
|
||||
recordName = currentRecord.value[nameField]
|
||||
}
|
||||
|
||||
crumbs.push({
|
||||
name: recordName,
|
||||
isLast: true,
|
||||
})
|
||||
} else if (recordId.value === 'new') {
|
||||
crumbs.push({
|
||||
name: 'New',
|
||||
isLast: true,
|
||||
})
|
||||
}
|
||||
|
||||
setBreadcrumbs(crumbs)
|
||||
}
|
||||
|
||||
// Watch for changes that affect breadcrumbs
|
||||
watch([objectDefinition, currentRecord, recordId], () => {
|
||||
updateBreadcrumbs()
|
||||
}, { deep: true })
|
||||
|
||||
// View configs
|
||||
const listConfig = computed(() => {
|
||||
if (!objectDefinition.value) return null
|
||||
return buildListViewConfig(objectDefinition.value, {
|
||||
searchable: true,
|
||||
exportable: true,
|
||||
filterable: true,
|
||||
})
|
||||
})
|
||||
|
||||
const detailConfig = computed(() => {
|
||||
if (!objectDefinition.value) return null
|
||||
return buildDetailViewConfig(objectDefinition.value)
|
||||
})
|
||||
|
||||
const editConfig = computed(() => {
|
||||
if (!objectDefinition.value) return null
|
||||
return buildEditViewConfig(objectDefinition.value)
|
||||
})
|
||||
|
||||
// Fetch object definition
|
||||
const fetchObjectDefinition = async () => {
|
||||
try {
|
||||
loading.value = true
|
||||
error.value = null
|
||||
const response = await api.get(`/setup/objects/${objectApiName.value}`)
|
||||
objectDefinition.value = response
|
||||
} catch (e: any) {
|
||||
error.value = e.message || 'Failed to load object definition'
|
||||
console.error('Error fetching object definition:', e)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
// Navigation handlers - use lowercase URLs
|
||||
const handleRowClick = (row: any) => {
|
||||
router.push(`/${objectApiName.value.toLowerCase()}/${row.id}/detail`)
|
||||
}
|
||||
|
||||
const handleCreate = () => {
|
||||
router.push(`/${objectApiName.value.toLowerCase()}/new`)
|
||||
}
|
||||
|
||||
const handleEdit = (row?: any) => {
|
||||
const id = row?.id || recordId.value
|
||||
router.push(`/${objectApiName.value.toLowerCase()}/${id}/edit`)
|
||||
}
|
||||
|
||||
const handleBack = () => {
|
||||
// Navigate to list view explicitly
|
||||
router.push(`/${objectApiName.value.toLowerCase()}/`)
|
||||
}
|
||||
|
||||
const handleDelete = async (rows: any[]) => {
|
||||
if (confirm(`Delete ${rows.length} record(s)? This action cannot be undone.`)) {
|
||||
try {
|
||||
const ids = rows.map(r => r.id)
|
||||
await deleteRecords(ids)
|
||||
if (view.value !== 'list') {
|
||||
await router.push(`/${objectApiName.value.toLowerCase()}/`)
|
||||
}
|
||||
} catch (e: any) {
|
||||
error.value = e.message || 'Failed to delete records'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const handleSaveRecord = async (data: any) => {
|
||||
try {
|
||||
const savedRecord = await handleSave(data)
|
||||
if (savedRecord?.id) {
|
||||
router.push(`/${objectApiName.value.toLowerCase()}/${savedRecord.id}/detail`)
|
||||
} else {
|
||||
// Fallback to list if no ID available
|
||||
router.push(`/${objectApiName.value.toLowerCase()}/`)
|
||||
}
|
||||
} catch (e: any) {
|
||||
error.value = e.message || 'Failed to save record'
|
||||
}
|
||||
}
|
||||
|
||||
const handleCancel = () => {
|
||||
if (recordId.value && recordId.value !== 'new') {
|
||||
router.push(`/${objectApiName.value.toLowerCase()}/${recordId.value}/detail`)
|
||||
} else {
|
||||
router.push(`/${objectApiName.value.toLowerCase()}/`)
|
||||
}
|
||||
}
|
||||
|
||||
// Watch for route changes
|
||||
watch(() => route.params, async (newParams, oldParams) => {
|
||||
// Reset current record when navigating to 'new'
|
||||
if (newParams.recordId === 'new') {
|
||||
currentRecord.value = null
|
||||
}
|
||||
|
||||
// Fetch record if navigating to existing record
|
||||
if (newParams.recordId && newParams.recordId !== 'new' && newParams.recordId !== oldParams.recordId) {
|
||||
await fetchRecord(newParams.recordId as string)
|
||||
}
|
||||
|
||||
// Fetch records if navigating back to list
|
||||
if (!newParams.recordId && !newParams.view) {
|
||||
await fetchRecords()
|
||||
}
|
||||
}, { deep: true })
|
||||
|
||||
// Initialize
|
||||
onMounted(async () => {
|
||||
await fetchObjectDefinition()
|
||||
|
||||
if (view.value === 'list') {
|
||||
await fetchRecords()
|
||||
} else if (recordId.value && recordId.value !== 'new') {
|
||||
await fetchRecord(recordId.value)
|
||||
}
|
||||
|
||||
// Update breadcrumbs after data is loaded
|
||||
updateBreadcrumbs()
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<NuxtLayout name="default">
|
||||
<div class="object-view-container">
|
||||
|
||||
<!-- Page Header -->
|
||||
<div v-if="!loading && !error && view === 'list'" class="mb-6">
|
||||
<h1 class="text-3xl font-bold">{{ objectDefinition?.label || objectApiName }}</h1>
|
||||
<p v-if="objectDefinition?.description" class="text-muted-foreground mt-2">
|
||||
{{ objectDefinition.description }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- Loading State -->
|
||||
<div v-if="loading" class="flex items-center justify-center min-h-screen">
|
||||
<div class="text-center space-y-4">
|
||||
<div class="animate-spin rounded-full h-12 w-12 border-b-2 border-primary mx-auto"></div>
|
||||
<p class="text-muted-foreground">Loading {{ objectApiName }}...</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Error State -->
|
||||
<div v-else-if="error" class="flex items-center justify-center min-h-screen">
|
||||
<div class="text-center space-y-4 max-w-md">
|
||||
<div class="text-destructive text-5xl">⚠️</div>
|
||||
<h2 class="text-2xl font-bold">Error</h2>
|
||||
<p class="text-muted-foreground">{{ error }}</p>
|
||||
<Button @click="router.back()">Go Back</Button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- List View -->
|
||||
<ListView
|
||||
v-else-if="view === 'list' && listConfig"
|
||||
:config="listConfig"
|
||||
:data="records"
|
||||
:loading="dataLoading"
|
||||
selectable
|
||||
@row-click="handleRowClick"
|
||||
@create="handleCreate"
|
||||
@edit="handleEdit"
|
||||
@delete="handleDelete"
|
||||
/>
|
||||
|
||||
<!-- Detail View -->
|
||||
<DetailView
|
||||
v-else-if="view === 'detail' && detailConfig && currentRecord"
|
||||
:config="detailConfig"
|
||||
:data="currentRecord"
|
||||
:loading="dataLoading"
|
||||
@edit="handleEdit"
|
||||
@delete="() => handleDelete([currentRecord])"
|
||||
@back="handleBack"
|
||||
/>
|
||||
|
||||
<!-- Edit View -->
|
||||
<EditView
|
||||
v-else-if="(view === 'edit' || recordId === 'new') && editConfig"
|
||||
:config="editConfig"
|
||||
:data="currentRecord || {}"
|
||||
:loading="dataLoading"
|
||||
:saving="saving"
|
||||
@save="handleSaveRecord"
|
||||
@cancel="handleCancel"
|
||||
@back="handleBack"
|
||||
/>
|
||||
</div>
|
||||
</NuxtLayout>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.object-view-container {
|
||||
min-height: 100vh;
|
||||
padding: 2rem;
|
||||
}
|
||||
</style>
|
||||
@@ -1,16 +0,0 @@
|
||||
<script setup lang="ts">
|
||||
// Redirect to a default page or show dashboard
|
||||
const router = useRouter()
|
||||
|
||||
// You can redirect to a dashboard or objects list
|
||||
// For now, just show a simple message
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<NuxtLayout name="default">
|
||||
<div class="container mx-auto p-8">
|
||||
<h1 class="text-3xl font-bold mb-4">Welcome to Neo Platform</h1>
|
||||
<p class="text-muted-foreground">Select an object from the sidebar to get started.</p>
|
||||
</div>
|
||||
</NuxtLayout>
|
||||
</template>
|
||||
@@ -1,5 +1,5 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, computed, onMounted, watch, nextTick } from 'vue'
|
||||
import { ref, computed, onMounted } from 'vue'
|
||||
import { useRoute, useRouter } from 'vue-router'
|
||||
import { useApi } from '@/composables/useApi'
|
||||
import { useFields, useViewState } from '@/composables/useFieldViews'
|
||||
@@ -9,19 +9,13 @@ import EditView from '@/components/views/EditView.vue'
|
||||
|
||||
const route = useRoute()
|
||||
const router = useRouter()
|
||||
const { api } = useApi()
|
||||
const api = useApi()
|
||||
const { buildListViewConfig, buildDetailViewConfig, buildEditViewConfig } = useFields()
|
||||
|
||||
// Get object API name from route
|
||||
const objectApiName = computed(() => route.params.objectName as string)
|
||||
const recordId = computed(() => route.params.recordId as string)
|
||||
const view = computed(() => {
|
||||
// If recordId is 'new', default to 'edit' view
|
||||
if (route.params.recordId === 'new' && !route.params.view) {
|
||||
return 'edit'
|
||||
}
|
||||
return (route.params.view as 'list' | 'detail' | 'edit') || 'list'
|
||||
})
|
||||
const view = computed(() => route.params.view as 'list' | 'detail' | 'edit' || 'list')
|
||||
|
||||
// State
|
||||
const objectDefinition = ref<any>(null)
|
||||
@@ -39,7 +33,7 @@ const {
|
||||
deleteRecord,
|
||||
deleteRecords,
|
||||
handleSave,
|
||||
} = useViewState(`/runtime/objects/${objectApiName.value}/records`)
|
||||
} = useViewState(`/api/runtime/objects/${objectApiName.value}`)
|
||||
|
||||
// View configs
|
||||
const listConfig = computed(() => {
|
||||
@@ -66,8 +60,8 @@ const fetchObjectDefinition = async () => {
|
||||
try {
|
||||
loading.value = true
|
||||
error.value = null
|
||||
const response = await api.get(`/setup/objects/${objectApiName.value}`)
|
||||
objectDefinition.value = response
|
||||
const response = await api.get(`/api/runtime/objects/${objectApiName.value}/definition`)
|
||||
objectDefinition.value = response.data
|
||||
} catch (e: any) {
|
||||
error.value = e.message || 'Failed to load object definition'
|
||||
console.error('Error fetching object definition:', e)
|
||||
@@ -78,7 +72,7 @@ const fetchObjectDefinition = async () => {
|
||||
|
||||
// Navigation handlers
|
||||
const handleRowClick = (row: any) => {
|
||||
router.push(`/app/objects/${objectApiName.value}/${row.id}/detail`)
|
||||
router.push(`/app/objects/${objectApiName.value}/${row.id}`)
|
||||
}
|
||||
|
||||
const handleCreate = () => {
|
||||
@@ -91,8 +85,7 @@ const handleEdit = (row?: any) => {
|
||||
}
|
||||
|
||||
const handleBack = () => {
|
||||
// Navigate to list view explicitly
|
||||
router.push(`/app/objects/${objectApiName.value}/`)
|
||||
router.push(`/app/objects/${objectApiName.value}`)
|
||||
}
|
||||
|
||||
const handleDelete = async (rows: any[]) => {
|
||||
@@ -101,7 +94,7 @@ const handleDelete = async (rows: any[]) => {
|
||||
const ids = rows.map(r => r.id)
|
||||
await deleteRecords(ids)
|
||||
if (view.value !== 'list') {
|
||||
await router.push(`/app/objects/${objectApiName.value}/`)
|
||||
await router.push(`/app/objects/${objectApiName.value}`)
|
||||
}
|
||||
} catch (e: any) {
|
||||
error.value = e.message || 'Failed to delete records'
|
||||
@@ -111,44 +104,21 @@ const handleDelete = async (rows: any[]) => {
|
||||
|
||||
const handleSaveRecord = async (data: any) => {
|
||||
try {
|
||||
const savedRecord = await handleSave(data)
|
||||
if (savedRecord?.id) {
|
||||
router.push(`/app/objects/${objectApiName.value}/${savedRecord.id}/detail`)
|
||||
} else {
|
||||
// Fallback to list if no ID available
|
||||
router.push(`/app/objects/${objectApiName.value}/`)
|
||||
}
|
||||
await handleSave(data)
|
||||
router.push(`/app/objects/${objectApiName.value}/${currentRecord.value?.id || data.id}`)
|
||||
} catch (e: any) {
|
||||
error.value = e.message || 'Failed to save record'
|
||||
}
|
||||
}
|
||||
|
||||
const handleCancel = () => {
|
||||
if (recordId.value && recordId.value !== 'new') {
|
||||
router.push(`/app/objects/${objectApiName.value}/${recordId.value}/detail`)
|
||||
if (recordId.value) {
|
||||
router.push(`/app/objects/${objectApiName.value}/${recordId.value}`)
|
||||
} else {
|
||||
router.push(`/app/objects/${objectApiName.value}/`)
|
||||
router.push(`/app/objects/${objectApiName.value}`)
|
||||
}
|
||||
}
|
||||
|
||||
// Watch for route changes
|
||||
watch(() => route.params, async (newParams, oldParams) => {
|
||||
// Reset current record when navigating to 'new'
|
||||
if (newParams.recordId === 'new') {
|
||||
currentRecord.value = null
|
||||
}
|
||||
|
||||
// Fetch record if navigating to existing record
|
||||
if (newParams.recordId && newParams.recordId !== 'new' && newParams.recordId !== oldParams.recordId) {
|
||||
await fetchRecord(newParams.recordId as string)
|
||||
}
|
||||
|
||||
// Fetch records if navigating back to list
|
||||
if (!newParams.recordId && !newParams.view) {
|
||||
await fetchRecords()
|
||||
}
|
||||
}, { deep: true })
|
||||
|
||||
// Initialize
|
||||
onMounted(async () => {
|
||||
await fetchObjectDefinition()
|
||||
@@ -162,16 +132,7 @@ onMounted(async () => {
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<NuxtLayout name="default">
|
||||
<div class="object-view-container">
|
||||
<!-- Page Header -->
|
||||
<div v-if="!loading && !error" class="mb-6">
|
||||
<h1 class="text-3xl font-bold">{{ objectDefinition?.label || objectApiName }}</h1>
|
||||
<p v-if="objectDefinition?.description" class="text-muted-foreground mt-2">
|
||||
{{ objectDefinition.description }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- Loading State -->
|
||||
<div v-if="loading" class="flex items-center justify-center min-h-screen">
|
||||
<div class="text-center space-y-4">
|
||||
@@ -226,7 +187,6 @@ onMounted(async () => {
|
||||
@back="handleBack"
|
||||
/>
|
||||
</div>
|
||||
</NuxtLayout>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
<script setup lang="ts">
|
||||
// List all available objects
|
||||
const { api } = useApi()
|
||||
const router = useRouter()
|
||||
|
||||
const objects = ref<any[]>([])
|
||||
const loading = ref(true)
|
||||
|
||||
onMounted(async () => {
|
||||
try {
|
||||
const response = await api.get('/setup/objects')
|
||||
objects.value = response.data || response || []
|
||||
} catch (e) {
|
||||
console.error('Failed to load objects:', e)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<NuxtLayout name="default">
|
||||
<div class="container mx-auto p-8">
|
||||
<h1 class="text-3xl font-bold mb-6">Objects</h1>
|
||||
|
||||
<div v-if="loading" class="text-center py-12">
|
||||
<div class="animate-spin rounded-full h-12 w-12 border-b-2 border-primary mx-auto"></div>
|
||||
</div>
|
||||
|
||||
<div v-else class="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
|
||||
<NuxtLink
|
||||
v-for="obj in objects"
|
||||
:key="obj.id"
|
||||
:to="`/app/objects/${obj.apiName}/`"
|
||||
class="block p-6 border rounded-lg hover:bg-accent transition-colors"
|
||||
>
|
||||
<h3 class="text-xl font-semibold mb-2">{{ obj.label }}</h3>
|
||||
<p v-if="obj.description" class="text-sm text-muted-foreground">{{ obj.description }}</p>
|
||||
</NuxtLink>
|
||||
</div>
|
||||
</div>
|
||||
</NuxtLayout>
|
||||
</template>
|
||||
@@ -7,13 +7,11 @@ import EditView from '@/components/views/EditView.vue'
|
||||
import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
|
||||
import {
|
||||
FieldType,
|
||||
ViewMode
|
||||
} from '@/types/field-types'
|
||||
import type {
|
||||
ListViewConfig,
|
||||
DetailViewConfig,
|
||||
EditViewConfig,
|
||||
FieldConfig
|
||||
ViewMode,
|
||||
type ListViewConfig,
|
||||
type DetailViewConfig,
|
||||
type EditViewConfig,
|
||||
type FieldConfig
|
||||
} from '@/types/field-types'
|
||||
|
||||
// Example: Contact Object
|
||||
|
||||
@@ -15,15 +15,7 @@ const authMessage = useCookie('authMessage')
|
||||
onMounted(() => {
|
||||
if (authMessage.value) {
|
||||
console.log('Displaying auth message: ' + authMessage.value)
|
||||
const message = authMessage.value
|
||||
|
||||
// Show success toast for logout, error for auth failures
|
||||
if (message.toLowerCase().includes('logged out')) {
|
||||
toast.success(message)
|
||||
} else {
|
||||
toast.error(message)
|
||||
}
|
||||
|
||||
toast.error(authMessage.value)
|
||||
// Clear the message after displaying
|
||||
authMessage.value = null
|
||||
}
|
||||
|
||||
@@ -40,10 +40,6 @@ export default {
|
||||
DEFAULT: 'hsl(var(--card))',
|
||||
foreground: 'hsl(var(--card-foreground))',
|
||||
},
|
||||
popover: {
|
||||
DEFAULT: 'hsl(var(--popover))',
|
||||
foreground: 'hsl(var(--popover-foreground))',
|
||||
},
|
||||
sidebar: {
|
||||
DEFAULT: 'hsl(var(--sidebar-background))',
|
||||
foreground: 'hsl(var(--sidebar-foreground))',
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
export * from './field-types'
|
||||
Reference in New Issue
Block a user