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
24 changes: 9 additions & 15 deletions app/admin/add-barometer/barometer-form.schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ import type { Prisma } from '@prisma/client'
import dayjs from 'dayjs'
import utc from 'dayjs/plugin/utc'
import { z } from 'zod'
import { imageStorage } from '@/constants/globals'
import { saveTempImage } from '@/server/images/actions'
import { createImagesInDb, saveTempImage } from '@/server/images/actions'
import { ImageType } from '@/types'
import { getThumbnailBase64, slug } from '@/utils'
import { slug } from '@/utils'

dayjs.extend(utc)

Expand Down Expand Up @@ -115,18 +114,13 @@ export const BarometerFormTransformSchema = BarometerFormValidationSchema.transf
images:
formData.images.length > 0
? {
create: await Promise.all(
formData.images.map(async (url, i) => {
const newUrl = await saveTempImage(url, ImageType.Barometer, formData.collectionId)
return {
url: newUrl,
order: i,
name: formData.name,
// ! это будет долго качать уже загруженные фотки. изменить алгоритм
// хорошо бы чтобы в форме были сами файлы чтобы не качать картинки
blurData: await getThumbnailBase64(imageStorage + newUrl),
}
}),
connect: await createImagesInDb(
await Promise.all(
formData.images.map(url =>
saveTempImage(url, ImageType.Barometer, formData.collectionId),
),
),
formData.name,
),
}
: undefined,
Expand Down
18 changes: 5 additions & 13 deletions app/admin/add-brand/brand-add-schema.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { z } from 'zod'
import { imageStorage } from '@/constants'
import { saveTempImage } from '@/server/images/actions'
import { createImagesInDb, saveTempImage } from '@/server/images/actions'
import { ImageType } from '@/types'
import { getBrandSlug, getThumbnailBase64 } from '@/utils'
import { getBrandSlug } from '@/utils'

// Zod validation schema
const brandSchema = z.object({
Expand Down Expand Up @@ -40,16 +39,9 @@ const brandTransformSchema = brandSchema.transform(
images:
images.length > 0
? {
create: await Promise.all(
images.map(async (url, i) => {
const permanentUrl = await saveTempImage(url, ImageType.Brand, slug)
return {
url: permanentUrl,
order: i,
name: formData.name,
blurData: await getThumbnailBase64(imageStorage + permanentUrl),
}
}),
connect: await createImagesInDb(
await Promise.all(images.map(url => saveTempImage(url, ImageType.Brand, slug))),
formData.name,
),
}
: undefined,
Expand Down
25 changes: 8 additions & 17 deletions app/admin/add-document/document-form.schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ import type { Prisma } from '@prisma/client'
import dayjs from 'dayjs'
import utc from 'dayjs/plugin/utc'
import { z } from 'zod'
import { imageStorage } from '@/constants/globals'
import { saveTempImage } from '@/server/images/actions'
import { createImagesInDb, saveTempImage } from '@/server/images/actions'
import { ImageType } from '@/types'
import { getThumbnailBase64 } from '@/utils'

dayjs.extend(utc)

Expand Down Expand Up @@ -89,20 +87,13 @@ export const DocumentFormTransformSchema = DocumentFormValidationSchema.transfor
images:
images.length > 0
? {
create: await Promise.all(
images.map(async (url, i) => {
const permanentUrl = await saveTempImage(
url,
ImageType.Document,
values.catalogueNumber,
)
return {
url: permanentUrl,
order: i,
name: formValues.title,
blurData: await getThumbnailBase64(imageStorage + permanentUrl),
}
}),
connect: await createImagesInDb(
await Promise.all(
values.images.map(url =>
saveTempImage(url, ImageType.Document, values.catalogueNumber),
),
),
values.title,
),
}
: undefined,
Expand Down
25 changes: 9 additions & 16 deletions app/brands/brand-edit-schema.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { z } from 'zod'
import { imageStorage } from '@/constants'
import type { updateBrand } from '@/server/brands/actions'
import { saveTempImage } from '@/server/images/actions'
import { createImagesInDb, saveTempImage } from '@/server/images/actions'
import { ImageType } from '@/types'
import { getBrandSlug, getThumbnailBase64 } from '@/utils'
import { getBrandSlug } from '@/utils'

// Schema for form validation (input)
export const BrandEditSchema = z.object({
Expand Down Expand Up @@ -39,19 +38,13 @@ export const BrandEditTransformSchema = BrandEditSchema.transform(
slug,
images: {
deleteMany: {},
create: await Promise.all(
images.map(async (url, i) => {
const imageUrl = url.startsWith('temp/')
? await saveTempImage(url, ImageType.Brand, slug)
: url
const blurData = await getThumbnailBase64(imageStorage + imageUrl)
return {
url: imageUrl,
order: i,
name: values.name,
blurData,
}
}),
connect: await createImagesInDb(
await Promise.all(
images.map(async url =>
url.startsWith('temp/') ? await saveTempImage(url, ImageType.Brand, slug) : url,
),
),
values.name,
),
},
successors: {
Expand Down
Loading
Loading