@oneuptime/common 11.7.1 → 11.7.3

package/build/dist/UI/Components/ModelTable/ColumnPreference.js

@@ -0,0 +1,258 @@
+export const EmptyColumnPreference = {
+    order: [],
+    hidden: [],
+};
+const slugify = (value) => {
+    return value
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, "-")
+        .replace(/^-+|-+$/g, "");
+};
+/*
+ * The identity a column would have if no other column competed for it. An
+ * explicit `id` always wins; otherwise it is the field the column reads,
+ * which is the one thing about a column that survives re-ordering, renaming
+ * and re-styling. `selectedProperty` is part of it so that every custom field
+ * on one JSON column gets its own id ("customFields.Severity").
+ */
+export const getColumnBaseId = (column) => {
+    if (column.id) {
+        return column.id;
+    }
+    const fieldKey = column.field
+        ? Object.keys(column.field)[0]
+        : undefined;
+    if (fieldKey) {
+        return column.selectedProperty
+            ? `${fieldKey}.${column.selectedProperty}`
+            : fieldKey;
+    }
+    return slugify(column.title || "") || "column";
+};
+/*
+ * Ids for a whole column set, in declaration order and guaranteed unique.
+ *
+ * Collisions are real and common: a table often carries several cells that
+ * render from `getElement` off the same placeholder `field: { _id: true }`.
+ * Those are disambiguated by title first (stable, and what the viewer
+ * actually sees in the picker) and only then by position, which is the one
+ * part that can shift when a column is inserted. A shifted id is harmless -
+ * it simply reads as a new column, so it defaults to visible.
+ */
+export const getColumnIds = (columns) => {
+    const baseIds = columns.map((column) => {
+        return getColumnBaseId(column);
+    });
+    const baseIdCounts = {};
+    for (const baseId of baseIds) {
+        baseIdCounts[baseId] = (baseIdCounts[baseId] || 0) + 1;
+    }
+    const candidateIds = columns.map((column, index) => {
+        const baseId = baseIds[index];
+        if ((baseIdCounts[baseId] || 0) < 2) {
+            return baseId;
+        }
+        const titleSlug = slugify(column.title || "");
+        return titleSlug ? `${baseId}:${titleSlug}` : baseId;
+    });
+    const usedIds = {};
+    const ids = [];
+    for (const candidateId of candidateIds) {
+        const timesUsed = usedIds[candidateId] || 0;
+        usedIds[candidateId] = timesUsed + 1;
+        ids.push(timesUsed === 0 ? candidateId : `${candidateId}#${timesUsed + 1}`);
+    }
+    return ids;
+};
+const isHiddenByDefault = (column) => {
+    return Boolean(column.isHiddenByDefault) && !column.isNotCustomizable;
+};
+/*
+ * The picker's model: every column the viewer may act on, already in the
+ * order they arranged them, each tagged with whether it is currently on.
+ *
+ * Pinned columns keep their declared position rather than being dragged
+ * around by a stale layout - they are not in the picker, so the viewer has no
+ * way to put them back if a persisted `order` moved them.
+ */
+export const getCustomizableColumns = (data) => {
+    const { columns, preference } = data;
+    const ids = getColumnIds(columns);
+    const entries = columns.map((column, index) => {
+        const id = ids[index];
+        const isPinned = Boolean(column.isNotCustomizable);
+        let isVisible = !isHiddenByDefault(column);
+        if (preference && !isPinned) {
+            if (preference.hidden.includes(id)) {
+                isVisible = false;
+            }
+            else if (preference.order.includes(id)) {
+                /*
+                 * The viewer has arranged this column at least once and did not
+                 * put it in `hidden`, so it is on - even if the table now ships it
+                 * hidden by default.
+                 */
+                isVisible = true;
+            }
+        }
+        return { id, column, isVisible, isPinned };
+    });
+    if (!preference || preference.order.length === 0) {
+        return entries;
+    }
+    const orderIndexById = {};
+    preference.order.forEach((id, index) => {
+        if (orderIndexById[id] === undefined) {
+            orderIndexById[id] = index;
+        }
+    });
+    /*
+     * A column the layout does not mention keeps its declared neighbours: it
+     * sorts just after the last arranged column that precedes it in the
+     * declaration, so a newly shipped column appears where its author put it
+     * rather than being swept to the end.
+     */
+    const sortKeys = [];
+    let lastKnownOrderIndex = -1;
+    entries.forEach((entry) => {
+        const knownIndex = entry.isPinned
+            ? undefined
+            : orderIndexById[entry.id];
+        if (knownIndex !== undefined) {
+            lastKnownOrderIndex = knownIndex;
+            sortKeys.push(knownIndex);
+            return;
+        }
+        sortKeys.push(lastKnownOrderIndex + 0.5);
+    });
+    return entries
+        .map((entry, index) => {
+        return { entry, key: sortKeys[index], at: index };
+    })
+        .sort((a, b) => {
+        // Stable: equal keys keep declaration order.
+        return a.key === b.key ? a.at - b.at : a.key - b.key;
+    })
+        .map((item) => {
+        return item.entry;
+    });
+};
+/*
+ * The column set the table should actually render. Refuses to return an empty
+ * set: a layout that hides everything would replace the table with an empty
+ * shell the viewer cannot get out of, so it falls back to showing everything.
+ */
+export const applyColumnPreference = (data) => {
+    const entries = getCustomizableColumns(data);
+    const visible = entries
+        .filter((entry) => {
+        return entry.isVisible;
+    })
+        .map((entry) => {
+        return entry.column;
+    });
+    if (visible.length === 0) {
+        return entries.map((entry) => {
+            return entry.column;
+        });
+    }
+    return visible;
+};
+/*
+ * The inverse of getCustomizableColumns: turn what the picker is showing back
+ * into something storable. Pinned columns are left out entirely - they are
+ * not the viewer's to arrange, so recording them would only create entries
+ * that go stale when a table stops pinning a column.
+ */
+export const buildColumnPreference = (entries) => {
+    const order = [];
+    const hidden = [];
+    for (const entry of entries) {
+        if (entry.isPinned) {
+            continue;
+        }
+        order.push(entry.id);
+        if (!entry.isVisible) {
+            hidden.push(entry.id);
+        }
+    }
+    return { order, hidden };
+};
+/*
+ * Drop everything that no longer names a column on this table. A stored
+ * layout outlives the release that produced it, so it routinely mentions
+ * columns that have since been renamed, removed, or - for custom fields -
+ * deleted from the project.
+ */
+export const sanitizeColumnPreference = (data) => {
+    const { preference, knownColumnIds } = data;
+    if (!preference) {
+        return null;
+    }
+    const known = new Set(knownColumnIds);
+    const keep = (ids) => {
+        const seen = new Set();
+        return ids.filter((id) => {
+            if (!known.has(id) || seen.has(id)) {
+                return false;
+            }
+            seen.add(id);
+            return true;
+        });
+    };
+    const sanitized = {
+        order: keep(preference.order),
+        hidden: keep(preference.hidden),
+    };
+    if (sanitized.order.length === 0 && sanitized.hidden.length === 0) {
+        return null;
+    }
+    return sanitized;
+};
+export const isEmptyColumnPreference = (preference) => {
+    return Boolean(!preference ||
+        (preference.order.length === 0 && preference.hidden.length === 0));
+};
+// A layout that changes nothing is stored as nothing.
+export const toJSON = (preference) => {
+    if (isEmptyColumnPreference(preference)) {
+        return null;
+    }
+    return {
+        order: [...preference.order],
+        hidden: [...preference.hidden],
+    };
+};
+/*
+ * Read a stored layout back. Anything on the way in is untrusted - it may
+ * have been hand-edited in devtools or written by an older release - so each
+ * list is validated on its own and a malformed one degrades to empty instead
+ * of taking the other down with it.
+ */
+export const fromJSON = (json) => {
+    if (!json || typeof json !== "object" || Array.isArray(json)) {
+        return null;
+    }
+    const readIds = (value) => {
+        if (!Array.isArray(value)) {
+            return [];
+        }
+        const seen = new Set();
+        return value.filter((entry) => {
+            if (typeof entry !== "string" || entry.length === 0 || seen.has(entry)) {
+                return false;
+            }
+            seen.add(entry);
+            return true;
+        });
+    };
+    const preference = {
+        order: readIds(json["order"]),
+        hidden: readIds(json["hidden"]),
+    };
+    if (isEmptyColumnPreference(preference)) {
+        return null;
+    }
+    return preference;
+};
+//# sourceMappingURL=ColumnPreference.js.map

