Orders: back button label "عودة" on the new order form, grid asks for a filter when none is set

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
Samer Salameh 2026-11-18 17:03:02 +03:00
parent 2a339afee3
commit 3a230fd556
3 changed files with 4 additions and 1 deletions

View File

@ -50,7 +50,8 @@ export const tenderOrderGrid = (h: OrderGridHandlers): GridMeta<TenderOrder> =>
endpoint: '/grains/orders', endpoint: '/grains/orders',
rowKey: (r) => r.id, rowKey: (r) => r.id,
emptyAsGrid: true, // no orders for the day: the headers stay, "no results" shows inside the table emptyAsGrid: true, // no orders for the day: the headers stay, "no results" shows inside the table
// The legacy grid stayed empty until a date was typed: start on today (clear the filter to list every day). // The legacy grid stayed empty until a date was typed: start on today; with the filter cleared the grid asks for a filter.
requireFilter: true,
defaultFilters: { orderDate: todayIso() }, defaultFilters: { orderDate: todayIso() },
filters: [{ name: 'orderDate', type: 'date', label: { en: 'Order date', ar: 'تاريخ الطلبية' } }], filters: [{ name: 'orderDate', type: 'date', label: { en: 'Order date', ar: 'تاريخ الطلبية' } }],
columns: [ columns: [

View File

@ -120,6 +120,7 @@ export function TenderOrderCreatePage() {
initialValues={initial} initialValues={initial}
serverErrors={serverErrors} serverErrors={serverErrors}
onCancel={() => navigate('/grains/orders')} onCancel={() => navigate('/grains/orders')}
cancelLabel={t('ord.back')}
onSubmit={(payload) => onSubmit={(payload) =>
new Promise<void>((resolve) => { new Promise<void>((resolve) => {
setServerErrors({}); setServerErrors({});

View File

@ -4,6 +4,7 @@ import { defineStrings } from '@/i18n/useUi';
export default defineStrings({ export default defineStrings({
// ---- menu // ---- menu
'ord.menu.finance': { en: 'Finance', ar: 'المالية' }, 'ord.menu.finance': { en: 'Finance', ar: 'المالية' },
'ord.back': { en: 'Back', ar: 'عودة' },
'ord.menu.group': { en: 'Orders', ar: 'الطلبيات' }, 'ord.menu.group': { en: 'Orders', ar: 'الطلبيات' },
'ord.menu.orders': { en: 'Tender orders', ar: 'الطلبيات' }, 'ord.menu.orders': { en: 'Tender orders', ar: 'الطلبيات' },
'ord.menu.quotas': { en: 'Daily quota', ar: 'الحصة اليومية' }, 'ord.menu.quotas': { en: 'Daily quota', ar: 'الحصة اليومية' },