@ibiliaze/global-vars 1.112.0 → 1.114.0

package/dist/flows.d.ts

@@ -1,5 +1,7 @@
 import { FixtureCategoryBase, FixtureCategoryFlowBase, FlowBase, OccupanceBase, StaffBase } from './ticketops/inputsDefault';
 export declare const flows: readonly ["Online", "Offline", "Special link", "Seasonal ticket"];
+export declare const idsEqual: <Id>(a: Id | null | undefined, b: Id | null | undefined) => boolean;
+export declare const arrayHasId: <Id>(list: readonly (Id | null | undefined)[] | null | undefined, target: Id | null | undefined) => boolean;
 export declare function makeSaleLogic<Id, TDate>(): SaleLogic<Id, TDate>;
 export type Path = '/' | '/link' | '/pos' | '/seasonal';
 export type Who = 'guest' | 'root' | 'cashier';
@@ -51,6 +53,7 @@ export interface GetOccupanceCategoryArgs<Id, TDate> {
 export interface GetCategoryArgs<Id, TDate> {
     where: WhereOf<Id, TDate>;
     fixtureCategories: FixtureCategoryOf<Id>[];
+    sectionId: Id;
     occupanceCategory: FixtureCategoryOf<Id> | undefined;
     sectionCategory: FixtureCategoryOf<Id> | undefined;
 }

package/dist/flows.js

@@ -1,8 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.flows = void 0;
+exports.arrayHasId = exports.idsEqual = exports.flows = void 0;
 exports.makeSaleLogic = makeSaleLogic;
 exports.flows = ['Online', 'Offline', 'Special link', 'Seasonal ticket'];
+const idsEqual = (a, b) => {
+    if (a == null || b == null)
+        return false;
+    return String(a) === String(b);
+};
+exports.idsEqual = idsEqual;
+const arrayHasId = (list = [], target) => {
+    if (!list || target == null)
+        return false;
+    return list.some(item => (0, exports.idsEqual)(item, target));
+};
+exports.arrayHasId = arrayHasId;
 function makeSaleLogic() {
     function whereAmI(path) {
         try {
@@ -24,8 +36,8 @@ function makeSaleLogic() {
         }
     }
     const isOnlineOrSeasonal = (flow) => flow.type === 'Seasonal ticket' || flow.type === 'Online';
-    const cashierSeesSeasonal = (flow, staffFlowIds) => flow.type === 'Seasonal ticket' && (staffFlowIds || [])?.includes(flow.flowId);
-    const comesFromSpecialLink = (flow, signedFlowId) => flow.type === 'Special link' && flow.flowId === signedFlowId;
+    const cashierSeesSeasonal = (flow, staffFlowIds) => flow.type === 'Seasonal ticket' && (0, exports.arrayHasId)(staffFlowIds, flow.flowId);
+    const comesFromSpecialLink = (flow, signedFlowId) => flow.type === 'Special link' && (0, exports.idsEqual)(flow.flowId, signedFlowId);
     const authoriser = ({ who, where, effectiveFlows, signedFlowId, staffFlowIds, }) => {
         // Guest
         if (who === 'guest') {
@@ -47,7 +59,7 @@ function makeSaleLogic() {
             if (where === 'Special link')
                 return false;
             if (where === 'Offline') {
-                return effectiveFlows.some(f => f.type === 'Offline' && staffFlowIds.includes(f.flowId));
+                return effectiveFlows.some(f => f.type === 'Offline' && (0, exports.arrayHasId)(staffFlowIds, f.flowId));
             }
             if (where === 'Seasonal ticket') {
                 return effectiveFlows.some(f => cashierSeesSeasonal(f, staffFlowIds));
@@ -62,10 +74,10 @@ function makeSaleLogic() {
             if (!fixtureCategories || !fixtureCategories.length)
                 return false;
             const sectionFlows = [
-                ...fixtureCategories.flatMap(link => link.sections?.flatMap(section => (section.sectionId === sectionId ? section.flows : []))),
+                ...fixtureCategories.flatMap(link => link.sections?.flatMap(section => ((0, exports.idsEqual)(section.sectionId, sectionId) ? section.flows : []))),
             ];
             const categoryFlows = [
-                ...fixtureCategories.flatMap(link => link.sections?.some(section => section.sectionId === sectionId) ? link.flows : []),
+                ...fixtureCategories.flatMap(link => link.sections?.some(section => (0, exports.idsEqual)(section.sectionId, sectionId)) ? link.flows : []),
             ];
             const effectiveFlows = sectionFlows.length ? sectionFlows : categoryFlows;
             return authoriser({ who, where, effectiveFlows, signedFlowId, staffFlowIds });
@@ -81,7 +93,7 @@ function makeSaleLogic() {
             if (!occupanceCategory || !occupanceCategory.categoryId)
                 return true;
             const effectiveFlows = (fixtureCategories || [])
-                .filter(link => link.categoryId === occupanceCategory.categoryId)
+                .filter(link => (0, exports.idsEqual)(link.categoryId, occupanceCategory.categoryId))
                 .flatMap(link => link.flows);
             return authoriser({ who, where, effectiveFlows, signedFlowId, staffFlowIds });
         }
@@ -91,7 +103,7 @@ function makeSaleLogic() {
     }
     function getSectorCategory({ sectionId, fixtureCategories }) {
         try {
-            const sectionCat = fixtureCategories?.find(link => link.sections?.some(section => section.sectionId === sectionId));
+            const sectionCat = fixtureCategories?.find(link => link.sections?.some(section => (0, exports.idsEqual)(section.sectionId, sectionId)));
             return {
                 categoryId: sectionCat?.categoryId,
                 name: sectionCat?.name ?? '',
@@ -108,7 +120,7 @@ function makeSaleLogic() {
     }
     function getOccupanceCategory({ occupanceCategory, fixtureCategories, }) {
         try {
-            const occupanceCat = fixtureCategories?.find(link => link.categoryId === occupanceCategory?.categoryId);
+            const occupanceCat = fixtureCategories?.find(link => (0, exports.idsEqual)(link.categoryId, occupanceCategory?.categoryId));
             return {
                 categoryId: occupanceCat?.categoryId,
                 name: occupanceCat?.name ?? '',
@@ -123,7 +135,7 @@ function makeSaleLogic() {
             return undefined;
         }
     }
-    function getCategory({ where, fixtureCategories, occupanceCategory, sectionCategory, }) {
+    function getCategory({ where, sectionId, fixtureCategories, occupanceCategory, sectionCategory, }) {
         try {
             const occupanceCatOverride = !!occupanceCategory?.categoryId;
             const category = occupanceCatOverride ? occupanceCategory : sectionCategory;
@@ -137,14 +149,15 @@ function makeSaleLogic() {
                 flows: category?.flows ?? [],
                 sections: category?.sections ?? [],
             };
+            // If it isn't a seasonal seat, return the effective cat
             if (!isSeasonal)
                 return effectiveCategory;
-            if (where === 'Seasonal ticket')
-                return effectiveCategory;
-            if (where === 'Offline')
+            // If Return the effective category is Sale Channel is Seasonal or Offline
+            if (where === 'Seasonal ticket' || where === 'Offline')
                 return effectiveCategory;
-            const onlineFlowCategory = fixtureCategories?.find(link => link.flows?.some(flow => flow.type === 'Online'));
-            return onlineFlowCategory;
+            // If sale channel is not seasonal but the seat is seasonal, return a default category
+            const defaultFlowCategory = fixtureCategories.find(cat => cat.sections?.some(sec => (0, exports.idsEqual)(sec.sectionId, sectionId)));
+            return defaultFlowCategory;
         }
         catch {
             return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiliaze/global-vars",
-  "version": "1.112.0",
+  "version": "1.114.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "sideEffects": false,
@@ -22,7 +22,7 @@
   "scripts": {
     "build": "tsc",
     "pub": "npm publish --access public",
-    "git": "git add .; git commit -m 'changes'; git tag -a v1.112.0 -m 'v1.112.0'; git push origin v1.112.0; git push",
+    "git": "git add .; git commit -m 'changes'; git tag -a v1.114.0 -m 'v1.114.0'; git push origin v1.114.0; git push",
     "push": "npm run build; npm run git; npm run pub"
   },
   "author": "Ibi Hasanli",