@dev-crew-berlin/enter-js-utils 0.88.1 → 0.90.0

package/dist/lib/tokens.d.ts

@@ -33,6 +33,7 @@ export declare function parseUnsubscribeToken(tokenString: string | undefined, o
 export declare function parseEmailHtmlToken(tokenString: string | undefined, options: TokenOptions): Result<TokenValidationError, {
     attendeeId: string;
     emailName: string;
+    mailingId: string | null;
 }>;
 export declare function readRegistrationToken(getCookie: CookieGetter, options: TokenOptions & RegistrationTokenOptions): Result<TokenValidationError, RegistrationToken>;
 export declare function storeRegistrationToken(token: string, setCookie: CookieSetter, options?: RegistrationTokenOptions): void;

package/dist/lib/tokens.js

@@ -58,7 +58,7 @@ export function parseEmailHtmlToken(tokenString, options) {
   const tokenResult = parseJWS(tokenString, options);
   if (!tokenResult.success) return tokenResult;
   const payload = tokenResult.data.payload;
-  if (payload.instance_name !== options.instanceName || typeof payload.attendee_id !== 'string' || typeof payload.email_name !== 'string' || typeof payload.exp !== 'number') {
+  if (payload.instance_name !== options.instanceName || typeof payload.attendee_id !== 'string' || typeof payload.email_name !== 'string' || payload.mailing_id != undefined && typeof payload.mailing_id !== 'string' || typeof payload.exp !== 'number') {
     return failure('token_invalid');
   }
   const now = new Date();
@@ -67,7 +67,8 @@ export function parseEmailHtmlToken(tokenString, options) {
   if (isExpired) return failure('token_expired');
   return success({
     attendeeId: payload.attendee_id,
-    emailName: payload.email_name
+    emailName: payload.email_name,
+    mailingId: payload.mailing_id ?? null
   });
 }
 export function readRegistrationToken(getCookie, options) {

package/dist/models/attendee.d.ts

@@ -26,6 +26,7 @@ export declare class Attendee {
     } | {
         isCompanion: true;
         mainGuestId: string;
+        mainGuestName: string;
     };
     payment: Payment | null;
     deleted: boolean;
@@ -39,6 +40,7 @@ export declare class Attendee {
      */
     static generateID(prefix: string): string;
     toJSON(): AttendeeJSON;
+    hash(): string;
     getRsvpCountForBranch(branchName: string): number;
     getRsvpCount(branchName: string, counterName: string): number;
     getResponseForBranch(branchName: string): 'no-response' | 'negative-response' | 'positive-response';

package/dist/models/attendee.js

@@ -1,4 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
+import hash from 'stable-hash';
 import { Checkins } from './checkins';
 import { Rsvp } from './rsvp';
 export class Attendee {
@@ -30,11 +31,12 @@ export class Attendee {
     this.rsvp = new Map(Object.entries(json.rsvp ?? {}).map(([checkinTag, rsvp]) => [checkinTag, rsvp ? new Rsvp(rsvp) : null]));
     this.checkin = new Map(Object.entries(json.checkin ?? {}).map(([checkinTag, checkin]) => [checkinTag, new Checkins(checkin)]));
     this.companions = json.companions?.isCompanion ? {
+      ...json.companions,
       isCompanion: true,
-      ...json.companions
+      mainGuestName: json.companions.mainGuestName ?? json.companions.mainGuestId
     } : {
-      isCompanion: false,
-      ...json.companions
+      ...json.companions,
+      isCompanion: false
     };
     this.payment = json.payment ?? null;
     this.deleted = json.deleted ?? false;
@@ -73,6 +75,9 @@ export class Attendee {
       rsvp
     };
   }
+  hash() {
+    return hash([this.id, Array.from(this.userdata), Array.from(this.tags), this.language, this.time, Array.from(this.branches), Array.from(this.rsvp).map(([counterName, rsvp]) => [counterName, rsvp?.hash()]), Array.from(this.checkin).map(([counterName, checkin]) => [counterName, checkin?.hash()]), this.companions, this.payment, this.deleted]);
+  }
   getRsvpCountForBranch(branchName) {
     const rsvp = this.rsvp.get(branchName);
     if (!rsvp) return 0;

package/dist/models/checkins.d.ts

@@ -7,6 +7,7 @@ export declare class Checkins {
     deleted: Set<string>;
     constructor(json?: CheckinsJSONInput);
     toJSON(): CheckinsJSON;
+    hash(): string;
     getActiveCheckins(counterName?: string): Checkin[];
     merge(otherCheckin: Checkins): Checkins;
 }

package/dist/models/checkins.js

@@ -1,3 +1,4 @@
+import hash from 'stable-hash';
 import { Checkin } from './checkin';
 export class Checkins {
   checkins = [];
@@ -14,6 +15,9 @@ export class Checkins {
       deleted: Array.from(this.deleted)
     };
   }
+  hash() {
+    return hash([this.checkins.map(checkin => checkin.id), Array.from(this.deleted)]);
+  }
   getActiveCheckins(counterName = 'main') {
     return this.checkins.filter(checkin => checkin.counterName === counterName && !this.deleted.has(checkin.id));
   }

package/dist/models/rsvp.d.ts

@@ -11,4 +11,5 @@ export declare class Rsvp {
     static declining(): Rsvp;
     get confirmed(): boolean;
     toJSON(): RsvpJSON;
+    hash(): string;
 }

package/dist/models/rsvp.js

@@ -1,4 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
+import hash from 'stable-hash';
 export class Rsvp {
   constructor(args) {
     if (typeof args == 'number') {
@@ -34,4 +35,7 @@ export class Rsvp {
       checkinCounters: Array.from(this.checkinCounters)
     };
   }
+  hash() {
+    return hash([this.tieBreaker, this.time, this.personCount, Array.from(this.checkinCounters)]);
+  }
 }

package/dist/ui/companion-info.d.ts

@@ -1,15 +1,13 @@
 import { FunctionComponent } from 'react';
 import 'styled-jsx';
-import { Attendee } from '../models';
 type Props = {
     companionStatus: {
         isCompanion: false;
     } | {
         isCompanion: true;
         mainGuestId: string;
+        mainGuestName: string;
     };
-    formatName: (attendee: Attendee) => string;
-    findMainGuest?: (attendeeId: string) => Attendee | undefined;
 };
 export declare const CompanionInfo: FunctionComponent<Props>;
 export {};

package/dist/ui/companion-info.js

@@ -4,13 +4,11 @@ import 'styled-jsx';
 import { colors, fonts } from '../lib/theme';
 export const CompanionInfo = props => {
   if (!props.companionStatus.isCompanion) return null;
-  const mainGuest = props.findMainGuest ? props.findMainGuest(props.companionStatus.mainGuestId) : undefined;
-  const mainGuestName = mainGuest ? props.formatName(mainGuest) : undefined;
   return /*#__PURE__*/React.createElement("p", {
     className: _JSXStyle.dynamic([["21346984", [colors.enterMediumGrey, fonts.primary, colors.enterDarkGrey]]]) + " " + 'companion-info'
-  }, mainGuestName ? /*#__PURE__*/React.createElement(React.Fragment, null, "companion of ", /*#__PURE__*/React.createElement("span", {
+  }, "companion of", ' ', /*#__PURE__*/React.createElement("span", {
     className: _JSXStyle.dynamic([["21346984", [colors.enterMediumGrey, fonts.primary, colors.enterDarkGrey]]]) + " " + 'companion-name'
-  }, mainGuestName)) : /*#__PURE__*/React.createElement(React.Fragment, null, "companion"), /*#__PURE__*/React.createElement(_JSXStyle, {
+  }, props.companionStatus.mainGuestName), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: "21346984",
     dynamic: [colors.enterMediumGrey, fonts.primary, colors.enterDarkGrey]
   }, `.companion-info.__jsx-style-dynamic-selector{margin:-0.5em 0 0.4em;color:${colors.enterMediumGrey};font-family:${fonts.primary};}.companion-name.__jsx-style-dynamic-selector{color:${colors.enterDarkGrey};}`));

package/dist/ui/companion-info.stories.d.ts

@@ -3,6 +3,5 @@ import { CompanionInfo } from './companion-info';
 declare const meta: Meta<typeof CompanionInfo>;
 export default meta;
 type Story = StoryObj<typeof CompanionInfo>;
-export declare const WithMainGuestFound: Story;
-export declare const WithoutMainGuest: Story;
+export declare const WithMainGuest: Story;
 export declare const NotACompanion: Story;

package/dist/ui/companion-info.stories.js

@@ -1,57 +1,15 @@
 import { CompanionInfo } from './companion-info';
-import { Attendee } from '../models';
 const meta = {
   title: 'Companion Info',
-  component: CompanionInfo,
-  argTypes: {
-    formatName: {
-      type: 'function'
-    }
-  }
+  component: CompanionInfo
 };
 export default meta;
-const mainGuest = new Attendee({
-  id: 'my-attendee',
-  language: 'de',
-  tags: ['VIP', 'Import-200-02-10'],
-  time: new Date('2022-01-01').toISOString(),
-  rsvp: {
-    default: {
-      personCount: 1,
-      time: new Date('2022-01-01').toISOString(),
-      tieBreaker: '1'
-    }
-  },
-  checkin: {},
-  companions: {
-    isCompanion: false
-  },
-  userdata: {
-    name: 'Max Mustermann'
-  },
-  deleted: false,
-  payment: null
-});
-export const WithMainGuestFound = {
-  args: {
-    companionStatus: {
-      isCompanion: true,
-      mainGuestId: 'my-attendee'
-    },
-    findMainGuest: () => mainGuest,
-    formatName(attendee) {
-      return attendee.getFieldValueString('name');
-    }
-  }
-};
-export const WithoutMainGuest = {
+export const WithMainGuest = {
   args: {
     companionStatus: {
       isCompanion: true,
-      mainGuestId: 'my-attendee'
-    },
-    formatName(attendee) {
-      return attendee.getFieldValueString('name');
+      mainGuestId: 'my-attendee',
+      mainGuestName: 'Max Mustermann'
     }
   }
 };
@@ -59,9 +17,6 @@ export const NotACompanion = {
   args: {
     companionStatus: {
       isCompanion: false
-    },
-    formatName(attendee) {
-      return attendee.getFieldValueString('name');
     }
   }
 };

package/dist/ui/guest-card.d.ts

@@ -11,7 +11,6 @@ type Props = {
     formatName: (attendee: Attendee) => string;
     filterTags?: (tag: string) => boolean;
     getTagColor?: (tag: string) => string | undefined;
-    findMainGuest?: (attendeeId: string) => Attendee | undefined;
     onClick?: (attendeeId: string) => void;
 };
 export declare const GuestCard: FunctionComponent<Props>;

package/dist/ui/guest-card.js

@@ -37,9 +37,7 @@ export const GuestCard = props => {
   }, /*#__PURE__*/React.createElement("h2", {
     className: _JSXStyle.dynamic([["1739379681", [colors.enterGrey, colors.enterBackground, fonts.primary, props.dense ? '0.5em 0' : '1.5em 0']]]) + " " + 'name'
   }, props.formatName(props.attendee)), /*#__PURE__*/React.createElement(CompanionInfo, {
-    companionStatus: props.attendee.companions,
-    findMainGuest: props.findMainGuest,
-    formatName: props.formatName
+    companionStatus: props.attendee.companions
   }), /*#__PURE__*/React.createElement(CheckinCountIndicator, {
     checkins: props.attendee.getCheckinsForBranch(props.branchName).getActiveCheckins(props.counterName),
     response: props.attendee.getResponse(props.branchName, props.counterName),

package/dist/ui/guest-card.stories.js

@@ -70,7 +70,8 @@ const companion = new Attendee({
   checkin: {},
   companions: {
     isCompanion: true,
-    mainGuestId: 'my-attendee'
+    mainGuestId: 'my-attendee',
+    mainGuestName: 'Max Mustermann'
   },
   userdata: {
     name: 'John Doe'
@@ -88,7 +89,7 @@ export const WithBackground = {
     branchName: 'default',
     counterName: 'main',
     formatName(attendee) {
-      return attendee.getFieldValueString('name');
+      return attendee.getFieldString('name');
     }
   }
 };
@@ -99,7 +100,7 @@ export const Plain = {
     branchName: 'default',
     counterName: 'main',
     formatName(attendee) {
-      return attendee.getFieldValueString('name');
+      return attendee.getFieldString('name');
     }
   }
 };
@@ -110,7 +111,7 @@ export const Dense = {
     branchName: 'default',
     counterName: 'main',
     formatName(attendee) {
-      return attendee.getFieldValueString('name');
+      return attendee.getFieldString('name');
     }
   }
 };
@@ -124,7 +125,7 @@ export const FilteredTags = {
       return allowedTags.includes(tag);
     },
     formatName(attendee) {
-      return attendee.getFieldValueString('name');
+      return attendee.getFieldString('name');
     }
   }
 };
@@ -134,7 +135,7 @@ export const WithColorLabel = {
     branchName: 'default',
     counterName: 'main',
     formatName(attendee) {
-      return attendee.getFieldValueString('name');
+      return attendee.getFieldString('name');
     },
     getTagColor(tag) {
       return tagColors[tag] ?? undefined;
@@ -147,7 +148,7 @@ export const WithMultipleColorLabels = {
     branchName: 'default',
     counterName: 'main',
     formatName(attendee) {
-      return attendee.getFieldValueString('name');
+      return attendee.getFieldString('name');
     },
     getTagColor(tag) {
       return tagColors[tag] ?? undefined;
@@ -161,7 +162,7 @@ export const WithInfoText = {
     counterName: 'main',
     infoText: '🥦 Vegetarian',
     formatName(attendee) {
-      return attendee.getFieldValueString('name');
+      return attendee.getFieldString('name');
     }
   }
 };
@@ -170,11 +171,8 @@ export const WithCompanion = {
     attendee: companion,
     branchName: 'default',
     counterName: 'main',
-    findMainGuest: () => {
-      return attendee;
-    },
     formatName(attendee) {
-      return attendee.getFieldValueString('name');
+      return attendee.getFieldString('name');
     }
   }
 };
@@ -184,7 +182,7 @@ export const WithCompanionButNoMainGuestInfo = {
     branchName: 'default',
     counterName: 'main',
     formatName(attendee) {
-      return attendee.getFieldValueString('name');
+      return attendee.getFieldString('name');
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-crew-berlin/enter-js-utils",
-  "version": "0.88.1",
+  "version": "0.90.0",
   "description": "utils such as vaildation and other helpers to work with data from the enter app",
   "files": [
     "dist",
@@ -79,6 +79,7 @@
   "dependencies": {
     "cookie": "^1.0.1",
     "jws": "^4.0.0",
+    "stable-hash": "^0.0.5",
     "styled-jsx": "^5.1.6",
     "uuid": "^9.0.0"
   }