Compare commits

...

2 Commits

Author SHA1 Message Date
Daniel Bedeleanu
3069a921e7 Build [v1.8.6] (TypeScript unknown catch type fix) 2026-04-13 19:56:27 +03:00
Daniel Bedeleanu
55e3cf5042 Build [v1.8.5] (Self-contained Frontend Build) 2026-04-13 19:50:28 +03:00
10 changed files with 33 additions and 35 deletions

View File

@@ -1,5 +0,0 @@
{
"version": "1.8.4",
"last_build": "2026-04-13-1945",
"codename": "ConfigSync"
}

View File

@@ -23,8 +23,7 @@ services:
frontend: frontend:
build: build:
context: . context: ./frontend
dockerfile: frontend/Dockerfile
networks: networks:
- inventory_net - inventory_net
ports: ports:

View File

@@ -3,8 +3,8 @@
echo "📦 Preparing TFM aInventory Production Bundle..." echo "📦 Preparing TFM aInventory Production Bundle..."
# Extract version from VERSION.json using grep to avoid macOS python/xcode stubs # Extract version from frontend/VERSION.json
VERSION=$(grep '"version"' VERSION.json | head -n 1 | awk -F '"' '{print $4}') VERSION=$(grep '"version"' frontend/VERSION.json | head -n 1 | awk -F '"' '{print $4}')
PROD_DIR="aInventory-PROD-v${VERSION}" PROD_DIR="aInventory-PROD-v${VERSION}"
# Clean previous run if it exists # Clean previous run if it exists
@@ -30,8 +30,8 @@ cp inventory.service.template "$PROD_DIR/"
cp USER_GUIDE.md "$PROD_DIR/" cp USER_GUIDE.md "$PROD_DIR/"
cp README.md "$PROD_DIR/INSTALLATION_GUIDE.md" cp README.md "$PROD_DIR/INSTALLATION_GUIDE.md"
cp .git_path "$PROD_DIR/" 2>/dev/null || true cp .git_path "$PROD_DIR/" 2>/dev/null || true
cp VERSION.json "$PROD_DIR/" cp frontend/VERSION.json "$PROD_DIR/"
cp VERSION.json "$PROD_DIR/frontend/" cp frontend/VERSION.json "$PROD_DIR/frontend/"
# Setup persistent volume skeleton # Setup persistent volume skeleton
mkdir -p "$PROD_DIR/data" mkdir -p "$PROD_DIR/data"

View File

@@ -4,16 +4,15 @@ FROM node:20-alpine AS base
FROM base AS deps FROM base AS deps
RUN apk add --no-cache libc6-compat RUN apk add --no-cache libc6-compat
WORKDIR /app WORKDIR /app
# Context is root to allow access to VERSION.json # We run this from the frontend folder context
COPY frontend/package.json frontend/package-lock.json* ./ COPY package.json package-lock.json* ./
RUN npm ci RUN npm ci
# Step 2: Build the source code # Step 2: Build the source code
FROM base AS builder FROM base AS builder
WORKDIR /app WORKDIR /app
COPY --from=deps /app/node_modules ./node_modules COPY --from=deps /app/node_modules ./node_modules
COPY frontend . COPY . .
COPY VERSION.json .
# Disable telemetry during build # Disable telemetry during build
ENV NEXT_TELEMETRY_DISABLED 1 ENV NEXT_TELEMETRY_DISABLED 1
RUN npm run build RUN npm run build

5
frontend/VERSION.json Normal file
View File

@@ -0,0 +1,5 @@
{
"version": "1.8.6",
"last_build": "2026-04-13-1954",
"codename": "TypeFix"
}

View File

