ChangeHistory: Fix broken history on priority change

Huulivoide · Huulivoide · commit 6df25932b645 · 2026-05-05T14:10:38.000+03:00
Always fetch all history items, and perform the priority filtering on
UI side post fact, for the final list of items to display. This
ensures we don't end up in a situation where we have a "missing" version,
due to it having a wrong priority.
diff --git a/ui/src/components/routes-and-lines/line-change-history/queries/useGetLineChangeHistory.ts b/ui/src/components/routes-and-lines/line-change-history/queries/useGetLineChangeHistory.ts
@@ -23,14 +23,9 @@ import {
 import { LineChangeHistoryItem, TgOperation } from '../types';
 
 const GQL_GET_LINE_CHANGE_HISTORY = gql`
-  query GetLineChangeHistory($label: String!, $priority: Int!) {
+  query GetLineChangeHistory($label: String!) {
     historyItems: route_line_change_history(
-      where: {
-        _and: [
-          { line_label: { _eq: $label } }
-          { line_priority: { _eq: $priority } }
-        ]
-      }
+      where: { line_label: { _eq: $label } }
     ) {
       ...LineChangeHistoryItemDetails
     }
@@ -241,8 +236,12 @@ function filterHistoryItems(
 ): (item: LineChangeHistoryItem) => boolean {
   const from = filters.from.startOf('day');
   const to = filters.to.endOf('day');
+  const { priority } = filters;
 
-  return (item) => from <= item.changed && item.changed <= to;
+  return (item) =>
+    item.linePriority === priority &&
+    from <= item.changed &&
+    item.changed <= to;
 }
 
 const noopGetUserNameById: GetUserNameById = () => null;
@@ -285,7 +284,7 @@ export function useGetLineChangeHistoryItems({
   sortingInfo,
 }: GetLineChangeHistoryOptions) {
   const { data, ...rest } = useGetLineChangeHistoryQuery({
-    variables: { label, priority: filters.priority },
+    variables: { label },
   });
 
   const historyItems: ReadonlyArray<LineChangeHistoryItem> = useMemo(
diff --git a/ui/src/components/stop-registry/stops/change-history/queries/useGetStopChangeHistoryItems.ts b/ui/src/components/stop-registry/stops/change-history/queries/useGetStopChangeHistoryItems.ts
@@ -12,19 +12,18 @@ import {
   ChangeHistoryFilters,
   ChangeHistorySortingInfo,
 } from '../../../../common/ChangeHistory';
-import { sortByVersion, useSortTiamatHistoryItems } from '../../../utils';
+import {
+  historyItemIsDateRange,
+  sortByVersion,
+  useSortTiamatHistoryItems,
+} from '../../../utils';
 import { sortByChangedTime } from '../../../utils/sortTiamatChangeHistoryItems';
 
 const GQL_GET_STOP_CHANGE_HISTORY = gql`
-  query GetStopChangeHistory($publicCode: String!, $priority: String!) {
+  query GetStopChangeHistory($publicCode: String!) {
     stopsDb: stops_database {
       historyItems: getQuayChangeHistory(
-        where: {
-          _and: [
-            { publicCode: { _eq: $publicCode } }
-            { priority: { _eq: $priority } }
-          ]
-        }
+        where: { publicCode: { _eq: $publicCode } }
       ) {
         ...QuayChangeHistoryItemDetails
       }
@@ -61,12 +60,9 @@ type GetStopChangeHistoryOptions = {
   readonly publicCode: string;
 };
 
-function useGetStopChangeHistorySortedByVersion(
-  publicCode: string,
-  priority: Priority,
-) {
+function useGetStopChangeHistorySortedByVersion(publicCode: string) {
   const { data, ...rest } = useGetStopChangeHistoryQuery({
-    variables: { publicCode, priority: String(priority) },
+    variables: { publicCode },
   });
 
   const rawHistoryItems = data?.stopsDb?.historyItems;
@@ -84,23 +80,30 @@ function useGetStopChangeHistorySortedByVersion(
   return { ...rest, historyItems };
 }
 
+function filterQuayHistoryItems(
+  filters: ChangeHistoryFilters,
+): (item: QuayChangeHistoryItem) => boolean {
+  const priorityStr = String(filters.priority);
+  const isInDateRange = historyItemIsDateRange(filters);
+
+  return (item) => item.priority === priorityStr && isInDateRange(item);
+}
+
 export function useGetStopChangeHistoryItems({
   filters,
   getUserNameById,
   publicCode,
   sortingInfo,
 }: GetStopChangeHistoryOptions) {
-  const base = useGetStopChangeHistorySortedByVersion(
-    publicCode,
-    filters.priority,
-  );
+  const base = useGetStopChangeHistorySortedByVersion(publicCode);
 
   const sortedHistoryItems: ReadonlyArray<QuayChangeHistoryItem> =
     useSortTiamatHistoryItems(
       base.historyItems,
       filters,
       sortingInfo,
       getUserNameById,
+      filterQuayHistoryItems,
     );
 
   return { ...base, sortedHistoryItems };
@@ -112,15 +115,18 @@ export function useGetLatestStopChangeHistory(
   publicCode: string,
   priority: Priority,
 ) {
-  const base = useGetStopChangeHistorySortedByVersion(publicCode, priority);
+  const priorityStr = String(priority);
+  const base = useGetStopChangeHistorySortedByVersion(publicCode);
+
   return {
     ...base,
     latestHistoryItems: useMemo(
       () =>
         base.historyItems
+          .filter((it) => it.priority === priorityStr)
           .toSorted(sortByChangedTime(SortOrder.DESCENDING))
           .slice(0, latestChangesLimit),
-      [base.historyItems],
+      [base.historyItems, priorityStr],
     ),
   };
 }
diff --git a/ui/src/components/stop-registry/utils/useSortTiamatHistoryItems.ts b/ui/src/components/stop-registry/utils/useSortTiamatHistoryItems.ts
@@ -11,7 +11,7 @@ import { sortBySortingInfo } from './sortTiamatChangeHistoryItems';
 
 export const noopGetUserNameById: GetUserNameById = () => null;
 
-function historyItemIsDateRange({
+export function historyItemIsDateRange({
   from,
   to,
 }: ChangeHistoryFilters): (item: BaseTiamatChangeHistoryItem) => boolean {
@@ -30,6 +30,9 @@ export function useSortTiamatHistoryItems<
   filters: ChangeHistoryFilters,
   sortingInfo: ChangeHistorySortingInfo,
   getUserNameByIdRealImpl: GetUserNameById,
+  getFilterFn: (
+    filters: ChangeHistoryFilters,
+  ) => (item: T) => boolean = historyItemIsDateRange,
 ): ReadonlyArray<T> {
   const collator = useCollator({ numeric: true });
 
@@ -43,8 +46,15 @@ export function useSortTiamatHistoryItems<
   return useMemo(
     () =>
       historyItems
-        .filter(historyItemIsDateRange(filters))
+        .filter(getFilterFn(filters))
         .sort(sortBySortingInfo(sortingInfo, collator, getUserNameById)),
-    [historyItems, filters, sortingInfo, collator, getUserNameById],
+    [
+      historyItems,
+      filters,
+      sortingInfo,
+      collator,
+      getUserNameById,
+      getFilterFn,
+    ],
   );
 }
diff --git a/ui/src/generated/graphql.tsx b/ui/src/generated/graphql.tsx
@@ -71955,7 +71955,6 @@ export type UpdateRouteJourneyPatternMutation = {
 
 export type GetLineChangeHistoryQueryVariables = Exact<{
   label: Scalars['String']['input'];
-  priority: Scalars['Int']['input'];
 }>;
 
 
@@ -76808,7 +76807,6 @@ export type DetailsForHistoricalStopVersionFragment = {
 
 export type GetStopChangeHistoryQueryVariables = Exact<{
   publicCode: Scalars['String']['input'];
-  priority: Scalars['String']['input'];
 }>;
 
 
@@ -85197,7 +85195,7 @@ export function useUpdateRouteJourneyPatternMutation(baseOptions?: Apollo.Mutati
 export type UpdateRouteJourneyPatternMutationHookResult = ReturnType<typeof useUpdateRouteJourneyPatternMutation>;
 export type UpdateRouteJourneyPatternMutationResult = Apollo.MutationResult<UpdateRouteJourneyPatternMutation>;
 export type UpdateRouteJourneyPatternMutationOptions = Apollo.BaseMutationOptions<UpdateRouteJourneyPatternMutation, UpdateRouteJourneyPatternMutationVariables>;
-export const GetLineChangeHistoryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetLineChangeHistory"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"label"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"priority"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","alias":{"kind":"Name","value":"historyItems"},"name":{"kind":"Name","value":"route_line_change_history"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"_and"},"value":{"kind":"ListValue","values":[{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"line_label"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"_eq"},"value":{"kind":"Variable","name":{"kind":"Name","value":"label"}}}]}}]},{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"line_priority"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"_eq"},"value":{"kind":"Variable","name":{"kind":"Name","value":"priority"}}}]}}]}]}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LineChangeHistoryItemDetails"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LineChangeHistoryItemDetails"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"route_line_change_history"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","alias":{"kind":"Name","value":"tgOperation"},"name":{"kind":"Name","value":"tg_operation"}},{"kind":"Field","alias":{"kind":"Name","value":"lineId"},"name":{"kind":"Name","value":"line_id"}},{"kind":"Field","alias":{"kind":"Name","value":"lineLabel"},"name":{"kind":"Name","value":"line_label"}},{"kind":"Field","alias":{"kind":"Name","value":"linePriority"},"name":{"kind":"Name","value":"line_priority"}},{"kind":"Field","alias":{"kind":"Name","value":"lineValidityStart"},"name":{"kind":"Name","value":"line_validity_start"}},{"kind":"Field","alias":{"kind":"Name","value":"lineValidityEnd"},"name":{"kind":"Name","value":"line_validity_end"}},{"kind":"Field","alias":{"kind":"Name","value":"routeId"},"name":{"kind":"Name","value":"route_id"}},{"kind":"Field","alias":{"kind":"Name","value":"routeLabel"},"name":{"kind":"Name","value":"route_label"}},{"kind":"Field","alias":{"kind":"Name","value":"routeDirection"},"name":{"kind":"Name","value":"route_direction"}},{"kind":"Field","alias":{"kind":"Name","value":"routeValidityStart"},"name":{"kind":"Name","value":"route_validity_start"}},{"kind":"Field","alias":{"kind":"Name","value":"routeValidityEnd"},"name":{"kind":"Name","value":"route_validity_end"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","alias":{"kind":"Name","value":"versionComment"},"name":{"kind":"Name","value":"version_comment"}},{"kind":"Field","name":{"kind":"Name","value":"changed"}},{"kind":"Field","alias":{"kind":"Name","value":"changedBy"},"name":{"kind":"Name","value":"changed_by"}}]}}]} as unknown as DocumentNode;
+export const GetLineChangeHistoryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetLineChangeHistory"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"label"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","alias":{"kind":"Name","value":"historyItems"},"name":{"kind":"Name","value":"route_line_change_history"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"line_label"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"_eq"},"value":{"kind":"Variable","name":{"kind":"Name","value":"label"}}}]}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LineChangeHistoryItemDetails"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LineChangeHistoryItemDetails"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"route_line_change_history"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","alias":{"kind":"Name","value":"tgOperation"},"name":{"kind":"Name","value":"tg_operation"}},{"kind":"Field","alias":{"kind":"Name","value":"lineId"},"name":{"kind":"Name","value":"line_id"}},{"kind":"Field","alias":{"kind":"Name","value":"lineLabel"},"name":{"kind":"Name","value":"line_label"}},{"kind":"Field","alias":{"kind":"Name","value":"linePriority"},"name":{"kind":"Name","value":"line_priority"}},{"kind":"Field","alias":{"kind":"Name","value":"lineValidityStart"},"name":{"kind":"Name","value":"line_validity_start"}},{"kind":"Field","alias":{"kind":"Name","value":"lineValidityEnd"},"name":{"kind":"Name","value":"line_validity_end"}},{"kind":"Field","alias":{"kind":"Name","value":"routeId"},"name":{"kind":"Name","value":"route_id"}},{"kind":"Field","alias":{"kind":"Name","value":"routeLabel"},"name":{"kind":"Name","value":"route_label"}},{"kind":"Field","alias":{"kind":"Name","value":"routeDirection"},"name":{"kind":"Name","value":"route_direction"}},{"kind":"Field","alias":{"kind":"Name","value":"routeValidityStart"},"name":{"kind":"Name","value":"route_validity_start"}},{"kind":"Field","alias":{"kind":"Name","value":"routeValidityEnd"},"name":{"kind":"Name","value":"route_validity_end"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","alias":{"kind":"Name","value":"versionComment"},"name":{"kind":"Name","value":"version_comment"}},{"kind":"Field","name":{"kind":"Name","value":"changed"}},{"kind":"Field","alias":{"kind":"Name","value":"changedBy"},"name":{"kind":"Name","value":"changed_by"}}]}}]} as unknown as DocumentNode;
 
 /**
  * __useGetLineChangeHistoryQuery__
@@ -85212,7 +85210,6 @@ export const GetLineChangeHistoryDocument = {"kind":"Document","definitions":[{"
  * const { data, loading, error } = useGetLineChangeHistoryQuery({
  *   variables: {
  *      label: // value for 'label'
- *      priority: // value for 'priority'
  *   },
  * });
  */