package/build/dist/UI/Components/ModelTable/ColumnPreference.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ColumnPreference.js","sourceRoot":"","sources":["../../../../../UI/Components/ModelTable/ColumnPreference.ts"],"names":[],"mappings":"AAuCA,MAAM,CAAC,MAAM,qBAAqB,GAAqB;IACrD,KAAK,EAAE,EAAE;IACT,MAAM,EAAE,EAAE;CACX,CAAC;AAIF,MAAM,OAAO,GAAoB,CAAC,KAAa,EAAU,EAAE;IACzD,OAAO,KAAK;SACT,WAAW,EAAE;SACb,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC7B,CAAC,CAAC;AAQF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,eAAe,GAA4B,CAGtD,MAAoC,EAC5B,EAAE;IACV,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;QACd,OAAO,MAAM,CAAC,EAAE,CAAC;IACnB,CAAC;IAED,MAAM,QAAQ,GAAuB,MAAM,CAAC,KAAK;QAC/C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC9B,CAAC,CAAC,SAAS,CAAC;IAEd,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,MAAM,CAAC,gBAAgB;YAC5B,CAAC,CAAC,GAAG,QAAQ,IAAI,MAAM,CAAC,gBAAgB,EAAE;YAC1C,CAAC,CAAC,QAAQ,CAAC;IACf,CAAC;IAED,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC;AACjD,CAAC,CAAC;AAQF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,YAAY,GAAyB,CAGhD,OAA4B,EACb,EAAE;IACjB,MAAM,OAAO,GAAkB,OAAO,CAAC,GAAG,CACxC,CAAC,MAAoC,EAAE,EAAE;QACvC,OAAO,eAAe,CAAa,MAAM,CAAC,CAAC;IAC7C,CAAC,CACF,CAAC;IAEF,MAAM,YAAY,GAA2B,EAAE,CAAC;IAEhD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,YAAY,GAAkB,OAAO,CAAC,GAAG,CAC7C,CAAC,MAAoC,EAAE,KAAa,EAAE,EAAE;QACtD,MAAM,MAAM,GAAW,OAAO,CAAC,KAAK,CAAW,CAAC;QAEhD,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,SAAS,GAAW,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QAEtD,OAAO,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACvD,CAAC,CACF,CAAC;IAEF,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,MAAM,GAAG,GAAkB,EAAE,CAAC;IAE9B,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACvC,MAAM,SAAS,GAAW,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACpD,OAAO,CAAC,WAAW,CAAC,GAAG,SAAS,GAAG,CAAC,CAAC;QACrC,GAAG,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,WAAW,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAkBF,MAAM,iBAAiB,GAA4B,CAGjD,MAAoC,EAC3B,EAAE;IACX,OAAO,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC;AACxE,CAAC,CAAC;AASF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAmC,CAEpE,IAGD,EAAyC,EAAE;IAC1C,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAErC,MAAM,GAAG,GAAkB,YAAY,CAAa,OAAO,CAAC,CAAC;IAE7D,MAAM,OAAO,GAA0C,OAAO,CAAC,GAAG,CAChE,CAAC,MAAoC,EAAE,KAAa,EAAE,EAAE;QACtD,MAAM,EAAE,GAAW,GAAG,CAAC,KAAK,CAAW,CAAC;QACxC,MAAM,QAAQ,GAAY,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAE5D,IAAI,SAAS,GAAY,CAAC,iBAAiB,CAAa,MAAM,CAAC,CAAC;QAEhE,IAAI,UAAU,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,IAAI,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;gBACnC,SAAS,GAAG,KAAK,CAAC;YACpB,CAAC;iBAAM,IAAI,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;gBACzC;;;;mBAIG;gBACH,SAAS,GAAG,IAAI,CAAC;YACnB,CAAC;QACH,CAAC;QAED,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;IAC7C,CAAC,CACF,CAAC;IAEF,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,cAAc,GAA2B,EAAE,CAAC;IAElD,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAU,EAAE,KAAa,EAAE,EAAE;QACrD,IAAI,cAAc,CAAC,EAAE,CAAC,KAAK,SAAS,EAAE,CAAC;YACrC,cAAc,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH;;;;;OAKG;IACH,MAAM,QAAQ,GAAkB,EAAE,CAAC;IACnC,IAAI,mBAAmB,GAAW,CAAC,CAAC,CAAC;IAErC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAqC,EAAE,EAAE;QACxD,MAAM,UAAU,GAAuB,KAAK,CAAC,QAAQ;YACnD,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAE7B,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,mBAAmB,GAAG,UAAU,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1B,OAAO;QACT,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,mBAAmB,GAAG,GAAG,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO;SACX,GAAG,CACF,CACE,KAAqC,EACrC,KAAa,EACuD,EAAE;QACtE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAW,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;IAC9D,CAAC,CACF;SACA,IAAI,CACH,CACE,CAA8B,EAC9B,CAA8B,EACtB,EAAE;QACV,6CAA6C;QAC7C,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC;IACvD,CAAC,CACF;SACA,GAAG,CACF,CAAC,IAEA,EAAkC,EAAE;QACnC,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC,CACF,CAAC;AACN,CAAC,CAAC;AASF;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAkC,CAElE,IAGD,EAAuB,EAAE;IACxB,MAAM,OAAO,GACX,sBAAsB,CAAa,IAAI,CAAC,CAAC;IAE3C,MAAM,OAAO,GAAwB,OAAO;SACzC,MAAM,CAAC,CAAC,KAAqC,EAAE,EAAE;QAChD,OAAO,KAAK,CAAC,SAAS,CAAC;IACzB,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,KAAqC,EAAE,EAAE;QAC7C,OAAO,KAAK,CAAC,MAAM,CAAC;IACtB,CAAC,CAAC,CAAC;IAEL,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,KAAqC,EAAE,EAAE;YAC3D,OAAO,KAAK,CAAC,MAAM,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAQF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAkC,CAGlE,OAA8C,EAC5B,EAAE;IACpB,MAAM,KAAK,GAAkB,EAAE,CAAC;IAChC,MAAM,MAAM,GAAkB,EAAE,CAAC;IAEjC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,SAAS;QACX,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAErB,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AAC3B,CAAC,CAAC;AAOF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,wBAAwB,GACnC,CAAC,IAGA,EAA2B,EAAE;IAC5B,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IAE5C,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,KAAK,GAAgB,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC;IAEnD,MAAM,IAAI,GAA0C,CAClD,GAAkB,EACH,EAAE;QACjB,MAAM,IAAI,GAAgB,IAAI,GAAG,EAAE,CAAC;QAEpC,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,EAAU,EAAE,EAAE;YAC/B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBACnC,OAAO,KAAK,CAAC;YACf,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACb,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,SAAS,GAAqB;QAClC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QAC7B,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;KAChC,CAAC;IAEF,IAAI,SAAS,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAMJ,MAAM,CAAC,MAAM,uBAAuB,GAAoC,CACtE,UAA+C,EACtC,EAAE;IACX,OAAO,OAAO,CACZ,CAAC,UAAU;QACT,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CACpE,CAAC;AACJ,CAAC,CAAC;AAMF,sDAAsD;AACtD,MAAM,CAAC,MAAM,MAAM,GAAmC,CACpD,UAA+C,EAC5B,EAAE;IACrB,IAAI,uBAAuB,CAAC,UAAU,CAAC,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,KAAK,EAAE,CAAC,GAAG,UAAW,CAAC,KAAK,CAAC;QAC7B,MAAM,EAAE,CAAC,GAAG,UAAW,CAAC,MAAM,CAAC;KAChC,CAAC;AACJ,CAAC,CAAC;AAMF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAqC,CACxD,IAAmC,EACV,EAAE;IAC3B,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAsC,CACjD,KAAc,EACC,EAAE;QACjB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,IAAI,GAAgB,IAAI,GAAG,EAAE,CAAC;QAEpC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,KAAc,EAAmB,EAAE;YACtD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvE,OAAO,KAAK,CAAC;YACf,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAChB,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,UAAU,GAAqB;QACnC,KAAK,EAAE,OAAO,CAAE,IAAmB,CAAC,OAAO,CAAC,CAAC;QAC7C,MAAM,EAAE,OAAO,CAAE,IAAmB,CAAC,QAAQ,CAAC,CAAC;KAChD,CAAC;IAEF,IAAI,uBAAuB,CAAC,UAAU,CAAC,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC"}

