@social-mail/social-mail-web-server 1.7.607 → 1.7.609

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.607",
+  "version": "1.7.609",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/model/SocialMailContext.ts

@@ -49,8 +49,7 @@ import { StoreItemFolderTag } from "./entities/StoreItemFolderTag.js";
 import { StoreItemFolder } from "./entities/StoreItemFolder.js";
 import { StoreJournalEntry } from "./entities/StoreJournalEntry.js";
 import { StoreJournalLineItem } from "./entities/StoreJournalLineItem.js";
-import { WebSiteTag } from "./entities/WebSiteTag.js";
-import RateLimitToken from "./entities/RateLimitToken.js";
+import { StoreTag } from "./entities/StoreTag.js";
 import AccessToken from "./entities/AccessToken.js";
 import ServerActivity from "./entities/ServerActivity.js";
 import IncomingSmsSource from "./entities/IncomingSmsSource.js";
@@ -79,6 +78,7 @@ import { WebSiteChannelDomain } from "./entities/WebSiteChannelDomain.js";
 import GeoIPBlock from "./entities/GeoIPBlock.js";
 import AppTempFile from "./entities/AppTempFile.js";
 import UserGroupMember from "./entities/UserGroupMember.js";
+import WebSiteTag from "./entities/WebSiteTemplateTag.js";
 
 @RegisterScoped
 export default class SocialMailContext extends EntityContext {
@@ -219,7 +219,7 @@ export default class SocialMailContext extends EntityContext {
 
     public storeItemTaxes = this.model.register(StoreItemTax);
 
-    public storeTags = this.model.register(WebSiteTag);
+    public storeTags = this.model.register(StoreTag);
 
     public storeItemTags = this.model.register(StoreItemTag);
 
@@ -247,6 +247,8 @@ export default class SocialMailContext extends EntityContext {
 
     public websiteChannels = this.model.register(WebSiteChannel);
 
+    public websiteTags = this.model.register(WebSiteTag);
+
 
     public loginSessions = this.model.register(LoginSession);
 

package/src/server/model/SocialMailContextEvents.ts

@@ -80,7 +80,7 @@ import { StoreItemFolderTag } from "./entities/StoreItemFolderTag.js";
 import { StoreItemFolder } from "./entities/StoreItemFolder.js";
 import { StoreJournalEntry } from "./entities/StoreJournalEntry.js";
 import { StoreJournalLineItem } from "./entities/StoreJournalLineItem.js";
-import { WebSiteTag } from "./entities/WebSiteTag.js";
+import { StoreTag } from "./entities/StoreTag.js";
 import StoreItemEvents from "./events/StoreItemEvents.js";
 import StoreItemPriceEvents from "./events/StoreItemPriceEvents.js";
 import AccessToken from "./entities/AccessToken.js";
@@ -98,7 +98,7 @@ import IncomingSmsSource from "./entities/IncomingSmsSource.js";
 import IncomingSmsSourceEvents from "./events/IncomingSmsSourceEvents.js";
 import VerificationToken, { VerificationTokenAddress } from "./entities/VerificationToken.js";
 import VerificationTokenEvents from "./events/VerificationTokenEvents.js";
-import WebSiteTagEvents from "./events/WebSiteTagEvents.js";
+import StoreTagEvents from "./events/StoreTagEvents.js";
 import StoreItemFolderTagEvents from "./events/StoreItemFolderTagEvents.js";
 import HostedZone, { HostedZoneRecord, HostedZoneUser } from "./entities/HostedZone.js";
 import HostedZoneEvents, { HostedZoneRecordEvents, HostedZoneUserEvents } from "./events/HostedZoneEvents.js";
@@ -142,6 +142,8 @@ import CachedItem from "./entities/CachedItem.js";
 import CachedItemEvents from "./events/CachedItemEvents.js";
 import MailboxFolder from "./entities/MailboxFolder.js";
 import MailboxFolderEvents from "./events/MailboxFolderEvents.js";
+import WebSiteTag from "./entities/WebSiteTemplateTag.js";
+import WebSiteTagEvents from "./events/WebSiteTagEvents.js";
 
 
 @RegisterSingleton
@@ -207,7 +209,7 @@ export default class SocialMailContextEvents extends ContextEvents {
         this.register(StoreItemFolderTag, StoreItemFolderTagEvents);
         this.register(StoreMediaFile, StoreMediaFileEvents);
         this.register(StoreItemTax, StoreItemTaxEvents);
-        this.register(WebSiteTag, WebSiteTagEvents);
+        this.register(StoreTag, StoreTagEvents);
         // this.register(StorePriceAddOn, StorePriceAddOnEvents);
         // this.register(StoreBill, StoreOrderEvents);
         // this.register(StoreBillLine, StoreOrderItemEvents);
@@ -231,6 +233,7 @@ export default class SocialMailContextEvents extends ContextEvents {
         this.register(WebSiteHost, WebSiteHostEvents);
         this.register(WebSiteVersion, WebSiteVersionEvents);
         this.register(WebSiteChannelDomain, WebSiteChannelDomainEvents);
+        this.register(WebSiteTag, WebSiteTagEvents);
 
         this.register(WebHook, WebHookEvents);
         this.register(WebHookEvent, WebHookEventEvents);

package/src/server/model/entities/{WebSiteTag.ts → StoreTag.ts}

@@ -5,26 +5,26 @@ import Tag from "./Tag.js";
 import WebSite from "./WebSite.js";
 
 
-@Table("WebSiteTags")
-export class WebSiteTag {
+@Table("StoreTags")
+export class StoreTag {
 
     @Column({ dataType: "BigInt", key: true })
     @RelateTo(WebSite, {
         property: (x) => x.store,
         inverseProperty: (x) => x.tags,
         foreignKeyConstraint: {
-            name: "FC_WebSiteTags_WebSiteID",
+            name: "FC_StoreTags_storeID",
             cascade: "delete"
         }
     })
-    public webSiteID: number;
+    public storeID: number;
 
     @Column({ dataType: "BigInt", key: true })
     @RelateTo(Tag, {
         property: (x) => x.tag,
         inverseProperty: (x) => x.storeTags,
         foreignKeyConstraint: {
-            name: "FC_WebSiteTags_TagID",
+            name: "FC_StoreTags_TagID",
             cascade: "delete"
         }
     })

package/src/server/model/entities/Tag.ts

@@ -10,9 +10,10 @@ import type MailboxContactTag from "./MailboxContactTag.js";
 import type EmailTag from "./EmailTag.js";
 import type { StoreItemTag } from "./StoreItemTag.js";
 import type { StoreItemFolderTag } from "./StoreItemFolderTag.js";
-import type { WebSiteTag } from "./WebSiteTag.js";
+import type { StoreTag } from "./StoreTag.js";
 import type MailboxFolder from "./MailboxFolder.js";
 import type MailboxTag from "./MailboxTag.js";
+import type WebSiteTag from "./WebSiteTemplateTag.js";
 
 /**
  * The reason tags table exists in form of string,bigint pair is, we need
@@ -83,8 +84,9 @@ export default class Tag {
     public contactTags: ContactTag[];
 
     public storeItemTags: StoreItemTag[];
-    storeTags: WebSiteTag[];
+    storeTags: StoreTag[];
     storeItemFolderTags: StoreItemFolderTag[];
     mailboxFolders: MailboxFolder[];
     mailboxTags: MailboxTag[];
+    webSiteTags: WebSiteTag[];
 }

package/src/server/model/entities/WebSite.ts

@@ -5,7 +5,7 @@ import AppFile, { AppFileVersion } from "./AppFile.js";
 import { JsonProperty, ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
 import Index from "@entity-access/entity-access/dist/decorators/Index.js";
 import type ServerActivity from "./ServerActivity.js";
-import type { WebSiteTag } from "./WebSiteTag.js";
+import type { StoreTag } from "./StoreTag.js";
 import type { StoreAccount } from "./StoreAccount.js";
 import type { StoreInsight } from "./StoreInsight.js";
 import type { StoreItem } from "./StoreItem.js";
@@ -18,6 +18,7 @@ import type { WebSiteChannelDomain } from "./WebSiteChannelDomain.js";
 import type { WebSiteChannel } from "./WebSiteChannel.js";
 import type { WebSiteVersion } from "./WebSiteVersion.js";
 import type { WebSiteHost } from "./WebSiteHost.js";
+import type WebSiteTag from "./WebSiteTemplateTag.js";
 
 @Table("WebSites")
 @Index({
@@ -109,7 +110,7 @@ export default class WebSite {
     channels: WebSiteChannel[];
 
     activities: ServerActivity[];
-    tags: WebSiteTag[];
+    tags: StoreTag[];
     storeAccounts: StoreAccount[];
     insights: StoreInsight[];
     storeItems: StoreItem[];
@@ -119,6 +120,7 @@ export default class WebSite {
     coupons: StoreCoupon[];
     webHooks: WebHook[];
     channelDomains: WebSiteChannelDomain[];
+    webSiteTags: WebSiteTag[];
 
 }
 

package/src/server/model/entities/WebSiteTemplateTag.ts

@@ -0,0 +1,35 @@
+import Column from "@entity-access/entity-access/dist/decorators/Column.js";
+import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
+import Table from "@entity-access/entity-access/dist/decorators/Table.js";
+import WebSite from "./WebSite.js";
+import Tag from "./Tag.js";
+
+@Table("WebSiteTags")
+export default class WebSiteTag {
+
+    @Column({ dataType: "BigInt", key: true })
+    @RelateTo(WebSite, {
+        property: (x) => x.webSite,
+        inverseProperty: (x) => x.webSiteTags,
+        foreignKeyConstraint: {
+            name: "FC_WebSiteTags_TemplateID",
+            cascade:"delete"
+        }
+    })
+    templateID: number;
+
+    @Column({ dataType: "BigInt", key: true })
+    @RelateTo(Tag, {
+        property: (x) => x.tag,
+        inverseProperty: (x) => x.webSiteTags,
+        foreignKeyConstraint: {
+            name: "FC_WebSiteTags_TemplateID",
+            cascade:"delete"
+        }
+    })
+    tagID: number;
+
+    tag: Tag;
+    webSite: WebSite;
+
+}

package/src/server/model/events/StoreTagEvents.ts

@@ -0,0 +1,27 @@
+import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
+import { StoreTag } from "../entities/StoreTag.js";
+import AuthenticatedEvents from "./AuthenticatedEvents.js";
+import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQuery.js";
+import Page from "@entity-access/server-pages/dist/Page.js";
+import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import SocialMailContext from "../SocialMailContext.js";
+
+export default class StoreTagEvents extends AuthenticatedEvents<StoreTag> {
+
+    @ExternalQuery
+    storeQuery() {
+        const page = ServiceProvider.resolve(this, Page as any) as Page;
+        const host = page.request.host;
+
+        const db = ServiceProvider.resolve(this, SocialMailContext);
+        const q = db.storeTags.where({ host }, (p) => (x) => x.store.hosts
+                .some((h) => h.host === p.host));
+        return q;
+    }
+
+
+    filter(query: IEntityQuery<StoreTag>): IEntityQuery<StoreTag> {
+        return query;
+    }
+
+}

package/src/server/model/events/WebSiteTagEvents.ts

@@ -1,26 +1,25 @@
 import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
-import { WebSiteTag } from "../entities/WebSiteTag.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
-import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQuery.js";
-import Page from "@entity-access/server-pages/dist/Page.js";
-import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import SocialMailContext from "../SocialMailContext.js";
+import WebSiteTag from "../entities/WebSiteTemplateTag.js";
+import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 
 export default class WebSiteTagEvents extends AuthenticatedEvents<WebSiteTag> {
 
-    @ExternalQuery
-    storeQuery() {
-        const page = ServiceProvider.resolve(this, Page as any) as Page;
-        const host = page.request.host;
+    filter(query: IEntityQuery<WebSiteTag>): IEntityQuery<WebSiteTag> {
 
-        const db = ServiceProvider.resolve(this, SocialMailContext);
-        const q = db.storeTags.where({ host }, (p) => (x) => x.store.hosts
-                .some((h) => h.host === p.host));
-        return q;
-    }
+        const { sessionUser } = this;
 
+        if (sessionUser.isAdmin) {
+            return query;
+        }
 
-    filter(query: IEntityQuery<WebSiteTag>): IEntityQuery<WebSiteTag> {
+        const { readFileAccess } = sessionUser;
+
+        return query.where({ readFileAccess }, (p) =>
+            (x) => Sql.text.likeAny(x.webSite.folder.path, p.readFileAccess));
+    }
+
+    includeFilter(query: IEntityQuery<WebSiteTag>, type?: any, key?: string): IEntityQuery<WebSiteTag> {
         return query;
     }
 

package/src/server/services/store/StoreTagCountService.ts

@@ -18,7 +18,7 @@ export default class StoreTagCountService {
             const ti = { tagID , storeID };
             const count = diff * (await db.storeItemTags.where(ti, (p) => (x) => x.tagID === p.tagID && x.storeItem.storeID === p.storeID)
                 .count());
-            await db.storeTags.statements.upsert({ tagID, webSiteID: storeID, count}, void 0, { tagID, webSiteID: storeID });
+            await db.storeTags.statements.upsert({ tagID, storeID, count}, void 0, { tagID, storeID });
         }
 
         // const updated = await db.storeTags.where(entity, (p) => (x) => x.storeID === p.storeID)

package/dist/server/model/entities/WebSiteTag.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"WebSiteTag.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/WebSiteTag.ts"],"names":[],"mappings":"AAGA,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,OAAO,MAAM,cAAc,CAAC;AAGnC,qBACa,UAAU;IAWZ,SAAS,EAAE,MAAM,CAAC;IAWlB,KAAK,EAAE,MAAM,CAAC;IAGd,KAAK,EAAE,MAAM,CAAC;IAEd,KAAK,EAAE,OAAO,CAAC;IAEf,GAAG,EAAE,GAAG,CAAC;CACnB"}

package/dist/server/model/entities/WebSiteTag.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"WebSiteTag.js","sourceRoot":"","sources":["../../../../src/server/model/entities/WebSiteTag.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,wDAAwD,CAAC;AAClF,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,OAAO,MAAM,cAAc,CAAC;AAI5B,IAAM,UAAU,GAAhB,MAAM,UAAU;CA8BtB,CAAA;AAnBU;IATN,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;IACzC,QAAQ,CAAC,OAAO,EAAE;QACf,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK;QACxB,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI;QAC9B,oBAAoB,EAAE;YAClB,IAAI,EAAE,0BAA0B;YAChC,OAAO,EAAE,QAAQ;SACpB;KACJ,CAAC;;6CACuB;AAWlB;IATN,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;IACzC,QAAQ,CAAC,GAAG,EAAE;QACX,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG;QACtB,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS;QACnC,oBAAoB,EAAE;YAClB,IAAI,EAAE,sBAAsB;YAC5B,OAAO,EAAE,QAAQ;SACpB;KACJ,CAAC;;yCACmB;AAGd;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;;yCACzB;AAzBZ,UAAU;IADtB,KAAK,CAAC,aAAa,CAAC;GACR,UAAU,CA8BtB"}