Move libs/table and libs/pagination into app/ (#1971)

move libs/table and libs/pagination into app/
oxidecomputer · Feb 23, 2024 · 4bfd227 · 4bfd227
1 parent cb109cb
commit 4bfd227
Show file tree

Hide file tree

Showing 34 changed files with 8 additions and 15 deletions.
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -18,6 +18,7 @@ export default {
     '',
     '^@oxide/(.*)$',
     '',
+    '^~/(.*)$',
     '^app/(.*)$',
     '',
     '^[./]',

diff --git a/libs/pagination/Pagination.tsx → app/components/Pagination.tsx b/libs/pagination/Pagination.tsx → app/components/Pagination.tsx
diff --git a/...gination/__tests__/use-pagination.spec.ts → app/hooks/use-pagination.spec.ts b/...gination/__tests__/use-pagination.spec.ts → app/hooks/use-pagination.spec.ts
@@ -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', () => {

diff --git a/libs/pagination/use-pagination.tsx → app/hooks/use-pagination.ts b/libs/pagination/use-pagination.tsx → app/hooks/use-pagination.ts
diff --git a/app/layouts/helpers.tsx b/app/layouts/helpers.tsx
@@ -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'
 

diff --git a/libs/table/QueryTable.tsx → app/table/QueryTable.tsx b/libs/table/QueryTable.tsx → app/table/QueryTable.tsx
@@ -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'

diff --git a/libs/table/Table.tsx → app/table/Table.tsx b/libs/table/Table.tsx → app/table/Table.tsx
diff --git a/libs/table/cells/BooleanCell.tsx → app/table/cells/BooleanCell.tsx b/libs/table/cells/BooleanCell.tsx → app/table/cells/BooleanCell.tsx
diff --git a/libs/table/cells/Cell.tsx → app/table/cells/Cell.tsx b/libs/table/cells/Cell.tsx → app/table/cells/Cell.tsx
diff --git a/libs/table/cells/DateCell.tsx → app/table/cells/DateCell.tsx b/libs/table/cells/DateCell.tsx → app/table/cells/DateCell.tsx
diff --git a/libs/table/cells/DefaultCell.tsx → app/table/cells/DefaultCell.tsx b/libs/table/cells/DefaultCell.tsx → app/table/cells/DefaultCell.tsx
diff --git a/libs/table/cells/EmptyCell.tsx → app/table/cells/EmptyCell.tsx b/libs/table/cells/EmptyCell.tsx → app/table/cells/EmptyCell.tsx
diff --git a/libs/table/cells/EnabledCell.tsx → app/table/cells/EnabledCell.tsx b/libs/table/cells/EnabledCell.tsx → app/table/cells/EnabledCell.tsx
diff --git a/libs/table/cells/FirewallFilterCell.tsx → app/table/cells/FirewallFilterCell.tsx b/libs/table/cells/FirewallFilterCell.tsx → app/table/cells/FirewallFilterCell.tsx
diff --git a/libs/table/cells/InstanceLinkCell.tsx → app/table/cells/InstanceLinkCell.tsx b/libs/table/cells/InstanceLinkCell.tsx → app/table/cells/InstanceLinkCell.tsx
diff --git a/libs/table/cells/InstanceResourceCell.tsx → app/table/cells/InstanceResourceCell.tsx b/libs/table/cells/InstanceResourceCell.tsx → app/table/cells/InstanceResourceCell.tsx
diff --git a/libs/table/cells/InstanceStatusCell.tsx → app/table/cells/InstanceStatusCell.tsx b/libs/table/cells/InstanceStatusCell.tsx → app/table/cells/InstanceStatusCell.tsx
diff --git a/libs/table/cells/LabelCell.tsx → app/table/cells/LabelCell.tsx b/libs/table/cells/LabelCell.tsx → app/table/cells/LabelCell.tsx
diff --git a/libs/table/cells/LinkCell.tsx → app/table/cells/LinkCell.tsx b/libs/table/cells/LinkCell.tsx → app/table/cells/LinkCell.tsx
diff --git a/libs/table/cells/SizeCell.tsx → app/table/cells/SizeCell.tsx b/libs/table/cells/SizeCell.tsx → app/table/cells/SizeCell.tsx
diff --git a/libs/table/cells/TruncateCell.tsx → app/table/cells/TruncateCell.tsx b/libs/table/cells/TruncateCell.tsx → app/table/cells/TruncateCell.tsx
diff --git a/libs/table/cells/TwoLineCell.tsx → app/table/cells/TwoLineCell.tsx b/libs/table/cells/TwoLineCell.tsx → app/table/cells/TwoLineCell.tsx
diff --git a/libs/table/cells/TypeValueCell.tsx → app/table/cells/TypeValueCell.tsx b/libs/table/cells/TypeValueCell.tsx → app/table/cells/TypeValueCell.tsx
diff --git a/libs/table/cells/TypeValueListCell.tsx → app/table/cells/TypeValueListCell.tsx b/libs/table/cells/TypeValueListCell.tsx → app/table/cells/TypeValueListCell.tsx
diff --git a/libs/table/cells/index.ts → app/table/cells/index.ts b/libs/table/cells/index.ts → app/table/cells/index.ts
diff --git a/libs/table/columns/action-col.tsx → app/table/columns/action-col.tsx b/libs/table/columns/action-col.tsx → app/table/columns/action-col.tsx
diff --git a/libs/table/columns/index.ts → app/table/columns/index.ts b/libs/table/columns/index.ts → app/table/columns/index.ts
diff --git a/libs/table/columns/select-col.tsx → app/table/columns/select-col.tsx b/libs/table/columns/select-col.tsx → app/table/columns/select-col.tsx
diff --git a/libs/table/headers/DefaultHeader.tsx → app/table/headers/DefaultHeader.tsx b/libs/table/headers/DefaultHeader.tsx → app/table/headers/DefaultHeader.tsx
diff --git a/libs/table/headers/index.ts → app/table/headers/index.ts b/libs/table/headers/index.ts → app/table/headers/index.ts
diff --git a/libs/table/index.ts → app/table/index.ts b/libs/table/index.ts → app/table/index.ts
diff --git a/libs/table/react-table.ts → app/table/react-table.ts b/libs/table/react-table.ts → app/table/react-table.ts
diff --git a/libs/pagination/index.ts b/libs/pagination/index.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -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": ".",