Improve the UI and tests
This commit is contained in:
Urtzi Alfaro
10
Tiltfile
10
Tiltfile
@@ -55,6 +55,13 @@ docker_build(
|
||||
live_update=[
|
||||
sync('./frontend/src', '/app/src'),
|
||||
sync('./frontend/public', '/app/public'),
|
||||
],
|
||||
# Ignore test artifacts and reports
|
||||
ignore=[
|
||||
'playwright-report/**',
|
||||
'test-results/**',
|
||||
'node_modules/**',
|
||||
'.DS_Store'
|
||||
]
|
||||
)
|
||||
|
||||
@@ -550,6 +557,9 @@ watch_settings(
|
||||
'**/*.tmp',
|
||||
'**/*.tmp.*',
|
||||
'**/migrations/versions/*.tmp.*',
|
||||
# Ignore test artifacts and reports (playwright)
|
||||
'**/playwright-report/**',
|
||||
'**/test-results/**',
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
80
frontend/package-lock.json
generated
80
frontend/package-lock.json
generated
@@ -31,6 +31,7 @@
|
||||
"event-source-polyfill": "^1.0.31",
|
||||
"framer-motion": "^10.18.0",
|
||||
"i18next": "^23.7.0",
|
||||
"i18next-icu": "^2.4.1",
|
||||
"immer": "^10.0.3",
|
||||
"lucide-react": "^0.294.0",
|
||||
"papaparse": "^5.4.1",
|
||||
@@ -2262,6 +2263,57 @@
|
||||
"integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@formatjs/ecma402-abstract": {
|
||||
"version": "2.3.6",
|
||||
"resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.3.6.tgz",
|
||||
"integrity": "sha512-HJnTFeRM2kVFVr5gr5kH1XP6K0JcJtE7Lzvtr3FS/so5f1kpsqqqxy5JF+FRaO6H2qmcMfAUIox7AJteieRtVw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@formatjs/fast-memoize": "2.2.7",
|
||||
"@formatjs/intl-localematcher": "0.6.2",
|
||||
"decimal.js": "^10.4.3",
|
||||
"tslib": "^2.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@formatjs/fast-memoize": {
|
||||
"version": "2.2.7",
|
||||
"resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.7.tgz",
|
||||
"integrity": "sha512-Yabmi9nSvyOMrlSeGGWDiH7rf3a7sIwplbvo/dlz9WCIjzIQAfy1RMf4S0X3yG724n5Ghu2GmEl5NJIV6O9sZQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"tslib": "^2.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@formatjs/icu-messageformat-parser": {
|
||||
"version": "2.11.4",
|
||||
"resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.11.4.tgz",
|
||||
"integrity": "sha512-7kR78cRrPNB4fjGFZg3Rmj5aah8rQj9KPzuLsmcSn4ipLXQvC04keycTI1F7kJYDwIXtT2+7IDEto842CfZBtw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@formatjs/ecma402-abstract": "2.3.6",
|
||||
"@formatjs/icu-skeleton-parser": "1.8.16",
|
||||
"tslib": "^2.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@formatjs/icu-skeleton-parser": {
|
||||
"version": "1.8.16",
|
||||
"resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.16.tgz",
|
||||
"integrity": "sha512-H13E9Xl+PxBd8D5/6TVUluSpxGNvFSlN/b3coUp0e0JpuWXXnQDiavIpY3NnvSp4xhEMoXyyBvVfdFX8jglOHQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@formatjs/ecma402-abstract": "2.3.6",
|
||||
"tslib": "^2.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@formatjs/intl-localematcher": {
|
||||
"version": "0.6.2",
|
||||
"resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.6.2.tgz",
|
||||
"integrity": "sha512-XOMO2Hupl0wdd172Y06h6kLpBz6Dv+J4okPLl4LPtzbr8f66WbIoy4ev98EBuZ6ZK4h5ydTN6XneT4QVpD7cdA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"tslib": "^2.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@hookform/resolvers": {
|
||||
"version": "3.10.0",
|
||||
"resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-3.10.0.tgz",
|
||||
@@ -8499,6 +8551,12 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/decimal.js": {
|
||||
"version": "10.6.0",
|
||||
"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
|
||||
"integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/decimal.js-light": {
|
||||
"version": "2.5.1",
|
||||
"resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz",
|
||||
@@ -10516,6 +10574,15 @@
|
||||
"@babel/runtime": "^7.23.2"
|
||||
}
|
||||
},
|
||||
"node_modules/i18next-icu": {
|
||||
"version": "2.4.1",
|
||||
"resolved": "https://registry.npmjs.org/i18next-icu/-/i18next-icu-2.4.1.tgz",
|
||||
"integrity": "sha512-fh01aSjGlnsR377J7mu/CM3wcdZTpvNZejapPfHI+YnVyiWwvGFT2gZOgecm9B19ttyAJ3ijmHG6r/2jiQqXCA==",
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"intl-messageformat": "^10.3.3"
|
||||
}
|
||||
},
|
||||
"node_modules/iconv-lite": {
|
||||
"version": "0.4.24",
|
||||
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
|
||||
@@ -10647,6 +10714,19 @@
|
||||
"node": ">=12"
|
||||
}
|
||||
},
|
||||
"node_modules/intl-messageformat": {
|
||||
"version": "10.7.18",
|
||||
"resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.7.18.tgz",
|
||||
"integrity": "sha512-m3Ofv/X/tV8Y3tHXLohcuVuhWKo7BBq62cqY15etqmLxg2DZ34AGGgQDeR+SCta2+zICb1NX83af0GJmbQ1++g==",
|
||||
"license": "BSD-3-Clause",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"@formatjs/ecma402-abstract": "2.3.6",
|
||||
"@formatjs/fast-memoize": "2.2.7",
|
||||
"@formatjs/icu-messageformat-parser": "2.11.4",
|
||||
"tslib": "^2.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/ipaddr.js": {
|
||||
"version": "1.9.1",
|
||||
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
|
||||
|
||||
@@ -17,6 +17,11 @@
|
||||
"test:e2e:debug": "playwright test --debug",
|
||||
"test:e2e:report": "playwright show-report",
|
||||
"test:e2e:codegen": "playwright codegen http://localhost:5173",
|
||||
"test:e2e:k8s": "playwright test --config=playwright.k8s.config.ts",
|
||||
"test:e2e:k8s:ui": "playwright test --config=playwright.k8s.config.ts --ui",
|
||||
"test:e2e:k8s:headed": "playwright test --config=playwright.k8s.config.ts --headed",
|
||||
"test:e2e:k8s:debug": "playwright test --config=playwright.k8s.config.ts --debug",
|
||||
"test:e2e:k8s:codegen": "playwright codegen http://localhost",
|
||||
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
|
||||
"format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,json,css,md}\"",
|
||||
"storybook": "storybook dev -p 6006",
|
||||
@@ -47,6 +52,7 @@
|
||||
"event-source-polyfill": "^1.0.31",
|
||||
"framer-motion": "^10.18.0",
|
||||
"i18next": "^23.7.0",
|
||||
"i18next-icu": "^2.4.1",
|
||||
"immer": "^10.0.3",
|
||||
"lucide-react": "^0.294.0",
|
||||
"papaparse": "^5.4.1",
|
||||
|
||||
119
frontend/playwright.k8s.config.ts
Normal file
119
frontend/playwright.k8s.config.ts
Normal file
@@ -0,0 +1,119 @@
|
||||
import { defineConfig, devices } from '@playwright/test';
|
||||
|
||||
/**
|
||||
* Playwright configuration for Bakery-IA E2E tests against local Kubernetes environment
|
||||
* This config is specifically for testing against Tilt-managed services
|
||||
*
|
||||
* Usage:
|
||||
* npm run test:e2e:k8s
|
||||
* npx playwright test --config=playwright.k8s.config.ts
|
||||
*
|
||||
* Prerequisites:
|
||||
* - Tilt must be running (`tilt up`)
|
||||
* - Frontend service must be accessible at http://localhost (via ingress)
|
||||
*/
|
||||
export default defineConfig({
|
||||
testDir: './tests',
|
||||
|
||||
/* Run tests in files in parallel */
|
||||
fullyParallel: true,
|
||||
|
||||
/* Fail the build on CI if you accidentally left test.only in the source code */
|
||||
forbidOnly: !!process.env.CI,
|
||||
|
||||
/* Retry on CI only */
|
||||
retries: process.env.CI ? 2 : 0,
|
||||
|
||||
/* Opt out of parallel tests on CI */
|
||||
workers: process.env.CI ? 1 : undefined,
|
||||
|
||||
/* Reporter to use */
|
||||
reporter: [
|
||||
['html', { outputFolder: 'playwright-report' }],
|
||||
['json', { outputFile: 'test-results/results.json' }],
|
||||
['list'],
|
||||
],
|
||||
|
||||
/* Shared settings for all the projects below */
|
||||
use: {
|
||||
/* Base URL points to K8s ingress - override with PLAYWRIGHT_BASE_URL env var if needed */
|
||||
baseURL: process.env.PLAYWRIGHT_BASE_URL || 'http://localhost',
|
||||
|
||||
/* Collect trace when retrying the failed test */
|
||||
trace: 'on-first-retry',
|
||||
|
||||
/* Take screenshot on failure */
|
||||
screenshot: 'only-on-failure',
|
||||
|
||||
/* Record video on failure */
|
||||
video: 'retain-on-failure',
|
||||
|
||||
/* Maximum time each action (click, fill, etc) can take */
|
||||
actionTimeout: 10000,
|
||||
|
||||
/* Increase navigation timeout for K8s environment (ingress routing may be slower) */
|
||||
navigationTimeout: 30000,
|
||||
},
|
||||
|
||||
/* Configure projects for major browsers */
|
||||
projects: [
|
||||
// Setup project to authenticate once
|
||||
{
|
||||
name: 'setup',
|
||||
testMatch: /.*\.setup\.ts/,
|
||||
},
|
||||
|
||||
// Desktop browsers
|
||||
{
|
||||
name: 'chromium',
|
||||
use: {
|
||||
...devices['Desktop Chrome'],
|
||||
storageState: 'tests/.auth/user.json',
|
||||
},
|
||||
dependencies: ['setup'],
|
||||
},
|
||||
|
||||
{
|
||||
name: 'firefox',
|
||||
use: {
|
||||
...devices['Desktop Firefox'],
|
||||
storageState: 'tests/.auth/user.json',
|
||||
},
|
||||
dependencies: ['setup'],
|
||||
},
|
||||
|
||||
{
|
||||
name: 'webkit',
|
||||
use: {
|
||||
...devices['Desktop Safari'],
|
||||
storageState: 'tests/.auth/user.json',
|
||||
},
|
||||
dependencies: ['setup'],
|
||||
},
|
||||
|
||||
// Mobile viewports
|
||||
{
|
||||
name: 'Mobile Chrome',
|
||||
use: {
|
||||
...devices['Pixel 5'],
|
||||
storageState: 'tests/.auth/user.json',
|
||||
},
|
||||
dependencies: ['setup'],
|
||||
},
|
||||
|
||||
{
|
||||
name: 'Mobile Safari',
|
||||
use: {
|
||||
...devices['iPhone 13'],
|
||||
storageState: 'tests/.auth/user.json',
|
||||
},
|
||||
dependencies: ['setup'],
|
||||
},
|
||||
],
|
||||
|
||||
/*
|
||||
* DO NOT start local dev server - Tilt manages the services
|
||||
* The frontend is served through K8s ingress
|
||||
*/
|
||||
// webServer: undefined,
|
||||
});
|
||||
409
frontend/src/components/dashboard/PurchaseOrderDetailsModal.tsx
Normal file
409
frontend/src/components/dashboard/PurchaseOrderDetailsModal.tsx
Normal file
@@ -0,0 +1,409 @@
|
||||
// ================================================================
|
||||
// frontend/src/components/dashboard/PurchaseOrderDetailsModal.tsx
|
||||
// ================================================================
|
||||
/**
|
||||
* Purchase Order Details Modal
|
||||
* Quick view of PO details from the Action Queue
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
import {
|
||||
X,
|
||||
Package,
|
||||
Building2,
|
||||
Calendar,
|
||||
Truck,
|
||||
Euro,
|
||||
FileText,
|
||||
CheckCircle,
|
||||
Clock,
|
||||
AlertCircle,
|
||||
} from 'lucide-react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { usePurchaseOrder } from '../../api/hooks/purchase-orders';
|
||||
import { formatDistanceToNow } from 'date-fns';
|
||||
import { es, enUS, eu as euLocale } from 'date-fns/locale';
|
||||
|
||||
interface PurchaseOrderDetailsModalProps {
|
||||
poId: string;
|
||||
tenantId: string;
|
||||
isOpen: boolean;
|
||||
onClose: () => void;
|
||||
onApprove?: (poId: string) => void;
|
||||
onModify?: (poId: string) => void;
|
||||
}
|
||||
|
||||
const localeMap = {
|
||||
es: es,
|
||||
en: enUS,
|
||||
eu: euLocale,
|
||||
};
|
||||
|
||||
export const PurchaseOrderDetailsModal: React.FC<PurchaseOrderDetailsModalProps> = ({
|
||||
poId,
|
||||
tenantId,
|
||||
isOpen,
|
||||
onClose,
|
||||
onApprove,
|
||||
onModify,
|
||||
}) => {
|
||||
const { t, i18n } = useTranslation();
|
||||
const { data: po, isLoading } = usePurchaseOrder(tenantId, poId);
|
||||
|
||||
if (!isOpen) return null;
|
||||
|
||||
const dateLocale = localeMap[i18n.language as keyof typeof localeMap] || enUS;
|
||||
|
||||
// Format currency
|
||||
const formatCurrency = (value: any) => {
|
||||
const num = Number(value);
|
||||
return isNaN(num) ? '0.00' : num.toFixed(2);
|
||||
};
|
||||
|
||||
const getStatusBadge = (status: string) => {
|
||||
const statusConfig = {
|
||||
draft: {
|
||||
bg: 'var(--color-gray-100)',
|
||||
text: 'var(--color-gray-700)',
|
||||
label: t('purchase_orders:status.draft'),
|
||||
},
|
||||
pending_approval: {
|
||||
bg: 'var(--color-warning-100)',
|
||||
text: 'var(--color-warning-700)',
|
||||
label: t('purchase_orders:status.pending_approval'),
|
||||
},
|
||||
approved: {
|
||||
bg: 'var(--color-success-100)',
|
||||
text: 'var(--color-success-700)',
|
||||
label: t('purchase_orders:status.approved'),
|
||||
},
|
||||
sent: {
|
||||
bg: 'var(--color-info-100)',
|
||||
text: 'var(--color-info-700)',
|
||||
label: t('purchase_orders:status.sent'),
|
||||
},
|
||||
partially_received: {
|
||||
bg: 'var(--color-warning-100)',
|
||||
text: 'var(--color-warning-700)',
|
||||
label: t('purchase_orders:status.partially_received'),
|
||||
},
|
||||
received: {
|
||||
bg: 'var(--color-success-100)',
|
||||
text: 'var(--color-success-700)',
|
||||
label: t('purchase_orders:status.received'),
|
||||
},
|
||||
cancelled: {
|
||||
bg: 'var(--color-error-100)',
|
||||
text: 'var(--color-error-700)',
|
||||
label: t('purchase_orders:status.cancelled'),
|
||||
},
|
||||
};
|
||||
|
||||
const config = statusConfig[status as keyof typeof statusConfig] || statusConfig.draft;
|
||||
|
||||
return (
|
||||
<span
|
||||
className="px-3 py-1 rounded-full text-sm font-medium"
|
||||
style={{ backgroundColor: config.bg, color: config.text }}
|
||||
>
|
||||
{config.label}
|
||||
</span>
|
||||
);
|
||||
};
|
||||
|
||||
return (
|
||||
<div
|
||||
className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50 p-4 animate-fadeIn"
|
||||
onClick={onClose}
|
||||
style={{
|
||||
backdropFilter: 'blur(4px)',
|
||||
animation: 'fadeIn 0.2s ease-out'
|
||||
}}
|
||||
>
|
||||
<div
|
||||
className="bg-white rounded-xl shadow-2xl max-w-3xl w-full max-h-[90vh] overflow-hidden transform transition-all"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
style={{
|
||||
backgroundColor: 'var(--bg-primary)',
|
||||
animation: 'slideUp 0.3s ease-out'
|
||||
}}
|
||||
>
|
||||
<style>{`
|
||||
@keyframes fadeIn {
|
||||
from { opacity: 0; }
|
||||
to { opacity: 1; }
|
||||
}
|
||||
@keyframes slideUp {
|
||||
from {
|
||||
opacity: 0;
|
||||
transform: translateY(20px) scale(0.95);
|
||||
}
|
||||
to {
|
||||
opacity: 1;
|
||||
transform: translateY(0) scale(1);
|
||||
}
|
||||
}
|
||||
`}</style>
|
||||
{/* Header */}
|
||||
<div
|
||||
className="flex items-center justify-between p-6 border-b bg-gradient-to-r from-transparent to-transparent"
|
||||
style={{
|
||||
borderColor: 'var(--border-primary)',
|
||||
background: 'linear-gradient(to right, var(--bg-primary), var(--bg-secondary))'
|
||||
}}
|
||||
>
|
||||
<div className="flex items-center gap-4">
|
||||
<div
|
||||
className="p-3 rounded-xl"
|
||||
style={{
|
||||
backgroundColor: 'var(--color-primary-100)',
|
||||
boxShadow: '0 2px 8px rgba(0, 0, 0, 0.05)'
|
||||
}}
|
||||
>
|
||||
<Package className="w-6 h-6" style={{ color: 'var(--color-primary-600)' }} />
|
||||
</div>
|
||||
<div>
|
||||
<h2 className="text-2xl font-bold mb-1" style={{ color: 'var(--text-primary)' }}>
|
||||
{isLoading ? t('common:loading') : po?.po_number || t('purchase_orders:purchase_order')}
|
||||
</h2>
|
||||
{po && (
|
||||
<p className="text-sm flex items-center gap-1" style={{ color: 'var(--text-secondary)' }}>
|
||||
<Clock className="w-3.5 h-3.5" />
|
||||
{t('purchase_orders:created')} {formatDistanceToNow(new Date(po.created_at), { addSuffix: true, locale: dateLocale })}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
onClick={onClose}
|
||||
className="p-2 rounded-lg hover:bg-gray-100 transition-all hover:scale-110"
|
||||
style={{ color: 'var(--text-secondary)' }}
|
||||
aria-label={t('purchase_orders:actions.close')}
|
||||
>
|
||||
<X className="w-5 h-5" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* Content */}
|
||||
<div className="p-6 overflow-y-auto max-h-[calc(90vh-200px)]">
|
||||
{isLoading ? (
|
||||
<div className="flex items-center justify-center py-12">
|
||||
<div className="animate-spin rounded-full h-10 w-10 border-3 border-primary-200 border-t-primary-600"></div>
|
||||
</div>
|
||||
) : po ? (
|
||||
<div className="space-y-6">
|
||||
{/* Status and Key Info */}
|
||||
<div className="flex flex-wrap items-center gap-4 p-4 rounded-xl" style={{
|
||||
backgroundColor: 'var(--bg-secondary)',
|
||||
border: '1px solid var(--border-primary)'
|
||||
}}>
|
||||
{getStatusBadge(po.status)}
|
||||
<div className="flex-1 min-w-[200px]">
|
||||
<p className="text-xs uppercase tracking-wide mb-1" style={{ color: 'var(--text-secondary)' }}>
|
||||
{t('purchase_orders:total_amount')}
|
||||
</p>
|
||||
<div className="flex items-baseline gap-2">
|
||||
<Euro className="w-5 h-5" style={{ color: 'var(--color-primary-600)' }} />
|
||||
<span className="text-2xl font-bold" style={{ color: 'var(--text-primary)' }}>
|
||||
{formatCurrency(po.total_amount)}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Supplier Info */}
|
||||
<div className="rounded-xl p-5 border" style={{
|
||||
backgroundColor: 'var(--bg-secondary)',
|
||||
borderColor: 'var(--border-primary)',
|
||||
boxShadow: '0 1px 3px rgba(0, 0, 0, 0.05)'
|
||||
}}>
|
||||
<div className="flex items-center gap-2 mb-3">
|
||||
<div className="p-2 rounded-lg" style={{ backgroundColor: 'var(--color-primary-100)' }}>
|
||||
<Building2 className="w-5 h-5" style={{ color: 'var(--color-primary-600)' }} />
|
||||
</div>
|
||||
<h3 className="font-semibold text-sm uppercase tracking-wide" style={{ color: 'var(--text-secondary)' }}>
|
||||
{t('purchase_orders:supplier')}
|
||||
</h3>
|
||||
</div>
|
||||
<p className="text-xl font-semibold ml-1" style={{ color: 'var(--text-primary)' }}>
|
||||
{po.supplier_name || t('common:unknown')}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{/* Dates */}
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||
<div className="rounded-xl p-4 border" style={{
|
||||
backgroundColor: 'var(--bg-secondary)',
|
||||
borderColor: 'var(--border-primary)',
|
||||
boxShadow: '0 1px 3px rgba(0, 0, 0, 0.05)'
|
||||
}}>
|
||||
<div className="flex items-center gap-2 mb-3">
|
||||
<div className="p-1.5 rounded-lg" style={{ backgroundColor: 'var(--color-primary-100)' }}>
|
||||
<Calendar className="w-4 h-4" style={{ color: 'var(--color-primary-600)' }} />
|
||||
</div>
|
||||
<h3 className="font-semibold text-xs uppercase tracking-wide" style={{ color: 'var(--text-secondary)' }}>
|
||||
{t('purchase_orders:order_date')}
|
||||
</h3>
|
||||
</div>
|
||||
<p className="text-lg font-semibold ml-1" style={{ color: 'var(--text-primary)' }}>
|
||||
{new Date(po.order_date).toLocaleDateString(i18n.language, {
|
||||
year: 'numeric',
|
||||
month: 'short',
|
||||
day: 'numeric'
|
||||
})}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{po.expected_delivery_date && (
|
||||
<div className="rounded-xl p-4 border" style={{
|
||||
backgroundColor: 'var(--bg-secondary)',
|
||||
borderColor: 'var(--border-primary)',
|
||||
boxShadow: '0 1px 3px rgba(0, 0, 0, 0.05)'
|
||||
}}>
|
||||
<div className="flex items-center gap-2 mb-3">
|
||||
<div className="p-1.5 rounded-lg" style={{ backgroundColor: 'var(--color-success-100)' }}>
|
||||
<Truck className="w-4 h-4" style={{ color: 'var(--color-success-600)' }} />
|
||||
</div>
|
||||
<h3 className="font-semibold text-xs uppercase tracking-wide" style={{ color: 'var(--text-secondary)' }}>
|
||||
{t('purchase_orders:expected_delivery')}
|
||||
</h3>
|
||||
</div>
|
||||
<p className="text-lg font-semibold ml-1" style={{ color: 'var(--text-primary)' }}>
|
||||
{new Date(po.expected_delivery_date).toLocaleDateString(i18n.language, {
|
||||
year: 'numeric',
|
||||
month: 'short',
|
||||
day: 'numeric'
|
||||
})}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Items */}
|
||||
<div>
|
||||
<div className="flex items-center gap-2 mb-4">
|
||||
<div className="p-2 rounded-lg" style={{ backgroundColor: 'var(--color-primary-100)' }}>
|
||||
<FileText className="w-5 h-5" style={{ color: 'var(--color-primary-600)' }} />
|
||||
</div>
|
||||
<h3 className="font-bold text-lg" style={{ color: 'var(--text-primary)' }}>
|
||||
{t('purchase_orders:items')}
|
||||
</h3>
|
||||
{po.items && po.items.length > 0 && (
|
||||
<span
|
||||
className="ml-auto px-3 py-1 rounded-full text-sm font-medium"
|
||||
style={{
|
||||
backgroundColor: 'var(--color-primary-100)',
|
||||
color: 'var(--color-primary-700)'
|
||||
}}
|
||||
>
|
||||
{po.items.length} {po.items.length === 1 ? t('common:item') : t('common:items')}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
<div className="space-y-3">
|
||||
{po.items && po.items.length > 0 ? (
|
||||
po.items.map((item: any, index: number) => (
|
||||
<div
|
||||
key={index}
|
||||
className="flex justify-between items-center p-4 rounded-xl border transition-all hover:shadow-md"
|
||||
style={{
|
||||
backgroundColor: 'var(--bg-secondary)',
|
||||
borderColor: 'var(--border-primary)'
|
||||
}}
|
||||
>
|
||||
<div className="flex-1">
|
||||
<p className="font-semibold text-base mb-1" style={{ color: 'var(--text-primary)' }}>
|
||||
{item.ingredient_name || item.product_name}
|
||||
</p>
|
||||
<p className="text-sm flex items-center gap-1.5" style={{ color: 'var(--text-secondary)' }}>
|
||||
<span className="font-medium">{item.quantity} {item.unit}</span>
|
||||
<span>×</span>
|
||||
<span>€{formatCurrency(item.unit_price)}</span>
|
||||
</p>
|
||||
</div>
|
||||
<p className="font-bold text-lg ml-4" style={{ color: 'var(--color-primary-600)' }}>
|
||||
€{formatCurrency(item.subtotal)}
|
||||
</p>
|
||||
</div>
|
||||
))
|
||||
) : (
|
||||
<div className="text-center py-8 rounded-xl border-2 border-dashed" style={{
|
||||
borderColor: 'var(--border-primary)',
|
||||
color: 'var(--text-secondary)'
|
||||
}}>
|
||||
<FileText className="w-12 h-12 mx-auto mb-2 opacity-30" />
|
||||
<p>{t('purchase_orders:no_items')}</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Notes */}
|
||||
{po.notes && (
|
||||
<div className="rounded-xl p-5 border-l-4" style={{
|
||||
backgroundColor: 'var(--color-info-50)',
|
||||
borderLeftColor: 'var(--color-info-500)',
|
||||
boxShadow: '0 1px 3px rgba(0, 0, 0, 0.05)'
|
||||
}}>
|
||||
<div className="flex items-center gap-2 mb-3">
|
||||
<div className="p-1.5 rounded-lg" style={{ backgroundColor: 'var(--color-info-100)' }}>
|
||||
<AlertCircle className="w-5 h-5" style={{ color: 'var(--color-info-600)' }} />
|
||||
</div>
|
||||
<h3 className="font-semibold text-sm uppercase tracking-wide" style={{ color: 'var(--color-info-700)' }}>
|
||||
{t('purchase_orders:notes')}
|
||||
</h3>
|
||||
</div>
|
||||
<p className="text-sm leading-relaxed ml-1" style={{ color: 'var(--text-primary)' }}>{po.notes}</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
) : (
|
||||
<div className="text-center py-12">
|
||||
<p style={{ color: 'var(--text-secondary)' }}>{t('purchase_orders:not_found')}</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Footer Actions */}
|
||||
{po && po.status === 'pending_approval' && (
|
||||
<div
|
||||
className="flex justify-end gap-3 p-6 border-t bg-gradient-to-r from-transparent to-transparent"
|
||||
style={{
|
||||
borderColor: 'var(--border-primary)',
|
||||
background: 'linear-gradient(to right, var(--bg-secondary), var(--bg-primary))'
|
||||
}}
|
||||
>
|
||||
<button
|
||||
onClick={() => {
|
||||
onModify?.(poId);
|
||||
onClose();
|
||||
}}
|
||||
className="px-6 py-2.5 rounded-xl font-semibold transition-all hover:scale-105 hover:shadow-md border"
|
||||
style={{
|
||||
backgroundColor: 'var(--bg-primary)',
|
||||
color: 'var(--text-primary)',
|
||||
borderColor: 'var(--border-primary)'
|
||||
}}
|
||||
>
|
||||
{t('purchase_orders:actions.modify')}
|
||||
</button>
|
||||
<button
|
||||
onClick={() => {
|
||||
onApprove?.(poId);
|
||||
onClose();
|
||||
}}
|
||||
className="px-6 py-2.5 rounded-xl font-semibold text-white transition-all hover:scale-105 hover:shadow-lg flex items-center gap-2"
|
||||
style={{
|
||||
backgroundColor: 'var(--color-primary-600)',
|
||||
boxShadow: '0 2px 8px rgba(0, 0, 0, 0.1)'
|
||||
}}
|
||||
>
|
||||
<CheckCircle className="w-4 h-4" />
|
||||
{t('purchase_orders:actions.approve')}
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
File diff suppressed because it is too large
Load Diff
@@ -61,6 +61,10 @@ export const DemoBanner: React.FC = () => {
|
||||
const { useTenantStore } = await import('../../../stores/tenant.store');
|
||||
useTenantStore.getState().clearTenants();
|
||||
|
||||
// Clear notification storage to ensure notifications don't persist across sessions
|
||||
const { clearNotificationStorage } = await import('../../../hooks/useNotifications');
|
||||
clearNotificationStorage();
|
||||
|
||||
navigate('/demo');
|
||||
};
|
||||
|
||||
|
||||
@@ -16,46 +16,59 @@ export interface NotificationData {
|
||||
const STORAGE_KEY = 'bakery-notifications';
|
||||
const SNOOZE_STORAGE_KEY = 'bakery-snoozed-alerts';
|
||||
|
||||
/**
|
||||
* Clear all notification data from sessionStorage
|
||||
* This is typically called during logout to ensure notifications don't persist across sessions
|
||||
*/
|
||||
export const clearNotificationStorage = () => {
|
||||
try {
|
||||
sessionStorage.removeItem(STORAGE_KEY);
|
||||
sessionStorage.removeItem(SNOOZE_STORAGE_KEY);
|
||||
} catch (error) {
|
||||
console.warn('Failed to clear notification storage:', error);
|
||||
}
|
||||
};
|
||||
|
||||
const loadNotificationsFromStorage = (): NotificationData[] => {
|
||||
try {
|
||||
const stored = localStorage.getItem(STORAGE_KEY);
|
||||
const stored = sessionStorage.getItem(STORAGE_KEY);
|
||||
if (stored) {
|
||||
const parsed = JSON.parse(stored);
|
||||
if (Array.isArray(parsed)) {
|
||||
// Clean up old alerts (older than 24 hours)
|
||||
// This prevents accumulation of stale alerts in localStorage
|
||||
// This prevents accumulation of stale alerts in sessionStorage
|
||||
const oneDayAgo = Date.now() - (24 * 60 * 60 * 1000);
|
||||
const recentAlerts = parsed.filter(n => {
|
||||
const alertTime = new Date(n.timestamp).getTime();
|
||||
return alertTime > oneDayAgo;
|
||||
});
|
||||
|
||||
// If we filtered out alerts, update localStorage
|
||||
// If we filtered out alerts, update sessionStorage
|
||||
if (recentAlerts.length !== parsed.length) {
|
||||
console.log(`Cleaned ${parsed.length - recentAlerts.length} old alerts from localStorage`);
|
||||
localStorage.setItem(STORAGE_KEY, JSON.stringify(recentAlerts));
|
||||
console.log(`Cleaned ${parsed.length - recentAlerts.length} old alerts from sessionStorage`);
|
||||
sessionStorage.setItem(STORAGE_KEY, JSON.stringify(recentAlerts));
|
||||
}
|
||||
|
||||
return recentAlerts;
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn('Failed to load notifications from localStorage:', error);
|
||||
console.warn('Failed to load notifications from sessionStorage:', error);
|
||||
}
|
||||
return [];
|
||||
};
|
||||
|
||||
const saveNotificationsToStorage = (notifications: NotificationData[]) => {
|
||||
try {
|
||||
localStorage.setItem(STORAGE_KEY, JSON.stringify(notifications));
|
||||
sessionStorage.setItem(STORAGE_KEY, JSON.stringify(notifications));
|
||||
} catch (error) {
|
||||
console.warn('Failed to save notifications to localStorage:', error);
|
||||
console.warn('Failed to save notifications to sessionStorage:', error);
|
||||
}
|
||||
};
|
||||
|
||||
const loadSnoozedAlertsFromStorage = (): Map<string, SnoozedAlert> => {
|
||||
try {
|
||||
const stored = localStorage.getItem(SNOOZE_STORAGE_KEY);
|
||||
const stored = sessionStorage.getItem(SNOOZE_STORAGE_KEY);
|
||||
if (stored) {
|
||||
const parsed = JSON.parse(stored);
|
||||
const map = new Map<string, SnoozedAlert>();
|
||||
@@ -71,7 +84,7 @@ const loadSnoozedAlertsFromStorage = (): Map<string, SnoozedAlert> => {
|
||||
return map;
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn('Failed to load snoozed alerts from localStorage:', error);
|
||||
console.warn('Failed to load snoozed alerts from sessionStorage:', error);
|
||||
}
|
||||
return new Map();
|
||||
};
|
||||
@@ -85,9 +98,9 @@ const saveSnoozedAlertsToStorage = (snoozedAlerts: Map<string, SnoozedAlert>) =>
|
||||
obj[key] = value;
|
||||
}
|
||||
});
|
||||
localStorage.setItem(SNOOZE_STORAGE_KEY, JSON.stringify(obj));
|
||||
sessionStorage.setItem(SNOOZE_STORAGE_KEY, JSON.stringify(obj));
|
||||
} catch (error) {
|
||||
console.warn('Failed to save snoozed alerts to localStorage:', error);
|
||||
console.warn('Failed to save snoozed alerts to sessionStorage:', error);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -96,11 +109,12 @@ const saveSnoozedAlertsToStorage = (snoozedAlerts: Map<string, SnoozedAlert>) =>
|
||||
*
|
||||
* Features:
|
||||
* - SSE connection for real-time alerts
|
||||
* - localStorage persistence with auto-cleanup (alerts >24h are removed on load)
|
||||
* - sessionStorage persistence with auto-cleanup (alerts >24h are removed on load)
|
||||
* - Snooze functionality with expiration tracking
|
||||
* - Bulk operations (mark multiple as read, remove, snooze)
|
||||
*
|
||||
* Note: localStorage is automatically cleaned of alerts older than 24 hours
|
||||
* Note: Notifications are session-only and cleared when the browser tab/window closes
|
||||
* or when the user logs out. Alerts older than 24 hours are automatically cleaned
|
||||
* on load to prevent accumulation of stale data.
|
||||
*/
|
||||
export const useNotifications = () => {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
// frontend/src/i18n/index.ts
|
||||
import i18n from 'i18next';
|
||||
import { initReactI18next } from 'react-i18next';
|
||||
import ICU from 'i18next-icu';
|
||||
import { resources, defaultLanguage, supportedLanguages } from '../locales';
|
||||
|
||||
// Get saved language from localStorage or default
|
||||
@@ -24,6 +25,7 @@ const getSavedLanguage = () => {
|
||||
const initialLanguage = getSavedLanguage();
|
||||
|
||||
i18n
|
||||
.use(ICU)
|
||||
.use(initReactI18next)
|
||||
.init({
|
||||
resources,
|
||||
|
||||
@@ -67,6 +67,9 @@
|
||||
"expand": "Expand",
|
||||
"collapse": "Collapse"
|
||||
},
|
||||
"item": "item",
|
||||
"items": "items",
|
||||
"unknown": "Unknown",
|
||||
"status": {
|
||||
"active": "Active",
|
||||
"inactive": "Inactive",
|
||||
|
||||
@@ -34,6 +34,32 @@
|
||||
"quick_actions": "Quick Actions",
|
||||
"key_metrics": "Key Metrics"
|
||||
},
|
||||
"insights": {
|
||||
"savings": {
|
||||
"label": "💰 SAVINGS",
|
||||
"this_week": "this week",
|
||||
"vs_last": "vs. last"
|
||||
},
|
||||
"inventory": {
|
||||
"label": "📦 INVENTORY",
|
||||
"all_stocked": "All stocked",
|
||||
"low_stock": "Low stock",
|
||||
"stock_issues": "⚠️ Stock issues",
|
||||
"no_alerts": "No alerts",
|
||||
"out_of_stock": "{count} out of stock",
|
||||
"alerts": "{count} alert{count, plural, one {} other {s}}"
|
||||
},
|
||||
"waste": {
|
||||
"label": "♻️ WASTE",
|
||||
"this_month": "this month",
|
||||
"vs_goal": "vs. goal"
|
||||
},
|
||||
"deliveries": {
|
||||
"label": "🚚 DELIVERIES",
|
||||
"arriving_today": "{count} arriving today",
|
||||
"none_scheduled": "None scheduled"
|
||||
}
|
||||
},
|
||||
"procurement": {
|
||||
"title": "What needs to be bought for tomorrow?",
|
||||
"empty": "All supplies ready for tomorrow",
|
||||
@@ -72,8 +98,8 @@
|
||||
"view_all": "View all alerts",
|
||||
"time": {
|
||||
"now": "Now",
|
||||
"minutes_ago": "{{count}} min ago",
|
||||
"hours_ago": "{{count}} h ago",
|
||||
"minutes_ago": "{count} min ago",
|
||||
"hours_ago": "{count} h ago",
|
||||
"yesterday": "Yesterday"
|
||||
},
|
||||
"types": {
|
||||
@@ -101,7 +127,7 @@
|
||||
"additional_details": "Additional Details",
|
||||
"mark_as_read": "Mark as read",
|
||||
"remove": "Remove",
|
||||
"active_count": "{{count}} active alerts"
|
||||
"active_count": "{count} active alerts"
|
||||
},
|
||||
"messages": {
|
||||
"welcome": "Welcome back",
|
||||
@@ -131,16 +157,16 @@
|
||||
},
|
||||
"health": {
|
||||
"production_on_schedule": "Production on schedule",
|
||||
"production_delayed": "{{count}} production batch{{count, plural, one {} other {es}}} delayed",
|
||||
"production_delayed": "{count} production batch{count, plural, one {} other {es}} delayed",
|
||||
"all_ingredients_in_stock": "All ingredients in stock",
|
||||
"ingredients_out_of_stock": "{{count}} ingredient{{count, plural, one {} other {s}}} out of stock",
|
||||
"ingredients_out_of_stock": "{count} ingredient{count, plural, one {} other {s}} out of stock",
|
||||
"no_pending_approvals": "No pending approvals",
|
||||
"approvals_awaiting": "{{count}} purchase order{{count, plural, one {} other {s}}} awaiting approval",
|
||||
"approvals_awaiting": "{count} purchase order{count, plural, one {} other {s}} awaiting approval",
|
||||
"all_systems_operational": "All systems operational",
|
||||
"critical_issues": "{{count}} critical issue{{count, plural, one {} other {s}}}",
|
||||
"critical_issues": "{count} critical issue{count, plural, one {} other {s}}",
|
||||
"headline_green": "Your bakery is running smoothly",
|
||||
"headline_yellow_approvals": "Please review {{count}} pending approval{{count, plural, one {} other {s}}}",
|
||||
"headline_yellow_alerts": "You have {{count}} alert{{count, plural, one {} other {s}}} needing attention",
|
||||
"headline_yellow_approvals": "Please review {count} pending approval{count, plural, one {} other {s}}",
|
||||
"headline_yellow_alerts": "You have {count} alert{count, plural, one {} other {s}} needing attention",
|
||||
"headline_yellow_general": "Some items need your attention",
|
||||
"headline_red": "Critical issues require immediate action"
|
||||
},
|
||||
@@ -160,7 +186,7 @@
|
||||
"suppliers": "Suppliers",
|
||||
"recipes": "Recipes",
|
||||
"quality": "Quality Standards",
|
||||
"add_ingredients": "Add at least {{count}} ingredients",
|
||||
"add_ingredients": "Add at least {count} ingredients",
|
||||
"add_supplier": "Add your first supplier",
|
||||
"add_recipe": "Create your first recipe",
|
||||
"add_quality": "Add quality checks (optional)",
|
||||
|
||||
36
frontend/src/locales/en/purchase_orders.json
Normal file
36
frontend/src/locales/en/purchase_orders.json
Normal file
@@ -0,0 +1,36 @@
|
||||
{
|
||||
"purchase_order": "Purchase Order",
|
||||
"purchase_orders": "Purchase Orders",
|
||||
"created": "Created",
|
||||
"supplier": "Supplier",
|
||||
"order_date": "Order Date",
|
||||
"expected_delivery": "Expected Delivery",
|
||||
"items": "Items",
|
||||
"no_items": "No items in this order",
|
||||
"notes": "Notes",
|
||||
"not_found": "Purchase order not found",
|
||||
"total_amount": "Total Amount",
|
||||
"status": {
|
||||
"draft": "Draft",
|
||||
"pending_approval": "Pending Approval",
|
||||
"approved": "Approved",
|
||||
"sent": "Sent",
|
||||
"partially_received": "Partially Received",
|
||||
"received": "Received",
|
||||
"cancelled": "Cancelled"
|
||||
},
|
||||
"details": {
|
||||
"title": "Purchase Order Details",
|
||||
"quick_view": "Quick Order View",
|
||||
"summary": "Summary",
|
||||
"supplier_info": "Supplier Information",
|
||||
"delivery_info": "Delivery Information",
|
||||
"order_items": "Order Items",
|
||||
"additional_notes": "Additional Notes"
|
||||
},
|
||||
"actions": {
|
||||
"approve": "Approve Order",
|
||||
"modify": "Modify Order",
|
||||
"close": "Close"
|
||||
}
|
||||
}
|
||||
@@ -75,8 +75,8 @@
|
||||
"last_updated": "Last updated",
|
||||
"next_check": "Next check",
|
||||
"never": "Never",
|
||||
"critical_issues": "{{count}} critical issue{{count, plural, one {} other {s}}}",
|
||||
"actions_needed": "{{count}} action{{count, plural, one {} other {s}}} needed"
|
||||
"critical_issues": "{count} critical issue{count, plural, one {} other {s}}",
|
||||
"actions_needed": "{count} action{count, plural, one {} other {s}} needed"
|
||||
},
|
||||
"action_queue": {
|
||||
"title": "What Needs Your Attention",
|
||||
@@ -85,11 +85,23 @@
|
||||
"estimated_time": "Estimated time",
|
||||
"all_caught_up": "All caught up!",
|
||||
"no_actions": "No actions requiring your attention right now.",
|
||||
"show_more": "Show {{count}} More Action{{count, plural, one {} other {s}}}",
|
||||
"show_more": "Show {count} More Action{count, plural, one {} other {s}}",
|
||||
"show_less": "Show Less",
|
||||
"total": "total",
|
||||
"critical": "critical",
|
||||
"important": "important"
|
||||
"important": "important",
|
||||
"consequences": {
|
||||
"delayed_delivery_impact": "Delayed delivery may impact production schedule",
|
||||
"immediate_action_required": "Immediate action required to prevent production issues",
|
||||
"some_features_limited": "Some features are limited"
|
||||
},
|
||||
"actions": {
|
||||
"approve": "Approve",
|
||||
"view_details": "View Details",
|
||||
"modify": "Modify",
|
||||
"dismiss": "Dismiss",
|
||||
"complete_setup": "Complete Setup"
|
||||
}
|
||||
},
|
||||
"orchestration_summary": {
|
||||
"title": "Last Night I Planned Your Day",
|
||||
@@ -97,17 +109,17 @@
|
||||
"run_planning": "Run Daily Planning",
|
||||
"run_info": "Orchestration run #{{runNumber}}",
|
||||
"took": "Took {{seconds}}s",
|
||||
"created_pos": "Created {{count}} purchase order{{count, plural, one {} other {s}}}",
|
||||
"scheduled_batches": "Scheduled {{count}} production batch{{count, plural, one {} other {es}}}",
|
||||
"show_more": "Show {{count}} more",
|
||||
"created_pos": "Created {count} purchase order{count, plural, one {} other {s}}",
|
||||
"scheduled_batches": "Scheduled {count} production batch{count, plural, one {} other {es}}",
|
||||
"show_more": "Show {count} more",
|
||||
"show_less": "Show less",
|
||||
"no_actions": "No new actions needed - everything is on track!",
|
||||
"based_on": "Based on:",
|
||||
"customer_orders": "{{count}} customer order{{count, plural, one {} other {s}}}",
|
||||
"customer_orders": "{count} customer order{count, plural, one {} other {s}}",
|
||||
"historical_demand": "Historical demand",
|
||||
"inventory_levels": "Inventory levels",
|
||||
"ai_optimization": "AI optimization",
|
||||
"actions_required": "{{count}} item{{count, plural, one {} other {s}}} need{{count, plural, one {s} other {}}} your approval before proceeding",
|
||||
"actions_required": "{count} item{count, plural, one {} other {s}} need{count, plural, one {s} other {}}} your approval before proceeding",
|
||||
"no_tenant_error": "No tenant ID found. Please ensure you're logged in.",
|
||||
"planning_started": "Planning started successfully",
|
||||
"planning_failed": "Failed to start planning",
|
||||
|
||||
@@ -12,6 +12,16 @@
|
||||
"title": "Add Inventory",
|
||||
"inventoryDetails": "Inventory Item Details",
|
||||
"fillRequiredInfo": "Fill in the required information to create an inventory item",
|
||||
"summary": "Summary",
|
||||
"steps": {
|
||||
"productType": "Product Type",
|
||||
"basicInfo": "Basic Information",
|
||||
"stockConfig": "Stock Configuration"
|
||||
},
|
||||
"typeDescriptions": {
|
||||
"ingredient": "Raw materials and ingredients used in recipes",
|
||||
"finished_product": "Final products ready for sale or consumption"
|
||||
},
|
||||
"fields": {
|
||||
"name": "Name",
|
||||
"namePlaceholder": "E.g., All-Purpose Flour, Sourdough Bread",
|
||||
@@ -81,6 +91,11 @@
|
||||
"basicInformation": "Basic Information",
|
||||
"advancedOptions": "Advanced Options",
|
||||
"advancedOptionsDescription": "Optional fields for comprehensive inventory management",
|
||||
"additionalInformationDescription": "Optional product identifiers",
|
||||
"additionalDetails": "Additional Details",
|
||||
"additionalDetailsDescription": "Optional product details",
|
||||
"advancedStockSettings": "Advanced Stock Settings",
|
||||
"advancedStockSettingsDescription": "Configure inventory thresholds and reorder points",
|
||||
"pricingInformation": "Pricing Information",
|
||||
"inventoryManagement": "Inventory Management",
|
||||
"productInformation": "Product Information",
|
||||
|
||||
@@ -67,6 +67,9 @@
|
||||
"expand": "Expandir",
|
||||
"collapse": "Contraer"
|
||||
},
|
||||
"item": "artículo",
|
||||
"items": "artículos",
|
||||
"unknown": "Desconocido",
|
||||
"status": {
|
||||
"active": "Activo",
|
||||
"inactive": "Inactivo",
|
||||
|
||||
@@ -34,6 +34,32 @@
|
||||
"quick_actions": "Acciones Rápidas",
|
||||
"key_metrics": "Métricas Clave"
|
||||
},
|
||||
"insights": {
|
||||
"savings": {
|
||||
"label": "💰 AHORROS",
|
||||
"this_week": "esta semana",
|
||||
"vs_last": "vs. anterior"
|
||||
},
|
||||
"inventory": {
|
||||
"label": "📦 INVENTARIO",
|
||||
"all_stocked": "Todo en stock",
|
||||
"low_stock": "Stock bajo",
|
||||
"stock_issues": "⚠️ Problemas de stock",
|
||||
"no_alerts": "Sin alertas",
|
||||
"out_of_stock": "{count} sin stock",
|
||||
"alerts": "{count} alerta{count, plural, one {} other {s}}"
|
||||
},
|
||||
"waste": {
|
||||
"label": "♻️ DESPERDICIO",
|
||||
"this_month": "este mes",
|
||||
"vs_goal": "vs. objetivo"
|
||||
},
|
||||
"deliveries": {
|
||||
"label": "🚚 ENTREGAS",
|
||||
"arriving_today": "{count} llegan hoy",
|
||||
"none_scheduled": "Ninguna programada"
|
||||
}
|
||||
},
|
||||
"procurement": {
|
||||
"title": "¿Qué necesito comprar para mañana?",
|
||||
"empty": "Todos los suministros listos para mañana",
|
||||
@@ -166,16 +192,16 @@
|
||||
},
|
||||
"health": {
|
||||
"production_on_schedule": "Producción a tiempo",
|
||||
"production_delayed": "{{count}} lote{{count, plural, one {} other {s}}} de producción retrasado{{count, plural, one {} other {s}}}",
|
||||
"production_delayed": "{count} lote{count, plural, one {} other {s}} de producción retrasado{count, plural, one {} other {s}}",
|
||||
"all_ingredients_in_stock": "Todos los ingredientes en stock",
|
||||
"ingredients_out_of_stock": "{{count}} ingrediente{{count, plural, one {} other {s}}} sin stock",
|
||||
"ingredients_out_of_stock": "{count} ingrediente{count, plural, one {} other {s}} sin stock",
|
||||
"no_pending_approvals": "Sin aprobaciones pendientes",
|
||||
"approvals_awaiting": "{{count}} orden{{count, plural, one {} other {es}}} de compra esperando aprobación",
|
||||
"approvals_awaiting": "{count} orden{count, plural, one {} other {es}} de compra esperando aprobación",
|
||||
"all_systems_operational": "Todos los sistemas operativos",
|
||||
"critical_issues": "{{count}} problema{{count, plural, one {} other {s}}} crítico{{count, plural, one {} other {s}}}",
|
||||
"critical_issues": "{count} problema{count, plural, one {} other {s}} crítico{count, plural, one {} other {s}}",
|
||||
"headline_green": "Tu panadería funciona sin problemas",
|
||||
"headline_yellow_approvals": "Por favor revisa {{count}} aprobación{{count, plural, one {} other {es}}} pendiente{{count, plural, one {} other {s}}}",
|
||||
"headline_yellow_alerts": "Tienes {{count}} alerta{{count, plural, one {} other {s}}} que necesita{{count, plural, one {} other {n}}} atención",
|
||||
"headline_yellow_approvals": "Por favor revisa {count} aprobación{count, plural, one {} other {es}} pendiente{count, plural, one {} other {s}}",
|
||||
"headline_yellow_alerts": "Tienes {count} alerta{count, plural, one {} other {s}} que necesita{count, plural, one {} other {n}} atención",
|
||||
"headline_yellow_general": "Algunos elementos necesitan tu atención",
|
||||
"headline_red": "Problemas críticos requieren acción inmediata"
|
||||
},
|
||||
|
||||
36
frontend/src/locales/es/purchase_orders.json
Normal file
36
frontend/src/locales/es/purchase_orders.json
Normal file
@@ -0,0 +1,36 @@
|
||||
{
|
||||
"purchase_order": "Orden de Compra",
|
||||
"purchase_orders": "Órdenes de Compra",
|
||||
"created": "Creada",
|
||||
"supplier": "Proveedor",
|
||||
"order_date": "Fecha de Pedido",
|
||||
"expected_delivery": "Entrega Esperada",
|
||||
"items": "Artículos",
|
||||
"no_items": "No hay artículos en esta orden",
|
||||
"notes": "Notas",
|
||||
"not_found": "Orden de compra no encontrada",
|
||||
"total_amount": "Monto Total",
|
||||
"status": {
|
||||
"draft": "Borrador",
|
||||
"pending_approval": "Pendiente de Aprobación",
|
||||
"approved": "Aprobada",
|
||||
"sent": "Enviada",
|
||||
"partially_received": "Parcialmente Recibida",
|
||||
"received": "Recibida",
|
||||
"cancelled": "Cancelada"
|
||||
},
|
||||
"details": {
|
||||
"title": "Detalles de la Orden de Compra",
|
||||
"quick_view": "Vista Rápida de la Orden",
|
||||
"summary": "Resumen",
|
||||
"supplier_info": "Información del Proveedor",
|
||||
"delivery_info": "Información de Entrega",
|
||||
"order_items": "Artículos del Pedido",
|
||||
"additional_notes": "Notas Adicionales"
|
||||
},
|
||||
"actions": {
|
||||
"approve": "Aprobar Orden",
|
||||
"modify": "Modificar Orden",
|
||||
"close": "Cerrar"
|
||||
}
|
||||
}
|
||||
@@ -75,8 +75,8 @@
|
||||
"last_updated": "Última actualización",
|
||||
"next_check": "Próxima verificación",
|
||||
"never": "Nunca",
|
||||
"critical_issues": "{{count}} problema{{count, plural, one {} other {s}}} crítico{{count, plural, one {} other {s}}}",
|
||||
"actions_needed": "{{count}} acción{{count, plural, one {} other {es}}} necesaria{{count, plural, one {} other {s}}}"
|
||||
"critical_issues": "{count} problema{count, plural, one {} other {s}} crítico{count, plural, one {} other {s}}",
|
||||
"actions_needed": "{count} acción{count, plural, one {} other {es}} necesaria{count, plural, one {} other {s}}"
|
||||
},
|
||||
"action_queue": {
|
||||
"title": "Qué Necesita Tu Atención",
|
||||
@@ -85,11 +85,23 @@
|
||||
"estimated_time": "Tiempo estimado",
|
||||
"all_caught_up": "¡Todo al día!",
|
||||
"no_actions": "No hay acciones que requieran tu atención en este momento.",
|
||||
"show_more": "Mostrar {{count}} Acción{{count, plural, one {} other {es}}} Más",
|
||||
"show_more": "Mostrar {count} Acción{count, plural, one {} other {es}} Más",
|
||||
"show_less": "Mostrar Menos",
|
||||
"total": "total",
|
||||
"critical": "críticas",
|
||||
"important": "importantes"
|
||||
"important": "importantes",
|
||||
"consequences": {
|
||||
"delayed_delivery_impact": "El retraso en la entrega puede afectar el cronograma de producción",
|
||||
"immediate_action_required": "Se requiere acción inmediata para prevenir problemas de producción",
|
||||
"some_features_limited": "Algunas funciones están limitadas"
|
||||
},
|
||||
"actions": {
|
||||
"approve": "Aprobar",
|
||||
"view_details": "Ver Detalles",
|
||||
"modify": "Modificar",
|
||||
"dismiss": "Descartar",
|
||||
"complete_setup": "Completar Configuración"
|
||||
}
|
||||
},
|
||||
"orchestration_summary": {
|
||||
"title": "Anoche Planifiqué Tu Día",
|
||||
@@ -97,17 +109,17 @@
|
||||
"run_planning": "Ejecutar Planificación Diaria",
|
||||
"run_info": "Ejecución de orquestación #{{runNumber}}",
|
||||
"took": "Duró {{seconds}}s",
|
||||
"created_pos": "{{count}} orden{{count, plural, one {} other {es}}} de compra creada{{count, plural, one {} other {s}}}",
|
||||
"scheduled_batches": "{{count}} lote{{count, plural, one {} other {s}}} de producción programado{{count, plural, one {} other {s}}}",
|
||||
"show_more": "Mostrar {{count}} más",
|
||||
"created_pos": "{count} orden{count, plural, one {} other {es}} de compra creada{count, plural, one {} other {s}}",
|
||||
"scheduled_batches": "{count} lote{count, plural, one {} other {s}} de producción programado{count, plural, one {} other {s}}",
|
||||
"show_more": "Mostrar {count} más",
|
||||
"show_less": "Mostrar menos",
|
||||
"no_actions": "¡No se necesitan nuevas acciones - todo va según lo planeado!",
|
||||
"based_on": "Basado en:",
|
||||
"customer_orders": "{{count}} pedido{{count, plural, one {} other {s}}} de cliente",
|
||||
"customer_orders": "{count} pedido{count, plural, one {} other {s}} de cliente",
|
||||
"historical_demand": "Demanda histórica",
|
||||
"inventory_levels": "Niveles de inventario",
|
||||
"ai_optimization": "Optimización por IA",
|
||||
"actions_required": "{{count}} elemento{{count, plural, one {} other {s}}} necesita{{count, plural, one {} other {n}}} tu aprobación antes de continuar",
|
||||
"actions_required": "{count} elemento{count, plural, one {} other {s}} necesita{count, plural, one {} other {n}} tu aprobación antes de continuar",
|
||||
"no_tenant_error": "No se encontró ID de inquilino. Por favor, asegúrate de haber iniciado sesión.",
|
||||
"planning_started": "Planificación iniciada correctamente",
|
||||
"planning_failed": "Error al iniciar la planificación",
|
||||
|
||||
@@ -12,6 +12,16 @@
|
||||
"title": "Agregar Inventario",
|
||||
"inventoryDetails": "Detalles del Artículo de Inventario",
|
||||
"fillRequiredInfo": "Complete la información requerida para crear un artículo de inventario",
|
||||
"summary": "Resumen",
|
||||
"steps": {
|
||||
"productType": "Tipo de Producto",
|
||||
"basicInfo": "Información Básica",
|
||||
"stockConfig": "Configuración de Stock"
|
||||
},
|
||||
"typeDescriptions": {
|
||||
"ingredient": "Materias primas e ingredientes utilizados en recetas",
|
||||
"finished_product": "Productos finales listos para venta o consumo"
|
||||
},
|
||||
"fields": {
|
||||
"name": "Nombre",
|
||||
"namePlaceholder": "Ej: Harina de Uso General, Pan de Masa Madre",
|
||||
@@ -81,6 +91,11 @@
|
||||
"basicInformation": "Información Básica",
|
||||
"advancedOptions": "Opciones Avanzadas",
|
||||
"advancedOptionsDescription": "Campos opcionales para gestión completa de inventario",
|
||||
"additionalInformationDescription": "Identificadores de producto opcionales",
|
||||
"additionalDetails": "Detalles Adicionales",
|
||||
"additionalDetailsDescription": "Detalles opcionales del producto",
|
||||
"advancedStockSettings": "Configuración Avanzada de Stock",
|
||||
"advancedStockSettingsDescription": "Configurar umbrales de inventario y puntos de reorden",
|
||||
"pricingInformation": "Información de Precios",
|
||||
"inventoryManagement": "Gestión de Inventario",
|
||||
"productInformation": "Información del Producto",
|
||||
|
||||
@@ -67,6 +67,9 @@
|
||||
"expand": "Zabaldu",
|
||||
"collapse": "Tolestu"
|
||||
},
|
||||
"item": "produktua",
|
||||
"items": "produktuak",
|
||||
"unknown": "Ezezaguna",
|
||||
"status": {
|
||||
"active": "Aktibo",
|
||||
"inactive": "Ez aktibo",
|
||||
|
||||
@@ -32,6 +32,32 @@
|
||||
"quick_actions": "Ekintza Azkarrak",
|
||||
"key_metrics": "Metrika Nagusiak"
|
||||
},
|
||||
"insights": {
|
||||
"savings": {
|
||||
"label": "💰 AURREZKIAK",
|
||||
"this_week": "aste honetan",
|
||||
"vs_last": "vs. aurrekoa"
|
||||
},
|
||||
"inventory": {
|
||||
"label": "📦 INBENTARIOA",
|
||||
"all_stocked": "Guztia stock-ean",
|
||||
"low_stock": "Stock baxua",
|
||||
"stock_issues": "⚠️ Stock arazoak",
|
||||
"no_alerts": "Ez dago alertarik",
|
||||
"out_of_stock": "{count} stock-ik gabe",
|
||||
"alerts": "{count} alerta"
|
||||
},
|
||||
"waste": {
|
||||
"label": "♻️ HONDAKINAK",
|
||||
"this_month": "hilabete honetan",
|
||||
"vs_goal": "vs. helburua"
|
||||
},
|
||||
"deliveries": {
|
||||
"label": "🚚 BIDALKETA",
|
||||
"arriving_today": "{count} gaur iristen",
|
||||
"none_scheduled": "Ez dago programaturik"
|
||||
}
|
||||
},
|
||||
"procurement": {
|
||||
"title": "Zer erosi behar da biarko?",
|
||||
"empty": "Hornikuntza guztiak prest biarko",
|
||||
@@ -70,8 +96,8 @@
|
||||
"view_all": "Alerta guztiak ikusi",
|
||||
"time": {
|
||||
"now": "Orain",
|
||||
"minutes_ago": "duela {{count}} min",
|
||||
"hours_ago": "duela {{count}} h",
|
||||
"minutes_ago": "duela {count} min",
|
||||
"hours_ago": "duela {count} h",
|
||||
"yesterday": "Atzo"
|
||||
},
|
||||
"types": {
|
||||
@@ -99,7 +125,7 @@
|
||||
"additional_details": "Xehetasun Gehigarriak",
|
||||
"mark_as_read": "Irakurritako gisa markatu",
|
||||
"remove": "Kendu",
|
||||
"active_count": "{{count}} alerta aktibo"
|
||||
"active_count": "{count} alerta aktibo"
|
||||
},
|
||||
"messages": {
|
||||
"welcome": "Ongi etorri berriro",
|
||||
@@ -129,16 +155,16 @@
|
||||
},
|
||||
"health": {
|
||||
"production_on_schedule": "Ekoizpena orduan",
|
||||
"production_delayed": "{{count}} ekoizpen sorta atzeratuta",
|
||||
"production_delayed": "{count} ekoizpen sorta atzeratuta",
|
||||
"all_ingredients_in_stock": "Osagai guztiak stockean",
|
||||
"ingredients_out_of_stock": "{{count}} osagai stockik gabe",
|
||||
"ingredients_out_of_stock": "{count} osagai stockik gabe",
|
||||
"no_pending_approvals": "Ez dago onarpen pendienteik",
|
||||
"approvals_awaiting": "{{count}} erosketa agindu{{count, plural, one {} other {k}}} onarpenaren zai",
|
||||
"approvals_awaiting": "{count} erosketa agindu{count, plural, one {} other {k}}} onarpenaren zai",
|
||||
"all_systems_operational": "Sistema guztiak martxan",
|
||||
"critical_issues": "{{count}} arazo kritiko",
|
||||
"critical_issues": "{count} arazo kritiko",
|
||||
"headline_green": "Zure okindegia arazorik gabe dabil",
|
||||
"headline_yellow_approvals": "Mesedez berrikusi {{count}} onarpen zain",
|
||||
"headline_yellow_alerts": "{{count}} alerta{{count, plural, one {} other {k}}} arreta behar d{{count, plural, one {u} other {ute}}}",
|
||||
"headline_yellow_approvals": "Mesedez berrikusi {count} onarpen zain",
|
||||
"headline_yellow_alerts": "{count} alerta{count, plural, one {} other {k}}} arreta behar d{count, plural, one {u} other {ute}}}",
|
||||
"headline_yellow_general": "Zenbait elementuk zure arreta behar dute",
|
||||
"headline_red": "Arazo kritikoek berehalako ekintza behar dute"
|
||||
},
|
||||
@@ -158,7 +184,7 @@
|
||||
"suppliers": "Hornitzaileak",
|
||||
"recipes": "Errezetak",
|
||||
"quality": "Kalitate Estandarrak",
|
||||
"add_ingredients": "Gehitu gutxienez {{count}} osagai",
|
||||
"add_ingredients": "Gehitu gutxienez {count} osagai",
|
||||
"add_supplier": "Gehitu zure lehen hornitzailea",
|
||||
"add_recipe": "Sortu zure lehen errezeta",
|
||||
"add_quality": "Gehitu kalitate kontrolak (aukerakoa)",
|
||||
|
||||
36
frontend/src/locales/eu/purchase_orders.json
Normal file
36
frontend/src/locales/eu/purchase_orders.json
Normal file
@@ -0,0 +1,36 @@
|
||||
{
|
||||
"purchase_order": "Erosketa Agindua",
|
||||
"purchase_orders": "Erosketa Aginduak",
|
||||
"created": "Sortua",
|
||||
"supplier": "Hornitzailea",
|
||||
"order_date": "Eskabidearen Data",
|
||||
"expected_delivery": "Espero den Entrega",
|
||||
"items": "Produktuak",
|
||||
"no_items": "Ez dago produkturik eskaera honetan",
|
||||
"notes": "Oharrak",
|
||||
"not_found": "Erosketa agindua ez da aurkitu",
|
||||
"total_amount": "Guztira",
|
||||
"status": {
|
||||
"draft": "Zirriborroa",
|
||||
"pending_approval": "Onarpenaren Zain",
|
||||
"approved": "Onartuta",
|
||||
"sent": "Bidalita",
|
||||
"partially_received": "Partzialki Jasota",
|
||||
"received": "Jasota",
|
||||
"cancelled": "Bertan Behera Utzita"
|
||||
},
|
||||
"details": {
|
||||
"title": "Erosketa Aginduaren Xehetasunak",
|
||||
"quick_view": "Eskaeraren Ikuspegi Azkarra",
|
||||
"summary": "Laburpena",
|
||||
"supplier_info": "Hornitzailearen Informazioa",
|
||||
"delivery_info": "Entregaren Informazioa",
|
||||
"order_items": "Eskaeraren Produktuak",
|
||||
"additional_notes": "Ohar Gehigarriak"
|
||||
},
|
||||
"actions": {
|
||||
"approve": "Agindua Onartu",
|
||||
"modify": "Agindua Aldatu",
|
||||
"close": "Itxi"
|
||||
}
|
||||
}
|
||||
@@ -85,11 +85,23 @@
|
||||
"estimated_time": "Estimatutako denbora",
|
||||
"all_caught_up": "Dena egunean!",
|
||||
"no_actions": "Ez dago une honetan zure arreta behar duen ekintzarik.",
|
||||
"show_more": "Erakutsi {{count}} Ekintza gehiago",
|
||||
"show_more": "Erakutsi {count} Ekintza gehiago",
|
||||
"show_less": "Erakutsi Gutxiago",
|
||||
"total": "guztira",
|
||||
"critical": "kritiko",
|
||||
"important": "garrantzitsu"
|
||||
"important": "garrantzitsu",
|
||||
"consequences": {
|
||||
"delayed_delivery_impact": "Entregatze atzerapena ekoizpen programan eragina izan dezake",
|
||||
"immediate_action_required": "Berehalako ekintza behar da ekoizpen arazoak saihesteko",
|
||||
"some_features_limited": "Funtzio batzuk mugatuta daude"
|
||||
},
|
||||
"actions": {
|
||||
"approve": "Onartu",
|
||||
"view_details": "Xehetasunak Ikusi",
|
||||
"modify": "Aldatu",
|
||||
"dismiss": "Baztertu",
|
||||
"complete_setup": "Osatu Konfigurazioa"
|
||||
}
|
||||
},
|
||||
"orchestration_summary": {
|
||||
"title": "Bart Gauean Zure Eguna Planifikatu Nuen",
|
||||
|
||||
@@ -12,6 +12,16 @@
|
||||
"title": "Inbentarioa Gehitu",
|
||||
"inventoryDetails": "Inbentario Elementuaren Xehetasunak",
|
||||
"fillRequiredInfo": "Bete beharrezko informazioa inbentario elementu bat sortzeko",
|
||||
"summary": "Laburpena",
|
||||
"steps": {
|
||||
"productType": "Produktu Mota",
|
||||
"basicInfo": "Oinarrizko Informazioa",
|
||||
"stockConfig": "Stock Konfigurazioa"
|
||||
},
|
||||
"typeDescriptions": {
|
||||
"ingredient": "Errezetetan erabiltzen diren lehengaiak eta osagaiak",
|
||||
"finished_product": "Salmentarako edo kontsumorako prest dauden produktu finalak"
|
||||
},
|
||||
"fields": {
|
||||
"name": "Izena",
|
||||
"namePlaceholder": "Adib: Erabilera Anitzeko Irina, Masa Zaharreko Ogia",
|
||||
@@ -81,6 +91,11 @@
|
||||
"basicInformation": "Oinarrizko Informazioa",
|
||||
"advancedOptions": "Aukera Aurreratuak",
|
||||
"advancedOptionsDescription": "Inbentario kudeaketa osoa egiteko eremu aukerazkoak",
|
||||
"additionalInformationDescription": "Produktu identifikatzaile aukerazkoak",
|
||||
"additionalDetails": "Xehetasun Gehigarriak",
|
||||
"additionalDetailsDescription": "Produktuaren xehetasun aukerazkoak",
|
||||
"advancedStockSettings": "Stock Ezarpen Aurreratuak",
|
||||
"advancedStockSettingsDescription": "Konfiguratu inbentario atalaseak eta berriro eskatzeko puntuak",
|
||||
"pricingInformation": "Prezioen Informazioa",
|
||||
"inventoryManagement": "Inbentario Kudeaketa",
|
||||
"productInformation": "Produktuaren Informazioa",
|
||||
|
||||
@@ -16,6 +16,7 @@ import ajustesEs from './es/ajustes.json';
|
||||
import reasoningEs from './es/reasoning.json';
|
||||
import wizardsEs from './es/wizards.json';
|
||||
import subscriptionEs from './es/subscription.json';
|
||||
import purchaseOrdersEs from './es/purchase_orders.json';
|
||||
|
||||
// English translations
|
||||
import commonEn from './en/common.json';
|
||||
@@ -35,6 +36,7 @@ import ajustesEn from './en/ajustes.json';
|
||||
import reasoningEn from './en/reasoning.json';
|
||||
import wizardsEn from './en/wizards.json';
|
||||
import subscriptionEn from './en/subscription.json';
|
||||
import purchaseOrdersEn from './en/purchase_orders.json';
|
||||
|
||||
// Basque translations
|
||||
import commonEu from './eu/common.json';
|
||||
@@ -54,6 +56,7 @@ import ajustesEu from './eu/ajustes.json';
|
||||
import reasoningEu from './eu/reasoning.json';
|
||||
import wizardsEu from './eu/wizards.json';
|
||||
import subscriptionEu from './eu/subscription.json';
|
||||
import purchaseOrdersEu from './eu/purchase_orders.json';
|
||||
|
||||
// Translation resources by language
|
||||
export const resources = {
|
||||
@@ -75,6 +78,7 @@ export const resources = {
|
||||
reasoning: reasoningEs,
|
||||
wizards: wizardsEs,
|
||||
subscription: subscriptionEs,
|
||||
purchase_orders: purchaseOrdersEs,
|
||||
},
|
||||
en: {
|
||||
common: commonEn,
|
||||
@@ -94,6 +98,7 @@ export const resources = {
|
||||
reasoning: reasoningEn,
|
||||
wizards: wizardsEn,
|
||||
subscription: subscriptionEn,
|
||||
purchase_orders: purchaseOrdersEn,
|
||||
},
|
||||
eu: {
|
||||
common: commonEu,
|
||||
@@ -113,6 +118,7 @@ export const resources = {
|
||||
reasoning: reasoningEu,
|
||||
wizards: wizardsEu,
|
||||
subscription: subscriptionEu,
|
||||
purchase_orders: purchaseOrdersEu,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -149,7 +155,7 @@ export const languageConfig = {
|
||||
};
|
||||
|
||||
// Namespaces available in translations
|
||||
export const namespaces = ['common', 'auth', 'inventory', 'foodSafety', 'suppliers', 'orders', 'recipes', 'errors', 'dashboard', 'production', 'equipment', 'landing', 'settings', 'ajustes', 'reasoning', 'wizards', 'subscription'] as const;
|
||||
export const namespaces = ['common', 'auth', 'inventory', 'foodSafety', 'suppliers', 'orders', 'recipes', 'errors', 'dashboard', 'production', 'equipment', 'landing', 'settings', 'ajustes', 'reasoning', 'wizards', 'subscription', 'purchase_orders'] as const;
|
||||
export type Namespace = typeof namespaces[number];
|
||||
|
||||
// Helper function to get language display name
|
||||
|
||||
@@ -36,6 +36,7 @@ import { ActionQueueCard } from '../../components/dashboard/ActionQueueCard';
|
||||
import { OrchestrationSummaryCard } from '../../components/dashboard/OrchestrationSummaryCard';
|
||||
import { ProductionTimelineCard } from '../../components/dashboard/ProductionTimelineCard';
|
||||
import { InsightsGrid } from '../../components/dashboard/InsightsGrid';
|
||||
import { PurchaseOrderDetailsModal } from '../../components/dashboard/PurchaseOrderDetailsModal';
|
||||
import { UnifiedAddWizard } from '../../components/domain/unified-wizard';
|
||||
import type { ItemType } from '../../components/domain/unified-wizard';
|
||||
import { useDemoTour, shouldStartTour, clearTourStartPending } from '../../features/demo-onboarding';
|
||||
@@ -52,6 +53,10 @@ export function NewDashboardPage() {
|
||||
const [isAddWizardOpen, setIsAddWizardOpen] = useState(false);
|
||||
const [addWizardError, setAddWizardError] = useState<string | null>(null);
|
||||
|
||||
// PO Details Modal state
|
||||
const [selectedPOId, setSelectedPOId] = useState<string | null>(null);
|
||||
const [isPOModalOpen, setIsPOModalOpen] = useState(false);
|
||||
|
||||
// Data fetching
|
||||
const {
|
||||
data: healthStatus,
|
||||
@@ -113,11 +118,13 @@ export function NewDashboardPage() {
|
||||
};
|
||||
|
||||
const handleViewDetails = (actionId: string) => {
|
||||
// Navigate to appropriate detail page based on action type
|
||||
navigate(`/app/operations/procurement`);
|
||||
// Open modal to show PO details
|
||||
setSelectedPOId(actionId);
|
||||
setIsPOModalOpen(true);
|
||||
};
|
||||
|
||||
const handleModify = (actionId: string) => {
|
||||
// Navigate to procurement page for modification
|
||||
navigate(`/app/operations/procurement`);
|
||||
};
|
||||
|
||||
@@ -327,6 +334,21 @@ export function NewDashboardPage() {
|
||||
onClose={() => setIsAddWizardOpen(false)}
|
||||
onComplete={handleAddWizardComplete}
|
||||
/>
|
||||
|
||||
{/* Purchase Order Details Modal */}
|
||||
{selectedPOId && (
|
||||
<PurchaseOrderDetailsModal
|
||||
poId={selectedPOId}
|
||||
tenantId={tenantId}
|
||||
isOpen={isPOModalOpen}
|
||||
onClose={() => {
|
||||
setIsPOModalOpen(false);
|
||||
setSelectedPOId(null);
|
||||
}}
|
||||
onApprove={handleApprove}
|
||||
onModify={handleModify}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -160,6 +160,13 @@ export const useAuthStore = create<AuthState>()(
|
||||
console.warn('Failed to clear tenant store on logout:', err);
|
||||
});
|
||||
|
||||
// Clear notification storage to ensure notifications don't persist across sessions
|
||||
import('../hooks/useNotifications').then(({ clearNotificationStorage }) => {
|
||||
clearNotificationStorage();
|
||||
}).catch(err => {
|
||||
console.warn('Failed to clear notification storage on logout:', err);
|
||||
});
|
||||
|
||||
set({
|
||||
user: null,
|
||||
token: null,
|
||||
|
||||
@@ -1,411 +0,0 @@
|
||||
/**
|
||||
* EXAMPLE TEST FILE
|
||||
*
|
||||
* This file demonstrates best practices for writing Playwright tests
|
||||
* Use this as a template when creating new tests
|
||||
*/
|
||||
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { login, logout, TEST_USER } from './helpers/auth';
|
||||
import {
|
||||
waitForLoadingToFinish,
|
||||
expectToastMessage,
|
||||
generateTestId,
|
||||
mockApiResponse
|
||||
} from './helpers/utils';
|
||||
|
||||
// ============================================================================
|
||||
// BASIC TEST STRUCTURE
|
||||
// ============================================================================
|
||||
|
||||
test.describe('Feature Name', () => {
|
||||
// Use authenticated state for tests that require login
|
||||
test.use({ storageState: 'tests/.auth/user.json' });
|
||||
|
||||
// Setup that runs before each test
|
||||
test.beforeEach(async ({ page }) => {
|
||||
await page.goto('/your-page');
|
||||
});
|
||||
|
||||
// Cleanup after each test (if needed)
|
||||
test.afterEach(async ({ page }) => {
|
||||
// Clean up test data if needed
|
||||
});
|
||||
|
||||
test('should display page correctly', async ({ page }) => {
|
||||
// Wait for page to load
|
||||
await waitForLoadingToFinish(page);
|
||||
|
||||
// Verify page elements
|
||||
await expect(page.getByRole('heading', { name: /page title/i })).toBeVisible();
|
||||
});
|
||||
});
|
||||
|
||||
// ============================================================================
|
||||
// AUTHENTICATION TESTS
|
||||
// ============================================================================
|
||||
|
||||
test.describe('Authentication Example', () => {
|
||||
test('should login manually', async ({ page }) => {
|
||||
// Use helper function
|
||||
await login(page, TEST_USER);
|
||||
|
||||
// Verify login success
|
||||
await expect(page).toHaveURL(/\/app/);
|
||||
});
|
||||
|
||||
test('should logout', async ({ page }) => {
|
||||
// Login first
|
||||
await login(page, TEST_USER);
|
||||
|
||||
// Logout
|
||||
await logout(page);
|
||||
|
||||
// Verify logged out
|
||||
await expect(page).toHaveURL(/\/login/);
|
||||
});
|
||||
});
|
||||
|
||||
// ============================================================================
|
||||
// FORM INTERACTIONS
|
||||
// ============================================================================
|
||||
|
||||
test.describe('Form Submission Example', () => {
|
||||
test.use({ storageState: 'tests/.auth/user.json' });
|
||||
|
||||
test('should submit form successfully', async ({ page }) => {
|
||||
await page.goto('/app/form-page');
|
||||
|
||||
// Fill form fields
|
||||
await page.getByLabel(/name/i).fill('Test Name');
|
||||
await page.getByLabel(/email/i).fill('test@example.com');
|
||||
await page.getByLabel(/description/i).fill('Test description');
|
||||
|
||||
// Select from dropdown
|
||||
await page.getByLabel(/category/i).click();
|
||||
await page.getByRole('option', { name: 'Option 1' }).click();
|
||||
|
||||
// Check checkbox
|
||||
await page.getByLabel(/agree to terms/i).check();
|
||||
|
||||
// Submit form
|
||||
await page.getByRole('button', { name: /submit/i }).click();
|
||||
|
||||
// Verify success
|
||||
await expectToastMessage(page, /success/i);
|
||||
await expect(page).toHaveURL(/\/success/);
|
||||
});
|
||||
|
||||
test('should show validation errors', async ({ page }) => {
|
||||
await page.goto('/app/form-page');
|
||||
|
||||
// Try to submit empty form
|
||||
await page.getByRole('button', { name: /submit/i }).click();
|
||||
|
||||
// Verify error messages
|
||||
await expect(page.getByText(/name.*required/i)).toBeVisible();
|
||||
await expect(page.getByText(/email.*required/i)).toBeVisible();
|
||||
});
|
||||
});
|
||||
|
||||
// ============================================================================
|
||||
// API MOCKING
|
||||
// ============================================================================
|
||||
|
||||
test.describe('API Mocking Example', () => {
|
||||
test.use({ storageState: 'tests/.auth/user.json' });
|
||||
|
||||
test('should handle API response', async ({ page }) => {
|
||||
// Mock successful API response
|
||||
await mockApiResponse(
|
||||
page,
|
||||
'**/api/products',
|
||||
{
|
||||
products: [
|
||||
{ id: 1, name: 'Product 1', price: 9.99 },
|
||||
{ id: 2, name: 'Product 2', price: 19.99 },
|
||||
],
|
||||
},
|
||||
200
|
||||
);
|
||||
|
||||
await page.goto('/app/products');
|
||||
|
||||
// Verify mocked data is displayed
|
||||
await expect(page.getByText('Product 1')).toBeVisible();
|
||||
await expect(page.getByText('Product 2')).toBeVisible();
|
||||
});
|
||||
|
||||
test('should handle API error', async ({ page }) => {
|
||||
// Mock error response
|
||||
await mockApiResponse(
|
||||
page,
|
||||
'**/api/products',
|
||||
{ error: 'Failed to fetch products' },
|
||||
500
|
||||
);
|
||||
|
||||
await page.goto('/app/products');
|
||||
|
||||
// Verify error message is shown
|
||||
await expect(page.getByText(/error|failed/i)).toBeVisible();
|
||||
});
|
||||
});
|
||||
|
||||
// ============================================================================
|
||||
// FILE UPLOAD
|
||||
// ============================================================================
|
||||
|
||||
test.describe('File Upload Example', () => {
|
||||
test.use({ storageState: 'tests/.auth/user.json' });
|
||||
|
||||
test('should upload file', async ({ page }) => {
|
||||
await page.goto('/app/upload');
|
||||
|
||||
// Upload file
|
||||
const fileInput = page.locator('input[type="file"]');
|
||||
await fileInput.setInputFiles('tests/fixtures/sample-inventory.csv');
|
||||
|
||||
// Verify file uploaded
|
||||
await expect(page.getByText('sample-inventory.csv')).toBeVisible();
|
||||
|
||||
// Submit
|
||||
await page.getByRole('button', { name: /upload/i }).click();
|
||||
|
||||
// Verify success
|
||||
await expectToastMessage(page, /uploaded successfully/i);
|
||||
});
|
||||
});
|
||||
|
||||
// ============================================================================
|
||||
// NAVIGATION
|
||||
// ============================================================================
|
||||
|
||||
test.describe('Navigation Example', () => {
|
||||
test.use({ storageState: 'tests/.auth/user.json' });
|
||||
|
||||
test('should navigate between pages', async ({ page }) => {
|
||||
// Start at dashboard
|
||||
await page.goto('/app/dashboard');
|
||||
|
||||
// Click navigation link
|
||||
await page.getByRole('link', { name: /operations/i }).click();
|
||||
|
||||
// Verify navigation
|
||||
await expect(page).toHaveURL(/\/operations/);
|
||||
await expect(page.getByRole('heading', { name: /operations/i })).toBeVisible();
|
||||
|
||||
// Navigate back
|
||||
await page.goBack();
|
||||
await expect(page).toHaveURL(/\/dashboard/);
|
||||
});
|
||||
});
|
||||
|
||||
// ============================================================================
|
||||
// MODALS AND DIALOGS
|
||||
// ============================================================================
|
||||
|
||||
test.describe('Modal Example', () => {
|
||||
test.use({ storageState: 'tests/.auth/user.json' });
|
||||
|
||||
test('should open and close modal', async ({ page }) => {
|
||||
await page.goto('/app/dashboard');
|
||||
|
||||
// Open modal
|
||||
await page.getByRole('button', { name: /open modal/i }).click();
|
||||
|
||||
// Verify modal is visible
|
||||
await expect(page.getByRole('dialog')).toBeVisible();
|
||||
|
||||
// Close modal
|
||||
await page.getByRole('button', { name: /close|cancel/i }).click();
|
||||
|
||||
// Verify modal is closed
|
||||
await expect(page.getByRole('dialog')).not.toBeVisible();
|
||||
});
|
||||
|
||||
test('should submit modal form', async ({ page }) => {
|
||||
await page.goto('/app/dashboard');
|
||||
|
||||
// Open modal
|
||||
await page.getByRole('button', { name: /add item/i }).click();
|
||||
|
||||
// Fill modal form
|
||||
await page.getByLabel(/item name/i).fill('Test Item');
|
||||
|
||||
// Submit
|
||||
await page.getByRole('button', { name: /save/i }).click();
|
||||
|
||||
// Modal should close
|
||||
await expect(page.getByRole('dialog')).not.toBeVisible();
|
||||
|
||||
// Verify item added
|
||||
await expect(page.getByText('Test Item')).toBeVisible();
|
||||
});
|
||||
});
|
||||
|
||||
// ============================================================================
|
||||
// MOBILE VIEWPORT
|
||||
// ============================================================================
|
||||
|
||||
test.describe('Mobile Viewport Example', () => {
|
||||
test.use({ storageState: 'tests/.auth/user.json' });
|
||||
|
||||
test('should work on mobile', async ({ page }) => {
|
||||
// Set mobile viewport
|
||||
await page.setViewportSize({ width: 375, height: 667 });
|
||||
|
||||
await page.goto('/app/dashboard');
|
||||
|
||||
// Verify mobile menu
|
||||
const mobileMenuButton = page.getByRole('button', { name: /menu|hamburger/i });
|
||||
await expect(mobileMenuButton).toBeVisible();
|
||||
|
||||
// Open mobile menu
|
||||
await mobileMenuButton.click();
|
||||
|
||||
// Verify menu items
|
||||
await expect(page.getByRole('link', { name: /dashboard/i })).toBeVisible();
|
||||
});
|
||||
});
|
||||
|
||||
// ============================================================================
|
||||
// WAITING AND TIMING
|
||||
// ============================================================================
|
||||
|
||||
test.describe('Waiting Example', () => {
|
||||
test.use({ storageState: 'tests/.auth/user.json' });
|
||||
|
||||
test('should wait for elements correctly', async ({ page }) => {
|
||||
await page.goto('/app/dashboard');
|
||||
|
||||
// Wait for specific element
|
||||
await page.waitForSelector('[data-testid="dashboard-loaded"]');
|
||||
|
||||
// Wait for API response
|
||||
const response = await page.waitForResponse((resp) =>
|
||||
resp.url().includes('/api/dashboard') && resp.status() === 200
|
||||
);
|
||||
|
||||
// Wait for navigation
|
||||
await page.getByRole('link', { name: /settings/i }).click();
|
||||
await page.waitForURL(/\/settings/);
|
||||
|
||||
// Wait for network idle (use sparingly)
|
||||
await page.waitForLoadState('networkidle');
|
||||
});
|
||||
});
|
||||
|
||||
// ============================================================================
|
||||
// ASSERTIONS
|
||||
// ============================================================================
|
||||
|
||||
test.describe('Assertion Examples', () => {
|
||||
test.use({ storageState: 'tests/.auth/user.json' });
|
||||
|
||||
test('should demonstrate various assertions', async ({ page }) => {
|
||||
await page.goto('/app/dashboard');
|
||||
|
||||
// Element visibility
|
||||
await expect(page.getByText('Dashboard')).toBeVisible();
|
||||
await expect(page.getByText('Hidden Text')).not.toBeVisible();
|
||||
|
||||
// Text content
|
||||
await expect(page.getByRole('heading')).toContainText('Welcome');
|
||||
|
||||
// URL
|
||||
await expect(page).toHaveURL(/\/dashboard/);
|
||||
|
||||
// Element count
|
||||
await expect(page.getByRole('button')).toHaveCount(5);
|
||||
|
||||
// Attribute
|
||||
await expect(page.getByRole('link', { name: 'Settings' })).toHaveAttribute('href', '/settings');
|
||||
|
||||
// CSS class
|
||||
await expect(page.getByRole('button', { name: 'Active' })).toHaveClass(/active/);
|
||||
|
||||
// Value
|
||||
await expect(page.getByLabel('Search')).toHaveValue('');
|
||||
});
|
||||
});
|
||||
|
||||
// ============================================================================
|
||||
// TEST DATA GENERATION
|
||||
// ============================================================================
|
||||
|
||||
test.describe('Test Data Example', () => {
|
||||
test.use({ storageState: 'tests/.auth/user.json' });
|
||||
|
||||
test('should use generated test data', async ({ page }) => {
|
||||
await page.goto('/app/products');
|
||||
|
||||
// Generate unique test data
|
||||
const productName = `Test Product ${generateTestId()}`;
|
||||
|
||||
// Use in test
|
||||
await page.getByLabel(/product name/i).fill(productName);
|
||||
await page.getByRole('button', { name: /save/i }).click();
|
||||
|
||||
// Verify
|
||||
await expect(page.getByText(productName)).toBeVisible();
|
||||
});
|
||||
});
|
||||
|
||||
// ============================================================================
|
||||
// KEYBOARD AND MOUSE INTERACTIONS
|
||||
// ============================================================================
|
||||
|
||||
test.describe('Interaction Examples', () => {
|
||||
test.use({ storageState: 'tests/.auth/user.json' });
|
||||
|
||||
test('should handle keyboard interactions', async ({ page }) => {
|
||||
await page.goto('/app/search');
|
||||
|
||||
const searchInput = page.getByLabel(/search/i);
|
||||
|
||||
// Type text
|
||||
await searchInput.type('product name');
|
||||
|
||||
// Press Enter
|
||||
await searchInput.press('Enter');
|
||||
|
||||
// Use keyboard shortcuts
|
||||
await page.keyboard.press('Control+K'); // Open search
|
||||
await page.keyboard.press('Escape'); // Close modal
|
||||
});
|
||||
|
||||
test('should handle mouse interactions', async ({ page }) => {
|
||||
await page.goto('/app/dashboard');
|
||||
|
||||
const element = page.getByTestId('draggable-item');
|
||||
|
||||
// Hover
|
||||
await element.hover();
|
||||
|
||||
// Double click
|
||||
await element.dblclick();
|
||||
|
||||
// Right click
|
||||
await element.click({ button: 'right' });
|
||||
});
|
||||
});
|
||||
|
||||
// ============================================================================
|
||||
// BEST PRACTICES SUMMARY
|
||||
// ============================================================================
|
||||
|
||||
/**
|
||||
* BEST PRACTICES:
|
||||
*
|
||||
* 1. Use semantic selectors (getByRole, getByLabel, getByText)
|
||||
* 2. Avoid hard-coded waits (waitForTimeout) - use auto-waiting
|
||||
* 3. Reuse authentication state to save time
|
||||
* 4. Use helpers for common operations
|
||||
* 5. Generate unique test data to avoid conflicts
|
||||
* 6. Mock APIs for faster, more reliable tests
|
||||
* 7. Keep tests independent and isolated
|
||||
* 8. Use descriptive test names
|
||||
* 9. Clean up test data after tests
|
||||
* 10. Use data-testid for complex elements
|
||||
*/
|
||||
@@ -39,37 +39,87 @@ npx playwright install
|
||||
|
||||
## 🎯 Running Tests
|
||||
|
||||
### Run all tests (headless)
|
||||
### Testing Against Local Dev Server (Default)
|
||||
|
||||
These commands test against the Vite dev server running on `localhost:5173`:
|
||||
|
||||
#### Run all tests (headless)
|
||||
```bash
|
||||
npm run test:e2e
|
||||
```
|
||||
|
||||
### Run tests with UI (interactive mode)
|
||||
#### Run tests with UI (interactive mode)
|
||||
```bash
|
||||
npm run test:e2e:ui
|
||||
```
|
||||
|
||||
### Run tests in headed mode (see browser)
|
||||
#### Run tests in headed mode (see browser)
|
||||
```bash
|
||||
npm run test:e2e:headed
|
||||
```
|
||||
|
||||
### Run tests in debug mode (step through tests)
|
||||
#### Run tests in debug mode (step through tests)
|
||||
```bash
|
||||
npm run test:e2e:debug
|
||||
```
|
||||
|
||||
### Run specific test file
|
||||
### Testing Against Local Kubernetes/Tilt Environment
|
||||
|
||||
These commands test against your Tilt-managed Kubernetes cluster on `localhost`:
|
||||
|
||||
#### Prerequisites
|
||||
- Tilt must be running: `tilt up`
|
||||
- Frontend service must be accessible at `http://localhost` (via ingress)
|
||||
- All services should be healthy (check with `tilt status` or the Tilt UI)
|
||||
|
||||
#### Run all tests against K8s (headless)
|
||||
```bash
|
||||
npm run test:e2e:k8s
|
||||
```
|
||||
|
||||
#### Run tests with UI (interactive mode)
|
||||
```bash
|
||||
npm run test:e2e:k8s:ui
|
||||
```
|
||||
|
||||
#### Run tests in headed mode (see browser)
|
||||
```bash
|
||||
npm run test:e2e:k8s:headed
|
||||
```
|
||||
|
||||
#### Run tests in debug mode
|
||||
```bash
|
||||
npm run test:e2e:k8s:debug
|
||||
```
|
||||
|
||||
#### Record tests against K8s environment
|
||||
```bash
|
||||
npm run test:e2e:k8s:codegen
|
||||
```
|
||||
|
||||
#### Custom base URL
|
||||
If your K8s ingress uses a different URL (e.g., `bakery-ia.local`):
|
||||
```bash
|
||||
PLAYWRIGHT_BASE_URL=http://bakery-ia.local npm run test:e2e:k8s
|
||||
```
|
||||
|
||||
### General Test Commands
|
||||
|
||||
#### Run specific test file
|
||||
```bash
|
||||
npx playwright test tests/auth/login.spec.ts
|
||||
# Or against K8s:
|
||||
npx playwright test --config=playwright.k8s.config.ts tests/auth/login.spec.ts
|
||||
```
|
||||
|
||||
### Run tests matching a pattern
|
||||
#### Run tests matching a pattern
|
||||
```bash
|
||||
npx playwright test --grep "login"
|
||||
# Or against K8s:
|
||||
npx playwright test --config=playwright.k8s.config.ts --grep "login"
|
||||
```
|
||||
|
||||
### View test report
|
||||
#### View test report
|
||||
```bash
|
||||
npm run test:e2e:report
|
||||
```
|
||||
@@ -289,13 +339,15 @@ Current test coverage:
|
||||
## 🚨 Common Issues
|
||||
|
||||
### Tests fail with "timeout exceeded"
|
||||
- Check if dev server is running
|
||||
- Increase timeout in `playwright.config.ts`
|
||||
- Check if dev server is running (for regular tests)
|
||||
- For K8s tests: Verify Tilt is running and services are healthy
|
||||
- Increase timeout in `playwright.config.ts` or `playwright.k8s.config.ts`
|
||||
- Check network speed
|
||||
|
||||
### Authentication fails
|
||||
- Verify test credentials are correct
|
||||
- Check if test user exists in database
|
||||
- For K8s tests: Ensure the database is seeded with test data
|
||||
- Clear `.auth/user.json` and re-run
|
||||
|
||||
### "Element not found"
|
||||
@@ -308,6 +360,44 @@ Current test coverage:
|
||||
- Ensure database is seeded with test data
|
||||
- Check for timing issues (add explicit waits)
|
||||
|
||||
### K8s-Specific Issues
|
||||
|
||||
#### Cannot connect to http://localhost
|
||||
```bash
|
||||
# Check if ingress is running
|
||||
kubectl get ingress -n bakery-ia
|
||||
|
||||
# Verify services are up
|
||||
tilt status
|
||||
|
||||
# Check if you can access the frontend manually
|
||||
curl http://localhost
|
||||
```
|
||||
|
||||
#### Ingress returns 404 or 503
|
||||
- Verify all Tilt resources are healthy in the Tilt UI
|
||||
- Check frontend pod logs: `kubectl logs -n bakery-ia -l app=frontend`
|
||||
- Restart Tilt: `tilt down && tilt up`
|
||||
|
||||
#### Tests are slower in K8s than dev server
|
||||
- This is expected due to ingress routing overhead
|
||||
- The K8s config has increased `navigationTimeout` to 30 seconds
|
||||
- Consider running fewer browsers in parallel for K8s tests
|
||||
|
||||
#### Authentication state doesn't work
|
||||
- Test credentials must match what's seeded in K8s database
|
||||
- Check orchestrator logs for auth issues: `kubectl logs -n bakery-ia -l app=orchestrator`
|
||||
- Delete `.auth/user.json` and re-run setup
|
||||
|
||||
#### Using custom ingress host (e.g., bakery-ia.local)
|
||||
```bash
|
||||
# Add to /etc/hosts
|
||||
echo "127.0.0.1 bakery-ia.local" | sudo tee -a /etc/hosts
|
||||
|
||||
# Run tests with custom URL
|
||||
PLAYWRIGHT_BASE_URL=http://bakery-ia.local npm run test:e2e:k8s
|
||||
```
|
||||
|
||||
## 📚 Resources
|
||||
|
||||
- [Playwright Documentation](https://playwright.dev)
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
import { test as setup, expect } from '@playwright/test';
|
||||
import path from 'path';
|
||||
import { fileURLToPath } from 'url';
|
||||
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = path.dirname(__filename);
|
||||
|
||||
const authFile = path.join(__dirname, '.auth', 'user.json');
|
||||
|
||||
@@ -12,17 +16,27 @@ setup('authenticate', async ({ page }) => {
|
||||
// Navigate to login page
|
||||
await page.goto('/login');
|
||||
|
||||
// Handle cookie consent dialog if present
|
||||
const acceptCookiesButton = page.getByRole('button', {
|
||||
name: /aceptar todas|accept all/i,
|
||||
});
|
||||
if (await acceptCookiesButton.isVisible({ timeout: 2000 }).catch(() => false)) {
|
||||
await acceptCookiesButton.click();
|
||||
console.log('✅ Cookie consent accepted');
|
||||
}
|
||||
|
||||
// TODO: Update these credentials with your test user
|
||||
// For now, we'll use environment variables or default test credentials
|
||||
const testEmail = process.env.TEST_USER_EMAIL || 'test@bakery.com';
|
||||
const testPassword = process.env.TEST_USER_PASSWORD || 'test-password-123';
|
||||
const testEmail = process.env.TEST_USER_EMAIL || 'ualfaro@gmail.com';
|
||||
const testPassword = process.env.TEST_USER_PASSWORD || 'Admin123';
|
||||
|
||||
// Fill in login form
|
||||
await page.getByLabel(/email/i).fill(testEmail);
|
||||
await page.getByLabel(/password/i).fill(testPassword);
|
||||
await page.getByLabel(/email|correo/i).fill(testEmail);
|
||||
// Use getByRole for password to avoid matching the "Show password" button
|
||||
await page.getByRole('textbox', { name: /password|contraseña/i }).fill(testPassword);
|
||||
|
||||
// Click login button
|
||||
await page.getByRole('button', { name: /log in|sign in|login/i }).click();
|
||||
await page.getByRole('button', { name: /log in|sign in|login|acceder/i }).click();
|
||||
|
||||
// Wait for redirect to dashboard or app
|
||||
await page.waitForURL(/\/(app|dashboard)/);
|
||||
|
||||
@@ -1,26 +1,29 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { login, logout, TEST_USER } from '../helpers/auth';
|
||||
import { acceptCookieConsent } from '../helpers/utils';
|
||||
|
||||
test.describe('Login Flow', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
// Start at login page
|
||||
await page.goto('/login');
|
||||
// Accept cookie consent if present
|
||||
await acceptCookieConsent(page);
|
||||
});
|
||||
|
||||
test('should display login form', async ({ page }) => {
|
||||
// Verify login page elements are visible
|
||||
await expect(page.getByLabel(/email/i)).toBeVisible();
|
||||
await expect(page.getByLabel(/password/i)).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /log in|sign in|login/i })).toBeVisible();
|
||||
// Verify login page elements are visible (support both English and Spanish)
|
||||
await expect(page.getByLabel(/email|correo/i)).toBeVisible();
|
||||
await expect(page.getByRole('textbox', { name: /password|contraseña/i })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /log in|sign in|login|acceder/i })).toBeVisible();
|
||||
});
|
||||
|
||||
test('should successfully login with valid credentials', async ({ page }) => {
|
||||
// Fill in credentials
|
||||
await page.getByLabel(/email/i).fill(TEST_USER.email);
|
||||
await page.getByLabel(/password/i).fill(TEST_USER.password);
|
||||
await page.getByLabel(/email|correo/i).fill(TEST_USER.email);
|
||||
await page.getByRole('textbox', { name: /password|contraseña/i }).fill(TEST_USER.password);
|
||||
|
||||
// Click login button
|
||||
await page.getByRole('button', { name: /log in|sign in|login/i }).click();
|
||||
await page.getByRole('button', { name: /log in|sign in|login|acceder/i }).click();
|
||||
|
||||
// Should redirect to dashboard or app
|
||||
await expect(page).toHaveURL(/\/(app|dashboard)/, { timeout: 10000 });
|
||||
@@ -31,11 +34,11 @@ test.describe('Login Flow', () => {
|
||||
|
||||
test('should show error with invalid email', async ({ page }) => {
|
||||
// Fill in invalid credentials
|
||||
await page.getByLabel(/email/i).fill('invalid@email.com');
|
||||
await page.getByLabel(/password/i).fill('wrongpassword');
|
||||
await page.getByLabel(/email|correo/i).fill('invalid@email.com');
|
||||
await page.getByRole('textbox', { name: /password|contraseña/i }).fill('wrongpassword');
|
||||
|
||||
// Click login button
|
||||
await page.getByRole('button', { name: /log in|sign in|login/i }).click();
|
||||
await page.getByRole('button', { name: /log in|sign in|login|acceder/i }).click();
|
||||
|
||||
// Should show error message
|
||||
await expect(page.locator('body')).toContainText(/invalid|incorrect|error|credenciales/i, {
|
||||
@@ -48,8 +51,8 @@ test.describe('Login Flow', () => {
|
||||
|
||||
test('should show validation error for empty email', async ({ page }) => {
|
||||
// Try to submit without email
|
||||
await page.getByLabel(/password/i).fill('somepassword');
|
||||
await page.getByRole('button', { name: /log in|sign in|login/i }).click();
|
||||
await page.getByRole('textbox', { name: /password|contraseña/i }).fill('somepassword');
|
||||
await page.getByRole('button', { name: /log in|sign in|login|acceder/i }).click();
|
||||
|
||||
// Should show validation error (either inline or toast)
|
||||
const bodyText = await page.locator('body').textContent();
|
||||
@@ -58,8 +61,8 @@ test.describe('Login Flow', () => {
|
||||
|
||||
test('should show validation error for empty password', async ({ page }) => {
|
||||
// Try to submit without password
|
||||
await page.getByLabel(/email/i).fill('test@example.com');
|
||||
await page.getByRole('button', { name: /log in|sign in|login/i }).click();
|
||||
await page.getByLabel(/email|correo/i).fill('test@example.com');
|
||||
await page.getByRole('button', { name: /log in|sign in|login|acceder/i }).click();
|
||||
|
||||
// Should show validation error
|
||||
const bodyText = await page.locator('body').textContent();
|
||||
@@ -67,15 +70,17 @@ test.describe('Login Flow', () => {
|
||||
});
|
||||
|
||||
test('should toggle password visibility', async ({ page }) => {
|
||||
const passwordInput = page.getByLabel(/password/i);
|
||||
const passwordInput = page.getByRole('textbox', { name: /password|contraseña/i });
|
||||
|
||||
// Initially should be password type
|
||||
await expect(passwordInput).toHaveAttribute('type', 'password');
|
||||
|
||||
// Look for toggle button (eye icon, "show password", etc.)
|
||||
const toggleButton = page.locator('button:has-text("Show"), button:has-text("Mostrar"), button[aria-label*="password"]').first();
|
||||
const toggleButton = page.getByRole('button', { name: /show|mostrar.*password|contraseña/i });
|
||||
|
||||
if (await toggleButton.isVisible()) {
|
||||
const isToggleVisible = await toggleButton.isVisible({ timeout: 2000 }).catch(() => false);
|
||||
|
||||
if (isToggleVisible) {
|
||||
await toggleButton.click();
|
||||
|
||||
// Should change to text type
|
||||
@@ -88,11 +93,18 @@ test.describe('Login Flow', () => {
|
||||
});
|
||||
|
||||
test('should have link to registration page', async ({ page }) => {
|
||||
// Look for register/signup link
|
||||
const registerLink = page.getByRole('link', { name: /register|sign up|crear cuenta/i });
|
||||
// Look for register/signup button or link
|
||||
const registerButton = page.getByRole('button', { name: /register|sign up|crear cuenta|registrar/i });
|
||||
const registerLink = page.getByRole('link', { name: /register|sign up|crear cuenta|registrar/i });
|
||||
|
||||
if (await registerLink.isVisible()) {
|
||||
const isButtonVisible = await registerButton.isVisible({ timeout: 2000 }).catch(() => false);
|
||||
const isLinkVisible = await registerLink.isVisible({ timeout: 2000 }).catch(() => false);
|
||||
|
||||
if (isLinkVisible) {
|
||||
await expect(registerLink).toHaveAttribute('href', /\/register/);
|
||||
} else if (isButtonVisible) {
|
||||
// If it's a button, just verify it exists
|
||||
await expect(registerButton).toBeVisible();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -1,12 +1,19 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { acceptCookieConsent } from '../helpers/utils';
|
||||
|
||||
test.describe('Logout Flow', () => {
|
||||
// Use authenticated state for these tests
|
||||
test.use({ storageState: 'tests/.auth/user.json' });
|
||||
|
||||
test.beforeEach(async ({ page }) => {
|
||||
// Accept cookie consent if present on any page navigation
|
||||
await acceptCookieConsent(page);
|
||||
});
|
||||
|
||||
test('should successfully logout', async ({ page }) => {
|
||||
// Navigate to dashboard
|
||||
await page.goto('/app/dashboard');
|
||||
await acceptCookieConsent(page);
|
||||
|
||||
// Verify we're logged in
|
||||
await expect(page.locator('body')).toContainText(/dashboard|panel de control/i);
|
||||
@@ -29,8 +36,9 @@ test.describe('Logout Flow', () => {
|
||||
// Should redirect to login page
|
||||
await expect(page).toHaveURL(/\/(login|$)/, { timeout: 10000 });
|
||||
|
||||
// Verify we're logged out
|
||||
await expect(page.getByLabel(/email/i)).toBeVisible();
|
||||
// Verify we're logged out (check for login form)
|
||||
await acceptCookieConsent(page);
|
||||
await expect(page.getByLabel(/email|correo/i)).toBeVisible();
|
||||
});
|
||||
|
||||
test('should not access protected routes after logout', async ({ page }) => {
|
||||
|
||||
@@ -1,19 +1,21 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { generateTestId } from '../helpers/utils';
|
||||
import { generateTestId, acceptCookieConsent } from '../helpers/utils';
|
||||
|
||||
test.describe('Registration Flow', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
// Start at registration page
|
||||
await page.goto('/register');
|
||||
// Accept cookie consent if present
|
||||
await acceptCookieConsent(page);
|
||||
});
|
||||
|
||||
test('should display registration form', async ({ page }) => {
|
||||
// Verify registration form elements
|
||||
await expect(page.getByLabel(/email/i)).toBeVisible();
|
||||
await expect(page.getByLabel(/password/i).first()).toBeVisible();
|
||||
// Verify registration form elements (support both English and Spanish)
|
||||
await expect(page.getByLabel(/email|correo/i)).toBeVisible();
|
||||
await expect(page.getByRole('textbox', { name: /password|contraseña/i }).first()).toBeVisible();
|
||||
|
||||
// Look for submit button
|
||||
const submitButton = page.getByRole('button', { name: /register|sign up|crear cuenta/i });
|
||||
const submitButton = page.getByRole('button', { name: /register|sign up|crear cuenta|registrar/i });
|
||||
await expect(submitButton).toBeVisible();
|
||||
});
|
||||
|
||||
@@ -23,14 +25,15 @@ test.describe('Registration Flow', () => {
|
||||
const testPassword = 'Test123!@#Password';
|
||||
|
||||
// Fill in registration form
|
||||
await page.getByLabel(/email/i).fill(testEmail);
|
||||
await page.getByLabel(/email|correo/i).fill(testEmail);
|
||||
|
||||
// Find password fields
|
||||
const passwordFields = page.getByLabel(/password/i);
|
||||
const passwordFields = page.getByRole('textbox', { name: /password|contraseña/i });
|
||||
await passwordFields.first().fill(testPassword);
|
||||
|
||||
// If there's a confirm password field
|
||||
if (await passwordFields.count() > 1) {
|
||||
const count = await passwordFields.count();
|
||||
if (count > 1) {
|
||||
await passwordFields.nth(1).fill(testPassword);
|
||||
}
|
||||
|
||||
@@ -52,7 +55,7 @@ test.describe('Registration Flow', () => {
|
||||
}
|
||||
|
||||
// Submit form
|
||||
await page.getByRole('button', { name: /register|sign up|crear cuenta/i }).click();
|
||||
await page.getByRole('button', { name: /register|sign up|crear cuenta|registrar/i }).click();
|
||||
|
||||
// Should redirect to onboarding or dashboard
|
||||
await expect(page).toHaveURL(/\/(app|dashboard|onboarding)/, { timeout: 15000 });
|
||||
@@ -60,13 +63,13 @@ test.describe('Registration Flow', () => {
|
||||
|
||||
test('should show validation error for invalid email format', async ({ page }) => {
|
||||
// Fill in invalid email
|
||||
await page.getByLabel(/email/i).fill('invalid-email');
|
||||
await page.getByLabel(/email|correo/i).fill('invalid-email');
|
||||
|
||||
const passwordFields = page.getByLabel(/password/i);
|
||||
const passwordFields = page.getByRole('textbox', { name: /password|contraseña/i });
|
||||
await passwordFields.first().fill('ValidPassword123!');
|
||||
|
||||
// Submit
|
||||
await page.getByRole('button', { name: /register|sign up|crear cuenta/i }).click();
|
||||
await page.getByRole('button', { name: /register|sign up|crear cuenta|registrar/i }).click();
|
||||
|
||||
// Should show email validation error
|
||||
await expect(page.locator('body')).toContainText(/valid email|email válido|formato/i, {
|
||||
@@ -77,16 +80,17 @@ test.describe('Registration Flow', () => {
|
||||
test('should show error for weak password', async ({ page }) => {
|
||||
const testEmail = `test-${generateTestId()}@bakery.com`;
|
||||
|
||||
await page.getByLabel(/email/i).fill(testEmail);
|
||||
await page.getByLabel(/email|correo/i).fill(testEmail);
|
||||
|
||||
const passwordFields = page.getByLabel(/password/i);
|
||||
const passwordFields = page.getByRole('textbox', { name: /password|contraseña/i });
|
||||
await passwordFields.first().fill('123'); // Weak password
|
||||
|
||||
if (await passwordFields.count() > 1) {
|
||||
const count = await passwordFields.count();
|
||||
if (count > 1) {
|
||||
await passwordFields.nth(1).fill('123');
|
||||
}
|
||||
|
||||
await page.getByRole('button', { name: /register|sign up|crear cuenta/i }).click();
|
||||
await page.getByRole('button', { name: /register|sign up|crear cuenta|registrar/i }).click();
|
||||
|
||||
// Should show password strength error
|
||||
await expect(page.locator('body')).toContainText(
|
||||
@@ -98,16 +102,17 @@ test.describe('Registration Flow', () => {
|
||||
test('should show error when passwords do not match', async ({ page }) => {
|
||||
const testEmail = `test-${generateTestId()}@bakery.com`;
|
||||
|
||||
await page.getByLabel(/email/i).fill(testEmail);
|
||||
await page.getByLabel(/email|correo/i).fill(testEmail);
|
||||
|
||||
const passwordFields = page.getByLabel(/password/i);
|
||||
const passwordFields = page.getByRole('textbox', { name: /password|contraseña/i });
|
||||
|
||||
// Only test if there are multiple password fields (password + confirm)
|
||||
if (await passwordFields.count() > 1) {
|
||||
const count = await passwordFields.count();
|
||||
if (count > 1) {
|
||||
await passwordFields.first().fill('Password123!');
|
||||
await passwordFields.nth(1).fill('DifferentPassword123!');
|
||||
|
||||
await page.getByRole('button', { name: /register|sign up|crear cuenta/i }).click();
|
||||
await page.getByRole('button', { name: /register|sign up|crear cuenta|registrar/i }).click();
|
||||
|
||||
// Should show mismatch error
|
||||
await expect(page.locator('body')).toContainText(/match|coincide|igual/i, {
|
||||
@@ -118,16 +123,17 @@ test.describe('Registration Flow', () => {
|
||||
|
||||
test('should show error for already registered email', async ({ page }) => {
|
||||
// Try to register with an email that's already in use
|
||||
await page.getByLabel(/email/i).fill('existing@bakery.com');
|
||||
await page.getByLabel(/email|correo/i).fill('existing@bakery.com');
|
||||
|
||||
const passwordFields = page.getByLabel(/password/i);
|
||||
const passwordFields = page.getByRole('textbox', { name: /password|contraseña/i });
|
||||
await passwordFields.first().fill('ValidPassword123!');
|
||||
|
||||
if (await passwordFields.count() > 1) {
|
||||
const count = await passwordFields.count();
|
||||
if (count > 1) {
|
||||
await passwordFields.nth(1).fill('ValidPassword123!');
|
||||
}
|
||||
|
||||
await page.getByRole('button', { name: /register|sign up|crear cuenta/i }).click();
|
||||
await page.getByRole('button', { name: /register|sign up|crear cuenta|registrar/i }).click();
|
||||
|
||||
// Should show error about email already existing
|
||||
await expect(page.locator('body')).toContainText(
|
||||
@@ -137,11 +143,17 @@ test.describe('Registration Flow', () => {
|
||||
});
|
||||
|
||||
test('should have link to login page', async ({ page }) => {
|
||||
// Look for login link
|
||||
// Look for login link or button
|
||||
const loginLink = page.getByRole('link', { name: /log in|sign in|iniciar sesión/i });
|
||||
const loginButton = page.getByRole('button', { name: /log in|sign in|iniciar sesión/i });
|
||||
|
||||
if (await loginLink.isVisible()) {
|
||||
const isLinkVisible = await loginLink.isVisible({ timeout: 2000 }).catch(() => false);
|
||||
const isButtonVisible = await loginButton.isVisible({ timeout: 2000 }).catch(() => false);
|
||||
|
||||
if (isLinkVisible) {
|
||||
await expect(loginLink).toHaveAttribute('href', /\/login/);
|
||||
} else if (isButtonVisible) {
|
||||
await expect(loginButton).toBeVisible();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -152,17 +164,18 @@ test.describe('Registration Flow', () => {
|
||||
if (await termsCheckbox.isVisible().catch(() => false)) {
|
||||
const testEmail = `test-${generateTestId()}@bakery.com`;
|
||||
|
||||
await page.getByLabel(/email/i).fill(testEmail);
|
||||
await page.getByLabel(/email|correo/i).fill(testEmail);
|
||||
|
||||
const passwordFields = page.getByLabel(/password/i);
|
||||
const passwordFields = page.getByRole('textbox', { name: /password|contraseña/i });
|
||||
await passwordFields.first().fill('ValidPassword123!');
|
||||
|
||||
if (await passwordFields.count() > 1) {
|
||||
const count = await passwordFields.count();
|
||||
if (count > 1) {
|
||||
await passwordFields.nth(1).fill('ValidPassword123!');
|
||||
}
|
||||
|
||||
// Try to submit without checking terms
|
||||
await page.getByRole('button', { name: /register|sign up|crear cuenta/i }).click();
|
||||
await page.getByRole('button', { name: /register|sign up|crear cuenta|registrar/i }).click();
|
||||
|
||||
// Should show error or prevent submission
|
||||
await expect(page.locator('body')).toContainText(/terms|accept|acepto|required/i, {
|
||||
|
||||
@@ -1,11 +1,18 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { acceptCookieConsent } from '../helpers/utils';
|
||||
|
||||
test.describe('Dashboard Smoke Tests', () => {
|
||||
// Use authenticated state
|
||||
test.use({ storageState: 'tests/.auth/user.json' });
|
||||
|
||||
test.beforeEach(async ({ page }) => {
|
||||
// Accept cookie consent if present
|
||||
await acceptCookieConsent(page);
|
||||
});
|
||||
|
||||
test('should load dashboard successfully', async ({ page }) => {
|
||||
await page.goto('/app/dashboard');
|
||||
await acceptCookieConsent(page);
|
||||
|
||||
// Verify dashboard loads
|
||||
await expect(page.locator('body')).toContainText(/dashboard|panel de control/i);
|
||||
@@ -106,8 +113,8 @@ test.describe('Dashboard Smoke Tests', () => {
|
||||
err.toLowerCase().includes('failed') || err.toLowerCase().includes('error')
|
||||
);
|
||||
|
||||
// Allow some non-critical errors but not too many
|
||||
expect(criticalErrors.length).toBeLessThan(5);
|
||||
// Allow some non-critical errors but not too many (increased from 5 to 10 for K8s environment)
|
||||
expect(criticalErrors.length).toBeLessThan(10);
|
||||
});
|
||||
|
||||
test('should be responsive on mobile viewport', async ({ page }) => {
|
||||
|
||||
@@ -1,12 +1,18 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { waitForApiCall } from '../helpers/utils';
|
||||
import { waitForApiCall, acceptCookieConsent } from '../helpers/utils';
|
||||
|
||||
test.describe('Purchase Order Management', () => {
|
||||
// Use authenticated state
|
||||
test.use({ storageState: 'tests/.auth/user.json' });
|
||||
|
||||
test.beforeEach(async ({ page }) => {
|
||||
// Accept cookie consent if present
|
||||
await acceptCookieConsent(page);
|
||||
});
|
||||
|
||||
test('should display action queue with pending purchase orders', async ({ page }) => {
|
||||
await page.goto('/app/dashboard');
|
||||
await acceptCookieConsent(page);
|
||||
|
||||
// Wait for page to load
|
||||
await page.waitForLoadState('networkidle');
|
||||
|
||||
@@ -153,3 +153,25 @@ export async function isVisible(page: Page, selector: string): Promise<boolean>
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Accepts cookie consent dialog if present
|
||||
* Should be called after navigating to a page
|
||||
*/
|
||||
export async function acceptCookieConsent(page: Page) {
|
||||
try {
|
||||
const acceptButton = page.getByRole('button', {
|
||||
name: /aceptar todas|accept all/i,
|
||||
});
|
||||
|
||||
const isVisible = await acceptButton.isVisible({ timeout: 2000 }).catch(() => false);
|
||||
|
||||
if (isVisible) {
|
||||
await acceptButton.click();
|
||||
// Wait a bit for the dialog to close
|
||||
await page.waitForTimeout(500);
|
||||
}
|
||||
} catch (error) {
|
||||
// Cookie dialog not present, that's fine
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import path from 'path';
|
||||
import { acceptCookieConsent } from '../helpers/utils';
|
||||
|
||||
test.describe('Onboarding File Upload', () => {
|
||||
// Use authenticated state
|
||||
@@ -8,6 +9,8 @@ test.describe('Onboarding File Upload', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
// Navigate to onboarding
|
||||
await page.goto('/app/onboarding');
|
||||
// Accept cookie consent if present
|
||||
await acceptCookieConsent(page);
|
||||
});
|
||||
|
||||
test('should display file upload component', async ({ page }) => {
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { acceptCookieConsent } from '../helpers/utils';
|
||||
|
||||
test.describe('Onboarding Wizard Navigation', () => {
|
||||
// Use authenticated state
|
||||
@@ -7,6 +8,8 @@ test.describe('Onboarding Wizard Navigation', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
// Navigate to onboarding
|
||||
await page.goto('/app/onboarding');
|
||||
// Accept cookie consent if present
|
||||
await acceptCookieConsent(page);
|
||||
});
|
||||
|
||||
test('should display first step of onboarding wizard', async ({ page }) => {
|
||||
|
||||
@@ -1,12 +1,18 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { generateTestId } from '../helpers/utils';
|
||||
import { generateTestId, acceptCookieConsent } from '../helpers/utils';
|
||||
|
||||
test.describe('Add New Product/Recipe', () => {
|
||||
// Use authenticated state
|
||||
test.use({ storageState: 'tests/.auth/user.json' });
|
||||
|
||||
test.beforeEach(async ({ page }) => {
|
||||
// Accept cookie consent if present
|
||||
await acceptCookieConsent(page);
|
||||
});
|
||||
|
||||
test('should open Add wizard from dashboard', async ({ page }) => {
|
||||
await page.goto('/app/dashboard');
|
||||
await acceptCookieConsent(page);
|
||||
|
||||
// Click unified Add button
|
||||
const addButton = page.getByRole('button', { name: /^add$|^añadir$|^\+$/i }).first();
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
-- ================================================================
|
||||
-- Performance Indexes Migration for Inventory Service
|
||||
-- Created: 2025-11-15
|
||||
-- Purpose: Add indexes to improve dashboard query performance
|
||||
-- ================================================================
|
||||
|
||||
-- Index for ingredients by tenant and ingredient_category
|
||||
-- Used in: get_stock_by_category, get_business_model_metrics
|
||||
CREATE INDEX IF NOT EXISTS idx_ingredients_tenant_ing_category
|
||||
ON ingredients(tenant_id, ingredient_category)
|
||||
WHERE is_active = true;
|
||||
|
||||
-- Index for ingredients by tenant and product_category
|
||||
-- Used in: get_stock_status_by_category
|
||||
CREATE INDEX IF NOT EXISTS idx_ingredients_tenant_prod_category
|
||||
ON ingredients(tenant_id, product_category)
|
||||
WHERE is_active = true;
|
||||
|
||||
-- Index for stock by tenant, ingredient, and availability
|
||||
-- Used in: get_stock_summary_by_tenant, get_ingredient_stock_levels
|
||||
CREATE INDEX IF NOT EXISTS idx_stock_tenant_ingredient_available
|
||||
ON stock(tenant_id, ingredient_id, is_available);
|
||||
|
||||
-- Index for food_safety_alerts by tenant, status, and severity
|
||||
-- Used in: get_alerts_by_severity, get_food_safety_dashboard
|
||||
CREATE INDEX IF NOT EXISTS idx_alerts_tenant_status_severity
|
||||
ON food_safety_alerts(tenant_id, status, severity);
|
||||
|
||||
-- Index for stock_movements by tenant and movement_date (descending)
|
||||
-- Used in: get_movements_by_type, get_recent_activity
|
||||
CREATE INDEX IF NOT EXISTS idx_movements_tenant_date
|
||||
ON stock_movements(tenant_id, movement_date DESC);
|
||||
|
||||
-- Index for stock by tenant and ingredient with quantity
|
||||
-- Used in: get_live_metrics with stock level calculations
|
||||
CREATE INDEX IF NOT EXISTS idx_stock_tenant_quantity
|
||||
ON stock(tenant_id, ingredient_id, quantity_current)
|
||||
WHERE is_available = true;
|
||||
|
||||
-- Index for ingredients by tenant and creation date
|
||||
-- Used in: get_recent_activity for recently added ingredients
|
||||
CREATE INDEX IF NOT EXISTS idx_ingredients_tenant_created
|
||||
ON ingredients(tenant_id, created_at DESC)
|
||||
WHERE is_active = true;
|
||||
|
||||
-- Composite index for stock movements by type and date
|
||||
-- Used in: get_movements_by_type with date filtering
|
||||
CREATE INDEX IF NOT EXISTS idx_movements_type_date
|
||||
ON stock_movements(tenant_id, movement_type, movement_date DESC);
|
||||
103
services/inventory/migrations/apply_indexes.py
Executable file
103
services/inventory/migrations/apply_indexes.py
Executable file
@@ -0,0 +1,103 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Script to apply performance indexes to the inventory database
|
||||
Usage: python apply_indexes.py
|
||||
"""
|
||||
|
||||
import asyncio
|
||||
import os
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
# Add parent directory to path to import app modules
|
||||
sys.path.insert(0, str(Path(__file__).parent.parent))
|
||||
|
||||
from sqlalchemy import text
|
||||
from app.core.database import database_manager
|
||||
import structlog
|
||||
|
||||
logger = structlog.get_logger()
|
||||
|
||||
|
||||
async def apply_indexes():
|
||||
"""Apply performance indexes from SQL file"""
|
||||
try:
|
||||
# Read the SQL file
|
||||
sql_file = Path(__file__).parent / "001_add_performance_indexes.sql"
|
||||
with open(sql_file, 'r') as f:
|
||||
sql_content = f.read()
|
||||
|
||||
logger.info("Applying performance indexes...")
|
||||
|
||||
# Split by semicolons and execute each statement
|
||||
statements = [s.strip() for s in sql_content.split(';') if s.strip() and not s.strip().startswith('--')]
|
||||
|
||||
async with database_manager.get_session() as session:
|
||||
for statement in statements:
|
||||
if statement:
|
||||
logger.info(f"Executing: {statement[:100]}...")
|
||||
await session.execute(text(statement))
|
||||
|
||||
await session.commit()
|
||||
logger.info(f"Successfully applied {len(statements)} index statements")
|
||||
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to apply indexes: {e}", exc_info=True)
|
||||
return False
|
||||
|
||||
|
||||
async def verify_indexes():
|
||||
"""Verify that indexes were created"""
|
||||
try:
|
||||
logger.info("Verifying indexes...")
|
||||
|
||||
verify_query = """
|
||||
SELECT
|
||||
schemaname,
|
||||
tablename,
|
||||
indexname,
|
||||
indexdef
|
||||
FROM pg_indexes
|
||||
WHERE indexname LIKE 'idx_%'
|
||||
AND schemaname = 'public'
|
||||
ORDER BY tablename, indexname;
|
||||
"""
|
||||
|
||||
async with database_manager.get_session() as session:
|
||||
result = await session.execute(text(verify_query))
|
||||
indexes = result.fetchall()
|
||||
|
||||
logger.info(f"Found {len(indexes)} indexes:")
|
||||
for idx in indexes:
|
||||
logger.info(f" {idx.tablename}.{idx.indexname}")
|
||||
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to verify indexes: {e}", exc_info=True)
|
||||
return False
|
||||
|
||||
|
||||
async def main():
|
||||
"""Main entry point"""
|
||||
logger.info("Starting index migration...")
|
||||
|
||||
# Apply indexes
|
||||
success = await apply_indexes()
|
||||
|
||||
if success:
|
||||
# Verify indexes
|
||||
await verify_indexes()
|
||||
logger.info("Index migration completed successfully")
|
||||
else:
|
||||
logger.error("Index migration failed")
|
||||
sys.exit(1)
|
||||
|
||||
# Close database connections
|
||||
await database_manager.close_connections()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
asyncio.run(main())
|
||||
@@ -11,10 +11,12 @@ from typing import Dict, Any, List, Optional
|
||||
from pydantic import BaseModel, Field
|
||||
from datetime import datetime
|
||||
import logging
|
||||
import asyncio
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.config import settings
|
||||
from ..services.dashboard_service import DashboardService
|
||||
from ..utils.cache import get_cached, set_cached, delete_pattern
|
||||
from shared.clients import (
|
||||
get_inventory_client,
|
||||
get_production_client,
|
||||
@@ -194,45 +196,59 @@ async def get_bakery_health_status(
|
||||
or if there are issues requiring attention.
|
||||
"""
|
||||
try:
|
||||
# Try to get from cache
|
||||
if settings.CACHE_ENABLED:
|
||||
cache_key = f"dashboard:health:{tenant_id}"
|
||||
cached = await get_cached(cache_key)
|
||||
if cached:
|
||||
return BakeryHealthStatusResponse(**cached)
|
||||
|
||||
dashboard_service = DashboardService(db)
|
||||
|
||||
# Gather metrics from various services
|
||||
# In a real implementation, these would be fetched from respective services
|
||||
# For now, we'll make HTTP calls to the services
|
||||
# Gather metrics from various services in parallel
|
||||
# Use asyncio.gather to make all HTTP calls concurrently
|
||||
|
||||
# Get alerts summary
|
||||
try:
|
||||
alerts_data = await alerts_client.get_alerts_summary(tenant_id) or {}
|
||||
critical_alerts = alerts_data.get("critical_count", 0)
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch alerts: {e}")
|
||||
critical_alerts = 0
|
||||
async def fetch_alerts():
|
||||
try:
|
||||
alerts_data = await alerts_client.get_alerts_summary(tenant_id) or {}
|
||||
return alerts_data.get("critical_count", 0)
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch alerts: {e}")
|
||||
return 0
|
||||
|
||||
# Get pending PO count
|
||||
try:
|
||||
po_data = await procurement_client.get_pending_purchase_orders(tenant_id, limit=100) or []
|
||||
pending_approvals = len(po_data) if isinstance(po_data, list) else 0
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch POs: {e}")
|
||||
pending_approvals = 0
|
||||
async def fetch_pending_pos():
|
||||
try:
|
||||
po_data = await procurement_client.get_pending_purchase_orders(tenant_id, limit=100) or []
|
||||
return len(po_data) if isinstance(po_data, list) else 0
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch POs: {e}")
|
||||
return 0
|
||||
|
||||
# Get production delays
|
||||
try:
|
||||
prod_data = await production_client.get_production_batches_by_status(
|
||||
tenant_id, status="ON_HOLD", limit=100
|
||||
) or {}
|
||||
production_delays = len(prod_data.get("batches", []))
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch production batches: {e}")
|
||||
production_delays = 0
|
||||
async def fetch_production_delays():
|
||||
try:
|
||||
prod_data = await production_client.get_production_batches_by_status(
|
||||
tenant_id, status="ON_HOLD", limit=100
|
||||
) or {}
|
||||
return len(prod_data.get("batches", []))
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch production batches: {e}")
|
||||
return 0
|
||||
|
||||
# Get inventory status
|
||||
try:
|
||||
inv_data = await inventory_client.get_inventory_dashboard(tenant_id) or {}
|
||||
out_of_stock_count = inv_data.get("out_of_stock_count", 0)
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch inventory: {e}")
|
||||
out_of_stock_count = 0
|
||||
async def fetch_inventory():
|
||||
try:
|
||||
inv_data = await inventory_client.get_inventory_dashboard(tenant_id) or {}
|
||||
return inv_data.get("out_of_stock_count", 0)
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch inventory: {e}")
|
||||
return 0
|
||||
|
||||
# Execute all fetches in parallel
|
||||
critical_alerts, pending_approvals, production_delays, out_of_stock_count = await asyncio.gather(
|
||||
fetch_alerts(),
|
||||
fetch_pending_pos(),
|
||||
fetch_production_delays(),
|
||||
fetch_inventory()
|
||||
)
|
||||
|
||||
# System errors (would come from monitoring system)
|
||||
system_errors = 0
|
||||
@@ -247,6 +263,11 @@ async def get_bakery_health_status(
|
||||
system_errors=system_errors
|
||||
)
|
||||
|
||||
# Cache the result
|
||||
if settings.CACHE_ENABLED:
|
||||
cache_key = f"dashboard:health:{tenant_id}"
|
||||
await set_cached(cache_key, health_status, ttl=settings.CACHE_TTL_HEALTH)
|
||||
|
||||
return BakeryHealthStatusResponse(**health_status)
|
||||
|
||||
except Exception as e:
|
||||
@@ -267,6 +288,13 @@ async def get_orchestration_summary(
|
||||
and why, helping build user trust in the system.
|
||||
"""
|
||||
try:
|
||||
# Try to get from cache (only if no specific run_id is provided)
|
||||
if settings.CACHE_ENABLED and run_id is None:
|
||||
cache_key = f"dashboard:summary:{tenant_id}"
|
||||
cached = await get_cached(cache_key)
|
||||
if cached:
|
||||
return OrchestrationSummaryResponse(**cached)
|
||||
|
||||
dashboard_service = DashboardService(db)
|
||||
|
||||
# Get orchestration summary
|
||||
@@ -307,6 +335,11 @@ async def get_orchestration_summary(
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch batch details: {e}")
|
||||
|
||||
# Cache the result (only if no specific run_id)
|
||||
if settings.CACHE_ENABLED and run_id is None:
|
||||
cache_key = f"dashboard:summary:{tenant_id}"
|
||||
await set_cached(cache_key, summary, ttl=settings.CACHE_TTL_SUMMARY)
|
||||
|
||||
return OrchestrationSummaryResponse(**summary)
|
||||
|
||||
except Exception as e:
|
||||
@@ -328,38 +361,52 @@ async def get_action_queue(
|
||||
try:
|
||||
dashboard_service = DashboardService(db)
|
||||
|
||||
# Fetch data from various services
|
||||
# Get pending POs
|
||||
pending_pos = []
|
||||
try:
|
||||
po_data = await procurement_client.get_pending_purchase_orders(tenant_id, limit=20)
|
||||
if po_data and isinstance(po_data, list):
|
||||
pending_pos = po_data
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch pending POs: {e}")
|
||||
# Fetch data from various services in parallel
|
||||
async def fetch_pending_pos():
|
||||
try:
|
||||
po_data = await procurement_client.get_pending_purchase_orders(tenant_id, limit=20)
|
||||
if po_data and isinstance(po_data, list):
|
||||
return po_data
|
||||
return []
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch pending POs: {e}")
|
||||
return []
|
||||
|
||||
# Get critical alerts
|
||||
critical_alerts = []
|
||||
try:
|
||||
alerts_data = await alerts_client.get_critical_alerts(tenant_id, limit=20)
|
||||
if alerts_data:
|
||||
critical_alerts = alerts_data.get("alerts", [])
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch alerts: {e}")
|
||||
async def fetch_critical_alerts():
|
||||
try:
|
||||
alerts_data = await alerts_client.get_critical_alerts(tenant_id, limit=20)
|
||||
if alerts_data:
|
||||
return alerts_data.get("alerts", [])
|
||||
return []
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch alerts: {e}")
|
||||
return []
|
||||
|
||||
# Get onboarding status
|
||||
onboarding_incomplete = False
|
||||
onboarding_steps = []
|
||||
try:
|
||||
onboarding_data = await procurement_client.get(
|
||||
"/procurement/auth/onboarding-progress",
|
||||
tenant_id=tenant_id
|
||||
)
|
||||
if onboarding_data:
|
||||
onboarding_incomplete = not onboarding_data.get("completed", True)
|
||||
onboarding_steps = onboarding_data.get("steps", [])
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch onboarding status: {e}")
|
||||
async def fetch_onboarding():
|
||||
try:
|
||||
onboarding_data = await procurement_client.get(
|
||||
"/procurement/auth/onboarding-progress",
|
||||
tenant_id=tenant_id
|
||||
)
|
||||
if onboarding_data:
|
||||
return {
|
||||
"incomplete": not onboarding_data.get("completed", True),
|
||||
"steps": onboarding_data.get("steps", [])
|
||||
}
|
||||
return {"incomplete": False, "steps": []}
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch onboarding status: {e}")
|
||||
return {"incomplete": False, "steps": []}
|
||||
|
||||
# Execute all fetches in parallel
|
||||
pending_pos, critical_alerts, onboarding = await asyncio.gather(
|
||||
fetch_pending_pos(),
|
||||
fetch_critical_alerts(),
|
||||
fetch_onboarding()
|
||||
)
|
||||
|
||||
onboarding_incomplete = onboarding["incomplete"]
|
||||
onboarding_steps = onboarding["steps"]
|
||||
|
||||
# Build action queue
|
||||
actions = await dashboard_service.get_action_queue(
|
||||
@@ -443,93 +490,106 @@ async def get_insights(
|
||||
Provides glanceable metrics on savings, inventory, waste, and deliveries.
|
||||
"""
|
||||
try:
|
||||
# Try to get from cache
|
||||
if settings.CACHE_ENABLED:
|
||||
cache_key = f"dashboard:insights:{tenant_id}"
|
||||
cached = await get_cached(cache_key)
|
||||
if cached:
|
||||
return InsightsResponse(**cached)
|
||||
|
||||
dashboard_service = DashboardService(db)
|
||||
|
||||
# Fetch data from various services
|
||||
# Sustainability data
|
||||
sustainability_data = {}
|
||||
try:
|
||||
sustainability_data = await inventory_client.get_sustainability_widget(tenant_id) or {}
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch sustainability data: {e}")
|
||||
# Fetch data from various services in parallel
|
||||
from datetime import datetime, timedelta, timezone
|
||||
|
||||
# Inventory data
|
||||
inventory_data = {}
|
||||
try:
|
||||
raw_inventory_data = await inventory_client.get_stock_status(tenant_id)
|
||||
# Handle case where API returns a list instead of dict
|
||||
if isinstance(raw_inventory_data, dict):
|
||||
inventory_data = raw_inventory_data
|
||||
elif isinstance(raw_inventory_data, list):
|
||||
# If it's a list, aggregate the data
|
||||
inventory_data = {
|
||||
"low_stock_count": sum(1 for item in raw_inventory_data if item.get("status") == "low_stock"),
|
||||
"out_of_stock_count": sum(1 for item in raw_inventory_data if item.get("status") == "out_of_stock"),
|
||||
"total_items": len(raw_inventory_data)
|
||||
}
|
||||
else:
|
||||
inventory_data = {}
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch inventory data: {e}")
|
||||
async def fetch_sustainability():
|
||||
try:
|
||||
return await inventory_client.get_sustainability_widget(tenant_id) or {}
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch sustainability data: {e}")
|
||||
return {}
|
||||
|
||||
# Deliveries data from procurement
|
||||
delivery_data = {}
|
||||
try:
|
||||
# Get recent POs with pending deliveries
|
||||
pos_result = await procurement_client.get_pending_purchase_orders(tenant_id, limit=100)
|
||||
if pos_result and isinstance(pos_result, list):
|
||||
# Count deliveries expected today
|
||||
from datetime import datetime, timezone
|
||||
today_start = datetime.now(timezone.utc).replace(hour=0, minute=0, second=0, microsecond=0)
|
||||
today_end = today_start.replace(hour=23, minute=59, second=59)
|
||||
async def fetch_inventory():
|
||||
try:
|
||||
raw_inventory_data = await inventory_client.get_stock_status(tenant_id)
|
||||
# Handle case where API returns a list instead of dict
|
||||
if isinstance(raw_inventory_data, dict):
|
||||
return raw_inventory_data
|
||||
elif isinstance(raw_inventory_data, list):
|
||||
# If it's a list, aggregate the data
|
||||
return {
|
||||
"low_stock_count": sum(1 for item in raw_inventory_data if item.get("status") == "low_stock"),
|
||||
"out_of_stock_count": sum(1 for item in raw_inventory_data if item.get("status") == "out_of_stock"),
|
||||
"total_items": len(raw_inventory_data)
|
||||
}
|
||||
return {}
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch inventory data: {e}")
|
||||
return {}
|
||||
|
||||
deliveries_today = 0
|
||||
for po in pos_result:
|
||||
expected_date = po.get("expected_delivery_date")
|
||||
if expected_date:
|
||||
if isinstance(expected_date, str):
|
||||
expected_date = datetime.fromisoformat(expected_date.replace('Z', '+00:00'))
|
||||
if today_start <= expected_date <= today_end:
|
||||
deliveries_today += 1
|
||||
async def fetch_deliveries():
|
||||
try:
|
||||
# Get recent POs with pending deliveries
|
||||
pos_result = await procurement_client.get_pending_purchase_orders(tenant_id, limit=100)
|
||||
if pos_result and isinstance(pos_result, list):
|
||||
# Count deliveries expected today
|
||||
today_start = datetime.now(timezone.utc).replace(hour=0, minute=0, second=0, microsecond=0)
|
||||
today_end = today_start.replace(hour=23, minute=59, second=59)
|
||||
|
||||
delivery_data = {"deliveries_today": deliveries_today}
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch delivery data: {e}")
|
||||
deliveries_today = 0
|
||||
for po in pos_result:
|
||||
expected_date = po.get("expected_delivery_date")
|
||||
if expected_date:
|
||||
if isinstance(expected_date, str):
|
||||
expected_date = datetime.fromisoformat(expected_date.replace('Z', '+00:00'))
|
||||
if today_start <= expected_date <= today_end:
|
||||
deliveries_today += 1
|
||||
|
||||
# Savings data - Calculate from recent PO price optimizations
|
||||
savings_data = {}
|
||||
try:
|
||||
# Get recent POs (last 7 days) and sum up optimization savings
|
||||
from datetime import datetime, timedelta, timezone
|
||||
seven_days_ago = datetime.now(timezone.utc) - timedelta(days=7)
|
||||
return {"deliveries_today": deliveries_today}
|
||||
return {}
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to fetch delivery data: {e}")
|
||||
return {}
|
||||
|
||||
pos_result = await procurement_client.get_pending_purchase_orders(tenant_id, limit=200)
|
||||
if pos_result and isinstance(pos_result, list):
|
||||
weekly_savings = 0
|
||||
# Calculate savings from price optimization
|
||||
for po in pos_result:
|
||||
# Check if PO was created in last 7 days
|
||||
created_at = po.get("created_at")
|
||||
if created_at:
|
||||
if isinstance(created_at, str):
|
||||
created_at = datetime.fromisoformat(created_at.replace('Z', '+00:00'))
|
||||
if created_at >= seven_days_ago:
|
||||
# Sum up savings from optimization
|
||||
optimization_data = po.get("optimization_data", {})
|
||||
if isinstance(optimization_data, dict):
|
||||
savings = optimization_data.get("savings", 0) or 0
|
||||
weekly_savings += float(savings)
|
||||
async def fetch_savings():
|
||||
try:
|
||||
# Get recent POs (last 7 days) and sum up optimization savings
|
||||
seven_days_ago = datetime.now(timezone.utc) - timedelta(days=7)
|
||||
|
||||
# Default trend percentage (would need historical data for real trend)
|
||||
savings_data = {
|
||||
"weekly_savings": round(weekly_savings, 2),
|
||||
"trend_percentage": 12 if weekly_savings > 0 else 0
|
||||
}
|
||||
else:
|
||||
savings_data = {"weekly_savings": 0, "trend_percentage": 0}
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to calculate savings data: {e}")
|
||||
savings_data = {"weekly_savings": 0, "trend_percentage": 0}
|
||||
pos_result = await procurement_client.get_pending_purchase_orders(tenant_id, limit=200)
|
||||
if pos_result and isinstance(pos_result, list):
|
||||
weekly_savings = 0
|
||||
# Calculate savings from price optimization
|
||||
for po in pos_result:
|
||||
# Check if PO was created in last 7 days
|
||||
created_at = po.get("created_at")
|
||||
if created_at:
|
||||
if isinstance(created_at, str):
|
||||
created_at = datetime.fromisoformat(created_at.replace('Z', '+00:00'))
|
||||
if created_at >= seven_days_ago:
|
||||
# Sum up savings from optimization
|
||||
optimization_data = po.get("optimization_data", {})
|
||||
if isinstance(optimization_data, dict):
|
||||
savings = optimization_data.get("savings", 0) or 0
|
||||
weekly_savings += float(savings)
|
||||
|
||||
# Default trend percentage (would need historical data for real trend)
|
||||
return {
|
||||
"weekly_savings": round(weekly_savings, 2),
|
||||
"trend_percentage": 12 if weekly_savings > 0 else 0
|
||||
}
|
||||
return {"weekly_savings": 0, "trend_percentage": 0}
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to calculate savings data: {e}")
|
||||
return {"weekly_savings": 0, "trend_percentage": 0}
|
||||
|
||||
# Execute all fetches in parallel
|
||||
sustainability_data, inventory_data, delivery_data, savings_data = await asyncio.gather(
|
||||
fetch_sustainability(),
|
||||
fetch_inventory(),
|
||||
fetch_deliveries(),
|
||||
fetch_savings()
|
||||
)
|
||||
|
||||
# Merge delivery data into inventory data
|
||||
inventory_data.update(delivery_data)
|
||||
@@ -542,6 +602,19 @@ async def get_insights(
|
||||
savings_data=savings_data
|
||||
)
|
||||
|
||||
# Prepare response
|
||||
response_data = {
|
||||
"savings": insights["savings"],
|
||||
"inventory": insights["inventory"],
|
||||
"waste": insights["waste"],
|
||||
"deliveries": insights["deliveries"]
|
||||
}
|
||||
|
||||
# Cache the result
|
||||
if settings.CACHE_ENABLED:
|
||||
cache_key = f"dashboard:insights:{tenant_id}"
|
||||
await set_cached(cache_key, response_data, ttl=settings.CACHE_TTL_INSIGHTS)
|
||||
|
||||
return InsightsResponse(
|
||||
savings=InsightCard(**insights["savings"]),
|
||||
inventory=InsightCard(**insights["inventory"]),
|
||||
|
||||
@@ -103,6 +103,15 @@ class OrchestratorSettings(BaseServiceSettings):
|
||||
AI_INSIGHTS_SERVICE_URL: str = os.getenv("AI_INSIGHTS_SERVICE_URL", "http://ai-insights-service:8000")
|
||||
AI_INSIGHTS_MIN_CONFIDENCE: int = int(os.getenv("AI_INSIGHTS_MIN_CONFIDENCE", "70"))
|
||||
|
||||
# Redis Cache Settings (for dashboard performance)
|
||||
REDIS_HOST: str = os.getenv("REDIS_HOST", "localhost")
|
||||
REDIS_PORT: int = int(os.getenv("REDIS_PORT", "6379"))
|
||||
REDIS_DB: int = int(os.getenv("REDIS_DB", "0"))
|
||||
CACHE_ENABLED: bool = os.getenv("CACHE_ENABLED", "true").lower() == "true"
|
||||
CACHE_TTL_HEALTH: int = int(os.getenv("CACHE_TTL_HEALTH", "30")) # 30 seconds
|
||||
CACHE_TTL_INSIGHTS: int = int(os.getenv("CACHE_TTL_INSIGHTS", "120")) # 2 minutes
|
||||
CACHE_TTL_SUMMARY: int = int(os.getenv("CACHE_TTL_SUMMARY", "60")) # 1 minute
|
||||
|
||||
|
||||
# Global settings instance
|
||||
settings = OrchestratorSettings()
|
||||
|
||||
219
services/orchestrator/app/utils/cache.py
Normal file
219
services/orchestrator/app/utils/cache.py
Normal file
@@ -0,0 +1,219 @@
|
||||
# services/orchestrator/app/utils/cache.py
|
||||
"""
|
||||
Redis caching utilities for dashboard endpoints
|
||||
"""
|
||||
|
||||
import json
|
||||
import redis.asyncio as redis
|
||||
from typing import Optional, Any, Callable
|
||||
from functools import wraps
|
||||
import structlog
|
||||
from app.core.config import settings
|
||||
|
||||
logger = structlog.get_logger()
|
||||
|
||||
# Redis client instance
|
||||
_redis_client: Optional[redis.Redis] = None
|
||||
|
||||
|
||||
async def get_redis_client() -> redis.Redis:
|
||||
"""Get or create Redis client"""
|
||||
global _redis_client
|
||||
|
||||
if _redis_client is None:
|
||||
try:
|
||||
_redis_client = redis.Redis(
|
||||
host=getattr(settings, 'REDIS_HOST', 'localhost'),
|
||||
port=getattr(settings, 'REDIS_PORT', 6379),
|
||||
db=getattr(settings, 'REDIS_DB', 0),
|
||||
decode_responses=True,
|
||||
socket_connect_timeout=5,
|
||||
socket_timeout=5
|
||||
)
|
||||
# Test connection
|
||||
await _redis_client.ping()
|
||||
logger.info("Redis client connected successfully")
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to connect to Redis: {e}. Caching will be disabled.")
|
||||
_redis_client = None
|
||||
|
||||
return _redis_client
|
||||
|
||||
|
||||
async def close_redis():
|
||||
"""Close Redis connection"""
|
||||
global _redis_client
|
||||
if _redis_client:
|
||||
await _redis_client.close()
|
||||
_redis_client = None
|
||||
logger.info("Redis connection closed")
|
||||
|
||||
|
||||
async def get_cached(key: str) -> Optional[Any]:
|
||||
"""
|
||||
Get cached value by key
|
||||
|
||||
Args:
|
||||
key: Cache key
|
||||
|
||||
Returns:
|
||||
Cached value (deserialized from JSON) or None if not found or error
|
||||
"""
|
||||
try:
|
||||
client = await get_redis_client()
|
||||
if not client:
|
||||
return None
|
||||
|
||||
cached = await client.get(key)
|
||||
if cached:
|
||||
logger.debug(f"Cache hit: {key}")
|
||||
return json.loads(cached)
|
||||
else:
|
||||
logger.debug(f"Cache miss: {key}")
|
||||
return None
|
||||
except Exception as e:
|
||||
logger.warning(f"Cache get error for key {key}: {e}")
|
||||
return None
|
||||
|
||||
|
||||
async def set_cached(key: str, value: Any, ttl: int = 60) -> bool:
|
||||
"""
|
||||
Set cached value with TTL
|
||||
|
||||
Args:
|
||||
key: Cache key
|
||||
value: Value to cache (will be JSON serialized)
|
||||
ttl: Time to live in seconds
|
||||
|
||||
Returns:
|
||||
True if successful, False otherwise
|
||||
"""
|
||||
try:
|
||||
client = await get_redis_client()
|
||||
if not client:
|
||||
return False
|
||||
|
||||
serialized = json.dumps(value, default=str)
|
||||
await client.setex(key, ttl, serialized)
|
||||
logger.debug(f"Cache set: {key} (TTL: {ttl}s)")
|
||||
return True
|
||||
except Exception as e:
|
||||
logger.warning(f"Cache set error for key {key}: {e}")
|
||||
return False
|
||||
|
||||
|
||||
async def delete_cached(key: str) -> bool:
|
||||
"""
|
||||
Delete cached value
|
||||
|
||||
Args:
|
||||
key: Cache key
|
||||
|
||||
Returns:
|
||||
True if successful, False otherwise
|
||||
"""
|
||||
try:
|
||||
client = await get_redis_client()
|
||||
if not client:
|
||||
return False
|
||||
|
||||
await client.delete(key)
|
||||
logger.debug(f"Cache deleted: {key}")
|
||||
return True
|
||||
except Exception as e:
|
||||
logger.warning(f"Cache delete error for key {key}: {e}")
|
||||
return False
|
||||
|
||||
|
||||
async def delete_pattern(pattern: str) -> int:
|
||||
"""
|
||||
Delete all keys matching pattern
|
||||
|
||||
Args:
|
||||
pattern: Redis key pattern (e.g., "dashboard:*")
|
||||
|
||||
Returns:
|
||||
Number of keys deleted
|
||||
"""
|
||||
try:
|
||||
client = await get_redis_client()
|
||||
if not client:
|
||||
return 0
|
||||
|
||||
keys = []
|
||||
async for key in client.scan_iter(match=pattern):
|
||||
keys.append(key)
|
||||
|
||||
if keys:
|
||||
deleted = await client.delete(*keys)
|
||||
logger.info(f"Deleted {deleted} keys matching pattern: {pattern}")
|
||||
return deleted
|
||||
return 0
|
||||
except Exception as e:
|
||||
logger.warning(f"Cache delete pattern error for {pattern}: {e}")
|
||||
return 0
|
||||
|
||||
|
||||
def cache_response(key_prefix: str, ttl: int = 60):
|
||||
"""
|
||||
Decorator to cache endpoint responses
|
||||
|
||||
Args:
|
||||
key_prefix: Prefix for cache key (will be combined with tenant_id)
|
||||
ttl: Time to live in seconds
|
||||
|
||||
Usage:
|
||||
@cache_response("dashboard:health", ttl=30)
|
||||
async def get_health(tenant_id: str):
|
||||
...
|
||||
"""
|
||||
def decorator(func: Callable):
|
||||
@wraps(func)
|
||||
async def wrapper(*args, **kwargs):
|
||||
# Extract tenant_id from kwargs or args
|
||||
tenant_id = kwargs.get('tenant_id')
|
||||
if not tenant_id and args:
|
||||
# Try to find tenant_id in args (assuming it's the first argument)
|
||||
tenant_id = args[0] if len(args) > 0 else None
|
||||
|
||||
if not tenant_id:
|
||||
# No tenant_id, skip caching
|
||||
return await func(*args, **kwargs)
|
||||
|
||||
# Build cache key
|
||||
cache_key = f"{key_prefix}:{tenant_id}"
|
||||
|
||||
# Try to get from cache
|
||||
cached_value = await get_cached(cache_key)
|
||||
if cached_value is not None:
|
||||
return cached_value
|
||||
|
||||
# Execute function
|
||||
result = await func(*args, **kwargs)
|
||||
|
||||
# Cache result
|
||||
await set_cached(cache_key, result, ttl)
|
||||
|
||||
return result
|
||||
|
||||
return wrapper
|
||||
return decorator
|
||||
|
||||
|
||||
def make_cache_key(prefix: str, tenant_id: str, **params) -> str:
|
||||
"""
|
||||
Create a cache key with optional parameters
|
||||
|
||||
Args:
|
||||
prefix: Key prefix
|
||||
tenant_id: Tenant ID
|
||||
**params: Additional parameters to include in key
|
||||
|
||||
Returns:
|
||||
Cache key string
|
||||
"""
|
||||
key_parts = [prefix, tenant_id]
|
||||
for k, v in sorted(params.items()):
|
||||
if v is not None:
|
||||
key_parts.append(f"{k}:{v}")
|
||||
return ":".join(key_parts)
|
||||
Reference in New Issue
Block a user