From a0053335a63da839687078cb26eb437f6afefa83 Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Thu, 15 Aug 2024 08:14:23 +0200 Subject: [PATCH] chore: cleanup --- server/routers/contentstack/contentPage/query.ts | 3 ++- server/routers/contentstack/contentPage/utils.ts | 9 --------- server/routers/contentstack/loyaltyPage/query.ts | 3 ++- server/routers/contentstack/loyaltyPage/utils.ts | 9 --------- utils/imageVault.ts | 6 ++++++ 5 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 server/routers/contentstack/contentPage/utils.ts diff --git a/server/routers/contentstack/contentPage/query.ts b/server/routers/contentstack/contentPage/query.ts index 845dd89e3..8aa03e162 100644 --- a/server/routers/contentstack/contentPage/query.ts +++ b/server/routers/contentstack/contentPage/query.ts @@ -4,12 +4,13 @@ import { request } from "@/lib/graphql/request" import { notFound } from "@/server/errors/trpc" import { contentstackExtendedProcedureUID, router } from "@/server/trpc" +import { makeImageVaultImage } from "@/utils/imageVault" + import { ContentPage, ContentPageDataRaw, validateContentPageSchema, } from "./output" -import { makeImageVaultImage } from "./utils" import { TrackingChannelEnum, diff --git a/server/routers/contentstack/contentPage/utils.ts b/server/routers/contentstack/contentPage/utils.ts deleted file mode 100644 index d2f748d93..000000000 --- a/server/routers/contentstack/contentPage/utils.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { insertResponseToImageVaultAsset } from "@/utils/imageVault" - -import { InsertResponse } from "@/types/components/imageVaultImage" - -export function makeImageVaultImage(image: any) { - return image && !!Object.keys(image).length - ? insertResponseToImageVaultAsset(image as InsertResponse) - : undefined -} diff --git a/server/routers/contentstack/loyaltyPage/query.ts b/server/routers/contentstack/loyaltyPage/query.ts index 5fea2a8dd..6839f1ced 100644 --- a/server/routers/contentstack/loyaltyPage/query.ts +++ b/server/routers/contentstack/loyaltyPage/query.ts @@ -12,6 +12,7 @@ import { generateTag, generateTags, } from "@/utils/generateTag" +import { makeImageVaultImage } from "@/utils/imageVault" import { removeMultipleSlashes } from "@/utils/url" import { removeEmptyObjects } from "../../utils" @@ -21,7 +22,7 @@ import { validateLoyaltyPageRefsSchema, validateLoyaltyPageSchema, } from "./output" -import { getConnections, makeButtonObject, makeImageVaultImage } from "./utils" +import { getConnections, makeButtonObject } from "./utils" import { LoyaltyBlocksTypenameEnum, diff --git a/server/routers/contentstack/loyaltyPage/utils.ts b/server/routers/contentstack/loyaltyPage/utils.ts index 99e66571d..1b473210a 100644 --- a/server/routers/contentstack/loyaltyPage/utils.ts +++ b/server/routers/contentstack/loyaltyPage/utils.ts @@ -1,9 +1,7 @@ -import { insertResponseToImageVaultAsset } from "@/utils/imageVault" import { removeMultipleSlashes } from "@/utils/url" import { LoyaltyPageRefsDataRaw } from "./output" -import { InsertResponse } from "@/types/components/imageVaultImage" import { LoyaltyBlocksTypenameEnum, LoyaltyCardsGridEnum, @@ -81,13 +79,6 @@ export function getConnections(refs: LoyaltyPageRefsDataRaw) { return connections } - -export function makeImageVaultImage(image: any) { - return image && !!Object.keys(image).length - ? insertResponseToImageVaultAsset(image as InsertResponse) - : undefined -} - export function makeButtonObject(button: any) { if (!button) return null diff --git a/utils/imageVault.ts b/utils/imageVault.ts index a6aaba6c7..9e8a0a414 100644 --- a/utils/imageVault.ts +++ b/utils/imageVault.ts @@ -29,3 +29,9 @@ export function insertResponseToImageVaultAsset( }, } } + +export function makeImageVaultImage(image: any) { + return image && !!Object.keys(image).length + ? insertResponseToImageVaultAsset(image as InsertResponse) + : undefined +}