Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
390 changes: 0 additions & 390 deletions DESIGN.md

This file was deleted.

229 changes: 0 additions & 229 deletions apps/shopify-app/app/features/delivery/operational-state.js

This file was deleted.

4 changes: 0 additions & 4 deletions apps/shopify-app/app/features/delivery/route-detail.server.js
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ export function buildRouteGroupChildDetails(routeGroup) {
const stops = firstArray(child?.stops, child?.routeStops, child?.assignments, routePlan?.stops);
const optimized = readRouteOptimizedSnapshot(child?.optimized ?? routePlan?.optimized);
return {
operationalState: child?.operationalState ?? routePlan?.operationalState ?? null,
routeGeometry: child?.routeGeometry ?? routePlan?.routeGeometry ?? optimized?.routeGeometry ?? null,
routeMetrics: child?.routeMetrics ?? routePlan?.routeMetrics ?? null,
routePlan: getRouteGroupChildRoutePlan(routeGroup, child, routePlanId, index, stops),
Expand Down Expand Up @@ -473,7 +472,6 @@ export async function loadRoutePlanDetail(request, routeId, routeGroupIdHint = n
);
const directCurrentChildDetail = routePlanData.routePlan || routePlanData.stops?.length
? {
operationalState: routePlanData.operationalState ?? null,
routeGeometry: routePlanData.routeGeometry,
routeMetrics: routePlanData.routeMetrics ?? null,
routePlan: routePlanData.routePlan,
Expand Down Expand Up @@ -519,7 +517,6 @@ export async function loadRoutePlanDetail(request, routeId, routeGroupIdHint = n
routePlan: currentChildDetail?.routePlan ?? routePlanData.routePlan,
}),
routePlan: currentChildDetail?.routePlan ?? null,
operationalState: currentChildDetail?.operationalState ?? routePlanData.operationalState ?? null,
routeGeometry: currentChildDetail?.routeGeometry ?? null,
routeMetrics: currentChildDetail?.routeMetrics ?? null,
routeStopPoints: currentChildDetail?.routeStopPoints ?? [],
Expand Down Expand Up @@ -562,7 +559,6 @@ export async function loadRoutePlanDetail(request, routeId, routeGroupIdHint = n
? await fetchDeliveryRouteGroupDetail(request, routeGroupId, { cacheKey: shopifyShopCacheKey })
: { errors: [], routeGroup: null };
const currentRouteDetail = {
operationalState: routePlanData.operationalState ?? null,
routeGeometry: routePlanData.routeGeometry,
routeMetrics: routePlanData.routeMetrics ?? null,
routePlan: routePlanData.routePlan,
Expand Down
32 changes: 7 additions & 25 deletions apps/shopify-app/app/features/delivery/route-list-rows.js
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ function buildRouteChildRows(
children = getVisibleRouteGroupChildren(routeGroup),
groupAccentColor = null,
groupSummary = null,
operationalStateByRoutePlanId = null,
) {
return children.map((child, index) => {
const routePlanId = getRouteGroupChildRoutePlanId(child);
Expand All @@ -239,10 +238,6 @@ function buildRouteChildRows(
groupSummary,
route: getRouteGroupChildRouteName(routeGroup, child, routePlan, index),
status: child.displayStatus ?? routePlan.status ?? "DRAFT",
operationalState: child.operationalState
?? routePlan.operationalState
?? operationalStateByRoutePlanId?.get(String(routePlanId))
?? null,
orders: stopsCount,
coordinates: `${locatedCount}/${stopsCount}`,
delivered: 0,
Expand All @@ -260,26 +255,14 @@ function buildRouteChildRows(
}

export function buildRouteRows(routePlans, routeGroups = []) {
const safeRoutePlans = Array.isArray(routePlans) ? routePlans : [];
const safeRouteGroups = Array.isArray(routeGroups) ? routeGroups : [];
const operationalStateByRoutePlanId = new Map(
safeRoutePlans
.filter((routePlan) => routePlan?.id != null)
.map((routePlan) => [String(routePlan.id), routePlan.operationalState ?? null]),
);
const routeGroupEntries = safeRouteGroups.map((routeGroup, index) => {
const children = getVisibleRouteGroupChildren(routeGroup);
const groupAccentColor = getRouteGroupAccentColor(routeGroup.id);
const totalOrders = getRouteGroupTotalOrders(routeGroup);
const groupSummary = formatRouteGroupSummary(children.length, totalOrders);
return {
childRows: buildRouteChildRows(
routeGroup,
children,
groupAccentColor,
groupSummary,
operationalStateByRoutePlanId,
),
childRows: buildRouteChildRows(routeGroup, children, groupAccentColor, groupSummary),
children,
groupAccentColor,
groupSummary,
Expand All @@ -293,11 +276,12 @@ export function buildRouteRows(routePlans, routeGroups = []) {
routeGroupEntries.flatMap(({ children }) => children.map(getRouteGroupChildRoutePlanId).filter(Boolean)),
);
const routeGroupIds = new Set(safeRouteGroups.map((routeGroup) => routeGroup?.id).filter(Boolean).map(String));
const standaloneRoutePlans = safeRoutePlans
.filter((routePlan) => {
const routeGroupId = getRouteGroupingChildGroupId(routePlan);
return !childRoutePlanIds.has(routePlan.id) && !(routeGroupId && routeGroupIds.has(routeGroupId));
});
const standaloneRoutePlans = Array.isArray(routePlans)
? routePlans.filter((routePlan) => {
const routeGroupId = getRouteGroupingChildGroupId(routePlan);
return !childRoutePlanIds.has(routePlan.id) && !(routeGroupId && routeGroupIds.has(routeGroupId));
})
: [];
const routeGroupRows = routeGroupEntries.map(({ childRows, groupSummary, routeGroup, routeMetrics, totalOrders }) => {
return {
id: routeGroup.id,
Expand All @@ -312,7 +296,6 @@ export function buildRouteRows(routePlans, routeGroups = []) {
deleteKey: getRouteDeleteKey({ ...routeGroup, isRouteGroup: true }),
route: routeGroup.name ?? routeGroup.id,
status: routeGroup.displayStatus ?? routeGroup.status ?? "DRAFT",
operationalState: null,
orders: totalOrders,
coordinates: "-",
delivered: 0,
Expand Down Expand Up @@ -374,7 +357,6 @@ export function buildRouteRows(routePlans, routeGroups = []) {
deleteKey: getRouteDeleteKey(routePlan),
route: routePlan.name ?? routePlan.id,
status: routePlan.status ?? "DRAFT",
operationalState: routePlan.operationalState ?? null,
orders: stopsCount,
coordinates: `${locatedCount}/${stopsCount}`,
delivered,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ export async function fetchDeliveryRoutePlanDetail(request, routePlanId, options
);

return {
operationalState: result.data?.operationalState ?? result.data?.routePlan?.operationalState ?? null,
routePlan: result.data?.routePlan ?? null,
routeGeometry: result.data?.routeGeometry ?? null,
routeMetrics: result.data?.routeMetrics ?? null,
Expand Down
Loading