@oneuptime/common 11.7.1 → 11.7.3

package/build/dist/UI/Utils/Project.js

@@ -8,22 +8,149 @@ import { SubscriptionStatusUtil, } from "../../Types/Billing/SubscriptionStatus"
 import Navigation from "./Navigation";
 import SessionStorage from "./SessionStorage";
 import Telemetry from "./Telemetry/Telemetry";
+/**
+ * Session storage key that pins a browser tab to the project it is showing.
+ * Session storage (and not local storage) so two tabs can show two different
+ * projects at the same time.
+ */
+export const CURRENT_PROJECT_ID_STORAGE_KEY = "current_project_id";
+/**
+ * Local storage key that remembers the last project the user opened on this
+ * browser. Unlike {@link CURRENT_PROJECT_ID_STORAGE_KEY} this survives closing
+ * the tab, which is what makes the dashboard reopen on the project the user
+ * left off on instead of always falling back to the first project.
+ */
+export const LAST_ACCESSED_PROJECT_ID_STORAGE_KEY = "last_accessed_project_id";
 export default class ProjectUtil {
+    /**
+     * The project the user is currently looking at, resolved in priority order:
+     *
+     * 1. `/dashboard/:projectId/...` in the URL - the page the user actually
+     *    opened, so a deep link always wins over anything we have cached.
+     * 2. `current_project_id` in session storage - keeps this tab on the project
+     *    it was already showing while the user moves around routes that do not
+     *    carry a project id (e.g. `/dashboard`).
+     * 3. `last_accessed_project_id` in local storage - the project this user last
+     *    opened on this browser, so closing the tab and coming back to
+     *    `/dashboard` reopens that project rather than the first one.
+     */
     static getCurrentProjectId() {
-        // if this is not available in the url, check the session storage
-        const currentProjectId = SessionStorage.getItem(`current_project_id`);
-        if (currentProjectId && ObjectID.isValidUUID(currentProjectId)) {
-            return new ObjectID(currentProjectId);
+        const projectIdInUrl = this.getProjectIdFromUrl();
+        if (projectIdInUrl) {
+            return projectIdInUrl;
         }
-        let projectId = Navigation.getFirstParam(2);
-        if (projectId && projectId.includes(":projectId")) {
-            projectId = undefined;
+        const projectIdInSession = this.toProjectId(SessionStorage.getItem(CURRENT_PROJECT_ID_STORAGE_KEY));
+        if (projectIdInSession) {
+            return projectIdInSession;
         }
-        // Only return the projectId if it's a valid UUID
-        if (projectId && ObjectID.isValidUUID(projectId)) {
-            return new ObjectID(projectId);
+        return this.getLastAccessedProjectId();
+    }
+    /**
+     * The project id in the current URL, if the user is on a project scoped route
+     * like `/dashboard/:projectId/...`. Returns null on routes that carry no
+     * project id (`/dashboard`, `/dashboard/welcome`, ...).
+     */
+    static getProjectIdFromUrl() {
+        const projectId = Navigation.getFirstParam(2);
+        if (!projectId || projectId.includes(":projectId")) {
+            return null;
         }
-        return null;
+        return this.toProjectId(projectId);
+    }
+    /**
+     * The last project this user opened on this browser. Persisted in local
+     * storage so it outlives the tab. It is cleared on logout (which clears all
+     * of local storage) and when the project is deleted.
+     */
+    static getLastAccessedProjectId() {
+        return this.toProjectId(LocalStorage.getItem(LAST_ACCESSED_PROJECT_ID_STORAGE_KEY));
+    }
+    static setLastAccessedProjectId(projectId) {
+        const id = this.toProjectId(projectId);
+        if (!id) {
+            // Never persist junk - an unusable value would only shadow the fallbacks.
+            this.clearLastAccessedProjectId();
+            return;
+        }
+        LocalStorage.setItem(LAST_ACCESSED_PROJECT_ID_STORAGE_KEY, id.toString());
+    }
+    static clearLastAccessedProjectId() {
+        LocalStorage.removeItem(LAST_ACCESSED_PROJECT_ID_STORAGE_KEY);
+    }
+    /**
+     * Picks the project the dashboard should load out of the projects the user
+     * has access to.
+     *
+     * Candidates are tried in order - current project (URL / this tab), then the
+     * last project opened on this browser, then the first project the user has
+     * access to. A candidate that is not in `projects` is skipped, because the
+     * user may have left, lost access to, or deleted it since.
+     */
+    static getProjectToSelect(data) {
+        const projects = this.getSelectableProjects(data.projects);
+        const candidateIds = [
+            data.currentProjectId,
+            data.lastAccessedProjectId,
+        ];
+        for (const candidateId of candidateIds) {
+            if (!candidateId) {
+                continue;
+            }
+            const project = projects.find((project) => {
+                var _a;
+                return ((_a = project._id) === null || _a === void 0 ? void 0 : _a.toString()) === candidateId.toString();
+            });
+            if (project) {
+                return project;
+            }
+        }
+        return projects[0] || null;
+    }
+    /**
+     * {@link getProjectToSelect} with the candidates read off storage / the URL.
+     */
+    static getProjectToLoad(projects) {
+        return this.getProjectToSelect({
+            projects: projects,
+            currentProjectId: this.getCurrentProjectId(),
+            lastAccessedProjectId: this.getLastAccessedProjectId(),
+        });
+    }
+    /**
+     * The project the dashboard should switch to now that the list of projects
+     * the user has access to has (re)loaded, or null when whatever is already
+     * selected should stand.
+     *
+     * A selection is left alone as long as the user still has access to it -
+     * otherwise a project the user just picked (or just created) would be
+     * overruled by whatever we happened to have remembered.
+     */
+    static getProjectToSelectOnProjectsLoaded(data) {
+        var _a, _b;
+        const projects = this.getSelectableProjects(data.projects);
+        if (projects.length === 0) {
+            // Nothing to select yet - the list is still loading, or the user has no projects.
+            return null;
+        }
+        const selectedProjectId = (_b = (_a = data.selectedProject) === null || _a === void 0 ? void 0 : _a._id) === null || _b === void 0 ? void 0 : _b.toString();
+        const isSelectionStillAccessible = Boolean(selectedProjectId &&
+            projects.some((project) => {
+                var _a;
+                return ((_a = project._id) === null || _a === void 0 ? void 0 : _a.toString()) === selectedProjectId;
+            }));
+        if (isSelectionStillAccessible) {
+            return null;
+        }
+        return this.getProjectToLoad(projects);
+    }
+    /**
+     * The projects that can actually be opened - a project without an id cannot
+     * be navigated to (`/dashboard/undefined`), so it is never a candidate.
+     */
+    static getSelectableProjects(projects) {
+        return (projects || []).filter((project) => {
+            return Boolean(project === null || project === void 0 ? void 0 : project._id);
+        });
     }
     static setIsSubscriptionInactiveOrOverdue(data) {
         var _a;
@@ -45,10 +172,13 @@ export default class ProjectUtil {
     static getCurrentProject() {
         var _a;
         const currentProjectId = (_a = this.getCurrentProjectId()) === null || _a === void 0 ? void 0 : _a.toString();
-        if (!LocalStorage.getItem(`project_${currentProjectId}`)) {
+        if (!currentProjectId) {
             return null;
         }
         const projectJson = LocalStorage.getItem(`project_${currentProjectId}`);
+        if (!projectJson) {
+            return null;
+        }
         return BaseModel.fromJSON(projectJson, Project);
     }
     static setCurrentProject(project) {
@@ -58,7 +188,9 @@ export default class ProjectUtil {
             project = BaseModel.toJSON(project, Project);
         }
         LocalStorage.setItem(`project_${currentProjectId}`, project);
-        SessionStorage.setItem(`current_project_id`, currentProjectId);
+        SessionStorage.setItem(CURRENT_PROJECT_ID_STORAGE_KEY, currentProjectId);
+        // Remember this project for the next time the user opens the dashboard.
+        this.setLastAccessedProjectId(currentProjectId);
         // Keep RUM span context in sync with the project being viewed.
         if (currentProjectId) {
             Telemetry.setGlobalAttributes({ projectId: currentProjectId });
@@ -67,8 +199,15 @@ export default class ProjectUtil {
     static clearCurrentProject() {
         var _a;
         const currentProjectId = (_a = this.getCurrentProjectId()) === null || _a === void 0 ? void 0 : _a.toString();
-        LocalStorage.setItem(`project_${currentProjectId}`, null);
-        SessionStorage.setItem(`current_project_id`, null);
+        if (currentProjectId) {
+            LocalStorage.removeItem(`project_${currentProjectId}`);
+        }
+        SessionStorage.removeItem(CURRENT_PROJECT_ID_STORAGE_KEY);
+        /*
+         * The project is gone (or the user is leaving it), so it must not be
+         * reopened the next time the dashboard loads.
+         */
+        this.clearLastAccessedProjectId();
     }
     static getCurrentPlan() {
         if (!BILLING_ENABLED) {
@@ -80,5 +219,12 @@ export default class ProjectUtil {
         }
         return SubscriptionPlan.getPlanType(project.paymentProviderPlanId, getAllEnvVars());
     }
+    static toProjectId(value) {
+        const id = value === null || value === void 0 ? void 0 : value.toString();
+        if (id && ObjectID.isValidUUID(id)) {
+            return new ObjectID(id);
+        }
+        return null;
+    }
 }
 //# sourceMappingURL=Project.js.map

package/build/dist/UI/Utils/Project.js.map

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

package/build/dist/UI/Utils/TableColumnsToCsv.js

@@ -198,27 +198,88 @@ export default class TableColumnsToCsv {
         }
         return null;
     }
+    /*
+     * The fields a column contributes to the export. A ModelTable column can
+     * declare several (a cell that renders hosts + clusters + services in one
+     * place), and BaseModelTable forwards all of them as exportKeys; `key`
+     * alone is only the first. Falls back to the single key for tables that
+     * build their Table columns by hand.
+     */
+    static getExportKeys(column) {
+        if (column.exportKeys && column.exportKeys.length > 0) {
+            return column.exportKeys;
+        }
+        if (column.key === null || column.key === undefined) {
+            return [];
+        }
+        return [String(column.key)];
+    }
+    /*
+     * A column that renders entirely through getElement still has to declare a
+     * field so the row gets fetched at all, and the convention for that is
+     * `field: { _id: true }` - the "Owners" column on alerts, incidents,
+     * monitors and friends. The id is plumbing, not the cell's value, so
+     * exporting it writes a raw UUID under a header like "Owners". Treat such a
+     * column as presentational and leave it out, the same way a column with no
+     * key at all is left out. A column that genuinely shows the id says so with
+     * FieldType.ObjectID, and one that wants its rendered content in the file
+     * says so with getExportValue.
+     */
+    static isPlaceholderIdColumn(column) {
+        if (!column.getElement) {
+            return false;
+        }
+        if (column.type === FieldType.ObjectID) {
+            return false;
+        }
+        const keys = this.getExportKeys(column);
+        return keys.length === 1 && keys[0] === "_id";
+    }
     /*
      * Columns that can be exported: everything except the Actions column (which
-     * only holds buttons) and columns without a data key (purely presentational).
+     * only holds buttons), columns that opted out, columns without a data key
+     * (purely presentational), and placeholder id columns.
      */
     static getExportableColumns(columns) {
         return (columns || []).filter((column) => {
             if (column.type === FieldType.Actions) {
                 return false;
             }
-            if (column.key === null || column.key === undefined) {
+            if (column.disableCsvExport) {
+                return false;
+            }
+            // An explicit export value makes even a keyless column exportable.
+            if (column.getExportValue) {
+                return true;
+            }
+            if (this.getExportKeys(column).length === 0) {
+                return false;
+            }
+            if (this.isPlaceholderIdColumn(column)) {
                 return false;
             }
             return true;
         });
     }
     static getCellValue(item, column) {
-        if (column.key === null || column.key === undefined) {
-            return "";
+        if (column.getExportValue) {
+            return column.getExportValue(item) || "";
+        }
+        /*
+         * Every declared field goes into the one cell, joined the same way a
+         * multi-value field is, so a cell that renders several relations exports
+         * all of them. Blanks are dropped (only one of the relations is usually
+         * set) and repeats are collapsed (the same entity reachable through two
+         * of them should not be listed twice).
+         */
+        const values = [];
+        for (const key of this.getExportKeys(column)) {
+            const formatted = this.formatValueForCsv(this.getRawValueByPath(item, key), column.type);
+            if (formatted.length > 0 && !values.includes(formatted)) {
+                values.push(formatted);
+            }
         }
-        const rawValue = this.getRawValueByPath(item, String(column.key));
-        return this.formatValueForCsv(rawValue, column.type);
+        return values.join("; ");
     }
     /*
      * Builds the full CSV text (header row + one row per item). Fields are

package/build/dist/UI/Utils/TableColumnsToCsv.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableColumnsToCsv.js","sourceRoot":"","sources":["../../../../UI/Utils/TableColumnsToCsv.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,+BAA+B,CAAC;AAEtD,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC;;;;OAIG;IACI,MAAM,CAAC,cAAc,CAAC,KAAa;QACxC,MAAM,YAAY,GAChB,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;YACnB,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;YACnB,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;YACpB,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEvB,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC;QAC1C,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,uBAAuB,CAAC,KAAa;QACjD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,SAAS,GAAW,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAE1C,IACE,SAAS,KAAK,GAAG;YACjB,SAAS,KAAK,GAAG;YACjB,SAAS,KAAK,GAAG;YACjB,SAAS,KAAK,IAAI;YAClB,SAAS,KAAK,IAAI,EAClB,CAAC;YACD,OAAO,IAAI,KAAK,EAAE,CAAC;QACrB,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,iBAAiB,CAC7B,IAAO,EACP,IAAY;QAEZ,MAAM,QAAQ,GAAkB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChD,IAAI,OAAO,GAAY,IAAI,CAAC;QAE5B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAEjD,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC9C,OAAO,OAAO,CAAC;YACjB,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,MAAM,CAAC,eAAe,CAAC,GAAY,EAAE,OAAe;QAC1D,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtC,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,MAAM,GAAa,GAA+B,CAAC,OAAO,CAAC,CAAC;QAElE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,cAAc,GAClB,GACD,CAAC,cAAc,CAAC;QAEjB,IAAI,OAAO,cAAc,KAAK,UAAU,EAAE,CAAC;YACzC,IAAI,CAAC;gBACH,OAAO,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC3C,CAAC;YAAC,WAAM,CAAC;gBACP,OAAO,SAAS,CAAC;YACnB,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,iBAAiB,CAAC,QAAiB,EAAE,IAAe;QAChE,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,OAAO,QAAQ;iBACZ,GAAG,CAAC,CAAC,OAAgB,EAAE,EAAE;gBACxB,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC/C,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,SAAiB,EAAE,EAAE;gBAC5B,OAAO,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;YAC9B,CAAC,CAAC;iBACD,IAAI,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC;QAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;IAEO,MAAM,CAAC,iBAAiB,CAAC,QAAiB,EAAE,IAAe;QACjE,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,SAAS,CAAC,IAAI;gBACjB,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YACzC,KAAK,SAAS,CAAC,QAAQ;gBACrB,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC1C,KAAK,SAAS,CAAC,OAAO;gBACpB,OAAO,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;YACjC,KAAK,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACxB,MAAM,GAAG,GAAW,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACrC,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtB,OAAO,EAAE,CAAC;gBACZ,CAAC;gBACD,OAAO,GAAG,GAAG,GAAG,GAAG,MAAM,CAAC;YAC5B,CAAC;YACD,KAAK,SAAS,CAAC,OAAO;gBACpB,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC7C;gBACE,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,QAAiB,EAAE,YAAqB;QAChE,IAAI,QAAQ,YAAY,IAAI,EAAE,CAAC;YAC7B,OAAO,aAAa,CAAC,yCAAyC,CAC5D,QAAQ,EACR,YAAY,CACb,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxD,OAAO,aAAa,CAAC,yCAAyC,CAC5D,QAAQ,EACR,YAAY,CACb,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC7C,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,SAAS,GAAW,OAAO,QAAQ,CAAC;QAE1C,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC3B,OAAO,QAAkB,CAAC;QAC5B,CAAC;QAED,IACE,SAAS,KAAK,QAAQ;YACtB,SAAS,KAAK,SAAS;YACvB,SAAS,KAAK,QAAQ,EACtB,CAAC;YACD,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC1B,CAAC;QAED,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC3B,MAAM,YAAY,GAAkB,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAErE,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;gBAC1B,OAAO,YAAY,CAAC;YACtB,CAAC;YAED,MAAM,GAAG,GAA4B,QAAmC,CAAC;YAEzE,KAAK,MAAM,UAAU,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;gBACpD,MAAM,YAAY,GAAY,GAAG,CAAC,UAAU,CAAC,CAAC;gBAE9C,IAAI,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAChE,OAAO,YAAY,CAAC;gBACtB,CAAC;gBAED,IAAI,YAAY,KAAK,IAAI,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;oBAC9D,MAAM,MAAM,GAAkB,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;oBAEnE,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACzC,OAAO,MAAM,CAAC;oBAChB,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,CAAC;gBACH,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAClC,CAAC;YAAC,WAAM,CAAC;gBACP,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC1B,CAAC;IAED;;;;OAIG;IACK,MAAM,CAAC,iBAAiB,CAAC,KAAc;QAC7C,MAAM,UAAU,GACd,KACD,aADC,KAAK,uBAAL,KAAK,CACJ,QAAQ,CAAC;QAEZ,IACE,OAAO,UAAU,KAAK,UAAU;YAChC,UAAU,KAAK,MAAM,CAAC,SAAS,CAAC,QAAQ,EACxC,CAAC;YACD,MAAM,QAAQ,GAAW,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEhD,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,iBAAiB,EAAE,CAAC;gBACnE,OAAO,QAAQ,CAAC;YAClB,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,oBAAoB,CAChC,OAAmB;QAEnB,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,MAAiB,EAAE,EAAE;YAClD,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;gBACtC,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IAAI,MAAM,CAAC,GAAG,KAAK,IAAI,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;gBACpD,OAAO,KAAK,CAAC;YACf,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,YAAY,CACxB,IAAO,EACP,MAAiB;QAEjB,IAAI,MAAM,CAAC,GAAG,KAAK,IAAI,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YACpD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,QAAQ,GAAY,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QAE3E,OAAO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,YAAY,CAA0B,IAGnD;QACC,MAAM,aAAa,GAAe,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE1E,MAAM,WAAW,GAA8B,CAAC,KAAa,EAAU,EAAE;YACvE,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,CAAC;QAClE,CAAC,CAAC;QAEF,MAAM,SAAS,GAAW,aAAa;aACpC,GAAG,CAAC,CAAC,MAAiB,EAAE,EAAE;YACzB,OAAO,WAAW,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QACzC,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,CAAC;QAEb,MAAM,IAAI,GAAkB,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAO,EAAE,EAAE;YAC7D,OAAO,aAAa;iBACjB,GAAG,CAAC,CAAC,MAAiB,EAAE,EAAE;gBACzB,OAAO,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;YACtD,CAAC,CAAC;iBACD,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,iBAAiB,CAAC,KAAa;QAC3C,MAAM,SAAS,GACb,CAAC,KAAK,IAAI,OAAO,CAAC;aACf,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC;aAChC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;aACvB,WAAW,EAAE,IAAI,OAAO,CAAC;QAE9B,MAAM,SAAS,GAAW,IAAI,IAAI,EAAE;aACjC,WAAW,EAAE;aACb,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;aACrB,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAEhB,OAAO,GAAG,SAAS,WAAW,SAAS,MAAM,CAAC;IAChD,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,IAAuC;QAC/D;;;WAGG;QACH,MAAM,aAAa,GAAW,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAE1D,MAAM,IAAI,GAAS,IAAI,IAAI,CAAC,CAAC,GAAG,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE;YAC3D,IAAI,EAAE,yBAAyB;SAChC,CAAC,CAAC;QAEH,MAAM,GAAG,GAAW,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,MAAM,GAAsB,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAC9D,MAAM,CAAC,IAAI,GAAG,GAAG,CAAC;QAClB,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAChC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAA0B,IAIvD;QACC,MAAM,GAAG,GAAW,IAAI,CAAC,YAAY,CAAC;YACpC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,CAAC;YACf,GAAG,EAAE,GAAG;YACR,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC;SAC7C,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"TableColumnsToCsv.js","sourceRoot":"","sources":["../../../../UI/Utils/TableColumnsToCsv.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,+BAA+B,CAAC;AAEtD,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC;;;;OAIG;IACI,MAAM,CAAC,cAAc,CAAC,KAAa;QACxC,MAAM,YAAY,GAChB,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;YACnB,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;YACnB,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;YACpB,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEvB,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC;QAC1C,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,uBAAuB,CAAC,KAAa;QACjD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,SAAS,GAAW,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAE1C,IACE,SAAS,KAAK,GAAG;YACjB,SAAS,KAAK,GAAG;YACjB,SAAS,KAAK,GAAG;YACjB,SAAS,KAAK,IAAI;YAClB,SAAS,KAAK,IAAI,EAClB,CAAC;YACD,OAAO,IAAI,KAAK,EAAE,CAAC;QACrB,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,iBAAiB,CAC7B,IAAO,EACP,IAAY;QAEZ,MAAM,QAAQ,GAAkB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChD,IAAI,OAAO,GAAY,IAAI,CAAC;QAE5B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAEjD,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC9C,OAAO,OAAO,CAAC;YACjB,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,MAAM,CAAC,eAAe,CAAC,GAAY,EAAE,OAAe;QAC1D,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtC,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,MAAM,GAAa,GAA+B,CAAC,OAAO,CAAC,CAAC;QAElE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,cAAc,GAClB,GACD,CAAC,cAAc,CAAC;QAEjB,IAAI,OAAO,cAAc,KAAK,UAAU,EAAE,CAAC;YACzC,IAAI,CAAC;gBACH,OAAO,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC3C,CAAC;YAAC,WAAM,CAAC;gBACP,OAAO,SAAS,CAAC;YACnB,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,iBAAiB,CAAC,QAAiB,EAAE,IAAe;QAChE,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,OAAO,QAAQ;iBACZ,GAAG,CAAC,CAAC,OAAgB,EAAE,EAAE;gBACxB,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC/C,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,SAAiB,EAAE,EAAE;gBAC5B,OAAO,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;YAC9B,CAAC,CAAC;iBACD,IAAI,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC;QAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;IAEO,MAAM,CAAC,iBAAiB,CAAC,QAAiB,EAAE,IAAe;QACjE,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,SAAS,CAAC,IAAI;gBACjB,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YACzC,KAAK,SAAS,CAAC,QAAQ;gBACrB,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC1C,KAAK,SAAS,CAAC,OAAO;gBACpB,OAAO,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;YACjC,KAAK,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACxB,MAAM,GAAG,GAAW,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACrC,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtB,OAAO,EAAE,CAAC;gBACZ,CAAC;gBACD,OAAO,GAAG,GAAG,GAAG,GAAG,MAAM,CAAC;YAC5B,CAAC;YACD,KAAK,SAAS,CAAC,OAAO;gBACpB,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC7C;gBACE,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,QAAiB,EAAE,YAAqB;QAChE,IAAI,QAAQ,YAAY,IAAI,EAAE,CAAC;YAC7B,OAAO,aAAa,CAAC,yCAAyC,CAC5D,QAAQ,EACR,YAAY,CACb,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxD,OAAO,aAAa,CAAC,yCAAyC,CAC5D,QAAQ,EACR,YAAY,CACb,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,QAAiB;QAC7C,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,SAAS,GAAW,OAAO,QAAQ,CAAC;QAE1C,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC3B,OAAO,QAAkB,CAAC;QAC5B,CAAC;QAED,IACE,SAAS,KAAK,QAAQ;YACtB,SAAS,KAAK,SAAS;YACvB,SAAS,KAAK,QAAQ,EACtB,CAAC;YACD,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC1B,CAAC;QAED,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC3B,MAAM,YAAY,GAAkB,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAErE,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;gBAC1B,OAAO,YAAY,CAAC;YACtB,CAAC;YAED,MAAM,GAAG,GAA4B,QAAmC,CAAC;YAEzE,KAAK,MAAM,UAAU,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;gBACpD,MAAM,YAAY,GAAY,GAAG,CAAC,UAAU,CAAC,CAAC;gBAE9C,IAAI,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAChE,OAAO,YAAY,CAAC;gBACtB,CAAC;gBAED,IAAI,YAAY,KAAK,IAAI,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;oBAC9D,MAAM,MAAM,GAAkB,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;oBAEnE,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACzC,OAAO,MAAM,CAAC;oBAChB,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,CAAC;gBACH,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAClC,CAAC;YAAC,WAAM,CAAC;gBACP,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC1B,CAAC;IAED;;;;OAIG;IACK,MAAM,CAAC,iBAAiB,CAAC,KAAc;QAC7C,MAAM,UAAU,GACd,KACD,aADC,KAAK,uBAAL,KAAK,CACJ,QAAQ,CAAC;QAEZ,IACE,OAAO,UAAU,KAAK,UAAU;YAChC,UAAU,KAAK,MAAM,CAAC,SAAS,CAAC,QAAQ,EACxC,CAAC;YACD,MAAM,QAAQ,GAAW,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEhD,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,iBAAiB,EAAE,CAAC;gBACnE,OAAO,QAAQ,CAAC;YAClB,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,aAAa,CACzB,MAAiB;QAEjB,IAAI,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtD,OAAO,MAAM,CAAC,UAAU,CAAC;QAC3B,CAAC;QAED,IAAI,MAAM,CAAC,GAAG,KAAK,IAAI,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YACpD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED;;;;;;;;;;OAUG;IACI,MAAM,CAAC,qBAAqB,CACjC,MAAiB;QAEjB,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,QAAQ,EAAE,CAAC;YACvC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,IAAI,GAAkB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAEvD,OAAO,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC;IAChD,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,oBAAoB,CAChC,OAAmB;QAEnB,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,MAAiB,EAAE,EAAE;YAClD,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;gBACtC,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC;gBAC5B,OAAO,KAAK,CAAC;YACf,CAAC;YAED,mEAAmE;YACnE,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;gBAC1B,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC5C,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IAAI,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC;gBACvC,OAAO,KAAK,CAAC;YACf,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,YAAY,CACxB,IAAO,EACP,MAAiB;QAEjB,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC3C,CAAC;QAED;;;;;;WAMG;QACH,MAAM,MAAM,GAAkB,EAAE,CAAC;QAEjC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7C,MAAM,SAAS,GAAW,IAAI,CAAC,iBAAiB,CAC9C,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC,EACjC,MAAM,CAAC,IAAI,CACZ,CAAC;YAEF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBACxD,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,YAAY,CAA0B,IAGnD;QACC,MAAM,aAAa,GAAe,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE1E,MAAM,WAAW,GAA8B,CAAC,KAAa,EAAU,EAAE;YACvE,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,CAAC;QAClE,CAAC,CAAC;QAEF,MAAM,SAAS,GAAW,aAAa;aACpC,GAAG,CAAC,CAAC,MAAiB,EAAE,EAAE;YACzB,OAAO,WAAW,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QACzC,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,CAAC;QAEb,MAAM,IAAI,GAAkB,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAO,EAAE,EAAE;YAC7D,OAAO,aAAa;iBACjB,GAAG,CAAC,CAAC,MAAiB,EAAE,EAAE;gBACzB,OAAO,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;YACtD,CAAC,CAAC;iBACD,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,iBAAiB,CAAC,KAAa;QAC3C,MAAM,SAAS,GACb,CAAC,KAAK,IAAI,OAAO,CAAC;aACf,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC;aAChC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;aACvB,WAAW,EAAE,IAAI,OAAO,CAAC;QAE9B,MAAM,SAAS,GAAW,IAAI,IAAI,EAAE;aACjC,WAAW,EAAE;aACb,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;aACrB,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAEhB,OAAO,GAAG,SAAS,WAAW,SAAS,MAAM,CAAC;IAChD,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,IAAuC;QAC/D;;;WAGG;QACH,MAAM,aAAa,GAAW,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAE1D,MAAM,IAAI,GAAS,IAAI,IAAI,CAAC,CAAC,GAAG,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE;YAC3D,IAAI,EAAE,yBAAyB;SAChC,CAAC,CAAC;QAEH,MAAM,GAAG,GAAW,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,MAAM,GAAsB,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAC9D,MAAM,CAAC,IAAI,GAAG,GAAG,CAAC;QAClB,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAChC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAA0B,IAIvD;QACC,MAAM,GAAG,GAAW,IAAI,CAAC,YAAY,CAAC;YACpC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,CAAC;YACf,GAAG,EAAE,GAAG;YACR,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC;SAC7C,CAAC,CAAC;IACL,CAAC;CACF"}

package/build/dist/Utils/Monitor/MonitorProbeSelectionUtil.js

@@ -0,0 +1,52 @@
+/*
+ * Which probes a brand-new monitor starts out with.
+ *
+ * The server applies this same rule in
+ * MonitorService.addDefaultProbesToMonitor (as a database query rather than a
+ * filter over a list). The create form uses it to pre-select the probe picker,
+ * so what the user sees before pressing "Create Monitor" is what they would
+ * have got anyway - and can now change.
+ */
+export default class MonitorProbeSelectionUtil {
+    /*
+     * A probe is auto-enabled on new monitors when it opts in with
+     * shouldAutoEnableProbeOnNewMonitors - except that global probes are skipped
+     * entirely for projects that turned off "add global probes by default".
+     */
+    static getDefaultSelectedProbeIds(data) {
+        const skipGlobalProbes = data.doNotAddGlobalProbesByDefaultOnNewMonitors === true;
+        const selected = [];
+        for (const probe of data.probes || []) {
+            if (!probe || !probe.id) {
+                continue;
+            }
+            if (!probe.shouldAutoEnableProbeOnNewMonitors) {
+                continue;
+            }
+            if (probe.isGlobalProbe && skipGlobalProbes) {
+                continue;
+            }
+            selected.push(probe.id);
+        }
+        return MonitorProbeSelectionUtil.dedupeProbeIds(selected);
+    }
+    /*
+     * Probe ids reach the server as plain strings and the same probe can be
+     * offered by more than one source, so duplicates have to go: MonitorProbe
+     * has no unique index and MonitorProbeService rejects the second insert with
+     * "Probe is already added to this monitor."
+     */
+    static dedupeProbeIds(probeIds) {
+        const seen = new Set();
+        const deduped = [];
+        for (const probeId of probeIds || []) {
+            if (!probeId || seen.has(probeId)) {
+                continue;
+            }
+            seen.add(probeId);
+            deduped.push(probeId);
+        }
+        return deduped;
+    }
+}
+//# sourceMappingURL=MonitorProbeSelectionUtil.js.map

package/build/dist/Utils/Monitor/MonitorProbeSelectionUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MonitorProbeSelectionUtil.js","sourceRoot":"","sources":["../../../../Utils/Monitor/MonitorProbeSelectionUtil.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAQH,MAAM,CAAC,OAAO,OAAO,yBAAyB;IAC5C;;;;OAIG;IACI,MAAM,CAAC,0BAA0B,CAAC,IAGxC;QACC,MAAM,gBAAgB,GACpB,IAAI,CAAC,0CAA0C,KAAK,IAAI,CAAC;QAE3D,MAAM,QAAQ,GAAkB,EAAE,CAAC;QAEnC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;YACtC,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;gBACxB,SAAS;YACX,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,kCAAkC,EAAE,CAAC;gBAC9C,SAAS;YACX,CAAC;YAED,IAAI,KAAK,CAAC,aAAa,IAAI,gBAAgB,EAAE,CAAC;gBAC5C,SAAS;YACX,CAAC;YAED,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC1B,CAAC;QAED,OAAO,yBAAyB,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,cAAc,CAAC,QAAuB;QAClD,MAAM,IAAI,GAAgB,IAAI,GAAG,EAAU,CAAC;QAC5C,MAAM,OAAO,GAAkB,EAAE,CAAC;QAElC,KAAK,MAAM,OAAO,IAAI,QAAQ,IAAI,EAAE,EAAE,CAAC;YACrC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBAClC,SAAS;YACX,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAClB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}

package/build/dist/Utils/UserPreferences.js

@@ -2,6 +2,7 @@ import LocalStorage from "../UI/Utils/LocalStorage";
 export var UserPreferenceType;
 (function (UserPreferenceType) {
     UserPreferenceType["BaseModelTablePageSize"] = "BaseModelTablePageSize";
+    UserPreferenceType["BaseModelTableColumns"] = "BaseModelTableColumns";
 })(UserPreferenceType || (UserPreferenceType = {}));
 export default class UserPreferences {
     static getUserPreferenceByTypeAsNumber(data) {
@@ -16,5 +17,37 @@ export default class UserPreferences {
         const finalKey = `${userPreferenceType}.${key}`;
         LocalStorage.setItem(finalKey, value);
     }
+    /*
+     * Object-shaped preferences (e.g. a table's column layout). LocalStorage
+     * already JSON-serializes objects on the way in and parses them on the way
+     * out, so this only has to reject anything that came back as something other
+     * than a plain object - a half-written or hand-edited entry must degrade to
+     * "no preference" rather than reaching the caller as a string or an array.
+     */
+    static getUserPreferenceByTypeAsJSON(data) {
+        const { key, userPreferenceType } = data;
+        const finalKey = `${userPreferenceType}.${key}`;
+        let value = null;
+        try {
+            value = LocalStorage.getItem(finalKey);
+        }
+        catch (_a) {
+            return null;
+        }
+        if (!value || typeof value !== "object" || Array.isArray(value)) {
+            return null;
+        }
+        return value;
+    }
+    static saveUserPreferenceByTypeAsJSON(data) {
+        const { key, userPreferenceType, value } = data;
+        const finalKey = `${userPreferenceType}.${key}`;
+        LocalStorage.setItem(finalKey, value);
+    }
+    static removeUserPreferenceByType(data) {
+        const { key, userPreferenceType } = data;
+        const finalKey = `${userPreferenceType}.${key}`;
+        LocalStorage.removeItem(finalKey);
+    }
 }
 //# sourceMappingURL=UserPreferences.js.map

package/build/dist/Utils/UserPreferences.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserPreferences.js","sourceRoot":"","sources":["../../../Utils/UserPreferences.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,0BAA0B,CAAC;AAEpD,MAAM,CAAN,IAAY,kBAEX;AAFD,WAAY,kBAAkB;IAC5B,uEAAiD,CAAA;AACnD,CAAC,EAFW,kBAAkB,KAAlB,kBAAkB,QAE7B;AAED,MAAM,CAAC,OAAO,OAAO,eAAe;IAC3B,MAAM,CAAC,+BAA+B,CAAC,IAG7C;QACC,MAAM,EAAE,GAAG,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC;QAEzC,MAAM,QAAQ,GAAW,GAAG,kBAAkB,IAAI,GAAG,EAAE,CAAC;QACxD,MAAM,WAAW,GAAkB,YAAY,CAAC,OAAO,CAAC,QAAQ,CAExD,CAAC;QAET,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,uBAAuB;IAChB,MAAM,CAAC,gCAAgC,CAAC,IAI9C;QACC,MAAM,EAAE,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAEhD,MAAM,QAAQ,GAAW,GAAG,kBAAkB,IAAI,GAAG,EAAE,CAAC;QACxD,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;CACF"}
+{"version":3,"file":"UserPreferences.js","sourceRoot":"","sources":["../../../Utils/UserPreferences.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,0BAA0B,CAAC;AAGpD,MAAM,CAAN,IAAY,kBAGX;AAHD,WAAY,kBAAkB;IAC5B,uEAAiD,CAAA;IACjD,qEAA+C,CAAA;AACjD,CAAC,EAHW,kBAAkB,KAAlB,kBAAkB,QAG7B;AAED,MAAM,CAAC,OAAO,OAAO,eAAe;IAC3B,MAAM,CAAC,+BAA+B,CAAC,IAG7C;QACC,MAAM,EAAE,GAAG,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC;QAEzC,MAAM,QAAQ,GAAW,GAAG,kBAAkB,IAAI,GAAG,EAAE,CAAC;QACxD,MAAM,WAAW,GAAkB,YAAY,CAAC,OAAO,CAAC,QAAQ,CAExD,CAAC;QAET,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,uBAAuB;IAChB,MAAM,CAAC,gCAAgC,CAAC,IAI9C;QACC,MAAM,EAAE,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAEhD,MAAM,QAAQ,GAAW,GAAG,kBAAkB,IAAI,GAAG,EAAE,CAAC;QACxD,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,6BAA6B,CAAC,IAG3C;QACC,MAAM,EAAE,GAAG,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC;QAEzC,MAAM,QAAQ,GAAW,GAAG,kBAAkB,IAAI,GAAG,EAAE,CAAC;QAExD,IAAI,KAAK,GAAY,IAAI,CAAC;QAE1B,IAAI,CAAC;YACH,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzC,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAChE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,KAAmB,CAAC;IAC7B,CAAC;IAEM,MAAM,CAAC,8BAA8B,CAAC,IAI5C;QACC,MAAM,EAAE,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAEhD,MAAM,QAAQ,GAAW,GAAG,kBAAkB,IAAI,GAAG,EAAE,CAAC;QACxD,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;IAEM,MAAM,CAAC,0BAA0B,CAAC,IAGxC;QACC,MAAM,EAAE,GAAG,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC;QAEzC,MAAM,QAAQ,GAAW,GAAG,kBAAkB,IAAI,GAAG,EAAE,CAAC;QACxD,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oneuptime/common",
-  "version": "11.7.1",
+  "version": "11.7.3",
   "description": "",
   "repository": {
     "type": "git",
@@ -8,7 +8,7 @@
   },
   "main": "index.js",
   "scripts": {
-    "test": "cd .. && export $(grep -v '^#' config.env | xargs) && cd Common && node --max-old-space-size=6144 node_modules/.bin/jest --runInBand ./Tests --detectOpenHandles",
+    "test": "cd .. && export $(grep -v '^#' config.env | xargs) && cd Common && node --max-old-space-size=6144 node_modules/.bin/jest --runInBand ./Tests --detectOpenHandles --forceExit",
     "test-file": "cd .. && export $(grep -v '^#' config.env | xargs) && cd Common && node node_modules/.bin/jest --runInBand $1 --detectOpenHandles",
     "coverage": "jest --detectOpenHandles --coverage",
     "compile": "tsc",
@@ -57,7 +57,7 @@
     "@clickhouse/client": "^1.10.1",
     "@elastic/elasticsearch": "^8.12.1",
     "@hcaptcha/react-hcaptcha": "^1.14.0",
-    "@monaco-editor/react": "^4.4.6",
+    "@monaco-editor/react": "^4.7.0",
     "@opentelemetry/api": "^1.9.1",
     "@opentelemetry/api-logs": "^0.219.0",
     "@opentelemetry/context-zone": "^2.8.0",
@@ -118,6 +118,7 @@
     "mermaid": "^11.12.2",
     "moment": "^2.30.1",
     "moment-timezone": "^0.5.45",
+    "monaco-editor": "0.52.2",
     "multer": "^2.1.1",
     "node-cron": "^4.0.0",
     "nodemailer": "^8.0.11",