shafi/freshyo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

enh

Browse source
This commit is contained in:
shafi54 2026-08-13 00:39:23 +05:30
parent 360289d3c6
commit d9a61818de
9 changed files with 33 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/admin-ui/app/(drawer)/dashboard/manage-orders/delivery-sequences/index.tsx
View file

@ -302,7 +302,7 @@ export default function DeliverySequences() {
// Auto-select first slot if no slotId provided
useEffect(() => {
if (!slotId && slotsData?.slots && slotsData.slots.length > 0) {
router.replace(`/manage-orders/delivery-sequences?slotId=${slotsData.slots[0].id}`);
router.replace(`/(drawer)/dashboard/manage-orders/delivery-sequences?slotId=${slotsData.slots[0].id}`);
}
}, [slotId, slotsData, router]);
@ -505,7 +505,7 @@ export default function DeliverySequences() {
value={selectedSlotId || ""}
onValueChange={(val) => {
if (val) {
router.replace(`/manage-orders/delivery-sequences?slotId=${val}`);
router.replace(`/(drawer)/dashboard/manage-orders/delivery-sequences?slotId=${val}`);
}
}}
placeholder="Select slot"
@ -726,7 +726,7 @@ export default function DeliverySequences() {
}}
onViewDetails={() => {
if (selectedOrder) {
router.push(`/manage-orders/order-details/${selectedOrder.id}`);
router.push(`/(drawer)/dashboard/manage-orders/order-details/${selectedOrder.id}`);
}
setShowOrderMenu(false);
}}

4
apps/admin-ui/app/(drawer)/dashboard/manage-orders/orders/index.tsx
View file

@ -105,12 +105,12 @@ const OrderItem = ({ order, refetch }: { order: OrderType; refetch: () => void }
const updateItemPackagingMutation = trpc.admin.order.updateOrderItemPackaging.useMutation();
const handleOrderPress = () => {
router.push(`/manage-orders/order-details/${order.orderId}` as any);
router.push(`/(drawer)/dashboard/manage-orders/order-details/${order.orderId}` as any);
};
const handleMenuOption = () => {
setMenuOpen(false);
router.push(`/manage-orders/order-details/${order.orderId}` as any);
router.push(`/(drawer)/dashboard/manage-orders/order-details/${order.orderId}` as any);
};
const handleMarkPackaged = (isPackaged: boolean) => {

2
apps/admin-ui/app/(drawer)/dashboard/prices-overview/index.tsx
View file

@ -419,7 +419,7 @@ export default function PricesOverview() {
<TouchableOpacity
style={tw`flex-row items-center p-4 bg-gray-50 rounded-lg`}
onPress={() => {
router.push('/rebalance-orders' as any);
router.push('/(drawer)/dashboard/rebalance-orders' as any);
setShowMenu(false);
}}
>

4
apps/admin-ui/app/(drawer)/dashboard/product-tags/index.tsx
View file

@ -95,11 +95,11 @@ export default function ProductTags() {
};
const handleAddNewTag = () => {
router.push('/product-tags/add');
router.push('/(drawer)/dashboard/product-tags/add');
};
const handleOrderTags = () => {
router.push('/product-tags/order');
router.push('/(drawer)/dashboard/product-tags/order');
};

6
apps/admin-ui/app/(drawer)/dashboard/slots/index.tsx
View file

@ -72,7 +72,7 @@ const SlotItemComponent: React.FC<SlotItemProps> = ({
</View>
<View style={tw`flex-row items-center`}>
<TouchableOpacity
onPress={() => router.push(`/slots/edit/${slot.id}` as any)}
onPress={() => router.push(`/(drawer)/dashboard/slots/edit/${slot.id}` as any)}
style={tw`px-3 py-1 rounded-full bg-pink2 mr-2`}
>
<View style={tw`flex-row items-center`}>
@ -147,7 +147,7 @@ const SlotItemComponent: React.FC<SlotItemProps> = ({
<TouchableOpacity
onPress={() => {
setMenuOpen(false);
router.push(`/slots/add?baseslot=${slot.id}` as any);
router.push(`/(drawer)/dashboard/slots/add?baseslot=${slot.id}` as any);
}}
style={tw`py-4 border-b border-gray-200`}
>
@ -277,7 +277,7 @@ export default function Slots() {
<MyTouchableOpacity
testID="add-slot-fab"
accessibilityLabel="add-slot-fab"
onPress={() => router.push('/slots/add' as any)}
onPress={() => router.push('/(drawer)/dashboard/slots/add' as any)}
activeOpacity={0.95}
style={{ position: 'absolute', bottom: 32, right: 24, zIndex: 100 }}
>

2
apps/admin-ui/app/(drawer)/dashboard/slots/slot-details.tsx
View file

@ -198,7 +198,7 @@ export default function SlotDetails() {
{/* FAB for Edit Slot */}
<MyTouchableOpacity
onPress={() => router.push(`/slots/edit/${slot.id}` as any)}
onPress={() => router.push(`/(drawer)/dashboard/slots/edit/${slot.id}` as any)}
activeOpacity={0.95}
style={{ position: 'absolute', bottom: 32, right: 24, zIndex: 100 }}
>

2
apps/admin-ui/src/components/TagMenu.tsx
View file

@ -34,7 +34,7 @@ export const TagMenu: React.FC<TagMenuProps> = ({
const handleEditTag = () => {
setIsOpen(false);
router.push(`/product-tags/edit?tagId=${tagId}`);
router.push(`/(drawer)/dashboard/product-tags/edit?tagId=${tagId}`);
};
const handleDeleteTag = () => {

14
apps/backend/src/trpc/apis/admin-apis/apis/const.ts
View file

@ -2,9 +2,16 @@ import { router, protectedProcedure } from '@/src/trpc/trpc-index'
import { z } from 'zod';
import { computeConstants } from '@/src/lib/const-store'
import { CONST_KEYS } from '@/src/lib/const-keys'
import { scheduleStoreInitialization } from '@/src/stores/store-initializer'
import { getAllConstants as getAllConstantsFromDb, upsertConstants as upsertConstantsInDb } from '@/src/dbService'
import type { Constant, ConstantUpdateResult } from '@packages/shared'
// Constants that are baked into the versioned cache files (products.json etc.)
// — changing them requires regenerating the cache so the user app picks it up.
const CACHE_AFFECTING_KEYS: string[] = [
CONST_KEYS.tagsOrder,
]
export const constRouter = router({
getConstants: protectedProcedure
.query(async (): Promise<Constant[]> => {
@ -64,6 +71,13 @@ export const constRouter = router({
// Refresh all constants in Redis after database update
await computeConstants();
// Constants like tagsOrder are baked into the versioned cache files.
// Regenerate the cache (bumps cacheVersion) so the user app fetches the
// new data (e.g., the new tab order on the home page).
if (constants.some((c) => CACHE_AFFECTING_KEYS.includes(c.key))) {
await scheduleStoreInitialization()
}
return {
success: true,
updatedCount: constants.length,

33
apps/user-ui/app/(drawer)/(tabs)/home/index.tsx
View file

@ -593,35 +593,14 @@ export default function Dashboard() {
productById.set(product.id, product);
}
// tag.productIds is already in the admin-curated order (backend sorts by sortOrder).
const orderedIds = (tag.productIds || []).filter((id: number) => productById.has(id));
const ordered: any[] = [];
const rest: any[] = [];
for (const id of orderedIds) {
const product = productById.get(id);
const isOutOfStock = Boolean(productSlotsMap[id]?.isOutOfStock) || !getQuickestSlot(id);
if (isOutOfStock) rest.push(product);
else ordered.push(product);
}
// Products in the tag's productIds but not in the curated order (added later) — availability sort.
const seen = new Set(orderedIds);
const extra = products
.filter((product: any) => (tag.productIds?.includes(product.id) ?? false) && !seen.has(product.id))
.sort((a: any, b: any) => {
const slotA = getQuickestSlot(a.id)
const slotB = getQuickestSlot(b.id)
const aOutOfStock = Boolean(productSlotsMap[a.id]?.isOutOfStock) || !slotA
const bOutOfStock = Boolean(productSlotsMap[b.id]?.isOutOfStock) || !slotB
if (aOutOfStock && !bOutOfStock) return 1
if (!aOutOfStock && bOutOfStock) return -1
return 0
});
map[tag.id] = [...ordered, ...rest, ...extra];
// Respect the admin-curated order — tag.productIds is already ordered by
// the tag's sortOrder (backend reorders it when building the cache).
map[tag.id] = (tag.productIds || [])
.map((id: number) => productById.get(id))
.filter(Boolean) as any[];
}
return map;
}, [dashboardTags, products, getQuickestSlot, productSlotsMap]);
}, [dashboardTags, products]);
const handleRefresh = useCallback(async () => {
setIsRefreshing(true);