@@ -86616,7 +86613,7 @@ export type GetVersionedStopPlaceAndQuaysQueryHookResult = ReturnType<typeof use
 export type GetVersionedStopPlaceAndQuaysLazyQueryHookResult = ReturnType<typeof useGetVersionedStopPlaceAndQuaysLazyQuery>;
 export type GetVersionedStopPlaceAndQuaysSuspenseQueryHookResult = ReturnType<typeof useGetVersionedStopPlaceAndQuaysSuspenseQuery>;
 export type GetVersionedStopPlaceAndQuaysQueryResult = Apollo.QueryResult<GetVersionedStopPlaceAndQuaysQuery, GetVersionedStopPlaceAndQuaysQueryVariables>;
-export const GetStopChangeHistoryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetStopChangeHistory"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"publicCode"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"priority"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","alias":{"kind":"Name","value":"stopsDb"},"name":{"kind":"Name","value":"stops_database"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","alias":{"kind":"Name","value":"historyItems"},"name":{"kind":"Name","value":"getQuayChangeHistory"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"_and"},"value":{"kind":"ListValue","values":[{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"publicCode"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"_eq"},"value":{"kind":"Variable","name":{"kind":"Name","value":"publicCode"}}}]}}]},{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"priority"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"_eq"},"value":{"kind":"Variable","name":{"kind":"Name","value":"priority"}}}]}}]}]}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"QuayChangeHistoryItemDetails"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"QuayChangeHistoryItemDetails"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"QuayChangeHistoryItem"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"netexId"}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"changed"}},{"kind":"Field","name":{"kind":"Name","value":"changedBy"}},{"kind":"Field","name":{"kind":"Name","value":"versionComment"}},{"kind":"Field","name":{"kind":"Name","value":"privateCodeType"}},{"kind":"Field","name":{"kind":"Name","value":"privateCodeValue"}},{"kind":"Field","name":{"kind":"Name","value":"publicCode"}},{"kind":"Field","name":{"kind":"Name","value":"importedId"}},{"kind":"Field","name":{"kind":"Name","value":"validityStart"}},{"kind":"Field","name":{"kind":"Name","value":"validityEnd"}},{"kind":"Field","name":{"kind":"Name","value":"priority"}},{"kind":"Field","name":{"kind":"Name","value":"stopPlaceNetexId"}},{"kind":"Field","name":{"kind":"Name","value":"stopPlaceVersion"}}]}}]} as unknown as DocumentNode;
+export const GetStopChangeHistoryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetStopChangeHistory"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"publicCode"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","alias":{"kind":"Name","value":"stopsDb"},"name":{"kind":"Name","value":"stops_database"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","alias":{"kind":"Name","value":"historyItems"},"name":{"kind":"Name","value":"getQuayChangeHistory"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"where"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"publicCode"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"_eq"},"value":{"kind":"Variable","name":{"kind":"Name","value":"publicCode"}}}]}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"QuayChangeHistoryItemDetails"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"QuayChangeHistoryItemDetails"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"QuayChangeHistoryItem"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"netexId"}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"changed"}},{"kind":"Field","name":{"kind":"Name","value":"changedBy"}},{"kind":"Field","name":{"kind":"Name","value":"versionComment"}},{"kind":"Field","name":{"kind":"Name","value":"privateCodeType"}},{"kind":"Field","name":{"kind":"Name","value":"privateCodeValue"}},{"kind":"Field","name":{"kind":"Name","value":"publicCode"}},{"kind":"Field","name":{"kind":"Name","value":"importedId"}},{"kind":"Field","name":{"kind":"Name","value":"validityStart"}},{"kind":"Field","name":{"kind":"Name","value":"validityEnd"}},{"kind":"Field","name":{"kind":"Name","value":"priority"}},{"kind":"Field","name":{"kind":"Name","value":"stopPlaceNetexId"}},{"kind":"Field","name":{"kind":"Name","value":"stopPlaceVersion"}}]}}]} as unknown as DocumentNode;
 
 /**
  * __useGetStopChangeHistoryQuery__
@@ -86631,7 +86628,6 @@ export const GetStopChangeHistoryDocument = {"kind":"Document","definitions":[{"
  * const { data, loading, error } = useGetStopChangeHistoryQuery({
  *   variables: {
  *      publicCode: // value for 'publicCode'
- *      priority: // value for 'priority'
  *   },
  * });
  */
