@haus-tech/badge-plugin 3.0.0 → 4.0.0

package/dist/entity/badge.entity.d.ts

@@ -1,7 +1,8 @@
 import { DeepPartial } from '@vendure/common/lib/shared-types';
-import { VendureEntity, Collection, ID, Asset } from '@vendure/core';
-export declare class Badge extends VendureEntity {
+import { VendureEntity, Collection, ID, Asset, ChannelAware, Channel } from '@vendure/core';
+export declare class Badge extends VendureEntity implements ChannelAware {
     constructor(input?: DeepPartial<Badge>);
+    channels: Channel[];
     position: string;
     order: number;
     text: string;

package/dist/entity/badge.entity.js

@@ -20,6 +20,7 @@ let Badge = class Badge extends core_1.VendureEntity {
             Object.assign(this, input);
         }
     }
+    channels;
     position;
     order;
     text;
@@ -28,6 +29,11 @@ let Badge = class Badge extends core_1.VendureEntity {
     collection;
     collectionId;
 };
+__decorate([
+    (0, typeorm_1.ManyToMany)((type) => core_1.Channel),
+    (0, typeorm_1.JoinTable)(),
+    __metadata("design:type", Array)
+], Badge.prototype, "channels", void 0);
 __decorate([
     (0, typeorm_1.Column)({ default: 'top-left' }),
     __metadata("design:type", String)

package/dist/service/badge.service.js

@@ -33,7 +33,9 @@ let BadgeService = class BadgeService {
     }
     async findAll(ctx, options) {
         return this.listQueryBuilder
-            .build(badge_entity_1.Badge, options, { relations: ['collection', 'asset'], ctx })
+            .build(badge_entity_1.Badge, options, { relations: ['collection', 'asset', 'channels'], ctx })
+            .leftJoin('badge.channels', 'channel')
+            .andWhere('channel.id = :channelId', { channelId: ctx.channel.id })
             .getManyAndCount()
             .then(([items, totalItems]) => ({ items, totalItems }));
     }
@@ -41,6 +43,7 @@ let BadgeService = class BadgeService {
         const badge = new badge_entity_1.Badge({
             position: 'top-left',
             ...input,
+            channels: [ctx.channel],
         });
         return this.connection.getRepository(ctx, badge_entity_1.Badge).save(badge);
     }
@@ -80,12 +83,19 @@ let BadgeService = class BadgeService {
         return badge || new core_1.ErrorResult();
     }
     async findOneByCollectionId(ctx, collectionId) {
-        return this.connection.getRepository(ctx, badge_entity_1.Badge).findOne({ where: { collectionId } });
+        const badge = await this.connection
+            .getRepository(ctx, badge_entity_1.Badge)
+            .findOne({ where: { collectionId }, relations: ['channels'] });
+        if (badge?.channels.some((channel) => channel.id === ctx.channel.id)) {
+            return badge;
+        }
+        return null;
     }
     async findByCollectionIds(ctx, collectionIds) {
-        return this.connection
+        const badges = await this.connection
             .getRepository(ctx, badge_entity_1.Badge)
-            .find({ where: { collectionId: (0, typeorm_1.In)(collectionIds) } });
+            .find({ where: { collectionId: (0, typeorm_1.In)(collectionIds) }, relations: ['channels'] });
+        return badges.filter((badge) => badge.channels.some((channel) => channel.id === ctx.channel.id));
     }
     async findBadgesForProduct(ctx, product) {
         const collections = await this.collectionService.getCollectionsByProductId(ctx, product.id, true);

package/dist/ui/badge-list.component.html

@@ -27,7 +27,7 @@
             [disabled]="true"
             [hiddenWhenOff]="true"
           ></vdr-select-toggle>
-          <img class="asset-thumb" [src]="item.asset | assetPreview : 'thumb'" />
+          <img class="asset-thumb" [src]="item.asset | assetPreview : 'medium'" />
         </div>
         <div class="detail">
           <span [title]="item.position">{{ item.position }}</span>

package/dist/ui/badge-list.component.scss

@@ -35,6 +35,7 @@
 
 img.asset-thumb {
   aspect-ratio: 1;
+  object-fit: contain;
 }
 
 vdr-select-toggle {

package/dist/ui/update-badge.component.html

@@ -17,7 +17,7 @@
     </ng-select>
   </vdr-labeled-data>
 
-  <vdr-labeled-data [label]="'badge-plugin.collections' | translate">
+  <vdr-labeled-data [label]="'badge-plugin.collections' | translate" class="select-wrapper">
     <ng-select
       [multiple]="false"
       [clearable]="true"

package/dist/ui/update-badge.component.scss

@@ -14,3 +14,10 @@
 .label-title {
   font-size: 32px;
 }
+
+:host ::ng-deep .select-wrapper {
+  > div {
+    display: block;
+    width: 100%;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haus-tech/badge-plugin",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "Adds a badge to product images",
   "author": "Haus Tech",
   "repository": "https://github.com/WeAreHausTech/haus-tech-vendure-plugins",