@@ -83,7 +83,7 @@ export default function AdminPage() {
setBackups(b); setBackups(b);
setDbStats(s); setDbStats(s);
setDbSettings(st); setDbSettings(st);
} catch (err) { } catch (err: any) {
console.error(err); console.error(err);
toast.error("Failed to load admin data"); toast.error("Failed to load admin data");
} finally { } finally {
@@ -101,7 +101,7 @@ export default function AdminPage() {
await inventoryApi.createUser({ username: name, password: pwd, role: 'user' }); await inventoryApi.createUser({ username: name, password: pwd, role: 'user' });
toast.success("User created successfully"); toast.success("User created successfully");
loadData(); loadData();
} catch (err) { } catch (err: any) {
toast.error("Failed to create user"); toast.error("Failed to create user");
} }
}; };
@@ -114,7 +114,7 @@ export default function AdminPage() {
await inventoryApi.deleteUser(id); await inventoryApi.deleteUser(id);
toast.success("User removed"); toast.success("User removed");
loadData(); loadData();
} catch (err) { } catch (err: any) {
toast.error("Delete failed"); toast.error("Delete failed");
} }
}; };
@@ -128,7 +128,7 @@ export default function AdminPage() {
await inventoryApi.createCategory({ name, description: desc }); await inventoryApi.createCategory({ name, description: desc });
toast.success("Category added"); toast.success("Category added");
loadData(); loadData();
} catch (err) { } catch (err: any) {
toast.error("Failed to add category"); toast.error("Failed to add category");
} }
}; };
@@ -140,7 +140,7 @@ export default function AdminPage() {
toast.success("Category updated"); toast.success("Category updated");
setEditingCategory(null); setEditingCategory(null);
loadData(); loadData();
} catch (err) { } catch (err: any) {
toast.error("Update failed"); toast.error("Update failed");
} }
}; };
@@ -152,7 +152,7 @@ export default function AdminPage() {
await inventoryApi.deleteCategory(id); await inventoryApi.deleteCategory(id);
toast.success("Category removed"); toast.success("Category removed");
loadData(); loadData();
} catch (err) { } catch (err: any) {
toast.error(err.response?.data?.detail || "Delete failed"); toast.error(err.response?.data?.detail || "Delete failed");
} }
}; };
@@ -167,7 +167,7 @@ export default function AdminPage() {
toast.success("User updated successfully"); toast.success("User updated successfully");
setEditingUser(null); setEditingUser(null);
loadData(); loadData();
} catch (err) { } catch (err: any) {
toast.error("Update failed"); toast.error("Update failed");
} }
}; };
@@ -183,7 +183,7 @@ export default function AdminPage() {
await inventoryApi.triggerBackup(); await inventoryApi.triggerBackup();
toast.success("Snapshot created successfully"); toast.success("Snapshot created successfully");
loadData(); loadData();
} catch (err) { } catch (err: any) {
toast.error("Backup failed"); toast.error("Backup failed");
} finally { } finally {
setIsBackingUp(false); setIsBackingUp(false);
@@ -198,7 +198,7 @@ export default function AdminPage() {
await inventoryApi.restoreDatabase(filename); await inventoryApi.restoreDatabase(filename);
toast.success("Database restored! Reloading system...", { id: loadingToast }); toast.success("Database restored! Reloading system...", { id: loadingToast });
setTimeout(() => window.location.reload(), 2000); setTimeout(() => window.location.reload(), 2000);
} catch (err) { } catch (err: any) {
toast.error("Restore failed", { id: loadingToast }); toast.error("Restore failed", { id: loadingToast });
} }
}; };
@@ -208,7 +208,7 @@ export default function AdminPage() {
await inventoryApi.updateDbSettings(newSettings); await inventoryApi.updateDbSettings(newSettings);
toast.success("System policy updated"); toast.success("System policy updated");
setDbSettings(newSettings); setDbSettings(newSettings);
} catch (err) { } catch (err: any) {
toast.error("Failed to update settings"); toast.error("Failed to update settings");
} }
}; };
@@ -218,7 +218,7 @@ export default function AdminPage() {
try { try {
await inventoryApi.updateLdapConfig(ldapConfig); await inventoryApi.updateLdapConfig(ldapConfig);
toast.success("Enterprise configuration updated"); toast.success("Enterprise configuration updated");
} catch (err) { } catch (err: any) {
toast.error("Failed to update LDAP config"); toast.error("Failed to update LDAP config");
} finally { } finally {
setLoading(false); setLoading(false);

View File

@@ -85,7 +85,7 @@ export default function InventoryPage() {
// Sync local DB // Sync local DB
await db.items.clear(); await db.items.clear();
await db.items.bulkPut(res); await db.items.bulkPut(res);
} catch (err) { } catch (err: any) {
console.error("Failed to load backend data", err); console.error("Failed to load backend data", err);
} }
}; };
@@ -149,7 +149,7 @@ export default function InventoryPage() {
setIsEditing(false); setIsEditing(false);
setSelectedItem(updated as Item); setSelectedItem(updated as Item);
await loadData(); await loadData();
} catch (err) { } catch (err: any) {
console.error(err); console.error(err);
toast.error("Failed to update item"); toast.error("Failed to update item");
} }
@@ -167,7 +167,7 @@ export default function InventoryPage() {
toast.success("Item deleted"); toast.success("Item deleted");
setSelectedItem(null); setSelectedItem(null);
await loadData(); await loadData();
} catch (err) { } catch (err: any) {
console.error(err); console.error(err);
toast.error("Failed to delete item"); toast.error("Failed to delete item");
} }
@@ -183,7 +183,7 @@ export default function InventoryPage() {
toast.success("Category updated"); toast.success("Category updated");
setEditingCategory(null); setEditingCategory(null);
await loadData(); await loadData();
} catch (err) { } catch (err: any) {
toast.error("Update failed"); toast.error("Update failed");
} }
}; };

View File

@@ -54,7 +54,7 @@ export default function LogsPage() {
}); });
setAuditLogs(enrichedLogs); setAuditLogs(enrichedLogs);
} catch (err) { } catch (err: any) {
console.error("Critical log load failure:", err); console.error("Critical log load failure:", err);
} finally { } finally {
setLoading(false); setLoading(false);

View File

@@ -48,7 +48,7 @@ import { generateBarcode128, getQRCodeURL } from '@/lib/labels';
import { clsx, type ClassValue } from 'clsx'; import { clsx, type ClassValue } from 'clsx';
import { twMerge } from 'tailwind-merge'; import { twMerge } from 'tailwind-merge';
import axios from 'axios'; import axios from 'axios';
import versionData from '../../VERSION.json'; import versionData from '../VERSION.json';
interface User { interface User {
id: number; id: number;
@@ -342,7 +342,7 @@ export default function Home() {
setIsEditing(false); setIsEditing(false);
setSelectedItem(updated as Item); setSelectedItem(updated as Item);
await loadInventory(); await loadInventory();
} catch (err) { } catch (err: any) {
console.error(err); console.error(err);
toast.error("Failed to update item"); toast.error("Failed to update item");
} }
@@ -360,7 +360,7 @@ export default function Home() {
toast.success("Item deleted from catalog"); toast.success("Item deleted from catalog");
setSelectedItem(null); setSelectedItem(null);
await loadInventory(); await loadInventory();
} catch (err) { } catch (err: any) {
console.error(err); console.error(err);
toast.error("Failed to delete item"); toast.error("Failed to delete item");
} }

View File

@@ -4,7 +4,7 @@ import os
import sys import sys
from datetime import datetime from datetime import datetime
VERSION_FILE = 'VERSION.json' VERSION_FILE = 'frontend/VERSION.json'
GIT_PATH_FILE = '.git_path' GIT_PATH_FILE = '.git_path'
def get_git_path(): def get_git_path():