chore: flatten app/pages/project (#2713)

* convert more routes

* flatten app/pages/projects/instances

* flatten app/pages/vpcs

* oxlint consistent-type-imports

Author: david-crespo

.oxlintrc.json

@@ -8,6 +8,9 @@
     "typescript",
     "oxc"
   ],
+  "categories": {
+    "correctness": "error"
+  },
   "rules": {
     // only worry about console.log
     "no-console": ["error", { "allow": ["warn", "error", "info", "table"] }],
@@ -25,7 +28,8 @@
 
     "react-hooks/exhaustive-deps": "error",
     "react-hooks/rules-of-hooks": "error",
-    "import/no-default-export": "error"
+    "import/no-default-export": "error",
+    "consistent-type-imports": "error"
   },
   "overrides": [
     {

app/components/form/fields/RadioField.tsx

@@ -6,7 +6,7 @@
  * Copyright Oxide Computer Company
  */
 import cn from 'classnames'
-import React, { useId } from 'react'
+import { useId, type default as React } from 'react'
 import {
   useController,
   type Control,

app/components/oxql-metrics/OxqlMetric.tsx

@@ -19,7 +19,7 @@ import { apiQueryClient, useApiQuery } from '@oxide/api'
 import { CopyCodeModal } from '~/components/CopyCode'
 import { MoreActionsMenu } from '~/components/MoreActionsMenu'
 import { getInstanceSelector } from '~/hooks/use-params'
-import { useMetricsContext } from '~/pages/project/instances/instance/tabs/common'
+import { useMetricsContext } from '~/pages/project/instances/common'
 import { LearnMore } from '~/ui/lib/SettingsGroup'
 import { classed } from '~/util/classed'
 import { links } from '~/util/links'

app/pages/lookups.ts app/pages/InstanceLookup.tsxapp/pages/lookups.ts renamed to app/pages/InstanceLookup.tsx

@@ -12,7 +12,7 @@ import { apiq, queryClient } from '@oxide/api'
 import { trigger404 } from '~/components/ErrorBoundary'
 import { pb } from '~/util/path-builder'
 
-export async function instanceLookupLoader({ params }: LoaderFunctionArgs) {
+export async function clientLoader({ params }: LoaderFunctionArgs) {
   try {
     const instance = await queryClient.fetchQuery(
       apiq('instanceView', { path: { instance: params.instance! } })
@@ -25,3 +25,8 @@ export async function instanceLookupLoader({ params }: LoaderFunctionArgs) {
     throw trigger404
   }
 }
+
+/** This should never render because the loader always redirects or 404s */
+export default function InstanceLookup() {
+  return null
+}

app/pages/project/disks/DisksPage.tsx

@@ -39,7 +39,7 @@ import { docLinks } from '~/util/links'
 import { pb } from '~/util/path-builder'
 import type * as PP from '~/util/path-params'
 
-import { fancifyStates } from '../instances/instance/tabs/common'
+import { fancifyStates } from '../instances/common'
 
 export const handle = makeCrumb('Disks', (p) => pb.disks(getProjectSelector(p)))
 

…t/instances/instance/tabs/ConnectTab.tsx …p/pages/project/instances/ConnectTab.tsxapp/pages/project/instances/instance/tabs/ConnectTab.tsx renamed to app/pages/project/instances/ConnectTab.tsx app/pages/project/instances/instance/tabs/ConnectTab.tsx renamed to app/pages/project/instances/ConnectTab.tsx

@@ -20,7 +20,7 @@ import type { OxqlVcpuState } from '~/components/oxql-metrics/util'
 import { useInstanceSelector } from '~/hooks/use-params'
 import { Listbox } from '~/ui/lib/Listbox'
 
-import { useMetricsContext } from '../common'
+import { useMetricsContext } from './common'
 
 export const handle = { crumb: 'CPU' }
 

…stance/tabs/MetricsTab/CpuMetricsTab.tsx …ages/project/instances/CpuMetricsTab.tsxapp/pages/project/instances/instance/tabs/MetricsTab/CpuMetricsTab.tsx renamed to app/pages/project/instances/CpuMetricsTab.tsx app/pages/project/instances/instance/tabs/MetricsTab/CpuMetricsTab.tsx renamed to app/pages/project/instances/CpuMetricsTab.tsx

@@ -24,7 +24,7 @@ import { EmptyMessage } from '~/ui/lib/EmptyMessage'
 import { Listbox } from '~/ui/lib/Listbox'
 import { TableEmptyBox } from '~/ui/lib/Table'
 
-import { useMetricsContext } from '../common'
+import { useMetricsContext } from './common'
 
 export async function clientLoader({ params }: LoaderFunctionArgs) {
   const { project, instance } = getInstanceSelector(params)

…tance/tabs/MetricsTab/DiskMetricsTab.tsx …ges/project/instances/DiskMetricsTab.tsxapp/pages/project/instances/instance/tabs/MetricsTab/DiskMetricsTab.tsx renamed to app/pages/project/instances/DiskMetricsTab.tsx app/pages/project/instances/instance/tabs/MetricsTab/DiskMetricsTab.tsx renamed to app/pages/project/instances/DiskMetricsTab.tsx

@@ -55,7 +55,7 @@ import { pb } from '~/util/path-builder'
 import { pluralize } from '~/util/str'
 import { GiB } from '~/util/units'
 
-import { useMakeInstanceActions } from '../actions'
+import { useMakeInstanceActions } from './actions'
 
 function getPrimaryVpcId(nics: InstanceNetworkInterface[]) {
   const nic = nics.find((nic) => nic.primary)

…ject/instances/instance/InstancePage.tsx …pages/project/instances/InstancePage.tsxapp/pages/project/instances/instance/InstancePage.tsx renamed to app/pages/project/instances/InstancePage.tsx app/pages/project/instances/instance/InstancePage.tsx renamed to app/pages/project/instances/InstancePage.tsx

@@ -42,7 +42,7 @@ import { pb } from '~/util/path-builder'
 import { pluralize } from '~/util/str'
 
 import { useMakeInstanceActions } from './actions'
-import { ResizeInstanceModal } from './instance/InstancePage'
+import { ResizeInstanceModal } from './InstancePage'
 
 const EmptyState = () => (
   <EmptyMessage