Merge pull request #6370 from entur/debug-client-dynamic-arguments

Add all routing parameters to debug UI
opentripplanner · Jan 23, 2025 · 1a86905 · 1a86905
2 parents 28bdf41 + 131f301
commit 1a86905
Show file tree

Hide file tree

Showing 45 changed files with 2,537 additions and 398 deletions.
diff --git a/client/.prettierignore b/client/.prettierignore
@@ -1,3 +1,4 @@
 node_modules/
 output/
 src/gql/
+src/static/query/tripQuery.tsx
diff --git a/client/codegen-preprocess.ts b/client/codegen-preprocess.ts
@@ -0,0 +1,16 @@
+import type { CodegenConfig } from '@graphql-codegen/cli';
+
+import * as path from 'node:path';
+
+const config: CodegenConfig = {
+  overwrite: true,
+  schema: '../application/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql',
+  documents: 'src/**/*.{ts,tsx}',
+  generates: {
+    'src/static/query/tripQuery.tsx': {
+      plugins: [path.resolve(__dirname, './src/util/generate-queries.cjs')],
+    },
+  },
+};
+
+export default config;
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -14,6 +14,8 @@
     "preview": "vite preview",
     "prebuild": "npm run codegen && npm run lint && npm run check-format",
     "predev": "npm run codegen",
+    "codegen-preprocess": "graphql-codegen --config codegen-preprocess.ts",
+    "precodegen": "npm run codegen-preprocess",
     "codegen": "graphql-codegen --config codegen.ts"
   },
   "dependencies": {
@@ -26,7 +28,8 @@
     "react": "19.0.0",
     "react-bootstrap": "2.10.7",
     "react-dom": "19.0.0",
-    "react-map-gl": "7.1.8"
+    "react-map-gl": "7.1.8",
+    "react-select": "5.9.0"
   },
   "devDependencies": {
     "@eslint/compat": "1.2.5",

diff --git a/client/src/components/ItineraryList/ItineraryListContainer.tsx b/client/src/components/ItineraryList/ItineraryListContainer.tsx
@@ -26,39 +26,46 @@ export function ItineraryListContainer({
   const timeZone = useContext(TimeZoneContext);
 
   return (
-    <section className="itinerary-list-container below-content" ref={containerRef}>
-      <ItineraryPaginationControl
-        onPagination={pageResults}
-        previousPageCursor={tripQueryResult?.trip.previousPageCursor}
-        nextPageCursor={tripQueryResult?.trip.nextPageCursor}
-        loading={loading}
-      />
-      <Accordion
-        activeKey={`${selectedTripPatternIndex}`}
-        onSelect={(eventKey) => setSelectedTripPatternIndex(parseInt(eventKey as string))}
-      >
-        {tripQueryResult &&
-          tripQueryResult.trip.tripPatterns.map((tripPattern, itineraryIndex) => (
-            <Accordion.Item
-              eventKey={`${itineraryIndex}`}
-              key={`${itineraryIndex}`}
-              bsPrefix={tripPattern.systemNotices.length === 0 ? '' : 'accordion-item-filtered'}
-            >
-              <Accordion.Header>
-                <ItineraryHeaderContent
-                  containerWidth={containerWidth}
-                  tripPattern={tripPattern}
-                  itineraryIndex={itineraryIndex}
-                  earliestStartTime={earliestStartTime}
-                  latestEndTime={latestEndTime}
-                />
-              </Accordion.Header>
-              <Accordion.Body>
-                <ItineraryDetails tripPattern={tripPattern} />
-              </Accordion.Body>
-            </Accordion.Item>
-          ))}
-      </Accordion>
+    <section className="left-pane-container below-content" ref={containerRef}>
+      <>
+        <div className="panel-header">Itinerary results</div>
+        <div className="pagination-controls">
+          <ItineraryPaginationControl
+            onPagination={pageResults}
+            previousPageCursor={tripQueryResult?.trip.previousPageCursor}
+            nextPageCursor={tripQueryResult?.trip.nextPageCursor}
+            loading={loading}
+          />
+        </div>
+        <Accordion
+          activeKey={`${selectedTripPatternIndex}`}
+          onSelect={(eventKey) => setSelectedTripPatternIndex(parseInt(eventKey as string))}
+        >
+          {tripQueryResult &&
+            tripQueryResult.trip.tripPatterns.map((tripPattern, itineraryIndex) => (
+              <Accordion.Item
+                eventKey={`${itineraryIndex}`}
+                key={`${itineraryIndex}`}
+                bsPrefix={tripPattern.systemNotices.length === 0 ? '' : 'accordion-item-filtered'}
+              >
+                <Accordion.Header>
+                  <ItineraryHeaderContent
+                    containerWidth={containerWidth}
+                    tripPattern={tripPattern}
+                    itineraryIndex={itineraryIndex}
+                    earliestStartTime={earliestStartTime}
+                    latestEndTime={latestEndTime}
+                  />
+                </Accordion.Header>
+                <Accordion.Body>
+                  <ItineraryDetails tripPattern={tripPattern} />
+                </Accordion.Body>
+              </Accordion.Item>
+            ))}
+        </Accordion>
+      </>
+
+      {/* Time Zone Info */}
       <div className="time-zone-info">
         All times in <code>{timeZone}</code>
       </div>

diff --git a/client/src/components/ItineraryList/ItineraryPaginationControl.tsx b/client/src/components/ItineraryList/ItineraryPaginationControl.tsx
@@ -12,7 +12,7 @@ export function ItineraryPaginationControl({
   loading: boolean;
 }) {
   return (
-    <div style={{ display: 'flex', justifyContent: 'space-evenly', margin: '1rem 0 ' }}>
+    <div style={{ display: 'flex', justifyContent: 'space-evenly' }}>
       <Button
         variant="outline-primary"
         size="sm"