swoop-common 2.2.175 → 2.2.177

package/dist/lib/config/templateStructure.d.ts

@@ -21,6 +21,7 @@ export declare const TEMPLATE_NAMES: {
     readonly FEE: "Fee";
     readonly PACKAGE: "Package";
     readonly ROOM: "Room";
+    readonly GROUP_TOUR: "Group Tour";
 };
 /**
  * Template Name to Template ID mapping
@@ -45,6 +46,7 @@ export declare const templateStructure: {
     readonly Fee: "template_d15cc4ab72034fb8a098d9a9ec791a7d";
     readonly "Cruise Activity": "template_12345678123456781234567812345678";
     readonly Room: "template_bb0b09c544d242c9a9ef38147966979f";
+    readonly "Group Tour": "template_530f2f95c21147a08422bb714d771994";
 };
 export declare const packagesTemplateStructure: {
     readonly Cruise: "template_63a57a90570c47b89f830d2c7618324f";
@@ -52,6 +54,7 @@ export declare const packagesTemplateStructure: {
     readonly GuidedMultidayActivity: "template_a64e161de5824fcb9515274b0f67d698";
     readonly AllInclusiveHotel: "template_ba7999ff957c4ca3a5e61496df6178ac";
     readonly "Private Tour": "template_d9081bfcc3b7461987a3728e57ca7363";
+    readonly "Group Tour": "template_530f2f95c21147a08422bb714d771994";
 };
 export declare const topLevelTemplates: {
     readonly Activity: "template_e2f0e9e5343349358037a0564a3366a0";
@@ -65,6 +68,7 @@ export declare const topLevelTemplates: {
     readonly GuidedMultidayActivity: "template_a64e161de5824fcb9515274b0f67d698";
     readonly AllInclusiveHotel: "template_ba7999ff957c4ca3a5e61496df6178ac";
     readonly "Private Tour": "template_d9081bfcc3b7461987a3728e57ca7363";
+    readonly "Group Tour": "template_530f2f95c21147a08422bb714d771994";
 };
 export type TemplateName = keyof typeof templateStructure;
 export type TemplateId = typeof templateStructure[TemplateName];

package/dist/lib/config/templateStructure.js

@@ -20,7 +20,8 @@ export const TEMPLATE_NAMES = {
     ACTIVITY: "Activity",
     FEE: "Fee",
     PACKAGE: "Package",
-    ROOM: "Room"
+    ROOM: "Room",
+    GROUP_TOUR: "Group Tour",
 };
 /**
  * Template Name to Template ID mapping
@@ -44,7 +45,8 @@ export const templateStructure = {
     [TEMPLATE_NAMES.ACTIVITY]: "template_e2f0e9e5343349358037a0564a3366a0",
     [TEMPLATE_NAMES.FEE]: "template_d15cc4ab72034fb8a098d9a9ec791a7d",
     [TEMPLATE_NAMES.CRUISE_ACTIVITY]: "template_12345678123456781234567812345678",
-    [TEMPLATE_NAMES.ROOM]: "template_bb0b09c544d242c9a9ef38147966979f"
+    [TEMPLATE_NAMES.ROOM]: "template_bb0b09c544d242c9a9ef38147966979f",
+    [TEMPLATE_NAMES.GROUP_TOUR]: "template_530f2f95c21147a08422bb714d771994"
 };
 export const packagesTemplateStructure = {
     [TEMPLATE_NAMES.CRUISE]: templateStructure[TEMPLATE_NAMES.CRUISE],
@@ -52,6 +54,7 @@ export const packagesTemplateStructure = {
     [TEMPLATE_NAMES.GUIDED_MULTIDAY_ACTIVITY]: templateStructure[TEMPLATE_NAMES.GUIDED_MULTIDAY_ACTIVITY],
     [TEMPLATE_NAMES.ALL_INCLUSIVE_HOTEL]: templateStructure[TEMPLATE_NAMES.ALL_INCLUSIVE_HOTEL],
     [TEMPLATE_NAMES.PRIVATE_TOUR]: templateStructure[TEMPLATE_NAMES.PRIVATE_TOUR],
+    [TEMPLATE_NAMES.GROUP_TOUR]: templateStructure[TEMPLATE_NAMES.GROUP_TOUR],
 };
 export const topLevelTemplates = Object.assign(Object.assign({}, packagesTemplateStructure), { [TEMPLATE_NAMES.ACTIVITY]: templateStructure[TEMPLATE_NAMES.ACTIVITY], [TEMPLATE_NAMES.FLIGHT]: templateStructure[TEMPLATE_NAMES.FLIGHT], [TEMPLATE_NAMES.GROUND_ACCOMMODATION]: templateStructure[TEMPLATE_NAMES.GROUND_ACCOMMODATION], [TEMPLATE_NAMES.SHIP_ACCOMMODATION]: templateStructure[TEMPLATE_NAMES.SHIP_ACCOMMODATION], [TEMPLATE_NAMES.TRANSFER]: templateStructure[TEMPLATE_NAMES.TRANSFER], [TEMPLATE_NAMES.INDEPENDENT_ARRANGEMENTS]: templateStructure[TEMPLATE_NAMES.INDEPENDENT_ARRANGEMENTS] });
 /**

package/dist/rendering/components/ComponentPicker.js

@@ -8,12 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import React, { useState, useEffect, useMemo } from "react";
-import { Dialog, DialogTitle, DialogContent, DialogActions, Button, TextField, MenuItem, Box, List, Typography, InputAdornment, IconButton, CircularProgress, Pagination, Autocomplete, } from "@mui/material";
+import { Dialog, DialogTitle, DialogContent, DialogActions, Button, TextField, MenuItem, Box, List, Typography, InputAdornment, IconButton, CircularProgress, Pagination, Autocomplete, Checkbox, FormControlLabel, } from "@mui/material";
 import { Search as SearchIcon, Clear as ClearIcon, FilterList as FilterIcon, } from "@mui/icons-material";
 import { fetchComponents, getAllPartners } from "../util/api";
 import { InternalServices } from "../../api/init";
 import ComponentListItem from "./ComponentListItem";
-import { TEMPLATE_NAMES, templateStructure } from "../../lib/config/templateStructure";
+import { TEMPLATE_NAMES, templateStructure, } from "../../lib/config/templateStructure";
 export default function ComponentPickerModal({ open, onClose, onSelect, selectedComponent, parentIdsFilter, }) {
     const [searchTerm, setSearchTerm] = useState("");
     const [selectedRegion, setSelectedRegion] = useState("");
@@ -31,11 +31,12 @@ export default function ComponentPickerModal({ open, onClose, onSelect, selected
     const [debouncedSearchTerm, setDebouncedSearchTerm] = useState("");
     const [activityTypes, setActivityTypes] = useState([]);
     const [selectedActivityType, setSelectedActivityType] = useState("");
+    const [citiesOnly, setCitiesOnly] = useState(false);
     const activityTemplateId = useMemo(() => {
         var _a;
         const cruiseActivityId = templateStructure[TEMPLATE_NAMES.CRUISE_ACTIVITY];
         const activityId = templateStructure[TEMPLATE_NAMES.ACTIVITY];
-        return (_a = parentIdsFilter === null || parentIdsFilter === void 0 ? void 0 : parentIdsFilter.find((id) => id === cruiseActivityId || id === activityId)) !== null && _a !== void 0 ? _a : null;
+        return ((_a = parentIdsFilter === null || parentIdsFilter === void 0 ? void 0 : parentIdsFilter.find((id) => id === cruiseActivityId || id === activityId)) !== null && _a !== void 0 ? _a : null);
     }, [parentIdsFilter]);
     useEffect(() => {
         const timer = setTimeout(() => {
@@ -69,13 +70,21 @@ export default function ComponentPickerModal({ open, onClose, onSelect, selected
         selectedPartner,
         selectedTemplate,
         selectedActivityType,
+        citiesOnly,
         page,
     ]);
     useEffect(() => {
         if (open) {
             setPage(1);
         }
-    }, [debouncedSearchTerm, selectedRegion, selectedPartner, selectedTemplate, selectedActivityType]);
+    }, [
+        debouncedSearchTerm,
+        selectedRegion,
+        selectedPartner,
+        selectedTemplate,
+        selectedActivityType,
+        citiesOnly,
+    ]);
     useEffect(() => {
         if (open) {
             setSearchTerm("");
@@ -83,6 +92,7 @@ export default function ComponentPickerModal({ open, onClose, onSelect, selected
             setSelectedPartner("");
             setSelectedTemplate("");
             setSelectedActivityType("");
+            setCitiesOnly(false);
         }
     }, [open]);
     const loadInitialData = () => __awaiter(this, void 0, void 0, function* () {
@@ -123,6 +133,8 @@ export default function ComponentPickerModal({ open, onClose, onSelect, selected
                 query.on = "name";
             if (selectedActivityType)
                 query["componentFields.data.type"] = selectedActivityType;
+            if (citiesOnly)
+                query["componentFields.data.type"] = "City";
             // Parent ids overwrites templateid filter
             if (parentIdsFilter === null || parentIdsFilter === void 0 ? void 0 : parentIdsFilter.length)
                 query.templateId = parentIdsFilter.join(",");
@@ -159,7 +171,14 @@ export default function ComponentPickerModal({ open, onClose, onSelect, selected
         const componentRegions = regions.filter((r) => { var _a; return (_a = component.regions) === null || _a === void 0 ? void 0 : _a.includes(r.id); });
         return { template, partners: componentPartners, regions: componentRegions };
     };
-    const hasActiveFilters = selectedRegion || selectedPartner || selectedTemplate || selectedActivityType;
+    const hasActiveFilters = selectedRegion ||
+        selectedPartner ||
+        selectedTemplate ||
+        selectedActivityType ||
+        citiesOnly;
+    const isLocationComponent = Array.isArray(parentIdsFilter) &&
+        parentIdsFilter.length > 0 &&
+        parentIdsFilter.includes(templateStructure[TEMPLATE_NAMES.LOCATION]);
     if (initialLoading) {
         return (React.createElement(Dialog, { open: open, onClose: onClose, maxWidth: "md", fullWidth: true, PaperProps: { sx: { height: "80vh", maxHeight: "800px" } } },
             React.createElement(DialogContent, null,
@@ -170,7 +189,7 @@ export default function ComponentPickerModal({ open, onClose, onSelect, selected
     return (React.createElement(Dialog, { open: open, onClose: onClose, maxWidth: "md", fullWidth: true, PaperProps: { sx: { height: "80vh", maxHeight: "800px" } } },
         React.createElement(DialogTitle, null,
             React.createElement(Box, { display: "flex", alignItems: "center", justifyContent: "space-between" },
-                React.createElement(Typography, { variant: "h6" }, "Select Component"),
+                React.createElement(Typography, { variant: "h6" }, "Select Components"),
                 hasActiveFilters && (React.createElement(Button, { size: "small", startIcon: React.createElement(ClearIcon, null), onClick: handleClearFilters }, "Clear Filters")))),
         React.createElement(DialogContent, { dividers: true },
             React.createElement(TextField, { fullWidth: true, placeholder: "Search components...", value: searchTerm, onChange: (e) => setSearchTerm(e.target.value), InputProps: {
@@ -193,7 +212,8 @@ export default function ComponentPickerModal({ open, onClose, onSelect, selected
                         template.revision))))),
                 activityTypes.length > 0 && (React.createElement(TextField, { select: true, size: "small", label: "Activity Type", value: selectedActivityType, onChange: (e) => setSelectedActivityType(e.target.value), sx: { minWidth: 160 } },
                     React.createElement(MenuItem, { value: "" }, "All Activity Types"),
-                    activityTypes.map((type) => (React.createElement(MenuItem, { key: type, value: type }, type)))))),
+                    activityTypes.map((type) => (React.createElement(MenuItem, { key: type, value: type }, type))))),
+                isLocationComponent && (React.createElement(FormControlLabel, { control: React.createElement(Checkbox, { checked: citiesOnly, onChange: (e) => setCitiesOnly(e.target.checked) }), label: "Cities only" }))),
             React.createElement(Box, { display: "flex", alignItems: "center", gap: 2, mb: 1 },
                 React.createElement(Typography, { variant: "body2", color: "text.secondary" },
                     totalCount,

package/dist/rendering/prebuild/generated/import_generated.d.ts

@@ -6,6 +6,7 @@ import "../../renderers/Debug";
 import "../../renderers/Example";
 import "../../renderers/Image/ImageForm";
 import "../../renderers/Image/ImagePresentation";
+import "../../renderers/NestedObjectArray";
 import "../../renderers/StagedText";
 import "../../renderers/Subset";
 import "../../renderers/TemplatePicker";

package/dist/rendering/prebuild/generated/import_generated.js

@@ -8,6 +8,7 @@ import "../../renderers/Debug";
 import "../../renderers/Example";
 import "../../renderers/Image/ImageForm";
 import "../../renderers/Image/ImagePresentation";
+import "../../renderers/NestedObjectArray";
 import "../../renderers/StagedText";
 import "../../renderers/Subset";
 import "../../renderers/TemplatePicker";

package/dist/rendering/renderers/NestedObjectArray.d.ts

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

package/dist/rendering/renderers/NestedObjectArray.js

@@ -0,0 +1,77 @@
+import { resolveSchema } from "@jsonforms/core";
+import { JsonForms } from "@jsonforms/react";
+import { materialCells, materialRenderers } from "@jsonforms/material-renderers";
+import React, { useState } from "react";
+import { Accordion, AccordionDetails, AccordionSummary, Box, Button, IconButton, Typography } from "@mui/material";
+import AddIcon from "@mui/icons-material/Add";
+import DeleteIcon from "@mui/icons-material/Delete";
+import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
+import { ComponentPool } from "../registry/types";
+import { getComponents, registerComponent } from "../registry/components";
+const hasNestedArray = (schema) => {
+    if (schema.type !== "array")
+        return false;
+    const items = schema.items;
+    if (!items || items.type !== "object")
+        return false;
+    const props = items.properties;
+    if (!props)
+        return false;
+    return Object.values(props).some((p) => p.type === "array");
+};
+// Rank 5 — beats materialArrayLayout (rank 4), only fires on arrays of objects
+// that contain at least one nested array property.
+const nestedObjectArrayTester = (uischema, schema) => {
+    const ui = uischema;
+    if (!ui.scope)
+        return -1;
+    const scoped = resolveSchema(schema, ui.scope, schema);
+    if (!scoped)
+        return -1;
+    if (!hasNestedArray(scoped))
+        return -1;
+    return 5;
+};
+const getItemLabel = (item, index) => (item === null || item === void 0 ? void 0 : item.title) ||
+    (item === null || item === void 0 ? void 0 : item.name) ||
+    (item === null || item === void 0 ? void 0 : item.label) ||
+    `Item ${index + 1}`;
+const NestedObjectArrayRenderer = ({ data, handleChange, path, schema, label, enabled }) => {
+    const items = Array.isArray(data) ? data : [];
+    const itemSchema = schema.items;
+    const [expanded, setExpanded] = useState(false);
+    const renderers = [...materialRenderers, ...getComponents(ComponentPool.FORM)];
+    const handleItemChange = (index, newData) => {
+        const next = [...items];
+        next[index] = newData;
+        handleChange(path, next);
+    };
+    const addItem = () => {
+        handleChange(path, [...items, {}]);
+        setExpanded(items.length);
+    };
+    const removeItem = (e, index) => {
+        e.stopPropagation();
+        const next = items.filter((_, i) => i !== index);
+        handleChange(path, next);
+        setExpanded(false);
+    };
+    return (React.createElement(Box, null,
+        label && (React.createElement(Typography, { variant: "subtitle2", sx: { mb: 1 } }, label)),
+        items.map((item, index) => (React.createElement(Accordion, { key: index, expanded: expanded === index, onChange: (_, isExpanded) => setExpanded(isExpanded ? index : false), sx: { mb: 1 } },
+            React.createElement(AccordionSummary, { expandIcon: React.createElement(ExpandMoreIcon, null) },
+                React.createElement(Box, { sx: {
+                        display: "flex",
+                        alignItems: "center",
+                        width: "100%",
+                        gap: 1
+                    } },
+                    React.createElement(Typography, { sx: { flex: 1 } }, getItemLabel(item, index)),
+                    enabled && (React.createElement(IconButton, { size: "small", color: "error", onClick: (e) => removeItem(e, index), "aria-label": "Remove item" },
+                        React.createElement(DeleteIcon, { fontSize: "small" }))))),
+            React.createElement(AccordionDetails, null,
+                React.createElement(JsonForms, { schema: itemSchema, data: item, onChange: ({ data: newData }) => handleItemChange(index, newData), renderers: renderers, cells: materialCells, readonly: !enabled }))))),
+        enabled && (React.createElement(Button, { size: "small", variant: "outlined", startIcon: React.createElement(AddIcon, null), onClick: addItem, sx: { mt: 1 } },
+            "Add ", label !== null && label !== void 0 ? label : "Item"))));
+};
+registerComponent("nested-object-array", NestedObjectArrayRenderer, ComponentPool.FORM, nestedObjectArrayTester);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "swoop-common",
-    "version": "2.2.175",
+    "version": "2.2.177",
     "main": "dist/api/index.js",
     "types": "dist/api/index.d.ts",
     "exports": {