@haus-tech/badge-plugin 3.0.0 → 4.0.1

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.d.ts

@@ -1,14 +1,18 @@
-import { AssetService, CollectionService, EntityHydrator, ErrorResult, ListQueryBuilder, ListQueryOptions, PaginatedList, Product, RequestContext, TransactionalConnection } from '@vendure/core';
+import { OnApplicationBootstrap } from '@nestjs/common';
+import { AssetService, ChannelService, CollectionService, EntityHydrator, ErrorResult, ListQueryBuilder, ListQueryOptions, PaginatedList, Product, RequestContext, TransactionalConnection } from '@vendure/core';
 import { Badge } from '../entity/badge.entity';
 import { CreateBadgeInput, DeletionResponse, UpdateBadgeInput } from '../gql/generated';
 import { SearchResult } from '@vendure/common/lib/generated-shop-types';
-export declare class BadgeService {
+import { AssignBadgesToChannelInput } from '../types';
+export declare class BadgeService implements OnApplicationBootstrap {
     private listQueryBuilder;
     private connection;
     private assetService;
     private entityHydratorService;
     private collectionService;
-    constructor(listQueryBuilder: ListQueryBuilder, connection: TransactionalConnection, assetService: AssetService, entityHydratorService: EntityHydrator, collectionService: CollectionService);
+    private channelService;
+    constructor(listQueryBuilder: ListQueryBuilder, connection: TransactionalConnection, assetService: AssetService, entityHydratorService: EntityHydrator, collectionService: CollectionService, channelService: ChannelService);
+    onApplicationBootstrap(): Promise<void>;
     findOne(ctx: RequestContext, id: number): Promise<Badge | null>;
     findAll(ctx: RequestContext, options?: ListQueryOptions<Badge>): Promise<PaginatedList<Badge>>;
     create(ctx: RequestContext, input: CreateBadgeInput): Promise<Badge>;
@@ -18,4 +22,5 @@ export declare class BadgeService {
     findByCollectionIds(ctx: RequestContext, collectionIds: string[]): Promise<Badge[]>;
     findBadgesForProduct(ctx: RequestContext, product: Product): Promise<Badge[]>;
     findBadgesForSearchResult(ctx: RequestContext, searchResult: SearchResult): Promise<Badge[]>;
+    assignToChannel(ctx: RequestContext, input: AssignBadgesToChannelInput): Promise<Badge[]>;
 }

package/dist/service/badge.service.js

@@ -21,19 +21,37 @@ let BadgeService = class BadgeService {
     assetService;
     entityHydratorService;
     collectionService;
-    constructor(listQueryBuilder, connection, assetService, entityHydratorService, collectionService) {
+    channelService;
+    constructor(listQueryBuilder, connection, assetService, entityHydratorService, collectionService, channelService) {
         this.listQueryBuilder = listQueryBuilder;
         this.connection = connection;
         this.assetService = assetService;
         this.entityHydratorService = entityHydratorService;
         this.collectionService = collectionService;
+        this.channelService = channelService;
+    }
+    async onApplicationBootstrap() {
+        // Assign all badges which are not assigned to any channel to the default channel
+        const defaultChannel = await this.channelService.getDefaultChannel();
+        const badgesWithoutChannels = await this.connection.rawConnection
+            .getRepository(badge_entity_1.Badge)
+            .createQueryBuilder('badge')
+            .leftJoinAndSelect('badge.channels', 'channel')
+            .where('channel.id IS NULL')
+            .getMany();
+        for (const badge of badgesWithoutChannels) {
+            badge.channels = [defaultChannel];
+            await this.connection.rawConnection.getRepository(badge_entity_1.Badge).save(badge);
+        }
     }
     async findOne(ctx, id) {
         return this.connection.getRepository(ctx, badge_entity_1.Badge).findOne({ where: { id } });
     }
     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 +59,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 +99,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);
@@ -97,6 +123,13 @@ let BadgeService = class BadgeService {
         const collectionIds = collections.map((c) => c.id);
         return this.findByCollectionIds(ctx, collectionIds);
     }
+    async assignToChannel(ctx, input) {
+        const badges = await this.connection.findByIdsInChannel(ctx, badge_entity_1.Badge, input.badgeIds, ctx.channelId, {});
+        await Promise.all(badges.map(async (badge) => {
+            await this.channelService.assignToChannels(ctx, badge_entity_1.Badge, badge.id, [input.channelId]);
+        }));
+        return this.connection.findByIdsInChannel(ctx, badge_entity_1.Badge, badges.map((b) => b.id), ctx.channelId, {});
+    }
 };
 BadgeService = __decorate([
     (0, common_1.Injectable)(),
@@ -104,6 +137,7 @@ BadgeService = __decorate([
         core_1.TransactionalConnection,
         core_1.AssetService,
         core_1.EntityHydrator,
-        core_1.CollectionService])
+        core_1.CollectionService,
+        core_1.ChannelService])
 ], BadgeService);
 exports.BadgeService = BadgeService;

package/dist/types.d.ts

@@ -0,0 +1,5 @@
+import { Scalars } from '@vendure/core';
+export type AssignBadgesToChannelInput = {
+    badgeIds: Array<Scalars['ID']>;
+    channelId: Scalars['ID'];
+};

package/dist/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: 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.1",
   "description": "Adds a badge to product images",
   "author": "Haus Tech",
   "repository": "https://github.com/WeAreHausTech/haus-tech-vendure-plugins",
@@ -16,7 +16,7 @@
   ],
   "scripts": {
     "start": "yarn ts-node test/dev-server.ts",
-    "build": "rimraf dist && tsc && copyfiles -u 1 'src/ui/**/*' dist/",
+    "build": "yarn run -T rimraf dist && yarn run -T tsc && yarn run -T copyfiles -u 1 'src/ui/**/*' dist/",
     "test": "jest --preset=\"ts-jest\"",
     "prepublishOnly": "yarn && yarn build"
   },