@dev-crew-berlin/enter-js-utils 0.38.0 → 0.39.0

package/dist/models/attendee.js

@@ -72,7 +72,7 @@ export class Attendee {
   getCheckinCountForTag(checkinTag) {
     const checkins = this.checkin[checkinTag];
     if (!checkins) return 0;
-    return checkins.getAllCheckins().length;
+    return checkins.getActiveCheckins().length;
   }
   addCheckinForTag(args) {
     const exsitingCheckins = this.getCheckinsForTag(args.checkinTag);

package/dist/models/checkin.d.ts

@@ -3,7 +3,6 @@ export declare type CheckinJSON = components['schemas']['Checkin'];
 export declare class Checkin {
     id: string;
     time: Date;
-    main: boolean;
     constructor(json: CheckinJSON);
     toJSON(): CheckinJSON;
 }

package/dist/models/checkin.js

@@ -2,13 +2,12 @@ export class Checkin {
   constructor(json) {
     this.id = json.id;
     this.time = new Date(json.time);
-    this.main = json.main;
   }
   toJSON() {
     return {
       id: this.id,
       time: this.time.toISOString(),
-      main: this.main
+      main: false
     };
   }
 }

package/dist/models/checkins.d.ts

@@ -6,8 +6,6 @@ export declare class Checkins {
     deleted: string[];
     constructor(json?: CheckinsJSON);
     toJSON(): CheckinsJSON;
-    getAllCheckins(): Checkin[];
-    getOtherCheckins(): Checkin[];
-    getMainCheckin(): Checkin | undefined;
+    getActiveCheckins(): Checkin[];
     merge(otherCheckin: Checkins): Checkins;
 }

package/dist/models/checkins.js

@@ -1,4 +1,3 @@
-import { notUndefined } from '../lib';
 import { Checkin } from './checkin';
 export class Checkins {
   checkins = [];
@@ -15,16 +14,8 @@ export class Checkins {
       deleted: this.deleted
     };
   }
-  getAllCheckins() {
-    const mainAndOthers = [this.getMainCheckin(), ...this.getOtherCheckins()];
-    return mainAndOthers.filter(notUndefined);
-  }
-  getOtherCheckins() {
-    return this.checkins.filter(c => c.main === false && !this.deleted.includes(c.id));
-  }
-  getMainCheckin() {
-    const nonDeletedCheckins = this.checkins.filter(checkin => checkin.main === true && !this.deleted.includes(checkin.id)).sort((a, b) => a.time.getTime() - b.time.getTime());
-    return nonDeletedCheckins[0];
+  getActiveCheckins() {
+    return this.checkins.filter(c => !this.deleted.includes(c.id));
   }
   merge(otherCheckin) {
     const checkins = new Map([...this.checkins, ...otherCheckin.checkins].map(checkin => [checkin.id, checkin])).values();

package/dist/ui/checkin-progress-bar.d.ts

@@ -3,6 +3,8 @@ declare type Props = {
     checkinCount: number;
     rsvp: number;
     children?: ReactNode;
+    leftLabel?: string;
+    rightLabel?: string;
 };
 export declare const CheckinProgressBar: FunctionComponent<Props>;
 export {};

package/dist/ui/checkin-progress-bar.js

@@ -14,13 +14,13 @@ export const CheckinProgressBar = props => {
     className: _JSXStyle.dynamic([["818622950", [theme.colors.enterDarkGrey, theme.colors.enterBackground, theme.fonts.primary, theme.colors.enterGreen, theme.fonts.secondary]]]) + " " + 'number checkin-count'
   }, props.checkinCount, /*#__PURE__*/React.createElement("label", {
     className: _JSXStyle.dynamic([["818622950", [theme.colors.enterDarkGrey, theme.colors.enterBackground, theme.fonts.primary, theme.colors.enterGreen, theme.fonts.secondary]]])
-  }, "Checkins")), /*#__PURE__*/React.createElement("div", {
+  }, props.leftLabel || 'Checkins')), /*#__PURE__*/React.createElement("div", {
     className: _JSXStyle.dynamic([["818622950", [theme.colors.enterDarkGrey, theme.colors.enterBackground, theme.fonts.primary, theme.colors.enterGreen, theme.fonts.secondary]]]) + " " + 'checkin-tag-display'
   }, props.children), /*#__PURE__*/React.createElement("div", {
     className: _JSXStyle.dynamic([["818622950", [theme.colors.enterDarkGrey, theme.colors.enterBackground, theme.fonts.primary, theme.colors.enterGreen, theme.fonts.secondary]]]) + " " + 'number confirmations'
   }, props.rsvp, /*#__PURE__*/React.createElement("label", {
     className: _JSXStyle.dynamic([["818622950", [theme.colors.enterDarkGrey, theme.colors.enterBackground, theme.fonts.primary, theme.colors.enterGreen, theme.fonts.secondary]]])
-  }, "Confirmations")), /*#__PURE__*/React.createElement(_JSXStyle, {
+  }, props.rightLabel || 'Confirmations')), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: "818622950",
     dynamic: [theme.colors.enterDarkGrey, theme.colors.enterBackground, theme.fonts.primary, theme.colors.enterGreen, theme.fonts.secondary]
   }, `.checkin-progress-bar.__jsx-style-dynamic-selector{position:relative;padding:0.5em 1em 0.7em;background-color:${theme.colors.enterDarkGrey};border:1px solid ${theme.colors.enterBackground};font-family:${theme.fonts.primary};color:white;display:grid;grid-template-columns:1fr auto 1fr;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;border-radius:4px;overflow:hidden;cursor:pointer;}.progress.__jsx-style-dynamic-selector{z-index:0;top:0;margin:0;padding:0;position:absolute;height:100%;background-color:${theme.colors.enterGreen};}.number.__jsx-style-dynamic-selector{z-index:1;font-weight:200;font-size:1.4em;}.checkin-count.__jsx-style-dynamic-selector{text-align:left;}.confirmations.__jsx-style-dynamic-selector{text-align:right;}.number.__jsx-style-dynamic-selector label.__jsx-style-dynamic-selector{display:block;font-family:${theme.fonts.secondary};font-size:0.6rem;-webkit-letter-spacing:0.05em;-moz-letter-spacing:0.05em;-ms-letter-spacing:0.05em;letter-spacing:0.05em;text-transform:uppercase;font-weight:normal;}.checkin-tag-display.__jsx-style-dynamic-selector{z-index:1;font-size:1.3em;}`));