package/build/dist/UI/Components/ModelTable/CustomFieldColumns.js

@@ -0,0 +1,168 @@
+import FieldType from "../Types/FieldType";
+import CustomFieldType from "../../../Types/CustomField/CustomFieldType";
+import React from "react";
+export const CustomFieldsColumnKey = "customFields";
+/*
+ * Dropdown options are stored as one option per line, the same format the
+ * settings page writes.
+ */
+export const parseDropdownOptions = (value) => {
+    if (typeof value !== "string" || !value) {
+        return [];
+    }
+    return value
+        .split("\n")
+        .map((line) => {
+        return line.trim();
+    })
+        .filter((line) => {
+        return line.length > 0;
+    });
+};
+/*
+ * Normalise whatever the definition API returned into a plain, sorted list.
+ *
+ * Sorting matters: the definition models carry no ordering column and the
+ * list endpoint is queried with an empty sort, so Postgres is free to hand
+ * back a different order on every request. Without a deterministic order
+ * here, a viewer's saved column layout would appear to shuffle itself
+ * between page loads.
+ */
+export const getCustomFieldDefinitions = (items) => {
+    const definitions = [];
+    const seenNames = new Set();
+    for (const item of items || []) {
+        const name = item === null || item === void 0 ? void 0 : item["name"];
+        if (typeof name !== "string" || name.trim().length === 0) {
+            continue;
+        }
+        const trimmedName = name.trim();
+        if (seenNames.has(trimmedName)) {
+            continue;
+        }
+        seenNames.add(trimmedName);
+        const description = item["description"];
+        const customFieldType = item["customFieldType"];
+        const dropdownOptions = item["dropdownOptions"];
+        definitions.push({
+            name: trimmedName,
+            description: typeof description === "string" ? description : undefined,
+            customFieldType: typeof customFieldType === "string"
+                ? customFieldType
+                : undefined,
+            dropdownOptions: typeof dropdownOptions === "string" ? dropdownOptions : undefined,
+        });
+    }
+    return definitions.sort((a, b) => {
+        return a.name.localeCompare(b.name);
+    });
+};
+export const getCustomFieldValue = (item, name) => {
+    const customFields = item === null || item === void 0 ? void 0 : item[CustomFieldsColumnKey];
+    if (!customFields || typeof customFields !== "object") {
+        return undefined;
+    }
+    return customFields[name];
+};
+const badge = (data) => {
+    return (React.createElement("span", { key: data.key, className: "inline-flex items-center gap-x-1.5 px-2 py-1 rounded-md bg-indigo-50 text-indigo-700 text-xs font-medium ring-1 ring-inset ring-indigo-700/10" },
+        React.createElement("svg", { className: "h-1.5 w-1.5 fill-indigo-500", viewBox: "0 0 6 6", "aria-hidden": "true" },
+            React.createElement("circle", { cx: 3, cy: 3, r: 3 })),
+        data.label));
+};
+export const renderCustomFieldValue = (data) => {
+    var _a;
+    const { value, definition } = data;
+    const noValueMessage = (_a = data.noValueMessage) !== null && _a !== void 0 ? _a : "-";
+    const empty = (React.createElement("span", { className: "text-gray-400" }, noValueMessage));
+    if (value === undefined || value === null || value === "") {
+        return empty;
+    }
+    if (definition.customFieldType === CustomFieldType.Boolean) {
+        /*
+         * A boolean custom field renders "No" rather than falling into the empty
+         * branch above - `false` is a real answer, not a missing one.
+         */
+        const isTrue = value === true || value === "true";
+        return (React.createElement("span", { className: isTrue
+                ? "inline-flex items-center px-2 py-1 rounded-md bg-green-50 text-green-700 text-xs font-medium ring-1 ring-inset ring-green-600/20"
+                : "inline-flex items-center px-2 py-1 rounded-md bg-gray-50 text-gray-600 text-xs font-medium ring-1 ring-inset ring-gray-500/10" }, isTrue ? "Yes" : "No"));
+    }
+    if (definition.customFieldType === CustomFieldType.MultiSelectDropdown) {
+        /*
+         * Tolerant on the way out: an older single-select value that was later
+         * switched to multi-select is still a bare string in the JSON.
+         */
+        const values = Array.isArray(value) ? value : [value];
+        const labels = values
+            .filter((entry) => {
+            return entry !== undefined && entry !== null && entry !== "";
+        })
+            .map((entry) => {
+            return String(entry);
+        });
+        if (labels.length === 0) {
+            return empty;
+        }
+        return (React.createElement("div", { className: "flex flex-wrap gap-1.5" }, labels.map((label, index) => {
+            return badge({ label, key: `${label}-${index}` });
+        })));
+    }
+    if (definition.customFieldType === CustomFieldType.Dropdown) {
+        return badge({ label: String(value), key: String(value) });
+    }
+    if (Array.isArray(value)) {
+        return React.createElement("span", null, value.join(", "));
+    }
+    if (typeof value === "object") {
+        return React.createElement("span", null, JSON.stringify(value));
+    }
+    return React.createElement("span", null, String(value));
+};
+/*
+ * Custom field columns default to hidden. A project is free to define a dozen
+ * of them, and turning every one on by default would push the columns the
+ * table was designed around off the side of the screen the first time anyone
+ * opens it. They are all listed in the column picker, one click away.
+ */
+export const getCustomFieldColumns = (data) => {
+    const isHidden = data.isHiddenByDefault !== false;
+    return (data.definitions || []).map((definition) => {
+        return {
+            id: `${CustomFieldsColumnKey}.${definition.name}`,
+            field: {
+                [CustomFieldsColumnKey]: true,
+            },
+            selectedProperty: definition.name,
+            title: definition.name,
+            description: definition.description,
+            type: FieldType.Element,
+            /*
+             * See the file header: sorting a jsonb key is not something the
+             * query path can express.
+             */
+            disableSort: true,
+            isHiddenByDefault: isHidden,
+            getExportValue: (item) => {
+                const value = getCustomFieldValue(item, definition.name);
+                if (value === undefined || value === null) {
+                    return "";
+                }
+                if (Array.isArray(value)) {
+                    return value.join(", ");
+                }
+                if (typeof value === "object") {
+                    return JSON.stringify(value);
+                }
+                return String(value);
+            },
+            getElement: (item) => {
+                return renderCustomFieldValue({
+                    value: getCustomFieldValue(item, definition.name),
+                    definition: definition,
+                });
+            },
+        };
+    });
+};
+//# sourceMappingURL=CustomFieldColumns.js.map

