@oneuptime/common 11.7.2 → 11.7.4

package/build/dist/UI/Components/Modal/Modal.js

@@ -1,6 +1,6 @@
 import { ButtonStyleType } from "../Button/Button";
 import ButtonType from "../Button/ButtonTypes";
-import Icon, { IconType, SizeProp, ThickProp } from "../Icon/Icon";
+import Icon from "../Icon/Icon";
 import Loader, { LoaderType } from "../Loader/Loader";
 import ModalBody from "./ModalBody";
 import ModalFooter from "./ModalFooter";
@@ -96,29 +96,6 @@ const Modal = (props) => {
             }
         };
     }, []);
-    let iconBgColor = "bg-indigo-50";
-    let iconColor = "text-indigo-600";
-    let iconRingColor = "ring-indigo-100";
-    if (props.iconType === IconType.Info) {
-        iconBgColor = "bg-indigo-50";
-        iconColor = "text-indigo-600";
-        iconRingColor = "ring-indigo-100";
-    }
-    else if (props.iconType === IconType.Warning) {
-        iconBgColor = "bg-yellow-50";
-        iconColor = "text-yellow-700";
-        iconRingColor = "ring-yellow-100";
-    }
-    else if (props.iconType === IconType.Success) {
-        iconBgColor = "bg-green-50";
-        iconColor = "text-green-600";
-        iconRingColor = "ring-green-100";
-    }
-    else if (props.iconType === IconType.Danger) {
-        iconBgColor = "bg-red-50";
-        iconColor = "text-red-600";
-        iconRingColor = "ring-red-100";
-    }
     let modalWidthClassName = "sm:max-w-lg md:max-w-lg";
     if (props.modalWidth === ModalWidth.Medium) {
         modalWidthClassName = "sm:max-w-3xl md:max-w-3xl";
@@ -132,14 +109,9 @@ const Modal = (props) => {
             React.createElement("div", { className: "flex min-h-full items-end justify-center p-0 text-center sm:items-center sm:p-6" },
                 React.createElement("div", { ref: modalRef, className: `relative flex max-h-[calc(100vh-1rem)] w-full flex-col rounded-t-2xl border border-gray-200/80 bg-white text-left shadow-2xl ring-1 ring-black/5 sm:my-8 sm:max-h-[calc(100vh-3rem)] sm:rounded-xl ${modalWidthClassName}`, "data-testid": "modal", "aria-labelledby": titleId, "aria-describedby": translatedDescription ? descriptionId : undefined, role: "dialog", "aria-modal": "true", tabIndex: -1 },
                     React.createElement("div", { className: "relative flex shrink-0 flex-col gap-4 rounded-t-2xl border-b border-gray-100 bg-white px-5 py-4 sm:flex-row sm:items-start sm:justify-between sm:gap-6 sm:rounded-t-xl sm:px-6" },
-                        React.createElement("div", { className: `flex min-w-0 flex-1 items-start gap-3 ${props.onClose ? "pr-9 sm:pr-0" : ""}` },
-                            props.icon && (React.createElement("div", { className: `flex h-9 w-9 flex-shrink-0 items-center justify-center rounded-lg ${iconBgColor} ring-1 ring-inset ${iconRingColor}`, "data-testid": "icon" },
-                                React.createElement(Icon, { thick: ThickProp.Thick, type: props.iconType === undefined
-                                        ? IconType.Info
-                                        : props.iconType, className: `${iconColor} h-5 w-5`, icon: props.icon, size: SizeProp.Five }))),
-                            React.createElement("div", { className: "min-w-0 flex-1" },
-                                React.createElement("h3", { "data-testid": "modal-title", className: "text-base font-semibold leading-6 tracking-tight text-gray-900", id: titleId }, translatedTitle),
-                                translatedDescription && (React.createElement("p", { id: descriptionId, "data-testid": "modal-description", className: "mt-0.5 text-sm leading-5 text-gray-500" }, translatedDescription)))),
+                        React.createElement("div", { className: `min-w-0 flex-1 ${props.onClose ? "pr-9 sm:pr-0" : ""}` },
+                            React.createElement("h3", { "data-testid": "modal-title", className: "text-base font-semibold leading-6 tracking-tight text-gray-900", id: titleId }, translatedTitle),
+                            translatedDescription && (React.createElement("p", { id: descriptionId, "data-testid": "modal-description", className: "mt-0.5 text-sm leading-5 text-gray-500" }, translatedDescription))),
                         props.rightElement && (React.createElement("div", { "data-testid": "right-element", className: `flex-shrink-0 ${props.onClose ? "pr-9" : ""}` }, props.rightElement)),
                         props.onClose && (React.createElement("button", { type: "button", title: translatedCloseLabel, "aria-label": translatedCloseLabel, "data-testid": "close-button", onClick: props.onClose, className: "absolute right-4 top-4 inline-flex h-8 w-8 items-center justify-center rounded-md text-gray-400 transition-colors hover:bg-gray-100 hover:text-gray-700 focus:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500 focus-visible:ring-offset-2" },
                             React.createElement(Icon, { icon: IconProp.Close, className: "h-4 w-4" })))),

package/build/dist/UI/Components/Modal/Modal.js.map

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

package/build/dist/UI/Components/ModelFormModal/ModelFormModal.js.map

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

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

@@ -25,6 +25,10 @@ import OrderedStatesList from "../OrderedStatesList/OrderedStatesList";
 import Pill from "../Pill/Pill";
 import Table from "../Table/Table";
 import FieldType from "../Types/FieldType";
+import ColumnCustomizationModal from "./ColumnCustomizationModal";
+import { applyColumnPreference, buildColumnPreference, fromJSON as columnPreferenceFromJSON, getCustomizableColumns, isEmptyColumnPreference, sanitizeColumnPreference, getColumnIds, toJSON as columnPreferenceToJSON, } from "./ColumnPreference";
+import { CustomFieldsColumnKey } from "./CustomFieldColumns";
+import useCustomFieldColumns from "./useCustomFieldColumns";
 import { getExportKeysFromColumn } from "./ExportFromColumns";
 import { getRelationSelectFromColumns, getSelectFromColumns, } from "./SelectFromColumns";
 import AnalyticsBaseModel from "../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
@@ -110,6 +114,83 @@ const BaseModelTable = (props) => {
     const [showHelpModal, setShowHelpModal] = useState(false);
     const [viewId, setViewId] = useState(null);
     const [tableColumns, setColumns] = useState([]);
+    /*
+     * ---------------------------------------------------------------------
+     * Viewer-customizable columns
+     * ---------------------------------------------------------------------
+     *
+     * The viewer's layout (which columns are on, and in what order) is a
+     * personal, presentational preference, so it lives in localStorage next to
+     * the page size rather than on the server: saved views are named, explicit,
+     * plan-gated and need write permission, none of which should stand between
+     * someone and hiding a column they don't care about. A saved view can still
+     * carry a layout of its own, and when one is active it wins.
+     *
+     * Custom fields are appended to the declared columns as additional,
+     * off-by-default columns; from here on they are ordinary columns.
+     */
+    const customFieldColumns = useCustomFieldColumns({
+        customFieldsModelType: props.customFieldsModelType,
+    });
+    const isColumnCustomizationEnabled = Boolean(!props.disableColumnCustomization &&
+        props.userPreferencesKey &&
+        showAs !== ShowAs.OrderedStatesList);
+    const allColumns = useMemo(() => {
+        if (customFieldColumns.columns.length === 0) {
+            return props.columns || [];
+        }
+        return [...(props.columns || []), ...customFieldColumns.columns];
+    }, [props.columns, customFieldColumns.columns]);
+    const readStoredColumnPreference = () => {
+        if (!props.userPreferencesKey) {
+            return null;
+        }
+        return columnPreferenceFromJSON(UserPreferences.getUserPreferenceByTypeAsJSON({
+            key: props.userPreferencesKey,
+            userPreferenceType: UserPreferenceType.BaseModelTableColumns,
+        }));
+    };
+    const [columnPreference, setColumnPreference] = useState(readStoredColumnPreference);
+    const [showColumnCustomizationModal, setShowColumnCustomizationModal] = useState(false);
+    /*
+     * Ids are derived over the *whole* declared set, so a column dropping out
+     * for lack of permission can never renumber the ones that remain.
+     */
+    const allColumnIds = useMemo(() => {
+        return getColumnIds(allColumns);
+    }, [allColumns]);
+    const effectiveColumnPreference = useMemo(() => {
+        if (!isColumnCustomizationEnabled) {
+            return null;
+        }
+        /*
+         * A stored layout outlives the release that wrote it, so anything naming
+         * a column this table no longer has is dropped before it is applied.
+         */
+        return sanitizeColumnPreference({
+            preference: columnPreference,
+            knownColumnIds: allColumnIds,
+        });
+    }, [columnPreference, allColumnIds, isColumnCustomizationEnabled]);
+    const saveColumnPreference = (preference) => {
+        setColumnPreference(preference);
+        if (!props.userPreferencesKey) {
+            return;
+        }
+        const json = columnPreferenceToJSON(preference);
+        if (!json) {
+            UserPreferences.removeUserPreferenceByType({
+                key: props.userPreferencesKey,
+                userPreferenceType: UserPreferenceType.BaseModelTableColumns,
+            });
+            return;
+        }
+        UserPreferences.saveUserPreferenceByTypeAsJSON({
+            key: props.userPreferencesKey,
+            userPreferenceType: UserPreferenceType.BaseModelTableColumns,
+            value: json,
+        });
+    };
     const [classicTableFilters, setClassicTableFilters] = useState([]);
     const [cardButtons, setCardButtons] = useState([]);
     const [actionButtonSchema, setActionButtonSchema] = useState([]);
@@ -199,10 +280,48 @@ const BaseModelTable = (props) => {
     const [isLoading, setIsLoading] = useState(true);
     const [error, setError] = useState("");
     const [tableFilterError, setTableFilterError] = useState("");
+    const labelFilterConfig = useMemo(() => {
+        const filter = props.filters.find((f) => {
+            return (f.filterEntityType &&
+                f.filterEntityType.name === "Label" &&
+                f.field &&
+                f.filterDropdownField);
+        });
+        if (!filter || !filter.field || !filter.filterDropdownField) {
+            return null;
+        }
+        const fieldKey = Object.keys(filter.field)[0];
+        if (!fieldKey) {
+            return null;
+        }
+        return {
+            fieldKey,
+            entityType: filter.filterEntityType,
+            fetchQuery: filter.filterQuery || {},
+            labelField: filter.filterDropdownField.label,
+        };
+    }, [props.filters]);
+    /*
+     * The label chips are a feature of the in-search Label filter, so a table
+     * without one has to ignore the URL's `labels` slice entirely.
+     *
+     * Tables that have since moved Labels out to a facet chip (Monitors,
+     * Network Devices) still receive `labels` from older shared/bookmarked
+     * links. Seeding those ids anyway produced a chip the table could neither
+     * name (`availableLabels` is only fetched when there *is* a config) nor
+     * apply (`buildSearchQueryFragment` skips the constraint for the same
+     * reason): a force-expanded search box with a raw-UUID pill sitting above a
+     * completely unfiltered list, re-persisted on every write until the user
+     * clicked its ×. Dropping it here also means the next view write omits the
+     * key, so the URL heals itself.
+     */
+    const restoredLabelIds = labelFilterConfig
+        ? initialUrlState.view.labels || []
+        : [];
     const [searchText, setSearchText] = useState(initialUrlState.view.search || "");
     const [debouncedSearchText, setDebouncedSearchText] = useState(initialUrlState.view.search || "");
     const [isSearchFocused, setIsSearchFocused] = useState(false);
-    const [isSearchExpanded, setIsSearchExpanded] = useState(Boolean(initialUrlState.view.search || (initialUrlState.view.labels || []).length));
+    const [isSearchExpanded, setIsSearchExpanded] = useState(Boolean(initialUrlState.view.search || restoredLabelIds.length));
     const searchInputRef = React.useRef(null);
     const [availableLabels, setAvailableLabels] = useState([]);
     /*
@@ -211,7 +330,7 @@ const BaseModelTable = (props) => {
      * are filled in by the hydration effect below once the label list loads.
      */
     const [selectedLabels, setSelectedLabels] = useState(() => {
-        return (initialUrlState.view.labels || []).map((id) => {
+        return restoredLabelIds.map((id) => {
             return { id: id, name: id, color: "#94a3b8" };
         });
     });
@@ -294,27 +413,24 @@ const BaseModelTable = (props) => {
         // reset to first page whenever the active search term or labels change
         setCurrentPageNumber(1);
     }, [debouncedSearchText, selectedLabelIdsKey]);
-    const labelFilterConfig = useMemo(() => {
-        const filter = props.filters.find((f) => {
-            return (f.filterEntityType &&
-                f.filterEntityType.name === "Label" &&
-                f.field &&
-                f.filterDropdownField);
-        });
-        if (!filter || !filter.field || !filter.filterDropdownField) {
-            return null;
-        }
-        const fieldKey = Object.keys(filter.field)[0];
-        if (!fieldKey) {
-            return null;
+    /*
+     * `props.filters` is not frozen — a page can rebuild it after mount, and
+     * that is exactly how a Labels filter leaves the popup for the facet bar.
+     * Chips left over from a config that no longer exists are unnameable and
+     * unappliable, so drop them here too rather than only at mount.
+     */
+    useEffect(() => {
+        if (labelFilterConfig) {
+            return;
         }
-        return {
-            fieldKey,
-            entityType: filter.filterEntityType,
-            fetchQuery: filter.filterQuery || {},
-            labelField: filter.filterDropdownField.label,
-        };
-    }, [props.filters]);
+        setSelectedLabels((existing) => {
+            /*
+             * Same array when there is nothing to clear, so this costs an idle table
+             * no re-render.
+             */
+            return existing.length === 0 ? existing : [];
+        });
+    }, [labelFilterConfig]);
     // Fetch labels on first search expansion if this resource supports them.
     useEffect(() => {
         if (!isSearchExpanded || !labelFilterConfig || labelsFetched) {
@@ -496,8 +612,11 @@ const BaseModelTable = (props) => {
         }
     }, [tableColumns]);
     const getRelationSelect = () => {
+        /*
+         * Deliberately the *unfiltered* column set. See getSelect() below.
+         */
         return getRelationSelectFromColumns({
-            columns: props.columns || [],
+            columns: allColumns,
             model: model,
         });
     };
@@ -530,7 +649,21 @@ const BaseModelTable = (props) => {
         selectFields = props.callbacks.addSlugToSelect(selectFields);
         const userPermissions = getUserPermissions();
         const accessControl = model.getColumnAccessControlForAllColumns();
-        for (const column of props.columns || []) {
+        /*
+         * The viewer's layout is applied to the *input* of this loop, never to
+         * the finished array: the Actions column is appended below and has to
+         * stay last, and it is generated rather than declared, so it is not the
+         * viewer's to move or switch off.
+         */
+        const columnsToRender = applyColumnPreference({
+            columns: allColumns,
+            preference: effectiveColumnPreference,
+        });
+        const columnIdByColumn = new Map();
+        allColumns.forEach((column, index) => {
+            columnIdByColumn.set(column, allColumnIds[index]);
+        });
+        for (const column of columnsToRender) {
             const hasPermission = hasPermissionToReadColumn(column) || User.isMasterAdmin();
             const key = getColumnKey(column);
             if (hasPermission) {
@@ -550,7 +683,7 @@ const BaseModelTable = (props) => {
                         "." +
                         column.selectedProperty)
                     : key;
-                columns.push(Object.assign(Object.assign({}, column), { disableSort: column.disableSort || shouldDisableSort(key), key: columnKey, 
+                columns.push(Object.assign(Object.assign({}, column), { id: columnIdByColumn.get(column), disableSort: column.disableSort || shouldDisableSort(key), key: columnKey, 
                     /*
                      * `key` is only the first declared field, so a cell composed from
                      * several of them would export just that one. Hand the exporter
@@ -1065,13 +1198,35 @@ const BaseModelTable = (props) => {
         });
     }, []);
     const getSelect = () => {
+        /*
+         * Every declared column, including the ones the viewer has switched off.
+         *
+         * Hiding must not narrow the request. A column's `getElement` is arbitrary
+         * caller code that can read any field on the row — a "Status" cell that
+         * also reads `currentMonitorStatus`, say — so dropping a hidden column's
+         * fields from the select would silently blank a *different*, visible cell,
+         * and there is no way to detect that statically. The sort field is
+         * likewise independent of what is on screen. The cost is a few unused
+         * fields on the wire.
+         */
         const selectFields = getSelectFromColumns({
-            columns: props.columns || [],
+            columns: allColumns,
             model: model,
             hasPermissionToReadField: (field) => {
                 return hasPermissionToReadField(field);
             },
         });
+        /*
+         * Custom field columns arrive asynchronously, but the table does not
+         * refetch when its column set changes — so the JSON column that backs
+         * every one of them is selected up front, off the synchronous prop, and
+         * the values are there the moment the definitions land.
+         */
+        if (props.customFieldsModelType &&
+            model.hasColumn(CustomFieldsColumnKey) &&
+            hasPermissionToReadField(CustomFieldsColumnKey)) {
+            selectFields[CustomFieldsColumnKey] = true;
+        }
         const selectMoreFields = props.selectMoreFields
             ? Object.keys(props.selectMoreFields)
             : [];
@@ -1102,7 +1257,7 @@ const BaseModelTable = (props) => {
             return React.createElement(React.Fragment, null);
         }
         if (props.saveFilterProps && props.saveFilterProps.tableId) {
-            return (React.createElement(TableViewElement, { tableId: props.saveFilterProps.tableId, tableView: tableView, currentQuery: query, currentSortBy: sortBy, currentItemsOnPage: itemsOnPage, currentSortOrder: sortOrder, currentFacetState: props.currentFacetState, onViewChange: async (tableView) => {
+            return (React.createElement(TableViewElement, { tableId: props.saveFilterProps.tableId, tableView: tableView, currentQuery: query, currentSortBy: sortBy, currentItemsOnPage: itemsOnPage, currentSortOrder: sortOrder, currentFacetState: props.currentFacetState, currentColumns: columnPreferenceToJSON(effectiveColumnPreference) || undefined, onViewChange: async (tableView) => {
                     var _a;
                     setTableView(tableView);
                     if (tableView) {
@@ -1128,6 +1283,15 @@ const BaseModelTable = (props) => {
                         if (props.onFacetStateRestored) {
                             props.onFacetStateRestored(tableView.facets || null);
                         }
+                        /*
+                         * A saved view carries the columns it was saved with. Views
+                         * created before this existed have none, which restores the
+                         * table's default layout rather than leaving the previous
+                         * view's columns in place.
+                         */
+                        if (isColumnCustomizationEnabled) {
+                            saveColumnPreference(columnPreferenceFromJSON(tableView.columns || null));
+                        }
                     }
                     else {
                         setQuery({});
@@ -1145,6 +1309,12 @@ const BaseModelTable = (props) => {
                         if (props.onFacetStateRestored) {
                             props.onFacetStateRestored(null);
                         }
+                        /*
+                         * Columns are deliberately left alone here. Clearing a saved
+                         * view means "stop filtering like that", not "throw away the
+                         * column layout I built" - which the viewer may well have set
+                         * up long before this view existed.
+                         */
                     }
                 } }));
         }
@@ -1252,6 +1422,22 @@ const BaseModelTable = (props) => {
                 icon: IconProp.Filter,
             });
         }
+        /*
+         * Only worth offering once there is a choice to make. A single-column
+         * table has nothing to hide and nothing to reorder.
+         */
+        if (isColumnCustomizationEnabled && allColumns.length > 1) {
+            headerbuttons.push({
+                title: "",
+                buttonStyle: ButtonStyleType.ICON,
+                buttonSize: ButtonSize.Small,
+                className: "",
+                onClick: () => {
+                    setShowColumnCustomizationModal(true);
+                },
+                icon: IconProp.TableCells,
+            });
+        }
         setCardButtons(headerbuttons);
     };
     useEffect(() => {
@@ -1350,6 +1536,13 @@ const BaseModelTable = (props) => {
     useEffect(() => {
         serializeToTableColumns();
     }, [props.columns]);
+    /*
+     * The viewer changed their layout, or the project's custom field
+     * definitions finally arrived.
+     */
+    useEffect(() => {
+        serializeToTableColumns();
+    }, [effectiveColumnPreference, customFieldColumns.columns]);
     const setActionSchema = () => {
         const permissions = PermissionUtil.getAllPermissions();
         const actionsSchema = [];
@@ -1892,17 +2085,18 @@ const BaseModelTable = (props) => {
                     }, role: "presentation" },
                     React.createElement(Icon, { icon: IconProp.Search, className: `h-4 w-4 flex-none transition-colors duration-200 ${iconColorClass}` }),
                     React.createElement("div", { className: "flex min-w-0 flex-1 flex-wrap items-center gap-1.5" },
-                        selectedLabels.map((label) => {
-                            return (React.createElement("span", { key: label.id, className: "inline-flex items-center gap-1 rounded-full bg-gray-50 py-0.5 pl-2 pr-1 text-xs font-medium text-gray-700 ring-1 ring-inset ring-gray-200 transition-all hover:bg-gray-100", title: `Label: ${label.name}` },
-                                React.createElement("span", { className: "h-2 w-2 flex-none rounded-full", style: { backgroundColor: label.color }, "aria-hidden": "true" }),
-                                React.createElement("span", { className: "max-w-[8rem] truncate" }, label.name),
-                                React.createElement("button", { type: "button", onMouseDown: (e) => {
-                                        e.preventDefault();
-                                    }, onClick: () => {
-                                        removeLabel(label.id);
-                                    }, title: "Remove label", "aria-label": `Remove ${label.name}`, className: "ml-0.5 flex-none rounded-full p-0.5 text-gray-400 transition-colors hover:bg-gray-200 hover:text-gray-700" },
-                                    React.createElement(Icon, { icon: IconProp.Close, className: "h-3 w-3" }))));
-                        }),
+                        hasLabelSupport &&
+                            selectedLabels.map((label) => {
+                                return (React.createElement("span", { key: label.id, className: "inline-flex items-center gap-1 rounded-full bg-gray-50 py-0.5 pl-2 pr-1 text-xs font-medium text-gray-700 ring-1 ring-inset ring-gray-200 transition-all hover:bg-gray-100", title: `Label: ${label.name}` },
+                                    React.createElement("span", { className: "h-2 w-2 flex-none rounded-full", style: { backgroundColor: label.color }, "aria-hidden": "true" }),
+                                    React.createElement("span", { className: "max-w-[8rem] truncate" }, label.name),
+                                    React.createElement("button", { type: "button", onMouseDown: (e) => {
+                                            e.preventDefault();
+                                        }, onClick: () => {
+                                            removeLabel(label.id);
+                                        }, title: "Remove label", "aria-label": `Remove ${label.name}`, className: "ml-0.5 flex-none rounded-full p-0.5 text-gray-400 transition-colors hover:bg-gray-200 hover:text-gray-700" },
+                                        React.createElement(Icon, { icon: IconProp.Close, className: "h-3 w-3" }))));
+                            }),
                         React.createElement("input", { ref: searchInputRef, type: "text", value: searchText, onChange: (e) => {
                                 setSearchText(e.target.value);
                                 setLabelDropdownIndex(0);
@@ -2091,6 +2285,8 @@ const BaseModelTable = (props) => {
                 return "Watch Demo";
             case IconProp.Search:
                 return "Search";
+            case IconProp.TableCells:
+                return "Columns";
             default:
                 return "Action";
         }
@@ -2186,6 +2382,77 @@ const BaseModelTable = (props) => {
     const getCardHeaderTitle = (originalTitle) => {
         return originalTitle;
     };
+    /*
+     * A column the viewer cannot read is left out of the picker entirely.
+     * Listing it would advertise a field they have no access to, and switching
+     * it on would put that field in the select — which the API rejects for the
+     * whole request, blanking the table.
+     */
+    const isPickableColumn = (column) => {
+        if (column.isNotCustomizable) {
+            return false;
+        }
+        return hasPermissionToReadColumn(column) || User.isMasterAdmin();
+    };
+    const getPickerEntries = (preference) => {
+        return getCustomizableColumns({
+            columns: allColumns,
+            preference: preference,
+        }).filter((entry) => {
+            return isPickableColumn(entry.column);
+        });
+    };
+    // Mirrors how serializeToTableColumns derives the key the header sorts on.
+    const getColumnSortKey = (column) => {
+        const key = getColumnKey(column);
+        if (!key) {
+            return null;
+        }
+        return column.selectedProperty
+            ? `${String(key)}.${column.selectedProperty}`
+            : String(key);
+    };
+    const onColumnCustomizationSave = (entries) => {
+        const preference = buildColumnPreference(entries);
+        /*
+         * If the layout the viewer just saved matches what the table ships with,
+         * store nothing. Otherwise every table anyone ever opened the picker on
+         * would be pinned to the column set of the release they opened it in, and
+         * columns added later would arrive already stale.
+         */
+        const defaultPreference = buildColumnPreference(getPickerEntries(null));
+        const isBackToDefault = JSON.stringify(preference) === JSON.stringify(defaultPreference);
+        /*
+         * Sorting by a column that is no longer on screen leaves the viewer with
+         * an ordering they can neither see nor undo — there is no header left to
+         * click. Fall back to the table's own default sort.
+         */
+        if (sortBy) {
+            const hiddenIds = new Set(preference.hidden);
+            const isSortedColumnHidden = entries.some((entry) => {
+                return (hiddenIds.has(entry.id) &&
+                    getColumnSortKey(entry.column) === String(sortBy));
+            });
+            if (isSortedColumnHidden) {
+                setSortBy(props.sortBy || null);
+                setSortOrder(props.sortOrder || SortOrder.Ascending);
+                setCurrentPageNumber(1);
+            }
+        }
+        saveColumnPreference(isBackToDefault ? null : preference);
+        setShowColumnCustomizationModal(false);
+    };
+    const getColumnCustomizationModal = () => {
+        if (!showColumnCustomizationModal || !isColumnCustomizationEnabled) {
+            return null;
+        }
+        return (React.createElement(ColumnCustomizationModal, { columns: getPickerEntries(effectiveColumnPreference), isDefaultLayout: isEmptyColumnPreference(effectiveColumnPreference), title: tx("Customize Columns"), onSave: onColumnCustomizationSave, onReset: () => {
+                saveColumnPreference(null);
+                setShowColumnCustomizationModal(false);
+            }, onClose: () => {
+                setShowColumnCustomizationModal(false);
+            } }));
+    };
     const getCardComponent = () => {
         const headerButtons = getHeaderButtonsWithSearch();
         if (showAs === ShowAs.Table || showAs === ShowAs.List) {
@@ -2193,7 +2460,7 @@ const BaseModelTable = (props) => {
                 props.cardProps && (React.createElement(Card, Object.assign({}, props.cardProps, { buttons: headerButtons, bodyClassName: showAs === ShowAs.List
                         ? "-ml-6 -mr-6 bg-gray-50 border-top"
                         : "", title: getCardHeaderTitle(getCardTitle(props.cardProps.title || "")) }),
-                    tableColumns.length === 0 && props.columns.length > 0 ? (React.createElement(ErrorMessage, { message: `You are not authorized to view this table. You need any one of these permissions: ${PermissionHelper.getPermissionTitles(model.getReadPermissions()).join(", ")}` })) : (React.createElement(React.Fragment, null)),
+                    tableColumns.length === 0 && allColumns.length > 0 ? (React.createElement(ErrorMessage, { message: `You are not authorized to view this table. You need any one of these permissions: ${PermissionHelper.getPermissionTitles(model.getReadPermissions()).join(", ")}` })) : (React.createElement(React.Fragment, null)),
                     props.topContent || React.createElement(React.Fragment, null),
                     tableColumns.length > 0 && showAs === ShowAs.Table ? (getTable()) : (React.createElement(React.Fragment, null)),
                     tableColumns.length > 0 && showAs === ShowAs.List ? (getList()) : (React.createElement(React.Fragment, null)))),
@@ -2279,7 +2546,8 @@ const BaseModelTable = (props) => {
                 setShowHelpModal(false);
             } },
             React.createElement("div", { className: "p-2" },
-                React.createElement(MarkdownViewer, { text: props.helpContent.markdown }))))));
+                React.createElement(MarkdownViewer, { text: props.helpContent.markdown })))),
+        getColumnCustomizationModal()));
 };
 export default BaseModelTable;
 //# sourceMappingURL=BaseModelTable.js.map