merge main

Author: david-crespo

.github/renovate.json5

@@ -1,33 +1,4 @@
 {
   $schema: 'https://docs.renovatebot.com/renovate-schema.json',
-  extends: ['config:base'],
-  enabledManagers: ['npm'],
-  packageRules: [
-    // Disable all npm dependency updates by default
-    {
-      managers: ['npm'],
-      depTypeList: ['dependencies', 'devDependencies', 'peerDependencies'],
-      packagePatterns: ['*'],
-      enabled: false,
-    },
-    // Disable all engine updates by default
-    {
-      managers: ['npm'],
-      depTypeList: ['engines'],
-      packagePatterns: ['*'],
-      enabled: false,
-    },
-    // Packages to auto update and auto merge if CI passes
-    {
-      managers: ['npm'],
-      packageNames: ['typescript'],
-      enabled: true,
-    },
-    // Open PRs for any oxide packages
-    {
-      managers: ['npm'],
-      packagePatterns: ['@oxide/*'],
-      enabled: true,
-    },
-  ],
+  enabled: false,
 }

app/components/AttachEphemeralIpModal.tsx

@@ -65,9 +65,6 @@ export const AttachEphemeralIpModal = ({
       addToast(<>IP <HL>{ephemeralIp.ip}</HL> attached</>)
       onDismiss()
     },
-    onError: (err) => {
-      addToast({ title: 'Error', content: err.message, variant: 'error' })
-    },
   })
 
   const form = useForm({ defaultValues: { pool: defaultPool } })
@@ -96,6 +93,9 @@ export const AttachEphemeralIpModal = ({
               noItemsPlaceholder="No pools available"
             />
           </form>
+          {instanceEphemeralIpAttach.error && (
+            <p className="text-error mt-4">{instanceEphemeralIpAttach.error.message}</p>
+          )}
         </Modal.Section>
       </Modal.Body>
       <Modal.Footer

app/components/AttachFloatingIpModal.tsx

@@ -85,9 +85,6 @@ export const AttachFloatingIpModal = ({
       addToast(<>IP <HL>{floatingIp.name}</HL> attached</>)
       onDismiss()
     },
-    onError: (err) => {
-      addToast({ title: 'Error', content: err.message, variant: 'error' })
-    },
   })
   const form = useForm({ defaultValues: { floatingIp: '' } })
   const floatingIp = form.watch('floatingIp')

app/components/Terminal.tsx

@@ -38,6 +38,7 @@ function getTheme(): ITerminalOptions['theme'] {
     brightCyan: style.getPropertyValue('--content-accent'),
     magenta: style.getPropertyValue('--content-accent-alt-secondary'),
     brightMagenta: style.getPropertyValue('--content-accent-alt'),
+    selectionBackground: style.getPropertyValue('--surface-accent'),
     cursor: style.getPropertyValue('--content-default'),
     cursorAccent: style.getPropertyValue('--surface-default'),
   }

app/pages/project/instances/InstancePage.tsx

@@ -301,9 +301,6 @@ export function ResizeInstanceModal({
           : undefined, // Only link to the instance if we're not already on that page
       })
     },
-    onError: (err) => {
-      addToast({ title: 'Error', content: err.message, variant: 'error' })
-    },
   })
 
   const form = useForm({

app/ui/lib/ActionMenu.tsx

@@ -109,11 +109,11 @@ export function ActionMenu(props: ActionMenuProps) {
                   e.preventDefault()
                   onDismiss()
                 }
-              } else if (e.key === KEYS.down || (e.ctrlKey && e.key === 'n')) {
+              } else if (e.key === KEYS.down) {
                 e.preventDefault()
                 const newIdx = selectedIdx === lastIdx ? 0 : selectedIdx + 1
                 setSelectedIdx(newIdx)
-              } else if (e.key === KEYS.up || (e.ctrlKey && e.key === 'p')) {
+              } else if (e.key === KEYS.up) {
                 e.preventDefault()
                 const newIdx = selectedIdx === 0 ? lastIdx : selectedIdx - 1
                 setSelectedIdx(newIdx)

app/ui/lib/Combobox.tsx

@@ -252,7 +252,7 @@ export const Combobox = ({
               {items.length > 0 && (
                 <ComboboxButton
                   className={cn(
-                    'border-secondary my-1.5 flex items-center border-l px-3',
+                    'relative flex items-center px-3 before:absolute before:inset-y-1.5 before:left-0 before:w-px before:content-[""] before:bg-(--stroke-secondary)',
                     disabled ? 'bg-disabled cursor-not-allowed' : 'bg-default'
                   )}
                   aria-hidden

app/ui/lib/Progress.tsx

@@ -25,7 +25,7 @@ export const Progress = (props: ProgressProps) => (
     {...ariaLabel(props)}
   >
     <div
-      className="bg-accent h-1 rounded-[1px]"
+      className="bg-accent-inverse h-1 rounded-[1px]"
       style={{
         width: `${props.value}%`,
         transition:

app/ui/styles/index.css

@@ -75,11 +75,11 @@
 
 ::-moz-selection {
   /* Code for Firefox */
-  @apply text-accent bg-accent;
+  @apply bg-accent-inverse/30;
 }
 
 ::selection {
-  @apply text-accent bg-accent;
+  @apply bg-accent-inverse/30;
 }
 
 @custom-variant selected {

mock-api/msw/db.ts

@@ -68,23 +68,23 @@ export const resolvePoolSelector = (
     | { pool: string; type: 'explicit' }
     | { type: 'auto'; ip_version?: IpVersion | null }
     | undefined,
-  poolType?: IpPoolType
+  poolType: IpPoolType,
+  siloId: string = defaultSilo.id
 ) => {
   if (poolSelector?.type === 'explicit') {
     return lookup.ipPool({ pool: poolSelector.pool })
   }
 
   // For 'auto' type, find the default pool for the specified IP version and pool type
-  const silo = lookup.silo({ silo: defaultSilo.id })
+  const silo = lookup.silo({ silo: siloId })
   const links = db.ipPoolSilos.filter((ips) => ips.silo_id === silo.id && ips.is_default)
 
   // Filter candidate pools by both IP version and pool type
   const candidateLinks = links.filter((ips) => {
     const pool = db.ipPools.find((p) => p.id === ips.ip_pool_id)
     if (!pool) return false
 
-    // If poolType specified, filter by it
-    if (poolType && pool.pool_type !== poolType) return false
+    if (pool.pool_type !== poolType) return false
 
     // If IP version specified, filter by it
     if (poolSelector?.ip_version && pool.ip_version !== poolSelector.ip_version) {
@@ -106,9 +106,8 @@ export const resolvePoolSelector = (
 
   const link = candidateLinks[0]
   if (!link) {
-    const typeStr = poolType ? ` ${poolType}` : ''
     const versionStr = poolSelector?.ip_version ? ` ${poolSelector.ip_version}` : ''
-    throw notFoundErr(`default${typeStr}${versionStr} pool for silo '${defaultSilo.id}'`)
+    throw notFoundErr(`default ${poolType}${versionStr} pool for silo '${siloId}'`)
   }
   return lookupById(db.ipPools, link.ip_pool_id)
 }