daball/dashersupply
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'openapi-sdk-migration'

Browse Source
This commit is contained in:
David Ball 2024-08-26 18:29:49 -04:00
commit 712d9bbf26
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/apps/catalog/amazon/amazon-append-images.ts
View File

@ -77,7 +77,6 @@ export const amazonAppendImagesCommand = (amazonCommand: Command) =>
let amazonAssetsDto = await getAllAssetsInFolder(productsASINFolder.id); let amazonAssetsDto = await getAllAssetsInFolder(productsASINFolder.id);
for (let i = 0; i < urls.length; i++) { for (let i = 0; i < urls.length; i++) {
log(urls[i]);
let foundUploaded = amazonAssetsDto.filter((asset) => (asset.metadata['amazon-url'] as string||'') === urls[i]); let foundUploaded = amazonAssetsDto.filter((asset) => (asset.metadata['amazon-url'] as string||'') === urls[i]);
if (!foundUploaded.length) { // is not found if (!foundUploaded.length) { // is not found
log(`Transmitting Product Image ${urls[i]} to Squidex Assets`); log(`Transmitting Product Image ${urls[i]} to Squidex Assets`);
@ -98,9 +97,8 @@ export const amazonAppendImagesCommand = (amazonCommand: Command) =>
} }
if (didUpdate) { if (didUpdate) {
log(`Listing did update, updating product listing with appended images.`); log(`Listing did update, updating product listing with appended images.`);
let updatedDto = await core.client.contents.putContent(SCHEMAS.LISTINGS, listingDto.id, { let updatedDto = await core.client.contents.putContent(SCHEMAS.LISTINGS, listingDto.id, { ...listing }, {
unpublished: false, unpublished: false,
requestBody: listing as any,
} as ContentsPutContentRequest as any); } as ContentsPutContentRequest as any);
log(`Listing version ${updatedDto.version} stored.`); log(`Listing version ${updatedDto.version} stored.`);
} }

3
src/apps/catalog/common/catalog-helpers.ts
View File

@ -479,14 +479,13 @@ export async function uploadDownloadedImageToSquidexAsAsset(downloadUrl: string,
let url = new URL(downloadUrl); let url = new URL(downloadUrl);
let filename = url.pathname.substring(downloadUrl.lastIndexOf('/')+1);//.replace(/[A-Z0-9\.-_]*, '$0'); let filename = url.pathname.substring(downloadUrl.lastIndexOf('/')+1);//.replace(/[A-Z0-9\.-_]*, '$0');
let response = await axios.get(downloadUrl, { timeout: TIMEOUT_IN_SECONDS * 1000, responseType: 'arraybuffer' }); let response = await axios.get(downloadUrl, { timeout: TIMEOUT_IN_SECONDS * 1000, responseType: 'arraybuffer' });
let form = new FormData();
let blob = new Blob(response.data, {type: mimeLookup(filename) as string}); let blob = new Blob(response.data, {type: mimeLookup(filename) as string});
let form = new FormData();
form.append('fileName', filename); form.append('fileName', filename);
form.append('file', blob, filename); form.append('file', blob, filename);
form.append('parentId', assetFolderId); form.append('parentId', assetFolderId);
let assetDto = await client.assets.postAsset({ file: blob, name: filename, url: filename, parentId: assetFolderId }, { body: form }); let assetDto = await client.assets.postAsset({ file: blob, name: filename, url: filename, parentId: assetFolderId }, { body: form });
assetDto = await client.assets.putAsset(assetDto.id, { metadata: { ...assetDto.metadata, 'amazon-url': downloadUrl }, tags: ['amazon', 'product'] }); assetDto = await client.assets.putAsset(assetDto.id, { metadata: { ...assetDto.metadata, 'amazon-url': downloadUrl }, tags: ['amazon', 'product'] });
// assetDto = await client.assets.putAssetParent({ id: assetDto.id, moveAssetDto: { parentId: assetFolderId } });
return assetDto; return assetDto;
} }