From a6f871ab2dd43beee05d7b8f8dcea7cfe0a6267a Mon Sep 17 00:00:00 2001 From: Sara Vieira Date: Sun, 17 Jul 2022 16:30:51 +0200 Subject: [PATCH 1/4] rename file --- .../panels/{image-upload.tsx => asset-manager.tsx} | 0 .../app/designer/features/sidebar-left/panels/index.ts | 4 ++-- .../app/designer/features/sidebar-left/sidebar-left.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename apps/designer/app/designer/features/sidebar-left/panels/{image-upload.tsx => asset-manager.tsx} (100%) diff --git a/apps/designer/app/designer/features/sidebar-left/panels/image-upload.tsx b/apps/designer/app/designer/features/sidebar-left/panels/asset-manager.tsx similarity index 100% rename from apps/designer/app/designer/features/sidebar-left/panels/image-upload.tsx rename to apps/designer/app/designer/features/sidebar-left/panels/asset-manager.tsx diff --git a/apps/designer/app/designer/features/sidebar-left/panels/index.ts b/apps/designer/app/designer/features/sidebar-left/panels/index.ts index 8b7896fe93..40ae1c16af 100644 --- a/apps/designer/app/designer/features/sidebar-left/panels/index.ts +++ b/apps/designer/app/designer/features/sidebar-left/panels/index.ts @@ -1,5 +1,5 @@ import * as components from "./components"; import * as tree from "./tree"; -import * as imageUpload from "./image-upload"; +import * as assetManager from "./asset-manager"; -export const panels = { components, tree, imageUpload } as const; +export const panels = { components, tree, assetManager } as const; diff --git a/apps/designer/app/designer/features/sidebar-left/sidebar-left.tsx b/apps/designer/app/designer/features/sidebar-left/sidebar-left.tsx index 34341be7c7..0fb79debfa 100644 --- a/apps/designer/app/designer/features/sidebar-left/sidebar-left.tsx +++ b/apps/designer/app/designer/features/sidebar-left/sidebar-left.tsx @@ -68,7 +68,7 @@ export const SidebarLeft = ({ const enabledPanels = ( isFeatureEnabled("assets") ? Object.keys(panels) - : Object.keys(panels).filter((panel) => panel !== "imageUpload") + : Object.keys(panels).filter((panel) => panel !== "assetManager") ) as Array; return ( From c6e54505b06d215e30438dba341b0c1b0fee272b Mon Sep 17 00:00:00 2001 From: Sara Vieira Date: Sun, 17 Jul 2022 16:31:47 +0200 Subject: [PATCH 2/4] fix order --- apps/designer/app/shared/db/assets.server.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/designer/app/shared/db/assets.server.ts b/apps/designer/app/shared/db/assets.server.ts index 7c0f1c0a0a..7b8e02f7dd 100644 --- a/apps/designer/app/shared/db/assets.server.ts +++ b/apps/designer/app/shared/db/assets.server.ts @@ -9,6 +9,9 @@ export const loadByProject = async (projectId?: Project["id"]) => { const assets = await prisma.asset.findMany({ where: { projectId }, + orderBy: { + createdAt: "desc", + }, }); return assets; From ce011f25a235b10974621ba6a7746c0023ac3a7b Mon Sep 17 00:00:00 2001 From: Sara Vieira Date: Sun, 17 Jul 2022 16:32:15 +0200 Subject: [PATCH 3/4] reset form on change --- .../features/sidebar-left/panels/asset-manager.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/designer/app/designer/features/sidebar-left/panels/asset-manager.tsx b/apps/designer/app/designer/features/sidebar-left/panels/asset-manager.tsx index b99d75c741..c74c26a5b2 100644 --- a/apps/designer/app/designer/features/sidebar-left/panels/asset-manager.tsx +++ b/apps/designer/app/designer/features/sidebar-left/panels/asset-manager.tsx @@ -16,7 +16,12 @@ export const TabContent = ({ assets }: { assets: Array }) => {
submit(event.currentTarget)} + onChange={(event) => { + if (inputRef.current?.files) { + submit(event.currentTarget); + event.currentTarget.reset(); + } + }} > Date: Sun, 17 Jul 2022 17:32:37 +0200 Subject: [PATCH 4/4] force float --- apps/designer/app/shared/db/assets.server.ts | 8 ++++++-- .../migration.sql | 3 +++ apps/designer/prisma/schema.prisma | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 apps/designer/prisma/migrations/20220717152939_make_width_and_height_float/migration.sql diff --git a/apps/designer/app/shared/db/assets.server.ts b/apps/designer/app/shared/db/assets.server.ts index 7b8e02f7dd..5d5405603c 100644 --- a/apps/designer/app/shared/db/assets.server.ts +++ b/apps/designer/app/shared/db/assets.server.ts @@ -17,6 +17,10 @@ export const loadByProject = async (projectId?: Project["id"]) => { return assets; }; +const forceFloat = (number: number) => { + return parseFloat(Number(number).toFixed(1)); +}; + export const create = async ( projectId: Project["id"], values: { name: string; path: string; size: number; arrayBuffer: ArrayBuffer } @@ -30,8 +34,8 @@ export const create = async ( path: values.path, size: values.size, format: metadata.format, - ...(metadata.width ? { width: Math.round(metadata.width) } : {}), - ...(metadata.height ? { height: Math.round(metadata.height) } : {}), + ...(metadata.width ? { width: forceFloat(metadata.width) } : {}), + ...(metadata.height ? { height: forceFloat(metadata.height) } : {}), projectId, }, }); diff --git a/apps/designer/prisma/migrations/20220717152939_make_width_and_height_float/migration.sql b/apps/designer/prisma/migrations/20220717152939_make_width_and_height_float/migration.sql new file mode 100644 index 0000000000..ea90ad8d89 --- /dev/null +++ b/apps/designer/prisma/migrations/20220717152939_make_width_and_height_float/migration.sql @@ -0,0 +1,3 @@ +-- AlterTable +ALTER TABLE "Asset" ALTER COLUMN "height" SET DATA TYPE DOUBLE PRECISION, +ALTER COLUMN "width" SET DATA TYPE DOUBLE PRECISION; diff --git a/apps/designer/prisma/schema.prisma b/apps/designer/prisma/schema.prisma index daaaac3626..189a414d7b 100644 --- a/apps/designer/prisma/schema.prisma +++ b/apps/designer/prisma/schema.prisma @@ -21,8 +21,8 @@ model Asset { projectId String format String? size Int - width Int? - height Int? + width Float? + height Float? name String path String alt String?