Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ui,dashboard): Add DataTable block #10024

Open
wants to merge 54 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
6c7641b
init work
kasperkristensen Oct 23, 2024
3ac7a5c
progress on column helper
kasperkristensen Oct 24, 2024
8988ec0
add hotkey
kasperkristensen Oct 25, 2024
07aaef9
Merge branch 'develop' into feat/data-table-medusa-ui
kasperkristensen Oct 29, 2024
5db3150
init work on filters
kasperkristensen Nov 4, 2024
790343b
Merge branch 'develop' into feat/data-table-medusa-ui
kasperkristensen Nov 4, 2024
8ab528d
progress
kasperkristensen Nov 4, 2024
63b59e0
sticky header and columns
kasperkristensen Nov 5, 2024
34ee59f
progress on filters
kasperkristensen Nov 6, 2024
77dd452
progress
kasperkristensen Nov 7, 2024
cdd7e93
cleanp
kasperkristensen Nov 7, 2024
6648f04
work on setting up component in admin
kasperkristensen Nov 8, 2024
6fe5e35
Merge branch 'develop' into feat/data-table-medusa-ui
kasperkristensen Nov 8, 2024
91031d2
save
kasperkristensen Nov 8, 2024
28cc824
add example usage
kasperkristensen Nov 11, 2024
264eb2d
Merge branch 'develop' into feat/data-table-medusa-ui
kasperkristensen Nov 11, 2024
7d4b3e6
add skeleton and cleanup types
kasperkristensen Nov 11, 2024
c42b042
add changeset
kasperkristensen Nov 11, 2024
da444f7
cleanup
kasperkristensen Nov 11, 2024
eaf8284
progress on custom date filter
kasperkristensen Nov 11, 2024
d1c4c44
progress
kasperkristensen Nov 11, 2024
b337773
rename fn
kasperkristensen Nov 11, 2024
283c15a
fix custom date filter
kasperkristensen Nov 12, 2024
363ad35
Merge branch 'develop' into feat/data-table-medusa-ui
kasperkristensen Nov 12, 2024
4eabca5
fix tanstack table version
kasperkristensen Nov 12, 2024
2fbb56c
Merge branch 'feat/data-table-medusa-ui' of https://github.com/medusa…
kasperkristensen Nov 12, 2024
111838d
cleanup changesets
kasperkristensen Nov 12, 2024
064da8c
add filtering labels to i18n
kasperkristensen Nov 12, 2024
d758763
mobile styling
kasperkristensen Nov 12, 2024
fb01408
fix error on non interactive select column, and add lazy delete custo…
kasperkristensen Nov 12, 2024
c81766e
Merge branch 'develop' into feat/data-table-medusa-ui
kasperkristensen Nov 13, 2024
9116fe5
fix loading state
kasperkristensen Nov 13, 2024
1e0f329
Merge branch 'feat/data-table-medusa-ui' of https://github.com/medusa…
kasperkristensen Nov 13, 2024
02fd54b
Merge branch 'develop' into feat/data-table-medusa-ui
kasperkristensen Nov 13, 2024
1ed5739
add rowHref
kasperkristensen Nov 13, 2024
4b88cfa
Merge branch 'feat/data-table-medusa-ui' of https://github.com/medusa…
kasperkristensen Nov 13, 2024
e23d97c
norefferer
kasperkristensen Nov 14, 2024
914aa16
Merge branch 'develop' into feat/data-table-medusa-ui
kasperkristensen Nov 14, 2024
d714504
Merge branch 'develop' into feat/data-table-medusa-ui
srindom Nov 15, 2024
5ffcf98
Merge branch 'develop' into feat/data-table-medusa-ui
kasperkristensen Nov 19, 2024
4056222
Merge branch 'develop' into feat/data-table-medusa-ui
kasperkristensen Nov 21, 2024
b8ee9b3
add errors when rendering state components without passing state
kasperkristensen Nov 21, 2024
bd2f60f
Merge branch 'feat/data-table-medusa-ui' of https://github.com/medusa…
kasperkristensen Nov 21, 2024
ae461ef
init work on improved filtering
kasperkristensen Nov 25, 2024
cf0e438
Merge branch 'develop' into feat/data-table-medusa-ui
kasperkristensen Nov 26, 2024
498cb2d
fix: filter rerenders
kasperkristensen Nov 26, 2024
3fc1731
cleanup
kasperkristensen Nov 26, 2024
ed003e9
Merge branch 'develop' into feat/data-table-medusa-ui
kasperkristensen Dec 5, 2024
508ea18
Merge branch 'develop' into feat/data-table-medusa-ui
kasperkristensen Jan 10, 2025
7da65e7
fix actions padding and add callback as option for creating actions
kasperkristensen Jan 13, 2025
f4ef179
Merge branch 'develop' into feat/data-table-medusa-ui
kasperkristensen Jan 13, 2025
32e6815
fix action divider for functions
kasperkristensen Jan 13, 2025
a0f0c49
cleanup
kasperkristensen Jan 13, 2025
51f97f1
Merge branch 'develop' into feat/data-table-medusa-ui
kasperkristensen Jan 13, 2025
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
6 changes: 6 additions & 0 deletions .changeset/wild-zebras-hammer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@medusajs/ui": patch
"@medusajs/dashboard": patch
---

