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 ( diff --git a/apps/designer/app/routes/designer/$id.tsx b/apps/designer/app/routes/designer/$id.tsx index 6047c6b294..b39867b200 100644 --- a/apps/designer/app/routes/designer/$id.tsx +++ b/apps/designer/app/routes/designer/$id.tsx @@ -11,7 +11,6 @@ import { Designer, links } from "~/designer"; import * as db from "~/shared/db"; import config from "~/config"; import env from "~/env.server"; -import { ImagesUpload } from "~/designer/features/sidebar-left/types"; import { s3UploadHandler } from "~/shared/uploads/s3-upload-handler"; import { sentryException } from "~/shared/sentry"; import { uploadToS3 } from "~/shared/uploads/upload-to-s3"; diff --git a/apps/designer/app/shared/db/assets.server.ts b/apps/designer/app/shared/db/assets.server.ts index 740a7aacc8..020278cddd 100644 --- a/apps/designer/app/shared/db/assets.server.ts +++ b/apps/designer/app/shared/db/assets.server.ts @@ -9,11 +9,18 @@ export const loadByProject = async (projectId?: Project["id"]) => { const assets = await prisma.asset.findMany({ where: { projectId }, + orderBy: { + createdAt: "desc", + }, }); return assets; }; +const forceFloat = (number: number) => { + return parseFloat(Number(number).toFixed(1)); +}; + const createAssetInDb = async ( projectId: Project["id"], values: { @@ -31,8 +38,8 @@ const createAssetInDb = async ( path, 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?