package/dist/ui/checkin-progress-bar.stories.d.ts

@@ -4,35 +4,56 @@ declare const _default: ComponentMeta<React.FunctionComponent<{
     checkinCount: number;
     rsvp: number;
     children?: React.ReactNode;
+    leftLabel?: string | undefined;
+    rightLabel?: string | undefined;
 }>>;
 export default _default;
 export declare const Basic: ComponentStory<React.FunctionComponent<{
     checkinCount: number;
     rsvp: number;
     children?: React.ReactNode;
+    leftLabel?: string | undefined;
+    rightLabel?: string | undefined;
 }>>;
 export declare const WithoutTagName: ComponentStory<React.FunctionComponent<{
     checkinCount: number;
     rsvp: number;
     children?: React.ReactNode;
+    leftLabel?: string | undefined;
+    rightLabel?: string | undefined;
 }>>;
 export declare const NoCheckins: ComponentStory<React.FunctionComponent<{
     checkinCount: number;
     rsvp: number;
     children?: React.ReactNode;
+    leftLabel?: string | undefined;
+    rightLabel?: string | undefined;
 }>>;
 export declare const AllCheckinsComplete: ComponentStory<React.FunctionComponent<{
     checkinCount: number;
     rsvp: number;
     children?: React.ReactNode;
+    leftLabel?: string | undefined;
+    rightLabel?: string | undefined;
 }>>;
 export declare const MoreCheckinsThanExpected: ComponentStory<React.FunctionComponent<{
     checkinCount: number;
     rsvp: number;
     children?: React.ReactNode;
+    leftLabel?: string | undefined;
+    rightLabel?: string | undefined;
 }>>;
 export declare const NoRSVP: ComponentStory<React.FunctionComponent<{
     checkinCount: number;
     rsvp: number;
     children?: React.ReactNode;
+    leftLabel?: string | undefined;
+    rightLabel?: string | undefined;
+}>>;
+export declare const CustomLabels: ComponentStory<React.FunctionComponent<{
+    checkinCount: number;
+    rsvp: number;
+    children?: React.ReactNode;
+    leftLabel?: string | undefined;
+    rightLabel?: string | undefined;
 }>>;

package/dist/ui/checkin-progress-bar.stories.js

@@ -39,4 +39,12 @@ NoRSVP.args = {
   rsvp: 0,
   checkinCount: 200,
   children: 'Dinner'
+};
+export const CustomLabels = Template.bind({});
+CustomLabels.args = {
+  rsvp: 200,
+  checkinCount: 125,
+  children: 'Dinner',
+  leftLabel: 'Present',
+  rightLabel: 'Guests'
 };

package/dist/ui/guest-card.js

@@ -40,7 +40,7 @@ export const GuestCard = props => {
     findMainGuest: props.findMainGuest,
     formatName: props.formatName
   }), /*#__PURE__*/React.createElement(CheckinCountIndicator, {
-    checkins: props.attendee.getCheckinsForTag(props.checkinTag).getAllCheckins(),
+    checkins: props.attendee.getCheckinsForTag(props.checkinTag).getActiveCheckins(),
     response: props.attendee.getResponseForTag(props.checkinTag),
     rsvpCount: props.attendee.getRsvpCountForTag(props.checkinTag)
   })), /*#__PURE__*/React.createElement("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-crew-berlin/enter-js-utils",
-  "version": "0.38.0",
+  "version": "0.39.0",
   "description": "utils such as vaildation and other helpers to work with data from the enter app",
   "files": [
     "dist",
@@ -53,9 +53,9 @@
     "@storybook/react": "^6.5.15",
     "@storybook/testing-library": "^0.0.13",
     "@types/node": "^17.0.38",
-    "@types/uuid": "^8.3.4",
     "@types/react": "^18.0.10",
     "@types/react-dom": "^18.0.5",
+    "@types/uuid": "^8.3.4",
     "@typescript-eslint/eslint-plugin": "^5.27.0",
     "@typescript-eslint/parser": "^5.27.0",
     "eslint": "^8.16.0",