@haus-tech/product-import-export-plugin 3.0.2 → 3.0.4

package/dist/product-import-export.plugin.js

@@ -147,7 +147,7 @@ ProductImportExportPlugin = ProductImportExportPlugin_1 = __decorate([
             });
             return config;
         },
-        compatibility: '^3.0.0',
+        compatibility: '^2.0.0 || ^3.0.0',
     })
 ], ProductImportExportPlugin);
 exports.ProductImportExportPlugin = ProductImportExportPlugin;

package/dist/providers/import-providers/asset-importer.d.ts

@@ -1,4 +1,5 @@
-import { Asset, AssetService, ConfigService, RequestContext, TransactionalConnection } from '@vendure/core';
+import { OnModuleInit } from '@nestjs/common';
+import { Asset, AssetService, ChannelService, ConfigService, RequestContext, TransactionalConnection } from '@vendure/core';
 import { JsonAsset } from '../../types';
 /**
  * @description
@@ -8,13 +9,16 @@ import { JsonAsset } from '../../types';
  *
  * @docsCategory import-export
  */
-export declare class ExtendedAssetImporter {
+export declare class ExtendedAssetImporter implements OnModuleInit {
     private configService;
     private assetService;
     private connection;
+    private channelService;
     private assetMap;
+    private defaultChannel;
     /** @internal */
-    constructor(configService: ConfigService, assetService: AssetService, connection: TransactionalConnection);
+    constructor(configService: ConfigService, assetService: AssetService, connection: TransactionalConnection, channelService: ChannelService);
+    onModuleInit(): Promise<void>;
     /**
      * @description
      * Creates Asset entities for the given paths, using the assetMap cache to prevent the

package/dist/providers/import-providers/asset-importer.js

@@ -25,12 +25,18 @@ let ExtendedAssetImporter = class ExtendedAssetImporter {
     configService;
     assetService;
     connection;
+    channelService;
     assetMap = new Map();
+    defaultChannel;
     /** @internal */
-    constructor(configService, assetService, connection) {
+    constructor(configService, assetService, connection, channelService) {
         this.configService = configService;
         this.assetService = assetService;
         this.connection = connection;
+        this.channelService = channelService;
+    }
+    async onModuleInit() {
+        this.defaultChannel = await this.channelService.getDefaultChannel();
     }
     /**
      * @description
@@ -45,10 +51,20 @@ let ExtendedAssetImporter = class ExtendedAssetImporter {
         for (const assetPath of uniqueAssetPaths.values()) {
             const cachedAsset = this.assetMap.get(assetPath.url);
             if (cachedAsset) {
+                if (cachedAsset.channels.some((channel) => channel.id !== ctx?.channelId)) {
+                    await this.connection
+                        .getRepository(ctx, core_1.Asset)
+                        .createQueryBuilder()
+                        .relation(core_1.Asset, 'channels')
+                        .of(cachedAsset.id)
+                        .add(ctx?.channel);
+                    cachedAsset.channels.push(ctx?.channel);
+                }
                 if (cachedAsset.name !== assetPath.name && assetPath.name) {
                     this.connection.getRepository(ctx, core_1.Asset).update(cachedAsset.id, {
                         name: assetPath.name,
                     });
+                    // Update the cached asset with the new name
                     this.assetMap.set(assetPath.url, { ...cachedAsset, name: assetPath.name });
                     assets.push({ ...cachedAsset, name: assetPath.name });
                 }
@@ -67,13 +83,15 @@ let ExtendedAssetImporter = class ExtendedAssetImporter {
                                 hash: assetHash,
                             },
                         },
+                        relations: ['channels'],
                     });
                     if (assetFromHash) {
                         // Check if the asset name has changed
-                        if (assetPath.name && assetFromHash.name !== assetPath.name) {
-                            await this.connection.getRepository(ctx, core_1.Asset).update(assetFromHash.id, {
-                                name: assetPath.name,
-                            });
+                        if ((assetPath.name && assetFromHash.name !== assetPath.name) ||
+                            assetFromHash.channels.some((channel) => channel.id !== ctx?.channelId)) {
+                            assetFromHash.name = assetPath.name || assetFromHash.name;
+                            assetFromHash.channels.push(ctx?.channel);
+                            await this.connection.getRepository(ctx, core_1.Asset).save(assetFromHash);
                         }
                         this.assetMap.set(assetPath.url, assetFromHash);
                         assets.push(assetFromHash);
@@ -94,12 +112,12 @@ let ExtendedAssetImporter = class ExtendedAssetImporter {
                                         hash: assetHash,
                                     },
                                 },
+                                relations: ['channels'],
                             });
                             if (assetFromHash) {
                                 shouldDeleteCreatedAsset = true;
                                 assetToUpdate = { ...assetFromHash, name: assetPath.name || assetFromHash.name };
                             }
-                            console.log('assetFromHash', assetFromHash);
                             if (assetPath.id) {
                                 shouldDeleteCreatedAsset = true;
                                 assetToUpdate = {
@@ -109,12 +127,13 @@ let ExtendedAssetImporter = class ExtendedAssetImporter {
                             }
                             this.assetMap.set(assetPath.url, assetToUpdate);
                             assets.push(assetToUpdate);
-                            await this.connection.getRepository(ctx, core_1.Asset).update(assetToUpdate.id, {
-                                customFields: {
-                                    hash: assetHash,
-                                },
-                                name: assetPath.name,
-                            });
+                            assetToUpdate.name = assetPath.name || assetToUpdate.name;
+                            assetToUpdate.channels.push(ctx?.channel);
+                            assetToUpdate.customFields = {
+                                ...assetToUpdate.customFields,
+                                hash: assetHash,
+                            };
+                            await this.connection.getRepository(ctx, core_1.Asset).save(assetToUpdate);
                             if (shouldDeleteCreatedAsset) {
                                 this.connection.getRepository(ctx, core_1.Asset).delete(createdAsset.id);
                             }
@@ -133,6 +152,7 @@ ExtendedAssetImporter = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [core_1.ConfigService,
         core_1.AssetService,
-        core_1.TransactionalConnection])
+        core_1.TransactionalConnection,
+        core_1.ChannelService])
 ], ExtendedAssetImporter);
 exports.ExtendedAssetImporter = ExtendedAssetImporter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haus-tech/product-import-export-plugin",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "A Vendure plugin for importing and exporting products using a CSV file",
   "author": "Haus Tech",
   "repository": {
@@ -32,4 +32,4 @@
     "csv-stringify": "^6.5.1",
     "slug": "^9.1.0"
   }
-}
+}