package/build/dist/UI/Components/ModelTable/CustomFieldColumns.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CustomFieldColumns.js","sourceRoot":"","sources":["../../../../../UI/Components/ModelTable/CustomFieldColumns.tsx"],"names":[],"mappings":"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"}

package/build/dist/UI/Components/ModelTable/ExportFromColumns.js

@@ -0,0 +1,30 @@
+/*
+ * Derives the fields a ModelTable column contributes to a CSV export from its
+ * column definition, and mirrors getSelectFromColumns: a column may declare
+ * MORE THAN ONE field when its cell is composed from several of them, and all
+ * of them are fetched. The Table column's `key` only ever holds the first, so
+ * an exporter reading `key` alone drops the rest - the alert "Affected
+ * Resources" cell spans hosts / kubernetesClusters / dockerHosts /
+ * podmanHosts / services, and only the hosts made it into the file.
+ */
+export function getExportKeysFromColumn(data) {
+    const exportKeys = [];
+    if (data.columnKey) {
+        exportKeys.push(data.columnKey);
+    }
+    if (!data.column.field) {
+        return exportKeys;
+    }
+    const declaredKeys = Object.keys(data.column.field);
+    // The primary field is already covered by columnKey.
+    for (const key of declaredKeys.slice(1)) {
+        if (data.hasPermissionToReadField && !data.hasPermissionToReadField(key)) {
+            continue;
+        }
+        if (!exportKeys.includes(key)) {
+            exportKeys.push(key);
+        }
+    }
+    return exportKeys;
+}
+//# sourceMappingURL=ExportFromColumns.js.map

