@dev-crew-berlin/enter-js-utils 0.95.0 → 0.95.2

package/dist/generated/api-schema.d.ts

@@ -221,6 +221,7 @@ export type components = {
             };
             companions?: components["schemas"]["RootModel_Union_Companion__MainGuest__-Input"];
             payment?: components["schemas"]["Payment"] | null;
+            partialPayment?: components["schemas"]["PartialPayment"];
             /** Branches */
             branches?: string[];
             /** Deletedbranches */
@@ -767,6 +768,16 @@ export type components = {
              */
             items: components["schemas"]["ItemOption"][];
         };
+        /**
+         * DynamicTag
+         * @description A tag with color and optional filter
+         */
+        DynamicTag: {
+            /** Color */
+            color: string;
+            /** @default {} */
+            filter?: components["schemas"]["Filter"];
+        };
         /** EmailField */
         EmailField: {
             /**
@@ -1006,6 +1017,11 @@ export type components = {
             /** Ext */
             ext: string[] | null;
         };
+        /** Filter */
+        Filter: {
+            /** Query */
+            query: string | null;
+        };
         /** FrontendConfigJSON */
         FrontendConfigJSON: {
             /** Domain */
@@ -1246,13 +1262,34 @@ export type components = {
              */
             max: number;
         };
+        /** PartialPayment */
+        PartialPayment: {
+            /** Paid */
+            paid?: boolean;
+            /** Amount */
+            amount?: number;
+            /**
+             * Provider
+             * @enum {string}
+             */
+            provider?: "manual" | "sepa" | "credit" | "bank_transfer" | "paypal" | "stripe";
+            /**
+             * Currency
+             * @enum {string}
+             */
+            currency?: "USD" | "EUR" | "CHF";
+        };
         /** Payment */
         Payment: {
             /** Paid */
             paid: boolean;
             /** Title */
             title?: string | null;
-            provider: components["schemas"]["PaymentProvider"];
+            /**
+             * Provider
+             * @enum {string}
+             */
+            provider: "manual" | "sepa" | "credit" | "bank_transfer" | "paypal" | "stripe";
             /** Reference */
             reference?: string | null;
             /** Amount */
@@ -1288,10 +1325,9 @@ export type components = {
             attendeeId: string;
             /** Instancename */
             instanceName: string;
-            provider?: components["schemas"]["PaymentProvider"] | null;
+            /** Provider */
+            provider?: ("manual" | "sepa" | "credit" | "bank_transfer" | "paypal" | "stripe") | null;
         };
-        /** @enum {string} */
-        PaymentProvider: "manual" | "sepa" | "credit" | "bank_transfer" | "paypal" | "stripe";
         /** PublicAttendee */
         "PublicAttendee-Input": {
             /** Id */
@@ -1391,6 +1427,8 @@ export type components = {
              * @default false
              */
             deleted: boolean;
+            /** Name */
+            name: string;
         };
         /** PublicEmail */
         PublicEmail: {
@@ -1415,10 +1453,17 @@ export type components = {
             registration: components["schemas"]["PublicRegistrationInfo"];
             /** Guestnamefields */
             guestNameFields: string[];
-            /** Tagcolors */
+            /**
+             * Tagcolors
+             * @deprecated
+             */
             tagColors: {
                 [key: string]: string;
             };
+            /** Dynamictags */
+            dynamicTags: {
+                [key: string]: components["schemas"]["DynamicTag"];
+            };
             /** Branches */
             branches: {
                 [key: string]: components["schemas"]["Branch"];

package/dist/models/attendee.d.ts

@@ -11,6 +11,7 @@ export type AttendeeJSON = Omit<components['schemas']['PublicAttendee-Output'],
 };
 export declare class Attendee {
     id: string;
+    readonly name: string | undefined;
     userdata: Map<string, FieldValue>;
     tags: Set<string>;
     language: string | null;
@@ -20,17 +21,17 @@ export declare class Attendee {
     checkin: Map<string, Checkins>;
     companions: {
         isCompanion: false;
-        companionNames?: {
+        readonly companionNames?: {
             [attendeeId: string]: string;
         };
     } | {
         isCompanion: true;
         mainGuestId: string;
-        mainGuestName: string;
+        readonly mainGuestName: string;
     };
     payment: Payment | null;
     deleted: boolean;
-    constructor(args: AttendeeJSONInput | string);
+    constructor(args: AttendeeJSONInput | AttendeeJSON | string);
     /**
      * creates a bse36 encoded uuid
      * we use base36 encoding because it is more human readable and also shorter

package/dist/models/attendee.js

@@ -23,6 +23,7 @@ export class Attendee {
     }
     const json = args;
     this.id = json.id;
+    this.name = 'name' in json ? json.name : undefined;
     this.userdata = new Map(Object.entries(json.userdata ?? {}));
     this.tags = new Set(json.tags);
     this.language = json.language;
@@ -67,6 +68,7 @@ export class Attendee {
     const rsvp = Object.fromEntries(Array.from(this.rsvp).map(([checkinTag, rsvp]) => [checkinTag, rsvp ? rsvp.toJSON() : null]));
     return {
       ...this,
+      name: this.name ?? '',
       time: this.time?.toISOString(),
       branches: Array.from(this.branches),
       tags: Array.from(this.tags),
@@ -97,7 +99,7 @@ export class Attendee {
   getResponse(branchName, counterName) {
     const rsvp = this.rsvp.get(branchName) ?? null;
     if (rsvp === null) return 'no-response';
-    if (!rsvp.checkinCounters.has(counterName)) 'no-response';
+    if (!rsvp.checkinCounters.has(counterName)) return 'no-response';
     return rsvp.confirmed ? 'positive-response' : 'negative-response';
   }
   getCheckinsForBranch(branchName) {

package/dist/models/dynamic-tag.d.ts

@@ -0,0 +1,2 @@
+import { components } from '../generated/api-schema';
+export type DynamicTag = components['schemas']['DynamicTag'];

package/dist/models/dynamic-tag.js

@@ -0,0 +1 @@
+export {};

package/dist/models/instance.d.ts

@@ -1,6 +1,7 @@
 import { components } from '../generated/api-schema';
 import { Attendee } from './attendee';
 import { Branch } from './branch';
+import { DynamicTag } from './dynamic-tag';
 export type InstanceJSON = components['schemas']['PublicInstance'];
 export declare class Instance {
     name: string;
@@ -20,7 +21,7 @@ export declare class Instance {
         allowRegistrationWithAuthCode: boolean;
     };
     guestNameFields: string[];
-    tagColors: Record<string, string>;
+    dynamicTags: Map<string, DynamicTag>;
     constructor(json: InstanceJSON);
     toJSON(): InstanceJSON;
     isRegistrationClosed(): boolean;

package/dist/models/instance.js

@@ -16,11 +16,13 @@ export class Instance {
       allowRegistrationWithAuthCode: json.registration.allowRegistrationWithAuthCode
     };
     this.guestNameFields = json.guestNameFields;
-    this.tagColors = json.tagColors;
+    this.dynamicTags = new Map(Object.entries(json.dynamicTags));
   }
   toJSON() {
     // convert each branch to its json representation
     const branches = Object.fromEntries(Array.from(this.branches).map(([branchName, branch]) => [branchName, branch.toJSON()]));
+    const dynamicTags = Object.fromEntries(this.dynamicTags);
+    const tagColors = Object.fromEntries(Array.from(this.dynamicTags).map(([tag, dynamicTag]) => [tag, dynamicTag.color]));
     return {
       name: this.name,
       title: this.title,
@@ -37,7 +39,8 @@ export class Instance {
         allowRegistrationWithAuthCode: this.registration.allowRegistrationWithAuthCode
       },
       guestNameFields: this.guestNameFields,
-      tagColors: this.tagColors
+      tagColors: tagColors,
+      dynamicTags: dynamicTags
     };
   }
   isRegistrationClosed() {
@@ -70,6 +73,6 @@ export class Instance {
     return this.guestNameFields.map(fieldKey => guest.userdata.get(fieldKey) ?? '').join(' ');
   }
   getTagColor(tag) {
-    return this.tagColors[tag] ?? undefined;
+    return this.dynamicTags.get(tag)?.color;
   }
 }

package/dist/ui/guest-card.js

@@ -45,7 +45,8 @@ export const GuestCard = props => {
   })), /*#__PURE__*/React.createElement("div", {
     className: _JSXStyle.dynamic([["1739379681", [colors.enterGrey, colors.enterBackground, fonts.primary, props.dense ? '0.5em 0' : '1.5em 0']]]) + " " + 'tag-list'
   }, tags.map(tag => /*#__PURE__*/React.createElement(Tag, {
-    key: tag
+    key: tag,
+    color: getTagColor(tag)
   }, tag)), props.infoText && /*#__PURE__*/React.createElement("div", {
     className: _JSXStyle.dynamic([["1739379681", [colors.enterGrey, colors.enterBackground, fonts.primary, props.dense ? '0.5em 0' : '1.5em 0']]]) + " " + 'info'
   }, " ", props.infoText))), /*#__PURE__*/React.createElement(_JSXStyle, {

package/dist/ui/tag.d.ts

@@ -2,6 +2,8 @@ import { FunctionComponent, ReactNode } from 'react';
 import 'styled-jsx';
 type Props = {
     children: ReactNode;
+    color?: string | null;
+    big?: boolean;
 };
 export declare const Tag: FunctionComponent<Props>;
 export {};

package/dist/ui/tag.js

@@ -2,11 +2,21 @@ import _JSXStyle from "styled-jsx/style";
 import React from 'react';
 import 'styled-jsx';
 import { colors, fonts } from '../lib/theme';
+
+// Decide on text color based on contrast to background color
+function getContrastYIQ(hexcolor) {
+  const r = parseInt(hexcolor.substring(1, 3), 16);
+  const g = parseInt(hexcolor.substring(3, 5), 16);
+  const b = parseInt(hexcolor.substring(5, 7), 16);
+  const yiq = (r * 299 + g * 587 + b * 114) / 1000;
+  return yiq >= 128 ? 'black' : 'white';
+}
 export const Tag = props => {
+  const textColor = getContrastYIQ(props.color ?? '#ffffff');
   return /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["3070421237", [fonts.primary, colors.enterDarkGrey, colors.enterGrey]]]) + " " + 'tag'
+    className: _JSXStyle.dynamic([["2799826206", [fonts.primary, props.big ? '14px' : '0.8em', textColor === 'black' ? colors.enterDarkGrey : 'white', props.color ? props.color : 'transparent', colors.enterGrey, props.big ? '7px 10px 5px 0' : '0 0 0.5em 0.5em']]]) + " " + 'tag'
   }, props.children, /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "3070421237",
-    dynamic: [fonts.primary, colors.enterDarkGrey, colors.enterGrey]
-  }, `.tag.__jsx-style-dynamic-selector{font-family:${fonts.primary};font-size:0.8em;color:${colors.enterDarkGrey};text-transform:uppercase;display:inline-block;background-color:transparent;border-radius:2px;border:1px solid ${colors.enterGrey};padding:2px 8px;margin:0 0 0.5em 0.5em;word-wrap:anywhere;}`));
+    id: "2799826206",
+    dynamic: [fonts.primary, props.big ? '14px' : '0.8em', textColor === 'black' ? colors.enterDarkGrey : 'white', props.color ? props.color : 'transparent', colors.enterGrey, props.big ? '7px 10px 5px 0' : '0 0 0.5em 0.5em']
+  }, `.tag.__jsx-style-dynamic-selector{font-family:${fonts.primary};font-size:${props.big ? '14px' : '0.8em'};color:${textColor === 'black' ? colors.enterDarkGrey : 'white'};text-transform:uppercase;display:inline-block;background-color:${props.color ? props.color : 'transparent'};border-radius:2px;border:1px solid ${colors.enterGrey};padding:2px 8px;margin:${props.big ? '7px 10px 5px 0' : '0 0 0.5em 0.5em'};word-wrap:anywhere;}`));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-crew-berlin/enter-js-utils",
-  "version": "0.95.0",
+  "version": "0.95.2",
   "description": "utils such as vaildation and other helpers to work with data from the enter app",
   "files": [
     "dist",