feat(ui,dashboard): Add new DataTable block
19 changes: 15 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ module.exports = {
"./packages/admin/admin-bundler/tsconfig.json",
"./packages/admin/admin-vite-plugin/tsconfig.json",

"./packages/design-system/ui/tsconfig.json",
"./packages/design-system/icons/tsconfig.json",
"./packages/design-system/ui-preset/tsconfig.json",
"./packages/design-system/toolbox/tsconfig.json",

"./packages/cli/create-medusa-app/tsconfig.json",
"./packages/cli/medusa-cli/tsconfig.spec.json",
"./packages/cli/oas/medusa-oas-cli/tsconfig.spec.json",
Expand Down Expand Up @@ -167,7 +172,10 @@ module.exports = {
},
},
{
files: ["packages/design-system/ui/**/*.{ts,tsx}"],
files: [
"./packages/design-system/ui/**/*.ts",
"./packages/design-system/ui/**/*.tsx",
],
extends: [
"plugin:react/recommended",
"plugin:storybook/recommended",
Expand Down Expand Up @@ -196,7 +204,10 @@ module.exports = {
},
},
{
files: ["packages/design-system/icons/**/*.{ts,tsx}"],
files: [
"./packages/design-system/icons/**/*.ts",
"./packages/design-system/icons/**/*.tsx",
],
extends: [
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
Expand All @@ -223,8 +234,8 @@ module.exports = {
},
{
files: [
"packages/admin/dashboard/**/*.ts",
"packages/admin/dashboard/**/*.tsx",
"./packages/admin/dashboard/**/*.ts",
"./packages/admin/dashboard/**/*.tsx",
],
plugins: ["unused-imports", "react-refresh"],
extends: [
Expand Down
8 changes: 7 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@
"arrowParens": "always",
"overrides": [
{
"files": "./packages/admin-ui/**/*.{js,jsx,ts,tsx}",
"files": "./packages/admin/dashboard/src/**/*.{ts,tsx}",
"options": {
"plugins": ["prettier-plugin-tailwindcss"]
}
},
{
"files": "./packages/design-system/ui/src/**/*.{ts,tsx}",
"options": {
"plugins": ["prettier-plugin-tailwindcss"]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,16 @@ export type ActionGroup = {

type ActionMenuProps = PropsWithChildren<{
groups: ActionGroup[]
variant?: "transparent" | "primary"
}>

export const ActionMenu = ({ groups, children }: ActionMenuProps) => {
export const ActionMenu = ({
groups,
variant = "transparent",
children,
}: ActionMenuProps) => {
const inner = children ?? (
<IconButton size="small" variant="transparent">
<IconButton size="small" variant={variant}>
<EllipsisHorizontal />
</IconButton>
)
Expand Down
Loading
Loading