package/build/dist/UI/Components/ModelTable/ExportFromColumns.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExportFromColumns.js","sourceRoot":"","sources":["../../../../../UI/Components/ModelTable/ExportFromColumns.ts"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AAEH,MAAM,UAAU,uBAAuB,CAErC,IAeD;IACC,MAAM,UAAU,GAAkB,EAAE,CAAC;IAErC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACvB,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,MAAM,YAAY,GAAkB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEnE,qDAAqD;IACrD,KAAK,MAAM,GAAG,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QACxC,IAAI,IAAI,CAAC,wBAAwB,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,EAAE,CAAC;YACzE,SAAS;QACX,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC9B,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}

package/build/dist/UI/Components/ModelTable/TableView.js

@@ -49,6 +49,7 @@ const TableViewElement = (props) => {
                     query: true,
                     name: true,
                     facets: true,
+                    columns: true,
                 },
                 sort: {
                     name: SortOrder.Ascending,
@@ -129,6 +130,13 @@ const TableViewElement = (props) => {
             return false;
         }));
     const hasActiveFilters = hasQueryFilters || hasFacetState;
+    /*
+     * A customized column layout is worth saving on its own - "the columns I
+     * care about, in my order" is a view even when nothing is filtered.
+     */
+    const hasColumnLayout = Boolean(props.currentColumns &&
+        Object.keys(props.currentColumns).length > 0);
+    const hasSavableState = hasActiveFilters || hasColumnLayout;
     const getMenuContents = () => {
         if (isLoading) {
             return [React.createElement(BarLoader, { key: -1, color: "var(--ou-link, #4f46e5)" })];
@@ -137,7 +145,7 @@ const TableViewElement = (props) => {
         if (allTableViews.length > 0) {
             elements.push(React.createElement(MoreMenuSection, { title: "Saved Views" }, getViewItems()));
         }
-        if (hasActiveFilters) {
+        if (hasSavableState) {
             elements.push(React.createElement(MoreMenuItem, { key: "save-new-view", text: "Save as New View", className: "bg-gray-50 hover:bg-gray-100 text-gray-700 hover:text-gray-900 font-medium -mt-2", icon: IconProp.Add, iconClassName: "", onClick: () => {
                     setShowCreateNewViewModel(true);
                 } }));
@@ -200,6 +208,9 @@ const TableViewElement = (props) => {
                 if (props.currentFacetState) {
                     tableView.facets = props.currentFacetState;
                 }
+                if (props.currentColumns) {
+                    tableView.columns = props.currentColumns;
+                }
                 return Promise.resolve(tableView);
             }, onSuccess: async (tableView) => {
                 var _a;
@@ -262,7 +273,7 @@ const TableViewElement = (props) => {
     };
     if (!isLoading &&
         allTableViews.length === 0 &&
-        !hasActiveFilters &&
+        !hasSavableState &&
         !currentlySelectedView) {
         return React.createElement(React.Fragment, null);
     }

package/build/dist/UI/Components/ModelTable/TableView.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableView.js","sourceRoot":"","sources":["../../../../../UI/Components/ModelTable/TableView.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"TableView.js","sourceRoot":"","sources":["../../../../../UI/Components/ModelTable/TableView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAgB,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACzE,OAAO,SAAS,MAAM,0CAA0C,CAAC;AAEjE,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,QAAQ,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAC9D,OAAO,GAAG,MAAM,oBAAoB,CAAC;AACrC,OAAO,eAAe,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,QAAQ,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,YAAY,MAAM,uBAAuB,CAAC;AACjD,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,mBAAmB,MAAM,oCAAoC,CAAC;AAGrE,OAAO,WAAW,MAAM,qBAAqB,CAAC;AAC9C,OAAO,IAAI,MAAM,kBAAkB,CAAC;AACpC,OAAO,IAAI,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AA+BzD,MAAM,gBAAgB,GAEF,CAClB,KAAwB,EACV,EAAE;IAChB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAS,EAAE,CAAC,CAAC;IAC/C,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAU,KAAK,CAAC,CAAC;IAC3D,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAmB,EAAE,CAAC,CAAC;IACzE,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,QAAQ,CAExD,SAAS,CAAC,CAAC;IACb,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,QAAQ,CACpD,SAAS,CACV,CAAC;IACF,MAAM,CAAC,sBAAsB,EAAE,yBAAyB,CAAC,GACvD,QAAQ,CAAU,KAAK,CAAC,CAAC;IAE3B,MAAM,WAAW,GAAsC,MAAM,EAAE,CAAC;IAEhE,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,GACrD,QAAQ,CAAmB,IAAI,CAAC,CAAC;IAEnC,SAAS,CAAC,GAAG,EAAE;QACb,wBAAwB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IAEtB,2DAA2D;IAC3D,MAAM,eAAe,GAAwB,KAAK,IAAmB,EAAE;QACrE,IAAI,CAAC;YACH,QAAQ,CAAC,EAAE,CAAC,CAAC;YACb,YAAY,CAAC,IAAI,CAAC,CAAC;YAEnB,MAAM,UAAU,GAA0B,MAAM,QAAQ,CAAC,OAAO,CAAC;gBAC/D,SAAS,EAAE,SAAS;gBACpB,KAAK,EAAE;oBACL,SAAS,EAAE,WAAW,CAAC,mBAAmB,EAAG;oBAC7C,eAAe,EAAE,IAAI,CAAC,SAAS,EAAE;oBACjC,OAAO,EAAE,KAAK,CAAC,OAAO;iBACvB;gBACD,KAAK,EAAE,iBAAiB;gBACxB,IAAI,EAAE,CAAC;gBACP,MAAM,EAAE;oBACN,IAAI,EAAE,IAAI;oBACV,WAAW,EAAE,IAAI;oBACjB,KAAK,EAAE,IAAI;oBACX,IAAI,EAAE,IAAI;oBACV,MAAM,EAAE,IAAI;oBACZ,OAAO,EAAE,IAAI;iBACd;gBACD,IAAI,EAAE;oBACJ,IAAI,EAAE,SAAS,CAAC,SAAS;iBAC1B;aACF,CAAC,CAAC;YAEH,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,QAAQ,CAAC,GAAG,CAAC,uBAAuB,CAAC,GAAY,CAAC,CAAC,CAAC;QACtD,CAAC;QAED,YAAY,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAC;IAIF,MAAM,eAAe,GAA4B,KAAK,EACpD,SAAoB,EACL,EAAE;QACjB,MAAM,WAAW,GAAa,SAAS,CAAC,EAAG,CAAC;QAE5C,IAAI,CAAC;YACH,QAAQ,CAAC,EAAE,CAAC,CAAC;YACb,YAAY,CAAC,IAAI,CAAC,CAAC;YAEnB,MAAM,QAAQ,CAAC,UAAU,CAAC;gBACxB,SAAS,EAAE,SAAS;gBACpB,EAAE,EAAE,WAAW;aAChB,CAAC,CAAC;YAEH,MAAM,eAAe,EAAE,CAAC;QAC1B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,QAAQ,CAAC,GAAG,CAAC,uBAAuB,CAAC,GAAY,CAAC,CAAC,CAAC;QACtD,CAAC;QAED,YAAY,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,eAAe,EAAE,CAAC,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;YACrC,QAAQ,CAAC,GAAG,CAAC,uBAAuB,CAAC,GAAY,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAMP,MAAM,mCAAmC,GACvC,CAAC,IAAe,EAAgB,EAAE;QAChC,OAAO,CACL,6BAAK,SAAS,EAAC,MAAM;YACnB,6BAAK,SAAS,EAAC,cAAc;gBAC3B,oBAAC,IAAI,IACH,IAAI,EAAE,QAAQ,CAAC,IAAI,EACnB,SAAS,EAAC,mCAAmC,EAC7C,IAAI,EAAE,QAAQ,CAAC,OAAO,EACtB,KAAK,EAAE,SAAS,CAAC,KAAK,EACtB,OAAO,EAAE,GAAG,EAAE;wBACZ,kBAAkB,CAAC,IAAI,CAAC,CAAC;oBAC3B,CAAC,GACD,CACE;YACN,6BAAK,SAAS,EAAC,SAAS;gBACtB,oBAAC,IAAI,IACH,SAAS,EAAC,mCAAmC,EAC7C,IAAI,EAAE,QAAQ,CAAC,KAAK,EACpB,IAAI,EAAE,QAAQ,CAAC,OAAO,EACtB,KAAK,EAAE,SAAS,CAAC,KAAK,EACtB,OAAO,EAAE,GAAG,EAAE;wBACZ,oBAAoB,CAAC,IAAI,CAAC,CAAC;oBAC7B,CAAC,GACD,CACE,CACF,CACP,CAAC;IACJ,CAAC,CAAC;IAIJ,MAAM,YAAY,GAAyB,GAAwB,EAAE;QACnE,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,IAAe,EAAE,KAAa,EAAE,EAAE;YAC1D,OAAO,CACL,oBAAC,YAAY,IACX,GAAG,EAAE,KAAK,EACV,YAAY,EAAE,mCAAmC,CAAC,IAAI,CAAC,EACvD,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE,EACrB,SAAS,EAAC,mCAAmC,EAC7C,IAAI,EAAE,QAAQ,CAAC,MAAM,EACrB,OAAO,EAAE,GAAG,EAAE;;oBACZ,MAAA,KAAK,CAAC,YAAY,sDAAG,IAAI,CAAC,CAAC;oBAC3B,wBAAwB,CAAC,IAAI,CAAC,CAAC;gBACjC,CAAC,GACD,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,eAAe,GACnB,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAuC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAExE;;;;;;;;OAQG;IACH,MAAM,aAAa,GAAY,OAAO,CACpC,KAAK,CAAC,iBAAiB;QACrB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAU,EAAE,EAAE;YACzD,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;gBAClC,OAAO,KAAK,CAAC;YACf,CAAC;YACD,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrB,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YACtB,CAAC;YACD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAC1B,OAAO,MAAM,CAAC,MAAM,CAAC,CAA4B,CAAC,CAAC,IAAI,CACrD,CAAC,KAAc,EAAE,EAAE;oBACjB,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAClE,CAAC,CACF,CAAC;YACJ,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CACL,CAAC;IAEF,MAAM,gBAAgB,GAAY,eAAe,IAAI,aAAa,CAAC;IAEnE;;;OAGG;IACH,MAAM,eAAe,GAAY,OAAO,CACtC,KAAK,CAAC,cAAc;QAClB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,cAA4B,CAAC,CAAC,MAAM,GAAG,CAAC,CAC7D,CAAC;IAEF,MAAM,eAAe,GAAY,gBAAgB,IAAI,eAAe,CAAC;IAErE,MAAM,eAAe,GACnB,GAAwB,EAAE;QACxB,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,CAAC,oBAAC,SAAS,IAAC,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,EAAC,yBAAyB,GAAG,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,QAAQ,GAAwB,EAAE,CAAC;QAEzC,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,QAAQ,CAAC,IAAI,CACX,oBAAC,eAAe,IAAC,KAAK,EAAC,aAAa,IACjC,YAAY,EAAE,CACC,CACnB,CAAC;QACJ,CAAC;QAED,IAAI,eAAe,EAAE,CAAC;YACpB,QAAQ,CAAC,IAAI,CACX,oBAAC,YAAY,IACX,GAAG,EAAE,eAAe,EACpB,IAAI,EAAC,kBAAkB,EACvB,SAAS,EAAC,kFAAkF,EAC5F,IAAI,EAAE,QAAQ,CAAC,GAAG,EAClB,aAAa,EAAC,EAAE,EAChB,OAAO,EAAE,GAAG,EAAE;oBACZ,yBAAyB,CAAC,IAAI,CAAC,CAAC;gBAClC,CAAC,GACa,CACjB,CAAC;QACJ,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;IAEJ,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CACL,oBAAC,YAAY,IACX,KAAK,EAAE,yBAAyB,EAChC,WAAW,EAAE,KAAK,EAClB,SAAS,EAAE,KAAK,EAChB,gBAAgB,EAAE,OAAO,EACzB,QAAQ,EAAE,GAAG,EAAE;gBACb,OAAO,QAAQ,CAAC,EAAE,CAAC,CAAC;YACtB,CAAC,GACD,CACH,CAAC;IACJ,CAAC;IAED,IAAI,eAAe,EAAE,CAAC;QACpB,OAAO,CACL,oBAAC,cAAc,IACb,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,eAAe,CAAC,EAAG,EAClC,IAAI,EAAC,WAAW,EAChB,KAAK,EAAC,WAAW,EACjB,WAAW,EAAC,sDAAsD,EAClE,OAAO,EAAE,GAAG,EAAE;gBACZ,kBAAkB,CAAC,SAAS,CAAC,CAAC;YAChC,CAAC,EACD,gBAAgB,EAAC,cAAc,EAC/B,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,kBAAkB,CAAC,SAAS,CAAC,CAAC;gBAE9B,MAAM,eAAe,EAAE,CAAC;YAC1B,CAAC,EACD,SAAS,EAAE;gBACT,IAAI,EAAE,WAAW;gBACjB,SAAS,EAAE,SAAS;gBACpB,EAAE,EAAE,iBAAiB;gBACrB,MAAM,EAAE;oBACN;wBACE,KAAK,EAAE;4BACL,IAAI,EAAE,IAAI;yBACX;wBACD,SAAS,EAAE,mBAAmB,CAAC,IAAI;wBACnC,WAAW,EAAE,kBAAkB;wBAC/B,WAAW,EAAE,uCAAuC;wBACpD,KAAK,EAAE,MAAM;wBACb,QAAQ,EAAE,IAAI;qBACf;iBACF;gBACD,QAAQ,EAAE,QAAQ,CAAC,MAAM;aAC1B,GACD,CACH,CAAC;IACJ,CAAC;IAED,IAAI,iBAAiB,EAAE,CAAC;QACtB,OAAO,CACL,oBAAC,YAAY,IACX,WAAW,EAAE,0CAA0C,iBAAiB,CAAC,IAAI,GAAG,EAChF,KAAK,EAAE,UAAU,iBAAiB,CAAC,IAAI,EAAE,EACzC,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,KAAK,IAAI,EAAE;gBACnB,MAAM,eAAe,CAAC,iBAAiB,CAAC,CAAC;gBACzC,oBAAoB,CAAC,SAAS,CAAC,CAAC;YAClC,CAAC,EACD,OAAO,EAAE,GAAG,EAAE;gBACZ,oBAAoB,CAAC,SAAS,CAAC,CAAC;YAClC,CAAC,EACD,gBAAgB,EAAE,QAAQ,EAC1B,gBAAgB,EAAE,eAAe,CAAC,MAAM,GACxC,CACH,CAAC;IACJ,CAAC;IAED,IAAI,sBAAsB,EAAE,CAAC;QAC3B,OAAO,CACL,oBAAC,cAAc,IACb,SAAS,EAAE,SAAS,EACpB,IAAI,EAAC,eAAe,EACpB,KAAK,EAAC,eAAe,EACrB,WAAW,EAAC,wDAAwD,EACpE,OAAO,EAAE,GAAG,EAAE;gBACZ,yBAAyB,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC,EACD,gBAAgB,EAAC,cAAc,EAC/B,cAAc,EAAE,CAAC,SAAoB,EAAE,EAAE;gBACvC,IAAI,IAAI,GAAY,EAAE,CAAC;gBAEvB,IAAI,KAAK,CAAC,gBAAgB,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;oBAClD,IAAI,GAAG;wBACL,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,KAAK,CAAC,gBAAgB;qBACnC,CAAC;gBACf,CAAC;gBAED,SAAS,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;gBAClC,SAAS,CAAC,KAAK;oBACZ,KAAK,CAAC,YAEL,IAAI,EAAE,CAAC;gBACX,SAAS,CAAC,WAAW,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,kBAAkB,KAAI,EAAE,CAAC;gBACxD,SAAS,CAAC,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;gBAC5B,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;oBAC5B,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC,iBAAiB,CAAC;gBAC7C,CAAC;gBACD,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;oBACzB,SAAS,CAAC,OAAO,GAAG,KAAK,CAAC,cAAc,CAAC;gBAC3C,CAAC;gBACD,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACpC,CAAC,EACD,SAAS,EAAE,KAAK,EAAE,SAAoB,EAAE,EAAE;;gBACxC,yBAAyB,CAAC,KAAK,CAAC,CAAC;gBACjC,MAAM,eAAe,EAAE,CAAC;gBACxB,sBAAsB;gBACtB,MAAA,KAAK,CAAC,YAAY,sDAAG,SAAS,CAAC,CAAC;YAClC,CAAC,EACD,SAAS,EAAE;gBACT,IAAI,EAAE,eAAe;gBACrB,SAAS,EAAE,SAAS;gBACpB,EAAE,EAAE,iBAAiB;gBACrB,MAAM,EAAE;oBACN;wBACE,KAAK,EAAE;4BACL,IAAI,EAAE,IAAI;yBACX;wBACD,SAAS,EAAE,mBAAmB,CAAC,IAAI;wBACnC,WAAW,EAAE,kBAAkB;wBAC/B,WAAW,EAAE,uCAAuC;wBACpD,KAAK,EAAE,MAAM;wBACb,QAAQ,EAAE,IAAI;qBACf;iBACF;gBACD,QAAQ,EAAE,QAAQ,CAAC,MAAM;aAC1B,GACD,CACH,CAAC;IACJ,CAAC;IAID,MAAM,kCAAkC,GACtC,GAAiB,EAAE;QACjB;;;WAGG;QACH,MAAM,WAAW,GACf,2HAA2H,CAAC;QAE9H,IAAI,qBAAqB,EAAE,CAAC;YAC1B,OAAO,CACL,6BACE,SAAS,EAAE,GAAG,WAAW,6FAA6F,EACtH,KAAK,EAAE,eAAe,qBAAqB,CAAC,IAAI,EAAE;gBAElD,oBAAC,IAAI,IACH,IAAI,EAAE,QAAQ,CAAC,QAAQ,EACvB,SAAS,EAAC,mCAAmC,GAC7C;gBACF,8BAAM,SAAS,EAAC,mEAAmE;oBACjF,8BAAM,SAAS,EAAC,kEAAkE,WAE3E;oBACP,8BAAM,SAAS,EAAC,8CAA8C,IAC3D,qBAAqB,CAAC,IAAI,CACtB,CACF;gBACP,6CACc,MAAM,EAClB,SAAS,EAAC,+BAA+B,GACzC;gBACF,gCACE,IAAI,EAAC,QAAQ,gBACF,kBAAkB,EAC7B,KAAK,EAAC,kBAAkB,EACxB,SAAS,EAAC,8MAA8M,EACxN,OAAO,EAAE,CAAC,KAA0C,EAAE,EAAE;;wBACtD,KAAK,CAAC,eAAe,EAAE,CAAC;wBACxB,wBAAwB,CAAC,IAAI,CAAC,CAAC;wBAC/B,MAAA,KAAK,CAAC,YAAY,sDAAG,IAAI,CAAC,CAAC;wBAC3B,iBAAiB,EAAE,CAAC;oBACtB,CAAC;oBAED,oBAAC,IAAI,IAAC,IAAI,EAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAC,SAAS,GAAG,CAC3C;gBACT,oBAAC,IAAI,IACH,IAAI,EAAE,QAAQ,CAAC,WAAW,EAC1B,SAAS,EAAC,uCAAuC,GACjD,CACE,CACP,CAAC;QACJ,CAAC;QAED,OAAO,CACL,6BACE,SAAS,EAAE,GAAG,WAAW,gFAAgF,EACzG,KAAK,EAAC,aAAa;YAEnB,oBAAC,IAAI,IACH,IAAI,EAAE,QAAQ,CAAC,QAAQ,EACvB,SAAS,EAAC,iCAAiC,GAC3C;YACF,8BAAM,SAAS,EAAC,SAAS,kBAAmB;YAC3C,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,CAC3B,8BAAM,SAAS,EAAC,gIAAgI,IAC7I,aAAa,CAAC,MAAM,CAAC,cAAc,EAAE,CACjC,CACR;YACD,oBAAC,IAAI,IACH,IAAI,EAAE,QAAQ,CAAC,WAAW,EAC1B,SAAS,EAAC,qCAAqC,GAC/C,CACE,CACP,CAAC;IACJ,CAAC,CAAC;IAEJ,MAAM,iBAAiB,GAAiB,GAAS,EAAE;QACjD,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACvB,WAAW,CAAC,OAAe,CAAC,aAAa,EAAE,CAAC;QAC/C,CAAC;IACH,CAAC,CAAC;IAEF,IACE,CAAC,SAAS;QACV,aAAa,CAAC,MAAM,KAAK,CAAC;QAC1B,CAAC,eAAe;QAChB,CAAC,qBAAqB,EACtB,CAAC;QACD,OAAO,yCAAK,CAAC;IACf,CAAC;IAED,OAAO,CACL,oBAAC,QAAQ,IACP,+BAA+B,EAAE,kCAAkC,EAAE,EACrE,GAAG,EAAE,WAAW,IAEf,eAAe,EAAE,CACT,CACZ,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}