return full asset object

Author: eunjae-lee

packages/field-plugin/src/createFieldPlugin/createPluginActions/createPluginActions.test.ts

@@ -231,15 +231,19 @@ describe('createPluginActions', () => {
         field: 'dummy',
         callbackId: TEST_CALLBACK_ID,
         filename,
-        fieldtype: 'asset',
-        name: '',
-        meta_data: {},
-        title: '',
-        copyright: '',
-        focus: '',
-        alt: '',
-        source: '',
-        is_private: false,
+        asset: {
+          id: 0,
+          fieldtype: 'asset',
+          name: '',
+          filename: '',
+          meta_data: {},
+          title: '',
+          copyright: '',
+          focus: '',
+          alt: '',
+          source: '',
+          is_private: false,
+        },
       })
       const result = await promise
       expect(result).toEqual({
@@ -275,15 +279,19 @@ describe('createPluginActions', () => {
         field: 'dummy',
         callbackId: WRONG_CALLBACK_ID,
         filename,
-        fieldtype: 'asset',
-        name: '',
-        meta_data: {},
-        title: '',
-        copyright: '',
-        focus: '',
-        alt: '',
-        source: '',
-        is_private: false,
+        asset: {
+          id: 0,
+          fieldtype: 'asset',
+          name: '',
+          filename: '',
+          meta_data: {},
+          title: '',
+          copyright: '',
+          focus: '',
+          alt: '',
+          source: '',
+          is_private: false,
+        },
       })
       const resolvedFn = jest.fn()
       const rejectedFn = jest.fn()

packages/field-plugin/src/createFieldPlugin/createPluginActions/createPluginMessageListener/handlePluginMessage.test.ts

@@ -95,15 +95,19 @@ describe('handlePluginMessage', () => {
       filename: '/my-file.jpg',
       field: 'callback-uid',
       callbackId: 'test-callback-id',
-      fieldtype: 'asset',
-      name: '',
-      meta_data: {},
-      title: '',
-      copyright: '',
-      focus: '',
-      alt: '',
-      source: '',
-      is_private: false,
+      asset: {
+        id: 0,
+        fieldtype: 'asset',
+        name: '',
+        filename: '',
+        meta_data: {},
+        title: '',
+        copyright: '',
+        focus: '',
+        alt: '',
+        source: '',
+        is_private: false,
+      },
     }
     const callbacks = mockCallbacks()
     handlePluginMessage(data, uid, callbacks)

packages/field-plugin/src/messaging/pluginMessage/containerToPluginMessage/Asset.test.ts

@@ -1,17 +1,21 @@
-import { Asset, assetFromAssetSelectedMessage, isAsset } from './Asset'
+import { AssetWrapper, assetFromAssetSelectedMessage, isAsset } from './Asset'
 import { AssetSelectedMessage } from './AssetSelectedMessage'
 
-const stub: Asset = {
+const stub: AssetWrapper = {
   filename: 'https://somthing.com/myimage.jpg',
-  fieldtype: 'asset',
-  name: '',
-  meta_data: {},
-  title: '',
-  copyright: '',
-  focus: '',
-  alt: '',
-  source: '',
-  is_private: false,
+  asset: {
+    id: 0,
+    fieldtype: 'asset',
+    name: '',
+    filename: '',
+    meta_data: {},
+    title: '',
+    copyright: '',
+    focus: '',
+    alt: '',
+    source: '',
+    is_private: false,
+  },
 }
 
 const assetSelectedMessage: AssetSelectedMessage = {
@@ -20,15 +24,19 @@ const assetSelectedMessage: AssetSelectedMessage = {
   callbackId: 'test-callback-id',
   action: 'asset-selected',
   filename: 'https://somthing.com/myimage.jpg',
-  fieldtype: 'asset',
-  name: '',
-  meta_data: {},
-  title: '',
-  copyright: '',
-  focus: '',
-  alt: '',
-  source: '',
-  is_private: false,
+  asset: {
+    id: 0,
+    fieldtype: 'asset',
+    name: '',
+    filename: '',
+    meta_data: {},
+    title: '',
+    copyright: '',
+    focus: '',
+    alt: '',
+    source: '',
+    is_private: false,
+  },
 }
 
 describe('Asset', function () {

packages/field-plugin/src/messaging/pluginMessage/containerToPluginMessage/Asset.ts

@@ -1,31 +1,37 @@
 import { hasKey } from '../../../utils'
 import { AssetSelectedMessage } from './AssetSelectedMessage'
 
-export type Asset = {
+export type AssetWrapper = {
   filename: string
+  asset: Asset
+}
+
+export type Asset = {
+  id: number
   fieldtype: 'asset'
+  filename: string
   name: string
-  meta_data: Record<string, string>
+  meta_data?: Record<string, unknown>
   title: string
   copyright: string
   focus: string
   alt: string
-  source: string
-  is_private: boolean
+  source?: string
+  is_external_url?: boolean
+  is_private?: boolean
+  src?: string
+  updated_at?: string
 }
 
-export const isAsset = (data: unknown): data is Asset =>
-  hasKey(data, 'filename') && typeof data.filename === 'string'
+export const isAsset = (data: unknown): data is AssetWrapper =>
+  hasKey(data, 'filename') &&
+  typeof data.filename === 'string' &&
+  hasKey(data, 'asset') &&
+  typeof data.asset === 'object'
 
 export const assetFromAssetSelectedMessage = (
   message: AssetSelectedMessage,
 ): Asset => {
-  const {
-    uid: _uid,
-    action: _action,
-    field: _field,
-    callbackId: _callbackId,
-    ...asset
-  } = message
+  const { asset } = message
   return asset
 }

packages/field-plugin/src/messaging/pluginMessage/containerToPluginMessage/AssetSelectedMessage.test.ts

@@ -10,15 +10,19 @@ const stub: AssetSelectedMessage = {
   field: 'dummy-field',
   callbackId: 'test-callback-id',
   filename: 'https://somthing.com/myimage.jpg',
-  fieldtype: 'asset',
-  name: '',
-  meta_data: {},
-  title: '',
-  copyright: '',
-  focus: '',
-  alt: '',
-  source: '',
-  is_private: false,
+  asset: {
+    id: 0,
+    fieldtype: 'asset',
+    name: '',
+    filename: '',
+    meta_data: {},
+    title: '',
+    copyright: '',
+    focus: '',
+    alt: '',
+    source: '',
+    is_private: false,
+  },
 }
 
 describe('AssetSelectedMessage', function () {

packages/field-plugin/src/messaging/pluginMessage/containerToPluginMessage/AssetSelectedMessage.ts

@@ -1,11 +1,11 @@
 import { isMessageToPlugin, MessageToPlugin } from './MessageToPlugin'
 import { hasKey } from '../../../utils'
-import { Asset, isAsset } from './Asset'
+import { AssetWrapper, isAsset } from './Asset'
 
 export type AssetSelectedMessage = MessageToPlugin<'asset-selected'> & {
   field?: string
   callbackId: string
-} & Asset &
+} & AssetWrapper &
   Record<string, unknown>
 
 export const isAssetSelectedMessage = (