cloudmr-ux 4.2.7 → 4.2.9

package/dist/CmrTable/CmrTable.d.ts

@@ -11,6 +11,12 @@ export interface CmrTableProps extends Omit<DataGridProps, 'rows'> {
     headerBgColor?: string;
     headerTextColor?: string;
     headerIconColor?: string;
+    /**
+     * Optional function to customize how rows are filtered/sorted before display.
+     * Receives the mapped rows; return a new array in the desired order.
+     * When omitted, rows are sorted by most recently submitted (createdAt/created_at descending).
+     */
+    processRows?: (rows: any[]) => any[];
 }
 declare const CmrTable: React.FC<CmrTableProps>;
 export default CmrTable;

package/dist/CmrTable/CmrTable.js

@@ -20,14 +20,38 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { jsx as _jsx } from "react/jsx-runtime";
 import './CmrTable.css';
 import { DataGrid } from '@mui/x-data-grid';
+/** Extracts a comparable timestamp from a row for sorting. Supports createdAt, created_at, or similar date fields. */
+function getSubmittedTimestamp(row) {
+    var _a, _b, _c;
+    var val = (_c = (_b = (_a = row.createdAt) !== null && _a !== void 0 ? _a : row.created_at) !== null && _b !== void 0 ? _b : row.updatedAt) !== null && _c !== void 0 ? _c : row.updated_at;
+    if (val == null)
+        return 0;
+    var ts = typeof val === 'number' ? val : new Date(val).getTime();
+    return isNaN(ts) ? 0 : ts;
+}
+/** Default sort: most recently submitted first (by createdAt or created_at descending). */
+function defaultSortByRecent(rows) {
+    return __spreadArray([], rows, true).sort(function (a, b) { return getSubmittedTimestamp(b) - getSubmittedTimestamp(a); });
+}
 var CmrTable = function (props) {
-    var dataSource = props.dataSource, columns = props.columns, idAlias = props.idAlias, className = props.className, onRowSelectionModelChange = props.onRowSelectionModelChange, style = props.style, _a = props.showCheckbox, showCheckbox = _a === void 0 ? true : _a, _b = props.headerBgColor, headerBgColor = _b === void 0 ? '#F3E5F5' : _b, _c = props.headerTextColor, headerTextColor = _c === void 0 ? '#333' : _c, _d = props.headerIconColor, headerIconColor = _d === void 0 ? '#580f8b' : _d, rest = __rest(props, ["dataSource", "columns", "idAlias", "className", "onRowSelectionModelChange", "style", "showCheckbox", "headerBgColor", "headerTextColor", "headerIconColor"]);
-    return (_jsx("div", __assign({ style: style !== null && style !== void 0 ? style : { height: '400px', width: '100%' }, className: className !== null && className !== void 0 ? className : '' }, { children: _jsx(DataGrid, __assign({ rows: dataSource
-                ? dataSource.map(function (row) { return (__assign({ id: idAlias ? row[idAlias] : row['id'] }, row)); })
-                : [], columns: columns, checkboxSelection: showCheckbox, onRowSelectionModelChange: onRowSelectionModelChange, initialState: {
+    var dataSource = props.dataSource, columns = props.columns, idAlias = props.idAlias, className = props.className, onRowSelectionModelChange = props.onRowSelectionModelChange, style = props.style, _a = props.showCheckbox, showCheckbox = _a === void 0 ? true : _a, _b = props.headerBgColor, headerBgColor = _b === void 0 ? '#F3E5F5' : _b, _c = props.headerTextColor, headerTextColor = _c === void 0 ? '#333' : _c, _d = props.headerIconColor, headerIconColor = _d === void 0 ? '#580f8b' : _d, processRows = props.processRows, rest = __rest(props, ["dataSource", "columns", "idAlias", "className", "onRowSelectionModelChange", "style", "showCheckbox", "headerBgColor", "headerTextColor", "headerIconColor", "processRows"]);
+    var mappedRows = dataSource
+        ? dataSource.map(function (row) { return (__assign({ id: idAlias ? row[idAlias] : row['id'] }, row)); })
+        : [];
+    var displayRows = processRows ? processRows(mappedRows) : defaultSortByRecent(mappedRows);
+    return (_jsx("div", __assign({ style: style !== null && style !== void 0 ? style : { height: '400px', width: '100%' }, className: className !== null && className !== void 0 ? className : '' }, { children: _jsx(DataGrid, __assign({ rows: displayRows, columns: columns, checkboxSelection: showCheckbox, onRowSelectionModelChange: onRowSelectionModelChange, initialState: {
                 pagination: {
                     paginationModel: { pageSize: 50, page: 0 }
                 }

package/dist/core/app/upload/Upload.js

@@ -214,8 +214,7 @@ var Upload = function () {
                                     // return !name.endsWith(".zip") && !name.endsWith(".nii");
                                     // TODO RJW: does this make sense? confusing if you upload a zip, it just disappears
                                     return true; // Show all files for now
-                                })
-                                    .reverse(), rowSelectionModel: selectedData, onRowSelectionModelChange: function (rowSelectionModel) {
+                                }), rowSelectionModel: selectedData, onRowSelectionModelChange: function (rowSelectionModel) {
                                     setSelectedData(rowSelectionModel);
                                 }, columns: uploadedFilesColumns }), _jsxs("div", __assign({ className: "row mt-2" }, { children: [_jsx("div", __assign({ className: "col-4" }, { children: _jsxs(Button, __assign({ color: "error", style: { textTransform: "none" }, variant: "contained", fullWidth: true, onClick: function () {
                                                 setName("Deleting Data");

package/dist/core/features/setup/setupActionCreation.js

@@ -42,19 +42,20 @@ import { AuthenticatedHttpClient } from "../../common/utilities/AuthenticatedReq
 export var submitJobs = createAsyncThunk("SUBMIT_JOBS", function (_a, thunkAPI) {
     var jobQueue = _a.jobQueue;
     return __awaiter(void 0, void 0, void 0, function () {
-        var endpoints, responses, _i, jobQueue_1, job, job_setup_copy, _b, _c, file, res;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var endpoints, responses, _i, jobQueue_1, job, job_setup_copy, _b, _c, file, res, error_1, errorData, errorMsg, modeMatch, mode;
+        var _d, _e, _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
                 case 0:
                     endpoints = getEndpoints();
                     responses = [];
                     _i = 0, jobQueue_1 = jobQueue;
-                    _d.label = 1;
+                    _g.label = 1;
                 case 1:
-                    if (!(_i < jobQueue_1.length)) return [3 /*break*/, 4];
+                    if (!(_i < jobQueue_1.length)) return [3 /*break*/, 6];
                     job = jobQueue_1[_i];
                     if (job === undefined) {
-                        return [3 /*break*/, 3];
+                        return [3 /*break*/, 5];
                     }
                     console.log(job);
                     console.log(JSON.stringify(job.setup));
@@ -72,6 +73,9 @@ export var submitJobs = createAsyncThunk("SUBMIT_JOBS", function (_a, thunkAPI)
                         console.log(e);
                     }
                     console.log(job_setup_copy);
+                    _g.label = 2;
+                case 2:
+                    _g.trys.push([2, 4, , 5]);
                     return [4 /*yield*/, AuthenticatedHttpClient.post(endpoints.JOBS_API, job_setup_copy, {
                             headers: {
                                 accept: "*/*",
@@ -79,17 +83,35 @@ export var submitJobs = createAsyncThunk("SUBMIT_JOBS", function (_a, thunkAPI)
                                 "Content-Type": "application/json"
                             }
                         })];
-                case 2:
-                    res = _d.sent();
+                case 3:
+                    res = _g.sent();
                     responses.push({
                         id: job.id,
                         status: res.status
                     });
-                    _d.label = 3;
-                case 3:
+                    return [3 /*break*/, 5];
+                case 4:
+                    error_1 = _g.sent();
+                    errorData = (_d = error_1 === null || error_1 === void 0 ? void 0 : error_1.response) === null || _d === void 0 ? void 0 : _d.data;
+                    if (((_f = (_e = errorData === null || errorData === void 0 ? void 0 : errorData.error) === null || _e === void 0 ? void 0 : _e.includes) === null || _f === void 0 ? void 0 : _f.call(_e, 'Monthly limit')) ||
+                        ((errorData === null || errorData === void 0 ? void 0 : errorData.current_count) !== undefined && (errorData === null || errorData === void 0 ? void 0 : errorData.limit) !== undefined)) {
+                        errorMsg = (errorData === null || errorData === void 0 ? void 0 : errorData.error) || '';
+                        modeMatch = errorMsg.match(/(mode_[12])/);
+                        mode = modeMatch ? modeMatch[1] : undefined;
+                        return [2 /*return*/, thunkAPI.rejectWithValue({
+                                error: errorMsg || 'Monthly limit reached',
+                                current_count: errorData === null || errorData === void 0 ? void 0 : errorData.current_count,
+                                limit: errorData === null || errorData === void 0 ? void 0 : errorData.limit,
+                                mode: mode,
+                                app: (errorData === null || errorData === void 0 ? void 0 : errorData.app) || (errorData === null || errorData === void 0 ? void 0 : errorData.cloudapp_name)
+                            })];
+                    }
+                    // Re-throw other errors
+                    throw error_1;
+                case 5:
                     _i++;
                     return [3 /*break*/, 1];
-                case 4:
+                case 6:
                     // //Update upstream jobs right after submission
                     thunkAPI.dispatch(getUpstreamJobs());
                     // Return whether the submission was successful

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudmr-ux",
-  "version": "4.2.7",
+  "version": "4.2.9",
   "author": "erosmontin@gmail.com",
   "license": "MIT",
   "repository": "erosmontin/cloudmr-ux",