Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export default {
'',
'^@oxide/(.*)$',
'',
'^~/(.*)$',
'^app/(.*)$',
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is about sorting ~/ into the right spot when prettier sorts and groups imports.

'',
'^[./]',
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { act, renderHook } from '@testing-library/react'
import { describe, expect, it } from 'vitest'

import { usePagination } from '../use-pagination'
import { usePagination } from './use-pagination'

describe('usePagination', () => {
it('starts with empty state', () => {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion app/layouts/helpers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
import { useRef } from 'react'
import { Outlet } from 'react-router-dom'

import { Pagination } from '@oxide/pagination'
import { SkipLinkTarget } from '@oxide/ui'
import { classed } from '@oxide/util'

import { Pagination } from '~/components/Pagination'
import { PageActionsTarget } from 'app/components/PageActions'
import { useScrollRestoration } from 'app/hooks/use-scroll-restoration'

Expand Down
4 changes: 3 additions & 1 deletion libs/table/QueryTable.tsx → app/table/QueryTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ import {
type Result,
type ResultItem,
} from '@oxide/api'
import { Pagination, usePagination } from '@oxide/pagination'
import { EmptyMessage, TableEmptyBox } from '@oxide/ui'
import { invariant, isOneOf } from '@oxide/util'

import { Pagination } from '~/components/Pagination'
import { usePagination } from '~/hooks/use-pagination'

import { DefaultCell } from './cells'
import { getActionsCol, getMultiSelectCol, getSelectCol, type MakeActions } from './columns'
import { Table } from './Table'
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 0 additions & 10 deletions libs/pagination/index.ts

This file was deleted.

4 changes: 2 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"noEmit": true,
"outDir": "dist",
"paths": {
"~/*": ["app/*"],
"app/*": ["app/*"],
"@oxide/gen/*": ["libs/api/__generated__/*"],
"@oxide/api": ["libs/api/index.ts"],
"@oxide/api-mocks": ["libs/api-mocks/index.ts"],
"@oxide/ui": ["libs/ui/index.ts"],
"@oxide/util": ["libs/util/index.ts"],
"@oxide/table": ["libs/table/index.ts"],
"@oxide/pagination": ["libs/pagination/index.ts"]
"@oxide/table": ["app/table/index.ts"]
},
"resolveJsonModule": true,
"rootDir": ".",
Expand Down