renaming to remove reference to V2 within lookoutui (#353)

* renaming to remove V2 from lookoutui

internal/lookoutui/src/App.tsx

@@ -8,7 +8,7 @@ import { BrowserRouter, Navigate, Route, Routes } from "react-router-dom"
 
 import NavBar from "./components/NavBar"
 import JobSetsContainer from "./containers/JobSetsContainer"
-import { JobsTableContainer } from "./containers/lookoutV2/JobsTableContainer"
+import { JobsTableContainer } from "./containers/lookout/JobsTableContainer"
 import { OidcAuthProvider } from "./oidcAuth"
 import { OIDC_REDIRECT_PATHNAME } from "./oidcAuth/OidcAuthProvider"
 import { Services, ServicesProvider } from "./services/context"

internal/lookoutui/src/components/job-sets/JobSetTable.tsx

@@ -17,10 +17,10 @@ import {
 import { visuallyHidden } from "@mui/utils"
 import { TableVirtuoso, TableComponents } from "react-virtuoso"
 
-import { JobState, jobStateColors, jobStateIcons } from "../../models/lookoutV2Models"
+import { JobState, jobStateColors, jobStateIcons } from "../../models/lookoutModels"
 import { JobSet } from "../../services/JobService"
 import { formatJobState } from "../../utils/jobsTableFormatters"
-import { JobStateCountChip } from "../lookoutV2/JobStateCountChip"
+import { JobStateCountChip } from "../lookout/JobStateCountChip"
 
 const JOB_STATES_TO_DISPLAY = [
   [JobState.Queued, "jobsQueued"],

internal/lookoutui/src/components/job-sets/QueueSelector.tsx

@@ -2,7 +2,7 @@ import { useMemo, useState } from "react"
 
 import { Alert, AlertTitle, Autocomplete, Button, styled, TextField } from "@mui/material"
 
-import { useGetQueues } from "../../services/lookoutV2/useGetQueues"
+import { useGetQueues } from "../../services/lookout/useGetQueues"
 
 const StyledAutocomplete = styled(Autocomplete<string>)({
   width: 300,

internal/lookoutui/src/components/job-sets/cancel-job-sets/CancelJobSetsOutcome.tsx

@@ -13,7 +13,7 @@ import {
   TableRow,
 } from "@mui/material"
 
-import { CancelJobSetsResponse } from "../../../services/lookoutV2/UpdateJobSetsService"
+import { CancelJobSetsResponse } from "../../../services/lookout/UpdateJobSetsService"
 
 import "./CancelJobSets.css"
 import "../../Dialog.css"

internal/lookoutui/src/components/job-sets/reprioritize-job-sets/ReprioritizeJobSetsOutcome.tsx

@@ -12,7 +12,7 @@ import {
   TableRow,
 } from "@mui/material"
 
-import { ReprioritizeJobSetsResponse } from "../../../services/lookoutV2/UpdateJobSetsService"
+import { ReprioritizeJobSetsResponse } from "../../../services/lookout/UpdateJobSetsService"
 
 import "./ReprioritizeJobSets.css"
 import "../../Dialog.css"

internal/lookoutui/src/components/lookoutV2/CancelDialog.test.tsx → internal/lookoutui/src/components/lookout/CancelDialog.test.tsx

@@ -3,10 +3,10 @@ import userEvent from "@testing-library/user-event"
 import { SnackbarProvider } from "notistack"
 
 import { CancelDialog } from "./CancelDialog"
-import { Job, JobFilter, JobState, Match } from "../../models/lookoutV2Models"
-import { IGetJobsService } from "../../services/lookoutV2/GetJobsService"
-import { UpdateJobsResponse, UpdateJobsService } from "../../services/lookoutV2/UpdateJobsService"
-import FakeGetJobsService from "../../services/lookoutV2/mocks/FakeGetJobsService"
+import { Job, JobFilter, JobState, Match } from "../../models/lookoutModels"
+import { IGetJobsService } from "../../services/lookout/GetJobsService"
+import { UpdateJobsResponse, UpdateJobsService } from "../../services/lookout/UpdateJobsService"
+import FakeGetJobsService from "../../services/lookout/mocks/FakeGetJobsService"
 import { makeManyTestJobs } from "../../utils/fakeJobsUtils"
 import { formatJobState } from "../../utils/jobsTableFormatters"
 

internal/lookoutui/src/components/lookoutV2/CancelDialog.tsx → internal/lookoutui/src/components/lookout/CancelDialog.tsx

@@ -9,10 +9,10 @@ import _ from "lodash"
 import dialogStyles from "./DialogStyles.module.css"
 import { JobStatusTable } from "./JobStatusTable"
 import { useCustomSnackbar } from "../../hooks/useCustomSnackbar"
-import { isTerminatedJobState, Job, JobFilter, JobId } from "../../models/lookoutV2Models"
+import { isTerminatedJobState, Job, JobFilter, JobId } from "../../models/lookoutModels"
 import { useGetAccessToken } from "../../oidcAuth"
-import { IGetJobsService } from "../../services/lookoutV2/GetJobsService"
-import { UpdateJobsService } from "../../services/lookoutV2/UpdateJobsService"
+import { IGetJobsService } from "../../services/lookout/GetJobsService"
+import { UpdateJobsService } from "../../services/lookout/UpdateJobsService"
 import { pl, waitMillis, PlatformCancelReason } from "../../utils"
 import { getUniqueJobsMatchingFilters } from "../../utils/jobsDialogUtils"
 import { formatJobState } from "../../utils/jobsTableFormatters"

internal/lookoutui/src/components/lookoutV2/JobGroupStateCounts.tsx → internal/lookoutui/src/components/lookout/JobGroupStateCounts.tsx

@@ -1,6 +1,6 @@
 import { Chip, styled, Tooltip } from "@mui/material"
 
-import { JobState, jobStateColors } from "../../models/lookoutV2Models"
+import { JobState, jobStateColors } from "../../models/lookoutModels"
 import { formatJobState } from "../../utils/jobsTableFormatters"
 
 const CountsContainer = styled("div")({

internal/lookoutui/src/components/lookoutV2/JobGroupStateCountsColumnHeader.tsx → internal/lookoutui/src/components/lookout/JobGroupStateCountsColumnHeader.tsx

@@ -1,6 +1,6 @@
 import { styled, Tooltip } from "@mui/material"
 
-import { JobState, jobStateColors, jobStateIcons } from "../../models/lookoutV2Models"
+import { JobState, jobStateColors, jobStateIcons } from "../../models/lookoutModels"
 import { formatJobState } from "../../utils/jobsTableFormatters"
 
 const OuterContainer = styled("div")({

internal/lookoutui/src/components/lookoutV2/JobStateChip.tsx → internal/lookoutui/src/components/lookout/JobStateChip.tsx

@@ -1,6 +1,6 @@
 import { Chip } from "@mui/material"
 
-import { JobState, jobStateColors, jobStateIcons } from "../../models/lookoutV2Models"
+import { JobState, jobStateColors, jobStateIcons } from "../../models/lookoutModels"
 import { formatJobState } from "../../utils/jobsTableFormatters"
 
 export interface JobStateChipProps {

internal/lookoutui/src/components/lookoutV2/JobStateCountChip.tsx → internal/lookoutui/src/components/lookout/JobStateCountChip.tsx

@@ -1,6 +1,6 @@
 import { Chip, styled } from "@mui/material"
 
-import { JobState, jobStateColors } from "../../models/lookoutV2Models"
+import { JobState, jobStateColors } from "../../models/lookoutModels"
 
 const StyledChip = styled(Chip)({ padding: "0 1ch" })
 

internal/lookoutui/src/components/lookoutV2/JobStatusTable.tsx → internal/lookoutui/src/components/lookout/JobStatusTable.tsx

@@ -2,7 +2,7 @@ import { memo } from "react"
 
 import { Table, TableBody, TableCell, TableContainer, TableHead, TableRow } from "@mui/material"
 
-import { Job } from "../../models/lookoutV2Models"
+import { Job } from "../../models/lookoutModels"
 
 interface JobStatusTableProps {
   jobsToRender: Job[]

internal/lookoutui/src/components/lookoutV2/JobsTableActionBar.tsx → internal/lookoutui/src/components/lookout/JobsTableActionBar.tsx

@@ -11,9 +11,9 @@ import { ReprioritiseDialog } from "./ReprioritiseDialog"
 import AutoRefreshToggle from "../AutoRefreshToggle"
 import RefreshButton from "../RefreshButton"
 import GroupBySelect from "./GroupBySelect"
-import { JobFilter } from "../../models/lookoutV2Models"
-import { IGetJobsService } from "../../services/lookoutV2/GetJobsService"
-import { UpdateJobsService } from "../../services/lookoutV2/UpdateJobsService"
+import { JobFilter } from "../../models/lookoutModels"
+import { IGetJobsService } from "../../services/lookout/GetJobsService"
+import { UpdateJobsService } from "../../services/lookout/UpdateJobsService"
 import { ColumnId, JobTableColumn, PINNED_COLUMNS, toColId } from "../../utils/jobsTableColumns"
 
 export interface JobsTableActionBarProps {

internal/lookoutui/src/components/lookoutV2/JobsTableCell.tsx → internal/lookoutui/src/components/lookout/JobsTableCell.tsx

@@ -7,7 +7,7 @@ import { Cell, ColumnResizeMode, flexRender, Header, Row } from "@tanstack/react
 import styles from "./JobsTableCell.module.css"
 import { JobsTableFilter } from "./JobsTableFilter"
 import { JobRow, JobTableRow } from "../../models/jobsTableModels"
-import { JobState, Match } from "../../models/lookoutV2Models"
+import { JobState, Match } from "../../models/lookoutModels"
 import { ColumnId, FilterType, getColumnMetadata, StandardColumnId, toColId } from "../../utils/jobsTableColumns"
 import { matchForColumn } from "../../utils/jobsTableUtils"
 import { ActionableValueOnHover } from "../ActionableValueOnHover"

internal/lookoutui/src/components/lookoutV2/JobsTableFilter.tsx → internal/lookoutui/src/components/lookout/JobsTableFilter.tsx

@@ -19,7 +19,7 @@ import Menu from "@mui/material/Menu"
 import { useDebouncedCallback } from "use-debounce"
 
 import { QueueFilter } from "./QueueFilter"
-import { Match, MATCH_DISPLAY_STRINGS } from "../../models/lookoutV2Models"
+import { Match, MATCH_DISPLAY_STRINGS } from "../../models/lookoutModels"
 import { CustomPaletteColorToken } from "../../theme/palette"
 import {
   ANNOTATION_COLUMN_PREFIX,

internal/lookoutui/src/components/lookoutV2/QueueFilter.tsx → internal/lookoutui/src/components/lookout/QueueFilter.tsx

@@ -13,7 +13,7 @@ import {
   TextField,
 } from "@mui/material"
 
-import { useGetQueues } from "../../services/lookoutV2/useGetQueues"
+import { useGetQueues } from "../../services/lookout/useGetQueues"
 
 const ELLIPSIS = "\u2026"
 const FILTER_CHANGE_DEBOUNCE_MS = 300

internal/lookoutui/src/components/lookoutV2/ReprioritiseDialog.test.tsx → internal/lookoutui/src/components/lookout/ReprioritiseDialog.test.tsx

@@ -3,10 +3,10 @@ import userEvent from "@testing-library/user-event"
 import { SnackbarProvider } from "notistack"
 
 import { ReprioritiseDialog } from "./ReprioritiseDialog"
-import { Job, JobFilter, JobState, Match } from "../../models/lookoutV2Models"
-import { IGetJobsService } from "../../services/lookoutV2/GetJobsService"
-import { UpdateJobsResponse, UpdateJobsService } from "../../services/lookoutV2/UpdateJobsService"
-import FakeGetJobsService from "../../services/lookoutV2/mocks/FakeGetJobsService"
+import { Job, JobFilter, JobState, Match } from "../../models/lookoutModels"
+import { IGetJobsService } from "../../services/lookout/GetJobsService"
+import { UpdateJobsResponse, UpdateJobsService } from "../../services/lookout/UpdateJobsService"
+import FakeGetJobsService from "../../services/lookout/mocks/FakeGetJobsService"
 import { makeManyTestJobs } from "../../utils/fakeJobsUtils"
 
 describe("ReprioritiseDialog", () => {

internal/lookoutui/src/components/lookoutV2/ReprioritiseDialog.tsx → internal/lookoutui/src/components/lookout/ReprioritiseDialog.tsx

@@ -17,10 +17,10 @@ import _ from "lodash"
 import dialogStyles from "./DialogStyles.module.css"
 import { JobStatusTable } from "./JobStatusTable"
 import { useCustomSnackbar } from "../../hooks/useCustomSnackbar"
-import { isTerminatedJobState, Job, JobFilter, JobId } from "../../models/lookoutV2Models"
+import { isTerminatedJobState, Job, JobFilter, JobId } from "../../models/lookoutModels"
 import { useGetAccessToken } from "../../oidcAuth"
-import { IGetJobsService } from "../../services/lookoutV2/GetJobsService"
-import { UpdateJobsService } from "../../services/lookoutV2/UpdateJobsService"
+import { IGetJobsService } from "../../services/lookout/GetJobsService"
+import { UpdateJobsService } from "../../services/lookout/UpdateJobsService"
 import { pl, waitMillis } from "../../utils"
 import { getUniqueJobsMatchingFilters } from "../../utils/jobsDialogUtils"
 

internal/lookoutui/src/components/lookoutV2/sidebar/ContainerDetails.tsx → internal/lookoutui/src/components/lookout/sidebar/ContainerDetails.tsx

@@ -15,8 +15,8 @@ import {
 import { KeyValuePairTable } from "./KeyValuePairTable"
 import { SidebarTabSubheading } from "./sidebarTabContentComponents"
 import { useCustomSnackbar } from "../../../hooks/useCustomSnackbar"
-import { Job } from "../../../models/lookoutV2Models"
-import { useGetJobSpec } from "../../../services/lookoutV2/useGetJobSpec"
+import { Job } from "../../../models/lookoutModels"
+import { useGetJobSpec } from "../../../services/lookout/useGetJobSpec"
 import { SPACING } from "../../../styling/spacing"
 import { CodeBlock } from "../../CodeBlock"
 

internal/lookoutui/src/components/lookoutV2/sidebar/NoRunsAlert.tsx → internal/lookoutui/src/components/lookout/sidebar/NoRunsAlert.tsx

@@ -1,6 +1,6 @@
 import { Alert } from "@mui/material"
 
-import { JobState } from "../../../models/lookoutV2Models"
+import { JobState } from "../../../models/lookoutModels"
 
 const jobStatusMayRunInFuture: Record<JobState, boolean> = {
   [JobState.Queued]: true,

internal/lookoutui/src/components/lookoutV2/sidebar/Sidebar.test.tsx → internal/lookoutui/src/components/lookout/sidebar/Sidebar.test.tsx

@@ -5,11 +5,11 @@ import { SnackbarProvider } from "notistack"
 
 import { Sidebar } from "./Sidebar"
 import { queryClient } from "../../../App"
-import { Job, JobRunState, JobState } from "../../../models/lookoutV2Models"
+import { Job, JobRunState, JobState } from "../../../models/lookoutModels"
 import { FakeServicesProvider } from "../../../services/fakeContext"
-import { FakeCordonService } from "../../../services/lookoutV2/mocks/FakeCordonService"
-import FakeGetJobInfoService from "../../../services/lookoutV2/mocks/FakeGetJobInfoService"
-import { FakeGetRunInfoService } from "../../../services/lookoutV2/mocks/FakeGetRunInfoService"
+import { FakeCordonService } from "../../../services/lookout/mocks/FakeCordonService"
+import FakeGetJobInfoService from "../../../services/lookout/mocks/FakeGetJobInfoService"
+import { FakeGetRunInfoService } from "../../../services/lookout/mocks/FakeGetRunInfoService"
 import { makeTestJob } from "../../../utils/fakeJobsUtils"
 
 describe("Sidebar", () => {

internal/lookoutui/src/components/lookoutV2/sidebar/Sidebar.tsx → internal/lookoutui/src/components/lookout/sidebar/Sidebar.tsx

@@ -11,10 +11,10 @@ import { SidebarTabJobLogs } from "./SidebarTabJobLogs"
 import { SidebarTabJobResult } from "./SidebarTabJobResult"
 import { SidebarTabJobYaml } from "./SidebarTabJobYaml"
 import { SidebarTabScheduling } from "./SidebarTabScheduling"
-import { Job, JobState } from "../../../models/lookoutV2Models"
-import { ICordonService } from "../../../services/lookoutV2/CordonService"
-import { IGetJobInfoService } from "../../../services/lookoutV2/GetJobInfoService"
-import { IGetRunInfoService } from "../../../services/lookoutV2/GetRunInfoService"
+import { Job, JobState } from "../../../models/lookoutModels"
+import { ICordonService } from "../../../services/lookout/CordonService"
+import { IGetJobInfoService } from "../../../services/lookout/GetJobInfoService"
+import { IGetRunInfoService } from "../../../services/lookout/GetRunInfoService"
 import { SPACING } from "../../../styling/spacing"
 import { CommandSpec } from "../../../utils"
 

internal/lookoutui/src/components/lookoutV2/sidebar/SidebarHeader.tsx → internal/lookoutui/src/components/lookout/sidebar/SidebarHeader.tsx

@@ -3,7 +3,7 @@ import { memo, ReactNode } from "react"
 import { Close } from "@mui/icons-material"
 import { IconButton, styled, Typography } from "@mui/material"
 
-import { Job } from "../../../models/lookoutV2Models"
+import { Job } from "../../../models/lookoutModels"
 import { formatTimeSince } from "../../../utils/jobsTableFormatters"
 import { CopyIconButton } from "../../CopyIconButton"
 import { JobStateChip } from "../JobStateChip"

internal/lookoutui/src/components/lookoutV2/sidebar/SidebarTabJobCommands.tsx → internal/lookoutui/src/components/lookout/sidebar/SidebarTabJobCommands.tsx

@@ -7,7 +7,7 @@ import validator from "validator"
 
 import { NoRunsAlert } from "./NoRunsAlert"
 import { SidebarTabHeading } from "./sidebarTabContentComponents"
-import { Job } from "../../../models/lookoutV2Models"
+import { Job } from "../../../models/lookoutModels"
 import { SPACING } from "../../../styling/spacing"
 import { CommandSpec } from "../../../utils"
 import { CodeBlock } from "../../CodeBlock"

internal/lookoutui/src/components/lookoutV2/sidebar/SidebarTabJobDetails.tsx → internal/lookoutui/src/components/lookout/sidebar/SidebarTabJobDetails.tsx

@@ -3,7 +3,7 @@ import { Alert } from "@mui/material"
 import { ContainerDetails } from "./ContainerDetails"
 import { KeyValuePairTable } from "./KeyValuePairTable"
 import { SidebarTabHeading } from "./sidebarTabContentComponents"
-import { Job } from "../../../models/lookoutV2Models"
+import { Job } from "../../../models/lookoutModels"
 import { formatBytes, formatCpu } from "../../../utils/resourceUtils"
 
 export interface SidebarTabJobDetailsProps {

internal/lookoutui/src/components/lookoutV2/sidebar/SidebarTabJobLogs.tsx → internal/lookoutui/src/components/lookout/sidebar/SidebarTabJobLogs.tsx

@@ -18,10 +18,10 @@ import {
 
 import { NoRunsAlert } from "./NoRunsAlert"
 import { useCustomSnackbar } from "../../../hooks/useCustomSnackbar"
-import { Job, JobRun } from "../../../models/lookoutV2Models"
-import { LogLine } from "../../../services/lookoutV2/LogService"
-import { useGetJobSpec } from "../../../services/lookoutV2/useGetJobSpec"
-import { useGetLogs } from "../../../services/lookoutV2/useGetLogs"
+import { Job, JobRun } from "../../../models/lookoutModels"
+import { LogLine } from "../../../services/lookout/LogService"
+import { useGetJobSpec } from "../../../services/lookout/useGetJobSpec"
+import { useGetLogs } from "../../../services/lookout/useGetLogs"
 import { SPACING } from "../../../styling/spacing"
 
 const LogsHeader = styled("div")(({ theme }) => ({

internal/lookoutui/src/components/lookoutV2/sidebar/SidebarTabJobResult.tsx → internal/lookoutui/src/components/lookout/sidebar/SidebarTabJobResult.tsx

@@ -20,11 +20,11 @@ import { KeyValuePairTable } from "./KeyValuePairTable"
 import { NoRunsAlert } from "./NoRunsAlert"
 import { SidebarTabHeading, SidebarTabSubheading } from "./sidebarTabContentComponents"
 import { useCustomSnackbar } from "../../../hooks/useCustomSnackbar"
-import { Job, JobRun, JobState } from "../../../models/lookoutV2Models"
+import { Job, JobRun, JobState } from "../../../models/lookoutModels"
 import { useGetAccessToken } from "../../../oidcAuth"
-import { ICordonService } from "../../../services/lookoutV2/CordonService"
-import { IGetJobInfoService } from "../../../services/lookoutV2/GetJobInfoService"
-import { IGetRunInfoService } from "../../../services/lookoutV2/GetRunInfoService"
+import { ICordonService } from "../../../services/lookout/CordonService"
+import { IGetJobInfoService } from "../../../services/lookout/GetJobInfoService"
+import { IGetRunInfoService } from "../../../services/lookout/GetRunInfoService"
 import { SPACING } from "../../../styling/spacing"
 import { getErrorMessage } from "../../../utils"
 import { formatJobRunState, formatTimeSince, formatUtcDate } from "../../../utils/jobsTableFormatters"

internal/lookoutui/src/components/lookoutV2/sidebar/SidebarTabJobYaml.tsx → internal/lookoutui/src/components/lookout/sidebar/SidebarTabJobYaml.tsx

@@ -3,8 +3,8 @@ import { useEffect } from "react"
 import yaml from "js-yaml"
 
 import { useCustomSnackbar } from "../../../hooks/useCustomSnackbar"
-import { Job } from "../../../models/lookoutV2Models"
-import { useGetJobSpec } from "../../../services/lookoutV2/useGetJobSpec"
+import { Job } from "../../../models/lookoutModels"
+import { useGetJobSpec } from "../../../services/lookout/useGetJobSpec"
 import { CodeBlock } from "../../CodeBlock"
 
 export interface SidebarTabJobYamlProps {

internal/lookoutui/src/components/lookoutV2/sidebar/SidebarTabScheduling.tsx → internal/lookoutui/src/components/lookout/sidebar/SidebarTabScheduling.tsx

@@ -14,10 +14,10 @@ import {
 
 import { KeyValuePairTable } from "./KeyValuePairTable"
 import { SidebarTabHeading, SidebarTabProminentValueCard, SidebarTabSubheading } from "./sidebarTabContentComponents"
-import { Job, JobState } from "../../../models/lookoutV2Models"
-import { useGetJobSchedulingReport } from "../../../services/lookoutV2/useGetJobSchedulingReport"
-import { useGetQueueSchedulingReport } from "../../../services/lookoutV2/useGetQueueSchedulingReport"
-import { useGetSchedulingReport } from "../../../services/lookoutV2/useGetSchedulingReport"
+import { Job, JobState } from "../../../models/lookoutModels"
+import { useGetJobSchedulingReport } from "../../../services/lookout/useGetJobSchedulingReport"
+import { useGetQueueSchedulingReport } from "../../../services/lookout/useGetQueueSchedulingReport"
+import { useGetSchedulingReport } from "../../../services/lookout/useGetSchedulingReport"
 import { SPACING } from "../../../styling/spacing"
 import { formatTimeSince } from "../../../utils/jobsTableFormatters"
 import { formatCpu, formatBytes } from "../../../utils/resourceUtils"

internal/lookoutui/src/containers/CancelJobSetsDialog.tsx

@@ -7,7 +7,7 @@ import CancelJobSetsOutcome from "../components/job-sets/cancel-job-sets/CancelJ
 import { useGetAccessToken } from "../oidcAuth"
 import { ApiJobState } from "../openapi/armada"
 import { JobSet } from "../services/JobService"
-import { CancelJobSetsResponse, UpdateJobSetsService } from "../services/lookoutV2/UpdateJobSetsService"
+import { CancelJobSetsResponse, UpdateJobSetsService } from "../services/lookout/UpdateJobSetsService"
 import { ApiResult, PlatformCancelReason, RequestStatus } from "../utils"
 
 export type CancelJobSetsDialogState = "CancelJobSets" | "CancelJobSetsResult"

internal/lookoutui/src/containers/JobSetsContainer.tsx

@@ -3,19 +3,19 @@ import { Component } from "react"
 import CancelJobSetsDialog, { getCancellableJobSets } from "./CancelJobSetsDialog"
 import ReprioritizeJobSetsDialog, { getReprioritizeableJobSets } from "./ReprioritizeJobSetsDialog"
 import JobSets from "../components/job-sets/JobSets"
-import { JobState, Match } from "../models/lookoutV2Models"
+import { JobState, Match } from "../models/lookoutModels"
 import IntervalService from "../services/IntervalService"
 import { GetJobSetsRequest, JobSet } from "../services/JobService"
 import JobSetsLocalStorageService from "../services/JobSetsLocalStorageService"
 import JobSetsQueryParamsService from "../services/JobSetsQueryParamsService"
-import { IGroupJobsService } from "../services/lookoutV2/GroupJobsService"
+import { IGroupJobsService } from "../services/lookout/GroupJobsService"
 import {
   DEFAULT_PREFERENCES,
   JobsTablePreferences,
   stringifyQueryParams,
   toQueryStringSafe,
-} from "../services/lookoutV2/JobsTablePreferencesService"
-import { UpdateJobSetsService } from "../services/lookoutV2/UpdateJobSetsService"
+} from "../services/lookout/JobsTablePreferencesService"
+import { UpdateJobSetsService } from "../services/lookout/UpdateJobSetsService"
 import { ApiResult, debounced, PropsWithRouter, RequestStatus, selectItem, setStateAsync, withRouter } from "../utils"
 import { StandardColumnId } from "../utils/jobsTableColumns"
 

internal/lookoutui/src/containers/ReprioritizeJobSetsDialog.tsx

@@ -6,7 +6,7 @@ import ReprioritizeJobSets from "../components/job-sets/reprioritize-job-sets/Re
 import ReprioritizeJobSetsOutcome from "../components/job-sets/reprioritize-job-sets/ReprioritizeJobSetsOutcome"
 import { useGetAccessToken } from "../oidcAuth"
 import { JobSet } from "../services/JobService"
-import { ReprioritizeJobSetsResponse, UpdateJobSetsService } from "../services/lookoutV2/UpdateJobSetsService"
+import { ReprioritizeJobSetsResponse, UpdateJobSetsService } from "../services/lookout/UpdateJobSetsService"
 import { ApiResult, priorityIsValid, RequestStatus } from "../utils"
 
 import "../components/Dialog.css"